From 5302d519f98fdb78d387165b278a127158fe342a Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 21 Nov 2024 01:05:40 +0100 Subject: [PATCH 0001/2168] ubports-pdk: init at 0-unstable-2024-08-28 --- pkgs/by-name/ub/ubports-pdk/package.nix | 69 +++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 pkgs/by-name/ub/ubports-pdk/package.nix diff --git a/pkgs/by-name/ub/ubports-pdk/package.nix b/pkgs/by-name/ub/ubports-pdk/package.nix new file mode 100644 index 000000000000..8d3f124a6804 --- /dev/null +++ b/pkgs/by-name/ub/ubports-pdk/package.nix @@ -0,0 +1,69 @@ +{ + stdenvNoCC, + lib, + fetchFromGitHub, + unstableGitUpdater, + bash, + coreutils, + dosfstools, + makeWrapper, + mtools, + wget, + which, + xz, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "ubports-pdk"; + version = "0-unstable-2024-08-28"; + + src = fetchFromGitHub { + owner = "ubports"; + repo = "ubports-pdk"; + rev = "ce16915f1ec2aa54bc0f010db7603fbb0deebf4b"; + hash = "sha256-jxlia3RgH3DAUO5OK3jB4IH0vUoG2XZKmODq4VhwJFE="; + }; + + strictDeps = true; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ + bash + coreutils + dosfstools + mtools + wget + which + xz + ]; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + + install -Dm755 ubuntu-touch-pdk $out/share/ubuntu-touch-pdk/ubuntu-touch-pdk + cp -R scripts $out/share/ubuntu-touch-pdk/ + + makeWrapper $out/share/ubuntu-touch-pdk/ubuntu-touch-pdk $out/bin/ubuntu-touch-pdk \ + --prefix PATH : ${lib.makeBinPath finalAttrs.finalPackage.buildInputs} + + runHook postInstall + ''; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + description = "Platform Development Kit for Ubuntu Touch"; + homepage = "https://github.com/ubports/ubports-pdk"; + license = lib.licenses.gpl3Only; + mainProgram = "ubuntu-touch-pdk"; + maintainers = with lib.maintainers; [ OPNA2608 ]; + platforms = lib.platforms.unix; + # setup wants to use brew to install extra prerequisites + broken = stdenvNoCC.hostPlatform.isDarwin; + }; +}) From 2cf1cfd34d9b5db8c477c84a608354606f31fad9 Mon Sep 17 00:00:00 2001 From: George Macon Date: Sun, 15 Dec 2024 15:28:59 -0500 Subject: [PATCH 0002/2168] cwtch: 0.1.3 -> 0.1.5 --- pkgs/by-name/cw/cwtch/package.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/cw/cwtch/package.nix b/pkgs/by-name/cw/cwtch/package.nix index bd0b0d836b48..438d46da41f3 100644 --- a/pkgs/by-name/cw/cwtch/package.nix +++ b/pkgs/by-name/cw/cwtch/package.nix @@ -5,15 +5,15 @@ }: buildGoModule rec { pname = "libcwtch"; - version = "0.1.3"; + version = "0.1.5"; # This Gitea instance has archive downloads disabled, so: fetchgit src = fetchgit { url = "https://git.openprivacy.ca/cwtch.im/autobindings.git"; rev = "v${version}"; - hash = "sha256-Gp6JnyjKChB7w0fUHkreu81QRXQ3YdMb2ReD/VCkVOE="; + hash = "sha256-SeMpL/ncDh4DgYYeikHiwRIF/RKsrOhRzPAePXglvqM="; }; - vendorHash = "sha256-UgG/yjupUFrfjPZ4E+OM1VsWi9MuMuHxcZ4yvz+q/Y0="; + vendorHash = "sha256-ZgysF9ZYbuUdaxUiNAJ44JAeFKjBpOQ1DMXhO2RV7zc="; overrideModAttrs = ( old: { preBuild = '' @@ -30,14 +30,15 @@ buildGoModule rec { buildPhase = '' runHook preBuild - make linux + make libCwtch.so runHook postBuild ''; installPhase = '' runHook preInstall install -D build/linux/libCwtch.h -t $out/include - install -D build/linux/libCwtch.*.so $out/lib/libCwtch.so + # * will match either "amd64" or "arm64" depending on the platform. + install -D build/linux/*/libCwtch.so $out/lib/libCwtch.so runHook postInstall ''; From 3b1b987285acaba03f6d13a23b79fcf2e49f02f6 Mon Sep 17 00:00:00 2001 From: George Macon Date: Sun, 15 Dec 2024 15:29:45 -0500 Subject: [PATCH 0003/2168] cwtch-ui: 1.15.1 -> 1.15.4 --- pkgs/by-name/cw/cwtch-ui/package.nix | 6 +- pkgs/by-name/cw/cwtch-ui/pubspec.json | 108 ++++++++++++++++++++++---- 2 files changed, 97 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/cw/cwtch-ui/package.nix b/pkgs/by-name/cw/cwtch-ui/package.nix index 88bcf61439d5..cfa5ca5c41e0 100644 --- a/pkgs/by-name/cw/cwtch-ui/package.nix +++ b/pkgs/by-name/cw/cwtch-ui/package.nix @@ -12,18 +12,18 @@ let in flutter.buildFlutterApplication rec { pname = "cwtch-ui"; - version = "1.15.1"; + version = "1.15.4"; # This Gitea instance has archive downloads disabled, so: fetchgit src = fetchgit { url = "https://git.openprivacy.ca/cwtch.im/cwtch-ui"; rev = "v${version}"; - hash = "sha256-+UtWhQMhm0UjY0kx3B5TwcBFhUfJma3rpeYls4XWy7I="; + hash = "sha256-Ee6LKqh4Xe+93noJktCGQyW1YLxSXgVKh6YoG0xebBc="; }; # NOTE: The included pubspec.json does not exactly match the upstream # pubspec.lock. With Flutter 3.24, a newer version of material_color_utilities # is required than the upstream locked version. From a checkout of cwtch-ui - # 1.15.1, I ran `flutter pub upgrade material_color_utilities` on 2024-10-17. + # 1.15.4, I ran `flutter pub upgrade material_color_utilities` on 2024-12-15. # This upgraded material_color_utilities and its dependencies. pubspecLock = lib.importJSON ./pubspec.json; gitHashes = { diff --git a/pkgs/by-name/cw/cwtch-ui/pubspec.json b/pkgs/by-name/cw/cwtch-ui/pubspec.json index 77c46b302138..493c10f67c14 100644 --- a/pkgs/by-name/cw/cwtch-ui/pubspec.json +++ b/pkgs/by-name/cw/cwtch-ui/pubspec.json @@ -238,6 +238,16 @@ "source": "hosted", "version": "3.1.1" }, + "coverage": { + "dependency": "transitive", + "description": { + "name": "coverage", + "sha256": "c1fb2dce3c0085f39dc72668e85f8e0210ec7de05345821ff58530567df345a5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.2" + }, "crypto": { "dependency": "direct main", "description": { @@ -651,6 +661,16 @@ "source": "hosted", "version": "1.0.0" }, + "node_preamble": { + "dependency": "transitive", + "description": { + "name": "node_preamble", + "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, "package_config": { "dependency": "transitive", "description": { @@ -881,15 +901,35 @@ "source": "hosted", "version": "1.4.1" }, + "shelf_packages_handler": { + "dependency": "transitive", + "description": { + "name": "shelf_packages_handler", + "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "shelf_static": { + "dependency": "transitive", + "description": { + "name": "shelf_static", + "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.3" + }, "shelf_web_socket": { "dependency": "transitive", "description": { "name": "shelf_web_socket", - "sha256": "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611", + "sha256": "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.0" + "version": "1.0.4" }, "sky_engine": { "dependency": "transitive", @@ -907,6 +947,26 @@ "source": "hosted", "version": "1.5.0" }, + "source_map_stack_trace": { + "dependency": "transitive", + "description": { + "name": "source_map_stack_trace", + "sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "source_maps": { + "dependency": "transitive", + "description": { + "name": "source_maps", + "sha256": "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.12" + }, "source_span": { "dependency": "transitive", "description": { @@ -977,6 +1037,16 @@ "source": "hosted", "version": "1.2.1" }, + "test": { + "dependency": "direct dev", + "description": { + "name": "test", + "sha256": "7ee44229615f8f642b68120165ae4c2a75fe77ae2065b1e55ae4711f6cf0899e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.25.7" + }, "test_api": { "dependency": "transitive", "description": { @@ -987,6 +1057,16 @@ "source": "hosted", "version": "0.7.2" }, + "test_core": { + "dependency": "transitive", + "description": { + "name": "test_core", + "sha256": "55ea5a652e38a1dfb32943a7973f3681a60f872f8c3a05a14664ad54ef9c6696", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.4" + }, "timezone": { "dependency": "transitive", "description": { @@ -1147,25 +1227,15 @@ "source": "hosted", "version": "0.5.1" }, - "web_socket": { - "dependency": "transitive", - "description": { - "name": "web_socket", - "sha256": "24301d8c293ce6fe327ffe6f59d8fd8834735f0ec36e4fd383ec7ff8a64aa078", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.5" - }, "web_socket_channel": { "dependency": "transitive", "description": { "name": "web_socket_channel", - "sha256": "a2d56211ee4d35d9b344d9d4ce60f362e4f5d1aafb988302906bd732bc731276", + "sha256": "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.0" + "version": "2.4.5" }, "webdriver": { "dependency": "transitive", @@ -1177,6 +1247,16 @@ "source": "hosted", "version": "3.0.3" }, + "webkit_inspection_protocol": { + "dependency": "transitive", + "description": { + "name": "webkit_inspection_protocol", + "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, "win32": { "dependency": "transitive", "description": { From 2021b9b81570abcdc6499666156b695b1696b152 Mon Sep 17 00:00:00 2001 From: Red Penguin Date: Tue, 17 Dec 2024 08:29:35 +0000 Subject: [PATCH 0004/2168] maintainers: add renpenguin --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 23b0e5213116..9b1d6b42c993 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18935,6 +18935,12 @@ githubId = 93167100; keys = [ { fingerprint = "9075 CEF8 9850 D261 6599 641A A2C9 36D5 B88C 139C"; } ]; }; + renpenguin = { + email = "redpenguin777@yahoo.com"; + github = "renpenguin"; + githubId = 79577742; + name = "ren"; + }; renzo = { email = "renzocarbonara@gmail.com"; github = "k0001"; From 447999e1ae0f6e9db4a8694a7105bdec49573e69 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Wed, 13 Nov 2024 19:35:50 -0800 Subject: [PATCH 0005/2168] widevine-cdm: move to by-name --- .../widevine-cdm.nix => by-name/wi/widevine-cdm/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/networking/browsers/misc/widevine-cdm.nix => by-name/wi/widevine-cdm/package.nix} (100%) diff --git a/pkgs/applications/networking/browsers/misc/widevine-cdm.nix b/pkgs/by-name/wi/widevine-cdm/package.nix similarity index 100% rename from pkgs/applications/networking/browsers/misc/widevine-cdm.nix rename to pkgs/by-name/wi/widevine-cdm/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27d706ce16a6..880a663c9496 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18781,8 +18781,6 @@ with pkgs; aitrack = libsForQt5.callPackage ../applications/misc/aitrack { }; - widevine-cdm = callPackage ../applications/networking/browsers/misc/widevine-cdm.nix { }; - tidal-dl = python3Packages.callPackage ../tools/audio/tidal-dl { }; tubekit = callPackage ../applications/networking/cluster/tubekit/wrapper.nix { }; From 971457ce05d22325aa048b09f9a5e3bf929a4651 Mon Sep 17 00:00:00 2001 From: Anomalocaridid <29845794+Anomalocaridid@users.noreply.github.com> Date: Tue, 24 Dec 2024 20:41:27 -0500 Subject: [PATCH 0006/2168] pysolfc: fix desktop entry --- pkgs/games/pysolfc/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/games/pysolfc/default.nix b/pkgs/games/pysolfc/default.nix index dede95fe0c80..5e01a2eae9b9 100644 --- a/pkgs/games/pysolfc/default.nix +++ b/pkgs/games/pysolfc/default.nix @@ -69,10 +69,6 @@ python311Packages.buildPythonApplication rec { patches = [ ./pysolfc-datadir.patch ]; nativeBuildInputs = [ desktop-file-utils ]; - postPatch = '' - desktop-file-edit --set-key Icon --set-value ${placeholder "out"}/share/icons/pysol01.png data/pysol.desktop - desktop-file-edit --set-key Comment --set-value "${meta.description}" data/pysol.desktop - ''; postInstall = '' mkdir $out/share/PySolFC/cardsets From 033bec6c96bb9709d5d34ff0a729c953d4efb388 Mon Sep 17 00:00:00 2001 From: Anomalocaridid <29845794+Anomalocaridid@users.noreply.github.com> Date: Tue, 24 Dec 2024 18:34:25 -0500 Subject: [PATCH 0007/2168] fishPlugins.exercism-cli-fish-wrapper: init at 0-unstable-2024-11-29 --- pkgs/shells/fish/plugins/default.nix | 2 ++ .../plugins/exercism-cli-fish-wrapper.nix | 26 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/shells/fish/plugins/exercism-cli-fish-wrapper.nix diff --git a/pkgs/shells/fish/plugins/default.nix b/pkgs/shells/fish/plugins/default.nix index e6256b4e3f2c..57984ad85a21 100644 --- a/pkgs/shells/fish/plugins/default.nix +++ b/pkgs/shells/fish/plugins/default.nix @@ -21,6 +21,8 @@ lib.makeScope newScope (self: with self; { done = callPackage ./done.nix { }; + exercism-cli-fish-wrapper = callPackage ./exercism-cli-fish-wrapper.nix { }; + fifc = callPackage ./fifc.nix { }; fish-bd = callPackage ./fish-bd.nix { }; diff --git a/pkgs/shells/fish/plugins/exercism-cli-fish-wrapper.nix b/pkgs/shells/fish/plugins/exercism-cli-fish-wrapper.nix new file mode 100644 index 000000000000..d2681ea48c33 --- /dev/null +++ b/pkgs/shells/fish/plugins/exercism-cli-fish-wrapper.nix @@ -0,0 +1,26 @@ +{ + lib, + buildFishPlugin, + fetchFromGitHub, + unstableGitUpdater, +}: +buildFishPlugin { + pname = "exercism-cli-fish-wrapper"; + version = "0-unstable-2024-11-29"; + + src = fetchFromGitHub { + owner = "glennj"; + repo = "exercism-cli-fish-wrapper"; + rev = "f25f76dcc9bf164c30a9292a16a2159c9350a146"; + hash = "sha256-R9Vf8tlLytqvMlJdWGyTy1g0TUhOcp7tifz0Bxb4Gts="; + }; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + description = "Fish wrapper for the Exercism CLI"; + homepage = "https://github.com/glennj/exercism-cli-fish-wrapper"; + license = lib.licenses.unfree; # No upstream license + maintainers = with lib.maintainers; [ anomalocaris ]; + }; +} From 7ba35e3012da188742007866b710c6ddb91e5e46 Mon Sep 17 00:00:00 2001 From: x123 Date: Wed, 25 Dec 2024 23:35:56 +0100 Subject: [PATCH 0008/2168] maintainers: update x123 email --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8bb8e723ac7e..9ee62fd56fbf 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -24537,7 +24537,7 @@ }; x123 = { name = "x123"; - email = "nix@boxchop.city"; + email = "nix@nixlink.net"; github = "x123"; githubId = 5481629; }; From 1f52ec9f95614d616ab29254d62a375aa152dcb6 Mon Sep 17 00:00:00 2001 From: ibizaman Date: Wed, 25 Dec 2024 23:10:04 +0100 Subject: [PATCH 0009/2168] prometheus-node-cert-exporter: init at 1.1.7-unstable-2024-12-26 --- .../manual/release-notes/rl-2505.section.md | 2 + .../monitoring/prometheus/exporters.nix | 1 + .../prometheus/exporters/node-cert.nix | 70 +++++++++++++++++++ nixos/tests/prometheus-exporters.nix | 43 ++++++++++++ .../prometheus-node-cert-exporter/gomod.patch | 33 +++++++++ .../prometheus-node-cert-exporter/package.nix | 33 +++++++++ 6 files changed, 182 insertions(+) create mode 100644 nixos/modules/services/monitoring/prometheus/exporters/node-cert.nix create mode 100644 pkgs/by-name/pr/prometheus-node-cert-exporter/gomod.patch create mode 100644 pkgs/by-name/pr/prometheus-node-cert-exporter/package.nix diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index d55c94795ea6..ecf8e3be55a4 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -69,6 +69,8 @@ - [nostr-rs-relay](https://git.sr.ht/~gheartsfield/nostr-rs-relay/), This is a nostr relay, written in Rust. Available as [services.nostr-rs-relay](options.html#opt-services.nostr-rs-relay.enable). +- [Prometheus Node Cert Exporter](https://github.com/amimof/node-cert-exporter), a prometheus exporter to check for SSL cert expiry. Available under [services.prometheus.exporters.node-cert](#opt-services.prometheus.exporters.node-cert.enable). + - [Actual Budget](https://actualbudget.org/), a local-first personal finance app. Available as [services.actual](#opt-services.actual.enable). - [mqtt-exporter](https://github.com/kpetremann/mqtt-exporter/), a Prometheus exporter for exposing messages from MQTT. Available as [services.prometheus.exporters.mqtt](#opt-services.prometheus.exporters.mqtt.enable). diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index f805920c5b87..b67f41c4fb12 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -66,6 +66,7 @@ let "nginx" "nginxlog" "node" + "node-cert" "nut" "nvidia-gpu" "pgbouncer" diff --git a/nixos/modules/services/monitoring/prometheus/exporters/node-cert.nix b/nixos/modules/services/monitoring/prometheus/exporters/node-cert.nix new file mode 100644 index 000000000000..d8b2004e8e85 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/node-cert.nix @@ -0,0 +1,70 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.services.prometheus.exporters.node-cert; + inherit (lib) mkOption types concatStringsSep; +in +{ + port = 9141; + + extraOpts = { + paths = mkOption { + type = types.listOf types.str; + description = '' + List of paths to search for SSL certificates. + ''; + }; + + excludePaths = mkOption { + type = types.listOf types.str; + description = '' + List of paths to exclute from searching for SSL certificates. + ''; + default = [ ]; + }; + + includeGlobs = mkOption { + type = types.listOf types.str; + description = '' + List files matching a pattern to include. Uses Go blob pattern. + ''; + default = [ ]; + }; + + excludeGlobs = mkOption { + type = types.listOf types.str; + description = '' + List files matching a pattern to include. Uses Go blob pattern. + ''; + default = [ ]; + }; + + user = mkOption { + type = types.str; + description = '' + User owning the certs. + ''; + default = "acme"; + }; + }; + + serviceOpts = { + serviceConfig = { + User = cfg.user; + ExecStart = '' + ${lib.getExe pkgs.prometheus-node-cert-exporter} \ + --listen ${toString cfg.listenAddress}:${toString cfg.port} \ + --path ${concatStringsSep "," cfg.paths} \ + --exclude-path "${concatStringsSep "," cfg.excludePaths}" \ + --include-glob "${concatStringsSep "," cfg.includeGlobs}" \ + --exclude-glob "${concatStringsSep "," cfg.excludeGlobs}" \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; +} diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index c15a3fd20b02..f59d61e69b92 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -1002,6 +1002,49 @@ let ''; }; + node-cert = { + nodeName = "node_cert"; + exporterConfig = { + enable = true; + paths = ["/run/certs"]; + }; + exporterTest = '' + wait_for_unit("prometheus-node-cert-exporter.service") + wait_for_open_port(9141) + wait_until_succeeds( + "curl -sSf http://localhost:9141/metrics | grep 'ssl_certificate_expiry_seconds{.\\+path=\"/run/certs/node-cert\\.cert\".\\+}'" + ) + ''; + + metricProvider = { + system.activationScripts.cert.text = '' + mkdir -p /run/certs + cd /run/certs + + cat >ca.template < Date: Thu, 26 Dec 2024 18:52:28 +0000 Subject: [PATCH 0010/2168] playwright-test: Add PLAYWRIGHT_BROWSERS_PATH to build environment This allows writing self-contained node scripts (using a nix-shell shebang), without requiring a separate shell.nix which sets PLAYWRIGHT_BROWSERS_PATH to pkgs.playwright-driver.browsers. --- pkgs/development/web/playwright/driver.nix | 19 +++++++++++++++++++ pkgs/development/web/playwright/test.js | 8 ++++++++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/web/playwright/test.js diff --git a/pkgs/development/web/playwright/driver.nix b/pkgs/development/web/playwright/driver.nix index 1058a61d48fb..ad38908c036f 100644 --- a/pkgs/development/web/playwright/driver.nix +++ b/pkgs/development/web/playwright/driver.nix @@ -12,6 +12,7 @@ makeFontsConf, makeWrapper, runCommand, + writeText, cacert, }: let @@ -191,9 +192,27 @@ let runHook postInstall ''; + setupHook = writeText "setupHook.sh" '' + addBrowsersPath () { + if [[ ! -v PLAYWRIGHT_BROWSERS_PATH ]] ; then + export PLAYWRIGHT_BROWSERS_PATH="${playwright-core.passthru.browsers}" + fi + } + + addEnvHooks "$targetOffset" addBrowsersPath + ''; + meta = playwright.meta // { mainProgram = "playwright"; }; + + passthru.tests.env = runCommand "playwright-core-env-test" { + buildInputs = [ + nodejs + playwright-core + playwright-test + ]; + } "node ${./test.js}"; }); browsers-mac = stdenv.mkDerivation { diff --git a/pkgs/development/web/playwright/test.js b/pkgs/development/web/playwright/test.js new file mode 100644 index 000000000000..2390bfe513b1 --- /dev/null +++ b/pkgs/development/web/playwright/test.js @@ -0,0 +1,8 @@ +const playwright = require('playwright'); +const fs = require('fs'); +playwright.chromium.launch() + .then((browser) => { + console.log('OK'); + fs.writeFileSync(process.env.out, ''); + process.exit(0); + }); From a1952a6083d1f4d66c24dd813083e2530d2d7611 Mon Sep 17 00:00:00 2001 From: WxNzEMof <143541718+WxNzEMof@users.noreply.github.com> Date: Fri, 27 Dec 2024 08:58:28 +0000 Subject: [PATCH 0011/2168] python3Packages.playwright: Add PLAYWRIGHT_BROWSERS_PATH to build environment This allows writing self-contained Python scripts (using a nix-shell shebang), without requiring a separate shell.nix which sets PLAYWRIGHT_BROWSERS_PATH to pkgs.playwright-driver.browsers. --- .../python-modules/playwright/default.nix | 16 ++++++++++++++++ .../python-modules/playwright/test.py | 10 ++++++++++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/playwright/test.py diff --git a/pkgs/development/python-modules/playwright/default.nix b/pkgs/development/python-modules/playwright/default.nix index 08462f56a616..c137b8f66bce 100644 --- a/pkgs/development/python-modules/playwright/default.nix +++ b/pkgs/development/python-modules/playwright/default.nix @@ -13,6 +13,9 @@ setuptools-scm, playwright-driver, nixosTests, + writeText, + runCommand, + pythonPackages, nodejs, }: @@ -86,6 +89,16 @@ buildPythonPackage rec { pyee ]; + setupHook = writeText "setupHook.sh" '' + addBrowsersPath () { + if [[ ! -v PLAYWRIGHT_BROWSERS_PATH ]] ; then + export PLAYWRIGHT_BROWSERS_PATH="${playwright-driver.browsers}" + fi + } + + addEnvHooks "$targetOffset" addBrowsersPath + ''; + postInstall = '' ln -s ${driver} $out/${python.sitePackages}/playwright/driver ''; @@ -101,6 +114,9 @@ buildPythonPackage rec { { driver = playwright-driver; browsers = playwright-driver.browsers; + env = runCommand "playwright-env-test" { + buildInputs = [ pythonPackages.playwright ]; + } "python ${./test.py}"; } // lib.optionalAttrs stdenv.hostPlatform.isLinux { inherit (nixosTests) playwright-python; diff --git a/pkgs/development/python-modules/playwright/test.py b/pkgs/development/python-modules/playwright/test.py new file mode 100644 index 000000000000..3ef73acfdd41 --- /dev/null +++ b/pkgs/development/python-modules/playwright/test.py @@ -0,0 +1,10 @@ +import os +import sys + +from playwright.sync_api import sync_playwright + +with sync_playwright() as p: + browser = p.chromium.launch() + context = browser.new_context() +with open(os.environ["out"], "w") as f: + f.write("OK") From cedcbe01b570f007db5d9ea21d11f2848f3057ae Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Sat, 28 Dec 2024 15:40:48 -0500 Subject: [PATCH 0012/2168] xar: fix build on GCC14 --- pkgs/by-name/xa/xar/package.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/xa/xar/package.nix b/pkgs/by-name/xa/xar/package.nix index 46eb43c0099b..801dcd2cc3da 100644 --- a/pkgs/by-name/xa/xar/package.nix +++ b/pkgs/by-name/xa/xar/package.nix @@ -68,11 +68,20 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoreconfHook ]; - # For some reason libxml2 package headers are in subdirectory and thus aren’t - # picked up by stdenv’s C compiler wrapper (see ccWrapper_addCVars). This - # doesn’t really belong here and either should be part of libxml2 package or - # libxml2 in Nixpkgs can just fix their header paths. - env.NIX_CFLAGS_COMPILE = "-isystem ${libxml2.dev}/include/libxml2"; + env.NIX_CFLAGS_COMPILE = toString ( + [ + # For some reason libxml2 package headers are in subdirectory and thus aren’t + # picked up by stdenv’s C compiler wrapper (see ccWrapper_addCVars). This + # doesn’t really belong here and either should be part of libxml2 package or + # libxml2 in Nixpkgs can just fix their header paths. + "-isystem ${libxml2.dev}/include/libxml2" + ] + ++ lib.optionals stdenv.cc.isGNU [ + # fix build on GCC 14 + "-Wno-error=implicit-function-declaration" + "-Wno-error=incompatible-pointer-types" + ] + ); buildInputs = [ From cc08c29bbb5051c3cea98361d5f8a97961017b41 Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Sun, 29 Dec 2024 13:39:22 +0300 Subject: [PATCH 0013/2168] gnome-extension-manager: 0.5.1 -> 0.6.0 --- .../gn/gnome-extension-manager/package.nix | 53 ++++++++----------- 1 file changed, 23 insertions(+), 30 deletions(-) diff --git a/pkgs/by-name/gn/gnome-extension-manager/package.nix b/pkgs/by-name/gn/gnome-extension-manager/package.nix index 46ba29a2c73d..c9b30dc62050 100644 --- a/pkgs/by-name/gn/gnome-extension-manager/package.nix +++ b/pkgs/by-name/gn/gnome-extension-manager/package.nix @@ -1,36 +1,37 @@ { - stdenv, lib, + stdenv, fetchFromGitHub, - wrapGAppsHook4, - libadwaita, - meson, - ninja, - gettext, - gtk4, + appstream, appstream-glib, desktop-file-utils, - gobject-introspection, - blueprint-compiler, - pkg-config, - json-glib, - libsoup_3, + gettext, glib, + gobject-introspection, + meson, + ninja, + pkg-config, + wrapGAppsHook4, + + blueprint-compiler, + gtk4, + json-glib, + libadwaita, libbacktrace, - text-engine, - fetchpatch, + libsoup_3, + libxml2, }: stdenv.mkDerivation rec { pname = "gnome-extension-manager"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "mjakeman"; repo = "extension-manager"; rev = "v${version}"; - hash = "sha256-PWpnLtzQDF2Is63CY9bNzYSo+MiA2oxzJi7B4nQZ7v8="; + hash = "sha256-AotIzFCx4k7XLdk+2eFyJgrG97KC1wChnSlpLdk90gE="; }; nativeBuildInputs = [ @@ -51,17 +52,9 @@ stdenv.mkDerivation rec { gtk4 json-glib libadwaita - libsoup_3 libbacktrace - text-engine - ]; - - patches = [ - # fix black window when opened, remove in next release - (fetchpatch { - url = "https://github.com/mjakeman/extension-manager/commit/91d1c42a30e12131dc3c5afd8a709e7db2a95b70.patch"; - hash = "sha256-NtsJeqclUx4L3wbyQ46ZCoo4IKSu4/HoT/FD20xriZ4="; - }) + libsoup_3 + libxml2 ]; mesonFlags = [ @@ -69,12 +62,12 @@ stdenv.mkDerivation rec { (lib.mesonOption "distributor" "nixpkgs") ]; - meta = with lib; { + meta = { description = "Desktop app for managing GNOME shell extensions"; homepage = "https://github.com/mjakeman/extension-manager"; - license = licenses.gpl3Plus; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; mainProgram = "extension-manager"; - maintainers = with maintainers; [ foo-dogsquared ]; + maintainers = with lib.maintainers; [ foo-dogsquared ]; }; } From 1ce7180d601787f070986d1e3d199330de6492ff Mon Sep 17 00:00:00 2001 From: AveryanAlex Date: Fri, 13 Sep 2024 12:17:34 +0300 Subject: [PATCH 0014/2168] nixos/wg-quick: add AmneziaWG support Co-authored-by: azahi --- .../modules/services/networking/wg-quick.nix | 63 +++++++-- nixos/tests/wireguard/amneziawg-quick.nix | 125 ++++++++++++++++++ nixos/tests/wireguard/default.nix | 1 + 3 files changed, 178 insertions(+), 11 deletions(-) create mode 100644 nixos/tests/wireguard/amneziawg-quick.nix diff --git a/nixos/modules/services/networking/wg-quick.nix b/nixos/modules/services/networking/wg-quick.nix index 369c5a939765..c829e8eb0fc1 100644 --- a/nixos/modules/services/networking/wg-quick.nix +++ b/nixos/modules/services/networking/wg-quick.nix @@ -11,6 +11,15 @@ let interfaceOpts = { ... }: { options = { + type = mkOption { + example = "amneziawg"; + default = "wireguard"; + type = types.enum ["wireguard" "amneziawg"]; + description = '' + The type of the interface. Currently only "wireguard" and "amneziawg" are supported. + ''; + }; + configFile = mkOption { example = "/secret/wg0.conf"; default = null; @@ -151,6 +160,22 @@ let description = "Peers linked to the interface."; type = with types; listOf (submodule peerOpts); }; + + extraOptions = mkOption { + type = with types; attrsOf (oneOf [ str int ]); + default = { }; + example = { + Jc = 5; + Jmin = 10; + Jmax = 42; + S1 = 60; + S2 = 90; + H4 = 12345; + }; + description = '' + Extra options to append to the interface section. Can be used to define AmneziaWG-specific options. + ''; + }; }; }; @@ -227,7 +252,7 @@ let writeScriptFile = name: text: ((pkgs.writeShellScriptBin name text) + "/bin/${name}"); - generatePrivateKeyScript = privateKeyFile: '' + generatePrivateKeyScript = privateKeyFile: wgBin: '' set -e # If the parent dir does not already exist, create it. @@ -236,7 +261,7 @@ let if [ ! -f "${privateKeyFile}" ]; then # Write private key file with atomically-correct permissions. - (set -e; umask 077; wg genkey > "${privateKeyFile}") + (set -e; umask 077; ${wgBin} genkey > "${privateKeyFile}") fi ''; @@ -244,11 +269,19 @@ let assert assertMsg (values.configFile != null || ((values.privateKey != null) != (values.privateKeyFile != null))) "Only one of privateKey, configFile or privateKeyFile may be set"; assert assertMsg (values.generatePrivateKeyFile == false || values.privateKeyFile != null) "generatePrivateKeyFile requires privateKeyFile to be set"; let - generateKeyScriptFile = if values.generatePrivateKeyFile then writeScriptFile "generatePrivateKey.sh" (generatePrivateKeyScript values.privateKeyFile) else null; + wgBin = { + wireguard = "wg"; + amneziawg = "awg"; + }.${values.type}; + generateKeyScriptFile = + if values.generatePrivateKeyFile then + writeScriptFile "generatePrivateKey.sh" (generatePrivateKeyScript values.privateKeyFile wgBin) + else + null; preUpFile = if values.preUp != "" then writeScriptFile "preUp.sh" values.preUp else null; postUp = - optional (values.privateKeyFile != null) "wg set ${name} private-key <(cat ${values.privateKeyFile})" ++ - (concatMap (peer: optional (peer.presharedKeyFile != null) "wg set ${name} peer ${peer.publicKey} preshared-key <(cat ${peer.presharedKeyFile})") values.peers) ++ + optional (values.privateKeyFile != null) "${wgBin} set ${name} private-key <(cat ${values.privateKeyFile})" ++ + (concatMap (peer: optional (peer.presharedKeyFile != null) "${wgBin} set ${name} peer ${peer.publicKey} preshared-key <(cat ${peer.presharedKeyFile})") values.peers) ++ optional (values.postUp != "") values.postUp; postUpFile = if postUp != [] then writeScriptFile "postUp.sh" (concatMapStringsSep "\n" (line: line) postUp) else null; preDownFile = if values.preDown != "" then writeScriptFile "preDown.sh" values.preDown else null; @@ -276,6 +309,7 @@ let optionalString (postUpFile != null) "PostUp = ${postUpFile}\n" + optionalString (preDownFile != null) "PreDown = ${preDownFile}\n" + optionalString (postDownFile != null) "PostDown = ${postDownFile}\n" + + concatLines (mapAttrsToList (n: v: "${n} = ${toString v}") values.extraOptions) + concatMapStringsSep "\n" (peer: assert assertMsg (!((peer.presharedKeyFile != null) && (peer.presharedKey != null))) "Only one of presharedKey or presharedKeyFile may be set"; "[Peer]\n" + @@ -301,7 +335,10 @@ let wantedBy = optional values.autostart "multi-user.target"; environment.DEVICE = name; path = [ - pkgs.wireguard-tools + { + wireguard = pkgs.wireguard-tools; + amneziawg = pkgs.amneziawg-tools; + }.${values.type} config.networking.firewall.package # iptables or nftables config.networking.resolvconf.package # openresolv or systemd ]; @@ -312,11 +349,11 @@ let }; script = '' - ${optionalString (!config.boot.isContainer) "${pkgs.kmod}/bin/modprobe wireguard"} + ${optionalString (!config.boot.isContainer) "${pkgs.kmod}/bin/modprobe ${values.type}"} ${optionalString (values.configFile != null) '' cp ${values.configFile} ${configPath} ''} - wg-quick up ${configPath} + ${wgBin}-quick up ${configPath} ''; serviceConfig = { @@ -325,7 +362,7 @@ let }; preStop = '' - wg-quick down ${configPath} + ${wgBin}-quick down ${configPath} ''; }; in { @@ -357,8 +394,12 @@ in { ###### implementation config = mkIf (cfg.interfaces != {}) { - boot.extraModulePackages = optional (versionOlder kernel.kernel.version "5.6") kernel.wireguard; - environment.systemPackages = [ pkgs.wireguard-tools ]; + boot.extraModulePackages = + optional (any (x: x.type == "wireguard") (attrValues cfg.interfaces) && (versionOlder kernel.kernel.version "5.6")) kernel.wireguard + ++ optional (any (x: x.type == "amneziawg") (attrValues cfg.interfaces)) kernel.amneziawg; + environment.systemPackages = + optional (any (x: x.type == "wireguard") (attrValues cfg.interfaces)) pkgs.wireguard-tools + ++ optional (any (x: x.type == "amneziawg") (attrValues cfg.interfaces)) pkgs.amneziawg-tools; systemd.services = mapAttrs' generateUnit cfg.interfaces; # Prevent networkd from clearing the rules set by wg-quick when restarted (e.g. when waking up from suspend). diff --git a/nixos/tests/wireguard/amneziawg-quick.nix b/nixos/tests/wireguard/amneziawg-quick.nix new file mode 100644 index 000000000000..0433233a2f96 --- /dev/null +++ b/nixos/tests/wireguard/amneziawg-quick.nix @@ -0,0 +1,125 @@ +import ../make-test-python.nix ( + { + pkgs, + lib, + kernelPackages ? null, + nftables ? false, + ... + }: + let + wg-snakeoil-keys = import ./snakeoil-keys.nix; + peer = import ./make-peer.nix { inherit lib; }; + commonConfig = { + boot.kernelPackages = lib.mkIf (kernelPackages != null) kernelPackages; + networking.nftables.enable = nftables; + # Make sure iptables doesn't work with nftables enabled + boot.blacklistedKernelModules = lib.mkIf nftables [ "nft_compat" ]; + }; + extraOptions = { + Jc = 5; + Jmin = 10; + Jmax = 42; + S1 = 60; + S2 = 90; + }; + in + { + name = "amneziawg-quick"; + meta = with pkgs.lib.maintainers; { + maintainers = [ + averyanalex + azahi + ]; + }; + + nodes = { + peer0 = peer { + ip4 = "192.168.0.1"; + ip6 = "fd00::1"; + extraConfig = lib.mkMerge [ + commonConfig + { + networking.firewall.allowedUDPPorts = [ 23542 ]; + networking.wg-quick.interfaces.wg0 = { + type = "amneziawg"; + + address = [ + "10.23.42.1/32" + "fc00::1/128" + ]; + listenPort = 23542; + + inherit (wg-snakeoil-keys.peer0) privateKey; + + peers = lib.singleton { + allowedIPs = [ + "10.23.42.2/32" + "fc00::2/128" + ]; + + inherit (wg-snakeoil-keys.peer1) publicKey; + }; + + dns = [ + "10.23.42.2" + "fc00::2" + "wg0" + ]; + + inherit extraOptions; + }; + } + ]; + }; + + peer1 = peer { + ip4 = "192.168.0.2"; + ip6 = "fd00::2"; + extraConfig = lib.mkMerge [ + commonConfig + { + networking.useNetworkd = true; + networking.wg-quick.interfaces.wg0 = { + type = "amneziawg"; + + address = [ + "10.23.42.2/32" + "fc00::2/128" + ]; + inherit (wg-snakeoil-keys.peer1) privateKey; + + peers = lib.singleton { + allowedIPs = [ + "0.0.0.0/0" + "::/0" + ]; + endpoint = "192.168.0.1:23542"; + persistentKeepalive = 25; + + inherit (wg-snakeoil-keys.peer0) publicKey; + }; + + dns = [ + "10.23.42.1" + "fc00::1" + "wg0" + ]; + + inherit extraOptions; + }; + } + ]; + }; + }; + + testScript = '' + start_all() + + peer0.wait_for_unit("wg-quick-wg0.service") + peer1.wait_for_unit("wg-quick-wg0.service") + + peer1.succeed("ping -c5 fc00::1") + peer1.succeed("ping -c5 10.23.42.1") + ''; + } +) diff --git a/nixos/tests/wireguard/default.nix b/nixos/tests/wireguard/default.nix index 16393f533bc7..b5da59d07ba9 100644 --- a/nixos/tests/wireguard/default.nix +++ b/nixos/tests/wireguard/default.nix @@ -14,6 +14,7 @@ let networkd = callTest ./networkd.nix; wg-quick = callTest ./wg-quick.nix; wg-quick-nftables = args: callTest ./wg-quick.nix ({ nftables = true; } // args); + amneziawg-quick = callTest ./amneziawg-quick.nix; generated = callTest ./generated.nix; dynamic-refresh = callTest ./dynamic-refresh.nix; dynamic-refresh-networkd = args: callTest ./dynamic-refresh.nix ({ useNetworkd = true; } // args); From 0240773f490a097cd96dc3d7f171f36e717bf08b Mon Sep 17 00:00:00 2001 From: AveryanAlex Date: Fri, 20 Dec 2024 16:26:55 +0300 Subject: [PATCH 0015/2168] nixos/wireguard: add AmneziaWG support Co-authored-by: azahi --- .../modules/services/networking/wireguard.nix | 63 ++++++++-- nixos/tests/wireguard/amneziawg.nix | 111 ++++++++++++++++++ nixos/tests/wireguard/default.nix | 1 + 3 files changed, 164 insertions(+), 11 deletions(-) create mode 100644 nixos/tests/wireguard/amneziawg.nix diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix index a3308a1cd396..e67b819afd6e 100644 --- a/nixos/modules/services/networking/wireguard.nix +++ b/nixos/modules/services/networking/wireguard.nix @@ -15,6 +15,15 @@ let options = { + type = mkOption { + example = "amneziawg"; + default = "wireguard"; + type = types.enum ["wireguard" "amneziawg"]; + description = '' + The type of the interface. Currently only "wireguard" and "amneziawg" are supported. + ''; + }; + ips = mkOption { example = [ "192.168.2.1/24" ]; default = []; @@ -204,6 +213,22 @@ let ::: ''; }; + + extraOptions = mkOption { + type = with types; attrsOf (oneOf [ str int ]); + default = { }; + example = { + Jc = 5; + Jmin = 10; + Jmax = 42; + S1 = 60; + S2 = 90; + H4 = 12345; + }; + description = '' + Extra options to append to the interface section. Can be used to define AmneziaWG-specific options. + ''; + }; }; }; @@ -342,6 +367,16 @@ let }; + wgBins = { + wireguard = "wg"; + amneziawg = "awg"; + }; + + wgPackages = { + wireguard = pkgs.wireguard-tools; + amneziawg = pkgs.amneziawg-tools; + }; + generateKeyServiceUnit = name: values: assert values.generatePrivateKeyFile; nameValuePair "wireguard-${name}-key" @@ -350,7 +385,7 @@ let wantedBy = [ "wireguard-${name}.service" ]; requiredBy = [ "wireguard-${name}.service" ]; before = [ "wireguard-${name}.service" ]; - path = with pkgs; [ wireguard-tools ]; + path = [ wgPackages.${values.type} ]; serviceConfig = { Type = "oneshot"; @@ -366,7 +401,7 @@ let if [ ! -f "${values.privateKeyFile}" ]; then # Write private key file with atomically-correct permissions. - (set -e; umask 077; wg genkey > "${values.privateKeyFile}") + (set -e; umask 077; ${wgBins.${values.type}} genkey > "${values.privateKeyFile}") fi ''; }; @@ -391,7 +426,7 @@ let src = interfaceCfg.socketNamespace; dst = interfaceCfg.interfaceNamespace; ip = nsWrap "ip" src dst; - wg = nsWrap "wg" src dst; + wg = nsWrap wgBins.${interfaceCfg.type} src dst; dynamicEndpointRefreshSeconds = dynamicRefreshSeconds interfaceCfg peer; dynamicRefreshEnabled = dynamicEndpointRefreshSeconds != 0; # We generate a different name (a `-refresh` suffix) when `dynamicEndpointRefreshSeconds` @@ -408,7 +443,7 @@ let wantedBy = [ "wireguard-${interfaceName}.service" ]; environment.DEVICE = interfaceName; environment.WG_ENDPOINT_RESOLUTION_RETRIES = "infinity"; - path = with pkgs; [ iproute2 wireguard-tools ]; + path = with pkgs; [ iproute2 wgPackages.${interfaceCfg.type} ]; serviceConfig = if !dynamicRefreshEnabled @@ -497,7 +532,7 @@ let dst = values.interfaceNamespace; ipPreMove = nsWrap "ip" src null; ipPostMove = nsWrap "ip" src dst; - wg = nsWrap "wg" src dst; + wg = nsWrap wgBins.${values.type} src dst; ns = if dst == "init" then "1" else dst; in @@ -508,7 +543,7 @@ let wants = [ "network.target" ]; before = [ "network.target" ]; environment.DEVICE = name; - path = with pkgs; [ kmod iproute2 wireguard-tools ]; + path = with pkgs; [ kmod iproute2 wgPackages.${values.type} ]; serviceConfig = { Type = "oneshot"; @@ -516,10 +551,10 @@ let }; script = concatStringsSep "\n" ( - optional (!config.boot.isContainer) "modprobe wireguard || true" + optional (!config.boot.isContainer) "modprobe ${values.type} || true" ++ [ values.preSetup - ''${ipPreMove} link add dev "${name}" type wireguard'' + ''${ipPreMove} link add dev "${name}" type ${values.type}'' ] ++ optional (values.interfaceNamespace != null && values.interfaceNamespace != values.socketNamespace) ''${ipPreMove} link set "${name}" netns "${ns}"'' ++ optional (values.mtu != null) ''${ipPostMove} link set "${name}" mtu ${toString values.mtu}'' @@ -531,6 +566,7 @@ let [ ''${wg} set "${name}" private-key "${privKey}"'' ] ++ optional (values.listenPort != null) ''listen-port "${toString values.listenPort}"'' ++ optional (values.fwMark != null) ''fwmark "${values.fwMark}"'' + ++ mapAttrsToList (k: v: ''${toLower k} "${toString v}"'') values.extraOptions )) ''${ipPostMove} link set up dev "${name}"'' values.postSetup @@ -550,6 +586,9 @@ let ns = last nsList; in if (length nsList > 0 && ns != "init") then ''ip netns exec "${ns}" "${cmd}"'' else cmd; + + usingWg = any (x: x.type == "wireguard") (attrValues cfg.interfaces); + usingAwg = any (x: x.type == "amneziawg") (attrValues cfg.interfaces); in { @@ -624,9 +663,11 @@ in message = "networking.wireguard.interfaces.${interfaceName} peer «${peer.publicKey}» has both presharedKey and presharedKeyFile set, but only one can be used."; }) all_peers; - boot.extraModulePackages = optional (versionOlder kernel.kernel.version "5.6") kernel.wireguard; - boot.kernelModules = [ "wireguard" ]; - environment.systemPackages = [ pkgs.wireguard-tools ]; + boot.extraModulePackages = + optional (usingWg && (versionOlder kernel.kernel.version "5.6")) kernel.wireguard + ++ optional usingAwg kernel.amneziawg; + boot.kernelModules = optional usingWg "wireguard" ++ optional usingAwg "amneziawg"; + environment.systemPackages = optional usingWg pkgs.wireguard-tools ++ optional usingAwg pkgs.amneziawg-tools; systemd.services = mkIf (!cfg.useNetworkd) ( (mapAttrs' generateInterfaceUnit cfg.interfaces) diff --git a/nixos/tests/wireguard/amneziawg.nix b/nixos/tests/wireguard/amneziawg.nix new file mode 100644 index 000000000000..40ab0e002fec --- /dev/null +++ b/nixos/tests/wireguard/amneziawg.nix @@ -0,0 +1,111 @@ +import ../make-test-python.nix ( + { + pkgs, + lib, + kernelPackages ? null, + ... + }: + let + wg-snakeoil-keys = import ./snakeoil-keys.nix; + peer = (import ./make-peer.nix) { inherit lib; }; + extraOptions = { + Jc = 5; + Jmin = 10; + Jmax = 42; + S1 = 60; + S2 = 90; + }; + in + { + name = "amneziawg"; + meta = with pkgs.lib.maintainers; { + maintainers = [ + averyanalex + azahi + ]; + }; + + nodes = { + peer0 = peer { + ip4 = "192.168.0.1"; + ip6 = "fd00::1"; + extraConfig = { + boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; }; + networking.firewall.allowedUDPPorts = [ 23542 ]; + networking.wireguard.interfaces.wg0 = { + type = "amneziawg"; + ips = [ + "10.23.42.1/32" + "fc00::1/128" + ]; + listenPort = 23542; + + inherit (wg-snakeoil-keys.peer0) privateKey; + + peers = lib.singleton { + allowedIPs = [ + "10.23.42.2/32" + "fc00::2/128" + ]; + + inherit (wg-snakeoil-keys.peer1) publicKey; + }; + + inherit extraOptions; + }; + }; + }; + + peer1 = peer { + ip4 = "192.168.0.2"; + ip6 = "fd00::2"; + extraConfig = { + boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; }; + networking.wireguard.interfaces.wg0 = { + type = "amneziawg"; + ips = [ + "10.23.42.2/32" + "fc00::2/128" + ]; + listenPort = 23542; + allowedIPsAsRoutes = false; + + inherit (wg-snakeoil-keys.peer1) privateKey; + + peers = lib.singleton { + allowedIPs = [ + "0.0.0.0/0" + "::/0" + ]; + endpoint = "192.168.0.1:23542"; + persistentKeepalive = 25; + + inherit (wg-snakeoil-keys.peer0) publicKey; + }; + + postSetup = + let + inherit (pkgs) iproute2; + in + '' + ${iproute2}/bin/ip route replace 10.23.42.1/32 dev wg0 + ${iproute2}/bin/ip route replace fc00::1/128 dev wg0 + ''; + + inherit extraOptions; + }; + }; + }; + }; + + testScript = '' + start_all() + + peer0.wait_for_unit("wireguard-wg0.service") + peer1.wait_for_unit("wireguard-wg0.service") + + peer1.succeed("ping -c5 fc00::1") + peer1.succeed("ping -c5 10.23.42.1") + ''; + } +) diff --git a/nixos/tests/wireguard/default.nix b/nixos/tests/wireguard/default.nix index b5da59d07ba9..1202e48b297c 100644 --- a/nixos/tests/wireguard/default.nix +++ b/nixos/tests/wireguard/default.nix @@ -10,6 +10,7 @@ with pkgs.lib; let tests = let callTest = p: args: import p ({ inherit system pkgs; } // args); in { basic = callTest ./basic.nix; + amneziawg = callTest ./amneziawg.nix; namespaces = callTest ./namespaces.nix; networkd = callTest ./networkd.nix; wg-quick = callTest ./wg-quick.nix; From cd90665c656a1c1527ee68284cac09519ab36794 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Wed, 1 Jan 2025 23:04:16 +0100 Subject: [PATCH 0016/2168] vcsi: relax python deps, run tests --- pkgs/by-name/vc/vcsi/package.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/vc/vcsi/package.nix b/pkgs/by-name/vc/vcsi/package.nix index 1e424382c767..823a932f08f7 100644 --- a/pkgs/by-name/vc/vcsi/package.nix +++ b/pkgs/by-name/vc/vcsi/package.nix @@ -20,6 +20,10 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ python3Packages.poetry-core ]; + nativeCheckInputs = [ + python3Packages.pytestCheckHook + ]; + propagatedBuildInputs = with python3Packages; [ numpy pillow @@ -28,7 +32,11 @@ python3Packages.buildPythonApplication rec { parsedatetime ]; - doCheck = false; + pythonRelaxDeps = [ + "numpy" + "pillow" + ]; + pythonImportsCheck = [ "vcsi" ]; makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}" ]; From bb868d767431519d8b9133226dd55b359adaccdf Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 14 Dec 2024 12:19:51 +0100 Subject: [PATCH 0017/2168] frr: 10.1 -> 10.2.1 https://frrouting.org/release/10.2/ https://github.com/FRRouting/frr/blob/frr-10.2.1/redhat/frr.spec.in#L839 --- pkgs/by-name/fr/frr/package.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/fr/frr/package.nix b/pkgs/by-name/fr/frr/package.nix index bc96316e7111..8d72901e54c1 100644 --- a/pkgs/by-name/fr/frr/package.nix +++ b/pkgs/by-name/fr/frr/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch # build time , autoreconfHook @@ -77,23 +76,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "frr"; - version = "10.1"; + version = "10.2.1"; src = fetchFromGitHub { owner = "FRRouting"; repo = finalAttrs.pname; rev = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-pmFdxL8QpyXvpX2YiSOZ+KIoNaj1OOH6/qnVAWZLE9s="; + hash = "sha256-TWqW6kI5dDl6IW2Ql6eeySDSyxp0fPgcJOOX1JxjAxs="; }; - patches = [ - (fetchpatch { - name = "CVE-2024-44070.patch"; - url = "https://github.com/FRRouting/frr/commit/fea4ed5043b4a523921f970a39a565d2c1ca381f.patch"; - hash = "sha256-X9FjQeOvo92+mL1z3u5W0LBhhePDAyhFAqh8sAtNNm8="; - }) - ]; - nativeBuildInputs = [ autoreconfHook bison From 4dd7ca03a3a63c5848f8f60e9ddd0e7ce0b2f961 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Sep 2024 08:22:15 +0000 Subject: [PATCH 0018/2168] libyang: 2.1.148 -> 3.4.2 --- pkgs/by-name/li/libyang/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libyang/package.nix b/pkgs/by-name/li/libyang/package.nix index 30b40d0a013e..e0523222b28a 100644 --- a/pkgs/by-name/li/libyang/package.nix +++ b/pkgs/by-name/li/libyang/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "libyang"; - version = "2.1.148"; + version = "3.4.2"; src = fetchFromGitHub { owner = "CESNET"; repo = "libyang"; rev = "v${version}"; - hash = "sha256-uYZJo8lUv6tq0MRRJvbTS/8t1eZNGqcMb5k5sVCwMJM="; + hash = "sha256-pki4T6faY42UcnzOT6697FJWyPRNKNbUFEFZkkeWUx8="; }; nativeBuildInputs = [ From a5f24af6da0f2a5ae04024d297a882abe2719bca Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Mon, 6 Jan 2025 03:10:42 -0500 Subject: [PATCH 0019/2168] buildkite-agent: 3.87.1 -> 3.89.0 Diff: https://github.com/buildkite/agent/compare/v3.87.1...v3.89.0 --- pkgs/by-name/bu/buildkite-agent/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bu/buildkite-agent/package.nix b/pkgs/by-name/bu/buildkite-agent/package.nix index a846606d836e..48147acca576 100644 --- a/pkgs/by-name/bu/buildkite-agent/package.nix +++ b/pkgs/by-name/bu/buildkite-agent/package.nix @@ -14,16 +14,16 @@ }: buildGoModule rec { pname = "buildkite-agent"; - version = "3.87.1"; + version = "3.89.0"; src = fetchFromGitHub { owner = "buildkite"; repo = "agent"; rev = "v${version}"; - hash = "sha256-L7ruto57E4uUEwo18krZgCQYl+9aJoIGgeecNEeVt54="; + hash = "sha256-5COo5vXecXLhYAy3bcaYvmluFdfEKGgiTbhat8T3AV8="; }; - vendorHash = "sha256-Snms9jzQ8+Tw+pJJth7AndskebF31bHKviJBA6Qu52I="; + vendorHash = "sha256-iYc/TWiUFdlgoGB4r/L28yhwQG7g+tBG8usB77JJncM="; postPatch = '' substituteInPlace clicommand/agent_start.go --replace /bin/bash ${bash}/bin/bash From 9478b2f3e8d7be47bbd0691afde74592d9b8cb82 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Mon, 6 Jan 2025 11:04:34 +0100 Subject: [PATCH 0020/2168] nixos/tests/frr: Adjust hello-interval and dead-interval https://github.com/NixOS/nixpkgs/pull/365164#issuecomment-2572728393 --- nixos/tests/frr.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/tests/frr.nix b/nixos/tests/frr.nix index f4cd68c9d315..21e61bd768aa 100644 --- a/nixos/tests/frr.nix +++ b/nixos/tests/frr.nix @@ -12,6 +12,10 @@ import ./make-test-python.nix ( ifAddr = node: iface: (pkgs.lib.head node.networking.interfaces.${iface}.ipv4.addresses).address; ospfConf1 = '' + interface eth2 + ip ospf hello-interval 1 + ip ospf dead-interval 5 + ! router ospf network 192.168.0.0/16 area 0 ''; From 56aa5498d3f4727059403dd0efea97f6bfe70fb5 Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 6 Jan 2025 15:39:28 +0000 Subject: [PATCH 0021/2168] adalanche: remove obsolete `TARGET_OS_*` workaround --- pkgs/by-name/ad/adalanche/package.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/by-name/ad/adalanche/package.nix b/pkgs/by-name/ad/adalanche/package.nix index b3d87bf15945..477dde7085b8 100644 --- a/pkgs/by-name/ad/adalanche/package.nix +++ b/pkgs/by-name/ad/adalanche/package.nix @@ -28,10 +28,6 @@ buildGoModule rec { "-X=github.com/lkarlslund/adalanche/modules/version.Version=${version}" ]; - env = { - CGO_CFLAGS = "-Wno-undef-prefix"; - }; - meta = with lib; { description = "Active Directory ACL Visualizer and Explorer"; homepage = "https://github.com/lkarlslund/adalanche"; From db53f14a1163551d0137a3acc74cbd52151f0761 Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 6 Jan 2025 15:39:28 +0000 Subject: [PATCH 0022/2168] nray: remove obsolete `TARGET_OS_*` workaround --- pkgs/by-name/nr/nray/package.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/by-name/nr/nray/package.nix b/pkgs/by-name/nr/nray/package.nix index 8e5716ef6c2f..475ac85dba52 100644 --- a/pkgs/by-name/nr/nray/package.nix +++ b/pkgs/by-name/nr/nray/package.nix @@ -22,10 +22,6 @@ buildGoModule rec { "-w" ]; - env = { - CGO_CFLAGS = "-Wno-undef-prefix"; - }; - meta = with lib; { description = "Distributed port scanner"; homepage = "https://github.com/nray-scanner/nray"; From 13e8cecd5d99b1d48baa88c8a81f25a4c178fc26 Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 6 Jan 2025 15:39:28 +0000 Subject: [PATCH 0023/2168] thc-hydra: remove obsolete `TARGET_OS_*` workaround --- pkgs/by-name/th/thc-hydra/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/th/thc-hydra/package.nix b/pkgs/by-name/th/thc-hydra/package.nix index 57d059e0b75c..9ea9193057fd 100644 --- a/pkgs/by-name/th/thc-hydra/package.nix +++ b/pkgs/by-name/th/thc-hydra/package.nix @@ -43,8 +43,6 @@ stdenv.mkDerivation rec { --replace-fail "-lcurses" "-lncurses" ''; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-undef-prefix"; - nativeBuildInputs = lib.optionals withGUI [ pkg-config makeWrapper From 5042c058bdd3695795d532b5a965f22201eb5f0a Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Mon, 6 Jan 2025 14:52:09 -0300 Subject: [PATCH 0024/2168] plasmusic-toolbar: 2.1.1 -> 2.2.0 --- pkgs/by-name/pl/plasmusic-toolbar/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pl/plasmusic-toolbar/package.nix b/pkgs/by-name/pl/plasmusic-toolbar/package.nix index 1240632b805a..21d637e39e49 100644 --- a/pkgs/by-name/pl/plasmusic-toolbar/package.nix +++ b/pkgs/by-name/pl/plasmusic-toolbar/package.nix @@ -7,13 +7,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "plasmusic-toolbar"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "ccatterina"; repo = "plasmusic-toolbar"; tag = "v${finalAttrs.version}"; - hash = "sha256-dQG6YOILsTsxbMfdrThodokixM2PrXPd5nB7+NWxFXg="; + hash = "sha256-yVhtn52wwBw+lGWbaynuF6Vv1rw5zslW/V1eZ71R140="; }; installPhase = '' From ff3c5a7172afb99d4294ed7bbe0e6abe3f3e22e8 Mon Sep 17 00:00:00 2001 From: Jorik Date: Wed, 30 Oct 2024 22:58:24 +0100 Subject: [PATCH 0025/2168] maintainers: add jorikvanveen --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index edb71c74ff8d..b9596fe547ac 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11174,6 +11174,12 @@ github = "jordanisaacs"; githubId = 19742638; }; + jorikvanveen = { + email = "vanveenjorik@protonmail.com"; + github = "jorikvanveen"; + githubId = 33939820; + name = "Jorik van Veen"; + }; jorise = { email = "info@jorisengbers.nl"; github = "JorisE"; From c30d129071627882d058bd6cb1e91137f6c2dcb5 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Mon, 6 Jan 2025 22:51:18 +0200 Subject: [PATCH 0026/2168] discord: add `startupWMClass` --- .../applications/networking/instant-messengers/discord/linux.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix index a0870e86efcd..c85461161dd1 100644 --- a/pkgs/applications/networking/instant-messengers/discord/linux.nix +++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix @@ -208,6 +208,7 @@ stdenv.mkDerivation rec { "InstantMessaging" ]; mimeTypes = [ "x-scheme-handler/discord" ]; + startupWMClass = "discord"; }; passthru = { From fb6a7bfe74ebeca9a86a96ece73242a11d34352c Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Sun, 22 Dec 2024 03:44:21 +0000 Subject: [PATCH 0027/2168] openbsd.{fsck,fsck_ffs,fsck_msdos}: init --- pkgs/os-specific/bsd/openbsd/pkgs/fsck.nix | 4 ++++ pkgs/os-specific/bsd/openbsd/pkgs/fsck_ffs.nix | 8 ++++++++ pkgs/os-specific/bsd/openbsd/pkgs/fsck_msdos.nix | 5 +++++ 3 files changed, 17 insertions(+) create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/fsck.nix create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/fsck_ffs.nix create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/fsck_msdos.nix diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/fsck.nix b/pkgs/os-specific/bsd/openbsd/pkgs/fsck.nix new file mode 100644 index 000000000000..c1afc90746ae --- /dev/null +++ b/pkgs/os-specific/bsd/openbsd/pkgs/fsck.nix @@ -0,0 +1,4 @@ +{ mkDerivation }: +mkDerivation { + path = "sbin/fsck"; +} diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/fsck_ffs.nix b/pkgs/os-specific/bsd/openbsd/pkgs/fsck_ffs.nix new file mode 100644 index 000000000000..85ff031ad488 --- /dev/null +++ b/pkgs/os-specific/bsd/openbsd/pkgs/fsck_ffs.nix @@ -0,0 +1,8 @@ +{ mkDerivation }: +mkDerivation { + path = "sbin/fsck_ffs"; + extraPaths = [ + "sbin/fsck" + "sys/ufs/ffs" + ]; +} diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/fsck_msdos.nix b/pkgs/os-specific/bsd/openbsd/pkgs/fsck_msdos.nix new file mode 100644 index 000000000000..103728248610 --- /dev/null +++ b/pkgs/os-specific/bsd/openbsd/pkgs/fsck_msdos.nix @@ -0,0 +1,5 @@ +{ mkDerivation }: +mkDerivation { + path = "sbin/fsck_msdos"; + extraPaths = [ "sbin/fsck" ]; +} From 55d65381bbda9ca9a614d86d54a836897d49a755 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Sun, 22 Dec 2024 03:53:07 +0000 Subject: [PATCH 0028/2168] openbsd.fsck: Override paths --- .../bsd/openbsd/pkgs/fsck/fsck-path.patch | 25 +++++++++++++++++++ .../pkgs/{fsck.nix => fsck/package.nix} | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/fsck/fsck-path.patch rename pkgs/os-specific/bsd/openbsd/pkgs/{fsck.nix => fsck/package.nix} (61%) diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/fsck/fsck-path.patch b/pkgs/os-specific/bsd/openbsd/pkgs/fsck/fsck-path.patch new file mode 100644 index 000000000000..a49ac7ceb04c --- /dev/null +++ b/pkgs/os-specific/bsd/openbsd/pkgs/fsck/fsck-path.patch @@ -0,0 +1,25 @@ +diff --git a/sbin/fsck/fsck.c b/sbin/fsck/fsck.c +index 19e730a484f..176d614d986 100644 +--- a/sbin/fsck/fsck.c ++++ b/sbin/fsck/fsck.c +@@ -308,18 +308,8 @@ checkfs(const char *vfstype, const char *spec, const char *mntpt, void *auxarg, + _exit(0); + + /* Go find an executable. */ +- edir = edirs; +- do { +- (void)snprintf(execname, +- sizeof(execname), "%s/fsck_%s", *edir, vfstype); +- execv(execname, (char * const *)argv); +- if (errno != ENOENT) { +- if (spec) +- warn("exec %s for %s", execname, spec); +- else +- warn("exec %s", execname); +- } +- } while (*++edir != NULL); ++ (void)snprintf(execname, sizeof(execname), "fsck_%s", vfstype); ++ execvp(execname, (char * const *)argv); + + if (errno == ENOENT) { + if (spec) diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/fsck.nix b/pkgs/os-specific/bsd/openbsd/pkgs/fsck/package.nix similarity index 61% rename from pkgs/os-specific/bsd/openbsd/pkgs/fsck.nix rename to pkgs/os-specific/bsd/openbsd/pkgs/fsck/package.nix index c1afc90746ae..c7a9e307f932 100644 --- a/pkgs/os-specific/bsd/openbsd/pkgs/fsck.nix +++ b/pkgs/os-specific/bsd/openbsd/pkgs/fsck/package.nix @@ -1,4 +1,6 @@ { mkDerivation }: mkDerivation { path = "sbin/fsck"; + + patches = [ ./fsck-path.patch ]; } From 52f3e97ee46c0cdd3511ddaa3882e764fe14c62f Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Sun, 22 Dec 2024 00:07:48 -0800 Subject: [PATCH 0029/2168] openbsd.fsck: unveil /nix/store too --- .../bsd/openbsd/pkgs/fsck/fsck-path.patch | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/fsck/fsck-path.patch b/pkgs/os-specific/bsd/openbsd/pkgs/fsck/fsck-path.patch index a49ac7ceb04c..2eedb4fc6c04 100644 --- a/pkgs/os-specific/bsd/openbsd/pkgs/fsck/fsck-path.patch +++ b/pkgs/os-specific/bsd/openbsd/pkgs/fsck/fsck-path.patch @@ -1,8 +1,17 @@ diff --git a/sbin/fsck/fsck.c b/sbin/fsck/fsck.c -index 19e730a484f..176d614d986 100644 +index 19e730a484f..cb548971abd 100644 --- a/sbin/fsck/fsck.c +++ b/sbin/fsck/fsck.c -@@ -308,18 +308,8 @@ checkfs(const char *vfstype, const char *spec, const char *mntpt, void *auxarg, +@@ -115,6 +115,8 @@ main(int argc, char *argv[]) + err(1, "unveil %s", _PATH_FSTAB); + if (unveil("/sbin", "x") == -1) + err(1, "unveil /sbin"); ++ if (unveil("/nix/store", "rx") == -1) ++ err(1, "unveil /nix/store"); + if (pledge("stdio rpath wpath disklabel proc exec", NULL) == -1) + err(1, "pledge"); + +@@ -308,18 +310,8 @@ checkfs(const char *vfstype, const char *spec, const char *mntpt, void *auxarg, _exit(0); /* Go find an executable. */ From 63bbbe8a6ca560e007925a1203789349413eebcb Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Sun, 22 Dec 2024 12:52:03 -0800 Subject: [PATCH 0030/2168] freebsd.compat: don't claim to work outside of Linux --- pkgs/os-specific/bsd/freebsd/pkgs/compat/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/compat/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/compat/package.nix index 961b31d0720a..57fec98d125a 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/compat/package.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/compat/package.nix @@ -173,7 +173,7 @@ mkDerivation { # Compat is for making other platforms look like FreeBSD (e.g. to # build build-time dependencies for building FreeBSD packages). It is # not needed when building for FreeBSD. - meta.broken = stdenv.hostPlatform.isFreeBSD; + meta.platforms = lib.platforms.linux; alwaysKeepStatic = true; } From 3244da6d13200f7a9bfbf744f9139dcfdc41994e Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Tue, 7 Jan 2025 19:09:18 +0900 Subject: [PATCH 0031/2168] nixos/tabby: fix invalid mkRemovedOptionModule import --- nixos/modules/services/misc/tabby.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/tabby.nix b/nixos/modules/services/misc/tabby.nix index 169d058d59b7..653bc9879288 100644 --- a/nixos/modules/services/misc/tabby.nix +++ b/nixos/modules/services/misc/tabby.nix @@ -16,7 +16,8 @@ in { imports = [ (mkRemovedOptionModule [ - "settings" + "services" + "tabby" "indexInterval" ] "These options are now managed within the tabby WebGUI") ]; From e32fb0b0f2571eb991941944db54701ef7efd345 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jan 2025 16:28:04 +0000 Subject: [PATCH 0032/2168] soft-serve: 0.8.1 -> 0.8.2 --- pkgs/by-name/so/soft-serve/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/so/soft-serve/package.nix b/pkgs/by-name/so/soft-serve/package.nix index b84ba34fa081..ce5b3a7d7597 100644 --- a/pkgs/by-name/so/soft-serve/package.nix +++ b/pkgs/by-name/so/soft-serve/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "soft-serve"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "soft-serve"; rev = "v${version}"; - hash = "sha256-rbwDFAnRS+Q7f0uTOsw2Fm43NeLiAGePGAl8h4DbUNI="; + hash = "sha256-eYe+F/1oiAshQeUQhpf8aUtmy1OWUL00F5SH6tV1NO0="; }; - vendorHash = "sha256-lqSNKexd5bXlBBp3tLKE+pneA+ZOMKubnItJfKRkbso="; + vendorHash = "sha256-DGlenK4CsxhoxtD87KeJYuKG/cpP3MuCCS+7Zlc4WUM="; doCheck = false; From 65580eea00b47b4171b68dba52ade898d139dd85 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Tue, 7 Jan 2025 23:49:49 +0000 Subject: [PATCH 0033/2168] nginx: Fix cross-OS build nginx uses uname to find the target platform by default. This works fine when building locally or when building on the same OS for most architectures, but breaks when building e.g. Linux to BSD. Explicitly tell the target to the configure script instead. --- 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 3f4933500f7b..bc35c18bf402 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -170,6 +170,9 @@ stdenv.mkDerivation { [ "--with-http_geoip_module" ] ++ lib.optional withStream "--with-stream_geoip_module" ) ++ lib.optional (with stdenv.hostPlatform; isLinux || isFreeBSD) "--with-file-aio" + ++ lib.optional ( + stdenv.buildPlatform != stdenv.hostPlatform + ) "--crossbuild=${stdenv.hostPlatform.uname.system}::${stdenv.hostPlatform.uname.processor}" ++ configureFlags ++ map (mod: "--add-module=${mod.src}") modules; From 9d2d70bea2f9ff86ce655dcf2a148509c5b7871d Mon Sep 17 00:00:00 2001 From: Anton Mosich Date: Thu, 9 Jan 2025 15:42:14 +0100 Subject: [PATCH 0034/2168] nixos/docs: fix typo If that string wasn't a raw string, the "\n" in the second line won't get rendered as such, but as a space instead. --- nixos/lib/test-driver/src/test_driver/machine.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/test-driver/src/test_driver/machine.py b/nixos/lib/test-driver/src/test_driver/machine.py index c423ad8a3fc0..1e65db76b6be 100644 --- a/nixos/lib/test-driver/src/test_driver/machine.py +++ b/nixos/lib/test-driver/src/test_driver/machine.py @@ -726,7 +726,7 @@ class Machine: retry(tty_matches, timeout) def send_chars(self, chars: str, delay: float | None = 0.01) -> None: - """ + r""" Simulate typing a sequence of characters on the virtual keyboard, e.g., `send_chars("foobar\n")` will type the string `foobar` followed by the Enter key. From 69e14e43b5a6afceaa75dce9d24407ba3ca35d77 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 11 Jan 2025 01:49:38 +0100 Subject: [PATCH 0035/2168] ocamlPackages.lablgtk: unpin gnumake42 --- pkgs/development/ocaml-modules/lablgtk/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index 7d2a3601b4a5..7f0bd839cd2a 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -3,6 +3,7 @@ stdenv, fetchurl, fetchFromGitHub, + fetchpatch, ocaml, findlib, pkg-config, @@ -10,7 +11,6 @@ libgnomecanvas, gtksourceview, camlp-streams, - gnumake42, }: let @@ -51,12 +51,18 @@ stdenv.mkDerivation { pname = "ocaml${ocaml.version}-lablgtk"; inherit (param) version src env; - # gnumake42: https://github.com/garrigue/lablgtk/issues/162 + # https://github.com/garrigue/lablgtk/issues/162 + patches = [ + (fetchpatch { + url = "https://github.com/garrigue/lablgtk/commit/c9717249954d1713815d435c84f9953a685af4be.patch"; + hash = "sha256-jxmcAIIpdee7sPKfeLAijBnwgKDTjXuiWlh6c9rs+18="; + }) + ]; + nativeBuildInputs = [ pkg-config ocaml findlib - gnumake42 ]; buildInputs = [ gtk2 From 37e2a8099638c3da70ea2e51860d283433e8cace Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Sat, 11 Jan 2025 09:28:32 +0100 Subject: [PATCH 0036/2168] nixos/nix-required-mounts: Fix outdated option hardware.opengl --- nixos/modules/programs/nix-required-mounts.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/programs/nix-required-mounts.nix b/nixos/modules/programs/nix-required-mounts.nix index 5064d6aaf575..47019dafab8f 100644 --- a/nixos/modules/programs/nix-required-mounts.nix +++ b/nixos/modules/programs/nix-required-mounts.nix @@ -50,10 +50,10 @@ let pkgs.addDriverRunpath.driverLink # mesa: - config.hardware.opengl.package + config.hardware.graphics.package # nvidia_x11, etc: - ] ++ config.hardware.opengl.extraPackages; # nvidia_x11 + ] ++ config.hardware.graphics.extraPackages; # nvidia_x11 defaults = { nvidia-gpu.onFeatures = package.allowedPatterns.nvidia-gpu.onFeatures; @@ -82,8 +82,8 @@ in default = { }; defaultText = lib.literalExpression '' { - opengl.paths = config.hardware.opengl.extraPackages ++ [ - config.hardware.opengl.package + opengl.paths = config.hardware.graphics.extraPackages ++ [ + config.graphics.opengl.package pkgs.addDriverRunpath.driverLink "/dev/dri" ]; From ea9594ba15fcbb787b9abe9d587e0e5c8fcafd4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Sat, 11 Jan 2025 09:57:22 +0100 Subject: [PATCH 0037/2168] nixos/nix: restructure default for system-features Assign default for option system-features at the common place. It allows use to re-use the default value in cause of setting the option. --- nixos/modules/config/nix.nix | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/nixos/modules/config/nix.nix b/nixos/modules/config/nix.nix index 9505c60d4f63..e1c347242878 100644 --- a/nixos/modules/config/nix.nix +++ b/nixos/modules/config/nix.nix @@ -27,7 +27,6 @@ let literalExpression mapAttrsToList mkAfter - mkDefault mkIf mkOption mkRenamedOptionModuleWith @@ -316,15 +315,25 @@ in system-features = mkOption { type = types.listOf types.str; - example = [ "kvm" "big-parallel" "gccarch-skylake" ]; + default = + [ + "nixos-test" + "benchmark" + "big-parallel" + "kvm" + ] + ++ optionals (pkgs.stdenv.hostPlatform ? gcc.arch) ( + # a builder can run code for `gcc.arch` and inferior architectures + [ "gccarch-${pkgs.stdenv.hostPlatform.gcc.arch}" ] + ++ map (x: "gccarch-${x}") ( + systems.architectures.inferiors.${pkgs.stdenv.hostPlatform.gcc.arch} or [ ] + ) + ); + defaultText = literalExpression ''[ "nixos-test" "benchmark" "big-parallel" "kvm" "gccarch-" ]''; description = '' The set of features supported by the machine. Derivations can express dependencies on system features through the `requiredSystemFeatures` attribute. - - By default, pseudo-features `nixos-test`, `benchmark`, - and `big-parallel` used in Nixpkgs are set, `kvm` - is also included if it is available. ''; }; @@ -350,7 +359,6 @@ in use-sandbox = true; show-trace = true; - system-features = [ "big-parallel" "kvm" "recursive-nix" ]; sandbox-paths = [ "/bin/sh=''${pkgs.busybox-sandbox-shell.out}/bin/busybox" ]; } ''; @@ -377,14 +385,6 @@ in trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ]; trusted-users = [ "root" ]; substituters = mkAfter [ "https://cache.nixos.org/" ]; - system-features = mkDefault ( - [ "nixos-test" "benchmark" "big-parallel" "kvm" ] ++ - optionals (pkgs.stdenv.hostPlatform ? gcc.arch) ( - # a builder can run code for `gcc.arch` and inferior architectures - [ "gccarch-${pkgs.stdenv.hostPlatform.gcc.arch}" ] ++ - map (x: "gccarch-${x}") (systems.architectures.inferiors.${pkgs.stdenv.hostPlatform.gcc.arch} or []) - ) - ); }; }; } From 2435407d78b00df53900335a3f1bba2fb2b104c1 Mon Sep 17 00:00:00 2001 From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com> Date: Sun, 12 Jan 2025 21:48:48 +0200 Subject: [PATCH 0038/2168] spacedrive: fix darwin binary symlink --- pkgs/by-name/sp/spacedrive/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/sp/spacedrive/package.nix b/pkgs/by-name/sp/spacedrive/package.nix index fb1e74801f9c..5f35e09d2598 100644 --- a/pkgs/by-name/sp/spacedrive/package.nix +++ b/pkgs/by-name/sp/spacedrive/package.nix @@ -79,7 +79,7 @@ if stdenv.hostPlatform.isDarwin then mkdir -p "$out/Applications/Spacedrive.app" cp -r . "$out/Applications/Spacedrive.app" mkdir -p "$out/bin" - ln -s "$out/Applications/Spacedrive.app/Contents/MacOS/Spacedrive" "$out/bin/spacedrive" + ln -s "$out/Applications/Spacedrive.app/Contents/MacOS/sd-desktop" "$out/bin/spacedrive" runHook postInstall ''; From 6ea4c4c1e84b163c1dbf828a53fd0b5d42a0ddfd Mon Sep 17 00:00:00 2001 From: Yaya Date: Tue, 14 Jan 2025 13:25:58 +0100 Subject: [PATCH 0039/2168] pocket-casts: 0.8.0 -> 0.9.0 Diff: https://github.com/felicianotech/pocket-casts-desktop-app/compare/v0.8.0...v0.9.0 --- pkgs/by-name/po/pocket-casts/package.nix | 8 +++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/po/pocket-casts/package.nix b/pkgs/by-name/po/pocket-casts/package.nix index b34c5eed3d01..7ff8546875e5 100644 --- a/pkgs/by-name/po/pocket-casts/package.nix +++ b/pkgs/by-name/po/pocket-casts/package.nix @@ -10,21 +10,23 @@ buildNpmPackage rec { pname = "pocket-casts"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "felicianotech"; repo = "pocket-casts-desktop-app"; rev = "v${version}"; - hash = "sha256-PwM9B2Qx4TxlcahQM/KEBTzWKc4cNrleDEYKg0m8bVE="; + hash = "sha256-5xn2uAjqIyWKQAruHLyho72HCYpbxyWlcTQ3LXXZy6M="; }; - npmDepsHash = "sha256-WPuXTcHCKrwepITGtZFCIwylVAdYlI3cNsuhqx1AEYI="; + npmDepsHash = "sha256-nfTn2rs0XGraebI0rKlTECccc7KpRXf/+qOjj/5GPAw="; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; dontNpmBuild = true; + makeCacheWritable = true; + desktopItems = [ (makeDesktopItem { name = pname; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68b022b96e8f..18922e8f35f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2538,7 +2538,7 @@ with pkgs; patool = with python3Packages; toPythonApplication patool; pocket-casts = callPackage ../by-name/po/pocket-casts/package.nix { - electron = electron_32; + electron = electron_33; }; pueue = darwin.apple_sdk_11_0.callPackage ../applications/misc/pueue { From 10274ff528a3de5ecea67a340093ae88945c900a Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Tue, 14 Jan 2025 20:00:44 +0100 Subject: [PATCH 0040/2168] sonic-lineup: fix strictDeps build --- pkgs/applications/audio/sonic-lineup/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/audio/sonic-lineup/default.nix b/pkgs/applications/audio/sonic-lineup/default.nix index e464c4a00f46..6d41c1cb7abb 100644 --- a/pkgs/applications/audio/sonic-lineup/default.nix +++ b/pkgs/applications/audio/sonic-lineup/default.nix @@ -72,10 +72,13 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ + capnproto # capnp pkg-config wrapQtAppsHook ]; + strictDeps = true; + enableParallelBuilding = true; # comment out the tests From e1cadf8259db663093e8efb9b1ce93f0d3f4f5ec Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Tue, 14 Jan 2025 20:00:44 +0100 Subject: [PATCH 0041/2168] perlPackages.GraphicsTIFF: fix strictDeps build --- pkgs/top-level/perl-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7162c0d4a942..636f2d8f81da 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11127,6 +11127,7 @@ with self; { url = "mirror://cpan/authors/id/R/RA/RATCLIFFE/Graphics-TIFF-20.tar.gz"; hash = "sha256-PlXMIJRl4GQBmiFaUvBf9RBAKX0CA5P+n7PeJ60CDjU="; }; + nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ pkgs.libtiff ExtUtilsDepends ExtUtilsPkgConfig ]; propagatedBuildInputs = [ Readonly ]; nativeCheckInputs = [ TestRequires TestDeep pkgs.hexdump ]; From 51f6a82f6d50208f3c1f53028338536fc7962c2e Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Tue, 14 Jan 2025 20:00:44 +0100 Subject: [PATCH 0042/2168] libcryptui: fix strictDeps build --- pkgs/development/libraries/libcryptui/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/libcryptui/default.nix b/pkgs/development/libraries/libcryptui/default.nix index ab3f1bff6b81..a019b9437ec8 100644 --- a/pkgs/development/libraries/libcryptui/default.nix +++ b/pkgs/development/libraries/libcryptui/default.nix @@ -31,6 +31,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config + dbus-glib # dbus-binding-tool + gtk3 # AM_GLIB_GNU_GETTEXT intltool autoreconfHook ]; @@ -44,6 +46,9 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ dbus-glib ]; + env.GNUPG = lib.getExe gnupg; + env.GPGME_CONFIG = lib.getExe' (lib.getDev gpgme) "gpgme-config"; + enableParallelBuilding = true; passthru = { @@ -59,5 +64,8 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/libcryptui"; license = licenses.lgpl21Plus; platforms = platforms.unix; + # ImportError: lib/gobject-introspection/giscanner/_giscanner.cpython-312-x86_64-linux-gnu.so + # cannot open shared object file: No such file or directory + broken = stdenv.buildPlatform != stdenv.hostPlatform; }; } From ffd16f7647dd7a7fda56106e05bc2b42d4eea0f6 Mon Sep 17 00:00:00 2001 From: bstanderline <153822813+bstanderline@users.noreply.github.com> Date: Wed, 15 Jan 2025 15:06:58 +0000 Subject: [PATCH 0043/2168] zabbix70: 7.0.7 -> 7.0.8 --- pkgs/servers/monitoring/zabbix/versions.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index 3d4f6d1fa7e3..8b6197ee6755 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -1,7 +1,7 @@ generic: { v70 = generic { - version = "7.0.7"; - hash = "sha256-GZv0OAXCkiVl1yhhFuH1fv/qormFwa/IK/urHmp1RIM="; + version = "7.0.8"; + hash = "sha256-VYfyJ/ASjQgG5VyWWB9iNNanG+3v2pCZFkwLXyWmdYI="; vendorHash = null; }; v64 = generic { From e96980a1ee8d8f276acfbd5b6b66d50557dc1991 Mon Sep 17 00:00:00 2001 From: anna Date: Wed, 15 Jan 2025 16:58:15 -0600 Subject: [PATCH 0044/2168] inconsolata: install variable font --- pkgs/by-name/in/inconsolata/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/in/inconsolata/package.nix b/pkgs/by-name/in/inconsolata/package.nix index a2493ed2d227..02968d0ce9b8 100644 --- a/pkgs/by-name/in/inconsolata/package.nix +++ b/pkgs/by-name/in/inconsolata/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { }; installPhase = '' - install -m644 --target $out/share/fonts/truetype/inconsolata -D $src/ofl/inconsolata/static/*.ttf + install -m644 --target $out/share/fonts/truetype/inconsolata -D $src/ofl/inconsolata/static/*.ttf $src/ofl/inconsolata/*.ttf ''; meta = with lib; { From 9d321ab3f82e52b3d5b3f4b4d380ea47b5184575 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Wed, 15 Jan 2025 19:00:57 -0500 Subject: [PATCH 0045/2168] firefox: Remove unused makeBinaryWrapper argument --- pkgs/applications/networking/browsers/firefox/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 9679e5d039c7..4790768ab399 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, makeDesktopItem, makeWrapper, makeBinaryWrapper, lndir, config +{ stdenv, lib, makeDesktopItem, makeWrapper, lndir, config , buildPackages , jq, xdg-utils, writeText From 4545eb3e01b7d9448a4c8bb24cfb85daf4f384da Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Wed, 15 Jan 2025 19:05:43 -0500 Subject: [PATCH 0046/2168] firefox: Remove obsolete native host configurations Warnings were generated since 23.11. It's probably time to clean up. --- .../networking/browsers/firefox/wrapper.nix | 28 ++----------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 4790768ab399..48f829e340ae 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -5,10 +5,7 @@ ## various stuff that can be plugged in , ffmpeg, xorg, alsa-lib, libpulseaudio, libcanberra-gtk3, libglvnd, libnotify, opensc , adwaita-icon-theme -, browserpass, gnome-browser-connector, uget-integrator, plasma5Packages, bukubrow, pipewire -, tridactyl-native -, fx-cast-bridge -, keepassxc +, pipewire , udev , libkrb5 , libva @@ -36,7 +33,6 @@ let , icon ? applicationName , wmClass ? applicationName , nativeMessagingHosts ? [] - , extraNativeMessagingHosts ? [] , pkcs11Modules ? [] , useGlvnd ? true , cfg ? config.${applicationName} or {} @@ -65,27 +61,7 @@ let # PCSC-Lite daemon (services.pcscd) also must be enabled for firefox to access smartcards smartcardSupport = cfg.smartcardSupport or false; - deprecatedNativeMessagingHost = option: pkg: - if (cfg.${option} or false) - then - lib.warn "The cfg.${option} argument for `firefox.override` is deprecated, please add `pkgs.${pkg.pname}` to `nativeMessagingHosts` instead" - [pkg] - else []; - - allNativeMessagingHosts = builtins.map lib.getBin ( - nativeMessagingHosts - ++ deprecatedNativeMessagingHost "enableBrowserpass" browserpass - ++ deprecatedNativeMessagingHost "enableBukubrow" bukubrow - ++ deprecatedNativeMessagingHost "enableTridactylNative" tridactyl-native - ++ deprecatedNativeMessagingHost "enableGnomeExtensions" gnome-browser-connector - ++ deprecatedNativeMessagingHost "enableUgetIntegrator" uget-integrator - ++ deprecatedNativeMessagingHost "enablePlasmaBrowserIntegration" plasma5Packages.plasma-browser-integration - ++ deprecatedNativeMessagingHost "enableFXCastBridge" fx-cast-bridge - ++ deprecatedNativeMessagingHost "enableKeePassXC" keepassxc - ++ (if extraNativeMessagingHosts != [] - then lib.warn "The extraNativeMessagingHosts argument for the Firefox wrapper is deprecated, please use `nativeMessagingHosts`" extraNativeMessagingHosts - else []) - ); + allNativeMessagingHosts = builtins.map lib.getBin nativeMessagingHosts; libs = lib.optionals stdenv.hostPlatform.isLinux ( [ udev libva libgbm libnotify xorg.libXScrnSaver cups pciutils vulkan-loader ] From 990e7a5fa219dc4fdae74cd23c7043722736e33e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 Jan 2025 03:42:49 +0000 Subject: [PATCH 0047/2168] pachyderm: 2.11.6 -> 2.12.2 --- pkgs/by-name/pa/pachyderm/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pa/pachyderm/package.nix b/pkgs/by-name/pa/pachyderm/package.nix index 1366fdc179d3..bb9fe0ac5c56 100644 --- a/pkgs/by-name/pa/pachyderm/package.nix +++ b/pkgs/by-name/pa/pachyderm/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "pachyderm"; - version = "2.11.6"; + version = "2.12.2"; src = fetchFromGitHub { owner = "pachyderm"; repo = "pachyderm"; rev = "v${version}"; - hash = "sha256-un9O8RdqNs2Lxsp/VAHJZsKAMJALYRbQiW0Zc+eZ4KM="; + hash = "sha256-S3om62ibp/hbpoY6seJ7RaRQeAzDNsThqfGDFC0SEQM="; }; - vendorHash = "sha256-8TQz4lSAUOMo479qnbS3uyL/xscxHuuHUt2j+5G09+w="; + vendorHash = "sha256-+4vegNCaDWaGwhEyk5msCuydC5IvQuGEatc1U1CZRjc="; subPackages = [ "src/server/cmd/pachctl" ]; From 879813b5ede6c54f281819e02f07e1e0aac94a37 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Jan 2025 02:01:23 +0000 Subject: [PATCH 0048/2168] grafana-dash-n-grab: 0.7.1 -> 0.7.2 --- pkgs/by-name/gr/grafana-dash-n-grab/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gr/grafana-dash-n-grab/package.nix b/pkgs/by-name/gr/grafana-dash-n-grab/package.nix index a7a2c108a56f..cd40c8407763 100644 --- a/pkgs/by-name/gr/grafana-dash-n-grab/package.nix +++ b/pkgs/by-name/gr/grafana-dash-n-grab/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "grafana-dash-n-grab"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "esnet"; repo = "gdg"; - sha256 = "sha256-oJ0wXBfanpYS95ET+7lpKzLdQG5g/uKFs5+Qd+hPjHo="; + sha256 = "sha256-0F4kdyQ4TXV2vb2IkPx7CisTmJAQjlSRtOAFhmZqaD8="; }; - vendorHash = "sha256-jnPnWcow5SiFHGfoAxBR8ncGHLyS7sFKNJT8YuUTg88="; + vendorHash = "sha256-Ufg4eeSLRHFkI577hPT5KWOf82o7//Y3n5GAlZl8IoQ="; ldflags = [ "-s" From 9a903fd7b09487d0552457665b94b95ffb1da862 Mon Sep 17 00:00:00 2001 From: Emily Trau Date: Fri, 17 Jan 2025 13:16:36 +1100 Subject: [PATCH 0049/2168] xxgdb: fix build failure --- pkgs/by-name/xx/xxgdb/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/xx/xxgdb/package.nix b/pkgs/by-name/xx/xxgdb/package.nix index 3eac7f58c30e..1942e11a88e2 100644 --- a/pkgs/by-name/xx/xxgdb/package.nix +++ b/pkgs/by-name/xx/xxgdb/package.nix @@ -11,12 +11,12 @@ libXt, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xxgdb"; version = "1.12"; src = fetchurl { - url = "http://deb.debian.org/debian/pool/main/x/xxgdb/xxgdb_${version}.orig.tar.gz"; + url = "http://deb.debian.org/debian/pool/main/x/xxgdb/xxgdb_${finalAttrs.version}.orig.tar.gz"; sha256 = "0jwazg99wk2l7r390ggw0yr8xipl07bp0qynni141xss530i6d1a"; }; @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { ./xxgdb-pty.patch ]; + env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration -Wno-error=implicit-int"; + nativeBuildInputs = [ imake gccmakedep @@ -62,4 +64,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ emilytrau ]; platforms = platforms.all; }; -} +}) From c0d940b21b1aa7e466a86c17d0ba23b56baae6ed Mon Sep 17 00:00:00 2001 From: linsui <36977733+linsui@users.noreply.github.com> Date: Sun, 17 Nov 2024 22:26:06 +0800 Subject: [PATCH 0050/2168] opendht: 3.2.0 -> 3.2.0-unstable-2025-01-05 --- pkgs/development/libraries/opendht/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index e7408ba37e67..42cd4744db02 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -12,22 +12,22 @@ , libargon2 , jsoncpp , restinio -, http-parser +, llhttp , openssl , fmt , enableProxyServerAndClient ? false , enablePushNotifications ? false }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "opendht"; - version = "3.2.0"; + version = "3.2.0-unstable-2025-01-05"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; - rev = "v${version}"; - hash = "sha256-s172Sj1EvV7Lmnmd+xyKmYF2cDEa8Bot10ovggEsOFg="; + rev = "5237f0a3b3eb8965f294de706ad73596569ae1dd"; + hash = "sha256-qErVKyZQR/asJ8qr0sRDaXZ8jUV7RaSLnJka5baWa7Q="; }; nativeBuildInputs = [ @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals enableProxyServerAndClient [ jsoncpp restinio - http-parser + llhttp openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security From d41c444e5b409738e133454ec56cf3e6fde4ffdd Mon Sep 17 00:00:00 2001 From: linsui <36977733+linsui@users.noreply.github.com> Date: Fri, 17 Jan 2025 15:42:40 +0800 Subject: [PATCH 0051/2168] opendht: format --- .../development/libraries/opendht/default.nix | 101 ++++++++++-------- 1 file changed, 58 insertions(+), 43 deletions(-) diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index 42cd4744db02..39478e3e92b2 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -1,22 +1,23 @@ -{ lib -, stdenv -, fetchFromGitHub -, Security -, cmake -, pkg-config -, asio -, nettle -, gnutls -, msgpack-cxx -, readline -, libargon2 -, jsoncpp -, restinio -, llhttp -, openssl -, fmt -, enableProxyServerAndClient ? false -, enablePushNotifications ? false +{ + lib, + stdenv, + fetchFromGitHub, + Security, + cmake, + pkg-config, + asio, + nettle, + gnutls, + msgpack-cxx, + readline, + libargon2, + jsoncpp, + restinio, + llhttp, + openssl, + fmt, + enableProxyServerAndClient ? false, + enablePushNotifications ? false, }: stdenv.mkDerivation { @@ -35,29 +36,34 @@ stdenv.mkDerivation { pkg-config ]; - buildInputs = [ - asio - fmt - nettle - gnutls - msgpack-cxx - readline - libargon2 - ] ++ lib.optionals enableProxyServerAndClient [ - jsoncpp - restinio - llhttp - openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - ]; + buildInputs = + [ + asio + fmt + nettle + gnutls + msgpack-cxx + readline + libargon2 + ] + ++ lib.optionals enableProxyServerAndClient [ + jsoncpp + restinio + llhttp + openssl + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + Security + ]; - cmakeFlags = lib.optionals enableProxyServerAndClient [ - "-DOPENDHT_PROXY_SERVER=ON" - "-DOPENDHT_PROXY_CLIENT=ON" - ] ++ lib.optionals enablePushNotifications [ - "-DOPENDHT_PUSH_NOTIFICATIONS=ON" - ]; + cmakeFlags = + lib.optionals enableProxyServerAndClient [ + "-DOPENDHT_PROXY_SERVER=ON" + "-DOPENDHT_PROXY_CLIENT=ON" + ] + ++ lib.optionals enablePushNotifications [ + "-DOPENDHT_PUSH_NOTIFICATIONS=ON" + ]; # https://github.com/savoirfairelinux/opendht/issues/612 postPatch = '' @@ -66,13 +72,22 @@ stdenv.mkDerivation { --replace '\$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} ''; - outputs = [ "out" "lib" "dev" "man" ]; + outputs = [ + "out" + "lib" + "dev" + "man" + ]; meta = with lib; { description = "C++11 Kademlia distributed hash table implementation"; homepage = "https://github.com/savoirfairelinux/opendht"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ taeer olynch thoughtpolice ]; + maintainers = with maintainers; [ + taeer + olynch + thoughtpolice + ]; platforms = platforms.unix; }; } From 9bd20c90a7c150e1909872dfd8e5922902c1d6dc Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 12 Jan 2025 14:28:33 +0200 Subject: [PATCH 0052/2168] tzupdate: be resilient to network issues tzupdate experiences --- nixos/modules/services/misc/tzupdate.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/misc/tzupdate.nix b/nixos/modules/services/misc/tzupdate.nix index 188ef95e185d..d100e620337b 100644 --- a/nixos/modules/services/misc/tzupdate.nix +++ b/nixos/modules/services/misc/tzupdate.nix @@ -28,6 +28,7 @@ in { wants = [ "network-online.target" ]; after = [ "network-online.target" ]; script = '' + set -uo pipefail timedatectl set-timezone "$(${lib.getExe pkgs.tzupdate} --print-only)" ''; From aff75d6ae09c95b5e3f3e15b484e61ebdb1626f1 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 18 Jan 2025 12:04:52 +0100 Subject: [PATCH 0053/2168] pam_u2f: 1.3.1 -> 1.3.2 https://github.com/Yubico/pam-u2f/blob/pam_u2f-1.3.2/NEWS --- pkgs/by-name/pa/pam_u2f/package.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pa/pam_u2f/package.nix b/pkgs/by-name/pa/pam_u2f/package.nix index a3606d871278..f3cf5168e67a 100644 --- a/pkgs/by-name/pa/pam_u2f/package.nix +++ b/pkgs/by-name/pa/pam_u2f/package.nix @@ -6,15 +6,16 @@ libfido2, pam, openssl, + nixosTests, }: stdenv.mkDerivation rec { pname = "pam_u2f"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { url = "https://developers.yubico.com/pam-u2f/Releases/${pname}-${version}.tar.gz"; - hash = "sha256-mhNUmUf4RPazq2kdca+09vAKRdFl/tJ7AcZsB3UKk4c="; + hash = "sha256-OL59GJcnHLP+45HSODs1r8EmrUMakanebpkQjBLMlJA="; }; nativeBuildInputs = [ pkg-config ]; @@ -36,6 +37,10 @@ stdenv.mkDerivation rec { EOF ''; + passthru.tests = { + pam_u2f = nixosTests.pam-u2f; + }; + meta = with lib; { homepage = "https://developers.yubico.com/pam-u2f/"; description = "PAM module for allowing authentication with a U2F device"; From fdf0d3c72eadcfefc3cf92e5ca2f54e1fda32c06 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 18 Jan 2025 22:53:41 +0000 Subject: [PATCH 0054/2168] redict.tests: fix the eval Without the change the test fails to eval as it does not exits: $ nix build --no-link -f. redict.tests.redict error: attribute 'redict' missing at pkgs/by-name/re/redict/package.nix:83:27: 82| 83| passthru.tests.redict = nixosTests.redict; | ^ 84| Did you mean redis? --- pkgs/by-name/re/redict/package.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/by-name/re/redict/package.nix b/pkgs/by-name/re/redict/package.nix index 5cc3d0f42615..cbda55fa8b01 100644 --- a/pkgs/by-name/re/redict/package.nix +++ b/pkgs/by-name/re/redict/package.nix @@ -6,7 +6,6 @@ lua, jemalloc, pkg-config, - nixosTests, tcl, which, ps, @@ -104,8 +103,6 @@ stdenv.mkDerivation (finalAttrs: { runHook postCheck ''; - passthru.tests.redict = nixosTests.redict; - meta = { homepage = "https://redict.io"; description = "Distributed key/value store"; From f6b4f8810fc98f5fc5e9f8d883ed95d5f51a3dbd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Jan 2025 03:38:44 +0000 Subject: [PATCH 0055/2168] google-alloydb-auth-proxy: 1.12.0 -> 1.12.1 --- pkgs/by-name/go/google-alloydb-auth-proxy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix b/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix index 37fa2e16a675..13c822cd88e2 100644 --- a/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix +++ b/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix @@ -7,18 +7,18 @@ buildGoModule rec { pname = "google-alloydb-auth-proxy"; - version = "1.12.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "alloydb-auth-proxy"; tag = "v${version}"; - hash = "sha256-Z1sTArR6usEkoI/Dp5FUXhjsPeDHVG88GaSbrb9KaaA="; + hash = "sha256-FnYVkZxdWFxY0aIUbHTSDLJ+AgYE2L03vNya1K2e3SI="; }; subPackages = [ "." ]; - vendorHash = "sha256-jEs1oI4Ka87vbFbxt7cLm042wO2Rl5NaISmHBrCHZGw="; + vendorHash = "sha256-0VksnkdN7E6VEzzxSIc6AfOvxlPm67vEj+HVR6N+BqA="; checkFlags = [ "-short" From 5cdba8c37ce6e83f7d98e10f5dbb7841d947354b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Jan 2025 18:06:22 +0000 Subject: [PATCH 0056/2168] pmbootstrap: 3.1.0 -> 3.2.0 --- pkgs/by-name/pm/pmbootstrap/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pm/pmbootstrap/package.nix b/pkgs/by-name/pm/pmbootstrap/package.nix index 35f1299c39ba..7a9ed331c49c 100644 --- a/pkgs/by-name/pm/pmbootstrap/package.nix +++ b/pkgs/by-name/pm/pmbootstrap/package.nix @@ -15,14 +15,14 @@ python3Packages.buildPythonApplication rec { pname = "pmbootstrap"; - version = "3.1.0"; + version = "3.2.0"; pyproject = true; src = fetchFromGitLab { owner = "postmarketOS"; repo = pname; tag = version; - hash = "sha256-ijXyX+VJqiS0z5IOXGjeL2SGZ/4ledhnq/Zr1ZLW/Io="; + hash = "sha256-iJ3XK1aA3d0V5ATj2h6arHlTRKocmJ1AaySiq9bSJrs="; domain = "gitlab.postmarketos.org"; }; From b370e7f14a0b865a99e4a45578c0a1f0f3926177 Mon Sep 17 00:00:00 2001 From: Tiago Dinis Date: Mon, 20 Jan 2025 11:53:47 +0000 Subject: [PATCH 0057/2168] pkgs/build-support/php/builders/v2: copy installer-paths to the output CMSes like Drupal or Wordpress use "extra.installer-paths" property to redirect certain packages to certain folders, which means only copying the vendor folder is not enough, we have to copy all dependencies in the installer-paths. Fixes #373626 pkgs/build-support/php/builders/v2: check if installer-paths exists before copying pkgs/build-support/php/builders/v2: strip out the git repositories --- .../builders/v2/hooks/composer-vendor-hook.sh | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh b/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh index 29bc95909d6f..d978c2800f40 100644 --- a/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh +++ b/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh @@ -96,9 +96,23 @@ composerVendorInstallHook() { mkdir -p $out cp -ar composer.json $(composer config vendor-dir) $out/ + mapfile -t installer_paths < <(jq -r 'try((.extra."installer-paths") | keys[])' composer.json) + + for installer_path in "${installer_paths[@]}"; do + # Remove everything after {$name} placeholder + installer_path="${installer_path/\{\$name\}*/}"; + out_installer_path="$out/${installer_path/\{\$name\}*/}"; + # Copy the installer path if it exists + if [[ -d "$installer_path" ]]; then + mkdir -p $(dirname "$out_installer_path") + cp -ar "$installer_path" "$out_installer_path" + # Strip out the git repositories + find $out_installer_path -name .git -type d -prune -print -exec rm -rf {} ";" + fi + done if [[ -f "composer.lock" ]]; then - cp -ar composer.lock $(composer config vendor-dir) $out/ + cp -ar composer.lock $out/ fi echo "Finished composerVendorInstallHook" From 6f416e8c9cf88cc097224f6388d297088310bb43 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 Jan 2025 07:37:16 +0000 Subject: [PATCH 0058/2168] ibus-engines.m17n: 1.4.34 -> 1.4.35 --- pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix index 04624b495eac..1f8f443adc22 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "ibus-m17n"; - version = "1.4.34"; + version = "1.4.35"; src = fetchFromGitHub { owner = "ibus"; repo = "ibus-m17n"; rev = version; - sha256 = "sha256-Dwnrpsk8cx51b702SXCEwfGGk4bZ8w4EPcfWpKd5RDI="; + sha256 = "sha256-+pNECooSLFqTRkijJiU4a3NpTnDNL9qzhkMp6gSq4XY="; }; nativeBuildInputs = [ From ca643b41490c2faf1a5b33a7d48f422f1d797e62 Mon Sep 17 00:00:00 2001 From: XYenon Date: Tue, 21 Jan 2025 15:20:24 +0800 Subject: [PATCH 0059/2168] bpftune: add update script --- pkgs/by-name/bp/bpftune/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bp/bpftune/package.nix b/pkgs/by-name/bp/bpftune/package.nix index 30a9a9bc5e96..b06f5785fd2f 100644 --- a/pkgs/by-name/bp/bpftune/package.nix +++ b/pkgs/by-name/bp/bpftune/package.nix @@ -9,6 +9,7 @@ libcap, libnl, nixosTests, + unstableGitUpdater, }: stdenv.mkDerivation rec { @@ -59,8 +60,11 @@ stdenv.mkDerivation rec { "zerocallusedregs" ]; - passthru.tests = { - inherit (nixosTests) bpftune; + passthru = { + tests = { + inherit (nixosTests) bpftune; + }; + updateScript = unstableGitUpdater { }; }; enableParallelBuilding = true; From 842fe953f01eca82071fa0a7a23aa5f049f21832 Mon Sep 17 00:00:00 2001 From: XYenon Date: Tue, 21 Jan 2025 07:32:25 +0000 Subject: [PATCH 0060/2168] bpftune: 0-unstable-2024-10-25 -> 0-unstable-2025-01-17 --- pkgs/by-name/bp/bpftune/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bp/bpftune/package.nix b/pkgs/by-name/bp/bpftune/package.nix index b06f5785fd2f..d89f392807fc 100644 --- a/pkgs/by-name/bp/bpftune/package.nix +++ b/pkgs/by-name/bp/bpftune/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "bpftune"; - version = "0-unstable-2024-10-25"; + version = "0-unstable-2025-01-17"; src = fetchFromGitHub { owner = "oracle"; repo = "bpftune"; - rev = "6a50f5ff619caeea6f04d889e3a60de6c12feb76"; - hash = "sha256-yol6VFelqQiPKLg1UUeP+r/+XO4fjYeDbIeI29gZ7j4="; + rev = "3c6ce4fc0c963610b7bada0ad6bac31c43eaab2e"; + hash = "sha256-0f9cbJgZqGlatMSCKjNsT1NniyrteRANHR1Fj8o4J0c="; }; postPatch = '' From 30db3141525d551b80611fc8f908c87ec85e4c86 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Tue, 21 Jan 2025 13:26:26 +0100 Subject: [PATCH 0061/2168] swayimg: 3.6 -> 3.8 --- pkgs/by-name/sw/swayimg/package.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sw/swayimg/package.nix b/pkgs/by-name/sw/swayimg/package.nix index 95eacdfec9a6..ecff75270285 100644 --- a/pkgs/by-name/sw/swayimg/package.nix +++ b/pkgs/by-name/sw/swayimg/package.nix @@ -21,20 +21,22 @@ libjxl, libexif, libavif, + libsixel, openexr_3, bash-completion, testers, nix-update-script, }: + stdenv.mkDerivation (finalAttrs: { pname = "swayimg"; - version = "3.6"; + version = "3.8"; src = fetchFromGitHub { owner = "artemsen"; repo = "swayimg"; tag = "v${finalAttrs.version}"; - hash = "sha256-DboalwPhQYcqptdQvLHN+zrrdU3Swzb6z3vO+GJY2JY="; + hash = "sha256-nPmVUJy5hlWk6Q+s6rRBEzlJvpDKLStKTRjLwj7iA/c="; }; strictDeps = true; @@ -71,6 +73,7 @@ stdenv.mkDerivation (finalAttrs: { libjxl libexif libavif + libsixel openexr_3 ]; From 497d17bffde144177b84e325ad7b3a07b6176de3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 Jan 2025 15:42:26 +0000 Subject: [PATCH 0062/2168] nextcloud-whiteboard-server: 1.0.4 -> 1.0.5 --- pkgs/by-name/ne/nextcloud-whiteboard-server/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ne/nextcloud-whiteboard-server/package.nix b/pkgs/by-name/ne/nextcloud-whiteboard-server/package.nix index e778332cee35..ae82effae616 100644 --- a/pkgs/by-name/ne/nextcloud-whiteboard-server/package.nix +++ b/pkgs/by-name/ne/nextcloud-whiteboard-server/package.nix @@ -8,16 +8,16 @@ }: buildNpmPackage rec { pname = "nextcloud-whiteboard-server"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "nextcloud"; repo = "whiteboard"; tag = "v${version}"; - hash = "sha256-27w8FZz9PbVdYV7yR5iRXi5edw7U/3bLVYfdRa8yPzo="; + hash = "sha256-WdaAMSID8MekVL6nA8YRWUiiI+pi1WgC0nN3dDAJHf8="; }; - npmDepsHash = "sha256-SwFQRDRo7Q8+0zYWx5szahJzDSoxkkJDPQ3qEdNLVaE="; + npmDepsHash = "sha256-T27oZdvITj9ZCEvd13fDZE3CS35XezgVmQ4iCeN75UA="; nativeBuildInputs = [ makeWrapper ]; From 2d67d1e7926e40e0503c9321d3cc777e2a30b514 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Sun, 5 Jan 2025 16:08:59 +0100 Subject: [PATCH 0063/2168] python312Packages.py2bit: 0.3.0 -> 0.3.3 --- .../python-modules/py2bit/default.nix | 29 +++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/py2bit/default.nix b/pkgs/development/python-modules/py2bit/default.nix index 96fbdeeb0ab5..d1bfd6f34d66 100644 --- a/pkgs/development/python-modules/py2bit/default.nix +++ b/pkgs/development/python-modules/py2bit/default.nix @@ -2,28 +2,39 @@ lib, buildPythonPackage, fetchPypi, - pytest, + pytestCheckHook, + setuptools, + setuptools-scm, }: buildPythonPackage rec { pname = "py2bit"; - version = "0.3.0"; - format = "setuptools"; - - checkInput = [ pytest ]; + version = "0.3.3"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "1vw2nvw1yrl7ikkqsqs1pg239yr5nspvd969r1x9arms1k25a1a5"; + hash = "sha256-Jk9b/DnXKfGsrVTHYKwE+oog1BhPS1BdnDM9LgMlN3A="; }; - meta = with lib; { + build-system = [ + setuptools + setuptools-scm + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ "py2bitTest/test.py" ]; + + meta = { homepage = "https://github.com/deeptools/py2bit"; description = "File access to 2bit files"; longDescription = '' A python extension, written in C, for quick access to 2bit files. The extension uses lib2bit for file access. ''; - license = licenses.mit; - maintainers = with maintainers; [ scalavision ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ scalavision ]; }; } From de25b6a94bbb593763d7be3b1ded151720addf2a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 Jan 2025 18:09:33 +0000 Subject: [PATCH 0064/2168] juju: 3.6.1 -> 3.6.2 --- pkgs/by-name/ju/juju/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ju/juju/package.nix b/pkgs/by-name/ju/juju/package.nix index e54327fee545..9394c7823218 100644 --- a/pkgs/by-name/ju/juju/package.nix +++ b/pkgs/by-name/ju/juju/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "juju"; - version = "3.6.1"; + version = "3.6.2"; src = fetchFromGitHub { owner = "juju"; repo = "juju"; rev = "v${version}"; - hash = "sha256-eq7C3F/OJWF/HWMO9I+yTlXeskO1xuTKGhmoNNGQcyM="; + hash = "sha256-qARy8c24VLE+Gmsszkvlwkh5Oo+sozoptjMIa4OiBfc="; }; - vendorHash = "sha256-+2MeUq+r0/2I8C/8IVZTxrKIZTS36P/9XHM2X41AZPE="; + vendorHash = "sha256-O7EGhy5bmTeUvlxpX0cv2kmeKDvPzilZxk0mTuyJCP8="; subPackages = [ "cmd/juju" From 8d9f9f04ecd57806f5a627bd85889057ea3d1f61 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 Jan 2025 21:36:47 +0000 Subject: [PATCH 0065/2168] httptoolkit: 1.19.0 -> 1.19.4 --- pkgs/by-name/ht/httptoolkit/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ht/httptoolkit/package.nix b/pkgs/by-name/ht/httptoolkit/package.nix index ba35c59ac8f0..6f954c2281fc 100644 --- a/pkgs/by-name/ht/httptoolkit/package.nix +++ b/pkgs/by-name/ht/httptoolkit/package.nix @@ -12,16 +12,16 @@ buildNpmPackage rec { pname = "httptoolkit"; - version = "1.19.0"; + version = "1.19.4"; src = fetchFromGitHub { owner = "httptoolkit"; repo = "httptoolkit-desktop"; tag = "v${version}"; - hash = "sha256-e+ngBZMwMTvwzY1K7IaxlNoRkZUPDdJvKxvxuCsc9pw="; + hash = "sha256-oDwAosyFY4ff9MP82O8q5o+mN/X6+J7hM3b7myfOq7k="; }; - npmDepsHash = "sha256-XgJIs4P1ezCEPPitIIfYpNkX0/3dPdajeIiDwHm7DSU="; + npmDepsHash = "sha256-4kREJgw7OjKkOF/J1HpD3uPn+awtQIfUGWqJctwq3N0="; env = { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; From c3f637d84cb68c037d0c7415361a3182cc7d25b6 Mon Sep 17 00:00:00 2001 From: atagen Date: Sun, 19 Jan 2025 10:14:47 +1100 Subject: [PATCH 0066/2168] unionfs-fuse: 2.2 -> 3.6 --- pkgs/by-name/un/unionfs-fuse/package.nix | 28 ++++++++++++++---------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/un/unionfs-fuse/package.nix b/pkgs/by-name/un/unionfs-fuse/package.nix index fe9b3ff7fd33..53d7b38bd377 100644 --- a/pkgs/by-name/un/unionfs-fuse/package.nix +++ b/pkgs/by-name/un/unionfs-fuse/package.nix @@ -3,18 +3,19 @@ stdenv, fetchFromGitHub, cmake, - fuse, + pkg-config, + fuse3, }: stdenv.mkDerivation rec { pname = "unionfs-fuse"; - version = "2.2"; + version = "3.6"; src = fetchFromGitHub { owner = "rpodgorny"; repo = "unionfs-fuse"; - rev = "v${version}"; - sha256 = "sha256-EJryML6E0CW4kvsqMRqV3cq77j50HuylNzgaHD6CL/o="; + tag = "v${version}"; + hash = "sha256-1Fy3evatfEplgJjAVeXgdq1CkGgIi+iZjsO0WBHmmBM="; }; patches = [ @@ -27,11 +28,14 @@ stdenv.mkDerivation rec { postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace CMakeLists.txt \ - --replace '/usr/local/include/osxfuse/fuse' '${lib.getDev fuse}/include/fuse' + --replace '/usr/local/include/osxfuse/fuse' '${lib.getDev fuse3}/include/fuse' ''; - nativeBuildInputs = [ cmake ]; - buildInputs = [ fuse ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; + buildInputs = [ fuse3 ]; # Put the unionfs mount helper in place as mount.unionfs-fuse. This makes it # possible to do: @@ -42,16 +46,16 @@ stdenv.mkDerivation rec { preConfigure = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' mkdir -p $out/sbin cp -a mount.unionfs $out/sbin/mount.unionfs-fuse - substituteInPlace $out/sbin/mount.unionfs-fuse --replace mount.fuse ${fuse}/sbin/mount.fuse + substituteInPlace $out/sbin/mount.unionfs-fuse --replace mount.fuse ${fuse3}/sbin/mount.fuse3 substituteInPlace $out/sbin/mount.unionfs-fuse --replace unionfs $out/bin/unionfs ''; - meta = with lib; { + meta = { broken = stdenv.hostPlatform.isDarwin; description = "FUSE UnionFS implementation"; homepage = "https://github.com/rpodgorny/unionfs-fuse"; - license = licenses.bsd3; - platforms = platforms.unix; - maintainers = with maintainers; [ orivej ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.orivej ]; }; } From f835a25c46a5c4d64e2e2dc25a63e4429bf93fe0 Mon Sep 17 00:00:00 2001 From: atagen Date: Sun, 19 Jan 2025 10:15:56 +1100 Subject: [PATCH 0067/2168] unionfs-fuse: add update script --- pkgs/by-name/un/unionfs-fuse/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/un/unionfs-fuse/package.nix b/pkgs/by-name/un/unionfs-fuse/package.nix index 53d7b38bd377..044d53d94784 100644 --- a/pkgs/by-name/un/unionfs-fuse/package.nix +++ b/pkgs/by-name/un/unionfs-fuse/package.nix @@ -1,4 +1,5 @@ { + nix-update-script, lib, stdenv, fetchFromGitHub, @@ -50,6 +51,8 @@ stdenv.mkDerivation rec { substituteInPlace $out/sbin/mount.unionfs-fuse --replace unionfs $out/bin/unionfs ''; + passthru.updateScript = nix-update-script { }; + meta = { broken = stdenv.hostPlatform.isDarwin; description = "FUSE UnionFS implementation"; From 07f172320af3bfcf6a574b0a1e3e80e0bce46c60 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Jan 2025 02:57:15 +0000 Subject: [PATCH 0068/2168] rke: 1.7.1 -> 1.7.2 --- pkgs/by-name/rk/rke/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/rk/rke/package.nix b/pkgs/by-name/rk/rke/package.nix index 3166db260785..d5d51e5315a2 100644 --- a/pkgs/by-name/rk/rke/package.nix +++ b/pkgs/by-name/rk/rke/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "rke"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "rancher"; repo = pname; rev = "v${version}"; - hash = "sha256-BatjRfUosYD5e3TNzgREuMeGSA2lknZMG3/y+0V2NkU="; + hash = "sha256-9b42F9czbck5BY3CwpIhpxw2QdXRU3o9/bGvEMUTis8="; }; vendorHash = "sha256-Lp14xvhn4xzOurTa8sRk0A1X1c/sj1clw7niVTRgNeM="; From 53f687f98be672edee65a33995ed074ad179dd76 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Jan 2025 03:13:32 +0000 Subject: [PATCH 0069/2168] verifast: 24.12 -> 25.01 --- pkgs/by-name/ve/verifast/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ve/verifast/package.nix b/pkgs/by-name/ve/verifast/package.nix index fbd625d58c25..307beb5be916 100644 --- a/pkgs/by-name/ve/verifast/package.nix +++ b/pkgs/by-name/ve/verifast/package.nix @@ -20,11 +20,11 @@ let in stdenv.mkDerivation rec { pname = "verifast"; - version = "24.12"; + version = "25.01"; src = fetchurl { url = "https://github.com/verifast/verifast/releases/download/${version}/${pname}-${version}-linux.tar.gz"; - sha256 = "sha256-Ub6/mQ8xZmq802dQAOdxTvebQXOQ6TCVPvJTg+jVlCE="; + sha256 = "sha256-d6xmlCTQffIFk3leXiL8pL+Z6i4yeFcAA9KCJ/4iFqw="; }; dontConfigure = true; From 776952dd888877b6991c251b846678664c48e9f7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Jan 2025 10:30:02 +0000 Subject: [PATCH 0070/2168] alfaview: 9.19.0 -> 9.20.0 --- pkgs/by-name/al/alfaview/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/al/alfaview/package.nix b/pkgs/by-name/al/alfaview/package.nix index 9c63d1c87b82..4321257ab1f0 100644 --- a/pkgs/by-name/al/alfaview/package.nix +++ b/pkgs/by-name/al/alfaview/package.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "alfaview"; - version = "9.19.0"; + version = "9.20.0"; src = fetchurl { url = "https://assets.alfaview.com/stable/linux/deb/${pname}_${version}.deb"; - hash = "sha256-o0sB+JLwemUNRflp8cR0exc5QvCkpxIAVd/g4vwix6Q="; + hash = "sha256-CnD75PTi5pfkS+F8a3sf+J3zz5Ro/8m2Z4GINTvQV6k="; }; nativeBuildInputs = [ From 9305c76f0611489e0fb894f0fd927ee8cd0e8c2e Mon Sep 17 00:00:00 2001 From: Jorik Date: Sat, 2 Nov 2024 15:11:57 +0100 Subject: [PATCH 0071/2168] python312Packages.textual-autocomplete: init at 3.0.0a13 --- .../textual-autocomplete/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/textual-autocomplete/default.nix diff --git a/pkgs/development/python-modules/textual-autocomplete/default.nix b/pkgs/development/python-modules/textual-autocomplete/default.nix new file mode 100644 index 000000000000..c609a33b77b0 --- /dev/null +++ b/pkgs/development/python-modules/textual-autocomplete/default.nix @@ -0,0 +1,45 @@ +{ + lib, + python3, + fetchFromGitHub, + poetry-core, + textual, + typing-extensions, + hatchling, +}: +python3.pkgs.buildPythonPackage rec { + pname = "textual_autocomplete"; + version = "3.0.0a13"; + pyproject = true; + + src = fetchFromGitHub { + owner = "darrenburns"; + repo = "textual-autocomplete"; + rev = "2cb572bf5b1ea0554b396d0833dfb398cb45dc9b"; + hash = "sha256-jfGYC3xDspwEr+KGApGB05VFuzluDe5S9a/Sjg5HtdI="; + }; + + nativeBuildInputs = [ + poetry-core + hatchling + ]; + + pythonRelaxDeps = true; + + dependencies = [ + textual + typing-extensions + ]; + + pythonImportsCheck = [ + "textual" + "typing_extensions" + ]; + + meta = { + description = "Python library that provides autocomplete capabilities to textual"; + homepage = "https://pypi.org/project/textual-autocomplete"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jorikvanveen ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 481a660c4f47..7c7142b4d791 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16005,6 +16005,8 @@ self: super: with self; { textual = callPackage ../development/python-modules/textual { }; + textual-autocomplete = callPackage ../development/python-modules/textual-autocomplete { }; + textual-dev = callPackage ../development/python-modules/textual-dev { }; textual-fastdatatable = callPackage ../development/python-modules/textual-fastdatatable { }; From 7d9ee07cabf514b27b8ffef98e90542a25cbd2c2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Jan 2025 11:24:21 +0000 Subject: [PATCH 0072/2168] flannel: 0.26.2 -> 0.26.3 --- pkgs/tools/networking/flannel/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix index 26afb10b0977..13e173acee44 100644 --- a/pkgs/tools/networking/flannel/default.nix +++ b/pkgs/tools/networking/flannel/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "flannel"; - version = "0.26.2"; + version = "0.26.3"; rev = "v${version}"; - vendorHash = "sha256-UHlt7YC7bNAfKMiejme36HmtxDTRK7OgQR4r+ItOr+Q="; + vendorHash = "sha256-OTorRwkCl4CQUDHNxr1A4XmSmPvZij4OqPpg+mPRe68="; src = fetchFromGitHub { inherit rev; owner = "flannel-io"; repo = "flannel"; - sha256 = "sha256-KfOukCDRGx/lx/UU2nxNOcrzEqaScKQB0ctANURc53k="; + sha256 = "sha256-YsrWZpCE79jmJRkpGTuB5D8kw4HEjXG4WzqR3IkRzQU="; }; ldflags = [ "-X github.com/flannel-io/flannel/pkg/version.Version=${rev}" ]; From 82a9574d100a132cef784036833a302b82cd59d5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Jan 2025 12:56:22 +0000 Subject: [PATCH 0073/2168] bee: 2.3.2 -> 2.4.0 --- pkgs/by-name/be/bee/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/be/bee/package.nix b/pkgs/by-name/be/bee/package.nix index 9799b0ed79ca..2f731ffbd521 100644 --- a/pkgs/by-name/be/bee/package.nix +++ b/pkgs/by-name/be/bee/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "bee"; - version = "2.3.2"; + version = "2.4.0"; src = fetchFromGitHub { owner = "ethersphere"; repo = "bee"; rev = "v${version}"; - hash = "sha256-/fyonUp8LxZrnvIk06DnacHlKgSLjIjirGr7MEVU9nc="; + hash = "sha256-03di/XgvUoc25b1jKxb64bAX21MTP/5M3kefUB+NbiY="; }; vendorHash = "sha256-kxfdreEGRY9NHxpGwgvdeYBg0m+itEhy7ih1JSD2E44="; From 930016505abdf85cf36f333909392831d80cd321 Mon Sep 17 00:00:00 2001 From: Ole Mussmann Date: Mon, 20 Jan 2025 22:22:42 +0100 Subject: [PATCH 0074/2168] maintainers: add olemussmann --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8aea451f3a0a..aca952fdffe1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -17043,6 +17043,12 @@ githubId = 72201; name = "Ole Jørgen Brønner"; }; + olemussmann = { + email = "nixpkgs-account@ole.mn"; + github = "OleMussmann"; + githubId = 14004859; + name = "Ole Mussmann"; + }; olifloof = { email = "benmoreosm@gmail.com"; github = "olifloof"; From 8d1ab45e5bf88d2d1c0a4df892f9d3ee5b017114 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Jan 2025 18:03:04 +0000 Subject: [PATCH 0075/2168] ricochet-refresh: 3.0.25 -> 3.0.30 --- pkgs/by-name/ri/ricochet-refresh/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ri/ricochet-refresh/package.nix b/pkgs/by-name/ri/ricochet-refresh/package.nix index 2817ca6a427a..b9cd6738f708 100644 --- a/pkgs/by-name/ri/ricochet-refresh/package.nix +++ b/pkgs/by-name/ri/ricochet-refresh/package.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "ricochet-refresh"; - version = "3.0.25"; + version = "3.0.30"; src = fetchFromGitHub { owner = "blueprint-freespeech"; repo = "ricochet-refresh"; rev = "v${finalAttrs.version}-release"; fetchSubmodules = true; - hash = "sha256-MXbsNrF3y2DimXUuf6XbqqCxcNsTGfNHSAMstdX1MoU="; + hash = "sha256-8KYjK3pW6xVTGPtHW0SkIpVqKokF2S748xtuI0zfp0E="; }; sourceRoot = "${finalAttrs.src.name}/src"; From c1dd20073671a9a9d4441a927efd9253052df944 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Jan 2025 02:31:18 +0000 Subject: [PATCH 0076/2168] kics: 2.1.3 -> 2.1.4 --- pkgs/by-name/ki/kics/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ki/kics/package.nix b/pkgs/by-name/ki/kics/package.nix index d0724825c538..188479698c71 100644 --- a/pkgs/by-name/ki/kics/package.nix +++ b/pkgs/by-name/ki/kics/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "kics"; - version = "2.1.3"; + version = "2.1.4"; src = fetchFromGitHub { owner = "Checkmarx"; repo = "kics"; tag = "v${version}"; - hash = "sha256-/trhDDY2jyN0o92fjy/ScEbYpcuBPPIaHx+wNW3cWA0="; + hash = "sha256-sjGPDDcAeHS2fC8NhIdew5yeJmDQfb9A15LxmvxoHK0="; }; - vendorHash = "sha256-coX8BenRrGijErDNheD9+vZLOKzMXkcwhIa3BuxrOCM="; + vendorHash = "sha256-gDppOwWOn8CoVTBsTdHIc6yGcqO379ijV5YccRIuMfs="; subPackages = [ "cmd/console" ]; From 28055501b3896ddce0de69c7ccd8858d16921f00 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Jan 2025 02:42:32 +0000 Subject: [PATCH 0077/2168] pdpmake: 2.0.1 -> 2.0.3 --- pkgs/by-name/pd/pdpmake/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pd/pdpmake/package.nix b/pkgs/by-name/pd/pdpmake/package.nix index 58e391d071c9..59f7ecc23e48 100644 --- a/pkgs/by-name/pd/pdpmake/package.nix +++ b/pkgs/by-name/pd/pdpmake/package.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation rec { pname = "pdpmake"; - version = "2.0.1"; + version = "2.0.3"; src = fetchFromGitHub { owner = "rmyorston"; repo = "pdpmake"; rev = version; - hash = "sha256-E9AcWwMfPp2sn4k/gv2gjBuqQ6k8J0TSfncMKuXh/Cc="; + hash = "sha256-6lLYtBKZTmi+fBkCyDysJS1O37/Z6ir9hU3pX4X1VHQ="; }; makeFlags = [ "PREFIX=$(out)" ]; From c81bee5136d4ea2d1b5c1cbc3291022c809bd577 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Jan 2025 02:44:20 +0000 Subject: [PATCH 0078/2168] cozy-drive: 3.41.0 -> 3.42.0 --- pkgs/by-name/co/cozy-drive/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/cozy-drive/package.nix b/pkgs/by-name/co/cozy-drive/package.nix index 732356fdf543..78d40c796651 100644 --- a/pkgs/by-name/co/cozy-drive/package.nix +++ b/pkgs/by-name/co/cozy-drive/package.nix @@ -6,11 +6,11 @@ let pname = "cozydrive"; - version = "3.41.0"; + version = "3.42.0"; src = fetchurl { url = "https://github.com/cozy-labs/cozy-desktop/releases/download/v${version}/Cozy-Drive-${version}-x86_64.AppImage"; - sha256 = "sha256-cNjr6QpzugVSSS1QrL+KwU5V0KAcupezZZIIQuHBIC8="; + sha256 = "sha256-1MsRxLp+IZAoj9yqo5n0N1kfRYmYR2tjIjnlbRPrKH4="; }; appimageContents = appimageTools.extract { inherit pname version src; }; From a47dd7800d4c00fd4ee71e874d071ee5a0f99042 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Jan 2025 02:52:03 +0000 Subject: [PATCH 0079/2168] ecs-agent: 1.89.2 -> 1.89.3 --- pkgs/by-name/ec/ecs-agent/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ec/ecs-agent/package.nix b/pkgs/by-name/ec/ecs-agent/package.nix index 7e1763797c12..c25074aa7574 100644 --- a/pkgs/by-name/ec/ecs-agent/package.nix +++ b/pkgs/by-name/ec/ecs-agent/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "amazon-ecs-agent"; - version = "1.89.2"; + version = "1.89.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "aws"; repo = pname; - hash = "sha256-Uld8WSN36byx0eDHsdEGVdiV0LFIPomc2eChn1wYC9w="; + hash = "sha256-zhltYmhISAbxYL+oeJLoxd5OaFjAoTJHAJWuIaBPYZs="; }; vendorHash = null; From c370228401e61475b5dbf31d9403929cf22dbcf5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Jan 2025 03:42:25 +0000 Subject: [PATCH 0080/2168] protoc-gen-validate: 1.1.0 -> 1.2.1 --- pkgs/by-name/pr/protoc-gen-validate/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/protoc-gen-validate/package.nix b/pkgs/by-name/pr/protoc-gen-validate/package.nix index 2fedd5b4992f..ef920b6351ce 100644 --- a/pkgs/by-name/pr/protoc-gen-validate/package.nix +++ b/pkgs/by-name/pr/protoc-gen-validate/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "protoc-gen-validate"; - version = "1.1.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "bufbuild"; repo = "protoc-gen-validate"; rev = "v${version}"; - sha256 = "sha256-QY7MqggMNYq6x1VkkWVGN07VZgkexe7mGj/+6QvJiHs="; + sha256 = "sha256-kGnfR8o12bvjJH+grAwlYezF6UzWt7lgjGslq+07p3k="; }; - vendorHash = "sha256-DqM+Am7Pi0UTz7NxYOCMN9W3H6WipX4oRRa8ceMsYZ0="; + vendorHash = "sha256-c7zi1y3HWGyjE2xG60msCUdKCTkwhWit2x5gU/bLoec="; excludedPackages = [ "tests" ]; From 0f9034d8b5c5c26f42a6b036d171044d4b11fb5d Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 23 Jan 2025 08:27:29 +0100 Subject: [PATCH 0081/2168] lib: Discourage use of extend It creates interoperability issues that can not be reconciled by `lib` or maintainers of projects that use the Nixpkgs library. Occasionally, end users may be able to solve the problems they run into, but most are not prepared to deal with this set of problems, nor should they be. Typical conflict: - User wants to propagate their own lib, because it has some function they like to use throughout their projects - Project maintainer requires the project's lib to be used No sane language uses a single namespace for combining all the things. (Arguably not even C with its extensive use of prefixing) Meanwhile, in Nix, all symbols are first class variables. We don't even have the concept of a global top-level namespace to pour everything into. With `lib` you can try to approximate that, I get the appeal of its apparent simplicity, but since `lib` can't be global, we just don't even get that apparent simplicity. I apologize for not offering concrete solutions to this in the text. The manuals are limited to reference documentation. Alternatives - of which we have multiple - are best provided in task-oriented documentation, e.g. nix.dev. --- doc/module-system/module-system.chapter.md | 9 +++++++ flake.nix | 2 ++ lib/default.nix | 31 ++++++++++++++++++++-- 3 files changed, 40 insertions(+), 2 deletions(-) diff --git a/doc/module-system/module-system.chapter.md b/doc/module-system/module-system.chapter.md index d24faa255259..0c91012eebb4 100644 --- a/doc/module-system/module-system.chapter.md +++ b/doc/module-system/module-system.chapter.md @@ -31,6 +31,15 @@ An attribute set of module arguments that can be used in `imports`. This is in contrast to `config._module.args`, which is only available after all `imports` have been resolved. +::: {.warning} +You may be tempted to use `specialArgs.lib` to provide extra library functions. Doing so limits the interoperability of modules, as well as the interoperability of Module System applications. + +`lib` is reserved for the Nixpkgs library, and should not be used for custom functions. + +Instead, you may create a new attribute in `specialArgs` to provide custom functions. +This clarifies their origin and avoids incompatibilities. +::: + #### `class` {#module-system-lib-evalModules-param-class} If the `class` attribute is set and non-`null`, the module system will reject `imports` with a different `_class` declaration. diff --git a/flake.nix b/flake.nix index 8510ce7e69bd..83ae9decf803 100644 --- a/flake.nix +++ b/flake.nix @@ -24,6 +24,8 @@ - `lib.nixos` for other NixOS-provided functionality, such as [`runTest`](https://nixos.org/manual/nixos/unstable/#sec-call-nixos-test-outside-nixos) */ + # DON'T USE lib.extend TO ADD NEW FUNCTIONALITY. + # THIS WAS A MISTAKE. See the warning in lib/default.nix. lib = lib.extend (final: prev: { /** diff --git a/lib/default.nix b/lib/default.nix index 849d6ce8f9d6..e77d053b8cc0 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -5,9 +5,36 @@ */ let - inherit (import ./fixed-points.nix { inherit lib; }) makeExtensible; + # A copy of `lib.makeExtensible'` in order to document `extend`. + # It has been leading to some trouble, so we have to document it specially. + makeExtensible' = + rattrs: + let self = rattrs self // { + /** + Patch the Nixpkgs library - lib = makeExtensible (self: let + The name `extends` is a bit misleading, as it doesn't actually extend the library, but rather patches it. + It is merely a consequence of being implemented by `makeExtensible`. + + # Inputs + + - An "extension function" `f` that returns attributes that will be updated in the returned Nixpkgs library. + + # Output + + A patched Nixpkgs library. + + :::{.warning} + This functionality is intended as an escape hatch for when the provided version of the Nixpkgs library has a flaw. + + If you were to use it to add new functionality, you will run into compatibility and interoperability issues. + ::: + */ + extend = f: lib.makeExtensible (lib.extends f rattrs); + }; + in self; + + lib = makeExtensible' (self: let callLibs = file: import file { lib = self; }; in { From 823e1c0800b2e382fe196ad2cb64763cd8ccae4e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Jan 2025 12:56:25 +0000 Subject: [PATCH 0082/2168] jan: 0.5.13 -> 0.5.14 --- pkgs/by-name/ja/jan/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ja/jan/package.nix b/pkgs/by-name/ja/jan/package.nix index a29891f11a10..376c920a9853 100644 --- a/pkgs/by-name/ja/jan/package.nix +++ b/pkgs/by-name/ja/jan/package.nix @@ -5,10 +5,10 @@ let pname = "jan"; - version = "0.5.13"; + version = "0.5.14"; src = fetchurl { url = "https://github.com/janhq/jan/releases/download/v${version}/jan-linux-x86_64-${version}.AppImage"; - hash = "sha256-QetnD+0SCzn5Zx5v1EJNjhx8U9ueHdp+zZu/Yf77AdY="; + hash = "sha256-NYTOuoFpeqj6aCclkM0hzYQ3esjbI9g0vMHrZXpaOq0="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; From 4697fbbba60937175be5ef1a91f8637176dddd14 Mon Sep 17 00:00:00 2001 From: Lin Xianyi Date: Thu, 23 Jan 2025 23:35:31 +0800 Subject: [PATCH 0083/2168] bambu-studio: pin boost to 1.86 --- pkgs/by-name/ba/bambu-studio/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ba/bambu-studio/package.nix b/pkgs/by-name/ba/bambu-studio/package.nix index 53cfee7062ef..f3819a25ec5d 100644 --- a/pkgs/by-name/ba/bambu-studio/package.nix +++ b/pkgs/by-name/ba/bambu-studio/package.nix @@ -7,7 +7,7 @@ ninja, pkg-config, wrapGAppsHook3, - boost, + boost186, cereal, cgal, curl, @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { buildInputs = [ binutils - boost + boost186 cereal cgal curl From d267ea8717977a757b705250205bb8801568dd63 Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Thu, 23 Jan 2025 19:56:06 +0100 Subject: [PATCH 0084/2168] nixos/wrappers: add per-wrapper enable option While it is possible to globally enable or disable security wrappers, it isn't possible to disable only a subset of them. Consequently, users will have to overwrite the security wrappers completely and re-add the desired subset in case they want to disable a subset of those set up by the NixOS modules. Address this usecase by adding a new per-wrapper enable option. --- nixos/modules/security/wrappers/default.nix | 9 ++++++++- nixos/tests/wrappers.nix | 11 +++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix index c885c25c2620..a5afe006266a 100644 --- a/nixos/modules/security/wrappers/default.nix +++ b/nixos/modules/security/wrappers/default.nix @@ -1,7 +1,9 @@ { config, lib, pkgs, ... }: let - inherit (config.security) wrapperDir wrappers; + inherit (config.security) wrapperDir; + + wrappers = lib.filterAttrs (name: value: value.enable) config.security.wrappers; parentWrapperDir = dirOf wrapperDir; @@ -41,6 +43,11 @@ let // { description = "file mode string"; }; wrapperType = lib.types.submodule ({ name, config, ... }: { + options.enable = lib.mkOption + { type = lib.types.bool; + default = true; + description = "Whether to enable the wrapper."; + }; options.source = lib.mkOption { type = lib.types.path; description = "The absolute path to the program to be wrapped."; diff --git a/nixos/tests/wrappers.nix b/nixos/tests/wrappers.nix index 8feb92b37927..4766051805c7 100644 --- a/nixos/tests/wrappers.nix +++ b/nixos/tests/wrappers.nix @@ -29,6 +29,14 @@ import ./make-test-python.nix ( security.apparmor.enable = true; security.wrappers = { + disabled = { + enable = false; + owner = "root"; + group = "root"; + setuid = true; + source = "${busybox pkgs}/bin/busybox"; + program = "disabled_busybox"; + }; suidRoot = { owner = "root"; group = "root"; @@ -112,6 +120,9 @@ import ./make-test-python.nix ( # actually makes the apparmor policy for ping, but there's no convenient # test for that one. machine.succeed("ping -c 1 127.0.0.1") + + # Test that the disabled wrapper is not present. + machine.fail("test -e /run/wrappers/bin/disabled_busybox") ''; } ) From d336081225fa8b32db26d39b83e5ed8041503da6 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Thu, 23 Jan 2025 18:27:42 -0500 Subject: [PATCH 0085/2168] mirtk: unbreak by pinning boost --- pkgs/development/libraries/science/biology/mirtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/biology/mirtk/default.nix b/pkgs/development/libraries/science/biology/mirtk/default.nix index a1444db5b40a..320aa6ddfcee 100644 --- a/pkgs/development/libraries/science/biology/mirtk/default.nix +++ b/pkgs/development/libraries/science/biology/mirtk/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, cmake, python3, - boost, + boost186, eigen, libGLU, fltk, @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ - boost + boost186 eigen fltk itk From 7c6be4bcb5b8f4c4797439d850d715094bc0423e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Jan 2025 01:44:17 +0000 Subject: [PATCH 0086/2168] micromdm: 1.12.1 -> 1.13.0 --- pkgs/by-name/mi/micromdm/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/micromdm/package.nix b/pkgs/by-name/mi/micromdm/package.nix index 4d75c10c2ef3..05cb4e691b6e 100644 --- a/pkgs/by-name/mi/micromdm/package.nix +++ b/pkgs/by-name/mi/micromdm/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "micromdm"; - version = "1.12.1"; + version = "1.13.0"; src = fetchFromGitHub { owner = "micromdm"; repo = "micromdm"; rev = "v${version}"; - hash = "sha256-hFoInkeJAd5h6UiF19YE9f6kkIZRmhVFVvUAkSkSqlM="; + hash = "sha256-o/HK1bjaUwsSQG7QbYe0gFnD/OKV00cHXLXpftNa3iY="; }; - vendorHash = "sha256-XYrv/cjma2ZYHs2x6hSXxifuS10Xa/zUx4s5O/OMLf4="; + vendorHash = "sha256-aKm8a/PS+1ozImh1aL2EliALyUqjPMMBh4NTbL0H/ng="; meta = { description = "Mobile Device Management server for Apple Devices, focused on giving you all the power through an API"; From 10b3543c05cf10ecf5fdda72db0e4af981522ace Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Jan 2025 05:37:26 +0000 Subject: [PATCH 0087/2168] revive: 1.5.1 -> 1.6.0 --- pkgs/by-name/re/revive/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/revive/package.nix b/pkgs/by-name/re/revive/package.nix index 2e1fb296f4b1..7676a05c8f78 100644 --- a/pkgs/by-name/re/revive/package.nix +++ b/pkgs/by-name/re/revive/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "revive"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "mgechev"; repo = pname; rev = "v${version}"; - hash = "sha256-8vUtnViEFXdzKzsJxKzO4zbmKgU952EEencR7drjwAo="; + hash = "sha256-MiD5b5cLUY+ORrHtyqynM/kdFKIHb/4CMWd6Dq+6TcY="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -18,7 +18,7 @@ buildGoModule rec { rm -rf $out/.git ''; }; - vendorHash = "sha256-DDpoi/OHGBjb/vhDklvYebJU2pBUr7s36/czZVGaR1A="; + vendorHash = "sha256-KFLnc7PFKbZ8VOUOx0EnRLyMYQzZVFZphDhk2KNRiIc="; ldflags = [ "-s" From 0c4953c7dd4e9dbb959f5b4e042b440c6ef4f2aa Mon Sep 17 00:00:00 2001 From: Rouven Czerwinski Date: Thu, 16 Jan 2025 11:23:32 +0100 Subject: [PATCH 0088/2168] rauc: 1.11.3 -> 1.13 Changelog: https://github.com/rauc/rauc/blob/52a8d00d574bd23ed93fdf93f3d075e3d9fd6a19/CHANGES --- pkgs/by-name/ra/rauc/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ra/rauc/package.nix b/pkgs/by-name/ra/rauc/package.nix index 369b0683b8be..4b3c53a7296f 100644 --- a/pkgs/by-name/ra/rauc/package.nix +++ b/pkgs/by-name/ra/rauc/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "rauc"; - version = "1.11.3"; + version = "1.13"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-sFOvkr6WbiP99GNAttK9ZmRg+O/hoUQDCnW7vq9s/vo="; + sha256 = "sha256-Vq1dudB8OQveclAIVgiB8jbtp4o2Ga5v61Y6JUjOpbs="; }; passthru = { @@ -57,6 +57,7 @@ stdenv.mkDerivation rec { (lib.mesonOption "dbusinterfacesdir" "${placeholder "out"}/share/dbus-1/interfaces") (lib.mesonOption "dbuspolicydir" "${placeholder "out"}/share/dbus-1/system.d") (lib.mesonOption "dbussystemservicedir" "${placeholder "out"}/share/dbus-1/system-services") + (lib.mesonOption "systemdcatalogdir" "${placeholder "out"}/lib/systemd/catalog") ]; meta = with lib; { From 80ae1ba91339bbc4b260ddb8f0f57b1efd3e72f9 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Fri, 24 Jan 2025 15:44:20 +0100 Subject: [PATCH 0089/2168] yewtube: 2.12.0 -> 2.12.1 Diff: https://github.com/mps-youtube/yewtube/compare/refs/tags/v2.12.0...v2.12.1 --- pkgs/by-name/ye/yewtube/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ye/yewtube/package.nix b/pkgs/by-name/ye/yewtube/package.nix index 0509cdaec948..18b3746925ce 100644 --- a/pkgs/by-name/ye/yewtube/package.nix +++ b/pkgs/by-name/ye/yewtube/package.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "yewtube"; - version = "2.12.0"; + version = "2.12.1"; src = fetchFromGitHub { owner = "mps-youtube"; repo = "yewtube"; tag = "v${version}"; - hash = "sha256-66cGnEEISC+lZAYhFXuVdDtwh1TgwvCP6nBD84z2z0I="; + hash = "sha256-+V9t71Z8PKioM7HWlzTB6X7EokAWgqC3fQJr5tkPdq8="; }; postPatch = '' From b90a52b475aad5c7c46f2878623e462e68c6361c Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Fri, 24 Jan 2025 16:50:06 +0100 Subject: [PATCH 0090/2168] passes: 0.9 -> 0.10 Diff: https://github.com/pablo-s/passes/compare/v0.9...v0.10 --- pkgs/by-name/pa/passes/package.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/pa/passes/package.nix b/pkgs/by-name/pa/passes/package.nix index 102af396ff4b..c856dd3d6e71 100644 --- a/pkgs/by-name/pa/passes/package.nix +++ b/pkgs/by-name/pa/passes/package.nix @@ -18,23 +18,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "passes"; - version = "0.9"; + version = "0.10"; src = fetchFromGitHub { owner = "pablo-s"; repo = "passes"; rev = "v${finalAttrs.version}"; - hash = "sha256-RfoqIyqc9zwrWZ5RLhQl+6vTccbCTwtDcMlnWPCDOag="; + hash = "sha256-e6nHCOrb2PX47REr7sy80n1aTdMZ0c2QZlIIib4vll8="; }; postPatch = '' substituteInPlace src/model/meson.build \ - --replace /app/lib ${zint}/lib - substituteInPlace src/view/window.blp \ - --replace reveal_flap reveal-flap - substituteInPlace build-aux/meson/postinstall.py \ - --replace gtk-update-icon-cache gtk4-update-icon-cache - patchShebangs build-aux/meson/postinstall.py + --replace-fail /app/lib ${zint}/lib ''; strictDeps = true; From 35ff9ddce1346004ee2fba191afb27697357501a Mon Sep 17 00:00:00 2001 From: danjujan <44864658+danjujan@users.noreply.github.com> Date: Fri, 24 Jan 2025 22:32:13 +0100 Subject: [PATCH 0091/2168] pineflash: fix start on wayland --- pkgs/by-name/pi/pineflash/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/pi/pineflash/package.nix b/pkgs/by-name/pi/pineflash/package.nix index d19f28b583c9..2793af702c51 100644 --- a/pkgs/by-name/pi/pineflash/package.nix +++ b/pkgs/by-name/pi/pineflash/package.nix @@ -15,6 +15,7 @@ libGL, libxkbcommon, nix-update-script, + wayland, }: rustPlatform.buildRustPackage rec { pname = "pineflash"; @@ -46,6 +47,7 @@ rustPlatform.buildRustPackage rec { runtimeDependencies = [ libGL libxkbcommon + wayland ]; postPatch = From d62ea22c2b8512fbf620234fa13963934d263a2b Mon Sep 17 00:00:00 2001 From: Andrew Voynov Date: Sat, 25 Jan 2025 10:30:16 +0300 Subject: [PATCH 0092/2168] docs: removed internal `security.wrapperDir` --- nixos/modules/security/wrappers/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix index c885c25c2620..62a6608d533d 100644 --- a/nixos/modules/security/wrappers/default.nix +++ b/nixos/modules/security/wrappers/default.nix @@ -203,9 +203,8 @@ in description = '' This option effectively allows adding setuid/setgid bits, capabilities, changing file ownership and permissions of a program without directly - modifying it. This works by creating a wrapper program under the - {option}`security.wrapperDir` directory, which is then added to - the shell `PATH`. + modifying it. This works by creating a wrapper program in a directory + (not configurable), which is then added to the shell `PATH`. ''; }; From b891fd2983a798c3fec6895c913ce7f5e4a0ede4 Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Sat, 25 Jan 2025 21:13:05 +0100 Subject: [PATCH 0093/2168] cinelerra: 2.3-unstable-2024-03-20 -> 2.3-unstable-2025-01-25 --- pkgs/by-name/ci/cinelerra/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ci/cinelerra/package.nix b/pkgs/by-name/ci/cinelerra/package.nix index adbaf1de6f80..0ac6c361003a 100644 --- a/pkgs/by-name/ci/cinelerra/package.nix +++ b/pkgs/by-name/ci/cinelerra/package.nix @@ -45,13 +45,13 @@ stdenv.mkDerivation { pname = "cinelerra-cv"; - version = "2.3-unstable-2024-03-20"; + version = "2.3-unstable-2025-01-25"; src = fetchFromGitHub { owner = "cinelerra-cv-team"; repo = "cinelerra-cv"; - rev = "18a693425f78f7c4c68b5a342efce3e8db2a30dc"; - hash = "sha256-+47Xa63GoKiQzEXbxmKUwJLDIFUnzc/FfxRPXCCxzpE="; + rev = "fb6eb391fe907d0f3b48b90f87e7a416408054f3"; + hash = "sha256-mu6yY44IlbmoBn1DUARQm5p16y6WShPc3gVML8+59xc="; }; preConfigure = '' From b845aa355f4653624621529347d6d167e71f0178 Mon Sep 17 00:00:00 2001 From: normalc Date: Sat, 25 Jan 2025 18:41:01 -0500 Subject: [PATCH 0094/2168] ruffle: remove govanify from `meta.maintainers` --- pkgs/by-name/ru/ruffle/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/ru/ruffle/package.nix b/pkgs/by-name/ru/ruffle/package.nix index a05fbf8cbb02..65524055c617 100644 --- a/pkgs/by-name/ru/ruffle/package.nix +++ b/pkgs/by-name/ru/ruffle/package.nix @@ -114,7 +114,6 @@ rustPlatform.buildRustPackage { lib.licenses.asl20 ]; maintainers = [ - lib.maintainers.govanify lib.maintainers.jchw lib.maintainers.normalcea ]; From ff76ffdb3ac128f060b25a1d636b0d2500a5c62c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Jan 2025 00:57:10 +0000 Subject: [PATCH 0095/2168] carapace: 1.1.1 -> 1.2.1 --- pkgs/shells/carapace/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/carapace/default.nix b/pkgs/shells/carapace/default.nix index fb90bfb8ffa4..327004106068 100644 --- a/pkgs/shells/carapace/default.nix +++ b/pkgs/shells/carapace/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "carapace"; - version = "1.1.1"; + version = "1.2.1"; src = fetchFromGitHub { owner = "carapace-sh"; repo = "carapace-bin"; rev = "v${version}"; - hash = "sha256-4tsqzXQwLTJ3icoCFJAmUWEXvv/RwzBnOXJd4vXOE7s="; + hash = "sha256-MGg0L+a4tYHwbJxrOQ9QotsfpOvxnL6K0QX6ayGGXpI="; }; - vendorHash = "sha256-8EuPHhTNK+7OnjYKAdkSmIS/iZR2AYrDw4nfY5ixYIo="; + vendorHash = "sha256-kxd/bINrZxgEmgZ67KjTTfuIr9ekpd08s0/p0Sht5Ks="; ldflags = [ "-s" From ca060466e87f6c2d7c74381d921353658b248aeb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Jan 2025 02:15:05 +0000 Subject: [PATCH 0096/2168] varia: 2024.11.7-1 -> 2025.1.24 --- pkgs/by-name/va/varia/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/va/varia/package.nix b/pkgs/by-name/va/varia/package.nix index c5c6ee6230f6..d6a19bbd71ab 100644 --- a/pkgs/by-name/va/varia/package.nix +++ b/pkgs/by-name/va/varia/package.nix @@ -14,14 +14,14 @@ python3Packages.buildPythonApplication rec { pname = "varia"; - version = "2024.11.7-1"; + version = "2025.1.24"; pyproject = false; src = fetchFromGitHub { owner = "giantpinkrobots"; repo = "varia"; tag = "v${version}"; - hash = "sha256-Xx3rd+FwelE7yjW4dXTAEzCMVa25ojXuhOLjqc6H57c="; + hash = "sha256-bsSAPKs5iD1CMQ+t0i09odglZre137TOSyvJqE5lqN4="; }; postPatch = '' From 2363cc101e923e5cf7696f95a3dc3d49a2e3db33 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sun, 26 Jan 2025 16:01:03 +0800 Subject: [PATCH 0097/2168] avidemux: fix build against x265 4.1 --- pkgs/applications/video/avidemux/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 4c1dfaa7a8fa..2e7275372514 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -64,6 +64,13 @@ stdenv.mkDerivation rec { patches = [ ./dynamic_install_dir.patch ./bootstrap_logging.patch + # x265 API change in 4.1 breaks build + # See discussion in https://avidemux.org/smif/index.php/topic,19995.msg97494.html#msg97494 + (fetchpatch { + name = "fix_build_with_x265_4_1.patch"; + url = "https://github.com/mean00/avidemux2/commit/c16d32a67cdb012db093472ad3776713939a30d1.patch"; + hash = "sha256-5QqocvYaY/phyvSX2lhTzeAi+z9Wgqs+ITR0cXReps4="; + }) ]; postPatch = '' From f7c14661350a4ee047b690e83e11958acf610af0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Jan 2025 09:24:52 +0000 Subject: [PATCH 0098/2168] kubebuilder: 4.4.0 -> 4.5.0 --- pkgs/by-name/ku/kubebuilder/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ku/kubebuilder/package.nix b/pkgs/by-name/ku/kubebuilder/package.nix index a04cb9e8c684..50b3afb383bf 100644 --- a/pkgs/by-name/ku/kubebuilder/package.nix +++ b/pkgs/by-name/ku/kubebuilder/package.nix @@ -13,13 +13,13 @@ buildGoModule rec { pname = "kubebuilder"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "kubebuilder"; rev = "v${version}"; - hash = "sha256-OLObVesASAOJxWXVJ5izJ8g6r7LCr1Or4JX2cF2RaVc="; + hash = "sha256-tkBSyLtorD4yMaDq8DIn5Nbl6TbBeRlRO44nR/22iNI="; }; vendorHash = "sha256-xZF4t5SMe3iKH+Hr1xhVHWiwTpxEJ3kWlR0QB4RSNhk="; From 9683835f04a0c1784ab2e7667ff8bedd5b084da6 Mon Sep 17 00:00:00 2001 From: provokateurin Date: Wed, 8 Jan 2025 18:14:13 +0100 Subject: [PATCH 0099/2168] nixos/nextcloud: Update logreader warning description The error is only logged as an info since https://github.com/nextcloud/logreader/pull/1449. This was a bug in the app, since the error is not fixable by the admin due to the logging configuration. --- nixos/modules/services/web-apps/nextcloud.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/web-apps/nextcloud.md b/nixos/modules/services/web-apps/nextcloud.md index 8d9aa878c287..9d49af27f55c 100644 --- a/nixos/modules/services/web-apps/nextcloud.md +++ b/nixos/modules/services/web-apps/nextcloud.md @@ -245,7 +245,7 @@ that are managed by Nix. If you want automatic updates it is recommended that yo ## Known warnings {#module-services-nextcloud-known-warnings} -### Failed to get an iterator for log entries: Logreader application only supports "file" log_type {#module-services-nextcloud-warning-logreader} +### Logreader application only supports "file" log_type {#module-services-nextcloud-warning-logreader} This is because @@ -253,10 +253,10 @@ This is because * the Logreader application that allows reading logs in the admin panel is enabled by default and requires logs written to a file. -The logreader application doesn't work, as it was the case before. The only change is that -it complains loudly now. So nothing actionable here by default. Alternatively you can +The logreader application doesn't work, as it was the case before. +So nothing actionable here by default. Alternatively you can -* disable the logreader application to shut up the "error". +* disable the logreader application to shut up the "info". We can't really do that by default since whether apps are enabled/disabled is part of the application's state and tracked inside the database. From 14c471b127039f67eaed970d4b4f6da8f1d6a375 Mon Sep 17 00:00:00 2001 From: NTBBloodbath Date: Sun, 26 Jan 2025 14:31:57 -0400 Subject: [PATCH 0100/2168] maintainers: add ntbbloodbath --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index fcc8363179a2..7f355a4412ca 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16790,6 +16790,13 @@ githubId = 30942198; name = "Noah Snelson"; }; + ntbbloodbath = { + email = "bloodbathalchemist@protonmail.com"; + matrix = "@ntbbloodbath:matrix.org"; + github = "ntbbloodbath"; + githubId = 36456999; + name = "Alejandro Martin"; + }; nthorne = { email = "notrupertthorne@gmail.com"; github = "nthorne"; From d1ed29454badb696c5133ecd7d4515f7ed6b17bf Mon Sep 17 00:00:00 2001 From: normalc Date: Sat, 25 Jan 2025 17:42:56 -0500 Subject: [PATCH 0101/2168] ruffle: nightly-2025-01-04 -> nightly-2025-01-25 Resolves #285887. --- pkgs/by-name/ru/ruffle/package.nix | 142 +++++++++++------- .../ruffle/remove-deterministic-feature.patch | 52 +++++++ 2 files changed, 143 insertions(+), 51 deletions(-) create mode 100644 pkgs/by-name/ru/ruffle/remove-deterministic-feature.patch diff --git a/pkgs/by-name/ru/ruffle/package.nix b/pkgs/by-name/ru/ruffle/package.nix index 65524055c617..5bda1d81b3c6 100644 --- a/pkgs/by-name/ru/ruffle/package.nix +++ b/pkgs/by-name/ru/ruffle/package.nix @@ -6,7 +6,7 @@ pkg-config, python3, rustPlatform, - stdenv, + stdenvNoCC, lib, wayland, xorg, @@ -19,25 +19,46 @@ gsettings-desktop-schemas, glib, libxkbcommon, + openh264, darwin, }: let - version = "nightly-2025-01-04"; + pname = "ruffle"; + version = "nightly-2025-01-25"; + # TODO: Remove overridden derivation once ruffle accepts upstream openh264-2.5.0 + openh264-241 = + if stdenvNoCC.hostPlatform.isLinux then + openh264.overrideAttrs (_: rec { + version = "2.4.1"; + src = fetchFromGitHub { + owner = "cisco"; + repo = "openh264"; + tag = "v${version}"; + hash = "sha256-ai7lcGcQQqpsLGSwHkSs7YAoEfGCIbxdClO6JpGA+MI="; + }; + postPatch = null; + }) + else + null; in rustPlatform.buildRustPackage { - pname = "ruffle"; - inherit version; + inherit pname version; src = fetchFromGitHub { owner = "ruffle-rs"; - repo = "ruffle"; - rev = version; - hash = "sha256-MxYl5fTTNerCwG3w34cltb6aasP6TvGRkvwf77lKIgs="; + repo = pname; + tag = version; + hash = "sha256-JLh0tatP70rYo2QXLKu6M9jJ1gFpY76sYaUJqW9U4E0="; }; + patches = [ ./remove-deterministic-feature.patch ]; + + useFetchCargoVendor = true; + cargoHash = "sha256-PbNp/V+xmU6Lo24a6pd9XoT/LQmINztjOHKoikG9N4Y="; + nativeBuildInputs = [ jre_minimal ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ + ++ lib.optionals stdenvNoCC.hostPlatform.isLinux [ glib gsettings-desktop-schemas makeWrapper @@ -45,10 +66,10 @@ rustPlatform.buildRustPackage { python3 wrapGAppsHook3 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ]; + ++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [ rustPlatform.bindgenHook ]; buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ + lib.optionals stdenvNoCC.hostPlatform.isLinux [ alsa-lib cairo gtk3 @@ -62,53 +83,72 @@ rustPlatform.buildRustPackage { vulkan-loader udev ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; - - dontWrapGApps = true; - - postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' - install -Dm644 -t $out/share/icons/hicolor/scalable/apps/ desktop/packages/linux/rs.ruffle.Ruffle.svg - - install -Dm644 -t $out/share/applications/ desktop/packages/linux/rs.ruffle.Ruffle.desktop - substituteInPlace $out/share/applications/rs.ruffle.Ruffle.desktop \ - --replace-fail "Exec=ruffle %u" "Exec=ruffle_desktop %u" - - install -Dm644 -t $out/share/metainfo/ desktop/packages/linux/rs.ruffle.Ruffle.metainfo.xml - ''; - - preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' - patchelf $out/bin/ruffle_desktop \ - --add-needed libxkbcommon-x11.so \ - --add-needed libwayland-client.so \ - --add-rpath ${libxkbcommon}/lib:${wayland}/lib - ''; - - postFixup = - '' - # This name is too generic - mv $out/bin/exporter $out/bin/ruffle_exporter - '' - + lib.optionalString stdenv.hostPlatform.isLinux '' - vulkanWrapperArgs+=( - --prefix LD_LIBRARY_PATH ':' ${vulkan-loader}/lib - ) - - wrapProgram $out/bin/ruffle_exporter \ - "''${vulkanWrapperArgs[@]}" - - wrapProgram $out/bin/ruffle_desktop \ - "''${vulkanWrapperArgs[@]}" \ - "''${gappsWrapperArgs[@]}" - ''; + ++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; cargoBuildFlags = [ "--workspace" ]; - useFetchCargoVendor = true; - cargoHash = "sha256-q+9yhUjYolPlBt6W1xJPoyE7DgqDffEhkQqJmSX4y3Y="; + postInstall = + '' + # Namespace binaries with "ruffle_" + mv $out/bin/exporter $out/bin/ruffle_exporter + mv $out/bin/mocket $out/bin/ruffle_mocket + mv $out/bin/stub-report $out/bin/ruffle_stub-report + mv $out/bin/build_playerglobal $out/bin/ruffle_build_playerglobal + + # This name is too specific + mv $out/bin/ruffle_desktop $out/bin/ruffle + '' + + lib.optionalString stdenvNoCC.hostPlatform.isLinux '' + install -Dm644 desktop/packages/linux/rs.ruffle.Ruffle.desktop \ + -t $out/share/applications/ + + install -Dm644 desktop/packages/linux/rs.ruffle.Ruffle.svg \ + -t $out/share/icons/hicolor/scalable/apps/ + + install -Dm644 desktop/packages/linux/rs.ruffle.Ruffle.metainfo.xml \ + -t $out/share/metainfo/ + + rm $out/bin/ruffle_web_safari + ''; + + preFixup = lib.optionalString stdenvNoCC.hostPlatform.isLinux '' + patchelf $out/bin/ruffle \ + --add-needed libxkbcommon-x11.so \ + --add-needed libwayland-client.so \ + --add-needed libopenh264.so \ + --add-rpath ${libxkbcommon}/lib:${wayland}/lib:${openh264-241}/lib + ''; + + dontWrapGApps = true; + + postFixup = lib.optionalString stdenvNoCC.hostPlatform.isLinux '' + vulkanWrapperArgs+=( + --prefix LD_LIBRARY_PATH ':' ${vulkan-loader}/lib + ) + + wrapProgram $out/bin/ruffle_exporter \ + "''${vulkanWrapperArgs[@]}" + + wrapProgram $out/bin/ruffle \ + "''${vulkanWrapperArgs[@]}" \ + "''${gappsWrapperArgs[@]}" + ''; meta = { description = "Cross platform Adobe Flash Player emulator"; + longDescription = '' + Ruffle is a cross platform emulator for running and preserving + Adobe Flash content. It is capable of running ActionScript 1, 2 + and 3 programs with machine-native performance thanks to being + written in the Rust programming language. + + This package for ruffle also includes the `exporter` and + `scanner` utilities which allow for generating screenshots as + PNGs and parsing `.swf` files in bulk respectively. + ''; homepage = "https://ruffle.rs/"; + downloadPage = "https://ruffle.rs/downloads"; + changelog = "https://github.com/ruffle-rs/ruffle/releases/tag/${version}"; license = [ lib.licenses.mit lib.licenses.asl20 @@ -117,7 +157,7 @@ rustPlatform.buildRustPackage { lib.maintainers.jchw lib.maintainers.normalcea ]; + mainProgram = "ruffle"; platforms = lib.platforms.linux ++ lib.platforms.darwin; - mainProgram = "ruffle_desktop"; }; } diff --git a/pkgs/by-name/ru/ruffle/remove-deterministic-feature.patch b/pkgs/by-name/ru/ruffle/remove-deterministic-feature.patch new file mode 100644 index 000000000000..804bc46c22be --- /dev/null +++ b/pkgs/by-name/ru/ruffle/remove-deterministic-feature.patch @@ -0,0 +1,52 @@ +diff --git a/exporter/Cargo.toml b/exporter/Cargo.toml +index 93066a30d..0f8b71ae4 100644 +--- a/exporter/Cargo.toml ++++ b/exporter/Cargo.toml +@@ -13,7 +13,7 @@ workspace = true + [dependencies] + clap = { workspace = true } + futures = { workspace = true } +-ruffle_core = { path = "../core", features = ["deterministic", "default_font"] } ++ruffle_core = { path = "../core", features = ["default_font"] } + ruffle_render_wgpu = { path = "../render/wgpu", features = ["clap"] } + image = { workspace = true, features = ["png"] } + walkdir = { workspace = true } +diff --git a/scanner/Cargo.toml b/scanner/Cargo.toml +index 59781ba79..40cf54c24 100644 +--- a/scanner/Cargo.toml ++++ b/scanner/Cargo.toml +@@ -12,7 +12,7 @@ workspace = true + + [dependencies] + clap = { workspace = true } +-ruffle_core = { path = "../core", features = ["deterministic"] } ++ruffle_core = { path = "../core" } + log = { workspace = true } + walkdir = { workspace = true } + serde = { workspace = true, features = ["derive"] } +diff --git a/tests/Cargo.toml b/tests/Cargo.toml +index 26bfc9a89..b7342b662 100644 +--- a/tests/Cargo.toml ++++ b/tests/Cargo.toml +@@ -27,7 +27,7 @@ ruffle_render_wgpu = { path = "../render/wgpu", optional = true } + regex = "1.11.1" + + [dev-dependencies] +-ruffle_core = { path = "../core", features = ["deterministic", "timeline_debug", "avm_debug", "audio", "mp3", "aac", "default_font", "test_only_as3"] } ++ruffle_core = { path = "../core", features = ["timeline_debug", "avm_debug", "audio", "mp3", "aac", "default_font", "test_only_as3"] } + ruffle_test_framework = { path = "framework" } + libtest-mimic = "0.8.1" + walkdir = { workspace = true } +diff --git a/tests/framework/Cargo.toml b/tests/framework/Cargo.toml +index ffc59e25b..639028578 100644 +--- a/tests/framework/Cargo.toml ++++ b/tests/framework/Cargo.toml +@@ -11,7 +11,7 @@ version.workspace = true + workspace = true + + [dependencies] +-ruffle_core = { path = "../../core", features = ["deterministic", "timeline_debug", "avm_debug", "audio", "mp3", "aac", "default_font", "serde"] } ++ruffle_core = { path = "../../core", features = ["timeline_debug", "avm_debug", "audio", "mp3", "aac", "default_font", "serde"] } + ruffle_render = { path = "../../render", features = ["serde"] } + ruffle_input_format = { path = "../input-format" } + ruffle_socket_format = { path = "../socket-format" } \ No newline at end of file From 5d57a90e2abf555de084876009bffba7dc40f0f2 Mon Sep 17 00:00:00 2001 From: James Atkins Date: Sun, 26 Jan 2025 17:34:36 -0600 Subject: [PATCH 0102/2168] rstudio: fix build Boost 1.87 deprecated io_service and breaks the build. Pin boost to 1.86 as a workaround. --- pkgs/applications/editors/rstudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 4df8046de30f..858a38cf5ee7 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -5,7 +5,7 @@ fetchFromGitHub, replaceVars, cmake, - boost, + boost186, zlib, openssl, R, @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { buildInputs = [ - boost + boost186 zlib openssl R From a3a1c578ed462e7c7e7d959059a82d5fff2cccde Mon Sep 17 00:00:00 2001 From: Jonathan del Strother Date: Mon, 27 Jan 2025 09:47:21 +0000 Subject: [PATCH 0103/2168] pngout: 20200115 -> 20230322 This bumps the nix `version` of the package to 20230322, although the linux binary remains unchanged. The 20230322 release just adds aarch64-darwin support to the mac binary. --- pkgs/by-name/pn/pngout/package.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/pn/pngout/package.nix b/pkgs/by-name/pn/pngout/package.nix index c8a59c29033a..ffe2f663501f 100644 --- a/pkgs/by-name/pn/pngout/package.nix +++ b/pkgs/by-name/pn/pngout/package.nix @@ -7,6 +7,9 @@ let platforms = { + aarch64-darwin = { + folder = "."; + }; aarch64-linux = { folder = "aarch64"; ld-linux = "ld-linux-aarch64.so.1"; @@ -33,22 +36,22 @@ let download = if stdenv.hostPlatform.isDarwin then { - extension = "macos.zip"; - hash = "sha256-MnL6lH7q/BrACG4fFJNfnvoh0JClVeaJIlX+XIj2aG4="; + suffix = "20230322-mac.zip"; + hash = "sha256-Lj63k0UgYECuOg0NDs/prQHZL+UAK4oWdqZWMqVoQOE="; } else { - extension = "linux.tar.gz"; + suffix = "20200115-linux.tar.gz"; hash = "sha256-rDi7pvDeKQM96GZTjDr6ZDQTGbaVu+OI77xf2egw6Sg="; }; in stdenv.mkDerivation rec { pname = "pngout"; - version = "20200115"; + version = "20230322"; src = fetchurl { inherit (download) hash; - url = "http://static.jonof.id.au/dl/kenutils/pngout-${version}-${download.extension}"; + url = "https://www.jonof.id.au/files/kenutils/pngout-${download.suffix}"; }; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ unzip ]; From df88061665aa5bb8bada79466e12721daa91d7dc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 13:19:11 +0000 Subject: [PATCH 0104/2168] jwasm: 2.18 -> 2.19 --- pkgs/by-name/jw/jwasm/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/jw/jwasm/package.nix b/pkgs/by-name/jw/jwasm/package.nix index a069cbda51d6..42808118b645 100644 --- a/pkgs/by-name/jw/jwasm/package.nix +++ b/pkgs/by-name/jw/jwasm/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "jwasm"; - version = "2.18"; + version = "2.19"; src = fetchFromGitHub { owner = "Baron-von-Riedesel"; repo = "JWasm"; rev = "v${finalAttrs.version}"; - hash = "sha256-xbiyGBTzIkAfUy45JdAl77gbvArzVUQNPOxa+H2uGFo="; + hash = "sha256-rWn/PhdOkA8aKDPx5GlfM6RuHcy1Hhudh1auVfaNtdI="; }; outputs = [ From 25a5185f4a9b9e9cb08dad79f1e0cd3356cd208d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 13:34:52 +0000 Subject: [PATCH 0105/2168] mackerel-agent: 0.83.0 -> 0.84.0 --- pkgs/by-name/ma/mackerel-agent/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/mackerel-agent/package.nix b/pkgs/by-name/ma/mackerel-agent/package.nix index e64e46c4f979..8ecd81bc961c 100644 --- a/pkgs/by-name/ma/mackerel-agent/package.nix +++ b/pkgs/by-name/ma/mackerel-agent/package.nix @@ -10,20 +10,20 @@ buildGoModule rec { pname = "mackerel-agent"; - version = "0.83.0"; + version = "0.84.0"; src = fetchFromGitHub { owner = "mackerelio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hxABrgUdEQDj8NJxZgChGgB2/3J1/ChTdIYkFQtGsuY="; + sha256 = "sha256-kLrZ+oTb27g2Lzb65cVyxu1Ou5wGXXMSUvod+IBnoPA="; }; nativeBuildInputs = [ makeWrapper ]; nativeCheckInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ nettools ]; buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ iproute2 ]; - vendorHash = "sha256-JIqQXS2iw3opeotpfqC16w7hdu+7XjxhIyVj2M+98ec="; + vendorHash = "sha256-DPxkZp46AsUiThQC9OwL24uKfJrUhgo8IvvE4fLo1yg="; subPackages = [ "." ]; From f6d24e9f4803e6fcd0e7a85d54a00518e65bfd2c Mon Sep 17 00:00:00 2001 From: Charles Hall Date: Sun, 26 Jan 2025 22:11:13 -0800 Subject: [PATCH 0106/2168] serious-sans: drop --- .../manual/release-notes/rl-2505.section.md | 2 ++ pkgs/by-name/se/serious-sans/package.nix | 34 ------------------- pkgs/top-level/aliases.nix | 1 + 3 files changed, 3 insertions(+), 34 deletions(-) delete mode 100644 pkgs/by-name/se/serious-sans/package.nix diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 4b888f502d00..912714512726 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -229,6 +229,8 @@ - `poac` has been renamed to `cabinpkg` to match the upstream name change but an alias has been added. See the [new name announcement](https://github.com/orgs/cabinpkg/discussions/1052) for more details. +- `serious-sans` has been removed because upstream changed its name to Serious Shanns, which is not currently packaged. + - `racket_7_9` has been removed, as it is insecure. It is recommended to use Racket 8 instead. - `services.mongodb.initialRootPassword` has been replaced with the more secure option [`services.mongodb.initialRootPasswordFile`](#opt-services.mongodb.initialRootPasswordFile) diff --git a/pkgs/by-name/se/serious-sans/package.nix b/pkgs/by-name/se/serious-sans/package.nix deleted file mode 100644 index 64159fc2d482..000000000000 --- a/pkgs/by-name/se/serious-sans/package.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - stdenvNoCC, - lib, - fetchFromGitHub, -}: - -stdenvNoCC.mkDerivation { - pname = "serious-sans"; - version = "unstable-2023-09-04"; - - src = fetchFromGitHub { - owner = "kaBeech"; - repo = "serious-sans"; - rev = "a23f2b303fa3b1ec8788c5abba67b44ca5a3cc0a"; - hash = "sha256-sPb9ZVDTBaZHT0Q/I9OfP7BMYJXPBiKkebzKgUHNuZM="; - }; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/fonts/serious-sans - cp SeriousSans/*/* $out/share/fonts/serious-sans - - runHook postInstall - ''; - - meta = { - homepage = "https://github.com/kaBeech/serious-sans"; - description = "Legible monospace font for playful professionals"; - license = with lib.licenses; [ mit ]; - maintainers = with lib.maintainers; [ CobaltCause ]; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c206664e0356..d8ddd54aa6c3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1246,6 +1246,7 @@ mapAliases { semeru-jre-bin-16 = throw "Semeru 16 has been removed as it has reached its end of life"; # Added 2024-08-01 sensu = throw "sensu has been removed as the upstream project is deprecated. Consider using `sensu-go`"; # Added 2024-10-28 serial-unit-testing = throw "'serial-unit-testing' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 + serious-sans = throw "'serious-sans' has been renamed to 'serious-shanns', which is not currently packaged"; # Added 2025-01-26 session-desktop-appimage = session-desktop; sequoia = sequoia-sq; # Added 2023-06-26 sexp = sexpp; # Added 2023-07-03 From 92e0e9e5168fdd1db2ca68a420dd0dc73401f89d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 17:43:22 +0000 Subject: [PATCH 0107/2168] nextdns: 1.44.3 -> 1.44.4 --- pkgs/by-name/ne/nextdns/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/nextdns/package.nix b/pkgs/by-name/ne/nextdns/package.nix index e37efbdf95e0..f8c0b4eb4e04 100644 --- a/pkgs/by-name/ne/nextdns/package.nix +++ b/pkgs/by-name/ne/nextdns/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "nextdns"; - version = "1.44.3"; + version = "1.44.4"; src = fetchFromGitHub { owner = "nextdns"; repo = "nextdns"; rev = "v${version}"; - sha256 = "sha256-fSYnR8yfgfOx8E9gGq82xAsvrMdujcwYq/qY/NF8LcM="; + sha256 = "sha256-HLf5LH94uPt63BXZgwEW6Uil6Ithz24wbQBa486ublo="; }; vendorHash = "sha256-DKYWuCnpoJXJHBd6G9DFFzAPbekO+vaCPuBc4UTuxHg="; From 255d1d6ebc4838c5c03e10475811e3281e576af3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Jan 2025 00:28:56 +0000 Subject: [PATCH 0108/2168] antimicrox: 3.5.0 -> 3.5.1 --- pkgs/tools/misc/antimicrox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/antimicrox/default.nix b/pkgs/tools/misc/antimicrox/default.nix index 76ea224f19d7..4fa71b40fbad 100644 --- a/pkgs/tools/misc/antimicrox/default.nix +++ b/pkgs/tools/misc/antimicrox/default.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "antimicrox"; - version = "3.5.0"; + version = "3.5.1"; src = fetchFromGitHub { owner = "AntiMicroX"; repo = pname; rev = version; - sha256 = "sha256-9vpkhs3zEOZa3LnyIqdW0U+nS/9t4HzMLzFqrB2TqI8="; + sha256 = "sha256-ZIHhgyOpabWkdFZoha/Hj/1d8/b6qVolE6dn0xAFZVw="; }; nativeBuildInputs = [ From 18c98764c692b6d8214fbde9fbb935d091518d31 Mon Sep 17 00:00:00 2001 From: chris Date: Mon, 27 Jan 2025 22:52:49 -0500 Subject: [PATCH 0109/2168] caido: 0.44.1 -> 0.45.1 --- pkgs/by-name/ca/caido/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/caido/package.nix b/pkgs/by-name/ca/caido/package.nix index 823895e9365e..401ec4676de6 100644 --- a/pkgs/by-name/ca/caido/package.nix +++ b/pkgs/by-name/ca/caido/package.nix @@ -15,14 +15,14 @@ let "cli" "desktop" ]; - version = "0.44.1"; + version = "0.45.1"; cli = fetchurl { url = "https://caido.download/releases/v${version}/caido-cli-v${version}-linux-x86_64.tar.gz"; - hash = "sha256-h8pqR74UcFp9eYiDB6+xck4uUs8qh/yE3LBuoUzmchs="; + hash = "sha256-tudXyf9wwWABMGwfsxaLJtkZPKImlgjzfJJYFtimQOE="; }; desktop = fetchurl { url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-linux-x86_64.AppImage"; - hash = "sha256-GKhjTTPXtZ7jMFdKKDUsT1pZsj2+Kmn3Au++sAsV6U8="; + hash = "sha256-meNB1KCtxApsP95476ggL2gbCxu2fdold6BQ2dlZqFc="; }; appimageContents = appimageTools.extractType2 { inherit pname version; From 5a69b0c17b458726fd0a72bb06ea4fc960ab80c5 Mon Sep 17 00:00:00 2001 From: oosquare Date: Tue, 28 Jan 2025 17:25:12 +0800 Subject: [PATCH 0110/2168] lx-music-desktop: 2.9.0 -> 2.10.0 Changelog: https://github.com/lyswhut/lx-music-desktop/releases/tag/v2.10.0 --- pkgs/by-name/lx/lx-music-desktop/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/lx/lx-music-desktop/package.nix b/pkgs/by-name/lx/lx-music-desktop/package.nix index 0d5ff5d79155..138564e76548 100644 --- a/pkgs/by-name/lx/lx-music-desktop/package.nix +++ b/pkgs/by-name/lx/lx-music-desktop/package.nix @@ -7,14 +7,14 @@ dpkg, libGL, systemd, - electron_30, + electron_32, commandLineArgs ? "", }: let pname = "lx-music-desktop"; - version = "2.9.0"; + version = "2.10.0"; buildUrl = version: arch: @@ -23,17 +23,17 @@ let srcs = { x86_64-linux = fetchurl { url = buildUrl version "amd64"; - hash = "sha256-krjC3vAwTMzlWJJIuJmYzFtN/Z/IINnzooUtlONeUM0="; + hash = "sha256-btNB8XFCJij1wUVZoWaa55vZn5n1gsKSMnEbQPTd9lg="; }; aarch64-linux = fetchurl { url = buildUrl version "arm64"; - hash = "sha256-734hTi/vgSrLAks+CV1vxrrZfSShnpExlO0JWUc4oUE="; + hash = "sha256-GVTzxTV7bM4AWZ+Xfb70fyedDMIa9eX/YwnGkm3WOsk="; }; armv7l-linux = fetchurl { url = buildUrl version "armv7l"; - hash = "sha256-e4Elipw7MzO+3XmmGlZfLDFgSph0by5Xy6FtYCie/38="; + hash = "sha256-3zttIk+A4BpG0W196LzgTJ5WeqWvLjqPFz6e9RCGlJo="; }; }; @@ -71,7 +71,7 @@ stdenv.mkDerivation { ''; postFixup = '' - makeWrapper ${electron_30}/bin/electron $out/bin/lx-music-desktop \ + makeWrapper ${electron_32}/bin/electron $out/bin/lx-music-desktop \ --add-flags $out/opt/lx-music-desktop/resources/app.asar \ --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ From 4a3d67a85114ee007e112304801057b172554607 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Jan 2025 13:07:41 +0000 Subject: [PATCH 0111/2168] mongodb-compass: 1.45.1 -> 1.45.2 --- pkgs/by-name/mo/mongodb-compass/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mo/mongodb-compass/package.nix b/pkgs/by-name/mo/mongodb-compass/package.nix index 86e87742f8cf..c9dd27486fbc 100644 --- a/pkgs/by-name/mo/mongodb-compass/package.nix +++ b/pkgs/by-name/mo/mongodb-compass/package.nix @@ -34,7 +34,7 @@ }: let - version = "1.45.1"; + version = "1.45.2"; rpath = lib.makeLibraryPath [ alsa-lib @@ -84,7 +84,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb"; - hash = "sha256-EEpP1M51Lyki4MJ3iMNpcxJbqPYl4bZGE3frax8kD0k="; + hash = "sha256-sP4WKV8DF05Lwlh+jboWU3xCono85FyeUi+5vzgx+E0="; } else throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; From 7aa016f96a27aec33ab3180fbc51b35ca516f402 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Jan 2025 13:30:37 +0000 Subject: [PATCH 0112/2168] libtorrent-rasterbar: 2.0.10 -> 2.0.11 --- pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix b/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix index 236b930a994d..b544b1c6f77e 100644 --- a/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix +++ b/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix @@ -12,7 +12,7 @@ }: let - version = "2.0.10"; + version = "2.0.11"; # Make sure we override python, so the correct version is chosen boostPython = boost.override { @@ -29,7 +29,7 @@ stdenv.mkDerivation { owner = "arvidn"; repo = "libtorrent"; rev = "v${version}"; - hash = "sha256-JrAYtoS8wNmmhbgnprD7vNz1N64ekIryjK77rAKTyaQ="; + hash = "sha256-iph42iFEwP+lCWNPiOJJOejISFF6iwkGLY9Qg8J4tyo="; fetchSubmodules = true; }; From 1d706ae8086e983e95df64db5c496b64488c6ec1 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Mon, 27 Jan 2025 18:40:17 +0100 Subject: [PATCH 0113/2168] mmtui: init at 0.1.1 [mmtui](https://github.com/SL-RU/mmtui) is a TUI interface to manage udisk2 mounts, written in rust. --- pkgs/by-name/mm/mmtui/package.nix | 37 +++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 pkgs/by-name/mm/mmtui/package.nix diff --git a/pkgs/by-name/mm/mmtui/package.nix b/pkgs/by-name/mm/mmtui/package.nix new file mode 100644 index 000000000000..4407075258b9 --- /dev/null +++ b/pkgs/by-name/mm/mmtui/package.nix @@ -0,0 +1,37 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + nix-update-script, +}: + +rustPlatform.buildRustPackage rec { + pname = "mmtui"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "SL-RU"; + repo = "mmtui"; + tag = "v${version}"; + hash = "sha256-s+50kz6OODZ0xKz8oNF2YEzk+mLZ6gXXynl8g6Uwdo4="; + }; + + cargoHash = "sha256-9F1YMepkWksTQRrkziNhLxVJnhoDH17lSKef5kOjp3Y="; + useFetchCargoVendor = true; + + nativeBuildInputs = [ + rustPlatform.bindgenHook + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/SL-RU/mmtui/releases/tag/v${version}"; + description = "TUI disk mount manager for TUI file managers"; + homepage = "https://github.com/SL-RU/mmtui"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ grimmauld ]; + mainProgram = "mmtui"; + platforms = lib.platforms.linux; + }; +} From 06b47bf4d00d45ec6da1bf4c8a7394896d71ea4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tristan=20Dani=C3=ABl=20Maat?= Date: Wed, 29 Jan 2025 00:34:57 +0800 Subject: [PATCH 0114/2168] crowdsec: Correctly add upstream systemd service to outputs --- pkgs/by-name/cr/crowdsec/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/cr/crowdsec/package.nix b/pkgs/by-name/cr/crowdsec/package.nix index 4c3a030b9e34..6dd3b25da063 100644 --- a/pkgs/by-name/cr/crowdsec/package.nix +++ b/pkgs/by-name/cr/crowdsec/package.nix @@ -42,6 +42,10 @@ buildGoModule rec { mkdir -p $out/share/crowdsec cp -r ./config $out/share/crowdsec/ + mkdir -p $out/lib/systemd/system + substitute ./config/crowdsec.service $out/lib/systemd/system/crowdsec.service \ + --replace-fail /usr/local $out + installShellCompletion --cmd cscli \ --bash <($out/bin/cscli completion bash) \ --fish <($out/bin/cscli completion fish) \ From 426a7afc9a6ecfdac544bda4022acef31e36df34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tristan=20Dani=C3=ABl=20Maat?= Date: Wed, 29 Jan 2025 00:36:48 +0800 Subject: [PATCH 0115/2168] crowdsec: Set tag version as expected by upstream Without setting the correct version here, the package is completely broken as the local API checks that any clients report the correct user agent, which includes this string. The sanity check missed this since `grep` just checks if a string exists in the line, and the version happened to be a superstring of what is expected. I've made this a bit more robust and switched to using `preCheck` rather than replacing the whole `checkPhase` while I'm here. This has been broken since switching to `refs/tags` in 326517a5290c34e0cc4da564825a7193a692f2b0. --- pkgs/by-name/cr/crowdsec/package.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cr/crowdsec/package.nix b/pkgs/by-name/cr/crowdsec/package.nix index 6dd3b25da063..6a466fa686f8 100644 --- a/pkgs/by-name/cr/crowdsec/package.nix +++ b/pkgs/by-name/cr/crowdsec/package.nix @@ -30,7 +30,7 @@ buildGoModule rec { "-w" "-X github.com/crowdsecurity/go-cs-lib/version.Version=v${version}" "-X github.com/crowdsecurity/go-cs-lib/version.BuildDate=1970-01-01_00:00:00" - "-X github.com/crowdsecurity/go-cs-lib/version.Tag=${src.rev}" + "-X github.com/crowdsecurity/go-cs-lib/version.Tag=v${version}" "-X github.com/crowdsecurity/crowdsec/pkg/cwversion.Codename=alphaga" "-X github.com/crowdsecurity/crowdsec/pkg/csconfig.defaultConfigDir=/etc/crowdsec" "-X github.com/crowdsecurity/crowdsec/pkg/csconfig.defaultDataDir=/var/lib/crowdsec/data" @@ -53,8 +53,13 @@ buildGoModule rec { ''; # It's important that the version is correctly set as it also determines feature capabilities - checkPhase = '' - $GOPATH/bin/cscli version 2>&1 | grep -q "version: v${version}" + preCheck = '' + version=$($GOPATH/bin/cscli version 2>&1 | sed -nE 's/^version: (.*)/\1/p') + + if [ "$version" != "v${version}" ]; then + echo "Invalid version string: '$version'" + exit 1 + fi ''; meta = with lib; { From ab9d0650b09329d4ef81ed1fa53b941f65fb5b90 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Tue, 28 Jan 2025 19:27:23 +0100 Subject: [PATCH 0116/2168] python313Packages.arelle: disable for now --- pkgs/development/python-modules/arelle/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/arelle/default.nix b/pkgs/development/python-modules/arelle/default.nix index 0ff14b8ba71e..6348b5aa9d72 100644 --- a/pkgs/development/python-modules/arelle/default.nix +++ b/pkgs/development/python-modules/arelle/default.nix @@ -1,6 +1,7 @@ { lib, buildPythonPackage, + pythonAtLeast, fetchFromGitHub, setuptools, @@ -47,6 +48,8 @@ buildPythonPackage rec { version = "2.30.25"; pyproject = true; + disabled = pythonAtLeast "3.13"; # Note: when updating, check if this is still needed + src = fetchFromGitHub { owner = "Arelle"; repo = "Arelle"; From 66ef4410d120715f93ca92eabdfc1263d6ced67c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 29 Jan 2025 01:21:55 +0000 Subject: [PATCH 0117/2168] keymapper: 4.9.2 -> 4.10.0 --- pkgs/by-name/ke/keymapper/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ke/keymapper/package.nix b/pkgs/by-name/ke/keymapper/package.nix index 0ecba85f6918..9648ea4aa9d3 100644 --- a/pkgs/by-name/ke/keymapper/package.nix +++ b/pkgs/by-name/ke/keymapper/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "keymapper"; - version = "4.9.2"; + version = "4.10.0"; src = fetchFromGitHub { owner = "houmain"; repo = "keymapper"; rev = finalAttrs.version; - hash = "sha256-8SHFIL0HLzi0UkZ8E+VnLf9pQ/I048/HhVx3eWavt/Y="; + hash = "sha256-F6SQMsb4juH9lXA2Hr4CeaOGAlvVssFX5pCrAkn5r3w="; }; # all the following must be in nativeBuildInputs From ac63b08e734e86b914471ecb7749a11c63a19f78 Mon Sep 17 00:00:00 2001 From: Marco Desiderati Date: Wed, 29 Jan 2025 09:01:25 +0100 Subject: [PATCH 0118/2168] maintainers: add shavyn --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 18032c354f0c..c56ab8424288 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -21036,6 +21036,12 @@ githubId = 46294732; name = "Sharzy"; }; + shavyn = { + name = "Marco Desiderati"; + email = "desideratimarco@gmail.com"; + github = "Shavyn"; + githubId = 7593302; + }; shawn8901 = { email = "shawn8901@googlemail.com"; github = "Shawn8901"; From b40e6078bfe734581f85e8980debc16dd06be83a Mon Sep 17 00:00:00 2001 From: Marco Desiderati Date: Wed, 29 Jan 2025 09:01:38 +0100 Subject: [PATCH 0119/2168] snx-rs: 2.2.3 -> 2.9.0 https://github.com/ancwrd1/snx-rs/blob/v2.9.0/CHANGELOG.md Added dependencies for snx-rs GUI to work. --- pkgs/by-name/sn/snx-rs/Cargo.lock | 2111 ++++++++++++++-------------- pkgs/by-name/sn/snx-rs/package.nix | 53 +- 2 files changed, 1105 insertions(+), 1059 deletions(-) diff --git a/pkgs/by-name/sn/snx-rs/Cargo.lock b/pkgs/by-name/sn/snx-rs/Cargo.lock index 6ae6f4b141f8..93695da0b1ec 100644 --- a/pkgs/by-name/sn/snx-rs/Cargo.lock +++ b/pkgs/by-name/sn/snx-rs/Cargo.lock @@ -1,21 +1,21 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" -version = "0.22.0" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ "gimli", ] [[package]] -name = "adler" -version = "1.0.2" +name = "adler2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" [[package]] name = "aes" @@ -28,6 +28,18 @@ dependencies = [ "cpufeatures", ] +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + [[package]] name = "aho-corasick" version = "1.1.3" @@ -37,6 +49,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "allocator-api2" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" + [[package]] name = "android-tzdata" version = "0.1.1" @@ -54,9 +72,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.14" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" +checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" dependencies = [ "anstyle", "anstyle-parse", @@ -69,61 +87,51 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.7" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" +checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" [[package]] name = "anstyle-parse" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" +checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" +checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.3" +version = "3.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" +checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" dependencies = [ "anstyle", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" [[package]] name = "async-broadcast" -version = "0.5.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +checksum = "435a87a52755b8f27fcf321ac4f04b2802e337c8c4872923137471ec39c37532" dependencies = [ - "event-listener 2.5.3", - "futures-core", -] - -[[package]] -name = "async-broadcast" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" -dependencies = [ - "event-listener 5.3.1", + "event-listener", "event-listener-strategy", "futures-core", "pin-project-lite", @@ -143,50 +151,21 @@ dependencies = [ [[package]] name = "async-io" -version = "1.13.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +checksum = "43a2b323ccce0a1d90b449fd71f2a06ca7faa7c54c2751f06c9bd851fc061059" dependencies = [ - "async-lock 2.8.0", - "autocfg", - "cfg-if", - "concurrent-queue", - "futures-lite 1.13.0", - "log", - "parking", - "polling 2.8.0", - "rustix 0.37.27", - "slab", - "socket2 0.4.10", - "waker-fn", -] - -[[package]] -name = "async-io" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" -dependencies = [ - "async-lock 3.4.0", + "async-lock", "cfg-if", "concurrent-queue", "futures-io", - "futures-lite 2.3.0", + "futures-lite", "parking", - "polling 3.7.1", - "rustix 0.38.34", + "polling", + "rustix", "slab", "tracing", - "windows-sys 0.52.0", -] - -[[package]] -name = "async-lock" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" -dependencies = [ - "event-listener 2.5.3", + "windows-sys 0.59.0", ] [[package]] @@ -195,46 +174,28 @@ version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener 5.3.1", + "event-listener", "event-listener-strategy", "pin-project-lite", ] [[package]] name = "async-process" -version = "1.8.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" -dependencies = [ - "async-io 1.13.0", - "async-lock 2.8.0", - "async-signal", - "blocking", - "cfg-if", - "event-listener 3.1.0", - "futures-lite 1.13.0", - "rustix 0.38.34", - "windows-sys 0.48.0", -] - -[[package]] -name = "async-process" -version = "2.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a" +checksum = "63255f1dc2381611000436537bbedfe83183faa303a5a0edaf191edef06526bb" dependencies = [ "async-channel", - "async-io 2.3.3", - "async-lock 3.4.0", + "async-io", + "async-lock", "async-signal", "async-task", "blocking", "cfg-if", - "event-listener 5.3.1", - "futures-lite 2.3.0", - "rustix 0.38.34", + "event-listener", + "futures-lite", + "rustix", "tracing", - "windows-sys 0.52.0", ] [[package]] @@ -245,25 +206,25 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.95", ] [[package]] name = "async-signal" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d" +checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" dependencies = [ - "async-io 2.3.3", - "async-lock 3.4.0", + "async-io", + "async-lock", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.34", + "rustix", "signal-hook-registry", "slab", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -274,20 +235,20 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.80" +version = "0.1.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "3f934833b4b7233644e5848f235df3f57ed8c80f1528a26c3dfa13d2147fa056" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.95", ] [[package]] name = "atk" -version = "0.18.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4af014b17dd80e8af9fa689b2d4a211ddba6eb583c1622f35d0cb543f6b17e4" +checksum = "241b621213072e993be4f6f3a9e4b45f65b7e6faad43001be957184b7bb1824b" dependencies = [ "atk-sys", "glib", @@ -296,9 +257,9 @@ dependencies = [ [[package]] name = "atk-sys" -version = "0.18.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "251e0b7d90e33e0ba930891a505a9a35ece37b2dd37a14f3ffc306c13b980009" +checksum = "c5e48b684b0ca77d2bbadeef17424c2ea3c897d44d566a1617e7e8f30614d086" dependencies = [ "glib-sys", "gobject-sys", @@ -314,23 +275,23 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "backtrace" -version = "0.3.72" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", "miniz_oxide", "object", "rustc-demangle", + "windows-targets 0.52.6", ] [[package]] @@ -347,19 +308,13 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" 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" @@ -378,6 +333,15 @@ dependencies = [ "generic-array", ] +[[package]] +name = "block2" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" +dependencies = [ + "objc2", +] + [[package]] name = "blocking" version = "1.6.1" @@ -387,15 +351,15 @@ dependencies = [ "async-channel", "async-task", "futures-io", - "futures-lite 2.3.0", + "futures-lite", "piper", ] [[package]] name = "bstr" -version = "1.9.1" +version = "1.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" +checksum = "531a9155a481e2ee699d4f98f43c0ca4ff8ee1bfd55c31e9e98fb29d2b176fe0" dependencies = [ "memchr", "regex-automata", @@ -416,42 +380,81 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" +dependencies = [ + "serde", +] [[package]] name = "c2rust-bitfields" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b43c3f07ab0ef604fa6f595aa46ec2f8a22172c975e186f6f5bf9829a3b72c41" +checksum = "367e5d1b30f28be590b6b3868da1578361d29d9bfac516d22f497d28ed7c9055" dependencies = [ "c2rust-bitfields-derive", ] [[package]] name = "c2rust-bitfields-derive" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3cbc102e2597c9744c8bd8c15915d554300601c91a079430d309816b0912545" +checksum = "a279db9c50c4024eeca1a763b6e0f033848ce74e83e47454bcf8a8a98f7b0b56" dependencies = [ "proc-macro2", "quote", "syn 1.0.109", ] +[[package]] +name = "cached" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9718806c4a2fe9e8a56fd736f97b340dd10ed1be8ed733ed50449f351dc33cae" +dependencies = [ + "ahash", + "async-trait", + "cached_proc_macro", + "cached_proc_macro_types", + "futures", + "hashbrown 0.14.5", + "once_cell", + "thiserror 1.0.69", + "tokio", + "web-time", +] + +[[package]] +name = "cached_proc_macro" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f42a145ed2d10dce2191e1dcf30cfccfea9026660e143662ba5eec4017d5daa" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.95", +] + +[[package]] +name = "cached_proc_macro_types" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade8366b8bd5ba243f0a58f036cc0ca8a2f069cff1a2351ef1cac6b083e16fc0" + [[package]] name = "cairo-rs" version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cairo-sys-rs", "glib", "libc", "once_cell", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -476,9 +479,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.99" +version = "1.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" +checksum = "a012a0df96dd6d06ba9a1b29d6402d1a5d77c6befd2566afdc26e10603dc93d7" +dependencies = [ + "shlex", +] [[package]] name = "cfg-expr" @@ -496,12 +502,6 @@ 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 = "cfg_aliases" version = "0.2.1" @@ -510,9 +510,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "chrono" -version = "0.4.38" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825" dependencies = [ "android-tzdata", "iana-time-zone", @@ -520,7 +520,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -535,9 +535,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.7" +version = "4.5.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f" +checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84" dependencies = [ "clap_builder", "clap_derive", @@ -545,9 +545,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.7" +version = "4.5.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f" +checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838" dependencies = [ "anstream", "anstyle", @@ -557,57 +557,27 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.5" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.95", ] [[package]] name = "clap_lex" -version = "0.7.1" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" - -[[package]] -name = "cocoa" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" -dependencies = [ - "bitflags 1.3.2", - "block", - "cocoa-foundation", - "core-foundation", - "core-graphics", - "foreign-types 0.5.0", - "libc", - "objc", -] - -[[package]] -name = "cocoa-foundation" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" -dependencies = [ - "bitflags 1.3.2", - "block", - "core-foundation", - "core-graphics-types", - "libc", - "objc", -] +checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" [[package]] name = "colorchoice" -version = "1.0.1" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" +checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" [[package]] name = "concurrent-queue" @@ -629,19 +599,29 @@ dependencies = [ ] [[package]] -name = "core-foundation-sys" -version = "0.8.6" +name = "core-foundation" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "core-graphics" -version = "0.23.2" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" +checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1" dependencies = [ - "bitflags 1.3.2", - "core-foundation", + "bitflags 2.6.0", + "core-foundation 0.10.0", "core-graphics-types", "foreign-types 0.5.0", "libc", @@ -649,20 +629,20 @@ dependencies = [ [[package]] name = "core-graphics-types" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" +checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb" dependencies = [ - "bitflags 1.3.2", - "core-foundation", + "bitflags 2.6.0", + "core-foundation 0.10.0", "libc", ] [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" dependencies = [ "libc", ] @@ -678,18 +658,18 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.13" +version = "0.5.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471" dependencies = [ "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.20" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "crypto-common" @@ -703,9 +683,9 @@ dependencies = [ [[package]] name = "cryptoki" -version = "0.6.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9123ecc6a29329cd3f852e6e6814f302ed777820e1eb60b098b89aee0eb91b" +checksum = "2e45b5f1ddb06ae54aea3f6d60e88c493356c51f43b8e741c9d5ac661f4d02d3" dependencies = [ "bitflags 1.3.2", "cryptoki-sys", @@ -717,13 +697,48 @@ dependencies = [ [[package]] name = "cryptoki-sys" -version = "0.1.7" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a978e5e226446ac68eded4f92796947130f0d21de1e21bf80298f9f50d917d5" +checksum = "062316aeb324b15a0b10c9475a9e67d613b7409056c33fbe33b7c12027408cfb" dependencies = [ "libloading 0.7.4", ] +[[package]] +name = "darling" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.95", +] + +[[package]] +name = "darling_macro" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.95", +] + [[package]] name = "dbus" version = "0.9.7" @@ -735,17 +750,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "digest" version = "0.10.7" @@ -801,13 +805,13 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.95", ] [[package]] @@ -818,15 +822,15 @@ checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53" [[package]] name = "either" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "encoding_rs" -version = "0.8.34" +version = "0.8.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" dependencies = [ "cfg-if", ] @@ -839,14 +843,14 @@ checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" [[package]] name = "enum-as-inner" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" +checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.95", ] [[package]] @@ -867,7 +871,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.95", ] [[package]] @@ -878,29 +882,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[package]] -name = "event-listener" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", + "windows-sys 0.59.0", ] [[package]] @@ -916,34 +903,25 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +checksum = "3c3e4e0dd3673c1139bf041f3008816d9cf2946bbfac2945c09e523b8d7b05b2" dependencies = [ - "event-listener 5.3.1", + "event-listener", "pin-project-lite", ] [[package]] name = "fastrand" -version = "1.9.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "fastrand" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "fdeflate" -version = "0.3.4" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +checksum = "1e6853b52649d4ac5c0bd02320cddc5ba956bdb407c4b75a2c6b75bf51500f8c" dependencies = [ "simd-adler32", ] @@ -954,15 +932,15 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" dependencies = [ - "memoffset 0.9.1", + "memoffset", "rustc_version", ] [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" dependencies = [ "crc32fast", "miniz_oxide", @@ -1001,7 +979,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.95", ] [[package]] @@ -1027,9 +1005,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -1042,9 +1020,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -1052,15 +1030,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -1069,32 +1047,17 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-lite" -version = "1.13.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +checksum = "cef40d21ae2c515b51041df9ed313ed21e572df340ea58a922a0aefe7e8891a1" dependencies = [ - "fastrand 1.9.0", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] - -[[package]] -name = "futures-lite" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" -dependencies = [ - "fastrand 2.1.0", + "fastrand", "futures-core", "futures-io", "parking", @@ -1103,32 +1066,32 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.95", ] [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -1144,9 +1107,9 @@ dependencies = [ [[package]] name = "gdk" -version = "0.18.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5ba081bdef3b75ebcdbfc953699ed2d7417d6bd853347a42a37d76406a33646" +checksum = "d9f245958c627ac99d8e529166f9823fb3b838d1d41fd2b297af3075093c2691" dependencies = [ "cairo-rs", "gdk-pixbuf", @@ -1185,9 +1148,9 @@ dependencies = [ [[package]] name = "gdk-sys" -version = "0.18.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31ff856cb3386dae1703a920f803abafcc580e9b5f711ca62ed1620c25b51ff2" +checksum = "5c2d13f38594ac1e66619e188c6d5a1adb98d11b2fcf7894fc416ad76aa2f3f7" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1223,9 +1186,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.29.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "gio" @@ -1243,7 +1206,7 @@ dependencies = [ "once_cell", "pin-project-lite", "smallvec", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -1265,7 +1228,7 @@ version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "futures-channel", "futures-core", "futures-executor", @@ -1279,7 +1242,7 @@ dependencies = [ "memchr", "once_cell", "smallvec", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -1293,7 +1256,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.95", ] [[package]] @@ -1319,9 +1282,9 @@ dependencies = [ [[package]] name = "gtk" -version = "0.18.1" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93c4f5e0e20b60e10631a5f06da7fe3dda744b05ad0ea71fee2f47adf865890c" +checksum = "fd56fb197bfc42bd5d2751f4f017d44ff59fbb58140c6b49f9b3b2bdab08506a" dependencies = [ "atk", "cairo-rs", @@ -1340,9 +1303,9 @@ dependencies = [ [[package]] name = "gtk-sys" -version = "0.18.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771437bf1de2c1c0b496c11505bdf748e26066bbe942dfc8f614c9460f6d7722" +checksum = "8f29a1c21c59553eb7dd40e918be54dccd60c52b049b75119d5d96ce6b624414" dependencies = [ "atk-sys", "cairo-sys-rs", @@ -1358,22 +1321,22 @@ dependencies = [ [[package]] name = "gtk3-macros" -version = "0.18.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6063efb63db582968fb7df72e1ae68aa6360dcfb0a75143f34fc7d616bad75e" +checksum = "52ff3c5b21f14f0736fed6dcfc0bfb4225ebf5725f3c0209edeec181e4d73e9d" dependencies = [ "proc-macro-crate 1.3.1", "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.95", ] [[package]] name = "h2" -version = "0.4.5" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e" dependencies = [ "atomic-waker", "bytes", @@ -1393,6 +1356,16 @@ name = "hashbrown" version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash", + "allocator-api2", +] + +[[package]] +name = "hashbrown" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" [[package]] name = "heck" @@ -1408,9 +1381,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hermit-abi" -version = "0.3.9" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" [[package]] name = "hex" @@ -1438,9 +1411,9 @@ dependencies = [ [[package]] name = "http" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea" dependencies = [ "bytes", "fnv", @@ -1449,9 +1422,9 @@ dependencies = [ [[package]] name = "http-body" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", "http", @@ -1472,15 +1445,15 @@ dependencies = [ [[package]] name = "httparse" -version = "1.9.2" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f3935c160d00ac752e09787e6e6bfc26494c2183cc922f1bc678a60d4733bc2" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" [[package]] name = "hyper" -version = "1.3.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" +checksum = "256fb8d4bd6413123cc9d91832d78325c48ff41677595be797d90f42969beae0" dependencies = [ "bytes", "futures-channel", @@ -1496,6 +1469,23 @@ dependencies = [ "want", ] +[[package]] +name = "hyper-rustls" +version = "0.27.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2" +dependencies = [ + "futures-util", + "http", + "hyper", + "hyper-util", + "rustls", + "rustls-pki-types", + "tokio", + "tokio-rustls", + "tower-service", +] + [[package]] name = "hyper-tls" version = "0.6.0" @@ -1514,9 +1504,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.5" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56" +checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4" dependencies = [ "bytes", "futures-channel", @@ -1525,25 +1515,24 @@ dependencies = [ "http-body", "hyper", "pin-project-lite", - "socket2 0.5.7", + "socket2", "tokio", - "tower", "tower-service", "tracing", ] [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core 0.52.0", + "windows-core", ] [[package]] @@ -1626,9 +1615,9 @@ checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" [[package]] name = "icu_properties" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f8ac670d7422d7f76b32e17a5db556510825b29ec9154f235977c9caba61036" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" dependencies = [ "displaydoc", "icu_collections", @@ -1670,29 +1659,44 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.95", ] [[package]] -name = "idna" -version = "1.0.0" +name = "ident_case" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4716a3a0933a1d01c2f72450e89596eb51dd34ef3c211ccd875acdf1f8fe47ed" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" dependencies = [ - "icu_normalizer", - "icu_properties", + "idna_adapter", "smallvec", "utf8_iter", ] [[package]] -name = "indexmap" -version = "2.2.6" +name = "idna_adapter" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +dependencies = [ + "icu_normalizer", + "icu_properties", +] + +[[package]] +name = "indexmap" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.15.2", ] [[package]] @@ -1705,112 +1709,65 @@ dependencies = [ "generic-array", ] -[[package]] -name = "instant" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "ioctl-sys" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bd11f3a29434026f5ff98c730b668ba74b1033637b8817940b54d040696133c" - [[package]] name = "ipnet" -version = "2.9.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" dependencies = [ "serde", ] [[package]] name = "is_terminal_polyfill" -version = "1.70.0" +version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "isakmp" version = "0.1.0" -source = "git+https://github.com/ancwrd1/isakmp.git#f958a02bd70bcaae8556ec9d5f8c0bdc97957cbd" +source = "git+https://github.com/ancwrd1/isakmp.git#c6360f5ac959fa386871b43ea49d92856deb0c73" dependencies = [ "anyhow", "async-trait", - "bitflags 2.5.0", + "bitflags 2.6.0", "byteorder", "bytes", "cryptoki", - "futures", "hex", "itertools", "openssl", "parking_lot", "rand", + "rmp-serde", + "serde", "tokio", "tracing", ] [[package]] name = "itertools" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.11" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - -[[package]] -name = "javascriptcore-rs" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca5671e9ffce8ffba57afc24070e906da7fc4b1ba66f2cabebf61bf2ea257fcc" -dependencies = [ - "bitflags 1.3.2", - "glib", - "javascriptcore-rs-sys", -] - -[[package]] -name = "javascriptcore-rs-sys" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af1be78d14ffa4b75b66df31840478fef72b51f8c2465d4ca7c194da9f7a5124" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] +checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7" dependencies = [ + "once_cell", "wasm-bindgen", ] @@ -1820,16 +1777,16 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "serde", "unicode-segmentation", ] [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libappindicator" @@ -1857,9 +1814,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.155" +version = "0.2.169" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" [[package]] name = "libdbus-sys" @@ -1883,12 +1840,12 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.3" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" dependencies = [ "cfg-if", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -1897,16 +1854,10 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", ] -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - [[package]] name = "linux-raw-sys" version = "0.4.14" @@ -1915,9 +1866,9 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "litemap" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" +checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" [[package]] name = "lock_api" @@ -1931,33 +1882,15 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" - -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" - -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memoffset" @@ -1976,41 +1909,42 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "miniz_oxide" -version = "0.7.3" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" +checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394" dependencies = [ - "adler", + "adler2", "simd-adler32", ] [[package]] name = "mio" -version = "0.8.11" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" dependencies = [ "libc", "wasi", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "muda" -version = "0.13.5" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b959f97c97044e4c96e32e1db292a7d594449546a3c6b77ae613dc3a5b5145" +checksum = "fdae9c00e61cc0579bcac625e8ad22104c60548a025bfc972dc83868a28e1484" dependencies = [ - "cocoa", "crossbeam-channel", "dpi", "gtk", "keyboard-types", - "objc", + "objc2", + "objc2-app-kit", + "objc2-foundation", "once_cell", "png", - "thiserror", - "windows-sys 0.52.0", + "thiserror 1.0.69", + "windows-sys 0.59.0", ] [[package]] @@ -2030,50 +1964,26 @@ dependencies = [ "tempfile", ] -[[package]] -name = "nix" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset 0.7.1", -] - -[[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 0.1.1", - "libc", - "memoffset 0.9.1", -] - [[package]] name = "nix" version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", - "cfg_aliases 0.2.1", + "cfg_aliases", "libc", + "memoffset", ] [[package]] name = "normpath" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5831952a9476f2fed74b77d74182fa5ddc4d21c72ec45a333b250e3ed0272804" +checksum = "c8911957c4b1549ac0dc74e30db9c8b0e66ddcd6d7acc33098f4c63a64a6d7ed" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2102,9 +2012,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ "num-integer", "num-traits", @@ -2160,58 +2070,138 @@ dependencies = [ ] [[package]] -name = "num_cpus" -version = "1.16.0" +name = "objc-sys" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" + +[[package]] +name = "objc2" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" dependencies = [ - "hermit-abi", - "libc", + "objc-sys", + "objc2-encode", ] [[package]] -name = "objc" -version = "0.2.7" +name = "objc2-app-kit" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" dependencies = [ - "malloc_buf", + "bitflags 2.6.0", + "block2", + "libc", + "objc2", + "objc2-core-data", + "objc2-core-image", + "objc2-foundation", + "objc2-quartz-core", +] + +[[package]] +name = "objc2-core-data" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-image" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc2-encode" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" + +[[package]] +name = "objc2-foundation" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" +dependencies = [ + "bitflags 2.6.0", + "block2", + "libc", + "objc2", +] + +[[package]] +name = "objc2-metal" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-quartz-core" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-foundation", + "objc2-metal", ] [[package]] name = "object" -version = "0.35.0" +version = "0.36.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e" +checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "opener" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8df34be653210fbe9ffaff41d3b92721c56ce82dfee58ee684f9afb5e3a90c0" +checksum = "d0812e5e4df08da354c851a3376fead46db31c2214f849d3de356d774d057681" dependencies = [ "bstr", "dbus", "normpath", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "openssl" -version = "0.10.64" +version = "0.10.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "foreign-types 0.3.2", "libc", @@ -2228,7 +2218,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.95", ] [[package]] @@ -2239,9 +2229,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.102" +version = "0.9.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" dependencies = [ "cc", "libc", @@ -2298,9 +2288,9 @@ dependencies = [ [[package]] name = "parking" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" [[package]] name = "parking_lot" @@ -2322,7 +2312,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -2336,9 +2326,9 @@ dependencies = [ [[package]] name = "passterm" -version = "2.0.3" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eea7e8981bca32c52230ca5f28b080dd5f28aed618a7bd12b5a382b234cd2b99" +checksum = "150ca2316c7813c688677784f20bb0a9efab639415ae1961869863ee99a81e51" dependencies = [ "libc", ] @@ -2357,20 +2347,20 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.10" +version = "2.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" +checksum = "8b7cafe60d6cf8e62e1b9b2ea516a089c008945bb5a275416789e7db0bc199dc" dependencies = [ "memchr", - "thiserror", + "thiserror 2.0.9", "ucd-trie", ] [[package]] name = "pest_derive" -version = "2.7.10" +version = "2.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459" +checksum = "816518421cfc6887a0d62bf441b6ffb4536fcc926395a69e1a85852d4363f57e" dependencies = [ "pest", "pest_generator", @@ -2378,53 +2368,33 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.10" +version = "2.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687" +checksum = "7d1396fd3a870fc7838768d171b4616d5c91f6cc25e377b673d714567d99377b" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.95", ] [[package]] name = "pest_meta" -version = "2.7.10" +version = "2.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd" +checksum = "e1e58089ea25d717bfd31fb534e4f3afcc2cc569c70de3e239778991ea3b7dea" dependencies = [ "once_cell", "pest", "sha2", ] -[[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.66", -] - [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" [[package]] name = "pin-utils" @@ -2434,26 +2404,26 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" dependencies = [ "atomic-waker", - "fastrand 2.1.0", + "fastrand", "futures-io", ] [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "png" -version = "0.17.13" +version = "0.17.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" +checksum = "82151a2fc869e011c153adc57cf2789ccb8d9906ce52c0b39a6b5697749d7526" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -2464,40 +2434,27 @@ dependencies = [ [[package]] name = "polling" -version = "2.8.0" +version = "3.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" -dependencies = [ - "autocfg", - "bitflags 1.3.2", - "cfg-if", - "concurrent-queue", - "libc", - "log", - "pin-project-lite", - "windows-sys 0.48.0", -] - -[[package]] -name = "polling" -version = "3.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e6a007746f34ed64099e88783b0ae369eaa3da6392868ba262e2af9b8fbaea1" +checksum = "a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f" dependencies = [ "cfg-if", "concurrent-queue", "hermit-abi", "pin-project-lite", - "rustix 0.38.34", + "rustix", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "proc-macro-crate" @@ -2520,11 +2477,11 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.21.1", + "toml_edit 0.22.22", ] [[package]] @@ -2553,18 +2510,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.85" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.36" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] @@ -2601,29 +2558,29 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.1" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] name = "redox_users" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "regex" -version = "1.10.5" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", @@ -2633,9 +2590,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", @@ -2644,15 +2601,15 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "reqwest" -version = "0.12.4" +version = "0.12.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" +checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da" dependencies = [ "base64", "bytes", @@ -2664,6 +2621,7 @@ dependencies = [ "http-body", "http-body-util", "hyper", + "hyper-rustls", "hyper-tls", "hyper-util", "ipnet", @@ -2682,12 +2640,50 @@ dependencies = [ "system-configuration", "tokio", "tokio-native-tls", + "tower", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "winreg", + "windows-registry", +] + +[[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 = "rmp" +version = "0.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" +dependencies = [ + "byteorder", + "num-traits", + "paste", +] + +[[package]] +name = "rmp-serde" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db" +dependencies = [ + "byteorder", + "rmp", + "serde", ] [[package]] @@ -2698,55 +2694,64 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver", ] [[package]] name = "rustix" -version = "0.37.27" +version = "0.38.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" +checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "errno", - "io-lifetimes", "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", + "linux-raw-sys", + "windows-sys 0.59.0", ] [[package]] -name = "rustix" -version = "0.38.34" +name = "rustls" +version = "0.23.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "5065c3f250cbd332cd894be57c40fa52387247659b14a2d6041d121547903b1b" dependencies = [ - "bitflags 2.5.0", - "errno", - "libc", - "linux-raw-sys 0.4.14", - "windows-sys 0.52.0", + "once_cell", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", ] [[package]] name = "rustls-pemfile" -version = "2.1.2" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" dependencies = [ - "base64", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.7.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" +checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37" + +[[package]] +name = "rustls-webpki" +version = "0.102.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] [[package]] name = "ryu" @@ -2756,11 +2761,11 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "schannel" -version = "0.1.23" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2780,9 +2785,9 @@ dependencies = [ [[package]] name = "secret-service" -version = "3.1.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5204d39df37f06d1944935232fd2dfe05008def7ca599bf28c0800366c8a8f9" +checksum = "e4d35ad99a181be0a60ffcbe85d680d98f87bdc4d7644ade319b87076b9dbfd4" dependencies = [ "aes", "cbc", @@ -2794,17 +2799,17 @@ dependencies = [ "rand", "serde", "sha2", - "zbus 3.15.2", + "zbus 4.4.0", ] [[package]] name = "security-framework" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 2.5.0", - "core-foundation", + "bitflags 2.6.0", + "core-foundation 0.9.4", "core-foundation-sys", "libc", "security-framework-sys", @@ -2812,9 +2817,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" +checksum = "1863fd3768cd83c56a7f60faa4dc0d403f1b6df0a38c3c25f44b7894e45370d5" dependencies = [ "core-foundation-sys", "libc", @@ -2822,37 +2827,38 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.23" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" +checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.95", ] [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.135" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -2865,14 +2871,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.95", ] [[package]] name = "serde_spanned" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" dependencies = [ "serde", ] @@ -2902,9 +2908,9 @@ dependencies = [ [[package]] name = "sha1_smol" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" +checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d" [[package]] name = "sha2" @@ -2926,6 +2932,12 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "signal-hook-registry" version = "1.4.2" @@ -2958,7 +2970,7 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "snx-rs" -version = "2.2.3" +version = "2.9.0" dependencies = [ "anyhow", "clap", @@ -2973,7 +2985,7 @@ dependencies = [ [[package]] name = "snx-rs-gui" -version = "2.2.3" +version = "2.9.0" dependencies = [ "anyhow", "async-channel", @@ -2989,13 +3001,12 @@ dependencies = [ "tracing", "tracing-subscriber", "tray-icon", - "webkit2gtk", - "zbus 4.2.2", + "zbus 5.2.0", ] [[package]] name = "snxcore" -version = "2.2.3" +version = "2.9.0" dependencies = [ "anyhow", "async-recursion", @@ -3003,6 +3014,7 @@ dependencies = [ "base64", "byteorder", "bytes", + "cached", "chrono", "directories-next", "enum-as-inner", @@ -3011,10 +3023,10 @@ dependencies = [ "ipnet", "isakmp", "libc", - "nix 0.29.0", + "nix", "num-traits", "once_cell", - "parking_lot", + "opener", "parse_int", "passterm", "pest", @@ -3025,22 +3037,22 @@ dependencies = [ "secret-service", "serde", "serde_json", + "tempfile", "tokio", "tokio-native-tls", "tokio-util", "tracing", "tun", "uuid", - "zbus 4.2.2", + "zbus 5.2.0", ] [[package]] name = "snxctl" -version = "2.2.3" +version = "2.9.0" dependencies = [ "anyhow", "clap", - "opener", "snxcore", "tokio", "tracing", @@ -3049,49 +3061,19 @@ dependencies = [ [[package]] name = "socket2" -version = "0.4.10" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "socket2" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" dependencies = [ "libc", "windows-sys 0.52.0", ] [[package]] -name = "soup3" -version = "0.5.0" +name = "spin" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "471f924a40f31251afc77450e781cb26d55c0b650842efafc9c6cbd2f7cc4f9f" -dependencies = [ - "futures-channel", - "gio", - "glib", - "libc", - "soup3-sys", -] - -[[package]] -name = "soup3-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ebe8950a680a12f24f15ebe1bf70db7af98ad242d9db43596ad3108aab86c27" -dependencies = [ - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "stable_deref_trait" @@ -3113,9 +3095,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" @@ -3130,9 +3112,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.66" +version = "2.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" dependencies = [ "proc-macro2", "quote", @@ -3141,9 +3123,12 @@ dependencies = [ [[package]] name = "sync_wrapper" -version = "0.1.2" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" +dependencies = [ + "futures-core", +] [[package]] name = "synstructure" @@ -3153,25 +3138,25 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.95", ] [[package]] name = "system-configuration" -version = "0.5.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ - "bitflags 1.3.2", - "core-foundation", + "bitflags 2.6.0", + "core-foundation 0.9.4", "system-configuration-sys", ] [[package]] name = "system-configuration-sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" dependencies = [ "core-foundation-sys", "libc", @@ -3192,40 +3177,62 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.14" +version = "0.12.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tempfile" -version = "3.10.1" +version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "9a8a559c81686f576e8cd0290cd2a24a2a9ad80c98b3478856500fcbd7acd704" dependencies = [ "cfg-if", - "fastrand 2.1.0", - "rustix 0.38.34", - "windows-sys 0.52.0", + "fastrand", + "getrandom", + "once_cell", + "rustix", + "windows-sys 0.59.0", ] [[package]] name = "thiserror" -version = "1.0.61" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc" +dependencies = [ + "thiserror-impl 2.0.9", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.95", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.95", ] [[package]] @@ -3250,32 +3257,32 @@ dependencies = [ [[package]] name = "tokio" -version = "1.38.0" +version = "1.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" +checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" dependencies = [ "backtrace", "bytes", "libc", "mio", - "num_cpus", + "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.7", + "socket2", "tokio-macros", "tracing", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.95", ] [[package]] @@ -3289,10 +3296,20 @@ dependencies = [ ] [[package]] -name = "tokio-util" -version = "0.7.11" +name = "tokio-rustls" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37" +dependencies = [ + "rustls", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078" dependencies = [ "bytes", "futures-core", @@ -3303,21 +3320,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.14" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.14", + "toml_edit 0.22.22", ] [[package]] name = "toml_datetime" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] @@ -3346,38 +3363,27 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.21.1" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.22.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.13", + "winnow 0.6.22", ] [[package]] name = "tower" -version = "0.4.13" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" dependencies = [ "futures-core", "futures-util", - "pin-project", "pin-project-lite", + "sync_wrapper", "tokio", "tower-layer", "tower-service", @@ -3385,21 +3391,21 @@ dependencies = [ [[package]] name = "tower-layer" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.40" +version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ "pin-project-lite", "tracing-attributes", @@ -3408,20 +3414,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.95", ] [[package]] name = "tracing-core" -version = "0.1.32" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" dependencies = [ "once_cell", "valuable", @@ -3440,9 +3446,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" dependencies = [ "nu-ansi-term", "sharded-slab", @@ -3454,21 +3460,22 @@ dependencies = [ [[package]] name = "tray-icon" -version = "0.14.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ad8319cca93189ea9ab1b290de0595960529750b6b8b501a399ed1ec3775d60" +checksum = "d48a05076dd272615d03033bf04f480199f7d1b66a8ac64d75c625fc4a70c06b" dependencies = [ - "cocoa", "core-graphics", "crossbeam-channel", "dirs", "libappindicator", "muda", - "objc", + "objc2", + "objc2-app-kit", + "objc2-foundation", "once_cell", "png", - "thiserror", - "windows-sys 0.52.0", + "thiserror 1.0.69", + "windows-sys 0.59.0", ] [[package]] @@ -3479,20 +3486,23 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tun" -version = "0.6.1" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0adb9992bbd5ca76f3847ed579ad4ee8defb2ec2eea918cceef17ccc66fa4fd4" +checksum = "5b5ea2466ffcdd0be0831f7d3981daa0b953586c0062f6d33398cb374689b090" dependencies = [ - "byteorder", "bytes", + "cfg-if", + "futures", "futures-core", - "ioctl-sys", + "ipnet", "libc", "log", - "thiserror", + "nix", + "thiserror 2.0.9", "tokio", "tokio-util", - "wintun", + "windows-sys 0.59.0", + "wintun-bindings", ] [[package]] @@ -3503,9 +3513,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "ucd-trie" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" +checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971" [[package]] name = "uds_windows" @@ -3513,28 +3523,34 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" dependencies = [ - "memoffset 0.9.1", + "memoffset", "tempfile", "winapi", ] [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unicode-segmentation" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.1" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c25da092f0a868cdf09e8674cd3b7ef3a7d92a24253e663a2fb85e2496de56" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" dependencies = [ "form_urlencoded", "idna", @@ -3561,9 +3577,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.8.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" dependencies = [ "getrandom", "sha1_smol", @@ -3589,15 +3605,9 @@ checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "waker-fn" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "want" @@ -3616,46 +3626,47 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79" dependencies = [ "bumpalo", "log", - "once_cell", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.95", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2" dependencies = [ "cfg-if", "js-sys", + "once_cell", "wasm-bindgen", "web-sys", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3663,75 +3674,41 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.95", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6" [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc" dependencies = [ "js-sys", "wasm-bindgen", ] [[package]] -name = "webkit2gtk" -version = "2.0.1" +name = "web-time" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76b1bc1e54c581da1e9f179d0b38512ba358fb1af2d634a1affe42e37172361a" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" dependencies = [ - "bitflags 1.3.2", - "cairo-rs", - "gdk", - "gdk-sys", - "gio", - "gio-sys", - "glib", - "glib-sys", - "gobject-sys", - "gtk", - "gtk-sys", - "javascriptcore-rs", - "libc", - "once_cell", - "soup3", - "webkit2gtk-sys", -] - -[[package]] -name = "webkit2gtk-sys" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62daa38afc514d1f8f12b8693d30d5993ff77ced33ce30cd04deebc267a6d57c" -dependencies = [ - "bitflags 1.3.2", - "cairo-sys-rs", - "gdk-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "gtk-sys", - "javascriptcore-rs-sys", - "libc", - "pkg-config", - "soup3-sys", - "system-deps", + "js-sys", + "wasm-bindgen", ] [[package]] @@ -3756,32 +3733,43 @@ 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.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", ] [[package]] @@ -3799,7 +3787,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -3819,18 +3816,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -3841,9 +3838,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -3853,9 +3850,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -3865,15 +3862,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -3883,9 +3880,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -3895,9 +3892,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -3907,9 +3904,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -3919,9 +3916,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" @@ -3934,34 +3931,37 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.13" +version = "0.6.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" +checksum = "39281189af81c07ec09db316b302a3e67bf9bd7cbf6c820b50e35fee9c2fa980" dependencies = [ "memchr", ] [[package]] -name = "winreg" -version = "0.52.0" +name = "winreg2" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +checksum = "e25225e44ce2ac6b72befed6416b0857cf8663f9963dba572c39473062f0e625" dependencies = [ "cfg-if", - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] -name = "wintun" -version = "0.3.2" +name = "wintun-bindings" +version = "0.7.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29b83b0eca06dd125dbcd48a45327c708a6da8aada3d95a3f06db0ce4b17e0d4" +checksum = "8e35d3911efde5ee25586385204127ff6a3f251477dcdd3b222775aaa4d95977" dependencies = [ + "blocking", "c2rust-bitfields", - "libloading 0.8.3", + "futures", + "libloading 0.8.6", "log", - "thiserror", - "windows", + "thiserror 2.0.9", + "windows-sys 0.59.0", + "winreg2", ] [[package]] @@ -3978,19 +3978,19 @@ checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" [[package]] name = "xdg-home" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8" +checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "yoke" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" +checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" dependencies = [ "serde", "stable_deref_trait", @@ -4000,69 +4000,33 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" +checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.95", "synstructure", ] [[package]] name = "zbus" -version = "3.15.2" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" +checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725" dependencies = [ - "async-broadcast 0.5.1", - "async-process 1.8.1", + "async-broadcast", + "async-process", "async-recursion", "async-trait", - "byteorder", - "derivative", "enumflags2", - "event-listener 2.5.3", + "event-listener", "futures-core", "futures-sink", "futures-util", "hex", - "nix 0.26.4", - "once_cell", - "ordered-stream", - "rand", - "serde", - "serde_repr", - "sha1", - "static_assertions", - "tokio", - "tracing", - "uds_windows", - "winapi", - "xdg-home", - "zbus_macros 3.15.2", - "zbus_names 2.6.1", - "zvariant 3.15.2", -] - -[[package]] -name = "zbus" -version = "4.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "989c3977a7aafa97b12b9a35d21cdcff9b0d2289762b14683f45d66b1ba6c48f" -dependencies = [ - "async-broadcast 0.7.1", - "async-process 2.2.3", - "async-recursion", - "async-trait", - "enumflags2", - "event-listener 5.3.1", - "futures-core", - "futures-sink", - "futures-util", - "hex", - "nix 0.28.0", + "nix", "ordered-stream", "rand", "serde", @@ -4074,47 +4038,67 @@ dependencies = [ "uds_windows", "windows-sys 0.52.0", "xdg-home", - "zbus_macros 4.2.2", + "zbus_macros 4.4.0", "zbus_names 3.0.0", - "zvariant 4.1.1", + "zvariant 4.2.0", ] [[package]] -name = "zbus_macros" -version = "3.15.2" +name = "zbus" +version = "5.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "regex", - "syn 1.0.109", - "zvariant_utils 1.0.1", -] - -[[package]] -name = "zbus_macros" -version = "4.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fe9de53245dcf426b7be226a4217dd5e339080e5d46e64a02d6e5dcbf90fca1" -dependencies = [ - "proc-macro-crate 3.1.0", - "proc-macro2", - "quote", - "syn 2.0.66", - "zvariant_utils 2.0.0", -] - -[[package]] -name = "zbus_names" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" +checksum = "fb67eadba43784b6fb14857eba0d8fc518686d3ee537066eb6086dc318e2c8a1" dependencies = [ + "async-broadcast", + "async-recursion", + "async-trait", + "enumflags2", + "event-listener", + "futures-core", + "futures-util", + "hex", + "nix", + "ordered-stream", "serde", + "serde_repr", "static_assertions", - "zvariant 3.15.2", + "tokio", + "tracing", + "uds_windows", + "windows-sys 0.59.0", + "winnow 0.6.22", + "xdg-home", + "zbus_macros 5.2.0", + "zbus_names 4.1.0", + "zvariant 5.1.0", +] + +[[package]] +name = "zbus_macros" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e" +dependencies = [ + "proc-macro-crate 3.2.0", + "proc-macro2", + "quote", + "syn 2.0.95", + "zvariant_utils 2.1.0", +] + +[[package]] +name = "zbus_macros" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d49ebc960ceb660f2abe40a5904da975de6986f2af0d7884b39eec6528c57" +dependencies = [ + "proc-macro-crate 3.2.0", + "proc-macro2", + "quote", + "syn 2.0.95", + "zbus_names 4.1.0", + "zvariant 5.1.0", + "zvariant_utils 3.0.2", ] [[package]] @@ -4125,27 +4109,60 @@ checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" dependencies = [ "serde", "static_assertions", - "zvariant 4.1.1", + "zvariant 4.2.0", +] + +[[package]] +name = "zbus_names" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "856b7a38811f71846fd47856ceee8bccaec8399ff53fb370247e66081ace647b" +dependencies = [ + "serde", + "static_assertions", + "winnow 0.6.22", + "zvariant 5.1.0", +] + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.95", ] [[package]] name = "zerofrom" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" +checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" +checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.95", "synstructure", ] @@ -4157,9 +4174,9 @@ checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" [[package]] name = "zerovec" -version = "0.10.2" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2cc8827d6c0994478a15c53f374f46fbd41bea663d809b14744bc42e6b109c" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" dependencies = [ "yoke", "zerofrom", @@ -4168,86 +4185,90 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97cf56601ee5052b4417d90c8755c6683473c926039908196cf35d99f893ebe7" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.95", ] [[package]] name = "zvariant" -version = "3.15.2" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db" -dependencies = [ - "byteorder", - "enumflags2", - "libc", - "serde", - "static_assertions", - "zvariant_derive 3.15.2", -] - -[[package]] -name = "zvariant" -version = "4.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aa6d31a02fbfb602bfde791de7fedeb9c2c18115b3d00f3a36e489f46ffbbc7" +checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe" dependencies = [ "endi", "enumflags2", "serde", "static_assertions", - "zvariant_derive 4.1.1", + "zvariant_derive 4.2.0", +] + +[[package]] +name = "zvariant" +version = "5.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1200ee6ac32f1e5a312e455a949a4794855515d34f9909f4a3e082d14e1a56f" +dependencies = [ + "endi", + "enumflags2", + "serde", + "static_assertions", + "winnow 0.6.22", + "zvariant_derive 5.1.0", + "zvariant_utils 3.0.2", ] [[package]] name = "zvariant_derive" -version = "3.15.2" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" +checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 1.0.109", - "zvariant_utils 1.0.1", + "syn 2.0.95", + "zvariant_utils 2.1.0", ] [[package]] name = "zvariant_derive" -version = "4.1.1" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642bf1b6b6d527988b3e8193d20969d53700a36eac734d21ae6639db168701c8" +checksum = "687e3b97fae6c9104fbbd36c73d27d149abf04fb874e2efbd84838763daa8916" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.66", - "zvariant_utils 2.0.0", + "syn 2.0.95", + "zvariant_utils 3.0.2", ] [[package]] name = "zvariant_utils" -version = "1.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.95", ] [[package]] name = "zvariant_utils" -version = "2.0.0" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" +checksum = "20d1d011a38f12360e5fcccceeff5e2c42a8eb7f27f0dcba97a0862ede05c9c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "serde", + "static_assertions", + "syn 2.0.95", + "winnow 0.6.22", ] diff --git a/pkgs/by-name/sn/snx-rs/package.nix b/pkgs/by-name/sn/snx-rs/package.nix index 6c79e2e02420..73a5539193fc 100644 --- a/pkgs/by-name/sn/snx-rs/package.nix +++ b/pkgs/by-name/sn/snx-rs/package.nix @@ -1,36 +1,57 @@ { fetchFromGitHub, - rustPlatform, - lib, - pkg-config, - openssl, glib, - atk, gtk3, + iproute2, + kdePackages, + lib, + libappindicator, + libappindicator-gtk2, + libappindicator-gtk3, + libayatana-appindicator, libsoup_3, + openssl, + pkg-config, + rustPlatform, webkitgtk_4_1, + nix-update-script, }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { pname = "snx-rs"; - version = "2.2.3"; + version = "2.9.0"; src = fetchFromGitHub { owner = "ancwrd1"; repo = "snx-rs"; - rev = "v2.2.3"; - hash = "sha256-tBl67uDeYVmVBwi8NQVclfFQ0Sj1dl+hR8Jct1iE2LI="; + rev = "v2.9.0"; + hash = "sha256-9uTawt9Lk3YJbw8hzrP91bEaPGT1wZehrmCWDKYrw5w="; }; - nativeBuildInputs = [ pkg-config ]; + passthru.updateScript = nix-update-script { }; + + nativeBuildInputs = [ + iproute2 + pkg-config + ]; + buildInputs = [ - openssl glib - atk gtk3 + kdePackages.kstatusnotifieritem + libappindicator + libappindicator-gtk2 + libappindicator-gtk3 + libayatana-appindicator libsoup_3 + openssl webkitgtk_4_1 ]; + postPatch = '' + substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ + --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" + ''; + checkFlags = [ "--skip=platform::linux::net::tests::test_default_ip" ]; @@ -38,7 +59,7 @@ rustPlatform.buildRustPackage { cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "isakmp-0.1.0" = "sha256-6v5xhkt9iaQg3Eh8S1tXW55oLv4YFDYvY0cfsepMuIM="; + "isakmp-0.1.0" = "sha256-H8yLwIUzlaPA0kJEfdGn8jvSjs27zWeIFdHlF3HitRk="; }; }; @@ -46,6 +67,10 @@ rustPlatform.buildRustPackage { description = "Open source Linux client for Checkpoint VPN tunnels"; homepage = "https://github.com/ancwrd1/snx-rs"; license = lib.licenses.agpl3Plus; - maintainers = [ ]; + changelog = "https://github.com/ancwrd1/snx-rs/blob/v${version}/CHANGELOG.md"; + maintainers = with lib.maintainers; [ + shavyn + ]; + mainProgram = "snx-rs"; }; } From 5c35166b71353cb32c89e344ba78c37c6d82ff0f Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Mon, 27 Jan 2025 17:26:08 +0100 Subject: [PATCH 0120/2168] lib/modules: improve mismatching class error mesage --- lib/modules.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/modules.nix b/lib/modules.nix index 79b8f25c2f43..4d2d8e0b08b6 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -367,7 +367,14 @@ let if m._class == null || m._class == class then m else - throw "The module ${m._file or m.key} was imported into ${class} instead of ${m._class}." + throw '' + The module `${m._file or m.key}` (class: ${lib.strings.escapeNixString m._class}) cannot be imported into a module evaluation that expects class ${lib.strings.escapeNixString class}. + + Help: + - Ensure that you are importing the correct module. + - Verify that the module's `_class`, ${lib.strings.escapeNixString m._class} matches the expected `class` ${lib.strings.escapeNixString class}. + - If you are using a custom class, make sure it is correctly defined and used consistently across your modules. + '' else m: m; From b3884c8b7d7f6e7bb3efb2199894b6cbdcea43c7 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Wed, 29 Jan 2025 11:50:16 +0100 Subject: [PATCH 0121/2168] lib/modules: tests change expected error for class mismatch --- lib/tests/modules.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index beb191aed0c1..c86e0aeec6dc 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -538,12 +538,12 @@ checkConfigOutput '^1$' config.sub.specialisation.value ./extendModules-168767-i # Class checks, evalModules checkConfigOutput '^{}$' config.ok.config ./class-check.nix checkConfigOutput '"nixos"' config.ok.class ./class-check.nix -checkConfigError 'The module .*/module-class-is-darwin.nix was imported into nixos instead of darwin.' config.fail.config ./class-check.nix -checkConfigError 'The module foo.nix#darwinModules.default was imported into nixos instead of darwin.' config.fail-anon.config ./class-check.nix +checkConfigError 'The module `.*/module-class-is-darwin.nix`.*?expects class "nixos".' config.fail.config ./class-check.nix +checkConfigError 'The module `foo.nix#darwinModules.default`.*?expects class "nixos".' config.fail-anon.config ./class-check.nix # Class checks, submoduleWith checkConfigOutput '^{}$' config.sub.nixosOk ./class-check.nix -checkConfigError 'The module .*/module-class-is-darwin.nix was imported into nixos instead of darwin.' config.sub.nixosFail.config ./class-check.nix +checkConfigError 'The module `.*/module-class-is-darwin.nix`.*?expects class "nixos".' config.sub.nixosFail.config ./class-check.nix # submoduleWith type merge with different class checkConfigError 'A submoduleWith option is declared multiple times with conflicting class values "darwin" and "nixos".' config.sub.mergeFail.config ./class-check.nix From f04cda16d6f2b6b622440d9eae3d6f0276bb9bea Mon Sep 17 00:00:00 2001 From: misuzu Date: Wed, 29 Jan 2025 14:57:24 +0200 Subject: [PATCH 0122/2168] libmpcdec: fix cross build Error without this fix: ``` checking for working memcmp... no configure: error: working memcmp is not available. ``` --- pkgs/by-name/li/libmpcdec/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/li/libmpcdec/package.nix b/pkgs/by-name/li/libmpcdec/package.nix index b7613dc2ab94..55d33a2327f9 100644 --- a/pkgs/by-name/li/libmpcdec/package.nix +++ b/pkgs/by-name/li/libmpcdec/package.nix @@ -13,6 +13,9 @@ stdenv.mkDerivation rec { sha256 = "1a0jdyga1zfi4wgkg3905y6inghy3s4xfs5m4x7pal08m0llkmab"; }; + # needed for cross builds + configureFlags = [ "ac_cv_func_memcmp_working=yes" ]; + meta = { description = "Musepack SV7 decoder library"; platforms = lib.platforms.unix; From 48d96f4be3f39712e0f416d0eb5e5a3794a5cacd Mon Sep 17 00:00:00 2001 From: Adriano Caloiaro Date: Wed, 1 Jan 2025 09:50:02 -0700 Subject: [PATCH 0123/2168] di-tui: init at 1.11.1 --- pkgs/by-name/di/di-tui/package.nix | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 pkgs/by-name/di/di-tui/package.nix diff --git a/pkgs/by-name/di/di-tui/package.nix b/pkgs/by-name/di/di-tui/package.nix new file mode 100644 index 000000000000..439237d27497 --- /dev/null +++ b/pkgs/by-name/di/di-tui/package.nix @@ -0,0 +1,29 @@ +{ + lib, + nix-update-script, + buildGoModule, + fetchFromGitHub, +}: +buildGoModule rec { + pname = "di-tui"; + version = "1.11.1"; + + src = fetchFromGitHub { + owner = "acaloiaro"; + repo = "di-tui"; + rev = "v${version}"; + hash = "sha256-jX+2wdnkJPEtCWoMNbwgn3c+LsEktYa5lIfSXY0Wsew="; + }; + + vendorHash = "sha256-b7dG0nSjPQpjWUbOlIxWudPZWKqtq96sQaJxKvsQT9I="; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "A simple terminal UI player for di.fm"; + homepage = "https://github.com/acaloiaro/di-tui"; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.acaloiaro ]; + mainProgram = "di-tui"; + }; +} From 5f7b18b5af51a615080d60d39f3ffcd38e5bae68 Mon Sep 17 00:00:00 2001 From: Adriano Caloiaro Date: Wed, 29 Jan 2025 07:26:55 -0700 Subject: [PATCH 0124/2168] maintainers: add acaloiaro --- maintainers/maintainer-list.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 694ac60eb114..7c395ae9121a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -499,6 +499,18 @@ githubId = 1517066; name = "Aiken Cairncross"; }; + acaloiaro = { + email = "code@adriano.fyi"; + githubId = 3331648; + github = "acaloiaro"; + matrix = "@adriano@beeper.com"; + name = "Adriano Caloiaro"; + keys = [ + { + fingerprint = "DCBD 2175 8A30 9C1F 41D7 A0FC 890F FDB1 1860 FE1C"; + } + ]; + }; a-camarillo = { name = "Anthony Camarillo"; email = "anthony.camarillo.96@gmail.com"; From e3610c39f74dc41a592d2b0af50368a33398dc8e Mon Sep 17 00:00:00 2001 From: jjtt <3908945+jjtt@users.noreply.github.com> Date: Sun, 17 Nov 2024 20:06:34 +0200 Subject: [PATCH 0125/2168] maintainers: add jjtt --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0072f5ab6826..7882d9226edd 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10892,6 +10892,11 @@ githubId = 691552; name = "Jamie McClymont"; }; + jjtt = { + github = "jjtt"; + githubId = 3908945; + name = "Juho Törmä"; + }; jk = { email = "hello+nixpkgs@j-k.io"; matrix = "@j-k:matrix.org"; From 59a791c1970848c3d0827eb295fdb3bf49e043fb Mon Sep 17 00:00:00 2001 From: jjtt <3908945+jjtt@users.noreply.github.com> Date: Wed, 29 Jan 2025 20:24:46 +0200 Subject: [PATCH 0126/2168] cfv: init at 3.1.0 --- pkgs/by-name/cf/cfv/package.nix | 43 +++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 pkgs/by-name/cf/cfv/package.nix diff --git a/pkgs/by-name/cf/cfv/package.nix b/pkgs/by-name/cf/cfv/package.nix new file mode 100644 index 000000000000..dcac59f78f1d --- /dev/null +++ b/pkgs/by-name/cf/cfv/package.nix @@ -0,0 +1,43 @@ +{ + lib, + fetchFromGitHub, + python3, + pkgs, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "cfv"; + version = "3.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "cfv-project"; + repo = "cfv"; + tag = "v${version}"; + sha256 = "1wxf30gsijsdvhv5scgkq0bqi8qi4dgs9dwppdrca5wxgy7a8sn5"; + }; + + build-system = with python3.pkgs; [ + setuptools + ]; + + checkPhase = '' + runHook preCheck + cd test + python3 test.py + runHook postCheck + ''; + + nativeCheckInputs = [ + pkgs.cksfv + ]; + + meta = { + description = "Utility to verify and create a wide range of checksums"; + homepage = "https://github.com/cfv-project/cfv"; + changelog = "https://github.com/cfv-project/cfv/releases/tag/v${version}"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ jjtt ]; + mainProgram = "cfv"; + }; +} From 5ad45e8e4d6fdb372af759bbfaabce741821dbea Mon Sep 17 00:00:00 2001 From: jjtt <3908945+jjtt@users.noreply.github.com> Date: Wed, 29 Jan 2025 20:37:47 +0200 Subject: [PATCH 0127/2168] cfv: avoid file descriptor warn from tests See: https://github.com/cfv-project/cfv/issues/22 --- pkgs/by-name/cf/cfv/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/cf/cfv/package.nix b/pkgs/by-name/cf/cfv/package.nix index dcac59f78f1d..46d62a01571b 100644 --- a/pkgs/by-name/cf/cfv/package.nix +++ b/pkgs/by-name/cf/cfv/package.nix @@ -24,6 +24,7 @@ python3.pkgs.buildPythonApplication rec { checkPhase = '' runHook preCheck cd test + ulimit -n 4096 python3 test.py runHook postCheck ''; From 5d7277a55686855b5f47cc55001af4e6dfd7feaa Mon Sep 17 00:00:00 2001 From: Petr Portnov Date: Wed, 29 Jan 2025 23:14:16 +0300 Subject: [PATCH 0128/2168] chatzone-desktop: 5.2.3 -> 5.2.4 --- pkgs/by-name/ch/chatzone-desktop/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ch/chatzone-desktop/package.nix b/pkgs/by-name/ch/chatzone-desktop/package.nix index 56406f63b4f7..ad793215640e 100644 --- a/pkgs/by-name/ch/chatzone-desktop/package.nix +++ b/pkgs/by-name/ch/chatzone-desktop/package.nix @@ -10,10 +10,10 @@ let pname = "chatzone-desktop"; - version = "5.2.3"; + version = "5.2.4"; src = fetchurl { - url = "https://cdn1.ozone.ru/s3/chatzone-clients/ci/5.2.3/466/chatzone-desktop-linux-5.2.3.AppImage"; - hash = "sha256-/1xAMtw1SgYge4b9RngBFQjb+rOUkvOalZPC+GtnvSA="; + url = "https://cdn1.ozone.ru/s3/chatzone-clients/ci/v5.2.4/506/chatzone-desktop-linux-5.2.4.AppImage"; + hash = "sha256-sd648wMCVYq5fpL4Ws9/fN4+ArqmsAIgY67a+AoFi8E="; }; appimageContents = appimageTools.extract { inherit pname version src; }; in From 6483e949bddca7079547ad2f2c1ea64b666face7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Akirazar?= Date: Wed, 29 Jan 2025 15:58:13 -0500 Subject: [PATCH 0129/2168] maintainers: add niraethm --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0072f5ab6826..5e9716c169c8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16552,6 +16552,13 @@ github = "nipeharefa"; githubId = 12620257; }; + niraethm = { + name = "Rémi Akirazar"; + email = "randormi@devcpu.co"; + matrix = "@lysgonul:bark.lgbt"; + github = "niraethm"; + githubId = 20865531; + }; NIS = { name = "NSC IT Solutions"; github = "dev-nis"; From a6786b1e06edf3af40c644ece739eb760621086c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Akirazar?= Date: Wed, 29 Jan 2025 15:59:13 -0500 Subject: [PATCH 0130/2168] vintagestory: add niraethm as maintainer --- pkgs/by-name/vi/vintagestory/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/vi/vintagestory/package.nix b/pkgs/by-name/vi/vintagestory/package.nix index b2700373da8a..ed2d596272d9 100644 --- a/pkgs/by-name/vi/vintagestory/package.nix +++ b/pkgs/by-name/vi/vintagestory/package.nix @@ -100,6 +100,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ artturin gigglesquid + niraethm ]; }; } From 55a11de1b0474788e59d6af6da77b858d7c582c1 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 29 Jan 2025 22:05:21 +0100 Subject: [PATCH 0131/2168] lib/default.nix: Update extend doc Co-authored-by: Johannes Kirschbauer --- lib/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/default.nix b/lib/default.nix index e77d053b8cc0..1557f33b5dd3 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -13,8 +13,13 @@ let /** Patch the Nixpkgs library + A function that applies patches onto the nixpkgs library. + Usage is discouraged for most scenarios. + + :::{.note} The name `extends` is a bit misleading, as it doesn't actually extend the library, but rather patches it. It is merely a consequence of being implemented by `makeExtensible`. + ::: # Inputs From a49d8ac86b6a2a4b3e73fa9f24d268c5b6e5c28c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 Jan 2025 01:05:10 +0000 Subject: [PATCH 0132/2168] timeular: 6.8.5 -> 6.9.0 --- pkgs/by-name/ti/timeular/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ti/timeular/package.nix b/pkgs/by-name/ti/timeular/package.nix index e3174edfb498..e4f166f2823d 100644 --- a/pkgs/by-name/ti/timeular/package.nix +++ b/pkgs/by-name/ti/timeular/package.nix @@ -5,12 +5,12 @@ }: let - version = "6.8.5"; + version = "6.9.0"; pname = "timeular"; src = fetchurl { url = "https://s3.amazonaws.com/timeular-desktop-packages/linux/production/Timeular-${version}.AppImage"; - hash = "sha256-hawVddF6jt0/fTL0bWAoK82F7mqskQLEO6w7/HBLLxQ="; + hash = "sha256-qesdlKl07EUjdzjQVa1ajaY229jGtXvu86LgcBvmIi0="; }; appimageContents = appimageTools.extractType2 { From 872205b2e6428276fabc121f818b347a64c7d7e1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 Jan 2025 01:06:48 +0000 Subject: [PATCH 0133/2168] questdb: 8.2.1 -> 8.2.2 --- pkgs/by-name/qu/questdb/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qu/questdb/package.nix b/pkgs/by-name/qu/questdb/package.nix index 89456d22b99e..2ba052c53195 100644 --- a/pkgs/by-name/qu/questdb/package.nix +++ b/pkgs/by-name/qu/questdb/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "questdb"; - version = "8.2.1"; + version = "8.2.2"; src = fetchurl { url = "https://github.com/questdb/questdb/releases/download/${finalAttrs.version}/questdb-${finalAttrs.version}-no-jre-bin.tar.gz"; - hash = "sha256-1Bm002Da4id9nn09VTrtsM8rtrH/fRoJxPoej1W3Fug="; + hash = "sha256-Lz3AbOGwPqTV2gbacaphMB9YXIuuMNd82sb1dXR777A="; }; nativeBuildInputs = [ From 95764c15b5de71015c068ae17700b7d9cd15d5c0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 Jan 2025 01:17:04 +0000 Subject: [PATCH 0134/2168] jbrowse: 2.18.0 -> 3.0.0 --- pkgs/by-name/jb/jbrowse/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/jb/jbrowse/package.nix b/pkgs/by-name/jb/jbrowse/package.nix index 2985eea88e87..c3befd3c48e0 100644 --- a/pkgs/by-name/jb/jbrowse/package.nix +++ b/pkgs/by-name/jb/jbrowse/package.nix @@ -6,11 +6,11 @@ let pname = "jbrowse"; - version = "2.18.0"; + version = "3.0.0"; src = fetchurl { url = "https://github.com/GMOD/jbrowse-components/releases/download/v${version}/jbrowse-desktop-v${version}-linux.AppImage"; - sha256 = "sha256-1YtINJgOMXwLPT7eyS85ebNCxTF8TbvHU7gOq9qNyF4="; + sha256 = "sha256-gg+DR6yjsdWE85nIj5eMjthvlZ3QaeugEugXD2AZeug="; }; appimageContents = appimageTools.extractType2 { From 0f83e158362586b28adc60fb73dd2c5c57d33dce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 Jan 2025 02:54:33 +0000 Subject: [PATCH 0135/2168] semodule-utils: 3.7 -> 3.8 --- pkgs/by-name/se/semodule-utils/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/se/semodule-utils/package.nix b/pkgs/by-name/se/semodule-utils/package.nix index 9c9343ead745..862a70334dd4 100644 --- a/pkgs/by-name/se/semodule-utils/package.nix +++ b/pkgs/by-name/se/semodule-utils/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "semodule-utils"; - version = "3.7"; + version = "3.8"; inherit (libsepol) se_url; src = fetchurl { url = "${se_url}/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-2wZBrq/v7EZhLHwt3TPvEGC7chzmSELSqWwz3dtesXY="; + sha256 = "sha256-QwVTfN/DOFUoA+MsSuMGWlqo99rCI7qDQxzWoIGcwCk="; }; buildInputs = [ libsepol ]; From bc14c84db6907f2ca9339af9564c2e48ee708e93 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 Jan 2025 03:24:54 +0000 Subject: [PATCH 0136/2168] python312Packages.pulsar: 3.5.0 -> 3.6.0 --- pkgs/development/python-modules/pulsar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pulsar/default.nix b/pkgs/development/python-modules/pulsar/default.nix index 2ff2f2a7b4ac..b5699d971f02 100644 --- a/pkgs/development/python-modules/pulsar/default.nix +++ b/pkgs/development/python-modules/pulsar/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pulsar"; - version = "3.5.0"; + version = "3.6.0"; format = "setuptools"; src = fetchFromGitHub { owner = "apache"; repo = "pulsar-client-python"; tag = "v${version}"; - hash = "sha256-2Ahv0lfeHuBhGIYhiTjKegEKsJqHkpK3Qu6xBnjsanI="; + hash = "sha256-/b3ha+FtZeLioRKGGjaW7x4jXu/cXxBX9GV2KyQpCkQ="; }; disabled = pythonOlder "3.7"; From 475dfe1b552eb5fd9d965f7d6db9bdd7a5f3dd28 Mon Sep 17 00:00:00 2001 From: Matt Votava Date: Wed, 29 Jan 2025 19:45:06 -0800 Subject: [PATCH 0137/2168] mkbootimage: install exbootimage tool The package also has a tool for extracting boot images, but it wasn't installed. --- pkgs/by-name/mk/mkbootimage/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/mk/mkbootimage/package.nix b/pkgs/by-name/mk/mkbootimage/package.nix index 91a70173ae05..c990d4a28a6b 100644 --- a/pkgs/by-name/mk/mkbootimage/package.nix +++ b/pkgs/by-name/mk/mkbootimage/package.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: { runHook preInstall install -Dm755 mkbootimage -t $out/bin + install -Dm755 exbootimage -t $out/bin runHook postInstall ''; From babfd0d6d12cb8854c02e4b8d982f241cf3f94fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 Jan 2025 07:06:53 +0000 Subject: [PATCH 0138/2168] venera: 1.2.0 -> 1.2.2 --- pkgs/by-name/ve/venera/package.nix | 4 +- pkgs/by-name/ve/venera/pubspec.lock.json | 102 ++++------------------- 2 files changed, 18 insertions(+), 88 deletions(-) diff --git a/pkgs/by-name/ve/venera/package.nix b/pkgs/by-name/ve/venera/package.nix index ef39fa6c8c32..5c959ff6a9d3 100644 --- a/pkgs/by-name/ve/venera/package.nix +++ b/pkgs/by-name/ve/venera/package.nix @@ -14,13 +14,13 @@ flutter327.buildFlutterApplication rec { pname = "venera"; - version = "1.2.0"; + version = "1.2.2"; src = fetchFromGitHub { owner = "venera-app"; repo = "venera"; tag = "v${version}"; - hash = "sha256-RqrddFzd0+TePVupqVwTjlt/Jpwi++J3JCsltW6KORo="; + hash = "sha256-uVy3M5H2zIbHPk5Uug0HBFauiYk5+wR9CJrheATTjbc="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; diff --git a/pkgs/by-name/ve/venera/pubspec.lock.json b/pkgs/by-name/ve/venera/pubspec.lock.json index 4915cf9bf619..7eb162361f64 100644 --- a/pkgs/by-name/ve/venera/pubspec.lock.json +++ b/pkgs/by-name/ve/venera/pubspec.lock.json @@ -40,16 +40,6 @@ "source": "hosted", "version": "1.0.4" }, - "archive": { - "dependency": "transitive", - "description": { - "name": "archive", - "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.6.1" - }, "args": { "dependency": "transitive", "description": { @@ -70,16 +60,6 @@ "source": "hosted", "version": "2.11.0" }, - "barcode": { - "dependency": "transitive", - "description": { - "name": "barcode", - "sha256": "ab180ce22c6555d77d45f0178a523669db67f95856e3378259ef2ffeb43e6003", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.2.8" - }, "battery_plus": { "dependency": "direct main", "description": { @@ -100,16 +80,6 @@ "source": "hosted", "version": "2.0.1" }, - "bidi": { - "dependency": "transitive", - "description": { - "name": "bidi", - "sha256": "9a712c7ddf708f7c41b1923aa83648a3ed44cfd75b04f72d598c45e5be287f9d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.12" - }, "boolean_selector": { "dependency": "transitive", "description": { @@ -371,6 +341,16 @@ "source": "hosted", "version": "1.1.1" }, + "flex_seed_scheme": { + "dependency": "direct main", + "description": { + "name": "flex_seed_scheme", + "sha256": "d3ba3c5c92d2d79d45e94b4c6c71d01fac3c15017da1545880c53864da5dfeb0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.5.0" + }, "flutter": { "dependency": "direct main", "description": "flutter", @@ -518,8 +498,8 @@ "dependency": "direct main", "description": { "path": ".", - "ref": "9c99ac258a11f8e91761a5466a190efba3ca64af", - "resolved-ref": "9c99ac258a11f8e91761a5466a190efba3ca64af", + "ref": "5978d0c7784fbbefcacc573547f0ab01ba59b7b3", + "resolved-ref": "5978d0c7784fbbefcacc573547f0ab01ba59b7b3", "url": "https://github.com/wgh136/flutter_qjs" }, "source": "git", @@ -648,16 +628,6 @@ "source": "hosted", "version": "0.1.0" }, - "image": { - "dependency": "transitive", - "description": { - "name": "image", - "sha256": "f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.3.0" - }, "intl": { "dependency": "direct main", "description": { @@ -859,16 +829,6 @@ "source": "hosted", "version": "1.9.0" }, - "path_parsing": { - "dependency": "transitive", - "description": { - "name": "path_parsing", - "sha256": "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.0" - }, "path_provider": { "dependency": "direct main", "description": { @@ -929,16 +889,6 @@ "source": "hosted", "version": "2.3.0" }, - "pdf": { - "dependency": "direct main", - "description": { - "name": "pdf", - "sha256": "05df53f8791587402493ac97b9869d3824eccbc77d97855f4545cf72df3cae07", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.11.1" - }, "petitparser": { "dependency": "transitive", "description": { @@ -990,16 +940,6 @@ "source": "hosted", "version": "3.9.1" }, - "qr": { - "dependency": "transitive", - "description": { - "name": "qr", - "sha256": "5a1d2586170e172b8a8c8470bbbffd5eb0cd38a66c0d77155ea138d3af3a4445", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.2" - }, "rhttp": { "dependency": "direct main", "description": { @@ -1217,16 +1157,6 @@ "source": "hosted", "version": "0.7.3" }, - "text_scroll": { - "dependency": "direct main", - "description": { - "name": "text_scroll", - "sha256": "7869d86a6fdd725dee56bdd150216a99f0372b82fbfcac319214dbd5f36e1908", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.2.0" - }, "typed_data": { "dependency": "transitive", "description": { @@ -1419,7 +1349,7 @@ "version": "6.5.0" }, "yaml": { - "dependency": "direct main", + "dependency": "transitive", "description": { "name": "yaml", "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5", @@ -1432,15 +1362,15 @@ "dependency": "direct main", "description": { "name": "zip_flutter", - "sha256": "be21152c35fcb6d0ef4ce89fc3aed681f7adc0db5490ca3eb5893f23fd20e646", + "sha256": "fe63ef9098bb2426b001adba2e28029820d71ce80cce957a36676bd6b3227245", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.0.6" + "version": "0.0.9" } }, "sdks": { "dart": ">=3.6.0 <4.0.0", - "flutter": ">=3.27.1" + "flutter": ">=3.27.3" } } From 429fceb22aed5e4fcfa299b762f3c1f705b454e3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 Jan 2025 12:36:09 +0000 Subject: [PATCH 0139/2168] libinput-gestures: 2.78 -> 2.79 --- pkgs/by-name/li/libinput-gestures/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libinput-gestures/package.nix b/pkgs/by-name/li/libinput-gestures/package.nix index af6a52b6f441..791ba50e287a 100644 --- a/pkgs/by-name/li/libinput-gestures/package.nix +++ b/pkgs/by-name/li/libinput-gestures/package.nix @@ -12,13 +12,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libinput-gestures"; - version = "2.78"; + version = "2.79"; src = fetchFromGitHub { owner = "bulletmark"; repo = "libinput-gestures"; tag = finalAttrs.version; - hash = "sha256-J9+KbaZYDPJzl/AE1gq6KNXIJns+XxoAL1oOSy7UTtY="; + hash = "sha256-oMteEOx2bwPBLgxB9uSE7zuR5vmuqX6J1Tk5nxefWa4="; }; patches = [ ./0001-hardcode-name.patch From 6d8fc203e222a905329a4e6d5b68e1f11eea9f1e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 Jan 2025 12:54:28 +0000 Subject: [PATCH 0140/2168] container2wasm: 0.7.1 -> 0.8.0 --- pkgs/by-name/co/container2wasm/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/container2wasm/package.nix b/pkgs/by-name/co/container2wasm/package.nix index 47b9d2b944a3..3812c6d4e39b 100644 --- a/pkgs/by-name/co/container2wasm/package.nix +++ b/pkgs/by-name/co/container2wasm/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "container2wasm"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "ktock"; repo = "container2wasm"; tag = "v${version}"; - hash = "sha256-Awk7tC5eyapbra/GlwPPfYx+Jh5UHlK9zo9ZRCVz9S0="; + hash = "sha256-1m5BX8w6PVV7gsTXas+rdQirOu1RicbJDZdGj0Fh5sc="; }; - vendorHash = "sha256-X6JG/D+f9MmZVGqic13OkyPriLloEazU6dqDjue6YmY="; + vendorHash = "sha256-azlZt+E8S+TjIEhwwmvRjAig4EVqbUm9tsFiIXim0Rs="; ldflags = [ "-s" From 48d15d4e5c19674c345a2714dff1206ddec6b5bf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 Jan 2025 13:40:45 +0000 Subject: [PATCH 0141/2168] ipv6calc: 4.2.2 -> 4.3.0 --- pkgs/by-name/ip/ipv6calc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ip/ipv6calc/package.nix b/pkgs/by-name/ip/ipv6calc/package.nix index 8002111097cc..53059e5567be 100644 --- a/pkgs/by-name/ip/ipv6calc/package.nix +++ b/pkgs/by-name/ip/ipv6calc/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "ipv6calc"; - version = "4.2.2"; + version = "4.3.0"; src = fetchFromGitHub { owner = "pbiering"; repo = pname; rev = version; - sha256 = "sha256-Mu9tcx/J58cRRqExlqvQzMIR87wJWX8eDacTVCZ7bNs="; + sha256 = "sha256-ObJn7T7dGp6HjICWHWAbJjgHM08FrJx31AxIMmIexuQ="; }; buildInputs = [ From e69f8a5c7ecede6ca93d0bcb9a081618e8c977d6 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 29 Jan 2025 10:17:09 +0100 Subject: [PATCH 0142/2168] python312Packages.microsoft-kiota-abstractions: 1.3.3 -> 1.9.1 --- .../microsoft-kiota-abstractions/default.nix | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix b/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix index b08c4ce1b629..8dcec2865bfc 100644 --- a/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - flit-core, + poetry-core, opentelemetry-api, opentelemetry-sdk, pytest-asyncio, @@ -14,19 +14,21 @@ buildPythonPackage rec { pname = "microsoft-kiota-abstractions"; - version = "1.3.3"; + version = "1.9.1"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "microsoft"; - repo = "kiota-abstractions-python"; - tag = "v${version}"; - hash = "sha256-TgHj5Ga6Aw/sN2Hobn0OocFB/iGRHTKEeOa2j2aqnRY="; + repo = "kiota-python"; + tag = "microsoft-kiota-abstractions-v${version}"; + hash = "sha256-ESRnI8prXG1h5H5RVD4eOQ1sQYSEMMLVHSk8yhzFGVw="; }; - build-system = [ flit-core ]; + sourceRoot = "source/packages/abstractions/"; + + build-system = [ poetry-core ]; dependencies = [ opentelemetry-api @@ -44,8 +46,8 @@ buildPythonPackage rec { meta = with lib; { description = "Abstractions library for Kiota generated Python clients"; - homepage = "https://github.com/microsoft/kiota-abstractions-python"; - changelog = "https://github.com/microsoft/kiota-abstractions-python/blob/${version}/CHANGELOG.md"; + homepage = "https://github.com/microsoft/kiota-python/tree/main/packages/abstractions/"; + changelog = "https://github.com/microsoft/kiota-python/releases/tag/microsoft-kiota-abstractions-v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From b66beb0e2a512b0974e54f61e2fa33cd401e322e Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 29 Jan 2025 10:17:09 +0100 Subject: [PATCH 0143/2168] python312Packages.microsoft-kiota-authentication-azure: 1.1.0 -> 1.9.1 --- .../default.nix | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix b/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix index 02802c58954d..def6f45944c3 100644 --- a/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix @@ -4,7 +4,7 @@ azure-core, buildPythonPackage, fetchFromGitHub, - flit-core, + poetry-core, microsoft-kiota-abstractions, opentelemetry-api, opentelemetry-sdk, @@ -16,19 +16,21 @@ buildPythonPackage rec { pname = "microsoft-kiota-authentication-azure"; - version = "1.1.0"; + version = "1.9.1"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "microsoft"; - repo = "kiota-authentication-azure-python"; - tag = "v${version}"; - hash = "sha256-JoR7qjAPNqtcV35AGwbyjhIro6AnFUZXXLHLOj7InY8="; + repo = "kiota-python"; + tag = "microsoft-kiota-authentication-azure-v${version}"; + hash = "sha256-ESRnI8prXG1h5H5RVD4eOQ1sQYSEMMLVHSk8yhzFGVw="; }; - build-system = [ flit-core ]; + sourceRoot = "source/packages/authentication/azure/"; + + build-system = [ poetry-core ]; dependencies = [ aiohttp @@ -48,8 +50,8 @@ buildPythonPackage rec { meta = with lib; { description = "Kiota Azure authentication provider"; - homepage = "https://github.com/microsoft/kiota-authentication-azure-python"; - changelog = "https://github.com/microsoft/kiota-authentication-azure-python/blob/v${version}/CHANGELOG.md"; + homepage = "https://github.com/microsoft/kiota-python/tree/main/packages/authentication/azure"; + changelog = "https://github.com/microsoft/kiota-python/releases/tag/microsoft-kiota-authentication-azure-v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From d66dc0ef3066a3534c6f9e67cdbef5da5a604c93 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 29 Jan 2025 10:17:09 +0100 Subject: [PATCH 0144/2168] python312Packages.microsoft-kiota-http: 1.3.4 -> 1.9.1 --- .../microsoft-kiota-http/default.nix | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/microsoft-kiota-http/default.nix b/pkgs/development/python-modules/microsoft-kiota-http/default.nix index 5d2cda9ae63a..2d65e6882021 100644 --- a/pkgs/development/python-modules/microsoft-kiota-http/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-http/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - flit-core, + poetry-core, httpx, microsoft-kiota-abstractions, opentelemetry-api, @@ -16,19 +16,21 @@ buildPythonPackage rec { pname = "microsoft-kiota-http"; - version = "1.3.4"; + version = "1.9.1"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "microsoft"; - repo = "kiota-http-python"; - tag = "v${version}"; - hash = "sha256-0hntB9GSDE05l/ghWTzMrX1MAPdWNHJVIQFpskraDV8="; + repo = "kiota-python"; + tag = "microsoft-kiota-http-v${version}"; + hash = "sha256-ESRnI8prXG1h5H5RVD4eOQ1sQYSEMMLVHSk8yhzFGVw="; }; - build-system = [ flit-core ]; + sourceRoot = "source/packages/http/httpx/"; + + build-system = [ poetry-core ]; dependencies = [ httpx @@ -48,8 +50,8 @@ buildPythonPackage rec { meta = with lib; { description = "HTTP request adapter implementation for Kiota clients for Python"; - homepage = "https://github.com/microsoft/kiota-http-python"; - changelog = "https://github.com/microsoft/kiota-http-python/blob/${version}/CHANGELOG.md"; + homepage = "https://github.com/microsoft/kiota-python/tree/main/packages/http/httpx"; + changelog = "https://github.com/microsoft/kiota-python/releases/tag/microsoft-kiota-http-v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From db94074682a54df39a5ea2089d91e25d300ab3ec Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 29 Jan 2025 10:17:09 +0100 Subject: [PATCH 0145/2168] python312Packages.microsoft-kiota-serialization-form: 0.1.1 -> 1.9.1 --- .../default.nix | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-form/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-form/default.nix index 15e824afca07..3a4edc918ae4 100644 --- a/pkgs/development/python-modules/microsoft-kiota-serialization-form/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-serialization-form/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - flit-core, + poetry-core, microsoft-kiota-abstractions, pytest-asyncio, pendulum, @@ -13,19 +13,21 @@ buildPythonPackage rec { pname = "microsoft-kiota-serialization-form"; - version = "0.1.1"; + version = "1.9.1"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "microsoft"; - repo = "kiota-serialization-form-python"; - tag = "v${version}"; - hash = "sha256-yOdrqj8QPz497VWS4427zDRRFc/S5654JeYkO1ZcUcQ="; + repo = "kiota-python"; + tag = "microsoft-kiota-serialization-form-v${version}"; + hash = "sha256-ESRnI8prXG1h5H5RVD4eOQ1sQYSEMMLVHSk8yhzFGVw="; }; - build-system = [ flit-core ]; + sourceRoot = "source/packages/serialization/form/"; + + build-system = [ poetry-core ]; dependencies = [ microsoft-kiota-abstractions @@ -42,8 +44,8 @@ buildPythonPackage rec { meta = with lib; { description = "Form serialization implementation for Kiota clients in Python"; - homepage = "https://github.com/microsoft/kiota-serialization-form-python"; - changelog = "https://github.com/microsoft/kiota-serialization-form-python/blob/v${version}/CHANGELOG.md"; + homepage = "https://github.com/microsoft/kiota-python/tree/main/packages/serialization/form"; + changelog = "https://github.com/microsoft/kiota-python/releases/tag/microsoft-kiota-serialization-form-v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From acdbde7709816f76046e195a829b69c41a8eebb2 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 29 Jan 2025 10:17:09 +0100 Subject: [PATCH 0146/2168] python312Packages.microsoft-kiota-serialization-json: 1.3.3 -> 1.9.1 --- .../default.nix | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix index d6ae7067e684..270ea442ab89 100644 --- a/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - flit-core, + poetry-core, microsoft-kiota-abstractions, pendulum, pytest-asyncio, @@ -13,19 +13,21 @@ buildPythonPackage rec { pname = "microsoft-kiota-serialization-json"; - version = "1.3.3"; + version = "1.9.1"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "microsoft"; - repo = "kiota-serialization-json-python"; - tag = "v${version}"; - hash = "sha256-J+wX2vF1LZHq88RDhda6NDeYioZzAz2BxovVFz2xxfw="; + repo = "kiota-python"; + tag = "microsoft-kiota-serialization-json-v${version}"; + hash = "sha256-ESRnI8prXG1h5H5RVD4eOQ1sQYSEMMLVHSk8yhzFGVw="; }; - build-system = [ flit-core ]; + sourceRoot = "source/packages/serialization/json/"; + + build-system = [ poetry-core ]; dependencies = [ microsoft-kiota-abstractions @@ -40,15 +42,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "kiota_serialization_json" ]; - disabledTests = [ - # Test compare an output format - "test_parse_union_type_complex_property1" - ]; - meta = with lib; { description = "JSON serialization implementation for Kiota clients in Python"; - homepage = "https://github.com/microsoft/kiota-serialization-json-python"; - changelog = "https://github.com/microsoft/kiota-serialization-json-python/blob/${version}/CHANGELOG.md"; + homepage = "https://github.com/microsoft/kiota-python/tree/main/packages/serialization/json"; + changelog = "https://github.com/microsoft/kiota-python/releases/tag/microsoft-kiota-serialization-json-v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From d179d755d5b9e81e9fbfce22f7a18bc239610453 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 29 Jan 2025 10:17:09 +0100 Subject: [PATCH 0147/2168] python312Packages.microsoft-kiota-serialization-multipart: 0.1.0 -> 1.9.1 --- .../default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-multipart/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-multipart/default.nix index e9e1ac000471..83181b9fd692 100644 --- a/pkgs/development/python-modules/microsoft-kiota-serialization-multipart/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-serialization-multipart/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - flit-core, + poetry-core, microsoft-kiota-abstractions, microsoft-kiota-serialization-json, pytest-asyncio, @@ -13,19 +13,21 @@ buildPythonPackage rec { pname = "microsoft-kiota-serialization-multipart"; - version = "0.1.0"; + version = "1.9.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "microsoft"; - repo = "kiota-serialization-multipart-python"; - tag = "v${version}"; - hash = "sha256-OGX6vX02928F1uCP8bF/q1Z5aDrdj29iQNOITzF2LQI="; + repo = "kiota-python"; + tag = "microsoft-kiota-serialization-multipart-v${version}"; + hash = "sha256-ESRnI8prXG1h5H5RVD4eOQ1sQYSEMMLVHSk8yhzFGVw="; }; - build-system = [ flit-core ]; + sourceRoot = "source/packages/serialization/multipart/"; + + build-system = [ poetry-core ]; dependencies = [ microsoft-kiota-abstractions ]; @@ -40,8 +42,8 @@ buildPythonPackage rec { meta = with lib; { description = "Multipart serialization implementation for Kiota clients in Python"; - homepage = "https://github.com/microsoft/kiota-serialization-multipart-python"; - changelog = "https://github.com/microsoft/kiota-serialization-multipart-python/blob/${version}/CHANGELOG.md"; + homepage = "https://github.com/microsoft/kiota-python/tree/main/packages/serialization/multipart"; + changelog = "https://github.com/microsoft/kiota-python/releases/tag/microsoft-kiota-serialization-multipart-v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From 280645d581331f0acf408f25e8203bed049c6f4e Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 29 Jan 2025 10:17:09 +0100 Subject: [PATCH 0148/2168] python312Packages.microsoft-kiota-serialization-text: 1.0.0 -> 1.9.1 --- .../default.nix | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix index 58eae68d75b8..b3ef5a841445 100644 --- a/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - flit-core, + poetry-core, microsoft-kiota-abstractions, pytest-asyncio, pytest-mock, @@ -13,19 +13,21 @@ buildPythonPackage rec { pname = "microsoft-kiota-serialization-text"; - version = "1.0.0"; + version = "1.9.1"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "microsoft"; - repo = "kiota-serialization-text-python"; - tag = "v${version}"; - hash = "sha256-jPuRfvqO4n5/PjSOS5NMCawaYRhXmrZtfg6LgYFCv7o="; + repo = "kiota-python"; + tag = "microsoft-kiota-serialization-text-v${version}"; + hash = "sha256-ESRnI8prXG1h5H5RVD4eOQ1sQYSEMMLVHSk8yhzFGVw="; }; - build-system = [ flit-core ]; + sourceRoot = "source/packages/serialization/text/"; + + build-system = [ poetry-core ]; dependencies = [ microsoft-kiota-abstractions @@ -42,8 +44,8 @@ buildPythonPackage rec { meta = with lib; { description = "Text serialization implementation for Kiota generated clients in Python"; - homepage = "https://github.com/microsoft/kiota-serialization-text-python"; - changelog = "https://github.com/microsoft/kiota-serialization-text-python/blob/${version}/CHANGELOG.md"; + homepage = "https://github.com/microsoft/kiota-python/tree/main/packages/serialization/text"; + changelog = "https://github.com/microsoft/kiota-python/releases/tag/microsoft-kiota-serialization-text-v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From b5e4fc3eb2d20d92bd4ed6305bc63f9ebce823c6 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Thu, 30 Jan 2025 15:25:40 +0000 Subject: [PATCH 0149/2168] refine: 0.4.2 -> 0.4.3 --- pkgs/by-name/re/refine/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/refine/package.nix b/pkgs/by-name/re/refine/package.nix index 91f7bd1a0271..87a462c23bcf 100644 --- a/pkgs/by-name/re/refine/package.nix +++ b/pkgs/by-name/re/refine/package.nix @@ -34,7 +34,7 @@ in python3Packages.buildPythonApplication rec { pname = "refine"; - version = "0.4.2"; + version = "0.4.3"; pyproject = false; # uses meson src = fetchFromGitLab { @@ -42,7 +42,7 @@ python3Packages.buildPythonApplication rec { owner = "TheEvilSkeleton"; repo = "Refine"; tag = version; - hash = "sha256-5oXLcmj0ZWYaCP93S+tSTqFn+XnrUkE/VwiA3ufvSQ0="; + hash = "sha256-WFajNhTXFqZUYLXumcnDM2pfmKye8p7h6L+BS1orEgs="; }; nativeBuildInputs = [ From e35a65a2f8a32f63c78a9d41cf993a5cf8a323c0 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 30 Jan 2025 15:51:59 +0100 Subject: [PATCH 0150/2168] nixos: Fix timesyncd test for systemd >= 257.1 Version 257.1 of systemd changed[1] the PrivateTmp setting for the systemd-timesyncd service from "yes" to "disconnected", which broke our systemd-timesyncd test. The reason for this is because the systemd-tmpfiles-setup.service is *only*[2] added as a dependency of systemd-timesyncd.service if PrivateTmp is set to "yes" but not when it is set to "disconnected" (which would make sense given that the tmpfiles.d mechanism was originally designed for temporary files). Commit 339a866b7c25ce44705552105b64cd9cb78780a8 switched the activation script to using systemd-tmpfiles, but the commit in question doesn't provide an explanation why this was necessary in this particular case. However the pull request[3] lists an ongoing effort to get rid of Perl and in the future get also rid of BASH for activation. The reasons for doing this are outlined in the document[4]: > The simple presence of interpreters on a system pose a security risk. > An attacker that gains access to a system can abuse them to execute > arbitrary commands. Mitre lists this as technique T1059. The most > radical yet simple solution to mitigate this exploit is to remove all > interpreters from a system (Mitre M1042). This radical solution is > only really feasible and/or interesting for appliances (i.e. > non-interactive) systems. Especially for high-security solutions this > mitigtation is interesting. I personally don't think this is a very compelling reason, at least for our activation scripts, since an attacker could simply drop an executable binary. Nevertheless, getting rid of additional dependencies on eg. Perl or BASH is something worth pursuing to trim down moving parts. To address this, I decided to implement this as a normal systemd service unit, since we need to guarantee that it's started before systemd-timesyncd.service and with a dedicated unit we can ensure explicit ordering. This has the advantage that we don't interfere with the effort of getting rid of Perl/BASH for activation/boot and also don't risk running into race conditions (again) because it's very unlikely that systemd will change/deprecate explicit unit ordering in the near future. [1]: https://github.com/systemd/systemd/commit/1f6e1928488d461d19fd1e4b4d645b0ea5ea8bf5 [2]: https://github.com/systemd/systemd/blob/30675a6ee98540a02bd1d6afcf80f0c0aa8c0910/src/core/unit.c#L1274 [3]: https://github.com/NixOS/nixpkgs/pull/263203 [4]: https://pad.lassul.us/nixos-perlless-activation Signed-off-by: aszlig --- nixos/tests/systemd-timesyncd.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/nixos/tests/systemd-timesyncd.nix b/nixos/tests/systemd-timesyncd.nix index d50b6386786c..b1f618d947cd 100644 --- a/nixos/tests/systemd-timesyncd.nix +++ b/nixos/tests/systemd-timesyncd.nix @@ -26,13 +26,18 @@ import ./make-test-python.nix ( # create the path that should be migrated by our activation script when # upgrading to a newer nixos version system.stateVersion = "19.03"; - systemd.tmpfiles.settings.systemd-timesyncd-test = { - "/var/lib/systemd/timesync".R = { }; - "/var/lib/systemd/timesync".L.argument = "/var/lib/private/systemd/timesync"; - "/var/lib/private/systemd/timesync".d = { - user = "systemd-timesync"; - group = "systemd-timesync"; - }; + systemd.services.old-timesync-state-dir = { + requiredBy = [ "sysinit.target" ]; + before = [ "systemd-timesyncd.service" ]; + after = [ "local-fs.target" ]; + unitConfig.DefaultDependencies = false; + serviceConfig.Type = "oneshot"; + script = '' + rm -rf /var/lib/systemd/timesync + mkdir -p /var/lib/systemd /var/lib/private/systemd/timesync + ln -s /var/lib/private/systemd/timesync /var/lib/systemd/timesync + chown systemd-timesync: /var/lib/private/systemd/timesync + ''; }; } ); From 545cc3f18563bb9c33ba1fca5b4a8d2615d3a8f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 Jan 2025 22:27:23 +0000 Subject: [PATCH 0151/2168] stackql: 0.6.50 -> 0.6.65 --- pkgs/by-name/st/stackql/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/stackql/package.nix b/pkgs/by-name/st/stackql/package.nix index c9d91cc3ba0f..fa9d717d8cf3 100644 --- a/pkgs/by-name/st/stackql/package.nix +++ b/pkgs/by-name/st/stackql/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "stackql"; - version = "0.6.50"; + version = "0.6.65"; src = fetchFromGitHub { owner = "stackql"; repo = "stackql"; rev = "v${version}"; - hash = "sha256-7MVpfXYMkVXlao3rA9Sp5DWwr5SBkS9fPG4JcCc9GVw="; + hash = "sha256-BOjk5Tb9Tii73oGNE4sEnXySPYQIsi3fnJTZYr73Yh4="; }; - vendorHash = "sha256-eGpmA1MYiIn1LSbieMFvF7OYEtLBoN62X7CQMa35HT4="; + vendorHash = "sha256-j0tmL3UJE56BR21pRynSGr7Fc7AuTJR9gPVzw+cFbf0="; ldflags = [ "-s" From 6d79e0f632c5c5d595a66994ea813b777ec46630 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 31 Jan 2025 00:35:45 +0000 Subject: [PATCH 0152/2168] yed: 3.24 -> 3.25 --- pkgs/by-name/ye/yed/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ye/yed/package.nix b/pkgs/by-name/ye/yed/package.nix index 39f81c922140..0b3a56ef9e38 100644 --- a/pkgs/by-name/ye/yed/package.nix +++ b/pkgs/by-name/ye/yed/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "yEd"; - version = "3.24"; + version = "3.25"; src = fetchzip { url = "https://www.yworks.com/resources/yed/demo/${pname}-${version}.zip"; - sha256 = "sha256-4aotsOippuKUucweWERtqm/5pz2gwW1Sue48KPisQ0I="; + sha256 = "sha256-6Z24XmFPK+aomO7hImN4AdN08kjOsyn9PvHToyQj8sk="; }; nativeBuildInputs = [ From f3951948f6de828b39ed7d6812d225b5706564c2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 31 Jan 2025 00:44:59 +0000 Subject: [PATCH 0153/2168] dool: 1.3.3 -> 1.3.4 --- pkgs/by-name/do/dool/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/do/dool/package.nix b/pkgs/by-name/do/dool/package.nix index fb3f22885a9c..1be266859149 100644 --- a/pkgs/by-name/do/dool/package.nix +++ b/pkgs/by-name/do/dool/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "dool"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitHub { owner = "scottchiefbaker"; repo = "dool"; rev = "v${version}"; - hash = "sha256-VII8Om43YILP3w0CsiKKdJDuK2Lc1rit2EY+eAArvng="; + hash = "sha256-eyWt8gWPGiU8YavX8KT018upSB6xg8eAyRZ84snrvoY="; }; buildInputs = [ From a34e2101ec8135c1220f80179c865129a6442591 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 31 Jan 2025 06:14:42 +0000 Subject: [PATCH 0154/2168] mdbook: 0.4.43 -> 0.4.44 Changes: https://github.com/rust-lang/mdBook/blob/master/CHANGELOG.md#mdbook-0444 --- pkgs/by-name/md/mdbook/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/md/mdbook/package.nix b/pkgs/by-name/md/mdbook/package.nix index fff84963849e..899228ad4918 100644 --- a/pkgs/by-name/md/mdbook/package.nix +++ b/pkgs/by-name/md/mdbook/package.nix @@ -9,7 +9,7 @@ installShellFiles, }: let - version = "0.4.43"; + version = "0.4.44"; in rustPlatform.buildRustPackage rec { inherit version; @@ -19,13 +19,13 @@ rustPlatform.buildRustPackage rec { owner = "rust-lang"; repo = "mdBook"; tag = "v${version}"; - hash = "sha256-aADNcuIeDef9+a3NOWQxo6IRnKJ6AbkvE4GqvFbubyI="; + hash = "sha256-p3DzsK1LSAp9eBES8gNqLsjKrs426nPgQxSjOKCLpzY="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; allowGitDependencies = false; - hash = "sha256-W5hg6ECNQRIh07ogZkXTn51el2YltutY86aJBYFDTP4="; + hash = "sha256-ah/6sugq3fkgB2N6ZjXWCHVHhCY8z4zgq3jcobURdpk="; }; nativeBuildInputs = [ installShellFiles ]; From 567bccc1777b9913102fbeadcaaf6ee13bd73eb6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 31 Jan 2025 17:46:13 +0000 Subject: [PATCH 0155/2168] drumkv1: 1.0.0 -> 1.3.0 --- pkgs/applications/audio/drumkv1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index 440676b14e5e..9f2f4e2437b3 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "drumkv1"; - version = "1.0.0"; + version = "1.3.0"; src = fetchurl { url = "mirror://sourceforge/drumkv1/drumkv1-${version}.tar.gz"; - hash = "sha256-vi//84boqaVxC/KCg+HF76vB4Opch02LU4RtbVaxaX4="; + hash = "sha256-WcWhq1Li9dfj0piyW6F0mdfzcK+nvk5Rtl8pQZTYyt8="; }; buildInputs = [ From e7588bdcf3d006f2550ee3da4829813789faa147 Mon Sep 17 00:00:00 2001 From: nichtsundniemand Date: Fri, 31 Jan 2025 21:01:37 +0100 Subject: [PATCH 0156/2168] cue: 0.11.2 -> 0.12.0 --- pkgs/by-name/cu/cue/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cu/cue/package.nix b/pkgs/by-name/cu/cue/package.nix index 202ce48cb5c5..68d542b3b514 100644 --- a/pkgs/by-name/cu/cue/package.nix +++ b/pkgs/by-name/cu/cue/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "cue"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "cue-lang"; repo = "cue"; rev = "v${version}"; - hash = "sha256-OSsDgwjtjQw5YRuXi1K/HQtHyLh1aHtYDlQDAtdYeZM="; + hash = "sha256-/2oVu1zij+8/qdDl4gApsNqdKwb1O7q5Xcdc3/djGn8="; }; - vendorHash = "sha256-jl8TR1kxame30l7DkfOEioWA9wK/ACTNofiTi++vjuI="; + vendorHash = "sha256-vkfXT8mAomQml/kQRb2VIi+D+jpc0qgE2AsJ8jK6LRQ="; subPackages = [ "cmd/*" ]; From 31f4103cb430fb55b3d4f853ed3f5b8059837432 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Fri, 31 Jan 2025 18:08:19 -0500 Subject: [PATCH 0157/2168] iotas: add gnome-circle team to maintainers https://thisweek.gnome.org/posts/2025/01/twig-185/#gnome-circle-apps-and-libraries --- pkgs/by-name/io/iotas/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/io/iotas/package.nix b/pkgs/by-name/io/iotas/package.nix index 2563c175df51..c17fa9a21df1 100644 --- a/pkgs/by-name/io/iotas/package.nix +++ b/pkgs/by-name/io/iotas/package.nix @@ -75,6 +75,6 @@ python3.pkgs.buildPythonApplication rec { license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; mainProgram = "iotas"; - maintainers = with lib.maintainers; [ zendo ]; + maintainers = with lib.maintainers; [ zendo ] ++ lib.teams.gnome-circle.members; }; } From 5f9e5f8a9876a92282e5e86cdc63f48c32b67536 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Feb 2025 04:48:40 +0000 Subject: [PATCH 0158/2168] soplex: 712 -> 713 --- pkgs/by-name/so/soplex/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/so/soplex/package.nix b/pkgs/by-name/so/soplex/package.nix index 2ee0976e6c9d..a9c44d88a836 100644 --- a/pkgs/by-name/so/soplex/package.nix +++ b/pkgs/by-name/so/soplex/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "soplex"; - version = "712"; + version = "713"; src = fetchFromGitHub { owner = "scipopt"; repo = "soplex"; rev = "release-${builtins.replaceStrings [ "." ] [ "" ] finalAttrs.version}"; - hash = "sha256-8muN9wYDQX5CULifKBYO/t9whS2LsatrYB2khlV0akg="; + hash = "sha256-qI7VGPAm3ALzeiD/OgvlZ1w2GzHRYdBajTW5XdIN9pU="; }; nativeBuildInputs = [ cmake ]; From 19b9250ff99243a3d6afaa37c53506ec286acfc9 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Sat, 1 Feb 2025 09:19:00 +0100 Subject: [PATCH 0159/2168] trilium-next-desktop: 0.90.12 -> 0.91.5 --- pkgs/by-name/tr/trilium-next-desktop/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/tr/trilium-next-desktop/package.nix b/pkgs/by-name/tr/trilium-next-desktop/package.nix index 91663165f311..48dcb1e9812e 100644 --- a/pkgs/by-name/tr/trilium-next-desktop/package.nix +++ b/pkgs/by-name/tr/trilium-next-desktop/package.nix @@ -6,7 +6,7 @@ fetchzip, makeBinaryWrapper, # use specific electron since it has to load a compiled module - electron_31, + electron_34, autoPatchelfHook, makeDesktopItem, copyDesktopItems, @@ -16,13 +16,13 @@ let pname = "trilium-next-desktop"; - version = "0.90.12"; + version = "0.91.5"; linuxSource.url = "https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-v${version}-linux-x64.zip"; - linuxSource.sha256 = "0ji28l60wyzhjbi6g5845dnm763bvg7535zfgzcmfgwjs6zr6nfq"; + linuxSource.sha256 = "10icng86y0idp7sjm7gzbcldd3gzc4z882d99hq959xiqd5lkcfi"; darwinSource.url = "https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-v${version}-macos-x64.zip"; - darwinSource.sha256 = "0jv80k7dk6gpyfj36iin6y7fk7qan4bya72f14jcgfla95wvk6ls"; + darwinSource.sha256 = "0377d12a43q2dmwb8zm22354w7crydj5q8n0g7i60gcyqsqpph8w"; meta = { description = "Hierarchical note taking application with focus on building large personal knowledge bases"; @@ -99,7 +99,7 @@ let asar pack $tmp/ $out/share/trilium/resources/app.asar rm -rf $tmp - makeWrapper ${lib.getExe electron_31} $out/bin/trilium \ + makeWrapper ${lib.getExe electron_34} $out/bin/trilium \ "''${gappsWrapperArgs[@]}" \ --set-default ELECTRON_IS_DEV 0 \ --add-flags $out/share/trilium/resources/app.asar From 649f78a78e2552ebce266d33237a08615b904f87 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Sat, 1 Feb 2025 09:19:00 +0100 Subject: [PATCH 0160/2168] trilium-next-server: 0.90.12 -> 0.91.5 --- .../by-name/tr/trilium-next-desktop/update.sh | 6 +- ...sole-logger-instead-of-rolling-files.patch | 81 ++++--------------- .../tr/trilium-next-server/package.nix | 25 +++++- 3 files changed, 41 insertions(+), 71 deletions(-) diff --git a/pkgs/by-name/tr/trilium-next-desktop/update.sh b/pkgs/by-name/tr/trilium-next-desktop/update.sh index 763e62c467c2..2aa423d37f9f 100755 --- a/pkgs/by-name/tr/trilium-next-desktop/update.sh +++ b/pkgs/by-name/tr/trilium-next-desktop/update.sh @@ -18,6 +18,8 @@ setKV ./package.nix linuxSource.sha256 $sha256_linux64 setKV ./package.nix darwinSource.sha256 $sha256_darwin64 # Update server -sha256_linux64_server=$(nix-prefetch-url --quiet https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-v${version}-server-linux-x64.tar.xz) +sha256_linux64_server=$(nix-prefetch-url --quiet https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-linux-x64-v${version}.tar.xz) +sha256_linux64_server_arm=$(nix-prefetch-url --quiet https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-linux-arm64-v${version}.tar.xz) setKV ../trilium-next-server/package.nix version $version -setKV ../trilium-next-server/package.nix serverSource.sha256 $sha256_linux64_server +setKV ../trilium-next-server/package.nix serverSource_x64.sha256 $sha256_linux64_server +setKV ../trilium-next-server/package.nix serverSource_arm64.sha256 $sha256_linux64_server_arm diff --git a/pkgs/by-name/tr/trilium-next-server/0001-Use-console-logger-instead-of-rolling-files.patch b/pkgs/by-name/tr/trilium-next-server/0001-Use-console-logger-instead-of-rolling-files.patch index 871076a76331..e6f33b51bf24 100644 --- a/pkgs/by-name/tr/trilium-next-server/0001-Use-console-logger-instead-of-rolling-files.patch +++ b/pkgs/by-name/tr/trilium-next-server/0001-Use-console-logger-instead-of-rolling-files.patch @@ -2,78 +2,29 @@ diff --git a/src/services/log.js b/src/services/log.js index 2840c185a..7fb16dd08 100644 --- a/src/services/log.js +++ b/src/services/log.js -@@ -1,45 +1,12 @@ - "use strict"; --import fs from "fs"; --import dataDir from "./data_dir.js"; +@@ -3,9 +3,6 @@ import fs from "fs"; + import dataDir from "./data_dir.js"; import cls from "./cls.js"; + import { isWindows } from "./utils.js"; -if (!fs.existsSync(dataDir.LOG_DIR)) { - fs.mkdirSync(dataDir.LOG_DIR, 0o700); -} --let logFile; + let logFile; const SECOND = 1000; const MINUTE = 60 * SECOND; --const HOUR = 60 * MINUTE; --const DAY = 24 * HOUR; --const NEW_LINE = process.platform === "win32" ? '\r\n' : '\n'; --let todaysMidnight; --initLogFile(); --function getTodaysMidnight() { -- const now = new Date(); -- return new Date(now.getFullYear(), now.getMonth(), now.getDate()); --} --function initLogFile() { -- todaysMidnight = getTodaysMidnight(); -- const path = `${dataDir.LOG_DIR}/trilium-${formatDate()}.log`; -- if (logFile) { -- logFile.end(); -- } -- logFile = fs.createWriteStream(path, { flags: 'a' }); --} --function checkDate(millisSinceMidnight) { -- if (millisSinceMidnight >= DAY) { -- initLogFile(); -- millisSinceMidnight -= DAY; -- } -- return millisSinceMidnight; --} - function log(str) { - const bundleNoteId = cls.get("bundleNoteId"); - if (bundleNoteId) { - str = `[Script ${bundleNoteId}] ${str}`; -- } -- let millisSinceMidnight = Date.now() - todaysMidnight.getTime(); -- millisSinceMidnight = checkDate(millisSinceMidnight); +@@ -24,7 +21,6 @@ function initLogFile() { + if (logFile) { + logFile.end(); + } +- logFile = fs.createWriteStream(path, { flags: "a" }); + } + function checkDate(millisSinceMidnight) { + if (millisSinceMidnight >= DAY) { +@@ -40,7 +36,6 @@ function log(str) { + } + let millisSinceMidnight = Date.now() - todaysMidnight.getTime(); + millisSinceMidnight = checkDate(millisSinceMidnight); - logFile.write(`${formatTime(millisSinceMidnight)} ${str}${NEW_LINE}`); -+ } console.log(str); } function info(message) { -@@ -61,27 +28,6 @@ function request(req, res, timeMs, responseLength = "?") { - info((timeMs >= 10 ? "Slow " : "") + - `${res.statusCode} ${req.method} ${req.url} with ${responseLength} bytes took ${timeMs}ms`); - } --function pad(num) { -- num = Math.floor(num); -- return num < 10 ? (`0${num}`) : num.toString(); --} --function padMilli(num) { -- if (num < 10) { -- return `00${num}`; -- } -- else if (num < 100) { -- return `0${num}`; -- } -- else { -- return num.toString(); -- } --} --function formatTime(millisSinceMidnight) { -- return `${pad(millisSinceMidnight / HOUR)}:${pad((millisSinceMidnight % HOUR) / MINUTE)}:${pad((millisSinceMidnight % MINUTE) / SECOND)}.${padMilli(millisSinceMidnight % SECOND)}`; --} --function formatDate() { -- return `${pad(todaysMidnight.getFullYear())}-${pad(todaysMidnight.getMonth() + 1)}-${pad(todaysMidnight.getDate())}`; --} - export default { - info, - error, diff --git a/pkgs/by-name/tr/trilium-next-server/package.nix b/pkgs/by-name/tr/trilium-next-server/package.nix index 4c29d71ebd4d..3d0287479ec8 100644 --- a/pkgs/by-name/tr/trilium-next-server/package.nix +++ b/pkgs/by-name/tr/trilium-next-server/package.nix @@ -7,10 +7,20 @@ }: let - version = "0.90.12"; + version = "0.91.5"; - serverSource.url = "https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-v${version}-server-linux-x64.tar.xz"; - serverSource.sha256 = "0gvb01cj334n805rs230xwwcv4rf2z2giikpagw8wqrs54gy3b35"; + serverSource_x64.url = "https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-linux-x64-v${version}.tar.xz"; + serverSource_x64.sha256 = "sha256-zLq3Dfgdz01Ds3eNqd5MrgQ5Jy7Ioj3UwnaR+Mt1IjE="; + serverSource_arm64.url = "https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-linux-arm64-v${version}.tar.xz"; + serverSource_arm64.sha256 = "0bih1v3lfmrjdvsdrlfayq23b3dnb2gpszxlvchgx4vq98nqdc8f"; + + serverSource = + if stdenv.hostPlatform.isx86_64 then + serverSource_x64 + else if stdenv.hostPlatform.isAarch64 then + serverSource_arm64 + else + throw "${stdenv.hostPlatform.config} not supported by trilium-next-server"; in stdenv.mkDerivation { pname = "trilium-next-server"; @@ -45,6 +55,10 @@ stdenv.mkDerivation { --chdir "$out/share/trilium-server" \ --add-flags "src/main" + # Clean up broken symlinks and build tools. + rm "$out"/share/trilium-server/node/bin/{npm,npx} + rm -r "$out"/share/trilium-server/node_modules/{@npmcli,@rollup,@babel} + runHook postInstall ''; @@ -53,7 +67,10 @@ stdenv.mkDerivation { homepage = "https://github.com/TriliumNext/Notes"; license = lib.licenses.agpl3Plus; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - platforms = [ "x86_64-linux" ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; maintainers = with lib.maintainers; [ eliandoran fliegendewurst From 3afa8bc0b9101dc53528868fe78e18b2af21ec7d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Feb 2025 13:38:12 +0000 Subject: [PATCH 0161/2168] ultrastardx: 2025.1.0 -> 2025.2.0 --- pkgs/by-name/ul/ultrastardx/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ul/ultrastardx/package.nix b/pkgs/by-name/ul/ultrastardx/package.nix index 483b9e95785f..b8ef7910b571 100644 --- a/pkgs/by-name/ul/ultrastardx/package.nix +++ b/pkgs/by-name/ul/ultrastardx/package.nix @@ -47,13 +47,13 @@ let in stdenv.mkDerivation rec { pname = "ultrastardx"; - version = "2025.1.0"; + version = "2025.2.0"; src = fetchFromGitHub { owner = "UltraStar-Deluxe"; repo = "USDX"; rev = "v${version}"; - hash = "sha256-8/qFzPP3Gw9YAGsnyI+wJUP3Jo8UoZkihRgYg4P5MVo="; + hash = "sha256-qYM57ooqVAOUDDhBWEpk2q0Z14WE+8LdqdHFpgfzooY="; }; nativeBuildInputs = [ From 66bd09fb952a708aee6cc21062a1d98e10a6db70 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Feb 2025 19:13:59 +0000 Subject: [PATCH 0162/2168] sesh: 2.8.0 -> 2.10.0 --- pkgs/by-name/se/sesh/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/se/sesh/package.nix b/pkgs/by-name/se/sesh/package.nix index d62c1a9b8270..cd0be3625fe7 100644 --- a/pkgs/by-name/se/sesh/package.nix +++ b/pkgs/by-name/se/sesh/package.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "sesh"; - version = "2.8.0"; + version = "2.10.0"; src = fetchFromGitHub { owner = "joshmedeski"; repo = "sesh"; rev = "v${version}"; - hash = "sha256-ndHi7GSdc+BJ7eYRt9ZE+eabZbFlYKJ9AqTY6Xs53QI="; + hash = "sha256-IM6wE/DMplG8jk4BXYprwIztPbgAHubr/YFavvPkBU8="; }; vendorHash = "sha256-3wNp1meUoUFPa2CEgKjuWcu4I6sxta3FPFvCb9QMQhQ="; From 0b0e3a872fa005b9f4b998a10c26f7b6f11f5b61 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Sat, 1 Feb 2025 13:59:33 -0800 Subject: [PATCH 0163/2168] mattermost: add goModules attribute for update script --- pkgs/by-name/ma/mattermost/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ma/mattermost/package.nix b/pkgs/by-name/ma/mattermost/package.nix index 534fa7759184..03763b6f3f16 100644 --- a/pkgs/by-name/ma/mattermost/package.nix +++ b/pkgs/by-name/ma/mattermost/package.nix @@ -49,6 +49,7 @@ let pname version src + goModules npmDeps webapp meta From 9d336fde19e854b8c60cdd9d3ef2ca9c4f4cd883 Mon Sep 17 00:00:00 2001 From: Nobody_alias_N <165517462+Nobody-alias-N@users.noreply.github.com> Date: Sun, 2 Feb 2025 00:36:20 +0200 Subject: [PATCH 0164/2168] jupp: 40 -> 41 --- pkgs/by-name/ju/jupp/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ju/jupp/package.nix b/pkgs/by-name/ju/jupp/package.nix index 7ef4c878658e..908eea9d6102 100644 --- a/pkgs/by-name/ju/jupp/package.nix +++ b/pkgs/by-name/ju/jupp/package.nix @@ -8,15 +8,15 @@ stdenv.mkDerivation rec { pname = "jupp"; - version = "40"; + version = "41"; srcName = "joe-3.1${pname}${version}"; src = fetchurl { urls = [ "https://www.mirbsd.org/MirOS/dist/jupp/${srcName}.tgz" - "https://pub.allbsd.org/MirOS/dist/jupp/${srcName}.tgz" + "https://mbsd.evolvis.org/MirOS/dist/jupp/${srcName}.tgz" ]; - sha256 = "S+1DnN5/K+KU6W5J7z6RPqkPvl6RTbiIQD46J+gDWxo="; + hash = "sha256-e7jqivUZvv7/+T7DyeMhCNfyuDIWybx7Aa71CYhhyC8="; }; preConfigure = "chmod +x ./configure"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { "--enable-termidx" ]; - meta = with lib; { + meta = { homepage = "http://www.mirbsd.org/jupp.htm"; downloadPage = "https://www.mirbsd.org/MirOS/dist/jupp/"; description = "Portable fork of Joe's editor"; @@ -46,8 +46,8 @@ stdenv.mkDerivation rec { and has a lot of bugs fixed. It is based upon an older version of joe because these behave better overall. ''; - license = licenses.gpl1Only; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; unix; + license = lib.licenses.gpl1Only; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = with lib.platforms; unix; }; } From 555b7a818d53b503b74ecf8e471a0f1ed1b6226d Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Sun, 26 Jan 2025 02:18:00 +0100 Subject: [PATCH 0165/2168] vulkan-memory-allocator: 3.1.0 -> 3.2.0 --- .../vu/vulkan-memory-allocator/package.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/vu/vulkan-memory-allocator/package.nix b/pkgs/by-name/vu/vulkan-memory-allocator/package.nix index b2446d86ded3..281afa72b5f3 100644 --- a/pkgs/by-name/vu/vulkan-memory-allocator/package.nix +++ b/pkgs/by-name/vu/vulkan-memory-allocator/package.nix @@ -2,31 +2,20 @@ lib, stdenvNoCC, fetchFromGitHub, - fetchpatch, cmake, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "vulkan-memory-allocator"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "GPUOpen-LibrariesAndSDKs"; repo = "VulkanMemoryAllocator"; tag = "v${finalAttrs.version}"; - hash = "sha256-j0Z9OEwQx3RB2cni9eK3gYfwkhOc2ST213b6VseaVzg="; + hash = "sha256-f9TmMUbWqS00Ib3gpPQpd/0D02nDBUgYvPJ8rSFizFY="; }; - patches = [ - # Allows specifying version constraints on the CMake module - # Remove when version > 3.1.0 - (fetchpatch { - name = "0001-vulkan-memory-allocator-add-cmake-package-version-file.patch"; - url = "https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator/commit/257138b8f5686ae84491a3df9f90a77d5660c3bd.patch"; - hash = "sha256-qbQhIJho/WQqzAwB2zzWgGKx4QK9zKmbaGisbNOV8mg="; - }) - ]; - # A compiler is only required for the samples. This lets us use stdenvNoCC. postPatch = '' substituteInPlace CMakeLists.txt \ From 0c67c3b6dd47bfcb80a053c6b91518c82be95218 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Sun, 26 Jan 2025 02:04:17 +0100 Subject: [PATCH 0166/2168] vulkan-memory-allocator: add nix-update-script --- pkgs/by-name/vu/vulkan-memory-allocator/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/vu/vulkan-memory-allocator/package.nix b/pkgs/by-name/vu/vulkan-memory-allocator/package.nix index 281afa72b5f3..f7c34918daa3 100644 --- a/pkgs/by-name/vu/vulkan-memory-allocator/package.nix +++ b/pkgs/by-name/vu/vulkan-memory-allocator/package.nix @@ -3,6 +3,7 @@ stdenvNoCC, fetchFromGitHub, cmake, + nix-update-script, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -28,6 +29,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { strictDeps = true; + passthru.updateScript = nix-update-script { }; + meta = { description = "Easy to integrate Vulkan memory allocation library"; homepage = "https://gpuopen.com/vulkan-memory-allocator/"; From 9d7ab01d890e6e4722e218b578e5cf6afefd70b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 2 Feb 2025 03:37:01 +0000 Subject: [PATCH 0167/2168] v2rayn: 7.7.0 -> 7.7.1 --- pkgs/by-name/v2/v2rayn/deps.json | 53 ++++++++++++++---------------- pkgs/by-name/v2/v2rayn/package.nix | 4 +-- 2 files changed, 26 insertions(+), 31 deletions(-) diff --git a/pkgs/by-name/v2/v2rayn/deps.json b/pkgs/by-name/v2/v2rayn/deps.json index 847a4f37d9ec..173f7b0e4083 100644 --- a/pkgs/by-name/v2/v2rayn/deps.json +++ b/pkgs/by-name/v2/v2rayn/deps.json @@ -1,4 +1,14 @@ [ + { + "pname": "Avalonia", + "version": "11.1.3", + "hash": "sha256-kz+k/vkuWoL0XBvRT8SadMOmmRCFk9W/J4k/IM6oYX0=" + }, + { + "pname": "Avalonia", + "version": "11.2.1", + "hash": "sha256-KdjhwDKlii12v7HNI3NsYAM1qYoXKRsVN2scQJbYMTc=" + }, { "pname": "Avalonia", "version": "11.2.3", @@ -34,11 +44,6 @@ "version": "11.2.3", "hash": "sha256-DIGkaBff+C3BLwedw5xteR5lfzb6ecxiLt12eJVgLQc=" }, - { - "pname": "Avalonia.Fonts.Inter", - "version": "11.2.3", - "hash": "sha256-ySsCXVpjqjCX/uYkwluSfrAoBtuq9k7fC1bFjxKC9/Q=" - }, { "pname": "Avalonia.FreeDesktop", "version": "11.2.3", @@ -54,6 +59,16 @@ "version": "11.2.3", "hash": "sha256-NqRetBiFg5gNCS8C0J1JJJsZ4sz+w+GoEegGFddBGDg=" }, + { + "pname": "Avalonia.Remote.Protocol", + "version": "11.1.3", + "hash": "sha256-CKF+62zCbK1Rd/HiC6MGrags3ylXrVQ1lni3Um0Muqk=" + }, + { + "pname": "Avalonia.Remote.Protocol", + "version": "11.2.1", + "hash": "sha256-RlO65QbExBdjEUY66CTlHefRdTZWzZbN4ksibVXxKv4=" + }, { "pname": "Avalonia.Remote.Protocol", "version": "11.2.3", @@ -176,18 +191,13 @@ }, { "pname": "Semi.Avalonia", - "version": "11.2.1.3", - "hash": "sha256-AtJSFLa/zHk/58fJ+1h6IDowNDLTaRNUVaQ7lfQyYAw=" + "version": "11.2.1.4", + "hash": "sha256-X1YIonqLNySnMMope2/+O2HfpArc8AhT/gNBOI+0Ts8=" }, { "pname": "Semi.Avalonia.DataGrid", - "version": "11.2.1.3", - "hash": "sha256-CEjvrgPSxqubAQ6aOiag7SukA19WJ2s4G3zeLrk9810=" - }, - { - "pname": "SkiaSharp", - "version": "2.88.6", - "hash": "sha256-y0wzgwdQXtgl5boCz/EgLWbK3SwC0cFVRUbBxOUPQXc=" + "version": "11.2.1.4", + "hash": "sha256-UDb+Gw8nDsuxbMlV8CJaGItfJ85k+p3XPGPuZrIl0KM=" }, { "pname": "SkiaSharp", @@ -204,11 +214,6 @@ "version": "2.88.9", "hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A=" }, - { - "pname": "SkiaSharp.NativeAssets.macOS", - "version": "2.88.6", - "hash": "sha256-7hOMjlYTOiNPLNwfLFUjTcdgiGEtmYUI1EubiRiC6bo=" - }, { "pname": "SkiaSharp.NativeAssets.macOS", "version": "2.88.7", @@ -224,11 +229,6 @@ "version": "2.88.9", "hash": "sha256-vgFL4Pdy3O1RKBp+T9N3W4nkH9yurZ0suo8u3gPmmhY=" }, - { - "pname": "SkiaSharp.NativeAssets.Win32", - "version": "2.88.6", - "hash": "sha256-ljD4QmAO2/vwA6I8GIUNkONpOzmGsOVJJy9vPDnjVfA=" - }, { "pname": "SkiaSharp.NativeAssets.Win32", "version": "2.88.7", @@ -239,11 +239,6 @@ "version": "2.88.9", "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4=" }, - { - "pname": "SkiaSharp.QrCode", - "version": "0.7.0", - "hash": "sha256-2FvbwizAKAPTcMvf/TgBZEwOF4nYQ/79TvTSC+8LZ74=" - }, { "pname": "Splat", "version": "15.1.1", diff --git a/pkgs/by-name/v2/v2rayn/package.nix b/pkgs/by-name/v2/v2rayn/package.nix index 589973911190..6fc6929ec6ad 100644 --- a/pkgs/by-name/v2/v2rayn/package.nix +++ b/pkgs/by-name/v2/v2rayn/package.nix @@ -19,13 +19,13 @@ }: buildDotnetModule rec { pname = "v2rayn"; - version = "7.7.0"; + version = "7.7.1"; src = fetchFromGitHub { owner = "2dust"; repo = "v2rayN"; tag = version; - hash = "sha256-gnGZtHSmmyxTf+/Dp1cEXI1odI8SiFLzATd9PNnAC7E="; + hash = "sha256-u73LzCaGc3vdRs9sG9fdv1jrDubgZGkkxCnP55Bqdx8="; }; projectFile = "v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj"; From 75c4f247cd4100ba6fd1477734dd3adf01a81f63 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 2 Feb 2025 06:09:37 +0000 Subject: [PATCH 0168/2168] melange: 0.18.3 -> 0.19.3 --- pkgs/by-name/me/melange/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/me/melange/package.nix b/pkgs/by-name/me/melange/package.nix index e4853c99aa6a..c7bb965984ba 100644 --- a/pkgs/by-name/me/melange/package.nix +++ b/pkgs/by-name/me/melange/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "melange"; - version = "0.18.3"; + version = "0.19.3"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-bFlILwA8Vy7u8pJFx8PHvfYaeh8M2SRzrTpdDMYz6+M="; + hash = "sha256-90Ezv9PM1lFRq4b0ACrc34OteF6P/8DhZy+5kCnInSI="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -25,7 +25,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-xOsxzDIk2tuPXDtf1k0604B3AYgxEH5iQ/YdDs2Aezs="; + vendorHash = "sha256-V1BDcAD84W5n/IOAcO+eMd+LnSe0sgNgBeq95dOl/Us="; subPackages = [ "." ]; From c6919aa5616f9ac93fb9e7e848fc2d7097a76260 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 2 Feb 2025 08:00:46 +0000 Subject: [PATCH 0169/2168] grizzly: 0.6.1 -> 0.7.1 --- pkgs/by-name/gr/grizzly/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gr/grizzly/package.nix b/pkgs/by-name/gr/grizzly/package.nix index dee241dd4c3f..3b353320f833 100644 --- a/pkgs/by-name/gr/grizzly/package.nix +++ b/pkgs/by-name/gr/grizzly/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "grizzly"; - version = "0.6.1"; + version = "0.7.1"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - hash = "sha256-9NtJHavlkuu8qSQI4FvXDOKfD1WjNzVqGDd8/8Fo3DE="; + hash = "sha256-1caG2QIBfbCgg9TLsW4XB0w+4dqUkQEsdWwRazbWeQA="; }; - vendorHash = "sha256-lioFmaFzqaxN1wnYJaoHA54to1xGZjaLGaqAFIfTaTs="; + vendorHash = "sha256-JxYafSralKqd/AB6fhTuQvt0q+/Zeu7dmZwVAAkolxY="; subPackages = [ "cmd/grr" ]; From 7ea2cf0e375c7ac35a497b002e81cd33ff467d1b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 2 Feb 2025 08:29:51 +0000 Subject: [PATCH 0170/2168] livi: 0.3.0 -> 0.3.1 --- pkgs/by-name/li/livi/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/livi/package.nix b/pkgs/by-name/li/livi/package.nix index 35e2d62c374a..9c9b528abeeb 100644 --- a/pkgs/by-name/li/livi/package.nix +++ b/pkgs/by-name/li/livi/package.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { pname = "livi"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitLab { owner = "guidog"; repo = "livi"; domain = "gitlab.gnome.org"; rev = "v${version}"; - hash = "sha256-13hvpYlMDfB6Y0yH2MaowuylKUk1AGv6R7j4E156YpI="; + hash = "sha256-cPnmKepXPeA3h0VYHypEPHAOclhVseokL1NsCKxGJ78="; }; nativeBuildInputs = [ meson From 7401d8c7b2d31b63da03d8071494f8a7f245fb5a Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Sat, 1 Feb 2025 09:19:00 +0100 Subject: [PATCH 0171/2168] python312Packages.pytrends: drop --- .../python-modules/pytrends/default.nix | 59 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 61 deletions(-) delete mode 100644 pkgs/development/python-modules/pytrends/default.nix diff --git a/pkgs/development/python-modules/pytrends/default.nix b/pkgs/development/python-modules/pytrends/default.nix deleted file mode 100644 index c9e20859086b..000000000000 --- a/pkgs/development/python-modules/pytrends/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - setuptools, - setuptools-scm, - wheel, - requests, - lxml, - pandas, - pytestCheckHook, - pytest-recording, - responses, -}: - -buildPythonPackage rec { - pname = "pytrends"; - version = "4.9.2"; - format = "pyproject"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-aRxuNrGuqkdU82kr260N/0RuUo/7BS7uLn8TmqosaYk="; - }; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'addopts = "--cov pytrends/"' "" - ''; - - nativeBuildInputs = [ - setuptools - setuptools-scm - wheel - ]; - - propagatedBuildInputs = [ - requests - lxml - pandas - ]; - - nativeCheckInputs = [ - pytestCheckHook - pytest-recording - responses - ]; - - pytestFlagsArray = [ "--block-network" ]; - - pythonImportsCheck = [ "pytrends" ]; - - meta = with lib; { - description = "Pseudo API for Google Trends"; - homepage = "https://github.com/GeneralMills/pytrends"; - license = [ licenses.asl20 ]; - maintainers = [ maintainers.mmahut ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 49eec3d93d70..704405de164c 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -375,6 +375,7 @@ mapAliases ({ PyMVGLive = pymvglive; # added 2023-02-19 pymyq = python-myq; # added 2023-10-20 python-myq = throw "python-myq has been removed, as the service provider has decided to block its API requests"; # added 2023-12-07 + pytrends = throw "pytrends has been removed, as it no longer works and is abandoned upstream"; # added 2025-02-02 pyqt4 = throw "pyqt4 has been removed, because it depended on the long EOL qt4"; # added 2022-06-09 pyqt5_sip = pyqt5-sip; # added 2024-01-07 pyqt5_with_qtmultimedia = pyqt5-multimedia; # added 2024-01-07 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 150965f1d205..495137f2534c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12645,8 +12645,6 @@ self: super: with self; { pytransportnswv2 = callPackage ../development/python-modules/pytransportnswv2 { }; - pytrends = callPackage ../development/python-modules/pytrends { }; - pytricia = callPackage ../development/python-modules/pytricia { }; pytrydan = callPackage ../development/python-modules/pytrydan { }; From ff23b19e01dd7bcdea59844155e684506471e95a Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Sun, 2 Feb 2025 11:26:58 +0100 Subject: [PATCH 0172/2168] python313Packages.inform: fix tests --- pkgs/development/python-modules/inform/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/inform/default.nix b/pkgs/development/python-modules/inform/default.nix index d69941e15a85..ba25c90f66db 100644 --- a/pkgs/development/python-modules/inform/default.nix +++ b/pkgs/development/python-modules/inform/default.nix @@ -9,6 +9,7 @@ num2words, pytestCheckHook, pythonOlder, + pythonAtLeast, }: buildPythonPackage rec { @@ -38,7 +39,12 @@ buildPythonPackage rec { hypothesis ]; - disabledTests = [ "test_prostrate" ]; + disabledTests = + [ "test_prostrate" ] + ++ lib.optionals (pythonAtLeast "3.13") [ + # doctest runs one more test than expected + "test_inform" + ]; meta = with lib; { description = "Print and logging utilities"; From 82c62d132e3f8a087bdaa6941800fcd157dffa99 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 2 Feb 2025 13:50:17 +0100 Subject: [PATCH 0173/2168] nixosTests.terminal-emulators.lomiri-terminal-app: Drop --- nixos/tests/lomiri.nix | 5 ----- nixos/tests/terminal-emulators.nix | 5 ----- .../lomiri/applications/lomiri-terminal-app/default.nix | 7 ++++++- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/nixos/tests/lomiri.nix b/nixos/tests/lomiri.nix index 4e400ccf121e..dbc99843d556 100644 --- a/nixos/tests/lomiri.nix +++ b/nixos/tests/lomiri.nix @@ -256,9 +256,6 @@ in machine.send_key("ctrl-alt-t") wait_for_text(r"(${user}|machine)") machine.screenshot("terminal_opens") - - # lomiri-terminal-app has a separate VM test to test its basic functionality - machine.send_key("alt-f4") # We want the ability to launch applications @@ -449,8 +446,6 @@ in wait_for_text(r"(${user}|machine)") machine.screenshot("terminal_opens") - # lomiri-terminal-app has a separate VM test to test its basic functionality - # for the LSS lomiri-content-hub test to work reliably, we need to kick off peer collecting machine.send_chars("lomiri-content-hub-test-importer\n") wait_for_text(r"(/build/source|hub.cpp|handler.cpp|void|virtual|const)") # awaiting log messages from lomiri-content-hub diff --git a/nixos/tests/terminal-emulators.nix b/nixos/tests/terminal-emulators.nix index 3fc820d3ac8b..6b209b8b3368 100644 --- a/nixos/tests/terminal-emulators.nix +++ b/nixos/tests/terminal-emulators.nix @@ -65,11 +65,6 @@ let konsole.pkg = p: p.plasma5Packages.konsole; - lomiri-terminal-app.pkg = p: p.lomiri.lomiri-terminal-app; - # after recent Mesa change, borked software rendering config under x86_64 icewm? - # BGR colour display on x86_64, RGB on aarch64 - lomiri-terminal-app.colourTest = false; - lxterminal.pkg = p: p.lxterminal; mate-terminal.pkg = p: p.mate.mate-terminal; diff --git a/pkgs/desktops/lomiri/applications/lomiri-terminal-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-terminal-app/default.nix index 6701f56b35ec..3fc7c5432716 100644 --- a/pkgs/desktops/lomiri/applications/lomiri-terminal-app/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri-terminal-app/default.nix @@ -61,7 +61,12 @@ stdenv.mkDerivation (finalAttrs: { ]; passthru = { - tests.vm-test = nixosTests.terminal-emulators.lomiri-terminal-app; + tests = { + # The way the test works sometimes causes segfaults in qtfeedback + # https://gitlab.com/ubports/development/apps/lomiri-terminal-app/-/issues/117 + # vm-test = nixosTests.terminal-emulators.lomiri-terminal-app; + inherit (nixosTests.lomiri) desktop-basics desktop-appinteractions; + }; updateScript = gitUpdater { rev-prefix = "v"; }; From 349335e67c92c4c1e50e3939c243b9903b8a388c Mon Sep 17 00:00:00 2001 From: Keenan Weaver Date: Sun, 2 Feb 2025 07:06:18 -0600 Subject: [PATCH 0174/2168] woof-doom: 15.1.0 -> 15.2.0 --- pkgs/by-name/wo/woof-doom/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wo/woof-doom/package.nix b/pkgs/by-name/wo/woof-doom/package.nix index d027006161f1..1464deb534c3 100644 --- a/pkgs/by-name/wo/woof-doom/package.nix +++ b/pkgs/by-name/wo/woof-doom/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "woof-doom"; - version = "15.1.0"; + version = "15.2.0"; src = fetchFromGitHub { owner = "fabiangreffrath"; repo = "woof"; rev = "woof_${finalAttrs.version}"; - hash = "sha256-rVcD+yeqkguNcfusVI1Y0X+RkXRMIShr9FjTbWB4Qfg="; + hash = "sha256-U1JxdWKSIbIbPMipnjY2SJ5lOP9AFMLNjyplK0mFhxE="; }; nativeBuildInputs = [ From 7c22280a25e473ea12a6423c459e0eec09f07127 Mon Sep 17 00:00:00 2001 From: goldenboy Date: Sun, 2 Feb 2025 09:07:03 -0500 Subject: [PATCH 0175/2168] saleae-logic-2: 2.4.13 -> 2.4.22 --- pkgs/by-name/sa/saleae-logic-2/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sa/saleae-logic-2/package.nix b/pkgs/by-name/sa/saleae-logic-2/package.nix index 6a447c587660..037a299a2054 100644 --- a/pkgs/by-name/sa/saleae-logic-2/package.nix +++ b/pkgs/by-name/sa/saleae-logic-2/package.nix @@ -6,10 +6,10 @@ }: let pname = "saleae-logic-2"; - version = "2.4.13"; + version = "2.4.22"; src = fetchurl { - url = "https://downloads.saleae.com/logic2/Logic-${version}-linux-x64.AppImage"; - hash = "sha256-0GIZQKQDY3arDUlxjQKWOHDB3j76xVwkx5H+8q+d0Rc="; + url = "https://downloads2.saleae.com/logic2/Logic-${version}-linux-x64.AppImage"; + hash = "sha256-MMuuSYOVw4O/JDsXz9OneUyJMNLUUCBpAMRqCs64khk="; }; desktopItem = makeDesktopItem { name = "saleae-logic-2"; From 94368ed5a50e9f3d778ecc1bc68b9fb6e259a706 Mon Sep 17 00:00:00 2001 From: 3JlOy_PYCCKUI <3jl0y_pycckui@riseup.net> Date: Sun, 2 Feb 2025 17:08:23 +0300 Subject: [PATCH 0176/2168] https-dns-proxy: unstable-2022-05-05 -> 0-unstable-2024-11-18 --- pkgs/by-name/ht/https-dns-proxy/package.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ht/https-dns-proxy/package.nix b/pkgs/by-name/ht/https-dns-proxy/package.nix index e4fc762bd82d..a37168689b58 100644 --- a/pkgs/by-name/ht/https-dns-proxy/package.nix +++ b/pkgs/by-name/ht/https-dns-proxy/package.nix @@ -5,26 +5,23 @@ cmake, gtest, c-ares, - curl, + curlHTTP3, libev, }: let - # https-dns-proxy supports HTTP3 if curl has support, but as of 2022-08 curl doesn't work with that enabled - # curl' = (curl.override { http3Support = true; }); - curl' = curl; - + curl' = curlHTTP3; in stdenv.mkDerivation rec { pname = "https-dns-proxy"; # there are no stable releases (yet?) - version = "unstable-2022-05-05"; + version = "0-unstable-2024-11-18"; src = fetchFromGitHub { owner = "aarond10"; repo = "https_dns_proxy"; - rev = "d310a378795790350703673388821558163944de"; - hash = "sha256-On4SKUeltPhzM/x+K9aKciKBw5lmVySxnmLi2tnKr3Y="; + rev = "484bd153bb85a51df1c5bede1b091be76537e0a7"; + hash = "sha256-T4l3kQ2hPgmyKE7xzlkDDUD6AQi8dQPJQnw8NhUUhDY="; }; postPatch = '' From 3366dda7f46e67a7e45ddb97fe1f704504fcc3bd Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Sun, 2 Feb 2025 11:26:58 +0100 Subject: [PATCH 0177/2168] python312Packages.pymatreader: 0.0.31 -> 1.0.0 --- .../python-modules/pymatreader/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pymatreader/default.nix b/pkgs/development/python-modules/pymatreader/default.nix index 486e88a313a4..d51b4d0b59cf 100644 --- a/pkgs/development/python-modules/pymatreader/default.nix +++ b/pkgs/development/python-modules/pymatreader/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitLab, - setuptools, + hatchling, h5py, numpy, scipy, @@ -12,17 +12,23 @@ buildPythonPackage rec { pname = "pymatreader"; - version = "0.0.31"; + version = "1.0.0"; pyproject = true; src = fetchFromGitLab { owner = "obob"; repo = "pymatreader"; - rev = "refs/tags/v${version}"; - hash = "sha256-pYObmvqA49sHjpZcwXkN828R/N5CSpmr0OyyxzDiodQ="; + tag = "v${version}"; + hash = "sha256-cDEGEvBSj3gmjA+8aXULwuBVk09BLQbA91CNAxgtiLA="; }; - nativeBuildInputs = [ setuptools ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'source = "regex_commit"' "" \ + --replace-fail '"hatch-regex-commit"' "" + ''; + + build-system = [ hatchling ]; propagatedBuildInputs = [ h5py From a31c6951411f488ab32b6e86b8b520a1a2345dcf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 2 Feb 2025 16:35:46 +0000 Subject: [PATCH 0178/2168] yafc-ce: 2.6.0 -> 2.7.0 --- pkgs/by-name/ya/yafc-ce/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ya/yafc-ce/package.nix b/pkgs/by-name/ya/yafc-ce/package.nix index 2500ee6cb352..45305b2072d3 100644 --- a/pkgs/by-name/ya/yafc-ce/package.nix +++ b/pkgs/by-name/ya/yafc-ce/package.nix @@ -12,13 +12,13 @@ let in buildDotnetModule (finalAttrs: { pname = "yafc-ce"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "shpaass"; repo = "yafc-ce"; rev = finalAttrs.version; - hash = "sha256-anQ49VWDIdze108idGLXXM74dfqAg9KqVthFozHQl0A="; + hash = "sha256-pBnAUrDnOabQq7D1YJ41aJq9MSPIHQ6K8ix5TLwkrZ0="; }; projectFile = [ "Yafc/Yafc.csproj" ]; From 48e48c18c1cce655da909c3af63e7238454a0e6d Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 2 Feb 2025 16:33:09 +0000 Subject: [PATCH 0179/2168] duperemove: 0.14.1 -> 0.15 Changes: https://github.com/markfasheh/duperemove/releases/tag/v0.15 --- pkgs/by-name/du/duperemove/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/du/duperemove/package.nix b/pkgs/by-name/du/duperemove/package.nix index 46a5522d597d..473abef34068 100644 --- a/pkgs/by-name/du/duperemove/package.nix +++ b/pkgs/by-name/du/duperemove/package.nix @@ -2,7 +2,9 @@ lib, stdenv, fetchFromGitHub, + libbsd, libgcrypt, + xxHash, pkg-config, glib, linuxHeaders ? stdenv.cc.libc.linuxHeaders, @@ -14,13 +16,13 @@ stdenv.mkDerivation rec { pname = "duperemove"; - version = "0.14.1"; + version = "0.15"; src = fetchFromGitHub { owner = "markfasheh"; repo = "duperemove"; rev = "v${version}"; - hash = "sha256-iMv80UKktYOhNfVA3mW6kKv8TwLZaP6MQt24t3Rchk4="; + hash = "sha256-m89e7ewda4+TNemoXG/9dG7HI9xHmsqVfMIFg5Ft2YM="; }; postPatch = '' @@ -30,11 +32,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ + libbsd libgcrypt glib linuxHeaders sqlite util-linux + xxHash ]; makeFlags = [ From 6cd98eae0ded1fbd3ed0ad8337e36113797d8154 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 2 Feb 2025 18:57:47 +0000 Subject: [PATCH 0180/2168] nwg-drawer: 0.5.2 -> 0.6.3 --- pkgs/by-name/nw/nwg-drawer/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/nw/nwg-drawer/package.nix b/pkgs/by-name/nw/nwg-drawer/package.nix index 4b843bf3e6a4..09984af405cd 100644 --- a/pkgs/by-name/nw/nwg-drawer/package.nix +++ b/pkgs/by-name/nw/nwg-drawer/package.nix @@ -13,16 +13,16 @@ let pname = "nwg-drawer"; - version = "0.5.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-drawer"; rev = "v${version}"; - hash = "sha256-A/Rg7iUk8qpJ5lxumv4JNNJG1vN8wJIabJupp2c+nsw="; + hash = "sha256-LFxugvLRUyx6uNc8dzn7tB4cZp87hcI7Fi2/9hVBJx0="; }; - vendorHash = "sha256-r4DtY06z0ZcPoHba4pqpCWqxYo7RbwCKi2g4jdoN1kg="; + vendorHash = "sha256-3QSq4zdsQu2bvKH0oA4Sapd247jYy+GV69roy9x8WK0="; in buildGoModule { inherit From 1d62c6da413c497961c8e44805b956ab081a4b51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 2 Feb 2025 11:28:10 -0800 Subject: [PATCH 0181/2168] libadwaita: 1.6.3 -> 1.6.4 Diff: https://gitlab.gnome.org/GNOME/libadwaita/-/compare/1.6.3...1.6.4 Changelog: https://gitlab.gnome.org/GNOME/libadwaita/-/blob/1.6.4/NEWS --- pkgs/development/libraries/libadwaita/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index f34c14e79d27..42d7be0c068c 100644 --- a/pkgs/development/libraries/libadwaita/default.nix +++ b/pkgs/development/libraries/libadwaita/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libadwaita"; - version = "1.6.3"; + version = "1.6.4"; outputs = [ "out" @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "GNOME"; repo = "libadwaita"; rev = finalAttrs.version; - hash = "sha256-4rYiNI6Oj++iqbPIwe8KvwviGnh93sAZ9wp1cIPZcBA="; + hash = "sha256-7AI8Eb6o/Gysli9CprwsgAzz1cGmNU79Qm7OzlsaTFw="; }; depsBuildBuild = [ From a4f4624cc81f094782c9ab645462d8a01d96ae87 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Sun, 2 Feb 2025 17:04:43 -0300 Subject: [PATCH 0182/2168] nixd: 2.6.0 -> 2.6.1 --- pkgs/development/tools/language-servers/nixd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/language-servers/nixd/default.nix b/pkgs/development/tools/language-servers/nixd/default.nix index ab873f618f22..458a1fd9eb1b 100644 --- a/pkgs/development/tools/language-servers/nixd/default.nix +++ b/pkgs/development/tools/language-servers/nixd/default.nix @@ -21,13 +21,13 @@ let common = rec { - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixd"; - rev = version; - hash = "sha256-gYC7nbZsTDOA1cJIw9JRjwjgkvSzrlQonGTT21EZeWM="; + tag = version; + hash = "sha256-HbHqog4Ct8qWJegAHcEcIVNbSyzrmrFspdOk+SVUaHI="; }; nativeBuildInputs = [ From d250c32be71d2d757db32a1b22d4cabba55c95b4 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Sun, 26 Jan 2025 22:44:30 +0100 Subject: [PATCH 0183/2168] services.mysqlBackup: make singleTransaction configurable per database --- nixos/modules/services/backup/mysql-backup.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/backup/mysql-backup.nix b/nixos/modules/services/backup/mysql-backup.nix index 33dc1c35ebeb..a8d874eaa668 100644 --- a/nixos/modules/services/backup/mysql-backup.nix +++ b/nixos/modules/services/backup/mysql-backup.nix @@ -39,6 +39,13 @@ let selectedAlg = compressionAlgs.${cfg.compressionAlg}; compressionCmd = selectedAlg.cmd compressionLevelFlag; + shouldUseSingleTransaction = + db: + if lib.isBool cfg.singleTransaction then + cfg.singleTransaction + else + lib.elem db cfg.singleTransaction; + backupScript = '' set -o pipefail failed="" @@ -51,7 +58,7 @@ let backupDatabaseScript = db: '' dest="${cfg.location}/${db}${selectedAlg.ext}" - if ${pkgs.mariadb}/bin/mysqldump ${lib.optionalString cfg.singleTransaction "--single-transaction"} ${db} | ${compressionCmd} > $dest.tmp; then + if ${pkgs.mariadb}/bin/mysqldump ${lib.optionalString (shouldUseSingleTransaction db) "--single-transaction"} ${db} | ${compressionCmd} > $dest.tmp; then mv $dest.tmp $dest echo "Backed up to $dest" else @@ -126,9 +133,13 @@ in singleTransaction = lib.mkOption { default = false; - type = lib.types.bool; + type = lib.types.oneOf [ + lib.types.bool + (lib.types.listOf lib.types.str) + ]; description = '' - Whether to create database dump in a single transaction + Whether to create database dump in a single transaction. + Can be either a boolean for all databases or a list of database names. ''; }; From 00f0c5cf3264189205230d6a383432940cafad82 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Mon, 27 Jan 2025 15:57:30 +0100 Subject: [PATCH 0184/2168] services.mysqlBackup: use new path of mariadb-dump if mysql service package is a modern mariadb --- nixos/modules/services/backup/mysql-backup.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/backup/mysql-backup.nix b/nixos/modules/services/backup/mysql-backup.nix index a8d874eaa668..ffa9af5ded79 100644 --- a/nixos/modules/services/backup/mysql-backup.nix +++ b/nixos/modules/services/backup/mysql-backup.nix @@ -8,6 +8,17 @@ let cfg = config.services.mysqlBackup; defaultUser = "mysqlbackup"; + dumpBinary = + if + ( + lib.getName config.services.mysql.package == lib.getName pkgs.mariadb + && lib.versionAtLeast config.services.mysql.package.version "11.0.0" + ) + then + "${config.services.mysql.package}/bin/mariadb-dump" + else + "${config.services.mysql.package}/bin/mysqldump"; + compressionAlgs = { gzip = rec { pkg = pkgs.gzip; @@ -58,7 +69,7 @@ let backupDatabaseScript = db: '' dest="${cfg.location}/${db}${selectedAlg.ext}" - if ${pkgs.mariadb}/bin/mysqldump ${lib.optionalString (shouldUseSingleTransaction db) "--single-transaction"} ${db} | ${compressionCmd} > $dest.tmp; then + if ${dumpBinary} ${lib.optionalString (shouldUseSingleTransaction db) "--single-transaction"} ${db} | ${compressionCmd} > $dest.tmp; then mv $dest.tmp $dest echo "Backed up to $dest" else From 16553f2c836371d3fab643be15549bceab93da85 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Thu, 30 Jan 2025 15:27:56 +0100 Subject: [PATCH 0185/2168] services.mysqlBackup: add assertion that all databases in singleTransaction must be included in the databases option --- nixos/modules/services/backup/mysql-backup.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/modules/services/backup/mysql-backup.nix b/nixos/modules/services/backup/mysql-backup.nix index ffa9af5ded79..7e6a0b76d08f 100644 --- a/nixos/modules/services/backup/mysql-backup.nix +++ b/nixos/modules/services/backup/mysql-backup.nix @@ -175,6 +175,12 @@ in || selectedAlg.minLevel <= cfg.compressionLevel && cfg.compressionLevel <= selectedAlg.maxLevel; message = "${cfg.compressionAlg} compression level must be between ${toString selectedAlg.minLevel} and ${toString selectedAlg.maxLevel}"; } + { + assertion = + !(lib.isList cfg.singleTransaction) + || lib.all (db: lib.elem db cfg.databases) cfg.singleTransaction; + message = "All databases in singleTransaction must be included in the databases option"; + } ]; # ensure unix user to be used to perform backup exist. From 657c689842d9c57d9e3ce7a81d24cabf2e46445b Mon Sep 17 00:00:00 2001 From: emilylange Date: Sun, 2 Feb 2025 21:04:08 +0100 Subject: [PATCH 0186/2168] ci/eval: make eval for non-native platforms less incorrect We commonly use platform-dependent conditional patterns like `lib.meta.availableOn stdenv.hostPlatform` and `stdenv.hostPlatform.isLinux` to enable different features in a given derivation or to evaluate completely different derivations based on the platform. For example, source builds of a given derivation may only be available on linux but not on darwin. The use of such conditionals allow us to fall back to patched binaries on darwin instead. In `chromedriver` (pkgs/development/tools/selenium/chromedriver/default.nix), we use ~~~nix if lib.meta.availableOn stdenv.hostPlatform chromium then callPackage ./source.nix { } else callPackage ./binary.nix { } ~~~ To provide some context, `chromedriver` source builds are based on `chromium.mkDerivation` and `chromium` is limited to `lib.platforms.linux`. Based on the same `chromium.mkDerivation`, we also do source builds for `electron` (pkgs/top-level/all-packages.nix): ~~~nix electron_33 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_33 then electron-source.electron_33 else electron_33-bin; electron_34 = electron_34-bin; electron = electron_34; ~~~ And finally, the top-level `jdk` (Java) attribute has a lot of indirection, but eventually also boils down to `stdenv.hostPlatform.isLinux` for source builds and binaries for x86_64-darwin and aarch64-darwin. A surprising amount of electron and jdk consumers use variations of `meta.platforms = electron.meta.platforms` in their own meta block. Due to internal implementation details, the conditionals in those top-level attributes like `chromedriver`, `electron` and `jdk` are evaluated based on the value from `builtins.currentSystem` and not the system passed to `import { }`. This then causes `chromedriver`, `electron`, `jdk` and all dependents that inherit those `meta.platforms` to appear only available on linux despite also being available on darwin. Hydra is affected similarly, but it's a lot more nuanced and in practice not actually *that* bad. The addition of `--eval-system` ensures that `builtins.currentSystem` matches the requested platform. As a bonus, this also fixes the store paths of an impure test that should probably be made pure: ~~~diff @@ -885069,13 +886119,13 @@ "out": "/nix/store/lb2500hc69czy4sfga9mbh2k679cr1rp-test-compressDrv" }, "tests.config.allowPkgsInPermittedInsecurePackages.aarch64-darwin": { - "out": "/nix/store/0l5h8svrpzwymq35mnpvx82gyc7nf8s4-hello-2.12.1" + "out": "/nix/store/v1zjb688mp4y2132b6chii43d5kkxnpa-hello-2.12.1" }, "tests.config.allowPkgsInPermittedInsecurePackages.aarch64-linux": { - "out": "/nix/store/0l5h8svrpzwymq35mnpvx82gyc7nf8s4-hello-2.12.1" + "out": "/nix/store/hb21z2zdk03dwygsw5lvpa8zc3fbr500-hello-2.12.1" }, "tests.config.allowPkgsInPermittedInsecurePackages.x86_64-darwin": { - "out": "/nix/store/0l5h8svrpzwymq35mnpvx82gyc7nf8s4-hello-2.12.1" + "out": "/nix/store/gljdqsf0mxv1j8zb04phx9ws09pp7z3l-hello-2.12.1" }, "tests.config.allowPkgsInPermittedInsecurePackages.x86_64-linux": { "out": "/nix/store/0l5h8svrpzwymq35mnpvx82gyc7nf8s4-hello-2.12.1" ~~~ Diff stats between two full evals based on 75c8548d8118c31509b89ffd7df6c322b94017dd with and without this fix on x86_64-linux: ~~~bash # git diff --no-index --stat /nix/store/659l3xp78255wx7abbahggsnrlj3a1la-combined-result/outpaths.json /nix/store/4fhlq4g5qa65cxbibskq9pma40zigrx7-combined-result/outpaths.json /nix/store/{659l3xp78255wx7abbahggsnrlj3a1la-combined-result => 4fhlq4g5qa65cxbibskq9pma40zigrx7-combined-result}/outpaths.json | 1416 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 1405 insertions(+), 11 deletions(-) ~~~ The full diff is available as a gist at . When we added `electron_34` only as binary instead of the usual source on linux with binary fallback in cfed9a19cbc98d12c0167f69238673f4ed89f798 and made the unversioned `electron` top-level point to the newly added `electron_34` instead of `electron_33`, the GitHub workflow suddenly reported 20 new packages. Of those 20 reported packages, 17 where false-positives caused by dropping the wrongly evaluated conditional. --- ci/eval/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/eval/default.nix b/ci/eval/default.nix index 927dec5a908d..d5f4419598b4 100644 --- a/ci/eval/default.nix +++ b/ci/eval/default.nix @@ -89,6 +89,7 @@ let set +e command time -f "Chunk $myChunk on $system done [%MKB max resident, %Es elapsed] %C" \ nix-env -f "${nixpkgs}/pkgs/top-level/release-attrpaths-parallel.nix" \ + --eval-system "$system" \ --option restrict-eval true \ --option allow-import-from-derivation false \ --query --available \ From 145c09f3a7bc67e6c2f8b860e79a4c650b489531 Mon Sep 17 00:00:00 2001 From: emaryn Date: Mon, 3 Feb 2025 04:58:09 +0800 Subject: [PATCH 0187/2168] sshx, sshx-server: 0.2.4 -> 0.3.1 --- pkgs/tools/misc/sshx/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/sshx/default.nix b/pkgs/tools/misc/sshx/default.nix index f5971b060245..3bad8c661c3b 100644 --- a/pkgs/tools/misc/sshx/default.nix +++ b/pkgs/tools/misc/sshx/default.nix @@ -9,13 +9,13 @@ buildNpmPackage, }: let - version = "0.2.4"; + version = "0.3.1"; src = fetchFromGitHub { owner = "ekzhang"; repo = "sshx"; tag = "v${version}"; - hash = "sha256-RIQRX4sXlMl73Opi6hK2WD/erdAMNrm40IasHasikuw="; + hash = "sha256-AOmtN+NoBWuyCDe73dDWFmAWYEAxH8N5Vue1V87CZVU="; }; mkSshxPackage = @@ -60,12 +60,12 @@ in { sshx = mkSshxPackage { pname = "sshx"; - cargoHash = "sha256-wXElkSaVWoUNhm2UOv8Q+UabgrVKqxwDUsk/JJaZzMw="; + cargoHash = "sha256-S07xqDiINhOrr7G5EWpEzOrV3UYr74bGehgzRNBlJTo="; }; sshx-server = mkSshxPackage rec { pname = "sshx-server"; - cargoHash = "sha256-wXElkSaVWoUNhm2UOv8Q+UabgrVKqxwDUsk/JJaZzMw="; + cargoHash = "sha256-S07xqDiINhOrr7G5EWpEzOrV3UYr74bGehgzRNBlJTo="; postPatch = '' substituteInPlace crates/sshx-server/src/web.rs \ @@ -86,11 +86,10 @@ in --replace-fail 'execSync("git rev-parse --short HEAD").toString().trim()' '"${src.rev}"' ''; - npmDepsHash = "sha256-bKePCxo6+n0EG+4tbbMimPedJ0Hu1O8yZsgspmhobOs="; + npmDepsHash = "sha256-2cO0+ComNa4kDgo3SNGd1kPgKCE0/x9L9arAeHY0sQ4="; installPhase = '' - mkdir -p "$out" - cp -r build/* "$out" + cp -r build $out ''; }; }; From 2686972de383874eca030358bbacc3ae599c281d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 2 Feb 2025 21:13:10 +0000 Subject: [PATCH 0188/2168] bloomeetunes: 2.10.13 -> 2.10.14 --- pkgs/by-name/bl/bloomeetunes/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bl/bloomeetunes/package.nix b/pkgs/by-name/bl/bloomeetunes/package.nix index 0623529bd1a4..ebeeeb30b063 100644 --- a/pkgs/by-name/bl/bloomeetunes/package.nix +++ b/pkgs/by-name/bl/bloomeetunes/package.nix @@ -10,13 +10,13 @@ flutter324.buildFlutterApplication rec { pname = "bloomeetunes"; - version = "2.10.13"; + version = "2.10.14"; src = fetchFromGitHub { owner = "HemantKArya"; repo = "BloomeeTunes"; - tag = "v${version}+157"; - hash = "sha256-cLhcuk4rLHFg3al+MkZnOWMG8n6r61idBSmDyP6ez+g="; + tag = "v${version}+161"; + hash = "sha256-Cj4NfWEIEYTNAdb6CunA7ExTebK89OlHvZx9n853eHI="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; From e8a255c09a299398efb99cb98a53330edfe5f9fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 25 Jan 2025 19:32:45 +0100 Subject: [PATCH 0189/2168] xtrlock-pam: drop --- pkgs/by-name/xt/xtrlock-pam/package.nix | 42 ------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 pkgs/by-name/xt/xtrlock-pam/package.nix diff --git a/pkgs/by-name/xt/xtrlock-pam/package.nix b/pkgs/by-name/xt/xtrlock-pam/package.nix deleted file mode 100644 index 0136fbc5c287..000000000000 --- a/pkgs/by-name/xt/xtrlock-pam/package.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - python39, - pkg-config, - pam, - xorg, -}: - -stdenv.mkDerivation { - pname = "xtrlock-pam"; - version = "3.4-post-20150909"; - - src = fetchFromGitHub { - owner = "aanatoly"; - repo = "xtrlock-pam"; - rev = "6f4920fcfff54791c0779057e9efacbbbbc05df6"; - sha256 = "sha256-TFfs418fpjBrAJNGW8U3jE0K7jQkfL4vCquAViKkXPw="; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - python39 - pam - xorg.libX11 - ]; - - configurePhase = '' - substituteInPlace .config/options.py --replace /usr/include/security/pam_appl.h ${pam}/include/security/pam_appl.h - substituteInPlace src/xtrlock.c --replace system-local-login xscreensaver - python configure --prefix=$out - ''; - - meta = { - homepage = "https://github.com/aanatoly/xtrlock-pam"; - description = "PAM based X11 screen locker"; - license = "unknown"; - maintainers = with lib.maintainers; [ ondt ]; - platforms = with lib.platforms; linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6157b05df0af..28a6488a5241 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1543,6 +1543,7 @@ mapAliases { xplayer = throw "xplayer has been removed as the upstream project was archived"; # Added 2024-12-27 xprite-editor = throw "'xprite-editor' has been removed due to lack of maintenance upstream. Consider using 'pablodraw' or 'aseprite' instead"; # Added 2024-09-14 xsv = throw "'xsv' has been removed due to lack of upstream maintenance. Please see 'xan' for a maintained alternative"; + xtrlock-pam = throw "xtrlock-pam has been removed because it is unmaintained for 10 years and doesn't support Python 3.10 or newer"; # Added 2025-01-25 xulrunner = firefox-unwrapped; # Added 2023-11-03 xvfb_run = throw "'xvfb_run' has been renamed to/replaced by 'xvfb-run'"; # Converted to throw 2024-10-17 xwaylandvideobridge = libsForQt5.xwaylandvideobridge; # Added 2024-09-27 From 780495a579688723dcf5e9b8074bfc163a3c7df9 Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Sun, 2 Feb 2025 13:24:10 -0800 Subject: [PATCH 0190/2168] uhdm: 1.84-unstable-2024-10-06 -> 1.84-unstable-2024-11-12 --- pkgs/by-name/uh/uhdm/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/uh/uhdm/package.nix b/pkgs/by-name/uh/uhdm/package.nix index 2bb3722cb266..ea59cedf155c 100644 --- a/pkgs/by-name/uh/uhdm/package.nix +++ b/pkgs/by-name/uh/uhdm/package.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "UHDM"; # When updating this package, also consider updating science/logic/surelog - version = "1.84-unstable-2024-10-06"; + version = "1.84-unstable-2024-11-12"; src = fetchFromGitHub { owner = "chipsalliance"; repo = "UHDM"; # After we're back on a stable tag, use v${finalAttrs.version} - rev = "857f68de3ce5b6f919f3a0f489c93072751b1578"; - hash = "sha256-qHcRncsvMiSJji+JLOlfQ87+pfKg+zvlqMTXKpImvTM="; + rev = "7d90dd0e68759775d0c86885d991925096b5b496"; + hash = "sha256-msdtBAlOXwYJd0HhWmVo8oMJ6h8OUmy0ILxV1MV52PE="; fetchSubmodules = false; # we use all dependencies from nix }; From 063975120723d08af0ebf8e935a2e9b64b34f88b Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Sun, 2 Feb 2025 13:25:16 -0800 Subject: [PATCH 0191/2168] surelog: 1.84-unstable-2024-11-09 -> 1.84-unstable-2024-12-06 --- pkgs/by-name/su/surelog/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/su/surelog/package.nix b/pkgs/by-name/su/surelog/package.nix index 75511f68e846..f7c9cb8d8e92 100644 --- a/pkgs/by-name/su/surelog/package.nix +++ b/pkgs/by-name/su/surelog/package.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "surelog"; - version = "1.84-unstable-2024-11-09"; + version = "1.84-unstable-2024-12-06"; src = fetchFromGitHub { owner = "chipsalliance"; repo = "surelog"; # Once we're back on a stable tag, use "v$(finalAttrs.version}" below. - rev = "da88163a02dbc16f1af3514f281b93941d371ad9"; - hash = "sha256-TIwXIMcDImZjCIiXwvT2MhukArgrWCgOf2AOvkG/55g="; + rev = "298a9cddc672cce7f25ec352f9f8f36f5b23aa4e"; + hash = "sha256-Qv4dosj2dwakNCcvu483ZMuw+LlYs4fhZTULszERLSI="; fetchSubmodules = false; # we use all dependencies from nix }; From 13b7493c0a6a15a3952d967d8e01fb298325b59a Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Sun, 2 Feb 2025 13:26:39 -0800 Subject: [PATCH 0192/2168] synlig: 2024-11-29 -> 2024-12-10 --- pkgs/development/compilers/yosys/plugins/synlig.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/yosys/plugins/synlig.nix b/pkgs/development/compilers/yosys/plugins/synlig.nix index 9c0f72559ff0..11070406ae86 100644 --- a/pkgs/development/compilers/yosys/plugins/synlig.nix +++ b/pkgs/development/compilers/yosys/plugins/synlig.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { plugin = "synlig"; # The module has automatic regular releases, with date + short git hash - GIT_VERSION = "2024-11-29-10efd31"; + GIT_VERSION = "2024-12-10-2d838ed"; # Derive our package version from GIT_VERSION, remove hash, just keep date. version = builtins.concatStringsSep "-" ( From 1e95f6cac9e93fbb61200ddc5375e65871356da7 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sun, 2 Feb 2025 22:30:04 +0100 Subject: [PATCH 0193/2168] sourcegit: 2025.01 -> 2025.03 --- pkgs/by-name/so/sourcegit/deps.json | 26 ++++++------------- .../so/sourcegit/fix-darwin-git-path.patch | 7 ++--- pkgs/by-name/so/sourcegit/package.nix | 4 +-- 3 files changed, 14 insertions(+), 23 deletions(-) diff --git a/pkgs/by-name/so/sourcegit/deps.json b/pkgs/by-name/so/sourcegit/deps.json index f76816c86853..f5d19193563b 100644 --- a/pkgs/by-name/so/sourcegit/deps.json +++ b/pkgs/by-name/so/sourcegit/deps.json @@ -104,11 +104,6 @@ "version": "8.3.2", "hash": "sha256-zY+iB5Rj/8ru0xpRWwFLFO6JI3UFB/XHnx9pWmrZCAs=" }, - { - "pname": "HarfBuzzSharp", - "version": "7.3.0.2", - "hash": "sha256-ibgoqzT1NV7Qo5e7X2W6Vt7989TKrkd2M2pu+lhSDg8=" - }, { "pname": "HarfBuzzSharp", "version": "7.3.0.3", @@ -136,18 +131,18 @@ }, { "pname": "LiveChartsCore", - "version": "2.0.0-rc4.5", - "hash": "sha256-2Fgn9Bo1aM6dZHCU+OVykOhggTzpcEfFNfYtWc4yvHc=" + "version": "2.0.0-rc5", + "hash": "sha256-NHgYbeIdAoZlrC6QgVb1oLo3dlo17R8yTbPgiHMmJZc=" }, { "pname": "LiveChartsCore.SkiaSharpView", - "version": "2.0.0-rc4.5", - "hash": "sha256-03RR14tA0DtYHiLdgmAI4Gp5/e2H6QPkNFOBeqiFaJU=" + "version": "2.0.0-rc5", + "hash": "sha256-zppOFKHGn2HJMP8AAuk6mxJXqvgjfN7o8f0sInUWZGc=" }, { "pname": "LiveChartsCore.SkiaSharpView.Avalonia", - "version": "2.0.0-rc4.5", - "hash": "sha256-lzG/5e6WDpUiHZ8GvovOMvwXyYoVBeB1Ktuuw2Fx5No=" + "version": "2.0.0-rc5", + "hash": "sha256-xyFEZWWkRlBi8GNCDpyOUzt6aEe+9sR1+VN2yY59mhg=" }, { "pname": "MicroCom.Runtime", @@ -159,11 +154,6 @@ "version": "1.0.6", "hash": "sha256-p+dhMfIH4C6xLKRUREnUpC0DZwFazjvI+30KRT8TWnU=" }, - { - "pname": "SkiaSharp", - "version": "2.88.8", - "hash": "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A=" - }, { "pname": "SkiaSharp", "version": "2.88.9", @@ -171,8 +161,8 @@ }, { "pname": "SkiaSharp.HarfBuzz", - "version": "2.88.8", - "hash": "sha256-W9jNuEo/8q+k2aHNC19FfKcBUIEWx2zDcGwM+jDZ1o8=" + "version": "2.88.9", + "hash": "sha256-JH8Jr25eftPfq0BztamvxfDcAZtnx/jLRj5DGCS5/G8=" }, { "pname": "SkiaSharp.NativeAssets.Linux", diff --git a/pkgs/by-name/so/sourcegit/fix-darwin-git-path.patch b/pkgs/by-name/so/sourcegit/fix-darwin-git-path.patch index 790fd218e789..14e5fb97ad07 100644 --- a/pkgs/by-name/so/sourcegit/fix-darwin-git-path.patch +++ b/pkgs/by-name/so/sourcegit/fix-darwin-git-path.patch @@ -15,15 +15,16 @@ diff --git a/src/Native/MacOS.cs b/src/Native/MacOS.cs index 5721fe8..bc2a57d 100644 --- a/src/Native/MacOS.cs +++ b/src/Native/MacOS.cs -@@ -25,12 +25,7 @@ namespace SourceGit.Native +@@ -25,13 +25,7 @@ namespace SourceGit.Native public string FindGitExecutable() { - var gitPathVariants = new List() { -- "/usr/bin/git", "/usr/local/bin/git", "/opt/homebrew/bin/git", "/opt/homebrew/opt/git/bin/git" +- "/usr/bin/git", "/usr/local/bin/git", "/opt/homebrew/bin/git", "/opt/homebrew/opt/git/bin/git" - }; - foreach (var path in gitPathVariants) -- if (File.Exists(path)) return path; +- if (File.Exists(path)) +- return path; - return string.Empty; + return Linux.FindExecutable("git"); } diff --git a/pkgs/by-name/so/sourcegit/package.nix b/pkgs/by-name/so/sourcegit/package.nix index 72ac09617105..7fda0cafd624 100644 --- a/pkgs/by-name/so/sourcegit/package.nix +++ b/pkgs/by-name/so/sourcegit/package.nix @@ -19,13 +19,13 @@ buildDotnetModule (finalAttrs: { pname = "sourcegit"; - version = "2025.01"; + version = "2025.03"; src = fetchFromGitHub { owner = "sourcegit-scm"; repo = "sourcegit"; tag = "v${finalAttrs.version}"; - hash = "sha256-6FO0WRUcWm7xnuw6Br97+cWZhvzIOesg/eANZzeyxZo="; + hash = "sha256-l1M3ix0HY87y2ES/iwT2Ju/Mwb8CCmnz95amHlYKFS4="; }; patches = [ ./fix-darwin-git-path.patch ]; From 470bfa35363227edc14496aedcff7ff34fd92d7a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Feb 2025 00:38:35 +0000 Subject: [PATCH 0194/2168] okteta: 0.26.18 -> 0.26.19 --- pkgs/applications/editors/okteta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix index d0f9dfc4b6fd..39355c12d8b8 100644 --- a/pkgs/applications/editors/okteta/default.nix +++ b/pkgs/applications/editors/okteta/default.nix @@ -19,11 +19,11 @@ mkDerivation rec { pname = "okteta"; - version = "0.26.18"; + version = "0.26.19"; src = fetchurl { url = "mirror://kde/stable/okteta/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "sha256-xAlhZtQuIRtvMaHflCr89lHH6ocqIRAECwHdRa+/imM="; + sha256 = "sha256-shVLRZqxFGstKmqtBIUT//kz8WLos+u4s6ftlXgospM="; }; nativeBuildInputs = [ From a832e3589ecda8012cb7ec4dec89fbbfbe58b77a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Feb 2025 01:01:02 +0000 Subject: [PATCH 0195/2168] openttd-jgrpp: 0.63.3 -> 0.64.0 --- pkgs/games/openttd/jgrpp.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/openttd/jgrpp.nix b/pkgs/games/openttd/jgrpp.nix index 6d76db258254..d1e89f298e5c 100644 --- a/pkgs/games/openttd/jgrpp.nix +++ b/pkgs/games/openttd/jgrpp.nix @@ -2,13 +2,13 @@ openttd.overrideAttrs (oldAttrs: rec { pname = "openttd-jgrpp"; - version = "0.63.3"; + version = "0.64.0"; src = fetchFromGitHub rec { owner = "JGRennison"; repo = "OpenTTD-patches"; rev = "jgrpp-${version}"; - hash = "sha256-853LbApHqQn+ucb7xjFDfohB0/T1h11o4voBgvgbpSI="; + hash = "sha256-aEmuwWNxqjuLmiWMrqwTUtCwdwDMA00eQspCHntxEXw="; }; buildInputs = oldAttrs.buildInputs ++ [ zstd ]; From b4f4acf790907eceb307d2a3acb3e7db7e959c4d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Feb 2025 01:45:19 +0000 Subject: [PATCH 0196/2168] rgbds: 0.9.0 -> 0.9.1 --- pkgs/by-name/rg/rgbds/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/rg/rgbds/package.nix b/pkgs/by-name/rg/rgbds/package.nix index f1cae1551f33..b46ac38954f1 100644 --- a/pkgs/by-name/rg/rgbds/package.nix +++ b/pkgs/by-name/rg/rgbds/package.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { pname = "rgbds"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "gbdev"; repo = "rgbds"; rev = "v${version}"; - hash = "sha256-njJ7g7hgaiahpeeDHrv9nYvWZp51Fl10CsV36ldBpf0="; + hash = "sha256-Rv2ylZavLy+G4XFLBdNGjk78hSb8cDoX9lW1l2TRmtk="; }; nativeBuildInputs = [ bison From 1b803dffb9220820b1aa431c76143d943468d268 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Feb 2025 02:44:57 +0000 Subject: [PATCH 0197/2168] opera: 115.0.5322.119 -> 116.0.5366.71 --- pkgs/by-name/op/opera/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/opera/package.nix b/pkgs/by-name/op/opera/package.nix index af8c014fd21f..6c9a046f3706 100644 --- a/pkgs/by-name/op/opera/package.nix +++ b/pkgs/by-name/op/opera/package.nix @@ -51,11 +51,11 @@ let in stdenv.mkDerivation rec { pname = "opera"; - version = "115.0.5322.119"; + version = "116.0.5366.71"; src = fetchurl { url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb"; - hash = "sha256-VUy3InKC3jn4FXZfptWqboFuislvFenVm8DeI0mn35Y="; + hash = "sha256-EgHr8YWAACXiT/S+zThAbTGoFVbOXVXcJ/MK//TWzL4="; }; nativeBuildInputs = [ From a84248e0aebe1756b079173e0f9c55390b88d5fa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Feb 2025 03:40:10 +0000 Subject: [PATCH 0198/2168] groovy: 4.0.24 -> 4.0.25 --- pkgs/by-name/gr/groovy/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gr/groovy/package.nix b/pkgs/by-name/gr/groovy/package.nix index 891688f30bae..523ced62b9bb 100644 --- a/pkgs/by-name/gr/groovy/package.nix +++ b/pkgs/by-name/gr/groovy/package.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "groovy"; - version = "4.0.24"; + version = "4.0.25"; src = fetchurl { url = "mirror://apache/groovy/${version}/distribution/apache-groovy-binary-${version}.zip"; - sha256 = "sha256-2/82g1VovsInGHb3C/zKbeuA4bF5RTzKk0pQLqMBu4A="; + sha256 = "sha256-giytjgM4jyO/YT03+ZC4E7tBZf44n9P8wk+LlkdsMO8="; }; nativeBuildInputs = [ From bdd4e9d74045d35226e6b8efd02fd37a96595a80 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Sun, 2 Feb 2025 22:41:47 -0800 Subject: [PATCH 0199/2168] tezos-rust-libs: bump llvm --- pkgs/by-name/te/tezos-rust-libs/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/tezos-rust-libs/package.nix b/pkgs/by-name/te/tezos-rust-libs/package.nix index 2bbed03999a3..03e10ca9ed6b 100644 --- a/pkgs/by-name/te/tezos-rust-libs/package.nix +++ b/pkgs/by-name/te/tezos-rust-libs/package.nix @@ -2,7 +2,7 @@ lib, fetchFromGitLab, stdenv, - llvmPackages_12, + llvmPackages, cargo, libiconv, }: @@ -18,10 +18,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - llvmPackages_12.llvm + llvmPackages.llvm cargo ]; - propagatedBuildInputs = [ llvmPackages_12.libllvm ]; + propagatedBuildInputs = [ llvmPackages.libllvm ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; buildPhase = '' From 09e20b6d547b2f98078416015a7eb5fa51ec8385 Mon Sep 17 00:00:00 2001 From: arminius-smh Date: Mon, 3 Feb 2025 08:46:07 +0100 Subject: [PATCH 0200/2168] waypaper: 2.3 -> 2.4 --- pkgs/by-name/wa/waypaper/package.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/waypaper/package.nix b/pkgs/by-name/wa/waypaper/package.nix index cb404a37b28e..8fcabc574485 100644 --- a/pkgs/by-name/wa/waypaper/package.nix +++ b/pkgs/by-name/wa/waypaper/package.nix @@ -9,14 +9,14 @@ python3.pkgs.buildPythonApplication rec { pname = "waypaper"; - version = "2.3"; + version = "2.4"; pyproject = true; src = fetchFromGitHub { owner = "anufrievroman"; repo = "waypaper"; tag = version; - hash = "sha256-ty3KiKkIyv6aqTua3YUB2smYJv7dXGPP5k3lXoxDzI0="; + hash = "sha256-bNh8WWSLgCV8PLFvDn/+AEcNOazxMEKEYv7n+L9ABTA="; }; nativeBuildInputs = [ @@ -31,6 +31,9 @@ python3.pkgs.buildPythonApplication rec { python3.pkgs.platformdirs python3.pkgs.importlib-metadata python3.pkgs.pillow + python3.pkgs.imageio + python3.pkgs.imageio-ffmpeg + python3.pkgs.screeninfo ]; propagatedBuildInputs = [ killall ]; From 4ef501d3a5b0a8f1025a86de151fd9cf00679c5b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Feb 2025 07:52:50 +0000 Subject: [PATCH 0201/2168] touchosc: 1.3.7.218 -> 1.3.8.222 --- pkgs/applications/audio/touchosc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/touchosc/default.nix b/pkgs/applications/audio/touchosc/default.nix index 89593cd7d9c6..98ac86802065 100644 --- a/pkgs/applications/audio/touchosc/default.nix +++ b/pkgs/applications/audio/touchosc/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { pname = "touchosc"; - version = "1.3.7.218"; + version = "1.3.8.222"; suffix = { aarch64-linux = "linux-arm64"; @@ -56,9 +56,9 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://hexler.net/pub/${pname}/${pname}-${version}-${suffix}.deb"; hash = { - aarch64-linux = "sha256-6nnTSMTKlUyqzhxSmTfDcpNcxCb34B0vuJaUiVNS0NE="; - armv7l-linux = "sha256-eOQiYqAKt36ah7BY5yxChaPF6lhBnVOshhep1u36p3U="; - x86_64-linux = "sha256-rBGbiV/1RhL513qSyc2TTsdvkTPJ2bmP6oq2Q6Ykay8="; + aarch64-linux = "sha256-TuO0dzV2j2YRbb5NJ/iIS186XCJ1E+15P8k7hVxElCE="; + armv7l-linux = "sha256-LJ4a9TZQr4LGuS5gGpmW1yp1q0Smsr8mIhz18ISM3sc="; + x86_64-linux = "sha256-l+7wefJC6q+hgjKuRMqCuD5XHNiw9DQANP99FkjIWOk="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; From 4dea13e848ceacbc48d82cf8ddff746f0736ad24 Mon Sep 17 00:00:00 2001 From: Paavo Pokkinen Date: Mon, 3 Feb 2025 09:56:34 +0200 Subject: [PATCH 0202/2168] mirrord: add support for aarch64-darwin and x86_64-darwin --- pkgs/by-name/mi/mirrord/manifest.json | 8 ++++++++ pkgs/by-name/mi/mirrord/update.py | 2 ++ 2 files changed, 10 insertions(+) diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json index ad8c3a098eeb..ae7afac8f32b 100644 --- a/pkgs/by-name/mi/mirrord/manifest.json +++ b/pkgs/by-name/mi/mirrord/manifest.json @@ -8,6 +8,14 @@ "aarch64-linux": { "url": "https://github.com/metalbear-co/mirrord/releases/download/3.131.2/mirrord_linux_aarch64", "hash": "sha256-2SC/6Q43AhUjx2i3kwCLHIMEnxp23qbUuFXYKZBLin8=" + }, + "aarch64-darwin": { + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.131.2/mirrord_mac_universal", + "hash": "sha256-uR7k9bE0J6Ald2joM+d51IbEIKBsigD+D5hAUeR17hk=" + }, + "x86_64-darwin": { + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.131.2/mirrord_mac_universal", + "hash": "sha256-uR7k9bE0J6Ald2joM+d51IbEIKBsigD+D5hAUeR17hk=" } } } diff --git a/pkgs/by-name/mi/mirrord/update.py b/pkgs/by-name/mi/mirrord/update.py index 6096b991b81a..5756363cfc7c 100755 --- a/pkgs/by-name/mi/mirrord/update.py +++ b/pkgs/by-name/mi/mirrord/update.py @@ -11,6 +11,8 @@ import httpx platforms = { "x86_64-linux": "linux_x86_64", "aarch64-linux": "linux_aarch64", + "aarch64-darwin": "mac_universal", + "x86_64-darwin": "mac_universal", } if __name__ == "__main__": From acad86c0c9ee3e8ef6fa3efb0361757f7af481df Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Feb 2025 08:12:38 +0000 Subject: [PATCH 0203/2168] tabby: 0.23.0 -> 0.23.1 --- pkgs/by-name/ta/tabby/Cargo.lock | 36 +++++++++++++++---------------- pkgs/by-name/ta/tabby/package.nix | 4 ++-- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/ta/tabby/Cargo.lock b/pkgs/by-name/ta/tabby/Cargo.lock index a51cef4f078c..450526e04694 100644 --- a/pkgs/by-name/ta/tabby/Cargo.lock +++ b/pkgs/by-name/ta/tabby/Cargo.lock @@ -41,7 +41,7 @@ dependencies = [ [[package]] name = "aim-downloader" -version = "0.23.0" +version = "0.23.1" dependencies = [ "async-stream", "clap", @@ -1728,7 +1728,7 @@ dependencies = [ [[package]] name = "hash-ids" -version = "0.23.0" +version = "0.23.1" [[package]] name = "hashbrown" @@ -1912,7 +1912,7 @@ dependencies = [ [[package]] name = "http-api-bindings" -version = "0.23.0" +version = "0.23.1" dependencies = [ "anyhow", "async-openai", @@ -2605,7 +2605,7 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "llama-cpp-server" -version = "0.23.0" +version = "0.23.1" dependencies = [ "anyhow", "async-openai", @@ -3134,7 +3134,7 @@ dependencies = [ [[package]] name = "ollama-api-bindings" -version = "0.23.0" +version = "0.23.1" dependencies = [ "anyhow", "async-stream", @@ -4937,7 +4937,7 @@ dependencies = [ [[package]] name = "sqlx-migrate-validate" -version = "0.23.0" +version = "0.23.1" dependencies = [ "anyhow", "async-trait", @@ -5262,7 +5262,7 @@ dependencies = [ [[package]] name = "tabby" -version = "0.23.0" +version = "0.23.1" dependencies = [ "anyhow", "assert-json-diff", @@ -5318,7 +5318,7 @@ dependencies = [ [[package]] name = "tabby-common" -version = "0.23.0" +version = "0.23.1" dependencies = [ "anyhow", "async-trait", @@ -5346,7 +5346,7 @@ dependencies = [ [[package]] name = "tabby-crawler" -version = "0.23.0" +version = "0.23.1" dependencies = [ "anyhow", "async-stream", @@ -5365,7 +5365,7 @@ dependencies = [ [[package]] name = "tabby-db" -version = "0.23.0" +version = "0.23.1" dependencies = [ "anyhow", "assert_matches", @@ -5384,7 +5384,7 @@ dependencies = [ [[package]] name = "tabby-db-macros" -version = "0.23.0" +version = "0.23.1" dependencies = [ "quote", "syn 2.0.66", @@ -5392,7 +5392,7 @@ dependencies = [ [[package]] name = "tabby-download" -version = "0.23.0" +version = "0.23.1" dependencies = [ "aim-downloader", "anyhow", @@ -5404,7 +5404,7 @@ dependencies = [ [[package]] name = "tabby-git" -version = "0.23.0" +version = "0.23.1" dependencies = [ "anyhow", "assert_matches", @@ -5425,7 +5425,7 @@ dependencies = [ [[package]] name = "tabby-index" -version = "0.23.0" +version = "0.23.1" dependencies = [ "anyhow", "async-stream", @@ -5467,7 +5467,7 @@ dependencies = [ [[package]] name = "tabby-index-cli" -version = "0.23.0" +version = "0.23.1" dependencies = [ "anyhow", "clap", @@ -5479,7 +5479,7 @@ dependencies = [ [[package]] name = "tabby-inference" -version = "0.23.0" +version = "0.23.1" dependencies = [ "anyhow", "async-openai", @@ -5497,7 +5497,7 @@ dependencies = [ [[package]] name = "tabby-schema" -version = "0.23.0" +version = "0.23.1" dependencies = [ "anyhow", "async-openai", @@ -5524,7 +5524,7 @@ dependencies = [ [[package]] name = "tabby-webserver" -version = "0.23.0" +version = "0.23.1" dependencies = [ "anyhow", "argon2", diff --git a/pkgs/by-name/ta/tabby/package.nix b/pkgs/by-name/ta/tabby/package.nix index dbb0434acc3c..85893b378fe7 100644 --- a/pkgs/by-name/ta/tabby/package.nix +++ b/pkgs/by-name/ta/tabby/package.nix @@ -31,7 +31,7 @@ let # https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/ollama/default.nix pname = "tabby"; - version = "0.23.0"; + version = "0.23.1"; availableAccelerations = flatten [ (optional cudaSupport "cuda") @@ -120,7 +120,7 @@ rustPlatform.buildRustPackage { owner = "TabbyML"; repo = "tabby"; tag = "v${version}"; - hash = "sha256-wIrYQqnt6Uuoxqs7QpCU+WQufk5dQuwKR3+fjF+97nM="; + hash = "sha256-8eQFsLiAHF/9gD1SdtsbDwHm0WjQ3Db6QIyxMF2dIM0="; fetchSubmodules = true; }; From 33c07e7725294425774255ddfb57d78d8bb789eb Mon Sep 17 00:00:00 2001 From: KSJ2000 Date: Fri, 31 Jan 2025 17:11:42 +0200 Subject: [PATCH 0204/2168] renpy: 8.3.1.24090601 -> 8.3.4.24120703 --- pkgs/by-name/re/renpy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/renpy/package.nix b/pkgs/by-name/re/renpy/package.nix index 49bd15debfce..f39f4e4e61d4 100644 --- a/pkgs/by-name/re/renpy/package.nix +++ b/pkgs/by-name/re/renpy/package.nix @@ -24,8 +24,8 @@ let # base_version is of the form major.minor.patch # vc_version is of the form YYMMDDCC # version corresponds to the tag on GitHub - base_version = "8.3.1"; - vc_version = "24090601"; + base_version = "8.3.4"; + vc_version = "24120703"; version = "${base_version}.${vc_version}"; in stdenv.mkDerivation { @@ -36,7 +36,7 @@ stdenv.mkDerivation { owner = "renpy"; repo = "renpy"; rev = version; - hash = "sha256-k8mcDzaFngRF3Xl9cinUFU0T9sjxNIVrECUguARJVZ4="; + hash = "sha256-GM6cx9yP5bgKWMSYOkZS9hE33/HJnsv4KmlB23jbkqg="; }; nativeBuildInputs = [ From 30d3f9efff0a0ca2b47acabdb21ff1bf71f34c8d Mon Sep 17 00:00:00 2001 From: Nikita Tikhonov Date: Mon, 3 Feb 2025 16:27:26 +0300 Subject: [PATCH 0205/2168] maintainers: add nekitdev --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a3cc89d57ed7..4b1ebd45c6d9 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16034,6 +16034,12 @@ githubId = 1859691; name = "Amedeo Molnár"; }; + nekitdev = { + email = "nekit@nekit.dev"; + github = "nekitdev"; + githubId = 43587167; + name = "Nikita Tikhonov"; + }; nelsonjeppesen = { email = "nix@jeppesen.io"; github = "NelsonJeppesen"; From cd0e425baa2439e576039ea900ada1e620084d78 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Mon, 3 Feb 2025 11:11:18 +0000 Subject: [PATCH 0206/2168] fishPlugins.nvm: init at 2.2.16 --- pkgs/shells/fish/plugins/default.nix | 2 ++ pkgs/shells/fish/plugins/nvm.nix | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/shells/fish/plugins/nvm.nix diff --git a/pkgs/shells/fish/plugins/default.nix b/pkgs/shells/fish/plugins/default.nix index e6256b4e3f2c..b4932ae34859 100644 --- a/pkgs/shells/fish/plugins/default.nix +++ b/pkgs/shells/fish/plugins/default.nix @@ -52,6 +52,8 @@ lib.makeScope newScope (self: with self; { hydro = callPackage ./hydro.nix { }; + nvm = callPackage ./nvm.nix { }; + pisces = callPackage ./pisces.nix { }; plugin-git = callPackage ./plugin-git.nix { }; diff --git a/pkgs/shells/fish/plugins/nvm.nix b/pkgs/shells/fish/plugins/nvm.nix new file mode 100644 index 000000000000..02be1d91fe94 --- /dev/null +++ b/pkgs/shells/fish/plugins/nvm.nix @@ -0,0 +1,24 @@ +{ + buildFishPlugin, + fetchFromGitHub, + lib, +}: +buildFishPlugin rec { + pname = "nvm"; + version = "2.2.16"; + src = fetchFromGitHub { + owner = "jorgebucaran"; + repo = "nvm.fish"; + tag = version; + hash = "sha256-GTEkCm+OtxMS3zJI5gnFvvObkrpepq1349/LcEPQRDo="; + }; + + meta = { + description = "The Node.js version manager you'll adore, crafted just for Fish"; + homepage = "https://github.com/jorgebucaran/nvm.fish"; + changelog = "https://github.com/jorgebucaran/nvm.fish/releases/tag/${version}/CHANGELOG.md"; + downloadPage = "https://github.com/jorgebucaran/nvm.fish/releases"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pta2002 ]; + }; +} From dc89413b009b732d578e91f4d6a682050edb087e Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Mon, 3 Feb 2025 09:15:55 -0600 Subject: [PATCH 0207/2168] addwater: 1.2.2 -> 1.2.5 Update to latest patchlevel of addwater. Link to github comparison from 1.2.2 -> 1.2.5 : https://github.com/largestgithubuseronearth/addwater/compare/v1.2.2...v1.2.5 --- pkgs/by-name/ad/addwater/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ad/addwater/package.nix b/pkgs/by-name/ad/addwater/package.nix index d79cf096aebb..1e835df03eee 100644 --- a/pkgs/by-name/ad/addwater/package.nix +++ b/pkgs/by-name/ad/addwater/package.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { pname = "addwater"; - version = "1.2.2"; + version = "1.2.5"; # built with meson, not a python format pyproject = false; @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec { owner = "largestgithubuseronearth"; repo = "addwater"; tag = "v${version}"; - hash = "sha256-BpV4nJbJNMI0Nzzsl1NbsWTNRMFRBSrUF1+Qdd7h6eg="; + hash = "sha256-Klz7FYlvkiokoISXsVvyWGKWR/MVhpj4OjQQhvPzju4="; }; buildInputs = [ From 3ad21240eb23b6b87e2f809dd2d32874b588dc32 Mon Sep 17 00:00:00 2001 From: Nikita Tikhonov Date: Mon, 3 Feb 2025 16:43:49 +0300 Subject: [PATCH 0208/2168] changelogging: init at 0.7.0 --- pkgs/by-name/ch/changelogging/package.nix | 36 +++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 pkgs/by-name/ch/changelogging/package.nix diff --git a/pkgs/by-name/ch/changelogging/package.nix b/pkgs/by-name/ch/changelogging/package.nix new file mode 100644 index 000000000000..5610d401744b --- /dev/null +++ b/pkgs/by-name/ch/changelogging/package.nix @@ -0,0 +1,36 @@ +{ + lib, + fetchCrate, + rustPlatform, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage rec { + pname = "changelogging"; + version = "0.7.0"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-orTUCBHacD0MQNfhOUWdh9RxT/9YNvgfCHFDr2eNQic="; + }; + + cargoHash = "sha256-2uYNwKjD0vX+C2Sj2epyTqe4sMqPa7cwVwoUHs3vtQE="; + + useFetchCargoVendor = true; + + passthru.updateScript = nix-update-script { }; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + + meta = { + description = "CLI tool for building changelogs from fragments"; + homepage = "https://github.com/nekitdev/changelogging"; + changelog = "https://github.com/nekitdev/changelogging/releases/tag/v${version}"; + platforms = lib.platforms.all; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.nekitdev ]; + mainProgram = "changelogging"; + }; +} From 6085f06801d28fb5fb695f0d6aca0396bae7057b Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Tue, 4 Feb 2025 00:05:26 +0800 Subject: [PATCH 0209/2168] rsshub: 0-unstable-2024-09-16 -> 0-unstable-2025-02-03 --- pkgs/by-name/rs/rsshub/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/rs/rsshub/package.nix b/pkgs/by-name/rs/rsshub/package.nix index 38ad570f53c2..3f5a3e557fde 100644 --- a/pkgs/by-name/rs/rsshub/package.nix +++ b/pkgs/by-name/rs/rsshub/package.nix @@ -9,13 +9,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "rsshub"; - version = "0-unstable-2024-09-16"; + version = "0-unstable-2025-02-03"; src = fetchFromGitHub { owner = "DIYgod"; repo = "RSSHub"; - rev = "6de50fb35dbdb93be43f315a8c2651e90c5195a9"; - hash = "sha256-fxkK1prrKfAmB5yqiOKdLPeJp/hO07KJNHLnYSQGPNE="; + rev = "72f78e2bfbcf000a6f374a92894430cf845fd1fd"; + hash = "sha256-okavLIYJZ+0iCsYtBc2r3FS18MVE/ap2OwRae7rWTrw="; }; patches = [ @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-mAAo4SdJ8cj8aqnbm+azcnxq8lFBvOy3BlSEKz9MA0Q="; + hash = "sha256-c16Ue5YiRWlF7ldt/8WLi1/xYhGqqr6XqvUieQbvbWg="; }; nativeBuildInputs = [ From 96f4f2b988ad70bac76e07bb5b6b67b511eb3dc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcell=20T=C3=B3th?= Date: Tue, 28 Jan 2025 10:43:19 +0100 Subject: [PATCH 0210/2168] free42: fix import/export menus by switching from gtk3 to wrapGAppsHook3 (#377260) --- pkgs/by-name/fr/free42/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fr/free42/package.nix b/pkgs/by-name/fr/free42/package.nix index ee1be3804755..b51861886c61 100644 --- a/pkgs/by-name/fr/free42/package.nix +++ b/pkgs/by-name/fr/free42/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, alsa-lib, copyDesktopItems, - gtk3, + wrapGAppsHook3, makeDesktopItem, pkg-config, }: @@ -23,11 +23,11 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ copyDesktopItems pkg-config + wrapGAppsHook3 ]; buildInputs = [ alsa-lib - gtk3 ]; postPatch = '' From 47c6ab8f4c19220590b736d345a68c128a831abb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcell=20T=C3=B3th?= Date: Tue, 28 Jan 2025 11:00:12 +0100 Subject: [PATCH 0211/2168] free42: fix desktop icons --- pkgs/by-name/fr/free42/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fr/free42/package.nix b/pkgs/by-name/fr/free42/package.nix index b51861886c61..fa3afdf1aadb 100644 --- a/pkgs/by-name/fr/free42/package.nix +++ b/pkgs/by-name/fr/free42/package.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: { exec = "free42bin"; type = "Application"; comment = "A software clone of HP-42S Calculator"; + icon = "free42"; categories = [ "Utility" "Calculator" @@ -56,6 +57,7 @@ stdenv.mkDerivation (finalAttrs: { exec = "free42dec"; type = "Application"; comment = "A software clone of HP-42S Calculator"; + icon = "free42"; categories = [ "Utility" "Calculator" @@ -87,8 +89,8 @@ stdenv.mkDerivation (finalAttrs: { install -m644 gtk/README $out/share/doc/free42/README-GTK install -m644 README $out/share/doc/free42/README - install -m644 gtk/icon-48x48.xpm $out/share/icons/hicolor/48x48/apps - install -m644 gtk/icon-128x128.xpm $out/share/icons/hicolor/128x128/apps + install -m644 gtk/icon-48x48.xpm $out/share/icons/hicolor/48x48/apps/free42.xpm + install -m644 gtk/icon-128x128.xpm $out/share/icons/hicolor/128x128/apps/free42.xpm install -m644 skins/* $out/share/free42/skins runHook postInstall From 781d05cdd10cf585fdd2b18e6ded5e9b0f2e1d95 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Feb 2025 17:37:59 +0000 Subject: [PATCH 0212/2168] jitsi-meet-prosody: 1.0.8302 -> 1.0.8384 --- pkgs/misc/jitsi-meet-prosody/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/jitsi-meet-prosody/default.nix b/pkgs/misc/jitsi-meet-prosody/default.nix index e7517c27e615..cfc563206ee0 100644 --- a/pkgs/misc/jitsi-meet-prosody/default.nix +++ b/pkgs/misc/jitsi-meet-prosody/default.nix @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { pname = "jitsi-meet-prosody"; - version = "1.0.8302"; + version = "1.0.8384"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "CWAunopJ49LnEV9D12+rZ6pFbeN0oeJgtwNrGSpfj2k="; + sha256 = "MzzfSBh0NVO2nF3X4qz0dIoepbEUyGf800vKNqS34ug="; }; nativeBuildInputs = [ dpkg ]; From 17b41f0f2428a720cd0f73e6ed4859f101d7beac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Feb 2025 17:55:11 +0000 Subject: [PATCH 0213/2168] dolt: 1.45.4 -> 1.48.0 --- pkgs/by-name/do/dolt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/do/dolt/package.nix b/pkgs/by-name/do/dolt/package.nix index f5440856014f..993533a8a739 100644 --- a/pkgs/by-name/do/dolt/package.nix +++ b/pkgs/by-name/do/dolt/package.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "1.45.4"; + version = "1.48.0"; src = fetchFromGitHub { owner = "dolthub"; repo = "dolt"; rev = "v${version}"; - sha256 = "sha256-yOAZJj+uqVcySLbS3dLw1nhn45G1x2MQTObs150iUs8="; + sha256 = "sha256-aP8kiIrkwwn9lPXUdREEn1RjVBEk9Jnm0BGCRVmc3Qo="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" ]; - vendorHash = "sha256-+q+zQKNwDPQ+6RJQj2pjhEFRxU+9kF1bgPIJB0YaTzk="; + vendorHash = "sha256-DLBgF82IvcaxtYi0IgrSv/7WuvzWUOHNZd1mJTZoTHg="; proxyVendor = true; doCheck = false; From 8a4b47d7cac5c0dbfd76771e07727d5be3623dc4 Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Mon, 3 Feb 2025 13:43:20 -0500 Subject: [PATCH 0214/2168] python3Packages.pyobjc-core: init at 11.0 --- .../python-modules/pyobjc-core/default.nix | 61 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 63 insertions(+) create mode 100644 pkgs/development/python-modules/pyobjc-core/default.nix diff --git a/pkgs/development/python-modules/pyobjc-core/default.nix b/pkgs/development/python-modules/pyobjc-core/default.nix new file mode 100644 index 000000000000..5dd7959940ca --- /dev/null +++ b/pkgs/development/python-modules/pyobjc-core/default.nix @@ -0,0 +1,61 @@ +{ + buildPythonPackage, + darwin, + fetchFromGitHub, + lib, + setuptools, +}: + +buildPythonPackage rec { + pname = "pyobjc-core"; + version = "11.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ronaldoussoren"; + repo = "pyobjc"; + tag = "v${version}"; + hash = "sha256-RhB0Ht6vyDxYwDGS+A9HZL9ySIjWlhdB4S+gHxvQQBg="; + }; + + sourceRoot = "source/pyobjc-core"; + + build-system = [ setuptools ]; + + buildInputs = [ + darwin.DarwinTools + darwin.libffi + ]; + + nativeBuildInputs = [ + darwin.DarwinTools # sw_vers + ]; + + # See https://github.com/ronaldoussoren/pyobjc/pull/641. Unfortunately, we + # cannot just pull that diff with fetchpatch due to https://discourse.nixos.org/t/how-to-apply-patches-with-sourceroot/59727. + postPatch = '' + for file in Modules/objc/test/*.m; do + substituteInPlace "$file" --replace "[[clang::suppress]]" "" + done + + substituteInPlace setup.py \ + --replace-fail "-buildversion" "-buildVersion" \ + --replace-fail "-productversion" "-productVersion" + ''; + + env.NIX_CFLAGS_COMPILE = toString [ + "-I${darwin.libffi.dev}/include" + "-Wno-error=cast-function-type-mismatch" + "-Wno-error=unused-command-line-argument" + ]; + + pythonImportsCheck = [ "objc" ]; + + meta = with lib; { + description = "Python <-> Objective-C bridge"; + homepage = "https://github.com/ronaldoussoren/pyobjc"; + license = licenses.mit; + platforms = platforms.darwin; + maintainers = with maintainers; [ samuela ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d366c45cd051..a0e15a43e287 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12317,6 +12317,8 @@ self: super: with self; { pyobihai = callPackage ../development/python-modules/pyobihai { }; + pyobjc-core = callPackage ../development/python-modules/pyobjc-core { }; + pyocd = callPackage ../development/python-modules/pyocd { }; pyocd-pemicro = callPackage ../development/python-modules/pyocd-pemicro { }; From a24313946ddb04b76c4070c9221aa1e13ff97d80 Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Mon, 3 Feb 2025 13:44:09 -0500 Subject: [PATCH 0215/2168] python3Packages.pyobjc-framework-Cocoa: init at 11.0 --- .../pyobjc-framework-Cocoa/default.nix | 59 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/development/python-modules/pyobjc-framework-Cocoa/default.nix diff --git a/pkgs/development/python-modules/pyobjc-framework-Cocoa/default.nix b/pkgs/development/python-modules/pyobjc-framework-Cocoa/default.nix new file mode 100644 index 000000000000..004757337266 --- /dev/null +++ b/pkgs/development/python-modules/pyobjc-framework-Cocoa/default.nix @@ -0,0 +1,59 @@ +{ + buildPythonPackage, + darwin, + fetchFromGitHub, + lib, + pyobjc-core, + setuptools, +}: + +buildPythonPackage rec { + pname = "pyobjc-framework-Cocoa"; + version = "11.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ronaldoussoren"; + repo = "pyobjc"; + tag = "v${version}"; + hash = "sha256-RhB0Ht6vyDxYwDGS+A9HZL9ySIjWlhdB4S+gHxvQQBg="; + }; + + sourceRoot = "source/pyobjc-framework-Cocoa"; + + build-system = [ setuptools ]; + + buildInputs = [ + darwin.libffi + darwin.DarwinTools + ]; + + nativeBuildInputs = [ + darwin.DarwinTools # sw_vers + ]; + + # See https://github.com/ronaldoussoren/pyobjc/pull/641. Unfortunately, we + # cannot just pull that diff with fetchpatch due to https://discourse.nixos.org/t/how-to-apply-patches-with-sourceroot/59727. + postPatch = '' + substituteInPlace pyobjc_setup.py \ + --replace-fail "-buildversion" "-buildVersion" \ + --replace-fail "-productversion" "-productVersion" + ''; + + dependencies = [ pyobjc-core ]; + + env.NIX_CFLAGS_COMPILE = toString [ + "-I${darwin.libffi.dev}/include" + "-Wno-error=unused-command-line-argument" + ]; + + pythonImportsCheck = [ "Cocoa" ]; + + meta = with lib; { + description = "PyObjC wrappers for the Cocoa frameworks on macOS"; + homepage = "https://github.com/ronaldoussoren/pyobjc"; + license = licenses.mit; + platforms = platforms.darwin; + maintainers = with maintainers; [ samuela ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a0e15a43e287..a103822397d9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12319,6 +12319,8 @@ self: super: with self; { pyobjc-core = callPackage ../development/python-modules/pyobjc-core { }; + pyobjc-framework-Cocoa = callPackage ../development/python-modules/pyobjc-framework-Cocoa { }; + pyocd = callPackage ../development/python-modules/pyocd { }; pyocd-pemicro = callPackage ../development/python-modules/pyocd-pemicro { }; From f4305e605c8a4cd812907ab96944a9eafd9d4c3b Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Mon, 3 Feb 2025 13:44:20 -0500 Subject: [PATCH 0216/2168] python3Packages.rumps: init at unstable-2025-02-02 --- .../python-modules/rumps/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/rumps/default.nix diff --git a/pkgs/development/python-modules/rumps/default.nix b/pkgs/development/python-modules/rumps/default.nix new file mode 100644 index 000000000000..1fb1729de358 --- /dev/null +++ b/pkgs/development/python-modules/rumps/default.nix @@ -0,0 +1,33 @@ +{ + buildPythonPackage, + fetchFromGitHub, + lib, + pyobjc-framework-Cocoa, + setuptools, +}: + +buildPythonPackage rec { + pname = "rumps"; + version = "unstable-2025-02-02"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jaredks"; + repo = "rumps"; + rev = "8730e7cff5768dfabecff478c0d5e3688862c1c6"; + hash = "sha256-oNJBpRaCGyOKCgBueRx4YhpNW1OnbIEWEEvlGfyoxUA="; + }; + + build-system = [ setuptools ]; + dependencies = [ pyobjc-framework-Cocoa ]; + + pythonImportsCheck = [ "rumps" ]; + + meta = with lib; { + description = "Ridiculously Uncomplicated macOS Python Statusbar apps"; + homepage = "https://github.com/jaredks/rumps"; + license = licenses.bsd2; + platforms = platforms.darwin; + maintainers = with maintainers; [ samuela ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a103822397d9..def1f363f644 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14441,6 +14441,8 @@ self: super: with self; { rules = callPackage ../development/python-modules/rules { }; + rumps = callPackage ../development/python-modules/rumps { }; + runs = callPackage ../development/python-modules/runs { }; runstats = callPackage ../development/python-modules/runstats { }; From 7f70c8136e2283e9dc5d7e9ce8c30ce0437f4015 Mon Sep 17 00:00:00 2001 From: Reed Riley Date: Mon, 3 Feb 2025 11:50:02 -0800 Subject: [PATCH 0217/2168] bcachefs-tools: 1.13.0 -> 1.20.0 --- pkgs/by-name/bc/bcachefs-tools/package.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/bc/bcachefs-tools/package.nix b/pkgs/by-name/bc/bcachefs-tools/package.nix index fb5d64a39825..2ad751d56c14 100644 --- a/pkgs/by-name/bc/bcachefs-tools/package.nix +++ b/pkgs/by-name/bc/bcachefs-tools/package.nix @@ -29,23 +29,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "bcachefs-tools"; - version = "1.13.0"; + version = "1.20.0"; src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; tag = "v${finalAttrs.version}"; - hash = "sha256-w55Fs1RZ4c55vTvb3jArPcmBLij1nuLi2MUHMMXPhng="; + hash = "sha256-WZmT8qYLQBp0lftm4T6BU92xffGmhniQNP7TI5pl4Y8="; }; - patches = [ - # backport patch to fix build with latest liburcu - (fetchpatch { - url = "https://github.com/koverstreet/bcachefs-tools/commit/634c812a1ed05de8e3d1dc146eed95b942e1e38d.patch"; - hash = "sha256-AL+nflQHKIwzI35NXZG2rniNjUfgLmv3osHHdpB1cGs="; - }) - ]; - nativeBuildInputs = [ pkg-config cargo From f7730f9cc5445c99d5283748526a92d7af50242b Mon Sep 17 00:00:00 2001 From: dish Date: Mon, 3 Feb 2025 18:30:46 -0500 Subject: [PATCH 0218/2168] python3Packages.internetarchive: 5.1.0 -> 5.2.0 --- pkgs/development/python-modules/internetarchive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix index 0b56b770739f..39253efa243d 100644 --- a/pkgs/development/python-modules/internetarchive/default.nix +++ b/pkgs/development/python-modules/internetarchive/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "internetarchive"; - version = "5.1.0"; + version = "5.2.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "jjjake"; repo = "internetarchive"; tag = "v${version}"; - hash = "sha256-HwE8oEd5ss8HkpuQuUwdfzENYHn2z/QmzvhRIBvo1qA="; + hash = "sha256-xi3cR/j25gRe+muWjk8towzELgDciqLxGvBIpRqJHd0="; }; build-system = [ setuptools ]; From 95c75aab5c73e15cf1ca9e74a9a3cfc0f0c60930 Mon Sep 17 00:00:00 2001 From: dish Date: Mon, 3 Feb 2025 18:32:33 -0500 Subject: [PATCH 0219/2168] python3Packages.internetarchive: Slightly modernize and add myself as maintainer --- pkgs/development/python-modules/internetarchive/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix index 39253efa243d..9b61c2bb55b1 100644 --- a/pkgs/development/python-modules/internetarchive/default.nix +++ b/pkgs/development/python-modules/internetarchive/default.nix @@ -61,12 +61,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "internetarchive" ]; - meta = with lib; { + meta = { description = "Python and Command-Line Interface to Archive.org"; homepage = "https://github.com/jjjake/internetarchive"; changelog = "https://github.com/jjjake/internetarchive/blob/v${version}/HISTORY.rst"; - license = licenses.agpl3Plus; - maintainers = [ ]; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ pyrox0 ]; mainProgram = "ia"; }; } From b226a444ab91811559e7bf0d5502cf951b4c06f2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Feb 2025 02:02:03 +0000 Subject: [PATCH 0220/2168] pioneer: 20240710 -> 20250203 --- pkgs/by-name/pi/pioneer/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pi/pioneer/package.nix b/pkgs/by-name/pi/pioneer/package.nix index a5b85c54602e..8d7889e772e4 100644 --- a/pkgs/by-name/pi/pioneer/package.nix +++ b/pkgs/by-name/pi/pioneer/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "pioneer"; - version = "20240710"; + version = "20250203"; src = fetchFromGitHub { owner = "pioneerspacesim"; repo = "pioneer"; rev = version; - hash = "sha256-zuPm5odMn6C3JqkgqQdgSztwxWjMmLVWUalYbEbAZro="; + hash = "sha256-mPTMmCgttFEhMyhGbRFBsIqI6oU0yBQJp+m7NbeeUHA="; }; postPatch = '' From f53ceb558f77d04588ec48bc72e509d0b3b75d5e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Feb 2025 02:45:57 +0000 Subject: [PATCH 0221/2168] dqlite: 1.18.0 -> 1.18.1 --- pkgs/by-name/dq/dqlite/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/dq/dqlite/package.nix b/pkgs/by-name/dq/dqlite/package.nix index 14d1bea4103f..127b3749fd40 100644 --- a/pkgs/by-name/dq/dqlite/package.nix +++ b/pkgs/by-name/dq/dqlite/package.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "dqlite"; - version = "1.18.0"; + version = "1.18.1"; src = fetchFromGitHub { owner = "canonical"; repo = pname; tag = "v${version}"; - hash = "sha256-sWA04CoVMR8380/PXSkMo/Ml2Gk1RNQxPC12CMVqxwE="; + hash = "sha256-7ou077ozbpH21PcvEEcprr4UYJ/X398Ph9dh5C3YyBQ="; }; nativeBuildInputs = [ autoreconfHook file pkg-config ]; From 39ef52856bb824d8248f6f13dbe5ea11abb0094c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Feb 2025 03:57:02 +0000 Subject: [PATCH 0222/2168] sympa: 6.2.74 -> 6.2.76 --- pkgs/by-name/sy/sympa/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sy/sympa/package.nix b/pkgs/by-name/sy/sympa/package.nix index 83018f0c72e0..bae91b64c82b 100644 --- a/pkgs/by-name/sy/sympa/package.nix +++ b/pkgs/by-name/sy/sympa/package.nix @@ -70,13 +70,13 @@ let in stdenv.mkDerivation rec { pname = "sympa"; - version = "6.2.74"; + version = "6.2.76"; src = fetchFromGitHub { owner = "sympa-community"; repo = pname; rev = version; - sha256 = "sha256-Z5V4LqogIobs8pT+ED6iZGjnC+J+GQBHq2opu1yv/7k="; + sha256 = "sha256-XvLTO2Wau34zMoi+5d16JnWd/K96w2py9xC5oLlRfRM="; }; configureFlags = [ From 079a2003c26fd42d37b13a66d7d8aed222e7b6c9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Feb 2025 04:12:11 +0000 Subject: [PATCH 0223/2168] flix: 0.56.0 -> 0.57.0 --- pkgs/by-name/fl/flix/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fl/flix/package.nix b/pkgs/by-name/fl/flix/package.nix index 428a10352754..066f77dd8644 100644 --- a/pkgs/by-name/fl/flix/package.nix +++ b/pkgs/by-name/fl/flix/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "flix"; - version = "0.56.0"; + version = "0.57.0"; src = fetchurl { url = "https://github.com/flix/flix/releases/download/v${version}/flix.jar"; - sha256 = "sha256-1xrfJesagHlN7Kur/ZeaYxqDVmFK+DaJ9ELmPfrQEVo="; + sha256 = "sha256-8qiNh8a6fwKkCeTGda/rBVWFSbYJsLRg27CxQsuL9Mo="; }; dontUnpack = true; From bfed661ae240648d011942236240390571aac88b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Feb 2025 04:13:19 +0000 Subject: [PATCH 0224/2168] altair: 8.1.3 -> 8.1.4 --- pkgs/by-name/al/altair/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/al/altair/package.nix b/pkgs/by-name/al/altair/package.nix index b56f4322d0bf..f634698a4c32 100644 --- a/pkgs/by-name/al/altair/package.nix +++ b/pkgs/by-name/al/altair/package.nix @@ -7,11 +7,11 @@ let pname = "altair"; - version = "8.1.3"; + version = "8.1.4"; src = fetchurl { url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage"; - sha256 = "sha256-1NNm4HUWb6Imz9dV23fmoR77rBiJD8zI83Pm4CCvfe4="; + sha256 = "sha256-o+R3cuE+2CX1gknhISN1f+VyeKkj6y/l+c6/ivPZyBU="; }; appimageContents = appimageTools.extract { inherit pname version src; }; From 4c3a095d576eacb252002e81b94a2fea2933e135 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Feb 2025 04:54:25 +0000 Subject: [PATCH 0225/2168] lubelogger: 1.4.3 -> 1.4.4 --- pkgs/by-name/lu/lubelogger/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lu/lubelogger/package.nix b/pkgs/by-name/lu/lubelogger/package.nix index 66573cef824e..1c4933746977 100644 --- a/pkgs/by-name/lu/lubelogger/package.nix +++ b/pkgs/by-name/lu/lubelogger/package.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "lubelogger"; - version = "1.4.3"; + version = "1.4.4"; src = fetchFromGitHub { owner = "hargata"; repo = "lubelog"; rev = "v${version}"; - hash = "sha256-D++znvzK8hoHOrsLBQTGqkTS/E8Y6IdiZ5fidd2HZmw="; + hash = "sha256-gKNZ/rGEOIPalexMTXduY/c3dGW4adKuzA2aGDpomsM="; }; projectFile = "CarCareTracker.sln"; From 5da19e6cada34f2c7653769feb317adb15953b7e Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Mon, 3 Feb 2025 22:25:03 -0800 Subject: [PATCH 0226/2168] citrix-workspace: bump llvm --- .../networking/remote/citrix-workspace/generic.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index f07ed6b3bf5a..e7772624061e 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -3,7 +3,7 @@ , heimdal, krb5, libsoup_2_4, libvorbis, speex, openssl, zlib, xorg, pango, gtk2 , gnome2, libgbm, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2 , libjpeg, libredirect, tzdata, cacert, systemd, libcxx, symlinkJoin -, libpulseaudio, pcsclite, glib-networking, llvmPackages_12, opencv4 +, libpulseaudio, pcsclite, glib-networking, llvmPackages, opencv4 , libfaketime , libinput, libcap, libjson, libsecret, libcanberra-gtk3 @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { libsoup_2_4 libvorbis libxml2 - llvmPackages_12.libunwind + llvmPackages.libunwind libgbm nspr nss From 331efcd0358c5a14dd7fcef9ad7ee5380a53a2b7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Feb 2025 07:40:48 +0000 Subject: [PATCH 0227/2168] pkgsite: 0-unstable-2025-01-21 -> 0-unstable-2025-01-31 --- pkgs/by-name/pk/pkgsite/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pk/pkgsite/package.nix b/pkgs/by-name/pk/pkgsite/package.nix index 1c3de33192a4..df8c1bb0dcc2 100644 --- a/pkgs/by-name/pk/pkgsite/package.nix +++ b/pkgs/by-name/pk/pkgsite/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "pkgsite"; - version = "0-unstable-2025-01-21"; + version = "0-unstable-2025-01-31"; src = fetchFromGitHub { owner = "golang"; repo = "pkgsite"; - rev = "ce52a304a0f4dccd8ae7abfdd3712c9dae7b4f34"; - hash = "sha256-6fZr9mi6SGIe7AUNv6cS6R+kBNjFbPfdamnpGclimWQ="; + rev = "50d4697cc82f2eedc49fc659871d1e81ca4c6164"; + hash = "sha256-zDUsMkhQH/KJDjUE6mw/zRF23Ad3VIfqjEIY374Y9GE="; }; vendorHash = "sha256-Z+Ji3RO2zn5vn9DXOAxyeI4OZXGOfyVdfdIsNyJHZpE="; From e927eba03b4161ce9ca8ec1a495ff1431daf0d64 Mon Sep 17 00:00:00 2001 From: rczb Date: Mon, 20 Jan 2025 22:54:46 +0800 Subject: [PATCH 0228/2168] racket and racket-minimal: separate recipes --- .../interpreters/racket/default.nix | 242 +++++------------- .../interpreters/racket/minimal.nix | 172 +++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 238 insertions(+), 178 deletions(-) create mode 100644 pkgs/development/interpreters/racket/minimal.nix diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index b5c40f363e3f..adefea1dd036 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -2,15 +2,10 @@ lib, stdenv, fetchurl, + racket-minimal, - libiconvReal, - libz, - lz4, - ncurses, openssl, - isMinimal ? false, - cairo, fontconfig, glib, @@ -29,10 +24,11 @@ disableDocs ? false, callPackage, - writers, }: let + minimal = racket-minimal.override { inherit disableDocs; }; + makeLibPaths = lib.concatMapStringsSep " " ( lib.flip lib.pipe [ lib.getLib @@ -41,9 +37,12 @@ let ); manifest = lib.importJSON ./manifest.json; - inherit (stdenv.hostPlatform) isDarwin isStatic; + inherit (stdenv.hostPlatform) isDarwin; + + runtimeDeps = [ + openssl + ]; - runtimeDeps = [ openssl ]; mainDistDeps = [ (if isDarwin then libiodbc else unixODBC) cairo @@ -58,83 +57,22 @@ let ]; in -stdenv.mkDerivation (finalAttrs: { - pname = "racket"; - inherit (manifest) version; - - src = - let - info = manifest.${if isMinimal then "minimal" else "full"}; - in - fetchurl { - url = "https://mirror.racket-lang.org/installers/${manifest.version}/${info.filename}"; - inherit (info) sha256; +minimal.overrideAttrs ( + finalAttrs: prevAttrs: { + src = fetchurl { + url = "https://mirror.racket-lang.org/installers/${manifest.version}/${manifest.full.filename}"; + inherit (manifest.full) sha256; }; - nativeBuildInputs = lib.optionals (!isMinimal) [ - wrapGAppsHook3 - ]; - - buildInputs = [ - libiconvReal - libz - lz4 - ncurses - ]; - - patches = lib.optionals isDarwin [ - /* - The entry point binary $out/bin/racket is codesigned at least once. The - following error is triggered as a result. - (error 'add-ad-hoc-signature "file already has a signature") - We always remove the existing signature then call add-ad-hoc-signature to - circumvent this error. - */ - ./patches/force-remove-codesign-then-add.patch - ]; - - preConfigure = - /* - The configure script forces using `libtool -o` as AR on Darwin. But, the - `-o` option is only available from Apple libtool. GNU ar works here. - */ - lib.optionalString isDarwin '' - substituteInPlace src/ChezScheme/zlib/configure \ - --replace-fail 'ARFLAGS="-o"' 'AR=ar; ARFLAGS="rc"' - '' - + '' - mkdir src/build - cd src/build - ''; - - configureScript = "../configure"; - - configureFlags = - [ - "--enable-check" - "--enable-csonly" - "--enable-liblz4" - "--enable-libz" - ] - ++ lib.optional disableDocs "--disable-docs" - ++ lib.optionals (!isStatic) [ - # instead of `--disable-static` that `stdenv` assumes - "--disable-libs" - # "not currently supported" in `configure --help-cs` but still emphasized in README - "--enable-shared" - ] - ++ lib.optionals isDarwin [ - "--disable-strip" - # "use Unix style (e.g., use Gtk) for Mac OS", which eliminates many problems - "--enable-xonx" + nativeBuildInputs = [ + wrapGAppsHook3 ]; - preBuild = - let - libPaths = makeLibPaths mainDistDeps; - libPathsVar = if isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" else "LD_LIBRARY_PATH"; - in - lib.optionalString (!isMinimal) ( + preBuild = + let + libPaths = makeLibPaths mainDistDeps; + libPathsVar = if isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + in /* Makes FFIs available for setting up `main-distribution` and its dependencies, which is integrated into the build process of Racket @@ -148,81 +86,50 @@ stdenv.mkDerivation (finalAttrs: { + '' export FONTCONFIG_FILE=${makeFontsConf { fontDirectories = [ ]; }} export XDG_CACHE_HOME=$(mktemp -d) - '' - ); + ''; - dontStrip = isDarwin; - - preFixup = lib.optionalString (!isMinimal && !isDarwin) '' - gappsWrapperArgs+=("--set" "LOCALE_ARCHIVE" "${glibcLocales}/lib/locale/locale-archive") - ''; - - postFixup = - let - libPaths = makeLibPaths (runtimeDeps ++ lib.optionals (!isMinimal) mainDistDeps); - in - '' - $out/bin/racket -f - < Racket is distributed under the MIT license and the Apache version 2.0 - > license, at your option. - - > The Racket runtime system embeds Chez Scheme, which is distributed - > under the Apache version 2.0 license. - */ - license = with lib.licenses; [ - asl20 - mit - ]; - maintainers = with lib.maintainers; [ rc-zb ]; - mainProgram = "racket"; - platforms = lib.platforms.${if isMinimal then "all" else "unix"}; - badPlatforms = lib.platforms.darwin; - }; -}) + platforms = lib.platforms.unix; + badPlatforms = lib.platforms.darwin; + }; + } +) diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix new file mode 100644 index 000000000000..c1abd3f983b1 --- /dev/null +++ b/pkgs/development/interpreters/racket/minimal.nix @@ -0,0 +1,172 @@ +{ + lib, + stdenv, + fetchurl, + + libiconvReal, + libz, + lz4, + ncurses, + openssl, + + disableDocs ? false, + + callPackage, + writers, +}: + +let + manifest = lib.importJSON ./manifest.json; + + inherit (stdenv.hostPlatform) isDarwin isStatic; +in + +stdenv.mkDerivation (finalAttrs: { + pname = "racket"; + inherit (manifest) version; + + src = fetchurl { + url = "https://mirror.racket-lang.org/installers/${manifest.version}/${manifest.minimal.filename}"; + inherit (manifest.minimal) sha256; + }; + + buildInputs = [ + libiconvReal + libz + lz4 + ncurses + ]; + + patches = lib.optionals isDarwin [ + /* + The entry point binary $out/bin/racket is codesigned at least once. The + following error is triggered as a result. + (error 'add-ad-hoc-signature "file already has a signature") + We always remove the existing signature then call add-ad-hoc-signature to + circumvent this error. + */ + ./patches/force-remove-codesign-then-add.patch + ]; + + preConfigure = + /* + The configure script forces using `libtool -o` as AR on Darwin. But, the + `-o` option is only available from Apple libtool. GNU ar works here. + */ + lib.optionalString isDarwin '' + substituteInPlace src/ChezScheme/zlib/configure \ + --replace-fail 'ARFLAGS="-o"' 'AR=ar; ARFLAGS="rc"' + '' + + '' + mkdir src/build + cd src/build + ''; + + configureScript = "../configure"; + + configureFlags = + [ + "--enable-check" + "--enable-csonly" + "--enable-liblz4" + "--enable-libz" + ] + ++ lib.optional disableDocs "--disable-docs" + ++ lib.optionals (!isStatic) [ + # instead of `--disable-static` that `stdenv` assumes + "--disable-libs" + # "not currently supported" in `configure --help-cs` but still emphasized in README + "--enable-shared" + ] + ++ lib.optionals isDarwin [ + "--disable-strip" + # "use Unix style (e.g., use Gtk) for Mac OS", which eliminates many problems + "--enable-xonx" + ]; + + dontStrip = isDarwin; + + postFixup = '' + $out/bin/racket -f - < Racket is distributed under the MIT license and the Apache version 2.0 + > license, at your option. + + > The Racket runtime system embeds Chez Scheme, which is distributed + > under the Apache version 2.0 license. + */ + license = with lib.licenses; [ + asl20 + mit + ]; + maintainers = with lib.maintainers; [ rc-zb ]; + mainProgram = "racket"; + platforms = lib.platforms.all; + badPlatforms = lib.platforms.darwin; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aa6cdc64dc4f..ab1b2c3e64f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7285,7 +7285,7 @@ with pkgs; wireplumber = callPackage ../development/libraries/pipewire/wireplumber.nix { }; racket = callPackage ../development/interpreters/racket { }; - racket-minimal = racket.override { isMinimal = true; }; + racket-minimal = callPackage ../development/interpreters/racket/minimal.nix { }; rakudo = callPackage ../development/interpreters/rakudo { }; moarvm = darwin.apple_sdk_11_0.callPackage ../development/interpreters/rakudo/moarvm.nix { From 9f953c133d4ba0608f9b0bee2b5b1aa66a67d258 Mon Sep 17 00:00:00 2001 From: rczb Date: Wed, 22 Jan 2025 11:43:53 +0800 Subject: [PATCH 0229/2168] racket-minimal: fix docs failure for lack of SQLite --- .../racket/configure-installation.rkt | 27 +++++++++ .../interpreters/racket/default.nix | 55 +++++-------------- .../interpreters/racket/minimal.nix | 29 +++++----- 3 files changed, 53 insertions(+), 58 deletions(-) create mode 100644 pkgs/development/interpreters/racket/configure-installation.rkt diff --git a/pkgs/development/interpreters/racket/configure-installation.rkt b/pkgs/development/interpreters/racket/configure-installation.rkt new file mode 100644 index 000000000000..ffc72b14d243 --- /dev/null +++ b/pkgs/development/interpreters/racket/configure-installation.rkt @@ -0,0 +1,27 @@ +#lang racket/base +(require + racket/function + racket/list + racket/pretty + racket/string + setup/dirs + ) + +(define config-file (build-path (find-config-dir) "config.rktd")) + +(define lib-paths + ((compose remove-duplicates + (curry map (curryr string-trim "-L" #:right? #f)) + (curry filter (curryr string-prefix? "-L")) + string-split) + (getenv "NIX_LDFLAGS"))) + +(define config + (let* ([prev-config (read-installation-configuration-table)] + [prev-lib-search-dirs (hash-ref prev-config 'lib-search-dirs '(#f))] + [lib-search-dirs (remove-duplicates (append lib-paths prev-lib-search-dirs))]) + (hash-set prev-config 'lib-search-dirs lib-search-dirs))) + +(call-with-output-file config-file + #:exists 'replace + (curry pretty-write config)) diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index adefea1dd036..2f624f400611 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -4,8 +4,6 @@ fetchurl, racket-minimal, - openssl, - cairo, fontconfig, glib, @@ -17,7 +15,6 @@ libpng, makeFontsConf, pango, - sqlite, unixODBC, wrapGAppsHook3, @@ -38,23 +35,6 @@ let manifest = lib.importJSON ./manifest.json; inherit (stdenv.hostPlatform) isDarwin; - - runtimeDeps = [ - openssl - ]; - - mainDistDeps = [ - (if isDarwin then libiodbc else unixODBC) - cairo - fontconfig - glib - gtk3 - libGL - libjpeg - libpng - pango - sqlite - ]; in minimal.overrideAttrs ( @@ -64,13 +44,25 @@ minimal.overrideAttrs ( inherit (manifest.full) sha256; }; + buildInputs = prevAttrs.buildInputs ++ [ + (if isDarwin then libiodbc else unixODBC) + cairo + fontconfig.lib + glib + gtk3 + libGL + libjpeg + libpng + pango + ]; + nativeBuildInputs = [ wrapGAppsHook3 ]; preBuild = let - libPaths = makeLibPaths mainDistDeps; + libPaths = makeLibPaths finalAttrs.buildInputs; libPathsVar = if isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" else "LD_LIBRARY_PATH"; in /* @@ -92,27 +84,6 @@ minimal.overrideAttrs ( gappsWrapperArgs+=("--set" "LOCALE_ARCHIVE" "${glibcLocales}/lib/locale/locale-archive") ''; - postFixup = - let - libPaths = makeLibPaths (runtimeDeps ++ mainDistDeps); - in - '' - $out/bin/racket -f - < Date: Thu, 30 Jan 2025 22:39:54 +0800 Subject: [PATCH 0230/2168] racket: fix failure to find executable Fix #377763. --- .../interpreters/racket/default.nix | 9 +++ .../racket/patches/force-cs-variant.patch | 12 ++++ .../racket/tests/get-version-and-variant.nix | 58 ++++++++++++------- 3 files changed, 59 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/interpreters/racket/patches/force-cs-variant.patch diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 2f624f400611..45ee63f0ec7e 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -60,6 +60,15 @@ minimal.overrideAttrs ( wrapGAppsHook3 ]; + patches = prevAttrs.patches or [ ] ++ [ + /* + Hardcode variant detection because nixpkgs wraps the Racket binary making it + fail to detect its variant at runtime. + https://github.com/NixOS/nixpkgs/issues/114993#issuecomment-812951247 + */ + ./patches/force-cs-variant.patch + ]; + preBuild = let libPaths = makeLibPaths finalAttrs.buildInputs; diff --git a/pkgs/development/interpreters/racket/patches/force-cs-variant.patch b/pkgs/development/interpreters/racket/patches/force-cs-variant.patch new file mode 100644 index 000000000000..52bb537a1f06 --- /dev/null +++ b/pkgs/development/interpreters/racket/patches/force-cs-variant.patch @@ -0,0 +1,12 @@ +--- old/collects/setup/variant.rkt ++++ new/collects/setup/variant.rkt +@@ -7,7 +7,8 @@ + (provide variant-suffix + script-variant?) + +-(define plain-variant ++(define plain-variant 'cs) ++#;(define plain-variant + (delay/sync + (cond + [(cross-installation?) diff --git a/pkgs/development/interpreters/racket/tests/get-version-and-variant.nix b/pkgs/development/interpreters/racket/tests/get-version-and-variant.nix index c81cb7719380..870542f8f6c0 100644 --- a/pkgs/development/interpreters/racket/tests/get-version-and-variant.nix +++ b/pkgs/development/interpreters/racket/tests/get-version-and-variant.nix @@ -1,27 +1,45 @@ -{ runCommandLocal, racket }: +{ + lib, + runCommandLocal, + racket, +}: runCommandLocal "racket-test-get-version-and-variant" { nativeBuildInputs = [ racket ]; } - '' - expectation="${racket.version}" + ( + lib.concatLines ( + builtins.map + ( + { expectation, output }: + '' + expectation="${expectation}" - output="$(racket -e '(display (version))')" + output="${output}" - if test "$output" != "$expectation"; then - echo "output mismatch: expected ''${expectation}, but got ''${output}" - exit 1 - fi - - expectation="cs" - - output="$(racket -e '(require launcher/launcher) (display (current-launcher-variant))')" - - if test "$output" != "$expectation"; then - echo "output mismatch: expected ''${expectation}, but got ''${output}" - exit 1 - fi - - touch $out - '' + if test "$output" != "$expectation"; then + echo "output mismatch: expected ''${expectation}, but got ''${output}" + exit 1 + fi + '' + ) + [ + { + expectation = racket.version; + output = "$(racket -e '(display (version))')"; + } + { + expectation = "cs"; + output = "$(racket -e '(require launcher/launcher) (display (current-launcher-variant))')"; + } + { + expectation = "${lib.getExe racket}"; + output = "$(racket -e '(require compiler/find-exe) (display (find-exe))')"; + } + ] + ) + + '' + touch $out + '' + ) From 1ff0d2c9e0ee67d0ec1cc81afdfd0f24860c65a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Feb 2025 11:58:52 +0000 Subject: [PATCH 0231/2168] python312Packages.google-cloud-pubsub: 2.27.2 -> 2.28.0 --- .../python-modules/google-cloud-pubsub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index ca7e688c01a7..02f51c149be1 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.27.2"; + version = "2.28.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_pubsub"; inherit version; - hash = "sha256-2SwVbH3dDlElAI+XeJgZjXsa52YCYFZJcnG+xJCWR/4="; + hash = "sha256-kE6JS04VEhUhB3rIXJqo9Oe4UXvF+0Cd2yqsjfGgKzw="; }; build-system = [ setuptools ]; From 3c0a25d30a3e26ccf0df13cbde09539d1d3ee08a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Feb 2025 12:28:53 +0000 Subject: [PATCH 0232/2168] alacritty-theme: 0-unstable-2025-01-21 -> 0-unstable-2025-01-27 --- pkgs/by-name/al/alacritty-theme/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/al/alacritty-theme/package.nix b/pkgs/by-name/al/alacritty-theme/package.nix index 48c698be1196..f349919d5960 100644 --- a/pkgs/by-name/al/alacritty-theme/package.nix +++ b/pkgs/by-name/al/alacritty-theme/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation (self: { pname = "alacritty-theme"; - version = "0-unstable-2025-01-21"; + version = "0-unstable-2025-01-27"; src = fetchFromGitHub { owner = "alacritty"; repo = "alacritty-theme"; - rev = "69d07c3bc280add63906a1cebf6be326687bc9eb"; - hash = "sha256-G8sUu8GD44uqUyQ7sZrgrGxC4IOfhSn++WIc+U67zL0="; + rev = "14794c3cc2dc1b4649f8b9b79a8833d2ce5bfd60"; + hash = "sha256-Bnx72n5rRLvZcA6x+ztUA7BLscDhs2g6dkzMJr6ODzg="; sparseCheckout = [ "themes" ]; }; From f93d16662d07ab7b1f3f10d25d197282edd61d3e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Feb 2025 12:30:51 +0000 Subject: [PATCH 0233/2168] wiremock: 3.10.0 -> 3.11.0 --- pkgs/by-name/wi/wiremock/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wi/wiremock/package.nix b/pkgs/by-name/wi/wiremock/package.nix index e1e76c23f738..f12271f0d84d 100644 --- a/pkgs/by-name/wi/wiremock/package.nix +++ b/pkgs/by-name/wi/wiremock/package.nix @@ -10,11 +10,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "wiremock"; - version = "3.10.0"; + version = "3.11.0"; src = fetchurl { url = "mirror://maven/org/wiremock/wiremock-standalone/${finalAttrs.version}/wiremock-standalone-${finalAttrs.version}.jar"; - hash = "sha256-MnACoA2dXdV4ObCsRPIxBoxiSu5aGmw4bhjnCXQ0Ghk="; + hash = "sha256-hfR+7NVN32qidcmjzq+OIAytMNJrUppwbdVeO/OkeH4="; }; dontUnpack = true; From 9ab80f7fea3ee920afc0b2a7352bce59c3ba0ab9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Feb 2025 12:52:10 +0000 Subject: [PATCH 0234/2168] galene: 0.96 -> 0.96.2 --- pkgs/by-name/ga/galene/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ga/galene/package.nix b/pkgs/by-name/ga/galene/package.nix index b8e5b2e4cf78..b7191239af0e 100644 --- a/pkgs/by-name/ga/galene/package.nix +++ b/pkgs/by-name/ga/galene/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "galene"; - version = "0.96"; + version = "0.96.2"; src = fetchFromGitHub { owner = "jech"; repo = "galene"; rev = "galene-${version}"; - hash = "sha256-E/xFh60Fzy/bRX414N1Juc7j4D8fN8CEDYPOUrNp5/4="; + hash = "sha256-Jp8kG4i1UVKIrBjPFx2FAfw/QoO6OIP3CpuzX2//if0="; }; vendorHash = "sha256-LDLKjD4qYn/Aae6GUX6gZ57+MUfKc058H+YHM0bNZV0="; From 3c316b6e6e43c1dda4cd5cea0fee9b1912b4111e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Feb 2025 16:08:32 +0000 Subject: [PATCH 0235/2168] coroot-node-agent: 1.23.6 -> 1.23.8 --- pkgs/by-name/co/coroot-node-agent/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/coroot-node-agent/package.nix b/pkgs/by-name/co/coroot-node-agent/package.nix index 8c6e00ee6adc..34e6b8374718 100644 --- a/pkgs/by-name/co/coroot-node-agent/package.nix +++ b/pkgs/by-name/co/coroot-node-agent/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "coroot-node-agent"; - version = "1.23.6"; + version = "1.23.8"; src = fetchFromGitHub { owner = "coroot"; repo = "coroot-node-agent"; rev = "v${version}"; - hash = "sha256-o7B5PRc7HXzro9mNvX0Amc9U8RE8wFT3oiEEz9elHB0="; + hash = "sha256-fuV6YAj6LgPrJcpbAGGhREfJeDVz0FlTO9hoGlHIOQw="; }; vendorHash = "sha256-SxyIlyDHuu8Ls1+/rujWE9elZiTfSYWIrV8vP5xsqTU="; From bae3d399e4eac8ef6ab9816d79f37355f62f73eb Mon Sep 17 00:00:00 2001 From: nichtsundniemand Date: Tue, 4 Feb 2025 17:24:30 +0100 Subject: [PATCH 0236/2168] cue: Switch to using `tag` inside of `fetchFromGitHub` --- pkgs/by-name/cu/cue/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/cu/cue/package.nix b/pkgs/by-name/cu/cue/package.nix index 68d542b3b514..1e3746a69a2a 100644 --- a/pkgs/by-name/cu/cue/package.nix +++ b/pkgs/by-name/cu/cue/package.nix @@ -16,7 +16,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "cue-lang"; repo = "cue"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-/2oVu1zij+8/qdDl4gApsNqdKwb1O7q5Xcdc3/djGn8="; }; From c569f990dfabc6cec3a8979fdee4d1b8fa24b2a3 Mon Sep 17 00:00:00 2001 From: Red Penguin Date: Sat, 1 Feb 2025 00:56:46 +0000 Subject: [PATCH 0237/2168] display3d: init at 0.2.1 --- pkgs/by-name/di/display3d/package.nix | 36 +++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 pkgs/by-name/di/display3d/package.nix diff --git a/pkgs/by-name/di/display3d/package.nix b/pkgs/by-name/di/display3d/package.nix new file mode 100644 index 000000000000..74efa2eedc3b --- /dev/null +++ b/pkgs/by-name/di/display3d/package.nix @@ -0,0 +1,36 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage rec { + pname = "display3d"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "renpenguin"; + repo = "display3d"; + tag = "v${version}"; + hash = "sha256-WGcocX3WYtTleh2f3F0yi3KBAMo1/dtlfVy1pQVhWgw="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-E4Ncg9OPlYGra794pPS9u9oyqep+k3Ser5ZxfV+uSRM="; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + versionCheckProgramArg = "--version"; + + passthru.updateScript = nix-update-script {}; + + meta = { + description = "CLI for rendering and animating 3D objects"; + homepage = "https://github.com/renpenguin/display3d"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ renpenguin ]; + mainProgram = "display3d"; + }; +} From 07e08a7a91e5c920097d97e8d6deacd41ee5cc16 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Feb 2025 17:30:43 +0000 Subject: [PATCH 0238/2168] rss-bridge: 2025-01-02 -> 2025-01-26 --- pkgs/by-name/rs/rss-bridge/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/rs/rss-bridge/package.nix b/pkgs/by-name/rs/rss-bridge/package.nix index 8593786f8bee..0baedb8dc21e 100644 --- a/pkgs/by-name/rs/rss-bridge/package.nix +++ b/pkgs/by-name/rs/rss-bridge/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "rss-bridge"; - version = "2025-01-02"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "RSS-Bridge"; repo = "rss-bridge"; rev = version; - sha256 = "sha256-6Ise+qptY2wLkNveT/mzL0nWrX6OhxAlOJkF2+BmSTE="; + sha256 = "sha256-b8mBojtNbQ9QSsFT2PTwyHJIOhoOpTxd6c2ldMy/g5g="; }; installPhase = '' From caf24255591a5c95f2fc3634f8e12b23557cea0a Mon Sep 17 00:00:00 2001 From: Barry Moore Date: Tue, 4 Feb 2025 12:55:19 -0500 Subject: [PATCH 0239/2168] erlang_26: 26.2.5.6 -> 26.2.5.7 --- pkgs/development/interpreters/erlang/26.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/26.nix b/pkgs/development/interpreters/erlang/26.nix index 6a91f3795d09..438f158a0f7a 100644 --- a/pkgs/development/interpreters/erlang/26.nix +++ b/pkgs/development/interpreters/erlang/26.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "26.2.5.6"; - sha256 = "sha256-5FsLAhbWqXjP18UQGNkbNQmFXlHiNoLY1aTzutLubZI="; + version = "26.2.5.7"; + sha256 = "sha256-SpiovwRjmV+hIIY+qXPs2QOgjhzo3sRtW+cXhOdiwCs="; } From 7a856fcb9c6498d7bcacf66ebf8aaf13ca2eaa01 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Feb 2025 18:21:04 +0000 Subject: [PATCH 0240/2168] sonar-scanner-cli: 6.2.1.4610 -> 7.0.1.4817 --- pkgs/by-name/so/sonar-scanner-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/so/sonar-scanner-cli/package.nix b/pkgs/by-name/so/sonar-scanner-cli/package.nix index 7eebc2693c9d..241e649095b5 100644 --- a/pkgs/by-name/so/sonar-scanner-cli/package.nix +++ b/pkgs/by-name/so/sonar-scanner-cli/package.nix @@ -11,16 +11,16 @@ maven.buildMavenPackage rec { pname = "sonar-scanner-cli"; - version = "6.2.1.4610"; + version = "7.0.1.4817"; src = fetchFromGitHub { owner = "SonarSource"; repo = "sonar-scanner-cli"; tag = version; - hash = "sha256-k1gZO3h6ZGwxJNQ5QwUH96aDPGpJuEn6HYUsYOpqo+g="; + hash = "sha256-gXThWkkDZbGMdEMfeDrcCGrRV0+Yv/kXVNJARgGIvXA="; }; - mvnHash = "sha256-RNWE9wjX2CP6G/Hoh/vJExUkTEsSh5D+1PAMZ9TuIh0="; + mvnHash = "sha256-YYoqBawqM63HNNgFENsgAXhURBBUlekn4mABtISz+LQ="; mvnParameters = "-Dproject.build.outputTimestamp=1980-01-01T00:00:02Z"; From 7eeeae929033eda631d19e5115f8ec90a570a69d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Feb 2025 18:45:26 +0000 Subject: [PATCH 0241/2168] twilio-cli: 5.22.9 -> 5.22.10 --- pkgs/by-name/tw/twilio-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tw/twilio-cli/package.nix b/pkgs/by-name/tw/twilio-cli/package.nix index ed4c6ced0cf3..acfa7428ceba 100644 --- a/pkgs/by-name/tw/twilio-cli/package.nix +++ b/pkgs/by-name/tw/twilio-cli/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "twilio-cli"; - version = "5.22.9"; + version = "5.22.10"; src = fetchzip { url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz"; - hash = "sha256-drQUlu5xc9HUlVP/OHDDWNEaSxT/90yhiKYh9bq2G4E="; + hash = "sha256-ZesjUeAoOuNWITzM1qjWsvh2DMehyy8XJDhecylx4V4="; }; buildInputs = [ nodejs-slim ]; From 877c12f841098f2bd7f4f13ded9d24ab3a7e009b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Feb 2025 19:55:59 +0000 Subject: [PATCH 0242/2168] retrospy: 6.7 -> 6.8.2 --- pkgs/by-name/re/retrospy/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/retrospy/package.nix b/pkgs/by-name/re/retrospy/package.nix index 8f0f3b81fd4e..9b0d85e0f082 100644 --- a/pkgs/by-name/re/retrospy/package.nix +++ b/pkgs/by-name/re/retrospy/package.nix @@ -8,13 +8,13 @@ runCommandLocal, }: let - version = "6.7"; + version = "6.8.2"; src = fetchFromGitHub { owner = "retrospy"; repo = "RetroSpy"; rev = "v${version}"; - hash = "sha256-L16LezV9z7pCRcXKv+KfGTCbCQfBd3y3dUidNeJUznQ="; + hash = "sha256-0f4rtBGjPSdCl3M72YPD6A6T4pOnpm9fde6ktvHcPLY="; }; executables = [ From d9b4e920b15a21eaf43ef3c5417c22e3712b3bc2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Feb 2025 20:07:04 +0000 Subject: [PATCH 0243/2168] python312Packages.python-docs-theme: 2024.12 -> 2025.2 --- pkgs/development/python-modules/python-docs-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-docs-theme/default.nix b/pkgs/development/python-modules/python-docs-theme/default.nix index baa986db0e2b..dabe52ca149a 100644 --- a/pkgs/development/python-modules/python-docs-theme/default.nix +++ b/pkgs/development/python-modules/python-docs-theme/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "python-docs-theme"; - version = "2024.12"; + version = "2025.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "python"; repo = "python-docs-theme"; tag = version; - hash = "sha256-LZFcKmFnALZ5ZV8XbRfT74Wv5r7he/y58mCu4uydgw8="; + hash = "sha256-+QOtlgWGPcuKZOfuE0l08GUetR0DZvMzsk8Xl8KaZcQ="; }; build-system = [ flit-core ]; From d4549901c87c62b2a3c9002b91fafbf378551dea Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Tue, 4 Feb 2025 12:08:41 -0800 Subject: [PATCH 0244/2168] nixos/nats: make config validation friendly to cross compilation --- nixos/modules/services/networking/nats.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/networking/nats.nix b/nixos/modules/services/networking/nats.nix index 0ab9d9f015c2..d6e1a326a751 100644 --- a/nixos/modules/services/networking/nats.nix +++ b/nixos/modules/services/networking/nats.nix @@ -17,14 +17,17 @@ let validateConfig = file: - pkgs.runCommand "validate-nats-conf" - { - nativeBuildInputs = [ pkgs.nats-server ]; - } - '' - nats-server --config "${configFile}" -t - ln -s "${configFile}" "$out" - ''; + pkgs.callPackage ( + { runCommand, nats-server }: + runCommand "validate-nats-conf" + { + nativeBuildInputs = [ nats-server ]; + } + '' + nats-server --config "${configFile}" -t + ln -s "${configFile}" "$out" + '' + ) { }; in { From 27b4c1f70e11a98d801bdf1b644cdd4c1c3bd80c Mon Sep 17 00:00:00 2001 From: David McFarland Date: Tue, 4 Feb 2025 16:55:37 -0400 Subject: [PATCH 0245/2168] nixops_unstable_{minimal,full}: fix missing nix after poetry update --- pkgs/applications/networking/cluster/nixops/unwrapped.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/nixops/unwrapped.nix b/pkgs/applications/networking/cluster/nixops/unwrapped.nix index 4527ed9121e0..9ac608bb8ff7 100644 --- a/pkgs/applications/networking/cluster/nixops/unwrapped.nix +++ b/pkgs/applications/networking/cluster/nixops/unwrapped.nix @@ -25,7 +25,10 @@ buildPythonApplication rec { }; postPatch = '' - substituteInPlace nixops/args.py --replace "@version@" "${version}-pre-${ + substituteInPlace pyproject.toml --replace-fail \ + 'include = ["nix/*.nix", "nixops/py.typed" ]' \ + 'include = [ { path = "nix/*.nix", format = "wheel" }, { path = "nixops/py.typed", format = "wheel" } ]' + substituteInPlace nixops/args.py --replace-fail "@version@" "${version}-pre-${ lib.substring 0 7 src.rev or "dirty" }" ''; From b6ed862e65772fab57f460f5670a518b5bae0ef5 Mon Sep 17 00:00:00 2001 From: Sam Willcocks Date: Fri, 24 Jan 2025 14:15:19 +0000 Subject: [PATCH 0246/2168] grafanaPlugins.victoriametrics-logs-datasource: init at 0.14.3 --- pkgs/servers/monitoring/grafana/plugins/plugins.nix | 1 + .../victoriametrics-logs-datasource/default.nix | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix diff --git a/pkgs/servers/monitoring/grafana/plugins/plugins.nix b/pkgs/servers/monitoring/grafana/plugins/plugins.nix index 0a14dfab1559..2a18348cd68a 100644 --- a/pkgs/servers/monitoring/grafana/plugins/plugins.nix +++ b/pkgs/servers/monitoring/grafana/plugins/plugins.nix @@ -28,6 +28,7 @@ redis-datasource = callPackage ./redis-datasource { }; redis-explorer-app = callPackage ./redis-explorer-app { }; ventura-psychrometric-panel = callPackage ./ventura-psychrometric-panel { }; + victoriametrics-logs-datasource = callPackage ./victoriametrics-logs-datasource { }; volkovlabs-echarts-panel = callPackage ./volkovlabs-echarts-panel { }; volkovlabs-form-panel = callPackage ./volkovlabs-form-panel { }; volkovlabs-rss-datasource = callPackage ./volkovlabs-rss-datasource { }; diff --git a/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix new file mode 100644 index 000000000000..1bd5ea435b21 --- /dev/null +++ b/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix @@ -0,0 +1,13 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin { + pname = "victoriametrics-logs-datasource"; + version = "0.14.3"; + zipHash = "sha256-g/ntmNyWJ9h/eYpZ0gqiESvVfm2fU6/Ci8R7FHIV7AQ="; + meta = { + description = "Grafana datasource for VictoriaLogs"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ samw ]; + platforms = lib.platforms.unix; + }; +} From d4f5d01becc2af7f4e96e84ed3e20f302510f9b2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Feb 2025 01:40:16 +0000 Subject: [PATCH 0247/2168] cargo-shuttle: 0.51.0 -> 0.52.0 --- pkgs/by-name/ca/cargo-shuttle/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-shuttle/package.nix b/pkgs/by-name/ca/cargo-shuttle/package.nix index 5549e4789623..15444122fb5d 100644 --- a/pkgs/by-name/ca/cargo-shuttle/package.nix +++ b/pkgs/by-name/ca/cargo-shuttle/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-shuttle"; - version = "0.51.0"; + version = "0.52.0"; src = fetchFromGitHub { owner = "shuttle-hq"; repo = "shuttle"; rev = "v${version}"; - hash = "sha256-oKFL/tnMsXz/qic65DgLmnmeyBsrklacs+XeVM6RGSs="; + hash = "sha256-uAxNLoB8ExfHpGRl96OZWhzV8hSiDzt1E7T4OD21w74="; }; useFetchCargoVendor = true; - cargoHash = "sha256-ocTkpIqXTf8k+onUroaCt/jMnslctzCt7g9wNtkI82g="; + cargoHash = "sha256-cHwF4+5HQmT2hICJjCF1zaivq6AtFhhLatxUWv+esCo="; nativeBuildInputs = [ pkg-config ]; From 330ca4303aea23fdc96600ba1b87f1a2a2488021 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Feb 2025 02:35:21 +0000 Subject: [PATCH 0248/2168] byedpi: 0.16 -> 0.16.4 --- pkgs/by-name/by/byedpi/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/by/byedpi/package.nix b/pkgs/by-name/by/byedpi/package.nix index 98e789aa91f5..65dc374819fc 100644 --- a/pkgs/by-name/by/byedpi/package.nix +++ b/pkgs/by-name/by/byedpi/package.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "byedpi"; - version = "0.16"; + version = "0.16.4"; src = fetchFromGitHub { owner = "hufrea"; repo = "byedpi"; tag = "v${finalAttrs.version}"; - hash = "sha256-/K60znoC/5NNOJ5olQI7YZkjShkGZaJDdub+LwZ/FKc="; + hash = "sha256-l9Clkdq4E8mgCQM4AsdDv6pB/3SBChp71P0yQKRtMSY="; }; installPhase = '' From cc6fb84b34283a8dbfe9834c59eb5ed3d8833700 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Feb 2025 02:39:13 +0000 Subject: [PATCH 0249/2168] lib60870: 2.3.3 -> 2.3.4 --- pkgs/by-name/li/lib60870/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/lib60870/package.nix b/pkgs/by-name/li/lib60870/package.nix index 2bbb3a146063..2c9966ab1ac7 100644 --- a/pkgs/by-name/li/lib60870/package.nix +++ b/pkgs/by-name/li/lib60870/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lib60870"; - version = "2.3.3"; + version = "2.3.4"; src = fetchFromGitHub { owner = "mz-automation"; repo = "lib60870"; rev = "v${finalAttrs.version}"; - hash = "sha256-me+EYS2XDITRdI4okMj/ZqeewUS2bKj8Opecu6/1+Cs="; + hash = "sha256-bPBDM+/1+mIj5BSLukV/nYwOGUo4riGCBC61z3YKAkQ="; }; sourceRoot = "${finalAttrs.src.name}/lib60870-C"; From baa7d4d6f0ee79c71e9ce46124b7156b4023b33c Mon Sep 17 00:00:00 2001 From: Benoit de Chezelles Date: Sat, 11 Jan 2025 08:46:43 +0100 Subject: [PATCH 0250/2168] rofi-file-browser: Fix build error & warnings - Fix a hard build error due to incompatible pointer type - Fix build on i686 where `gsize` is not a `unsigned long` - Fix glib-related warning about deprecated functions --- .../rofi-file-browser/fix_build_on_i686.patch | 13 +++ .../fix_incompatible_pointer_type.patch | 27 ++++++ .../fix_recent_glib_deprecation_warning.patch | 83 +++++++++++++++++++ pkgs/by-name/ro/rofi-file-browser/package.nix | 6 ++ 4 files changed, 129 insertions(+) create mode 100644 pkgs/by-name/ro/rofi-file-browser/fix_build_on_i686.patch create mode 100644 pkgs/by-name/ro/rofi-file-browser/fix_incompatible_pointer_type.patch create mode 100644 pkgs/by-name/ro/rofi-file-browser/fix_recent_glib_deprecation_warning.patch diff --git a/pkgs/by-name/ro/rofi-file-browser/fix_build_on_i686.patch b/pkgs/by-name/ro/rofi-file-browser/fix_build_on_i686.patch new file mode 100644 index 000000000000..95c01a8e4ac4 --- /dev/null +++ b/pkgs/by-name/ro/rofi-file-browser/fix_build_on_i686.patch @@ -0,0 +1,13 @@ +diff --git a/src/icons.c b/src/icons.c +index eee00a4..ae476de 100644 +--- a/src/icons.c ++++ b/src/icons.c +@@ -48,7 +48,7 @@ void request_icons_for_file ( FBFile *fbfile, int icon_size, FileBrowserIconData + } + } + +- unsigned long num_icon_names; ++ gsize num_icon_names; + char** icon_names_raw = g_array_steal ( icon_names, &num_icon_names ); + + /* Create icon fetcher requests. */ diff --git a/pkgs/by-name/ro/rofi-file-browser/fix_incompatible_pointer_type.patch b/pkgs/by-name/ro/rofi-file-browser/fix_incompatible_pointer_type.patch new file mode 100644 index 000000000000..3108deb1fa43 --- /dev/null +++ b/pkgs/by-name/ro/rofi-file-browser/fix_incompatible_pointer_type.patch @@ -0,0 +1,27 @@ +diff --git a/src/filebrowser.c b/src/filebrowser.c +index a5a19af..59f0140 100644 +--- a/src/filebrowser.c ++++ b/src/filebrowser.c +@@ -256,21 +256,21 @@ static char *file_browser_get_display_value ( const Mode *sw, unsigned int selec + FBCmd *fbcmd = &pd->cmds[selected_line]; + char* name = fbcmd->name != NULL ? fbcmd->name : fbcmd->cmd; + return rofi_force_utf8 ( name, strlen ( name ) ); + } else { + int index = pd->open_custom ? pd->open_custom_index : selected_line; + FBFile *fbfile = &fd->files[index]; + return rofi_force_utf8 ( fbfile->name, strlen ( fbfile->name ) ); + } + } + +-static cairo_surface_t *file_browser_get_icon ( const Mode *sw, unsigned int selected_line, int height ) ++static cairo_surface_t *file_browser_get_icon ( const Mode *sw, unsigned int selected_line, unsigned int height ) + { + FileBrowserModePrivateData *pd = ( FileBrowserModePrivateData * ) mode_get_private_data ( sw ); + FileBrowserFileData *fd = &pd->file_data; + FileBrowserIconData *id = &pd->icon_data; + + if ( ! id->show_icons ) { + return NULL; + } + + if ( pd->open_custom && pd->show_cmds ) { diff --git a/pkgs/by-name/ro/rofi-file-browser/fix_recent_glib_deprecation_warning.patch b/pkgs/by-name/ro/rofi-file-browser/fix_recent_glib_deprecation_warning.patch new file mode 100644 index 000000000000..829905de44c2 --- /dev/null +++ b/pkgs/by-name/ro/rofi-file-browser/fix_recent_glib_deprecation_warning.patch @@ -0,0 +1,83 @@ +diff --git a/src/cmds.c b/src/cmds.c +index b2f61d7..16554d8 100644 +--- a/src/cmds.c ++++ b/src/cmds.c +@@ -108,21 +108,21 @@ void search_path_for_cmds ( FileBrowserModePrivateData *pd ) + fbcmd->cmd = cmdstr; + fbcmd->name = NULL; + fbcmd->icon_name = NULL; + + num_cmds++; + } + + g_hash_table_steal_all ( table ); + g_hash_table_destroy ( table ); + +- g_qsort_with_data ( cmds, num_cmds, sizeof ( FBCmd ), compare_cmds, NULL ); ++ g_sort_array ( cmds, num_cmds, sizeof ( FBCmd ), compare_cmds, NULL ); + + add_cmds(cmds, num_cmds, pd); + + g_free ( cmds ); + } + + void destroy_cmds ( FileBrowserModePrivateData *pd ) + { + for ( int i = 0; i < pd->num_cmds; i++ ) { + g_free( pd->cmds[i].cmd ); +diff --git a/src/files.c b/src/files.c +index 29a5f9c..6a15b2e 100644 +--- a/src/files.c ++++ b/src/files.c +@@ -135,46 +135,46 @@ void load_files ( FileBrowserFileData *fd ) + FBFile *sort_files = fd->files; + int num_sort_files = fd->num_files; + if ( ! fd->hide_parent ) { + sort_files++; + num_sort_files--; + } + + /* Sort all but the parent dir. */ + if ( fd->sort_by_type ) { + if ( fd->sort_by_depth ) { +- g_qsort_with_data ( sort_files, num_sort_files, sizeof ( FBFile ), compare_files_depth_type, NULL ); ++ g_sort_array ( sort_files, num_sort_files, sizeof ( FBFile ), compare_files_depth_type, NULL ); + } else { +- g_qsort_with_data ( sort_files, num_sort_files, sizeof ( FBFile ), compare_files_type, NULL ); ++ g_sort_array ( sort_files, num_sort_files, sizeof ( FBFile ), compare_files_type, NULL ); + } + } else { + if ( fd->sort_by_depth ) { +- g_qsort_with_data ( sort_files, num_sort_files, sizeof ( FBFile ), compare_files_depth, NULL ); ++ g_sort_array ( sort_files, num_sort_files, sizeof ( FBFile ), compare_files_depth, NULL ); + } else { +- g_qsort_with_data ( sort_files, num_sort_files, sizeof ( FBFile ), compare_files, NULL ); ++ g_sort_array ( sort_files, num_sort_files, sizeof ( FBFile ), compare_files, NULL ); + } + } + } + + void change_dir ( char *path, FileBrowserFileData *pd ) + { + char* new_dir = get_canonical_abs_path ( path, pd->current_dir ); + g_free ( pd->current_dir ); + pd->current_dir = new_dir; + g_chdir ( new_dir ); + } + + static bool match_glob_patterns ( const char *basename, FileBrowserFileData *fd ) + { + int len = strlen ( basename ); + for ( int i = 0; i < fd->num_exclude_patterns; i++ ) { +- if ( g_pattern_match ( fd->exclude_patterns[i], len, basename, NULL ) ) { ++ if ( g_pattern_spec_match ( fd->exclude_patterns[i], len, basename, NULL ) ) { + return false; + } + } + return true; + } + + static int add_file ( const char *fpath, G_GNUC_UNUSED const struct stat *sb, int typeflag, struct FTW *ftwbuf ) + { + FileBrowserFileData *fd = global_fd; + diff --git a/pkgs/by-name/ro/rofi-file-browser/package.nix b/pkgs/by-name/ro/rofi-file-browser/package.nix index 76bd8da4488a..025851b0d4dc 100644 --- a/pkgs/by-name/ro/rofi-file-browser/package.nix +++ b/pkgs/by-name/ro/rofi-file-browser/package.nix @@ -20,6 +20,12 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = [ + ./fix_incompatible_pointer_type.patch + ./fix_build_on_i686.patch + ./fix_recent_glib_deprecation_warning.patch + ]; + prePatch = '' substituteInPlace ./CMakeLists.txt \ --replace ' ''${ROFI_PLUGINS_DIR}' " $out/lib/rofi" \ From c81ae66b15b168b8464ab1625c5a611f6d595028 Mon Sep 17 00:00:00 2001 From: Benoit de Chezelles Date: Sat, 11 Jan 2025 08:59:40 +0100 Subject: [PATCH 0251/2168] rofi-file-browser: add bew as maintainer --- pkgs/by-name/ro/rofi-file-browser/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ro/rofi-file-browser/package.nix b/pkgs/by-name/ro/rofi-file-browser/package.nix index 025851b0d4dc..f1c266a520f9 100644 --- a/pkgs/by-name/ro/rofi-file-browser/package.nix +++ b/pkgs/by-name/ro/rofi-file-browser/package.nix @@ -49,6 +49,9 @@ stdenv.mkDerivation rec { description = "Use rofi to quickly open files"; homepage = "https://github.com/marvinkreis/rofi-file-browser-extended"; license = licenses.mit; - maintainers = with maintainers; [ jluttine ]; + maintainers = with maintainers; [ + bew + jluttine + ]; }; } From 451af963879573f946db6c0f076f56772fb9cb1e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Feb 2025 07:04:13 +0000 Subject: [PATCH 0252/2168] emacsPackages.lsp-bridge: 0-unstable-2025-01-22 -> 0-unstable-2025-02-03 --- .../elisp-packages/manual-packages/lsp-bridge/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix index cf1c84b3fd8b..8d15e185b286 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix @@ -31,13 +31,13 @@ let in melpaBuild { pname = "lsp-bridge"; - version = "0-unstable-2025-01-22"; + version = "0-unstable-2025-02-03"; src = fetchFromGitHub { owner = "manateelazycat"; repo = "lsp-bridge"; - rev = "c87e6ac6d452b3bd94583a5c5edb16f37edadb94"; - hash = "sha256-+6qU8KGdti/pji1d+024bnT7+oFP5Ve3jToURautKzE="; + rev = "16c9054be6e40a254e096715b1acf80ca36918aa"; + hash = "sha256-u1NWrSLsc+SRiK9BZwAujrzYb7vU+lEqyT+wozbXaiY="; }; patches = [ From 6a953abe6af317d09e83af62fbe915b064f99f19 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Feb 2025 07:54:00 +0000 Subject: [PATCH 0253/2168] jitsi-videobridge: 2.3-187-gc7ef8e66 -> 2.3-204-g26cd91bd --- pkgs/servers/jitsi-videobridge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jitsi-videobridge/default.nix b/pkgs/servers/jitsi-videobridge/default.nix index d9d8d21c9983..b9c8d9b49dd1 100644 --- a/pkgs/servers/jitsi-videobridge/default.nix +++ b/pkgs/servers/jitsi-videobridge/default.nix @@ -11,10 +11,10 @@ let pname = "jitsi-videobridge2"; - version = "2.3-187-gc7ef8e66"; + version = "2.3-204-g26cd91bd"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "ExihaHPQeShvKgnZKOsPJTDFTqU9KkOHMnknF1ksJB4="; + sha256 = "bh0WhNPpJcWz+SUWbUn6r5y9EnwKrslTsAPP2Ot9wKY="; }; in stdenv.mkDerivation { From 105746d258f181e763178e6a95623cf7ec0227b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Wed, 29 Jan 2025 18:28:20 +0100 Subject: [PATCH 0254/2168] pgloader: build and install man pages (#377042) --- pkgs/by-name/pg/pgloader/package.nix | 41 ++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/pg/pgloader/package.nix b/pkgs/by-name/pg/pgloader/package.nix index 1eaca6a9504b..1ce03e2b5bbf 100644 --- a/pkgs/by-name/pg/pgloader/package.nix +++ b/pkgs/by-name/pg/pgloader/package.nix @@ -2,6 +2,8 @@ lib, stdenv, fetchurl, + fetchFromGitHub, + installShellFiles, makeWrapper, sbcl, sqlite, @@ -11,24 +13,39 @@ git, cacert, openssl, + sphinx, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pgloader"; version = "3.6.9"; - src = fetchurl { - url = "https://github.com/dimitri/pgloader/releases/download/v3.6.9/pgloader-bundle-3.6.9.tgz"; - sha256 = "sha256-pdCcRmoJnrfVnkhbT0WqLrRbCtOEmRgGRsXK+3uByeA="; - }; + srcs = [ + (fetchurl { + url = "https://github.com/dimitri/pgloader/releases/download/v3.6.9/pgloader-bundle-3.6.9.tgz"; + sha256 = "sha256-pdCcRmoJnrfVnkhbT0WqLrRbCtOEmRgGRsXK+3uByeA="; + }) + # needed because bundle does not contain docs / man pages + (fetchFromGitHub { + owner = "dimitri"; + repo = "pgloader"; + rev = "v${finalAttrs.version}"; + hash = "sha256-lqvfWayaJbZ9xx4CgFfY1g0TKwFEd5IWf+RLLXQddw4="; + }) + ]; + + sourceRoot = "."; nativeBuildInputs = [ git makeWrapper + installShellFiles ]; + buildInputs = [ sbcl cacert sqlite + sphinx freetds libzip curl @@ -48,15 +65,23 @@ stdenv.mkDerivation rec { export PATH=$PATH:$out/bin export HOME=$TMPDIR + pushd pgloader-bundle-${finalAttrs.version} make pgloader + popd + + pushd source/docs + make man + popd ''; dontStrip = true; enableParallelBuilding = false; installPhase = '' - install -Dm755 bin/pgloader "$out/bin/pgloader" - wrapProgram $out/bin/pgloader --prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}" + install -Dm755 pgloader-bundle-${finalAttrs.version}/bin/pgloader "$out/bin/pgloader" + wrapProgram $out/bin/pgloader --prefix LD_LIBRARY_PATH : "${finalAttrs.LD_LIBRARY_PATH}" + mkdir -p $out/bin $out/man/man1 + installManPage source/docs/_build/man/*.1 ''; meta = with lib; { @@ -67,4 +92,4 @@ stdenv.mkDerivation rec { license = licenses.postgresql; platforms = platforms.all; }; -} +}) From 65c24be2bdf0ba1ec97d7bff0b3b825b74e4feb3 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 5 Feb 2025 11:08:08 +0100 Subject: [PATCH 0255/2168] vale: 3.9.4 -> 3.9.5 Diff: https://github.com/errata-ai/vale/compare/v3.9.4...v3.9.5 Changelog: https://github.com/errata-ai/vale/releases/tag/v3.9.5 --- pkgs/by-name/va/vale/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/va/vale/package.nix b/pkgs/by-name/va/vale/package.nix index 15b83f7ec486..6df13eada593 100644 --- a/pkgs/by-name/va/vale/package.nix +++ b/pkgs/by-name/va/vale/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { pname = "vale"; - version = "3.9.4"; + version = "3.9.5"; subPackages = [ "cmd/vale" ]; @@ -19,10 +19,10 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - hash = "sha256-F677sYL49U7egbseDdcWtMRomMkZV7NBeOvEKmz2LwE="; + hash = "sha256-l8B2nhMJ6C9Oattp6PYKEzG4ZpAiw0flkTMTE6CPMYU="; }; - vendorHash = "sha256-zjJICe3T3fmyqf3HJbUOaOXOb2GdhAufSFiJTjxauZY="; + vendorHash = "sha256-ivHOUkX9a4mRsw/ruYr3CzVbAovYMGQI+ExmaB+lP5E="; ldflags = [ "-s" From 9fc6a9ba5bf6fddf90489962b7c4c8822e85027d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Feb 2025 12:00:44 +0000 Subject: [PATCH 0256/2168] fanficfare: 4.41.0 -> 4.42.0 --- pkgs/by-name/fa/fanficfare/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fa/fanficfare/package.nix b/pkgs/by-name/fa/fanficfare/package.nix index 3f26f5f34409..a0b77ffa616b 100644 --- a/pkgs/by-name/fa/fanficfare/package.nix +++ b/pkgs/by-name/fa/fanficfare/package.nix @@ -6,12 +6,12 @@ python3Packages.buildPythonApplication rec { pname = "fanficfare"; - version = "4.41.0"; + version = "4.42.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-KZm3hhJzXZzHy11Ad6IdB5ixlLtIDFcx5X8ydqVpJKA="; + hash = "sha256-DfiZqndOh9XENU3MVubKydhdyeUdzhmRyHhLdxU+qDc="; }; nativeBuildInputs = with python3Packages; [ From bf7f00a07c51875e4455de7c764c32d4514522e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Feb 2025 12:15:02 +0000 Subject: [PATCH 0257/2168] airwindows: 0-unstable-2025-01-06 -> 0-unstable-2025-02-02 --- pkgs/by-name/ai/airwindows/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ai/airwindows/package.nix b/pkgs/by-name/ai/airwindows/package.nix index c2c5b1c41886..a6e8d1b0e110 100644 --- a/pkgs/by-name/ai/airwindows/package.nix +++ b/pkgs/by-name/ai/airwindows/package.nix @@ -9,13 +9,13 @@ }: stdenv.mkDerivation { pname = "airwindows"; - version = "0-unstable-2025-01-06"; + version = "0-unstable-2025-02-02"; src = fetchFromGitHub { owner = "airwindows"; repo = "airwindows"; - rev = "0ca33035253b9fc0c6c876592d9e5ff3a654cd10"; - hash = "sha256-+AyB6y179BRWTvflA9Ld5utpF2scSJDszkGa8BCvPdM="; + rev = "14f348fe83cfd42a6402856d3d15a1866b157996"; + hash = "sha256-IHOEpVykX1416wQBqymFgYHA8AnNH9mfUU53IkVVs6Y="; }; # we patch helpers because honestly im spooked out by where those variables From 18e12e5a8595d51795f91c8c75299de8dfd4becf Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 5 Feb 2025 13:21:09 +0100 Subject: [PATCH 0258/2168] nixos/*: cleanup code-escaped manpage urls Done with rg '[a-zA-Z.-]+\([0-9]+\)' -tnix nixos/ -l | xe sd '`\{manpage\}`([a-zA-Z.-]+\([0-9]+\))``' '{manpage}`$1`' --- nixos/modules/config/swap.nix | 4 ++-- nixos/modules/services/hardware/thinkfan.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/config/swap.nix b/nixos/modules/config/swap.nix index e262d0fb1c7e..0e08a986e925 100644 --- a/nixos/modules/config/swap.nix +++ b/nixos/modules/config/swap.nix @@ -46,7 +46,7 @@ let If not specified, the amount of data to read from `source` will be determined by cryptsetup. - See `{manpage}`cryptsetup-open(8)`` for details. + See {manpage}`cryptsetup-open(8)` for details. ''; }; @@ -60,7 +60,7 @@ let If not specified, the default sector size is determined from the underlying block device. - See `{manpage}`cryptsetup-open(8)`` for details. + See {manpage}`cryptsetup-open(8)` for details. ''; }; diff --git a/nixos/modules/services/hardware/thinkfan.nix b/nixos/modules/services/hardware/thinkfan.nix index 023c0be0e2c7..33f1ae422b2d 100644 --- a/nixos/modules/services/hardware/thinkfan.nix +++ b/nixos/modules/services/hardware/thinkfan.nix @@ -259,7 +259,7 @@ in description = '' Thinkfan settings. Use this option to configure thinkfan settings not exposed in a NixOS option or to bypass one. - Before changing this, read the `{manpage}`thinkfan.conf(5)`` + Before changing this, read the {manpage}`thinkfan.conf(5)` manpage and take a look at the example config file at ''; From 11a327303b37e1f000d8f11aaa05aca8658b69dd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Feb 2025 12:37:22 +0000 Subject: [PATCH 0259/2168] uncover: 1.0.9 -> 1.0.10 --- pkgs/by-name/un/uncover/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/un/uncover/package.nix b/pkgs/by-name/un/uncover/package.nix index 1b16fc3c8334..d672e02ee93f 100644 --- a/pkgs/by-name/un/uncover/package.nix +++ b/pkgs/by-name/un/uncover/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "uncover"; - version = "1.0.9"; + version = "1.0.10"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "uncover"; tag = "v${version}"; - hash = "sha256-avGbawIeh7ZUtacRLo/tLz4D6U7JAlu9BXDYu/xvoa0="; + hash = "sha256-q8ecgTY2uDo4O+/CqK9aYnYb4oArDIvga9C/tG9IooE="; }; - vendorHash = "sha256-93iXho+WCQyhw9DoLgo9ZKiPrd88D2ibgp1M9uP7bUU="; + vendorHash = "sha256-Pm3CFHdp0VHZ5tRrjnpXXaIwQFu7EXyVgo/K9OOqHBI="; subPackages = [ "cmd/uncover" ]; From d87449290a52dea4cad66a026d4f6d250585e1aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Feb 2025 12:39:01 +0000 Subject: [PATCH 0260/2168] ganttproject-bin: 3.3.3312 -> 3.3.3316 --- pkgs/applications/misc/ganttproject-bin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/ganttproject-bin/default.nix b/pkgs/applications/misc/ganttproject-bin/default.nix index a5e04f86b28e..f50aff51f579 100644 --- a/pkgs/applications/misc/ganttproject-bin/default.nix +++ b/pkgs/applications/misc/ganttproject-bin/default.nix @@ -9,12 +9,12 @@ stdenv.mkDerivation rec { pname = "ganttproject-bin"; - version = "3.3.3312"; + version = "3.3.3316"; src = fetchzip { url = "https://dl.ganttproject.biz/ganttproject-${version}/ganttproject-${version}.zip"; stripRoot = false; - hash = "sha256-mvup4yMfFfzL2iLMj9vlFFrJT0wLmeadNEnf2QO53H0="; + hash = "sha256-tiEq/xdC0gXiUInLS9xGR/vI/BpdSA+mSf5yukuejc4="; }; nativeBuildInputs = [ makeWrapper ]; From 860c0a12e716ea0880233fe10585ec144a276b5f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Feb 2025 12:58:54 +0000 Subject: [PATCH 0261/2168] codux: 15.41.0 -> 15.42.0 --- pkgs/by-name/co/codux/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/codux/package.nix b/pkgs/by-name/co/codux/package.nix index 954c33cab990..516b62a470fb 100644 --- a/pkgs/by-name/co/codux/package.nix +++ b/pkgs/by-name/co/codux/package.nix @@ -6,11 +6,11 @@ let pname = "codux"; - version = "15.41.0"; + version = "15.42.0"; src = fetchurl { url = "https://github.com/wixplosives/codux-versions/releases/download/${version}/Codux-${version}.x86_64.AppImage"; - hash = "sha256-l1Z4jcbsTdzn4kFDcAGENAuewIThP2ENB/fbG7XerdY="; + hash = "sha256-rD0yXZAEUcPtxWlWuZD77gjw6JlcUvBsaDYGj+NgLss="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; From 77936f95a03ebf45c46f1eeacc8931dffcfc32a8 Mon Sep 17 00:00:00 2001 From: misilelab Date: Wed, 5 Feb 2025 22:58:14 +0900 Subject: [PATCH 0262/2168] d2: 0.6.8 -> 0.6.9 Signed-off-by: misilelab --- pkgs/by-name/d2/d2/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/d2/d2/package.nix b/pkgs/by-name/d2/d2/package.nix index 9cfebc4669d4..59660722c989 100644 --- a/pkgs/by-name/d2/d2/package.nix +++ b/pkgs/by-name/d2/d2/package.nix @@ -10,16 +10,16 @@ buildGo123Module rec { pname = "d2"; - version = "0.6.8"; + version = "0.6.9"; src = fetchFromGitHub { owner = "terrastruct"; repo = pname; tag = "v${version}"; - hash = "sha256-Sd4AkXKQVRJIgQTb7BbDNb8DbULyoWX8TuFtiu+Km5Y="; + hash = "sha256-Z+RC3wXqplGxaECIpHDiV8giWItvE5KFh3N+mwVL6HU="; }; - vendorHash = "sha256-PMqN/6kzXR0d1y1PigBE0KJ8uP14n+qQziFqGai5zLE="; + vendorHash = "sha256-ujyPfQx9FyMq5GBRquBHxcQ47R72RP6g2/rqLICDdWM="; excludedPackages = [ "./e2etests" ]; From 3f4b3762170293318f3a077bf849d4a88678bb7f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Feb 2025 14:15:57 +0000 Subject: [PATCH 0263/2168] framesh: 0.6.10 -> 0.6.11 --- pkgs/by-name/fr/framesh/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fr/framesh/package.nix b/pkgs/by-name/fr/framesh/package.nix index 262f705820d6..a9fe230b7bb8 100644 --- a/pkgs/by-name/fr/framesh/package.nix +++ b/pkgs/by-name/fr/framesh/package.nix @@ -7,10 +7,10 @@ let pname = "framesh"; - version = "0.6.10"; + version = "0.6.11"; src = fetchurl { url = "https://github.com/floating/frame/releases/download/v${version}/Frame-${version}.AppImage"; - hash = "sha256-h2Y0G7luakd5UVu7bVt9r6xhvyOh80gYMTswmEIcnnk="; + hash = "sha256-t60jsA4ojXF805OUrqIOdk8eP9PlwA/g0XxEBCahmb4="; }; appimageContents = appimageTools.extractType2 { From ef505f58029c5419d7dc446a26e6effc31fd501f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Feb 2025 15:27:30 +0000 Subject: [PATCH 0264/2168] web-ext: 8.3.0 -> 8.4.0 --- pkgs/by-name/we/web-ext/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/we/web-ext/package.nix b/pkgs/by-name/we/web-ext/package.nix index 5123992e38c6..41e6089a8422 100644 --- a/pkgs/by-name/we/web-ext/package.nix +++ b/pkgs/by-name/we/web-ext/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "web-ext"; - version = "8.3.0"; + version = "8.4.0"; src = fetchFromGitHub { owner = "mozilla"; repo = "web-ext"; rev = version; - hash = "sha256-Jlxfsyir1+vutfuHt6SxBkcn0PTtr9/cZzEGa6z6LU0="; + hash = "sha256-zPOXl/7v/yP1ggqSKruGli/FC8Vf7i4J3LZey4WC/Lc="; }; - npmDepsHash = "sha256-MCK1bCWZpUk2Z/+ZWsY+iUCpz+n1UEcBqkAtiBtJl0k="; + npmDepsHash = "sha256-tU/NTeMjUyw1ftXLTP3HpLQqfzTNVwgY3oKvuIZXPxw="; npmBuildFlags = [ "--production" ]; From 049cdee2fbdf030fb0a0d10c8d421484a96f6e6d Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 5 Feb 2025 17:02:57 +0100 Subject: [PATCH 0265/2168] saunafs: 4.6.0 -> 4.7.0 --- pkgs/by-name/sa/saunafs/package.nix | 9 ++++----- pkgs/by-name/sa/saunafs/sfstool.patch | 13 ++++++------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/sa/saunafs/package.nix b/pkgs/by-name/sa/saunafs/package.nix index 374e52b7ebcc..d9fe7402f42b 100644 --- a/pkgs/by-name/sa/saunafs/package.nix +++ b/pkgs/by-name/sa/saunafs/package.nix @@ -6,7 +6,7 @@ cmake, asciidoc, jemalloc, - boost, + boost186, fmt, fuse3, spdlog, @@ -17,18 +17,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "saunafs"; - version = "4.6.0"; + version = "4.7.0"; src = fetchFromGitHub { owner = "leil-io"; repo = "saunafs"; rev = "v${finalAttrs.version}"; - hash = "sha256-uPHgyCL4/HYjoIm1Ev5p7lXAf1KlpV/OAqLVhu5Ang4="; + hash = "sha256-6WXSnItbydH3Lk04l0Iph14EKzL/Pl5vriWdhHxTF6I="; }; patches = [ ./sfstool.patch - ]; outputs = [ @@ -46,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { spdlog yaml-cpp fuse3 - boost + boost186 jemalloc isa-l judy diff --git a/pkgs/by-name/sa/saunafs/sfstool.patch b/pkgs/by-name/sa/saunafs/sfstool.patch index 90c5f840489d..b3ca9e6510d2 100644 --- a/pkgs/by-name/sa/saunafs/sfstool.patch +++ b/pkgs/by-name/sa/saunafs/sfstool.patch @@ -1,13 +1,12 @@ diff --git a/src/tools/sfstools.sh b/src/tools/sfstools.sh -index c6c41197..9a59814f 100755 +index ffd9ec22..a1cb83b6 100755 --- a/src/tools/sfstools.sh +++ b/src/tools/sfstools.sh -@@ -1,5 +1,6 @@ +@@ -1,4 +1,6 @@ #!/usr/bin/env bash --tool=$(basename $0) -+tool="$(basename $0)" + tool="$(basename $0)" +-exec saunafs "${tool#sfs}" "$@" +dir="$(dirname $0)" - --${tool/saunafs/saunafs } "$@" -+$dir/saunafs ${tool/sfs/} "$@" ++ ++exec "$dir/saunafs" "${tool#sfs}" "$@" From e499f37df93149dce44b74834cfe37f5ab32114c Mon Sep 17 00:00:00 2001 From: Pedro Mendes Date: Tue, 4 Feb 2025 23:54:12 -0300 Subject: [PATCH 0266/2168] mantainers: add phrmendes --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f3d03f99db7f..5efe71182de0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18123,6 +18123,12 @@ githubId = 301903; name = "Chip Collier"; }; + phrmendes = { + name = "Pedro Mendes"; + email = "pedrohrmendes@proton.me"; + github = "phrmendes"; + githubId = 22376151; + }; phrogg = { name = "Phil Roggenbuck"; email = "nixpkgs@phrogg.de"; From d1eb432ffc0cc90439d072d1cddfe63aa2ae55fa Mon Sep 17 00:00:00 2001 From: lyranico Date: Sun, 2 Feb 2025 03:50:54 +0800 Subject: [PATCH 0267/2168] shotcut: 24.11.17 -> 25.01.25 --- .../sh/shotcut/fix-mlt-ffmpeg-path.patch | 22 +++++++++---------- pkgs/by-name/sh/shotcut/package.nix | 5 +++-- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/sh/shotcut/fix-mlt-ffmpeg-path.patch b/pkgs/by-name/sh/shotcut/fix-mlt-ffmpeg-path.patch index fa584162cbe8..4e72ff822f89 100644 --- a/pkgs/by-name/sh/shotcut/fix-mlt-ffmpeg-path.patch +++ b/pkgs/by-name/sh/shotcut/fix-mlt-ffmpeg-path.patch @@ -1,17 +1,17 @@ diff --git a/src/docks/encodedock.cpp b/src/docks/encodedock.cpp -index 3359f676..24e44f98 100644 +index bba23d7..2d74f8c 100755 --- a/src/docks/encodedock.cpp +++ b/src/docks/encodedock.cpp -@@ -2177,7 +2177,7 @@ bool EncodeDock::detectHardwareEncoders() +@@ -2570,7 +2570,7 @@ bool EncodeDock::detectHardwareEncoders() { MAIN.showStatusMessage(tr("Detecting hardware encoders...")); QStringList hwlist; - QFileInfo ffmpegPath(qApp->applicationDirPath(), "ffmpeg"); + QFileInfo ffmpegPath("@ffmpeg@/bin/ffmpeg"); - foreach (const QString &codec, codecs()) { + for (const QString &codec : codecs()) { LOG_INFO() << "checking for" << codec; QProcess proc; -@@ -2220,7 +2220,7 @@ bool EncodeDock::detectHardwareEncoders() +@@ -2617,7 +2617,7 @@ bool EncodeDock::detectHardwareEncoders() QString &EncodeDock::defaultFormatExtension() { auto format = ui->formatCombo->currentText(); @@ -21,10 +21,10 @@ index 3359f676..24e44f98 100644 QStringList args; args << "-hide_banner" << "-h" << format.prepend("muxer="); diff --git a/src/jobs/ffmpegjob.cpp b/src/jobs/ffmpegjob.cpp -index 1f15e647..b6ad6633 100644 +index fe390d3..39b847a 100644 --- a/src/jobs/ffmpegjob.cpp +++ b/src/jobs/ffmpegjob.cpp -@@ -54,7 +54,7 @@ FfmpegJob::~FfmpegJob() +@@ -55,7 +55,7 @@ FfmpegJob::~FfmpegJob() void FfmpegJob::start() { QString shotcutPath = qApp->applicationDirPath(); @@ -34,10 +34,10 @@ index 1f15e647..b6ad6633 100644 LOG_DEBUG() << ffmpegPath.absoluteFilePath() + " " + m_args.join(' '); AbstractJob::start(ffmpegPath.absoluteFilePath(), m_args); diff --git a/src/jobs/meltjob.cpp b/src/jobs/meltjob.cpp -index fd8c00b8..9150fe7b 100644 +index 019f693..15b8969 100644 --- a/src/jobs/meltjob.cpp +++ b/src/jobs/meltjob.cpp -@@ -98,9 +98,9 @@ void MeltJob::start() +@@ -115,9 +115,9 @@ void MeltJob::start() } QString shotcutPath = qApp->applicationDirPath(); #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) @@ -50,10 +50,10 @@ index fd8c00b8..9150fe7b 100644 setReadChannel(QProcess::StandardError); QStringList args; diff --git a/src/mltcontroller.cpp b/src/mltcontroller.cpp -index 1e2299ac..b8f39f12 100644 +index 3d3b070..f57cfd1 100644 --- a/src/mltcontroller.cpp +++ b/src/mltcontroller.cpp -@@ -1555,9 +1555,9 @@ int Controller::checkFile(const QString &path) +@@ -1668,9 +1668,9 @@ int Controller::checkFile(const QString &path) || path.endsWith(".aep")) { QString shotcutPath = qApp->applicationDirPath(); #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) @@ -66,7 +66,7 @@ index 1e2299ac..b8f39f12 100644 QStringList args; args << "-quiet" << "-consumer" << "null" << "real_time=0" << "out=0" << "terminate_on_pause=1" << diff --git a/src/widgets/directshowvideowidget.cpp b/src/widgets/directshowvideowidget.cpp -index c91ba821..73dd5a61 100644 +index a636a22..7a7b068 100644 --- a/src/widgets/directshowvideowidget.cpp +++ b/src/widgets/directshowvideowidget.cpp @@ -35,7 +35,7 @@ DirectShowVideoWidget::DirectShowVideoWidget(QWidget *parent) : diff --git a/pkgs/by-name/sh/shotcut/package.nix b/pkgs/by-name/sh/shotcut/package.nix index e4e29656f425..d58b91f080ad 100644 --- a/pkgs/by-name/sh/shotcut/package.nix +++ b/pkgs/by-name/sh/shotcut/package.nix @@ -17,15 +17,16 @@ gitUpdater, ffmpeg, }: + stdenv.mkDerivation (finalAttrs: { pname = "shotcut"; - version = "24.11.17"; + version = "25.01.25"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; tag = "v${finalAttrs.version}"; - hash = "sha256-sOBGLQYRGHcXNoKTmqbBqmheUFHe7p696BTCiwtF5JY="; + hash = "sha256-YrnmhxD7Yf2LgdEaBU4mmRdvZdO6VQ6IAb4s+V9QvLM="; }; nativeBuildInputs = [ From 2f9f9ecfb17b452655531f73048e11d2c0ffe4b5 Mon Sep 17 00:00:00 2001 From: lyranico Date: Sun, 2 Feb 2025 05:00:54 +0800 Subject: [PATCH 0268/2168] deskflow: 1.18.0 -> 1.19.0 --- pkgs/by-name/de/deskflow/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/de/deskflow/package.nix b/pkgs/by-name/de/deskflow/package.nix index 1bba705488ba..6d90b1e8b126 100644 --- a/pkgs/by-name/de/deskflow/package.nix +++ b/pkgs/by-name/de/deskflow/package.nix @@ -29,16 +29,18 @@ libsysprof-capture, lerc, doxygen, + writableTmpDirAsHomeHook, }: + stdenv.mkDerivation rec { pname = "deskflow"; - version = "1.18.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "deskflow"; repo = "deskflow"; tag = "v${version}"; - hash = "sha256-FdpDaJ+pphy2+8prlKst0DjmdbcZOmNp+lKN5xdnvC8="; + hash = "sha256-Jj2BNqz4pIJ468pywJRKu6GjgGX31GZZtDLHgcvC3JE="; }; postPatch = '' @@ -95,11 +97,12 @@ stdenv.mkDerivation rec { doCheck = true; + nativeCheckInputs = [ writableTmpDirAsHomeHook ]; + checkPhase = '' runHook preCheck export QT_QPA_PLATFORM=offscreen - export HOME=$(mktemp -d) ./bin/unittests ./bin/integtests From 811584737095c3a1639842b294e49593b9462934 Mon Sep 17 00:00:00 2001 From: lyranico Date: Mon, 3 Feb 2025 00:21:15 +0800 Subject: [PATCH 0269/2168] gtt: 9 -> 10 --- pkgs/by-name/gt/gtt/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/gt/gtt/package.nix b/pkgs/by-name/gt/gtt/package.nix index fb52b0b94ae1..56b69c97ea06 100644 --- a/pkgs/by-name/gt/gtt/package.nix +++ b/pkgs/by-name/gt/gtt/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "gtt"; - version = "9"; + version = "10"; src = fetchFromGitHub { owner = "eeeXun"; repo = "gtt"; rev = "v${version}"; - hash = "sha256-WDuQ8daKA8Skto4soG9L4ChkYzV18BwVZh+AbyDyXYs="; + hash = "sha256-ghdf8UQA+SfsBiD5bPrNZM8sPE+Xhbhn18iNl3xLh8c="; }; - vendorHash = "sha256-5Uwi1apowHoUtvkSgmUV9WbfpVQFTqJ9GA2sRnC5nFw="; + vendorHash = "sha256-6C+++HIVwOwOmlsdwXWF/ykyK9WOlq/ktIPjRslvllk="; nativeBuildInputs = [ pkg-config @@ -36,11 +36,11 @@ buildGoModule rec { "-w" ]; - meta = with lib; { + meta = { description = "Google Translate TUI (Originally). Now support Apertium, Argos, Bing, ChatGPT, DeepL, Google, Reverso"; homepage = "https://github.com/eeeXun/gtt"; - license = licenses.mit; - maintainers = with maintainers; [ linuxissuper ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ linuxissuper ]; mainProgram = "gtt"; }; } From b5c4a09dc84255d4e4c958d25a4e598ab4856108 Mon Sep 17 00:00:00 2001 From: lyranico Date: Mon, 3 Feb 2025 02:10:14 +0800 Subject: [PATCH 0270/2168] dart.flutter_discord_rpc: init --- .../dart/package-source-builders/default.nix | 1 + .../flutter_discord_rpc/cargokit.patch | 90 +++++++++++++++++++ .../flutter_discord_rpc/default.nix | 50 +++++++++++ 3 files changed, 141 insertions(+) create mode 100644 pkgs/development/compilers/dart/package-source-builders/flutter_discord_rpc/cargokit.patch create mode 100644 pkgs/development/compilers/dart/package-source-builders/flutter_discord_rpc/default.nix diff --git a/pkgs/development/compilers/dart/package-source-builders/default.nix b/pkgs/development/compilers/dart/package-source-builders/default.nix index 0b89c9f76851..9a6fcc606e1b 100644 --- a/pkgs/development/compilers/dart/package-source-builders/default.nix +++ b/pkgs/development/compilers/dart/package-source-builders/default.nix @@ -3,6 +3,7 @@ { audiotags = callPackage ./audiotags { }; file_picker = callPackage ./file_picker { }; + flutter_discord_rpc = callPackage ./flutter_discord_rpc { }; flutter_secure_storage_linux = callPackage ./flutter-secure-storage-linux { }; flutter_volume_controller = callPackage ./flutter_volume_controller { }; fvp = callPackage ./fvp { }; diff --git a/pkgs/development/compilers/dart/package-source-builders/flutter_discord_rpc/cargokit.patch b/pkgs/development/compilers/dart/package-source-builders/flutter_discord_rpc/cargokit.patch new file mode 100644 index 000000000000..78e2678723b2 --- /dev/null +++ b/pkgs/development/compilers/dart/package-source-builders/flutter_discord_rpc/cargokit.patch @@ -0,0 +1,90 @@ +--- old/cargokit/cmake/cargokit.cmake 2024-11-08 13:36:13.345889693 +0800 ++++ new/cargokit/cmake/cargokit.cmake 2024-11-08 13:45:26.019632176 +0800 +@@ -17,83 +17,22 @@ + function(apply_cargokit target manifest_dir lib_name any_symbol_name) + + set(CARGOKIT_LIB_NAME "${lib_name}") +- set(CARGOKIT_LIB_FULL_NAME "${CMAKE_SHARED_MODULE_PREFIX}${CARGOKIT_LIB_NAME}${CMAKE_SHARED_MODULE_SUFFIX}") +- if (CMAKE_CONFIGURATION_TYPES) +- set(CARGOKIT_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/$") +- set(OUTPUT_LIB "${CMAKE_CURRENT_BINARY_DIR}/$/${CARGOKIT_LIB_FULL_NAME}") +- else() +- set(CARGOKIT_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}") +- set(OUTPUT_LIB "${CMAKE_CURRENT_BINARY_DIR}/${CARGOKIT_LIB_FULL_NAME}") +- endif() +- set(CARGOKIT_TEMP_DIR "${CMAKE_CURRENT_BINARY_DIR}/cargokit_build") +- +- if (FLUTTER_TARGET_PLATFORM) +- set(CARGOKIT_TARGET_PLATFORM "${FLUTTER_TARGET_PLATFORM}") +- else() +- set(CARGOKIT_TARGET_PLATFORM "windows-x64") +- endif() +- +- set(CARGOKIT_ENV +- "CARGOKIT_CMAKE=${CMAKE_COMMAND}" +- "CARGOKIT_CONFIGURATION=$" +- "CARGOKIT_MANIFEST_DIR=${CMAKE_CURRENT_SOURCE_DIR}/${manifest_dir}" +- "CARGOKIT_TARGET_TEMP_DIR=${CARGOKIT_TEMP_DIR}" +- "CARGOKIT_OUTPUT_DIR=${CARGOKIT_OUTPUT_DIR}" +- "CARGOKIT_TARGET_PLATFORM=${CARGOKIT_TARGET_PLATFORM}" +- "CARGOKIT_TOOL_TEMP_DIR=${CARGOKIT_TEMP_DIR}/tool" +- "CARGOKIT_ROOT_PROJECT_DIR=${CMAKE_SOURCE_DIR}" +- ) +- +- if (WIN32) +- set(SCRIPT_EXTENSION ".cmd") +- set(IMPORT_LIB_EXTENSION ".lib") +- else() +- set(SCRIPT_EXTENSION ".sh") +- set(IMPORT_LIB_EXTENSION "") +- execute_process(COMMAND chmod +x "${cargokit_cmake_root}/run_build_tool${SCRIPT_EXTENSION}") +- endif() +- +- # Using generators in custom command is only supported in CMake 3.20+ +- if (CMAKE_CONFIGURATION_TYPES AND ${CMAKE_VERSION} VERSION_LESS "3.20.0") +- foreach(CONFIG IN LISTS CMAKE_CONFIGURATION_TYPES) +- add_custom_command( +- OUTPUT +- "${CMAKE_CURRENT_BINARY_DIR}/${CONFIG}/${CARGOKIT_LIB_FULL_NAME}" +- "${CMAKE_CURRENT_BINARY_DIR}/_phony_" +- COMMAND ${CMAKE_COMMAND} -E env ${CARGOKIT_ENV} +- "${cargokit_cmake_root}/run_build_tool${SCRIPT_EXTENSION}" build-cmake +- VERBATIM +- ) +- endforeach() +- else() +- add_custom_command( +- OUTPUT +- ${OUTPUT_LIB} +- "${CMAKE_CURRENT_BINARY_DIR}/_phony_" +- COMMAND ${CMAKE_COMMAND} -E env ${CARGOKIT_ENV} +- "${cargokit_cmake_root}/run_build_tool${SCRIPT_EXTENSION}" build-cmake +- VERBATIM +- ) +- endif() +- +- +- set_source_files_properties("${CMAKE_CURRENT_BINARY_DIR}/_phony_" PROPERTIES SYMBOLIC TRUE) + + if (TARGET ${target}) + # If we have actual cmake target provided create target and make existing + # target depend on it +- add_custom_target("${target}_cargokit" DEPENDS ${OUTPUT_LIB}) ++ add_custom_target("${target}_cargokit" DEPENDS @output_lib@) + add_dependencies("${target}" "${target}_cargokit") +- target_link_libraries("${target}" PRIVATE "${OUTPUT_LIB}${IMPORT_LIB_EXTENSION}") ++ target_link_libraries("${target}" PRIVATE @output_lib@) + if(WIN32) + target_link_options(${target} PRIVATE "/INCLUDE:${any_symbol_name}") + endif() + else() + # Otherwise (FFI) just use ALL to force building always +- add_custom_target("${target}_cargokit" ALL DEPENDS ${OUTPUT_LIB}) ++ add_custom_target("${target}_cargokit" ALL DEPENDS @output_lib@) + endif() + + # Allow adding the output library to plugin bundled libraries +- set("${target}_cargokit_lib" ${OUTPUT_LIB} PARENT_SCOPE) ++ set("${target}_cargokit_lib" @output_lib@ PARENT_SCOPE) + + endfunction() diff --git a/pkgs/development/compilers/dart/package-source-builders/flutter_discord_rpc/default.nix b/pkgs/development/compilers/dart/package-source-builders/flutter_discord_rpc/default.nix new file mode 100644 index 000000000000..ee3a129a57b3 --- /dev/null +++ b/pkgs/development/compilers/dart/package-source-builders/flutter_discord_rpc/default.nix @@ -0,0 +1,50 @@ +{ + lib, + rustPlatform, + stdenv, + replaceVars, +}: + +{ version, src, ... }: + +let + rustDep = rustPlatform.buildRustPackage { + pname = "flutter_discord_rpc-rs"; + inherit version src; + + buildAndTestSubdir = "rust"; + + useFetchCargoVendor = true; + + cargoHash = + { + _1_0_0 = "sha256-C9WDE9+6V59yNCNVeMUY5lRpMJ+8XWpHpxzdTmz+/Yw="; + } + .${"_" + (lib.replaceStrings [ "." ] [ "_" ] version)} or (throw '' + Unsupported version of pub 'flutter_discord_rpc': '${version}' + Please add cargoHash here. If the cargoHash + is the same with existing versions, add an alias here. + ''); + + passthru.libraryPath = "lib/libflutter_discord_rpc.so"; + }; +in +stdenv.mkDerivation { + pname = "flutter_discord_rpc"; + inherit version src; + inherit (src) passthru; + + patches = [ + (replaceVars ./cargokit.patch { + output_lib = "${rustDep}/${rustDep.passthru.libraryPath}"; + }) + ]; + + installPhase = '' + runHook preInstall + + cp -r . $out + + runHook postInstall + ''; +} From da7074e3496c8770da38fa4deb95f940f2325bb5 Mon Sep 17 00:00:00 2001 From: Matt Wittmann Date: Wed, 5 Feb 2025 11:35:48 -0800 Subject: [PATCH 0271/2168] cudaPackages.cuda_sanitizer_api: add override --- pkgs/development/cuda-modules/cuda/overrides.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/cuda-modules/cuda/overrides.nix b/pkgs/development/cuda-modules/cuda/overrides.nix index 1302fb4f305b..afe37accd7a1 100644 --- a/pkgs/development/cuda-modules/cuda/overrides.nix +++ b/pkgs/development/cuda-modules/cuda/overrides.nix @@ -260,6 +260,8 @@ filterAndCreateOverrides { ]; }; + cuda_sanitizer_api = _: _: { outputs = [ "out" ]; }; + nsight_compute = { lib, From 02d6fd212f2e842989a9787e0e5895c821c5d9e9 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 5 Feb 2025 22:50:20 +0100 Subject: [PATCH 0272/2168] pinball: 0.3.20201218 -> 0.3.20201218-unstable-2024-11-14 Fixes build, and uses modern SDL. Source repo and homepage are updated to GitHub repo linked from the old Sourceforge one. --- pkgs/by-name/pi/pinball/package.nix | 36 ++++++++++++++--------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/pi/pinball/package.nix b/pkgs/by-name/pi/pinball/package.nix index 67f35ab0b1e3..125406ee9f9f 100644 --- a/pkgs/by-name/pi/pinball/package.nix +++ b/pkgs/by-name/pi/pinball/package.nix @@ -1,23 +1,26 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, autoreconfHook, pkg-config, libglvnd, - SDL, - SDL_image, - SDL_mixer, + libtool, + SDL2, + SDL2_image, + SDL2_mixer, xorg, }: stdenv.mkDerivation rec { pname = "pinball"; - version = "0.3.20201218"; + version = "0.3.20201218-unstable-2024-11-14"; - src = fetchurl { - url = "mirror://sourceforge/pinball/pinball-${version}.tar.gz"; - sha256 = "0vacypp3ksq1hs6hxpypx7nrfkprbl4ksfywcncckwrh4qcir631"; + src = fetchFromGitHub { + owner = "adoptware"; + repo = "pinball"; + rev = "7f6887d8912340c0eee7f96b4c4bb84c8d889246"; + hash = "sha256-8wuux7eC0OkgL/m20eyRGRrAF1lBGAbd7Gmid9cNPto="; }; postPatch = '' @@ -30,26 +33,23 @@ stdenv.mkDerivation rec { ]; buildInputs = [ libglvnd - SDL - SDL_image - SDL_mixer + libtool + SDL2 + SDL2_image + SDL2_mixer xorg.libSM ]; strictDeps = true; - configureFlags = [ - "--with-sdl-prefix=${lib.getDev SDL}" - ]; - env.NIX_CFLAGS_COMPILE = toString [ - "-I${lib.getDev SDL_image}/include/SDL" - "-I${lib.getDev SDL_mixer}/include/SDL" + "-I${lib.getDev SDL2_image}/include/SDL2" + "-I${lib.getDev SDL2_mixer}/include/SDL2" ]; enableParallelBuilding = true; meta = with lib; { - homepage = "https://purl.org/rzr/pinball"; + homepage = "https://github.com/adoptware/pinball"; description = "Emilia Pinball simulator"; license = licenses.gpl2Only; maintainers = with maintainers; [ qyliss ]; From 0e36fa56576a01929023c09a757147c00a39a53d Mon Sep 17 00:00:00 2001 From: "Berk D. Demir" Date: Tue, 4 Feb 2025 18:19:12 -0800 Subject: [PATCH 0273/2168] 1password-gui: 8.10.58 -> 8.10.60 No new beta release. --- pkgs/applications/misc/1password-gui/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index 0650b52a708c..d37882b5a348 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -10,25 +10,25 @@ let pname = "1password"; - version = if channel == "stable" then "8.10.58" else "8.10.60-4.BETA"; + version = if channel == "stable" then "8.10.60" else "8.10.60-4.BETA"; sources = { stable = { x86_64-linux = { url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz"; - hash = "sha256-JznF2xG66z8FKwC7Xg3Pe/LLwxw5PqbHBessmxzpyRA="; + hash = "sha256-QCoV66LvGo6vA5fjuE3fG+LwehKVMPmgaDghh9YEvmA="; }; aarch64-linux = { url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz"; - hash = "sha256-q3qb1S30svgrMeOv5okAqH//RUnDuD0RUTdjxDoQFJo="; + hash = "sha256-E5TniXur9ATJ3ER/zTFc6EiBrH/kbNvIao0ADLyBZZE="; }; x86_64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - hash = "sha256-ER+NLSVyYJpxNx4mHgJJE8OWSXSx5WppN2YqMaWuJ7E="; + hash = "sha256-2Nv4CHKLgCFbU1TeJQhIq8YdkJSQJXtUw2S17B8cS4s="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - hash = "sha256-7SczaIcY/bQtTy6ODQh464/14q+VvgnJr7EdhEzevCs="; + hash = "sha256-drJiM8EiUM3M54+KPQdLvAmSfBH5YPqQk14yjHzoBtM="; }; }; beta = { From 042bfa88dc8ccb5e70f6a53c98194c0619490ba1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Feb 2025 02:02:11 +0000 Subject: [PATCH 0274/2168] ledger-live-desktop: 2.96.0 -> 2.98.0 --- pkgs/by-name/le/ledger-live-desktop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/le/ledger-live-desktop/package.nix b/pkgs/by-name/le/ledger-live-desktop/package.nix index 0896ce343a4b..9bf7ffc6a681 100644 --- a/pkgs/by-name/le/ledger-live-desktop/package.nix +++ b/pkgs/by-name/le/ledger-live-desktop/package.nix @@ -8,11 +8,11 @@ let pname = "ledger-live-desktop"; - version = "2.96.0"; + version = "2.98.0"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-3Buab2SDhEEOSQdXCBf7jHlSbgYUe/G1IUSNrcWTbqs="; + hash = "sha256-wYSs7PIj5eA5C/5msbZb+OkcC3Hrhi57yyYrKZ0mvCM="; }; appimageContents = appimageTools.extractType2 { From cdc2b63bdf5f5600dc40fcf34942f10989c35510 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Feb 2025 05:15:17 +0000 Subject: [PATCH 0275/2168] rqlite: 8.36.8 -> 8.36.11 --- pkgs/by-name/rq/rqlite/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/rq/rqlite/package.nix b/pkgs/by-name/rq/rqlite/package.nix index c3f5a37c4819..cf1364581387 100644 --- a/pkgs/by-name/rq/rqlite/package.nix +++ b/pkgs/by-name/rq/rqlite/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "rqlite"; - version = "8.36.8"; + version = "8.36.11"; src = fetchFromGitHub { owner = "rqlite"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fyhBKSPE9vAMe1g7IOjrk8u3+KhMgtVrwKRZA+DsGik="; + sha256 = "sha256-LL2nfRFrfDtttDexLUarFb7AyoLTFf3WeoWm4cqmBtM="; }; - vendorHash = "sha256-+otWcVUAqO2e9v+4T5QTw2DOVfDUGu6hP/1/6LO21nY="; + vendorHash = "sha256-BUZaRSDbzHVzP3A0Q4LnKfzp0lzEJ3x7Vag+7sn4MSM="; subPackages = [ "cmd/rqlite" From b59c65f7b949454a0ff25fdf26c3583f1a57296b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Feb 2025 05:47:19 +0000 Subject: [PATCH 0276/2168] terraform-providers.ibm: 1.73.0 -> 1.75.1 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 6b8fc339e89e..654b19a4b7af 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -642,13 +642,13 @@ "vendorHash": null }, "ibm": { - "hash": "sha256-vji7Qm3qSGnaCJz7+CH6dnvXILClS1WYzw02XQrOjXg=", + "hash": "sha256-Wq8YYVDp+hUa3iZGK2umW89v5itwK1Ig1aHIb4ojXis=", "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm", "owner": "IBM-Cloud", "repo": "terraform-provider-ibm", - "rev": "v1.73.0", + "rev": "v1.75.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-QHteisy2VVE4s9DinmF9p9kQYhAOuKj/fDrF2KRyQRs=" + "vendorHash": "sha256-k1EQbBnpdkC7FdvyRTM8AAhUIAk3hY4CBD9wOVQnMIs=" }, "icinga2": { "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=", From 98eef661cfc6e49a10810f4416990230760b5b40 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Feb 2025 05:48:06 +0000 Subject: [PATCH 0277/2168] cpuinfo: 0-unstable-2025-01-10 -> 0-unstable-2025-02-03 --- pkgs/by-name/cp/cpuinfo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cp/cpuinfo/package.nix b/pkgs/by-name/cp/cpuinfo/package.nix index 357e71fa0379..e0e85e836f8e 100644 --- a/pkgs/by-name/cp/cpuinfo/package.nix +++ b/pkgs/by-name/cp/cpuinfo/package.nix @@ -10,13 +10,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "cpuinfo"; - version = "0-unstable-2025-01-10"; + version = "0-unstable-2025-02-03"; src = fetchFromGitHub { owner = "pytorch"; repo = "cpuinfo"; - rev = "8a1772a0c5c447df2d18edf33ec4603a8c9c04a6"; - hash = "sha256-dKmZ5YXLhvVdxaJ4PefR+SWlh+MTFHNxOMeM6Vj7Gvo="; + rev = "aaac07ee499895770c89163ce0920ef8bb41ed23"; + hash = "sha256-A86nAbKs7trVwwa1HFUNbV//6O1minvlHTpZR3vabrU="; }; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; From 08f420f6f0f1ccb78524707903e30d5a58a0dc1f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Feb 2025 07:02:45 +0000 Subject: [PATCH 0278/2168] vivaldi: 7.1.3570.39 -> 7.1.3570.47 --- pkgs/applications/networking/browsers/vivaldi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 171b67b75de9..834463e69a91 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -24,7 +24,7 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "7.1.3570.39"; + version = "7.1.3570.47"; suffix = { aarch64-linux = "arm64"; @@ -34,8 +34,8 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb"; hash = { - aarch64-linux = "sha256-rhIz+vX/W39sN/j37nhaq+iEbIc/rfgMprqmX+DM2D8="; - x86_64-linux = "sha256-d6NQRueNE9P2/IOLwBIm4evrqO0D+RNKUUC156PEgcc="; + aarch64-linux = "sha256-wpx4IonQNTY4KmzP2uP8XDTupQNeZm808JOfS2aeXBY="; + x86_64-linux = "sha256-alUT0cMl2gKFDNE+DW8SS2ith4J3baCXu5m4vEYGNrw="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; From 87c3183a76c69091be8d119c14f521dc6b252ef9 Mon Sep 17 00:00:00 2001 From: "Samuel Hierholzer (Adfinis AG)" Date: Thu, 6 Feb 2025 08:28:16 +0100 Subject: [PATCH 0279/2168] lbdbq: 0.48.1 -> 0.56 --- pkgs/by-name/lb/lbdb/package.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/lb/lbdb/package.nix b/pkgs/by-name/lb/lbdb/package.nix index c0cdd532a25f..2fafe782da50 100644 --- a/pkgs/by-name/lb/lbdb/package.nix +++ b/pkgs/by-name/lb/lbdb/package.nix @@ -29,11 +29,11 @@ let in stdenv.mkDerivation rec { pname = "lbdb"; - version = "0.48.1"; + version = "0.56"; src = fetchurl { - url = "https://www.spinnaker.de/lbdb/download/lbdb_${version}.tar.gz"; - sha256 = "1gr5l2fr9qbdccga8bhsrpvz6jxigvfkdxrln9wyf2xpps5cdjxh"; + url = "https://www.spinnaker.de/lbdb/download/lbdb-${version}.tar.gz"; + sha256 = "sha256-uqaiO2E5TXkreyIeGWHZulcQYUyTJOj1mzXBJsK0504="; }; buildInputs = @@ -55,12 +55,6 @@ stdenv.mkDerivation rec { patches = [ ./add-methods-to-rc.patch - # fix undefined exec_prefix. Remove with the next release - (fetchpatch { - url = "https://github.com/RolandRosenfeld/lbdb/commit/60b7bae255011f59212d96adfbded459d6a27129.patch"; - sha256 = "129zg086glmlalrg395jq8ljcp787dl3rxjf9v7apsd8mqfdkl2v"; - excludes = [ "debian/changelog" ]; - }) ]; meta = with lib; { From 285e69b42fbf6b72185573839d03182a7f5216af Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Thu, 6 Feb 2025 08:31:02 +0100 Subject: [PATCH 0280/2168] go_1_24: rc2 -> rc3 Signed-off-by: Paul Meyer --- pkgs/development/compilers/go/1.24.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.24.nix b/pkgs/development/compilers/go/1.24.nix index b0f264771224..9daecc98a7aa 100644 --- a/pkgs/development/compilers/go/1.24.nix +++ b/pkgs/development/compilers/go/1.24.nix @@ -49,11 +49,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.24rc2"; + version = "1.24rc3"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-uge2hj8ggWDo8J8RyLlYJym1HP63Us5rp5o3m0+8rG0="; + hash = "sha256-LHEopY9iz9706vaOe5vxh/P/6i7AZ1SmTW7ja/6j1pE="; }; strictDeps = true; From 65cb8867f8b380bd7443cf1ba0520bbf9809fc60 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Thu, 6 Feb 2025 08:39:39 +0100 Subject: [PATCH 0281/2168] go: update 1.22 bootstrap to 1.22.12 Signed-off-by: Paul Meyer --- .../development/compilers/go/bootstrap122.nix | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/pkgs/development/compilers/go/bootstrap122.nix b/pkgs/development/compilers/go/bootstrap122.nix index bed8c1c42197..ddd2632282d0 100644 --- a/pkgs/development/compilers/go/bootstrap122.nix +++ b/pkgs/development/compilers/go/bootstrap122.nix @@ -1,27 +1,27 @@ { callPackage }: callPackage ./binary.nix { - version = "1.22.11"; + version = "1.22.12"; hashes = { # Use `print-hashes.sh ${version}` to generate the list below - darwin-amd64 = "c6d130066d509ccca1164d84514905b1e8dc5f5f4c25c24113f1b65ad87cd020"; - darwin-arm64 = "3980b1d2be042a164989f2fd24f0bb306a2397d581a29c7426885578b369db5d"; - freebsd-386 = "ab10063b2620de387b74bc2eeadc2642a960b1c97c3fc8193447977954262241"; - freebsd-amd64 = "7910de647cab36eea010da64c07c31484a2c94e0447a0d81f339415de0def2a4"; - freebsd-arm64 = "9b5043744bd56d36d66ed193776952dd5ebdef31302d6b209e9e87f3b3936e85"; - freebsd-armv6l = "31cebf4d5280db96dc742fb71301eae5ca4ada5b48b76fb339a03bf857288eeb"; - freebsd-riscv64 = "b8196ed8ee94eb4c3bbbd4147af9362ffc6b77511dabaf9beb60ac072cf00ead"; - linux-386 = "b40ee463437e8c8f2d6c9685a0e166eaecb36615afa362eaa58459d3369f3baf"; - linux-amd64 = "0fc88d966d33896384fbde56e9a8d80a305dc17a9f48f1832e061724b1719991"; - linux-arm64 = "9ebfcab26801fa4cf0627c6439db7a4da4d3c6766142a3dd83508240e4f21031"; - linux-armv6l = "ac3ba3e0433d96b041f683e9bbb791ca39e159b3d4bb948de4ab3a2c1af1b257"; - linux-loong64 = "83ced97550e9afc82a48d98534a2457c9662a9071a35439558a70167c8cd513b"; - linux-mips = "e8c507c5516328e61e7af442f4901f3481859679284eff20198b4180f98fdfd9"; - linux-mips64 = "22ad73f1762a3129b96f398f4c65fe8a63f5e5657d4bc7f14e153728777ab323"; - linux-mips64le = "d4ad600a7c6b3c113984b1c301afec67a696a598b0f0ed2841a52c3b9051cd2d"; - linux-mipsle = "5ebd447b07f33b57e264c80a8229e5c7e09bbc3203efdd72568e7e3267538479"; - linux-ppc64 = "d3b8cda5a35d9ae670096d88cb8763424d1ac1c720521564eef8dc0dd68c2bc2"; - linux-ppc64le = "963a0ec973640b23ee8bb7a462cc415276fd8436111a03df8c34eb3b1ae29f12"; - linux-riscv64 = "150fd528397622764285f807d3343c36d052ed8cfc390a95e6336738c53f68f4"; - linux-s390x = "1a235afe650dee989fb37fef6aa520f35e4cd557c31453f3e82b553da3a90669"; + darwin-amd64 = "e7bbe07e96f0bd3df04225090fe1e7852ed33af37c43a23e16edbbb3b90a5b7c"; + darwin-arm64 = "416c35218edb9d20990b5d8fc87be655d8b39926f15524ea35c66ee70273050d"; + freebsd-386 = "85b00f8646e84be6ce51c753d22b68a5f4d5bbfc6a82c8ca9e7489c0c5a619d8"; + freebsd-amd64 = "a8c77e76859db3e6f3322cbe11deea5faf779e374f45df7554d2cb484ffa492a"; + freebsd-arm64 = "f56d3b2d26acd9e720f8be503d92bb7bb5d921462ff7c92463d0fa550507ed93"; + freebsd-armv6l = "dac691ce62ac6b9c78f45a0058d7656abedbe5665b3d49910cbd6ba12e20c2fb"; + freebsd-riscv64 = "d147c0c8faaffed65240f3b4fe5e44e573928827b9292fb873c9712d567fa986"; + linux-386 = "40d4c297bc2e964e9c96fe79bb323dce79b77b8b103fc7cc52e0a87c7849890f"; + linux-amd64 = "4fa4f869b0f7fc6bb1eb2660e74657fbf04cdd290b5aef905585c86051b34d43"; + linux-arm64 = "fd017e647ec28525e86ae8203236e0653242722a7436929b1f775744e26278e7"; + linux-armv6l = "bcd678461bb74cda217fb5aa3cc914b2021be6d828f0c6fb4e3a36c3d7312acb"; + linux-loong64 = "ef1644676782354369210ed6cd839ff872de886c38f287d29ac69377928edec1"; + linux-mips = "993c685dad0a59f9f15f76a2eb9146f741ef36d808f38985bc6748b38000746d"; + linux-mips64 = "d8aa3dea17e0175d6a57dfdf9b3b29a911ebe8c5ddbefd808eab61a842c00229"; + linux-mips64le = "2d473895f9c1dc8c86d51eb13f8ca49b7eea46010759fd71efed3eecacf5335b"; + linux-mipsle = "d4ba5f6215643a1d64dc159869663f71dd339598e99678e97e1c5300bb46d46d"; + linux-ppc64 = "ab0b6dc2aa1096f256224398d4a34eac5257289146cdc2f3a62b9fc17709a3c5"; + linux-ppc64le = "9573d30003b0796717a99d9e2e96c48fddd4fc0f29d840f212c503b03d7de112"; + linux-riscv64 = "f03a084aabc812fdc15b29acd5e1ee18e13b3c80be22aec43990119afcaf4947"; + linux-s390x = "e1b20935cc790fdc4c48c0e3e6dd11be57ac09e4eb302ba2cdf146276468b346"; }; } From 6adcba9704a299587128fa05a6e11e8db6b445fa Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman <145775305+xokdvium@users.noreply.github.com> Date: Thu, 6 Feb 2025 10:53:22 +0300 Subject: [PATCH 0282/2168] mbuffer: fix and enable strictDeps `openssl` is also a native check dependency. This doesn't affect cross, but only native strictDeps builds. --- pkgs/by-name/mb/mbuffer/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/mb/mbuffer/package.nix b/pkgs/by-name/mb/mbuffer/package.nix index 25b5f00be30f..d20292c5269c 100644 --- a/pkgs/by-name/mb/mbuffer/package.nix +++ b/pkgs/by-name/mb/mbuffer/package.nix @@ -25,8 +25,12 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ which ]; + nativeCheckInputs = [ + openssl + ]; doCheck = true; + strictDeps = true; meta = { description = "Tool for buffering data streams with a large set of unique features"; From 1cd039866ff4728d85430ba66af60ba790a4789b Mon Sep 17 00:00:00 2001 From: Konrad Malik Date: Thu, 6 Feb 2025 08:34:33 +0100 Subject: [PATCH 0283/2168] roslyn-ls: 4.14.0-1.25060.2 -> 4.14.0-1.25074.7 --- pkgs/by-name/ro/roslyn-ls/deps.json | 12 ++++++------ pkgs/by-name/ro/roslyn-ls/force-sdk_8_0.patch | 9 +++++---- pkgs/by-name/ro/roslyn-ls/package.nix | 6 +++--- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/ro/roslyn-ls/deps.json b/pkgs/by-name/ro/roslyn-ls/deps.json index 891fda20b2a4..88becefb21b4 100644 --- a/pkgs/by-name/ro/roslyn-ls/deps.json +++ b/pkgs/by-name/ro/roslyn-ls/deps.json @@ -43,9 +43,9 @@ }, { "pname": "Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace", - "version": "9.0.0-preview.24555.12", - "hash": "sha256-SMOU22F2xZkFM6KRRETeRR79BuVccALMGH+zcgyqq4M=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.aspnetcore.razor.externalaccess.roslynworkspace/9.0.0-preview.24555.12/microsoft.aspnetcore.razor.externalaccess.roslynworkspace.9.0.0-preview.24555.12.nupkg" + "version": "9.0.0-preview.25064.4", + "hash": "sha256-w6gQZ702lMi2lI/9hIKbeaxW4K42YlDkDnGiD5+cgFo=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.aspnetcore.razor.externalaccess.roslynworkspace/9.0.0-preview.25064.4/microsoft.aspnetcore.razor.externalaccess.roslynworkspace.9.0.0-preview.25064.4.nupkg" }, { "pname": "Microsoft.Bcl.AsyncInterfaces", @@ -193,9 +193,9 @@ }, { "pname": "Microsoft.DotNet.Arcade.Sdk", - "version": "9.0.0-beta.24572.2", - "hash": "sha256-dTYFN1KH3grxcf/On6GLW5WdFliq91Y37DeWDCwiryM=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/9.0.0-beta.24572.2/microsoft.dotnet.arcade.sdk.9.0.0-beta.24572.2.nupkg" + "version": "9.0.0-beta.25065.2", + "hash": "sha256-8LCKwRGoa0plL1IzZzPR8prayboN7gulS4EC6HWL+5E=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/9.0.0-beta.25065.2/microsoft.dotnet.arcade.sdk.9.0.0-beta.25065.2.nupkg" }, { "pname": "Microsoft.DotNet.XliffTasks", diff --git a/pkgs/by-name/ro/roslyn-ls/force-sdk_8_0.patch b/pkgs/by-name/ro/roslyn-ls/force-sdk_8_0.patch index 21b12177e3d4..a5f75d015089 100644 --- a/pkgs/by-name/ro/roslyn-ls/force-sdk_8_0.patch +++ b/pkgs/by-name/ro/roslyn-ls/force-sdk_8_0.patch @@ -1,5 +1,5 @@ diff --git a/eng/targets/TargetFrameworks.props b/eng/targets/TargetFrameworks.props -index 2dddaff1560..bc8fd1938d5 100644 +index 58f90114f4d..8eb23c25067 100644 --- a/eng/targets/TargetFrameworks.props +++ b/eng/targets/TargetFrameworks.props @@ -17,7 +17,7 @@ @@ -11,10 +11,10 @@ index 2dddaff1560..bc8fd1938d5 100644 net9.0 -diff --git a/src/Workspaces/Core/MSBuild.BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj b/src/Workspaces/Core/MSBuild.BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj +diff --git a/src/Workspaces/MSBuild/BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj b/src/Workspaces/MSBuild/BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj index 8101f56b8be..1733955dc3d 100644 ---- a/src/Workspaces/Core/MSBuild.BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj -+++ b/src/Workspaces/Core/MSBuild.BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj +--- a/src/Workspaces/MSBuild/BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj ++++ b/src/Workspaces/MSBuild/BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj @@ -28,6 +28,12 @@ --> <_MsbuildVersion>17.3.4 @@ -43,3 +43,4 @@ index 8101f56b8be..1733955dc3d 100644 + diff --git a/pkgs/by-name/ro/roslyn-ls/package.nix b/pkgs/by-name/ro/roslyn-ls/package.nix index 689b7002afe0..c690ac2f465e 100644 --- a/pkgs/by-name/ro/roslyn-ls/package.nix +++ b/pkgs/by-name/ro/roslyn-ls/package.nix @@ -32,18 +32,18 @@ in buildDotnetModule rec { inherit pname dotnet-sdk dotnet-runtime; - vsVersion = "2.62.18"; + vsVersion = "2.64.7"; src = fetchFromGitHub { owner = "dotnet"; repo = "roslyn"; rev = "VSCode-CSharp-${vsVersion}"; - hash = "sha256-oy1xYM6Kd/8uAQQdvsxLNkycs9OOs7SEe+dzYc4RMeM="; + hash = "sha256-HWcVb2vpZxZWSxvWYRc91iUNaNGYDGEgKzHtD3yoyXs="; }; # versioned independently from vscode-csharp # "roslyn" in here: # https://github.com/dotnet/vscode-csharp/blob/main/package.json - version = "4.14.0-1.25060.2"; + version = "4.14.0-1.25074.7"; projectFile = "src/LanguageServer/${project}/${project}.csproj"; useDotnetFromEnv = true; nugetDeps = ./deps.json; From 1c699b8921e759f147668ad10be3e436ab9e4032 Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Thu, 6 Feb 2025 09:57:05 +0100 Subject: [PATCH 0284/2168] shark: fix build with boost187 --- pkgs/by-name/sh/shark/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/sh/shark/package.nix b/pkgs/by-name/sh/shark/package.nix index 1bd6a9ab94c3..4219153a78ab 100644 --- a/pkgs/by-name/sh/shark/package.nix +++ b/pkgs/by-name/sh/shark/package.nix @@ -23,6 +23,11 @@ stdenv.mkDerivation (finalAttrs: { # c.f https://github.com/Shark-ML/Shark/commit/221c1f2e8abfffadbf3c5ef7cf324bc6dc9b4315 patches = [ ./shark-2-ext-num-literals-all.diff ]; + # Remove explicitly setting C++11, because boost::math headers need C++14 since Boost187. + postPatch = '' + sed -i '/CXX_STANDARD/d' src/CMakeLists.txt + ''; + # https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/-/blob/develop/SuperBuild/CMake/External_shark.cmake?ref_type=heads cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" From 8e5a2b1af2fcb4e2e06b49d4b81cf3f3136b4ee9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Feb 2025 09:24:41 +0000 Subject: [PATCH 0285/2168] git-machete: 3.31.1 -> 3.32.1 --- pkgs/applications/version-management/git-machete/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-machete/default.nix b/pkgs/applications/version-management/git-machete/default.nix index 46802d5157ea..0612b06e9aef 100644 --- a/pkgs/applications/version-management/git-machete/default.nix +++ b/pkgs/applications/version-management/git-machete/default.nix @@ -11,13 +11,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.31.1"; + version = "3.32.1"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - hash = "sha256-OirzHEAHDiImgQoniBNaTjUgNm0I2azaPhjEnAavbNg="; + hash = "sha256-G62KCL0l1WTJoSXfJoQd1HXWleKPC8OjX39AD9NOgV0="; }; nativeBuildInputs = [ installShellFiles ]; From 079c000971e0463a5f17ddb4fc3b465cfba56d50 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Feb 2025 10:33:48 +0000 Subject: [PATCH 0286/2168] zabbix-agent2-plugin-postgresql: 7.0.6 -> 7.2.3 --- pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix b/pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix index 10fc8297d435..43addb523a2f 100644 --- a/pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix +++ b/pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix @@ -6,11 +6,11 @@ buildGoModule rec { pname = "zabbix-agent2-plugin-postgresql"; - version = "7.0.6"; + version = "7.2.3"; src = fetchurl { url = "https://cdn.zabbix.com/zabbix-agent2-plugins/sources/postgresql/zabbix-agent2-plugin-postgresql-${version}.tar.gz"; - hash = "sha256-35w2KIiECaVBUw5PGXyc9T6l1ATMeAntOf+KrxK7PaY="; + hash = "sha256-TtcEY/X8FXFcI3cghGRnLiCDj0fUwspXf90G/h22M9s="; }; vendorHash = null; From 01661f9a6b5be25311609b2a950186e93709c894 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Tue, 31 Dec 2024 16:03:44 +0100 Subject: [PATCH 0287/2168] glances: 4.2.1 -> 4.3.0.6 fixes #361545 closes #368794 Changelog: https://github.com/nicolargo/glances/blob/v4.3.0.6/NEWS.rst Signed-off-by: Florian Brandes --- pkgs/applications/system/glances/default.nix | 37 ++++++++++++-------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix index 3085d9920bf9..6e5696ea4dc0 100644 --- a/pkgs/applications/system/glances/default.nix +++ b/pkgs/applications/system/glances/default.nix @@ -3,19 +3,23 @@ buildPythonApplication, fetchFromGitHub, isPyPy, + pythonOlder, lib, defusedxml, packaging, psutil, setuptools, - pydantic, nixosTests, + pytestCheckHook, + which, + podman, + selenium, # Optional dependencies: fastapi, jinja2, pysnmp, hddtemp, - netifaces, # IP module + netifaces2, # IP module uvicorn, requests, prometheus-client, @@ -23,16 +27,16 @@ buildPythonApplication rec { pname = "glances"; - version = "4.2.1"; + version = "4.3.0.6"; pyproject = true; - disabled = isPyPy; + disabled = isPyPy || pythonOlder "3.9"; src = fetchFromGitHub { owner = "nicolargo"; repo = "glances"; tag = "v${version}"; - hash = "sha256-8Jm6DE3B7OQkaNwX/KwXMNZHUyvPtln8mJYaD6yzJRM="; + hash = "sha256-r4wDuV7WS3BQ5hidp2x6JqvHQLf6FchoHisMMEye1PM="; }; build-system = [ setuptools ]; @@ -50,17 +54,9 @@ buildPythonApplication rec { # some tests fail in darwin sandbox doCheck = !stdenv.hostPlatform.isDarwin; - checkPhase = '' - runHook preCheck - - python unittest-core.py - - runHook postCheck - ''; - dependencies = [ defusedxml - netifaces + netifaces2 packaging psutil pysnmp @@ -68,6 +64,7 @@ buildPythonApplication rec { uvicorn requests jinja2 + which prometheus-client ] ++ lib.optional stdenv.hostPlatform.isLinux hddtemp; @@ -75,6 +72,18 @@ buildPythonApplication rec { service = nixosTests.glances; }; + nativeCheckInputs = [ + which + pytestCheckHook + selenium + podman + ]; + + disabledTestPaths = [ + # Message: Unable to obtain driver for chrome + "tests/test_webui.py" + ]; + meta = { homepage = "https://nicolargo.github.io/glances/"; description = "Cross-platform curses-based monitoring tool"; From 13d80f9a1d1cb20146a2718bc21f61f9a5de627d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Feb 2025 11:47:18 +0000 Subject: [PATCH 0288/2168] nim-unwrapped: 2.2.0 -> 2.2.2 --- pkgs/by-name/ni/nim-unwrapped-2_2/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ni/nim-unwrapped-2_2/package.nix b/pkgs/by-name/ni/nim-unwrapped-2_2/package.nix index 41307f320271..0ecdbe92b511 100644 --- a/pkgs/by-name/ni/nim-unwrapped-2_2/package.nix +++ b/pkgs/by-name/ni/nim-unwrapped-2_2/package.nix @@ -85,12 +85,12 @@ in stdenv.mkDerivation (finalAttrs: { pname = "nim-unwrapped"; - version = "2.2.0"; + version = "2.2.2"; strictDeps = true; src = fetchurl { url = "https://nim-lang.org/download/nim-${finalAttrs.version}.tar.xz"; - hash = "sha256-zphChJyXYOSH7N0c2t98DyhEyvrmBUAcfHKuJXZEiTw="; + hash = "sha256-f8ybh6ycC6Wkif3Cbi2EgM6Wo8piIQDWJn75ITX9ih8="; }; buildInputs = [ From 238bc88476ac11fe14fee424abce25aa0ab95439 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Feb 2025 11:52:17 +0000 Subject: [PATCH 0289/2168] copycat: 002 -> 003 --- pkgs/by-name/co/copycat/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/copycat/package.nix b/pkgs/by-name/co/copycat/package.nix index 2e69ec74adfe..7a008e67f448 100644 --- a/pkgs/by-name/co/copycat/package.nix +++ b/pkgs/by-name/co/copycat/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "ccat"; - version = "002"; + version = "003"; src = fetchFromGitHub { owner = "DeeKahy"; repo = "CopyCat"; tag = version; - hash = "sha256-0pqC6fxuvqOPuO10Em63tFguc3VJNnniPCHM6TcFDN0="; + hash = "sha256-BNXWubJ6eRnuK7+0kE9yHQzjJci5miTSG3dwWE2XDwc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-unZB49VOCNnvKhRyry682JaYYzaUTr0qvJZtcFlh4J8="; + cargoHash = "sha256-2SI4h5RqzWKWnRmQ2t/eDAOK1ql7jlZKIgPlSiiB6Dg="; buildInputs = lib.optionals (stdenv.hostPlatform.isDarwin) [ darwin.apple_sdk_11_0.frameworks.AppKit From 37d08685e8d27542b32edb4a72433e66a41f65cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Wed, 5 Feb 2025 22:50:36 -0500 Subject: [PATCH 0290/2168] nixos/version: validate system.stateVersion --- .../manual/release-notes/rl-2505.section.md | 2 ++ nixos/modules/misc/version.nix | 22 +++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 3c166bab99be..6d8cc3723bce 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -437,6 +437,8 @@ - Overriding Wayland compositor is possible using `enableWaylandSession` option, but you might need to take care [`xfce4-session`](https://gitlab.xfce.org/xfce/xfce4-session/-/merge_requests/49), [`dbus-update-activation-environment`](https://github.com/labwc/labwc/blob/eaf11face68ee1f1bcc7ce1498304ca8c108c8ba/src/config/session.c#L234) and [`systemctl --user import-environment`](https://github.com/labwc/labwc/blob/eaf11face68ee1f1bcc7ce1498304ca8c108c8ba/src/config/session.c#L239) on startup. - For new Xfce installations, default panel layout has [changed](https://gitlab.xfce.org/xfce/xfce4-panel/-/merge_requests/158/diffs) to not include external panel plugins by default. You can still add them yourself using the "Panel Preferences" dialog. +- [`system.stateVersion`](#opt-system.stateVersion) is now validated and must be in the `"YY.MM"` format, ideally corresponding to a prior NixOS release. + - GOverlay has been updated to 1.2, please check the [upstream changelog](https://github.com/benjamimgois/goverlay/releases) for more details. - [`services.mongodb`](#opt-services.mongodb.enable) is now compatible with the `mongodb-ce` binary package. To make use of it, set [`services.mongodb.package`](#opt-services.mongodb.package) to `pkgs.mongodb-ce`. diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index b1a58be8ef4c..5610afc8168d 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -16,6 +16,7 @@ let toLower optionalString literalExpression + match mkRenamedOptionModule mkDefault mkOption @@ -263,6 +264,27 @@ in config = { + assertions = [ + { + assertion = match "[0-9]{2}\\.[0-9]{2}" config.system.stateVersion != null; + message = '' + ${config.system.stateVersion} is an invalid value for 'system.stateVersion'; it must be in the format "YY.MM", + which corresponds to a prior release of NixOS. + + If you want to switch releases or switch to unstable, you should change your channel and/or flake input URLs only. + *DO NOT* touch the 'system.stateVersion' option, as it will not help you upgrade. + Leave it exactly on the previous value, which is likely the value you had for it when you installed your system. + + If you're unsure which value to set it to, use "${ + if match "[0-9]{2}\\.[0-9]{2}" options.system.stateVersion.default != null then + options.system.stateVersion.default + else + options.system.nixos.release.default + }" as a default. + ''; + } + ]; + system.nixos = { # These defaults are set here rather than up there so that # changing them would not rebuild the manual From 0e6cdb567e6ba8b1c0acae966569dccab32399be Mon Sep 17 00:00:00 2001 From: merrkry Date: Tue, 4 Feb 2025 09:30:41 +0100 Subject: [PATCH 0291/2168] tsukimi: 0.19.0 -> 0.19.3 --- pkgs/by-name/ts/tsukimi/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ts/tsukimi/package.nix b/pkgs/by-name/ts/tsukimi/package.nix index 659b4db92742..633a790ed00f 100644 --- a/pkgs/by-name/ts/tsukimi/package.nix +++ b/pkgs/by-name/ts/tsukimi/package.nix @@ -10,23 +10,22 @@ openssl, libepoxy, wrapGAppsHook4, - stdenv, nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "tsukimi"; - version = "0.19.0"; + version = "0.19.3"; src = fetchFromGitHub { owner = "tsukinaha"; repo = "tsukimi"; tag = "v${version}"; - hash = "sha256-5hOOIkH0VhZwlsNKAyOI714ueGcSMagoLGi5ECfqXk4="; + hash = "sha256-MNPg3qg9wRRWKofH4NSRIa76+nA3IFoMfOt6s5+4y8A="; fetchSubmodules = true; }; useFetchCargoVendor = true; - cargoHash = "sha256-rgTrPJydS4685BlSEwNvmEajZEksqQicscOq/Uu9JJ4="; + cargoHash = "sha256-mS5qKEm3oCHiFP5i/XHnIOBmXzvlgfE2i/f0lLl4TN4="; nativeBuildInputs = [ pkg-config From a179629c24919e364111d3703c80152d8be1aee1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Feb 2025 12:30:33 +0000 Subject: [PATCH 0292/2168] aws-iam-authenticator: 0.6.29 -> 0.6.30 --- pkgs/by-name/aw/aws-iam-authenticator/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/aw/aws-iam-authenticator/package.nix b/pkgs/by-name/aw/aws-iam-authenticator/package.nix index d4ea9e617e65..24e83364591f 100644 --- a/pkgs/by-name/aw/aws-iam-authenticator/package.nix +++ b/pkgs/by-name/aw/aws-iam-authenticator/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "aws-iam-authenticator"; - version = "0.6.29"; + version = "0.6.30"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; tag = "v${version}"; - hash = "sha256-xjHwnzh22cGv1Q2civdgLz9sFoV5p3exyG8P26u4hi0="; + hash = "sha256-pgAk2qhsJTXbaXtdmKkA5GUIJt2ShWJ1mG6h0Zuh+Ng="; }; - vendorHash = "sha256-TcEpIyBSXiKZxiVMWJycRLfNL6oogRo98yoza093AtQ="; + vendorHash = "sha256-dR98s5g2KFGJIFbgYHmW2813GEhLFZZvV5nja84a0Ik="; ldflags = let From 6b96b20e385c0dd9065e29cd9f35f02f4b6e0fb6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Feb 2025 13:17:16 +0000 Subject: [PATCH 0293/2168] ansel: 0-unstable-2025-01-12 -> 0-unstable-2025-02-06 --- pkgs/by-name/an/ansel/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/an/ansel/package.nix b/pkgs/by-name/an/ansel/package.nix index fbc8c8046f6b..14858b7fa404 100644 --- a/pkgs/by-name/an/ansel/package.nix +++ b/pkgs/by-name/an/ansel/package.nix @@ -78,13 +78,13 @@ let in stdenv.mkDerivation { pname = "ansel"; - version = "0-unstable-2025-01-12"; + version = "0-unstable-2025-02-06"; src = fetchFromGitHub { owner = "aurelienpierreeng"; repo = "ansel"; - rev = "c15d92ab7236e61454aaf8e8591777adfa3a73f7"; - hash = "sha256-FVb4xoHIs+DJG6Lw6Qf755Tjt0Sg9i+Hp979/GgD3IQ="; + rev = "701595ea91c366572c1ebefdd0464c94bd588d99"; + hash = "sha256-139YRDTuw4JGM1+EkWuskojNQzRvPequTl/LcUM+AW4="; fetchSubmodules = true; }; From 278f6f9b59dfcd472ed1a563e185f51ffc60d8c0 Mon Sep 17 00:00:00 2001 From: Honnip Date: Thu, 6 Feb 2025 14:47:03 +0900 Subject: [PATCH 0294/2168] papers: 47.0 -> 47.3 https://gitlab.gnome.org/GNOME/Incubator/papers/-/compare/47.0...47.3 --- pkgs/by-name/pa/papers/package.nix | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/pa/papers/package.nix b/pkgs/by-name/pa/papers/package.nix index aa877d8d8d5e..dfd126181208 100644 --- a/pkgs/by-name/pa/papers/package.nix +++ b/pkgs/by-name/pa/papers/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - fetchpatch, meson, ninja, pkg-config, @@ -35,12 +34,11 @@ exempi, cargo, rustPlatform, - rustfmt, }: stdenv.mkDerivation (finalAttrs: { pname = "papers"; - version = "47.0"; + version = "47.3"; outputs = [ "out" @@ -50,18 +48,9 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/papers/${lib.versions.major finalAttrs.version}/papers-${finalAttrs.version}.tar.xz"; - hash = "sha256-z2nrCjcX/jVAEWFuL2Ajg4FP9Xt6nqzzBsZ25k2PZmY="; + hash = "sha256-PlhTk+gef6D5r55U38hvYSa1w9hS6pDf3DumsHlSxKo="; }; - # FIXME: remove in next version - patches = [ - (fetchpatch { - name = "fix-crash-when-drag-and-drop"; - url = "https://gitlab.gnome.org/GNOME/Incubator/papers/-/commit/455ad2aebe5e5d5a57a2f4defc6af054927eac73.patch"; - hash = "sha256-PeWlFhvM8UzUFRaK9k/9Txwgta/EiFnMRjHwld3O+cU="; - }) - ]; - cargoRoot = "shell-rs"; cargoDeps = rustPlatform.fetchCargoVendor { @@ -87,9 +76,6 @@ stdenv.mkDerivation (finalAttrs: { yelp-tools cargo rustPlatform.cargoSetupHook - # FIXME: remove rustfmt in next version - # https://gitlab.gnome.org/GNOME/Incubator/papers/-/commit/d0093c8c9cbacfbdafd70b6024982638b30a2591 - rustfmt ]; buildInputs = @@ -130,10 +116,6 @@ stdenv.mkDerivation (finalAttrs: { "-Dnautilus=false" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString ( - stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "16" - ) "-Wno-error=incompatible-function-pointer-types"; - postInstall = '' substituteInPlace $out/share/thumbnailers/papers.thumbnailer \ --replace-fail '=papers-thumbnailer' "=$out/bin/papers-thumbnailer" From 3d86ed3ac6cf3d421d10522b77f09eb702515118 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Thu, 6 Feb 2025 15:37:30 +0100 Subject: [PATCH 0295/2168] certificate-ripper: 2.3.0 -> 2.4.0 --- .../by-name/ce/certificate-ripper/package.nix | 29 ++++++++++++------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ce/certificate-ripper/package.nix b/pkgs/by-name/ce/certificate-ripper/package.nix index ea76132ab5b7..00b2bcfb7675 100644 --- a/pkgs/by-name/ce/certificate-ripper/package.nix +++ b/pkgs/by-name/ce/certificate-ripper/package.nix @@ -7,7 +7,7 @@ let pname = "certificate-ripper"; - version = "2.3.0"; + version = "2.4.0"; jar = maven.buildMavenPackage { pname = "${pname}-jar"; @@ -16,8 +16,8 @@ let src = fetchFromGitHub { owner = "Hakky54"; repo = "certificate-ripper"; - rev = version; - hash = "sha256-q/UhKLFAre3YUH2W7e+SH4kRM0GIZAUyNJFDm02eL+8="; + tag = version; + hash = "sha256-2EXALTGeGkHne335B1R42VrA5vMCMkFF5FBatAfO9Tc="; }; patches = [ @@ -25,12 +25,22 @@ let ./fix-test-temp-dir-path.patch ]; - mvnHash = "sha256-/iy7DXBAyq8TIpvrd2WAQh+9OApfxCWo1NoGwbzbq7s="; + mvnHash = "sha256-Nv/V2+QPSPMxkDcUh6gJrI6aSi+9O+brxpOZg/JPGxI="; - mvnParameters = lib.escapeShellArgs [ - "-Dproject.build.outputTimestamp=1980-01-01T00:00:02Z" # make timestamp deterministic - "-Dtest=!PemExportCommandShould#resolveRootCaOnlyWhenEnabled" # disable test using network - ]; + mvnParameters = + let + disabledTests = [ + "PemExportCommandShould#resolveRootCaOnlyWhenEnabled" # uses network + "DerExportCommandShould#processSystemTrustedCertificates" + "JksExportCommandShould#processSystemTrustedCertificates" + "PemExportCommandShould#processSystemTrustedCertificates" + "Pkcs12ExportCommandShould#processSystemTrustedCertificates" + ]; + in + lib.escapeShellArgs [ + "-Dproject.build.outputTimestamp=1980-01-01T00:00:02Z" # make timestamp deterministic + "-Dtest=${lib.concatMapStringsSep "," (t: "!" + t) disabledTests}" + ]; installPhase = '' install -Dm644 target/crip.jar $out @@ -47,13 +57,12 @@ buildGraalvmNativeImage { # Copied from pom.xml extraNativeImageBuildArgs = [ "--no-fallback" - "-H:ReflectionConfigurationResources=graalvm_config.json" "-H:EnableURLProtocols=https" "-H:EnableURLProtocols=http" ]; meta = { - changelog = "https://github.com/Hakky54/certificate-ripper/releases/tag/${version}"; + changelog = "https://github.com/Hakky54/certificate-ripper/releases/tag/${jar.src.tag}"; description = "CLI tool to extract server certificates"; homepage = "https://github.com/Hakky54/certificate-ripper"; license = lib.licenses.asl20; From f05513f3af282cdbb7c79fbce78dfcd6a1b2334e Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Tue, 12 Nov 2024 09:22:26 -0500 Subject: [PATCH 0296/2168] nixos/xonsh: support extra packages --- .../manual/release-notes/rl-2505.section.md | 2 ++ nixos/modules/programs/xonsh.nix | 21 ++++++++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index d5549ef98bee..b72db6032de2 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -348,6 +348,8 @@ - `borgmatic` has been updated from 1.8.14 to 1.9.5, please check the [upstream changelog](https://projects.torsion.org/borgmatic-collective/borgmatic/releases) for more details, especially for a few possibly breaking changes noted in the [1.9.0 changelog](https://projects.torsion.org/borgmatic-collective/borgmatic/releases/tag/1.9.0). +- `programs.xonsh.package` now gets overrided internally with `extraPackages` to support `programs.xonsh.extraPackages`. See `programs.xonsh.extraPackages` for more details. + - `nodePackages.ganache` has been removed, as the package has been deprecated by upstream. - `virtualisation.azure.agent` option provided by `azure-agent.nix` is replaced by `services.waagent`, and will be removed in a future release. diff --git a/nixos/modules/programs/xonsh.nix b/nixos/modules/programs/xonsh.nix index 86bdb4088845..ed7f3593d79d 100644 --- a/nixos/modules/programs/xonsh.nix +++ b/nixos/modules/programs/xonsh.nix @@ -5,7 +5,7 @@ let cfg = config.programs.xonsh; - + package = cfg.package.override { inherit (cfg) extraPackages; }; in { @@ -32,6 +32,21 @@ in type = lib.types.lines; }; + extraPackages = lib.mkOption { + default = (ps: [ ]); + type = with lib.types; coercedTo (listOf lib.types.package) (v: (_: v)) (functionTo (listOf lib.types.package)); + description = '' + Add the specified extra packages to the xonsh package. + Preferred over using `programs.xonsh.package` as it composes with `programs.xonsh.xontribs`. + + Take care in using this option along with manually defining the package + option above, as the two can result in conflicting sets of build dependencies. + This option assumes that the package option has an overridable argument + called `extraPackages`, so if you override the package option but also + intend to use this option, be sure that your resulting package still honors + the necessary option. + ''; + }; }; }; @@ -64,11 +79,11 @@ in ${cfg.config} ''; - environment.systemPackages = [ cfg.package ]; + environment.systemPackages = [ package ]; environment.shells = [ "/run/current-system/sw/bin/xonsh" - "${lib.getExe cfg.package}" + "${lib.getExe package}" ]; }; } From f6706283e81d05a907d5ca00539f8bd454a66a84 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Tue, 12 Nov 2024 09:23:55 -0500 Subject: [PATCH 0297/2168] xonsh: format --- pkgs/by-name/xo/xonsh/package.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/xo/xonsh/package.nix b/pkgs/by-name/xo/xonsh/package.nix index 2cf2b9241ca4..63857655409c 100644 --- a/pkgs/by-name/xo/xonsh/package.nix +++ b/pkgs/by-name/xo/xonsh/package.nix @@ -7,14 +7,17 @@ }: let - pythonEnv = python3.withPackages - (ps: [ ps.xonsh ] ++ extraPackages ps); + pythonEnv = python3.withPackages (ps: [ ps.xonsh ] ++ extraPackages ps); xonsh = python3.pkgs.xonsh; in -runCommand - "xonsh-${xonsh.version}" +runCommand "xonsh-${xonsh.version}" { - inherit (xonsh) pname version meta passthru; + inherit (xonsh) + pname + version + meta + passthru + ; } '' mkdir -p $out/bin From a229520681acc90fd74805598fb64a698c1b2702 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Thu, 30 Jan 2025 13:22:03 -0500 Subject: [PATCH 0298/2168] xonsh: rewrite with callPackage and new buildPythonPackage --- pkgs/by-name/xo/xonsh/unwrapped.nix | 247 ++++++++++++++-------------- 1 file changed, 126 insertions(+), 121 deletions(-) diff --git a/pkgs/by-name/xo/xonsh/unwrapped.nix b/pkgs/by-name/xo/xonsh/unwrapped.nix index 3992262d873c..677b2f49b2d2 100644 --- a/pkgs/by-name/xo/xonsh/unwrapped.nix +++ b/pkgs/by-name/xo/xonsh/unwrapped.nix @@ -1,130 +1,135 @@ { lib, - coreutils, + buildPythonPackage, fetchFromGitHub, - gitMinimal, - glibcLocales, - nix-update-script, - pythonPackages, + + setuptools, + ply, + prompt-toolkit, + pygments, + addBinToPathHook, writableTmpDirAsHomeHook, + gitMinimal, + glibcLocales, + pip, + pyte, + pytest-mock, + pytest-subprocess, + pytestCheckHook, + requests, + + coreutils, + + nix-update-script, + python, }: -let +buildPythonPackage rec { + pname = "xonsh"; + version = "0.19.1"; + pyproject = true; - argset = { - pname = "xonsh"; - version = "0.19.1"; - pyproject = true; - - # PyPI package ships incomplete tests - src = fetchFromGitHub { - owner = "xonsh"; - repo = "xonsh"; - tag = argset.version; - hash = "sha256-20egNKlJjJO1wdy1anApz0ADBnaHPUSqhfrsPe3QQIs="; - }; - - nativeBuildInputs = with pythonPackages; [ - setuptools - wheel - ]; - - propagatedBuildInputs = ( - with pythonPackages; - [ - ply - prompt-toolkit - pygments - ] - ); - - nativeCheckInputs = - [ - addBinToPathHook - gitMinimal - glibcLocales - writableTmpDirAsHomeHook - ] - ++ (with pythonPackages; [ - pip - pyte - pytest-mock - pytest-subprocess - pytestCheckHook - requests - ]); - - disabledTests = [ - # fails on sandbox - "test_colorize_file" - "test_loading_correctly" - "test_no_command_path_completion" - "test_bsd_man_page_completions" - "test_xonsh_activator" - - # fails on non-interactive shells - "test_capture_always" - "test_casting" - "test_command_pipeline_capture" - "test_dirty_working_directory" - "test_man_completion" - "test_vc_get_branch" - "test_bash_and_is_alias_is_only_functional_alias" - - # flaky tests - "test_script" - "test_alias_stability" - "test_alias_stability_exception" - "test_complete_import" - "test_subproc_output_format" - - # https://github.com/xonsh/xonsh/issues/5569 - "test_spec_decorator_alias_output_format" - - # Broken test - "test_repath_backslash" - ]; - - disabledTestPaths = [ - # fails on sandbox - "tests/completers/test_command_completers.py" - "tests/shell/test_ptk_highlight.py" - # fails on non-interactive shells - "tests/prompt/test_gitstatus.py" - "tests/completers/test_bash_completer.py" - ]; - - # https://github.com/NixOS/nixpkgs/issues/248978 - dontWrapPythonPrograms = true; - - env.LC_ALL = "en_US.UTF-8"; - - postPatch = '' - sed -i -e 's|/bin/ls|${lib.getExe' coreutils "ls"}|' tests/test_execer.py - sed -i -e 's|SHELL=xonsh|SHELL=$out/bin/xonsh|' tests/test_integrations.py - - for script in tests/test_integrations.py scripts/xon.sh $(find -name "*.xsh"); do - sed -i -e 's|/usr/bin/env|${lib.getExe' coreutils "env"}|' $script - done - patchShebangs . - ''; - - passthru = { - shellPath = "/bin/xonsh"; - python = pythonPackages.python; # To the wrapper - wrapper = throw "The top-level xonsh package is now wrapped. Use it directly."; - updateScript = nix-update-script { }; - }; - - meta = { - homepage = "https://xon.sh/"; - description = "Python-ish, BASHwards-compatible shell"; - changelog = "https://github.com/xonsh/xonsh/raw/main/CHANGELOG.rst"; - license = with lib.licenses; [ bsd3 ]; - mainProgram = "xonsh"; - maintainers = with lib.maintainers; [ samlukeyes123 ]; - }; + # PyPI package ships incomplete tests + src = fetchFromGitHub { + owner = "xonsh"; + repo = "xonsh"; + tag = version; + hash = "sha256-20egNKlJjJO1wdy1anApz0ADBnaHPUSqhfrsPe3QQIs="; }; -in -pythonPackages.buildPythonPackage argset + + build-system = [ + setuptools + ]; + + dependencies = [ + ply + prompt-toolkit + pygments + ]; + + nativeCheckInputs = [ + addBinToPathHook + writableTmpDirAsHomeHook + gitMinimal + glibcLocales + pip + pyte + pytest-mock + pytest-subprocess + pytestCheckHook + requests + ]; + + disabledTests = [ + # fails on sandbox + "test_bsd_man_page_completions" + "test_colorize_file" + "test_loading_correctly" + "test_no_command_path_completion" + "test_xonsh_activator" + + # fails on non-interactive shells + "test_bash_and_is_alias_is_only_functional_alias" + "test_capture_always" + "test_casting" + "test_command_pipeline_capture" + "test_dirty_working_directory" + "test_man_completion" + "test_vc_get_branch" + + # flaky tests + "test_alias_stability" + "test_alias_stability_exception" + "test_complete_import" + "test_script" + "test_subproc_output_format" + + # broken tests + "test_repath_backslash" + + # https://github.com/xonsh/xonsh/issues/5569 + "test_spec_decorator_alias_output_format" + ]; + + disabledTestPaths = [ + # fails on sandbox + "tests/completers/test_command_completers.py" + "tests/shell/test_ptk_highlight.py" + + # fails on non-interactive shells + "tests/prompt/test_gitstatus.py" + "tests/completers/test_bash_completer.py" + ]; + + # https://github.com/NixOS/nixpkgs/issues/248978 + dontWrapPythonPrograms = true; + + env.LC_ALL = "en_US.UTF-8"; + + postPatch = '' + sed -i -e 's|/bin/ls|${lib.getExe' coreutils "ls"}|' tests/test_execer.py + sed -i -e 's|SHELL=xonsh|SHELL=$out/bin/xonsh|' tests/test_integrations.py + + for script in tests/test_integrations.py scripts/xon.sh $(find -name "*.xsh"); do + sed -i -e 's|/usr/bin/env|${lib.getExe' coreutils "env"}|' $script + done + patchShebangs . + ''; + + passthru = { + inherit python; + shellPath = "/bin/xonsh"; + wrapper = throw "The top-level xonsh package is now wrapped. Use it directly."; + updateScript = nix-update-script { }; + }; + + meta = { + homepage = "https://xon.sh/"; + description = "Python-ish, BASHwards-compatible shell"; + changelog = "https://github.com/xonsh/xonsh/raw/main/CHANGELOG.rst"; + license = with lib.licenses; [ bsd3 ]; + mainProgram = "xonsh"; + maintainers = with lib.maintainers; [ samlukeyes123 ]; + }; +} From c922aecbc36187a48b82a57316c56c1f6e16f5f5 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Tue, 12 Nov 2024 09:25:40 -0500 Subject: [PATCH 0299/2168] xonsh.xontribs: init empty package set --- pkgs/by-name/xo/xonsh/unwrapped.nix | 2 ++ pkgs/by-name/xo/xonsh/xontribs/default.nix | 5 +++++ 2 files changed, 7 insertions(+) create mode 100644 pkgs/by-name/xo/xonsh/xontribs/default.nix diff --git a/pkgs/by-name/xo/xonsh/unwrapped.nix b/pkgs/by-name/xo/xonsh/unwrapped.nix index 677b2f49b2d2..3e7686d340c2 100644 --- a/pkgs/by-name/xo/xonsh/unwrapped.nix +++ b/pkgs/by-name/xo/xonsh/unwrapped.nix @@ -23,6 +23,7 @@ nix-update-script, python, + callPackage, }: buildPythonPackage rec { @@ -122,6 +123,7 @@ buildPythonPackage rec { shellPath = "/bin/xonsh"; wrapper = throw "The top-level xonsh package is now wrapped. Use it directly."; updateScript = nix-update-script { }; + xontribs = import ./xontribs { inherit callPackage; }; }; meta = { diff --git a/pkgs/by-name/xo/xonsh/xontribs/default.nix b/pkgs/by-name/xo/xonsh/xontribs/default.nix new file mode 100644 index 000000000000..162a5bdf52f4 --- /dev/null +++ b/pkgs/by-name/xo/xonsh/xontribs/default.nix @@ -0,0 +1,5 @@ +{ + callPackage, +}: +{ +} From 92a755c010899f094f3140cae1bc5e3a5d0d17d8 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Tue, 12 Nov 2024 09:28:29 -0500 Subject: [PATCH 0300/2168] xonsh.xontribs.xonsh-direnv: init at 1.6.5 --- pkgs/by-name/xo/xonsh/xontribs/default.nix | 1 + .../xonsh/xontribs/xonsh-direnv/default.nix | 39 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/by-name/xo/xonsh/xontribs/xonsh-direnv/default.nix diff --git a/pkgs/by-name/xo/xonsh/xontribs/default.nix b/pkgs/by-name/xo/xonsh/xontribs/default.nix index 162a5bdf52f4..db2719a2b8b8 100644 --- a/pkgs/by-name/xo/xonsh/xontribs/default.nix +++ b/pkgs/by-name/xo/xonsh/xontribs/default.nix @@ -2,4 +2,5 @@ callPackage, }: { + xonsh-direnv = callPackage ./xonsh-direnv { }; } diff --git a/pkgs/by-name/xo/xonsh/xontribs/xonsh-direnv/default.nix b/pkgs/by-name/xo/xonsh/xontribs/xonsh-direnv/default.nix new file mode 100644 index 000000000000..e4122feb09fe --- /dev/null +++ b/pkgs/by-name/xo/xonsh/xontribs/xonsh-direnv/default.nix @@ -0,0 +1,39 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + setuptools, + direnv, + nix-update-script, +}: + +buildPythonPackage rec { + pname = "xonsh-direnv"; + version = "1.6.5"; + + src = fetchFromGitHub { + owner = "74th"; + repo = "xonsh-direnv"; + tag = version; + hash = "sha256-huBJ7WknVCk+WgZaXHlL+Y1sqsn6TYqMP29/fsUPSyU="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + direnv + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Direnv support for Xonsh"; + homepage = "https://github.com/74th/xonsh-direnv/"; + changelog = "https://github.com/74th/xonsh-direnv/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ greg ]; + }; +} From e23facf8739d9738c6904e0475b08ef735714bb5 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Tue, 12 Nov 2024 09:30:32 -0500 Subject: [PATCH 0301/2168] xonsh.xontribs.xontrib-abbrevs: init at 0.1.0 --- pkgs/by-name/xo/xonsh/xontribs/default.nix | 1 + .../xontribs/xontrib-abbrevs/default.nix | 58 +++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 pkgs/by-name/xo/xonsh/xontribs/xontrib-abbrevs/default.nix diff --git a/pkgs/by-name/xo/xonsh/xontribs/default.nix b/pkgs/by-name/xo/xonsh/xontribs/default.nix index db2719a2b8b8..c40e2c67412c 100644 --- a/pkgs/by-name/xo/xonsh/xontribs/default.nix +++ b/pkgs/by-name/xo/xonsh/xontribs/default.nix @@ -3,4 +3,5 @@ }: { xonsh-direnv = callPackage ./xonsh-direnv { }; + xontrib-abbrevs = callPackage ./xontrib-abbrevs { }; } diff --git a/pkgs/by-name/xo/xonsh/xontribs/xontrib-abbrevs/default.nix b/pkgs/by-name/xo/xonsh/xontribs/xontrib-abbrevs/default.nix new file mode 100644 index 000000000000..d276a84fbf9c --- /dev/null +++ b/pkgs/by-name/xo/xonsh/xontribs/xontrib-abbrevs/default.nix @@ -0,0 +1,58 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + setuptools, + setuptools-scm, + poetry-core, + prompt-toolkit, + writableTmpDirAsHomeHook, + pytestCheckHook, + xonsh, + nix-update-script, +}: + +buildPythonPackage rec { + pname = "xontrib-abbrevs"; + version = "0.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "xonsh"; + repo = "xontrib-abbrevs"; + tag = "v${version}"; + hash = "sha256-JxH5b2ey99tvHXSUreU5r6fS8nko4RrS/1c8psNbJNc="; + }; + + prePatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '"xonsh>=0.17", ' "" + ''; + + build-system = [ + setuptools + setuptools-scm + poetry-core + ]; + + dependencies = [ + prompt-toolkit + ]; + + nativeCheckInputs = [ + writableTmpDirAsHomeHook + pytestCheckHook + xonsh + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Command abbreviations for Xonsh"; + homepage = "https://github.com/xonsh/xontrib-abbrevs"; + changelog = "https://github.com/xonsh/xontrib-apprevs/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ greg ]; + }; +} From 9c6b94bb313be8c4ce4c7ce7bb19cb916aa3e0f7 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Tue, 12 Nov 2024 09:31:04 -0500 Subject: [PATCH 0302/2168] xonsh.xontribs.xontrib-bashisms: init at 0.0.5 --- pkgs/by-name/xo/xonsh/xontribs/default.nix | 1 + .../xontribs/xontrib-bashisms/default.nix | 48 +++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 pkgs/by-name/xo/xonsh/xontribs/xontrib-bashisms/default.nix diff --git a/pkgs/by-name/xo/xonsh/xontribs/default.nix b/pkgs/by-name/xo/xonsh/xontribs/default.nix index c40e2c67412c..57b19bd769bd 100644 --- a/pkgs/by-name/xo/xonsh/xontribs/default.nix +++ b/pkgs/by-name/xo/xonsh/xontribs/default.nix @@ -4,4 +4,5 @@ { xonsh-direnv = callPackage ./xonsh-direnv { }; xontrib-abbrevs = callPackage ./xontrib-abbrevs { }; + xontrib-bashisms = callPackage ./xontrib-bashisms { }; } diff --git a/pkgs/by-name/xo/xonsh/xontribs/xontrib-bashisms/default.nix b/pkgs/by-name/xo/xonsh/xontribs/xontrib-bashisms/default.nix new file mode 100644 index 000000000000..9247a1f225a4 --- /dev/null +++ b/pkgs/by-name/xo/xonsh/xontribs/xontrib-bashisms/default.nix @@ -0,0 +1,48 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + setuptools, + writableTmpDirAsHomeHook, + pytestCheckHook, + xonsh, + nix-update-script, +}: + +buildPythonPackage rec { + pname = "xontrib-bashisms"; + version = "0.0.5"; + pyproject = true; + + src = fetchFromGitHub { + owner = "xonsh"; + repo = "xontrib-bashisms"; + tag = version; + hash = "sha256-R1DCGMrRCJLnz/QMk6QB8ai4nx88vvyPdaCKg3od5/I="; + }; + + prePatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '"xonsh>=0.12.5"' "" + ''; + + build-system = [ + setuptools + ]; + + nativeCheckInputs = [ + writableTmpDirAsHomeHook + pytestCheckHook + xonsh + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Bash-like interactive mode extensions for the xonsh shell"; + homepage = "https://github.com/xonsh/xontrib-bashisms"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ greg ]; + }; +} From bc10963f94090f17eaa1400d61087842dfd0fefb Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Tue, 12 Nov 2024 09:31:40 -0500 Subject: [PATCH 0303/2168] xonsh.xontribs.xontrib-debug-tools: init at 0.0.1 --- pkgs/by-name/xo/xonsh/xontribs/default.nix | 1 + .../xontribs/xontrib-debug-tools/default.nix | 48 +++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 pkgs/by-name/xo/xonsh/xontribs/xontrib-debug-tools/default.nix diff --git a/pkgs/by-name/xo/xonsh/xontribs/default.nix b/pkgs/by-name/xo/xonsh/xontribs/default.nix index 57b19bd769bd..d2b54e0de446 100644 --- a/pkgs/by-name/xo/xonsh/xontribs/default.nix +++ b/pkgs/by-name/xo/xonsh/xontribs/default.nix @@ -5,4 +5,5 @@ xonsh-direnv = callPackage ./xonsh-direnv { }; xontrib-abbrevs = callPackage ./xontrib-abbrevs { }; xontrib-bashisms = callPackage ./xontrib-bashisms { }; + xontrib-debug-tools = callPackage ./xontrib-debug-tools { }; } diff --git a/pkgs/by-name/xo/xonsh/xontribs/xontrib-debug-tools/default.nix b/pkgs/by-name/xo/xonsh/xontribs/xontrib-debug-tools/default.nix new file mode 100644 index 000000000000..dbe3e01a7961 --- /dev/null +++ b/pkgs/by-name/xo/xonsh/xontribs/xontrib-debug-tools/default.nix @@ -0,0 +1,48 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + setuptools, + writableTmpDirAsHomeHook, + pytestCheckHook, + xonsh, + nix-update-script, +}: + +buildPythonPackage rec { + pname = "xontrib-debug-tools"; + version = "0.0.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "xonsh"; + repo = "xontrib-debug-tools"; + tag = version; + hash = "sha256-Z8AXKk94NxmF5rO2OMZzNX0GIP/Vj+mOtYUaifRX1cw="; + }; + + prePatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '"xonsh>=0.12.5"' "" + ''; + + build-system = [ + setuptools + ]; + + nativeCheckInputs = [ + writableTmpDirAsHomeHook + pytestCheckHook + xonsh + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Debug tools for xonsh shell"; + homepage = "https://github.com/xonsh/xontrib-debug-tools"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ greg ]; + }; +} From d508833e365603020eafd4265b90c6b8bf3b5b8e Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Tue, 12 Nov 2024 09:32:08 -0500 Subject: [PATCH 0304/2168] xonsh.xontribs.xontrib-distributed: init at 0.0.4 --- pkgs/by-name/xo/xonsh/xontribs/default.nix | 1 + .../xontribs/xontrib-distributed/default.nix | 56 +++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 pkgs/by-name/xo/xonsh/xontribs/xontrib-distributed/default.nix diff --git a/pkgs/by-name/xo/xonsh/xontribs/default.nix b/pkgs/by-name/xo/xonsh/xontribs/default.nix index d2b54e0de446..64e84a357fa8 100644 --- a/pkgs/by-name/xo/xonsh/xontribs/default.nix +++ b/pkgs/by-name/xo/xonsh/xontribs/default.nix @@ -6,4 +6,5 @@ xontrib-abbrevs = callPackage ./xontrib-abbrevs { }; xontrib-bashisms = callPackage ./xontrib-bashisms { }; xontrib-debug-tools = callPackage ./xontrib-debug-tools { }; + xontrib-distributed = callPackage ./xontrib-distributed { }; } diff --git a/pkgs/by-name/xo/xonsh/xontribs/xontrib-distributed/default.nix b/pkgs/by-name/xo/xonsh/xontribs/xontrib-distributed/default.nix new file mode 100644 index 000000000000..7ae42069f366 --- /dev/null +++ b/pkgs/by-name/xo/xonsh/xontribs/xontrib-distributed/default.nix @@ -0,0 +1,56 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + poetry-core, + distributed, + writableTmpDirAsHomeHook, + pytestCheckHook, + xonsh, + nix-update-script, +}: + +buildPythonPackage rec { + pname = "xontrib-distributed"; + version = "0.0.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "xonsh"; + repo = "xontrib-distributed"; + tag = "v${version}"; + hash = "sha256-Hb7S3PqHi0w6zb9ki8ADMtgdYVv8O5WQZMgJzKF74qE="; + }; + + prePatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'xonsh = ">=0.12"' "" + ''; + + build-system = [ + poetry-core + ]; + + dependencies = [ + distributed + ]; + + # As of v0.0.4 has no tests that get run by pytest + doCheck = false; + + nativeCheckInputs = [ + writableTmpDirAsHomeHook + pytestCheckHook + xonsh + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Dask Distributed integration for Xonsh"; + homepage = "https://github.com/xonsh/xontrib-distributed"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ greg ]; + }; +} From cb78105719eabede7c07206e6c8ac8fca3539e88 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Tue, 12 Nov 2024 09:32:43 -0500 Subject: [PATCH 0305/2168] xonsh.xontribs.xontrib-fish-completer: init at 0.0.1 --- pkgs/by-name/xo/xonsh/xontribs/default.nix | 1 + .../xontrib-fish-completer/default.nix | 50 +++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 pkgs/by-name/xo/xonsh/xontribs/xontrib-fish-completer/default.nix diff --git a/pkgs/by-name/xo/xonsh/xontribs/default.nix b/pkgs/by-name/xo/xonsh/xontribs/default.nix index 64e84a357fa8..4d06e9dd5039 100644 --- a/pkgs/by-name/xo/xonsh/xontribs/default.nix +++ b/pkgs/by-name/xo/xonsh/xontribs/default.nix @@ -7,4 +7,5 @@ xontrib-bashisms = callPackage ./xontrib-bashisms { }; xontrib-debug-tools = callPackage ./xontrib-debug-tools { }; xontrib-distributed = callPackage ./xontrib-distributed { }; + xontrib-fish-completer = callPackage ./xontrib-fish-completer { }; } diff --git a/pkgs/by-name/xo/xonsh/xontribs/xontrib-fish-completer/default.nix b/pkgs/by-name/xo/xonsh/xontribs/xontrib-fish-completer/default.nix new file mode 100644 index 000000000000..71a9beacaf82 --- /dev/null +++ b/pkgs/by-name/xo/xonsh/xontribs/xontrib-fish-completer/default.nix @@ -0,0 +1,50 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + setuptools, + writableTmpDirAsHomeHook, + pytestCheckHook, + pytest-subprocess, + xonsh, + nix-update-script, +}: + +buildPythonPackage rec { + pname = "xontrib-fish-completer"; + version = "0.0.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "xonsh"; + repo = "xontrib-fish-completer"; + tag = version; + hash = "sha256-PhhdZ3iLPDEIG9uDeR5ctJ9zz2+YORHBhbsiLrJckyA="; + }; + + prePatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '"xonsh>=0.12.5"' "" + ''; + + build-system = [ + setuptools + ]; + + nativeCheckInputs = [ + writableTmpDirAsHomeHook + pytestCheckHook + pytest-subprocess + xonsh + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Populate rich completions using fish and remove the default bash based completer"; + homepage = "https://github.com/xonsh/xontrib-fish-completer"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ greg ]; + }; +} From afeae08331f80ee83959223803bea28ae6bc0b72 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Tue, 12 Nov 2024 09:33:06 -0500 Subject: [PATCH 0306/2168] xonsh.xontribs.xontrib-jedi: init at 0.1.1 --- pkgs/by-name/xo/xonsh/xontribs/default.nix | 1 + .../xonsh/xontribs/xontrib-jedi/default.nix | 59 +++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 pkgs/by-name/xo/xonsh/xontribs/xontrib-jedi/default.nix diff --git a/pkgs/by-name/xo/xonsh/xontribs/default.nix b/pkgs/by-name/xo/xonsh/xontribs/default.nix index 4d06e9dd5039..d8464131eee2 100644 --- a/pkgs/by-name/xo/xonsh/xontribs/default.nix +++ b/pkgs/by-name/xo/xonsh/xontribs/default.nix @@ -8,4 +8,5 @@ xontrib-debug-tools = callPackage ./xontrib-debug-tools { }; xontrib-distributed = callPackage ./xontrib-distributed { }; xontrib-fish-completer = callPackage ./xontrib-fish-completer { }; + xontrib-jedi = callPackage ./xontrib-jedi { }; } diff --git a/pkgs/by-name/xo/xonsh/xontribs/xontrib-jedi/default.nix b/pkgs/by-name/xo/xonsh/xontribs/xontrib-jedi/default.nix new file mode 100644 index 000000000000..a6ae8f5e23dd --- /dev/null +++ b/pkgs/by-name/xo/xonsh/xontribs/xontrib-jedi/default.nix @@ -0,0 +1,59 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + poetry-core, + jedi, + writableTmpDirAsHomeHook, + pytestCheckHook, + xonsh, + nix-update-script, +}: + +buildPythonPackage rec { + pname = "xontrib-jedi"; + version = "0.1.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "xonsh"; + repo = "xontrib-jedi"; + tag = "v${version}"; + hash = "sha256-T4Yxr91emM2mjclQOjQsnnPO/JijAGNcqmZjxrz72Bs="; + }; + + prePatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'xonsh = ">=0.17"' "" + ''; + + build-system = [ + poetry-core + ]; + + dependencies = [ + jedi + ]; + + preCheck = '' + substituteInPlace tests/test_jedi.py \ + --replace-fail "/usr/bin" "${jedi}/bin" + ''; + + nativeCheckInputs = [ + writableTmpDirAsHomeHook + pytestCheckHook + xonsh + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Xonsh Python mode completions using jedi"; + homepage = "https://github.com/xonsh/xontrib-jedi"; + changelog = "https://github.com/xonsh/xontrib-jedi.releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ greg ]; + }; +} From 6453547e820676c7eb0d3d7debdd4f2bb7093bd4 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Tue, 12 Nov 2024 09:33:24 -0500 Subject: [PATCH 0307/2168] xonsh.xontribs.xontrib-jupyter: init at 0.3.2 --- pkgs/by-name/xo/xonsh/xontribs/default.nix | 1 + .../xontribs/xontrib-jupyter/default.nix | 57 +++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 pkgs/by-name/xo/xonsh/xontribs/xontrib-jupyter/default.nix diff --git a/pkgs/by-name/xo/xonsh/xontribs/default.nix b/pkgs/by-name/xo/xonsh/xontribs/default.nix index d8464131eee2..0ad20b9cbab8 100644 --- a/pkgs/by-name/xo/xonsh/xontribs/default.nix +++ b/pkgs/by-name/xo/xonsh/xontribs/default.nix @@ -9,4 +9,5 @@ xontrib-distributed = callPackage ./xontrib-distributed { }; xontrib-fish-completer = callPackage ./xontrib-fish-completer { }; xontrib-jedi = callPackage ./xontrib-jedi { }; + xontrib-jupyter = callPackage ./xontrib-jupyter { }; } diff --git a/pkgs/by-name/xo/xonsh/xontribs/xontrib-jupyter/default.nix b/pkgs/by-name/xo/xonsh/xontribs/xontrib-jupyter/default.nix new file mode 100644 index 000000000000..a4ff04bba4e2 --- /dev/null +++ b/pkgs/by-name/xo/xonsh/xontribs/xontrib-jupyter/default.nix @@ -0,0 +1,57 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + poetry-core, + jupyter-client, + writableTmpDirAsHomeHook, + pytestCheckHook, + xonsh, + nix-update-script, +}: + +buildPythonPackage rec { + pname = "xontrib-jupyter"; + version = "0.3.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "xonsh"; + repo = "xontrib-jupyter"; + tag = "v${version}"; + hash = "sha256-gf+jyA2il7MD+Moez/zBYpf4EaPiNcgr5ZrJFK4uD2k="; + }; + + prePatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'xonsh = ">=0.12"' "" + + substituteInPlace xonsh_jupyter/shell.py \ + --replace-fail 'xonsh.base_shell' 'xonsh.shells.base_shell' + ''; + + build-system = [ + poetry-core + ]; + + dependencies = [ + jupyter-client + ]; + + nativeCheckInputs = [ + writableTmpDirAsHomeHook + pytestCheckHook + xonsh + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Xonsh jupyter kernel allows to run Xonsh shell code in Jupyter, JupyterLab, Euporia, etc"; + homepage = "https://github.com/xonsh/xontrib-jupyter"; + changelog = "https://github.com/xonsh/xontrib-jupyter/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ greg ]; + }; +} From a09d941ad719afe76c1924dcd95127d1dafc777b Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Tue, 12 Nov 2024 09:33:39 -0500 Subject: [PATCH 0308/2168] xonsh.xontribs.xontrib-vox: init at 0.0.1 --- pkgs/by-name/xo/xonsh/xontribs/default.nix | 1 + .../xo/xonsh/xontribs/xontrib-vox/default.nix | 60 +++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 pkgs/by-name/xo/xonsh/xontribs/xontrib-vox/default.nix diff --git a/pkgs/by-name/xo/xonsh/xontribs/default.nix b/pkgs/by-name/xo/xonsh/xontribs/default.nix index 0ad20b9cbab8..38e1a697f36f 100644 --- a/pkgs/by-name/xo/xonsh/xontribs/default.nix +++ b/pkgs/by-name/xo/xonsh/xontribs/default.nix @@ -10,4 +10,5 @@ xontrib-fish-completer = callPackage ./xontrib-fish-completer { }; xontrib-jedi = callPackage ./xontrib-jedi { }; xontrib-jupyter = callPackage ./xontrib-jupyter { }; + xontrib-vox = callPackage ./xontrib-vox { }; } diff --git a/pkgs/by-name/xo/xonsh/xontribs/xontrib-vox/default.nix b/pkgs/by-name/xo/xonsh/xontribs/xontrib-vox/default.nix new file mode 100644 index 000000000000..9a191be8e5cf --- /dev/null +++ b/pkgs/by-name/xo/xonsh/xontribs/xontrib-vox/default.nix @@ -0,0 +1,60 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + setuptools, + virtualenv, + writableTmpDirAsHomeHook, + pytestCheckHook, + pytest-subprocess, + xonsh, + nix-update-script, +}: + +buildPythonPackage rec { + pname = "xontrib-vox"; + version = "0.0.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "xonsh"; + repo = "xontrib-vox"; + tag = version; + hash = "sha256-OB1O5GZYkg7Ucaqak3MncnQWXhMD4BM4wXsYCDD0mhk="; + }; + + prePatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '"xonsh>=0.12.5"' "" + ''; + + build-system = [ + setuptools + ]; + + dependencies = [ + virtualenv + ]; + + nativeCheckInputs = [ + writableTmpDirAsHomeHook + pytestCheckHook + pytest-subprocess + xonsh + ]; + + disabledTests = [ + # Monkeypatch in test fails, preventing test from running + "test_interpreter" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Python virtual environment manager for the xonsh shell"; + homepage = "https://github.com/xonsh/xontrib-vox"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ greg ]; + }; +} From 65fa4335a0c93be788831b30cf0b161e3c46cc21 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Tue, 12 Nov 2024 09:33:54 -0500 Subject: [PATCH 0309/2168] xonsh.xontribs.xontrib-whole-word-jumping: init at 0.0.1 --- pkgs/by-name/xo/xonsh/xontribs/default.nix | 1 + .../xontrib-whole-word-jumping/default.nix | 48 +++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 pkgs/by-name/xo/xonsh/xontribs/xontrib-whole-word-jumping/default.nix diff --git a/pkgs/by-name/xo/xonsh/xontribs/default.nix b/pkgs/by-name/xo/xonsh/xontribs/default.nix index 38e1a697f36f..fd0b211e6d7b 100644 --- a/pkgs/by-name/xo/xonsh/xontribs/default.nix +++ b/pkgs/by-name/xo/xonsh/xontribs/default.nix @@ -11,4 +11,5 @@ xontrib-jedi = callPackage ./xontrib-jedi { }; xontrib-jupyter = callPackage ./xontrib-jupyter { }; xontrib-vox = callPackage ./xontrib-vox { }; + xontrib-whole-word-jumping = callPackage ./xontrib-whole-word-jumping { }; } diff --git a/pkgs/by-name/xo/xonsh/xontribs/xontrib-whole-word-jumping/default.nix b/pkgs/by-name/xo/xonsh/xontribs/xontrib-whole-word-jumping/default.nix new file mode 100644 index 000000000000..d842525e899f --- /dev/null +++ b/pkgs/by-name/xo/xonsh/xontribs/xontrib-whole-word-jumping/default.nix @@ -0,0 +1,48 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + setuptools, + writableTmpDirAsHomeHook, + pytestCheckHook, + xonsh, + nix-update-script, +}: + +buildPythonPackage rec { + pname = "xontrib-whole-word-jumping"; + version = "0.0.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "xonsh"; + repo = "xontrib-whole-word-jumping"; + tag = version; + hash = "sha256-zLAOGW9prjYDQBDITFNMggn4X1JTyAnVdjkBOH9gXPs="; + }; + + prePatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '"xonsh>=0.12.5", ' "" + ''; + + build-system = [ + setuptools + ]; + + nativeCheckInputs = [ + writableTmpDirAsHomeHook + pytestCheckHook + xonsh + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Additional keyboard navigation for interactive xonsh shells"; + homepage = "https://github.com/xonsh/xontrib-whole-word-jumping"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ greg ]; + }; +} From c72a94cbed753a4b7893a33f8bf755f93d91b214 Mon Sep 17 00:00:00 2001 From: Patrick Date: Thu, 6 Feb 2025 17:25:06 +0100 Subject: [PATCH 0310/2168] firefly-iii: 6.1.25 -> 6.2.4 --- pkgs/by-name/fi/firefly-iii/package.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/fi/firefly-iii/package.nix b/pkgs/by-name/fi/firefly-iii/package.nix index 22b3b9447dde..274e250b1540 100644 --- a/pkgs/by-name/fi/firefly-iii/package.nix +++ b/pkgs/by-name/fi/firefly-iii/package.nix @@ -5,7 +5,7 @@ nodejs, fetchNpmDeps, buildPackages, - php83, + php84, nixosTests, nix-update-script, dataDir ? "/var/lib/firefly-iii", @@ -13,23 +13,23 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "firefly-iii"; - version = "6.1.25"; + version = "6.2.4"; src = fetchFromGitHub { owner = "firefly-iii"; repo = "firefly-iii"; - rev = "v${finalAttrs.version}"; - hash = "sha256-6DZwTk67bKvgB+Zf7aPakrWWYCAjkYggrRiaFKgsMkk="; + tag = "v${finalAttrs.version}"; + hash = "sha256-IBf34RPpQUH3U0tl8ljJpL9of6QNDOTyBg7Hc1ae+W8="; }; - buildInputs = [ php83 ]; + buildInputs = [ php84 ]; nativeBuildInputs = [ nodejs nodejs.python buildPackages.npmHooks.npmConfigHook - php83.composerHooks.composerInstallHook - php83.packages.composer-local-repo-plugin + php84.composerHooks.composerInstallHook + php84.packages.composer-local-repo-plugin ]; composerNoDev = true; @@ -38,15 +38,15 @@ stdenvNoCC.mkDerivation (finalAttrs: { composerStrictValidation = true; strictDeps = true; - vendorHash = "sha256-5uUjb5EPcoEBuFbWGb1EIC/U/VaSUsRp09S9COIx25E="; + vendorHash = "sha256-LRcgWQPDLNCMbaJhaySDrcw95fXF4yVUc03SFnrteeM="; npmDeps = fetchNpmDeps { inherit (finalAttrs) src; name = "${finalAttrs.pname}-npm-deps"; - hash = "sha256-j49iltvW7xGOCV+FIB4f+ECfQo50U+wTugyaK9JGN3A="; + hash = "sha256-K8zoX4UsD/hOpMZ5JCH3G9WBTUpJcXAertEaXaUGcys="; }; - composerRepository = php83.mkComposerRepository { + composerRepository = php84.mkComposerRepository { inherit (finalAttrs) pname src @@ -65,7 +65,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; passthru = { - phpPackage = php83; + phpPackage = php84; tests = nixosTests.firefly-iii; updateScript = nix-update-script { }; }; From 21fd8180b52e407c2e6eee4a2429ada1f7998c68 Mon Sep 17 00:00:00 2001 From: Patrick Date: Thu, 6 Feb 2025 17:36:09 +0100 Subject: [PATCH 0311/2168] firefly-iii-data-importer: 1.5.7 -> 1.6.0 --- .../fi/firefly-iii-data-importer/package.nix | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix index 8917db34db95..8242ec2008ef 100644 --- a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix +++ b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix @@ -5,7 +5,7 @@ nodejs, fetchNpmDeps, buildPackages, - php83, + php84, nixosTests, nix-update-script, dataDir ? "/var/lib/firefly-iii-data-importer", @@ -13,23 +13,23 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "firefly-iii-data-importer"; - version = "1.5.7"; + version = "1.6.0"; src = fetchFromGitHub { owner = "firefly-iii"; repo = "data-importer"; - rev = "v${finalAttrs.version}"; - hash = "sha256-CKDAPpDTTrBXPhfSQiBl/M42hOQi2KwpWDtEnlDwpuU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-f/kvSQMA4w+wwD+hM6kGduV3AQmmYe2w5u3dhnJBS9s="; }; - buildInputs = [ php83 ]; + buildInputs = [ php84 ]; nativeBuildInputs = [ nodejs nodejs.python buildPackages.npmHooks.npmConfigHook - php83.composerHooks.composerInstallHook - php83.packages.composer-local-repo-plugin + php84.composerHooks.composerInstallHook + php84.packages.composer-local-repo-plugin ]; composerNoDev = true; @@ -38,15 +38,15 @@ stdenvNoCC.mkDerivation (finalAttrs: { composerStrictValidation = true; strictDeps = true; - vendorHash = "sha256-larFTf64oPJi+XLMK6ZuLEN4P/CkGLojUJDE/gvu8UU="; + vendorHash = "sha256-Jn0H63VxIGjgVOT6yyXEhRdMWeIInMdv6mi5JQXp68Q="; npmDeps = fetchNpmDeps { inherit (finalAttrs) src; name = "${finalAttrs.pname}-npm-deps"; - hash = "sha256-0xY9F/Bok2RQ1YWRr5fnENk3zB1WubnpT0Ldy+i618g="; + hash = "sha256-hUq5pp62K2XAnjU9QhQE+PogUSla9R1xG7beW4bgrV8="; }; - composerRepository = php83.mkComposerRepository { + composerRepository = php84.mkComposerRepository { inherit (finalAttrs) pname src @@ -64,7 +64,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; passthru = { - phpPackage = php83; + phpPackage = php84; tests = nixosTests.firefly-iii-data-importer; updateScript = nix-update-script { }; }; From ab315b1b0cb329b14417acb5972c74d7056a978c Mon Sep 17 00:00:00 2001 From: arminius-smh Date: Tue, 28 Jan 2025 11:54:48 +0100 Subject: [PATCH 0312/2168] spotify-player: 0.20.3 -> 0.20.4 --- pkgs/by-name/sp/spotify-player/package.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/sp/spotify-player/package.nix b/pkgs/by-name/sp/spotify-player/package.nix index 693b775bdf72..893cc5a22a11 100644 --- a/pkgs/by-name/sp/spotify-player/package.nix +++ b/pkgs/by-name/sp/spotify-player/package.nix @@ -21,7 +21,6 @@ withDaemon ? true, withAudioBackend ? "rodio", # alsa, pulseaudio, rodio, portaudio, jackaudio, rodiojack, sdl withMediaControl ? true, - withLyrics ? true, withImage ? true, withNotify ? true, withSixel ? true, @@ -47,17 +46,17 @@ assert lib.assertOneOf "withAudioBackend" withAudioBackend [ rustPlatform.buildRustPackage rec { pname = "spotify-player"; - version = "0.20.3"; + version = "0.20.4"; src = fetchFromGitHub { owner = "aome510"; repo = pname; tag = "v${version}"; - hash = "sha256-9iXsZod1aLdCQYUKBjdRayQfRUz770Xw3/M85Rp/OCw="; + hash = "sha256-5N/zTkNgcIk/Ml11Oo+jyoO0r2Hh9SxFL+tdhD/1X/4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-LX4DuIIL9jGQLEzECydIdPEdPGdRTYREwFbMCS8CoNo="; + cargoHash = "sha256-0vIhAJ3u+PfujUGI07fddDs33P35Q4CSDz1sMuQwVws="; nativeBuildInputs = [ @@ -100,13 +99,17 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals (withAudioBackend != "") [ "${withAudioBackend}-backend" ] ++ lib.optionals withMediaControl [ "media-control" ] ++ lib.optionals withImage [ "image" ] - ++ lib.optionals withLyrics [ "lyric-finder" ] ++ lib.optionals withDaemon [ "daemon" ] ++ lib.optionals withNotify [ "notify" ] ++ lib.optionals withStreaming [ "streaming" ] ++ lib.optionals withSixel [ "sixel" ] ++ lib.optionals withFuzzy [ "fzf" ]; + # tries to access HOME only in aarch64-darwin environment when building mac-notification-sys + preBuild = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' + export HOME=$TMPDIR + ''; + # sixel-sys is dynamically linked to libsixel postInstall = lib.optionals (stdenv.hostPlatform.isDarwin && withSixel) '' wrapProgram $out/bin/spotify_player \ From 97c0691a2d5c23faea8c71225f0ac8ffbecaabeb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Feb 2025 18:55:40 +0000 Subject: [PATCH 0313/2168] python312Packages.cantools: 40.1.1 -> 40.2.0 --- pkgs/development/python-modules/cantools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cantools/default.nix b/pkgs/development/python-modules/cantools/default.nix index e97c974ffe12..b679b5772253 100644 --- a/pkgs/development/python-modules/cantools/default.nix +++ b/pkgs/development/python-modules/cantools/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "cantools"; - version = "40.1.1"; + version = "40.2.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-sXMdpeaZdmEITGAZ1s3LN3OGjANe2KcoEmz4xvMaI2g="; + hash = "sha256-/HX5/ls375kvr9+YH/giCH4brxgWK7uzXYsLEyHtct8="; }; nativeBuildInputs = [ From 6c28f61e895b4ee0e10d8cb1c5607faa38a8370f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Feb 2025 19:03:48 +0000 Subject: [PATCH 0314/2168] lock: 1.3.9 -> 1.4.1 --- pkgs/by-name/lo/lock/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lo/lock/package.nix b/pkgs/by-name/lo/lock/package.nix index 2f998f4cdbe2..e71e434c84ff 100644 --- a/pkgs/by-name/lo/lock/package.nix +++ b/pkgs/by-name/lo/lock/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lock"; - version = "1.3.9"; + version = "1.4.1"; src = fetchFromGitHub { owner = "konstantintutsch"; repo = "Lock"; tag = "v${finalAttrs.version}"; - hash = "sha256-aRXwRJ4FTdIef1UHBJ9877d86uxm5GHML//IqOGEGXs="; + hash = "sha256-DTq3hJVWoLnosjN5XWUNaQCdXut4nqGeD6XutzBAKa8="; }; strictDeps = true; From aebbeb61dfb75af20cdaecde641ce6abc6713144 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Thu, 6 Feb 2025 10:55:24 -0800 Subject: [PATCH 0315/2168] python3Packages.langchain*: Add sarahec as maintainer --- pkgs/development/python-modules/langchain-aws/default.nix | 1 + .../python-modules/langchain-community/default.nix | 5 ++++- pkgs/development/python-modules/langchain/default.nix | 5 ++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langchain-aws/default.nix b/pkgs/development/python-modules/langchain-aws/default.nix index a2fbe8323182..99eed8ee5680 100644 --- a/pkgs/development/python-modules/langchain-aws/default.nix +++ b/pkgs/development/python-modules/langchain-aws/default.nix @@ -78,6 +78,7 @@ buildPythonPackage rec { maintainers = with lib.maintainers; [ drupol natsukium + sarahec ]; }; } diff --git a/pkgs/development/python-modules/langchain-community/default.nix b/pkgs/development/python-modules/langchain-community/default.nix index 5a6ffe34c2be..f7e43dae3162 100644 --- a/pkgs/development/python-modules/langchain-community/default.nix +++ b/pkgs/development/python-modules/langchain-community/default.nix @@ -125,6 +125,9 @@ buildPythonPackage rec { description = "Community contributed LangChain integrations"; homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/community"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ natsukium ]; + maintainers = with lib.maintainers; [ + natsukium + sarahec + ]; }; } diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix index 5a8988e7793c..1c84fceb2e70 100644 --- a/pkgs/development/python-modules/langchain/default.nix +++ b/pkgs/development/python-modules/langchain/default.nix @@ -145,7 +145,10 @@ buildPythonPackage rec { homepage = "https://github.com/langchain-ai/langchain"; changelog = "https://github.com/langchain-ai/langchain/releases/tag/v${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ natsukium ]; + maintainers = with lib.maintainers; [ + natsukium + sarahec + ]; mainProgram = "langchain-server"; }; } From aad97fda3ed9c3f07efbff33119776710b621873 Mon Sep 17 00:00:00 2001 From: Tert0 Date: Thu, 6 Feb 2025 20:46:42 +0100 Subject: [PATCH 0316/2168] libreoffice-fresh-unwrapped: 24.8.3.2 -> 25.2.0.3 --- .../office/libreoffice/src-fresh/deps.nix | 299 ++++++++++-------- .../office/libreoffice/src-fresh/help.nix | 4 +- .../office/libreoffice/src-fresh/main.nix | 4 +- .../libreoffice/src-fresh/translations.nix | 4 +- .../office/libreoffice/src-fresh/version.nix | 2 +- 5 files changed, 181 insertions(+), 132 deletions(-) diff --git a/pkgs/applications/office/libreoffice/src-fresh/deps.nix b/pkgs/applications/office/libreoffice/src-fresh/deps.nix index bfcb4b419add..a4bd62b5b8c1 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/deps.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/deps.nix @@ -14,11 +14,11 @@ md5name = "daf972a89577f8772602bf2eb38b6a3dd3d922bf5724d45e7f9589b5e830442c-phc-winner-argon2-20190702.tar.gz"; } { - name = "boost_1_85_0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/boost_1_85_0.tar.xz"; - sha256 = "4e23218ff5036d57afd20f7cdab2e94cdbf6ba9c509d656ace643a81c40a985a"; + name = "boost_1_86_0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/boost_1_86_0.tar.xz"; + sha256 = "efd6d4ce7e8571ba86f77a30bee2d3dd8dccd306721351464fc6998dd00b0c8c"; md5 = ""; - md5name = "4e23218ff5036d57afd20f7cdab2e94cdbf6ba9c509d656ace643a81c40a985a-boost_1_85_0.tar.xz"; + md5name = "efd6d4ce7e8571ba86f77a30bee2d3dd8dccd306721351464fc6998dd00b0c8c-boost_1_86_0.tar.xz"; } { name = "box2d-2.4.1.tar.gz"; @@ -56,11 +56,11 @@ md5name = "4eebc4c2bad0402bc3f501db184417094657d111fb6c06f076a82ea191fe1faf-cairo-1.17.6.tar.xz"; } { - name = "libcdr-0.1.7.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libcdr-0.1.7.tar.xz"; - sha256 = "5666249d613466b9aa1e987ea4109c04365866e9277d80f6cd9663e86b8ecdd4"; + name = "libcdr-0.1.8.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libcdr-0.1.8.tar.xz"; + sha256 = "ced677c8300b29c91d3004bb1dddf0b99761bf5544991c26c2ee8f427e87193c"; md5 = ""; - md5name = "5666249d613466b9aa1e987ea4109c04365866e9277d80f6cd9663e86b8ecdd4-libcdr-0.1.7.tar.xz"; + md5name = "ced677c8300b29c91d3004bb1dddf0b99761bf5544991c26c2ee8f427e87193c-libcdr-0.1.8.tar.xz"; } { name = "clucene-core-2.3.3.4.tar.gz"; @@ -105,11 +105,11 @@ md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz"; } { - name = "curl-8.11.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/curl-8.11.0.tar.xz"; - sha256 = "db59cf0d671ca6e7f5c2c5ec177084a33a79e04c97e71cf183a5cdea235054eb"; + name = "curl-8.11.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/curl-8.11.1.tar.xz"; + sha256 = "c7ca7db48b0909743eaef34250da02c19bc61d4f1dcedd6603f109409536ab56"; md5 = ""; - md5name = "db59cf0d671ca6e7f5c2c5ec177084a33a79e04c97e71cf183a5cdea235054eb-curl-8.11.0.tar.xz"; + md5name = "c7ca7db48b0909743eaef34250da02c19bc61d4f1dcedd6603f109409536ab56-curl-8.11.1.tar.xz"; } { name = "libe-book-0.1.3.tar.xz"; @@ -140,11 +140,11 @@ md5name = "03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad-libepubgen-0.1.1.tar.xz"; } { - name = "libetonyek-0.1.10.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libetonyek-0.1.10.tar.xz"; - sha256 = "b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a"; + name = "libetonyek-0.1.12.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libetonyek-0.1.12.tar.xz"; + sha256 = "b9fa82fbeb8cb7a701101060e4f3e1e4ef7c38f574b2859d3ecbe43604c21f83"; md5 = ""; - md5name = "b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a-libetonyek-0.1.10.tar.xz"; + md5name = "b9fa82fbeb8cb7a701101060e4f3e1e4ef7c38f574b2859d3ecbe43604c21f83-libetonyek-0.1.12.tar.xz"; } { name = "expat-2.6.4.tar.xz"; @@ -224,18 +224,18 @@ md5name = "1b6880e4b8df09c3b9e246d6084bfd94bf32a0ffff60cf2dcffd3622d0e2d79f-NotoKufiArabic-v2.109.zip"; } { - name = "NotoSans-v2.014.zip"; - url = "https://dev-www.libreoffice.org/src/NotoSans-v2.014.zip"; - sha256 = "1dffbaf31a0a699ee2c57dfb60c1a628010425301dd076cfb485adbe017352c1"; + name = "NotoSans-v2.015.zip"; + url = "https://dev-www.libreoffice.org/src/NotoSans-v2.015.zip"; + sha256 = "0c34df072a3fa7efbb7cbf34950e1f971a4447cffe365d3a359e2d4089b958f5"; md5 = ""; - md5name = "1dffbaf31a0a699ee2c57dfb60c1a628010425301dd076cfb485adbe017352c1-NotoSans-v2.014.zip"; + md5name = "0c34df072a3fa7efbb7cbf34950e1f971a4447cffe365d3a359e2d4089b958f5-NotoSans-v2.015.zip"; } { - name = "NotoSerif-v2.014.zip"; - url = "https://dev-www.libreoffice.org/src/NotoSerif-v2.014.zip"; - sha256 = "6abce0a80df4ef6d5a944d60c81099364481d6a7015b0721d87bc4c16acc1fd3"; + name = "NotoSerif-v2.015.zip"; + url = "https://dev-www.libreoffice.org/src/NotoSerif-v2.015.zip"; + sha256 = "0e9a43c8a4b94ac76f55069ed1d7385bbcaf6b99527a94deb5619e032b7e76c1"; md5 = ""; - md5name = "6abce0a80df4ef6d5a944d60c81099364481d6a7015b0721d87bc4c16acc1fd3-NotoSerif-v2.014.zip"; + md5name = "0e9a43c8a4b94ac76f55069ed1d7385bbcaf6b99527a94deb5619e032b7e76c1-NotoSerif-v2.015.zip"; } { name = "NotoSerifHebrew-v2.004.zip"; @@ -315,11 +315,11 @@ md5name = "b12a1ff762680681b7ce4d98dd29a7f54d90f5bcadd10c955afc640a27b3a268-NotoSansLisu-v2.102.zip"; } { - name = "culmus-0.133.tar.gz"; - url = "https://dev-www.libreoffice.org/src/culmus-0.133.tar.gz"; - sha256 = "c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05"; + name = "culmus-0.140.tar.gz"; + url = "https://dev-www.libreoffice.org/src/culmus-0.140.tar.gz"; + sha256 = "6daed104481007752a76905000e71c0093c591c8ef3017d1b18222c277fc52e3"; md5 = ""; - md5name = "c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05-culmus-0.133.tar.gz"; + md5name = "6daed104481007752a76905000e71c0093c591c8ef3017d1b18222c277fc52e3-culmus-0.140.tar.gz"; } { name = "libre-hebrew-1.0.tar.gz"; @@ -356,6 +356,55 @@ md5 = ""; md5name = "251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5-Scheherazade-2.100.zip"; } + { + name = "Agdasima-2.002.zip"; + url = "https://dev-www.libreoffice.org/src/Agdasima-2.002.zip"; + sha256 = "b4c17499f8bc183320ffdcf1f8491c778dd68a237adc056dc08e1fcb2da488f3"; + md5 = ""; + md5name = "b4c17499f8bc183320ffdcf1f8491c778dd68a237adc056dc08e1fcb2da488f3-Agdasima-2.002.zip"; + } + { + name = "Bacasime_Antique-2.000.zip"; + url = "https://dev-www.libreoffice.org/src/Bacasime_Antique-2.000.zip"; + sha256 = "81127cebc97d4ee0b950c2bc2d6be0ed29abfe0d5988435eb9a39e382557250a"; + md5 = ""; + md5name = "81127cebc97d4ee0b950c2bc2d6be0ed29abfe0d5988435eb9a39e382557250a-Bacasime_Antique-2.000.zip"; + } + { + name = "Belanosima-2.000.zip"; + url = "https://dev-www.libreoffice.org/src/Belanosima-2.000.zip"; + sha256 = "9c30e9e7cdb0797b651113a77f6b789659b8d8598a466b2ba92754e9dec30449"; + md5 = ""; + md5name = "9c30e9e7cdb0797b651113a77f6b789659b8d8598a466b2ba92754e9dec30449-Belanosima-2.000.zip"; + } + { + name = "Caprasimo-1.001.zip"; + url = "https://dev-www.libreoffice.org/src/Caprasimo-1.001.zip"; + sha256 = "f066d27cfc99b6601083be102d08b4039da8d2834e2795aabd890f16c6fd1b9b"; + md5 = ""; + md5name = "f066d27cfc99b6601083be102d08b4039da8d2834e2795aabd890f16c6fd1b9b-Caprasimo-1.001.zip"; + } + { + name = "Lugrasimo-1.001.zip"; + url = "https://dev-www.libreoffice.org/src/Lugrasimo-1.001.zip"; + sha256 = "db24dff31e8ddf6a113556c947a219f9534b072852e9ce2079a08c94854a7503"; + md5 = ""; + md5name = "db24dff31e8ddf6a113556c947a219f9534b072852e9ce2079a08c94854a7503-Lugrasimo-1.001.zip"; + } + { + name = "Lumanosimo-1.010.zip"; + url = "https://dev-www.libreoffice.org/src/Lumanosimo-1.010.zip"; + sha256 = "d4545ad6afded9a55d9a7728cfc7453cf5637861db87aafe0a730676a0cb960f"; + md5 = ""; + md5name = "d4545ad6afded9a55d9a7728cfc7453cf5637861db87aafe0a730676a0cb960f-Lumanosimo-1.010.zip"; + } + { + name = "Lunasima-2.009.zip"; + url = "https://dev-www.libreoffice.org/src/Lunasima-2.009.zip"; + sha256 = "4302809cf4b95b481bec53de87484d919b391c90a518d065f6c775fd435a5393"; + md5 = ""; + md5name = "4302809cf4b95b481bec53de87484d919b391c90a518d065f6c775fd435a5393-Lunasima-2.009.zip"; + } { name = "libfreehand-0.1.2.tar.xz"; url = "https://dev-www.libreoffice.org/src/libfreehand-0.1.2.tar.xz"; @@ -364,18 +413,18 @@ md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz"; } { - name = "freetype-2.13.2.tar.xz"; - url = "https://dev-www.libreoffice.org/src/freetype-2.13.2.tar.xz"; - sha256 = "12991c4e55c506dd7f9b765933e62fd2be2e06d421505d7950a132e4f1bb484d"; + name = "freetype-2.13.3.tar.xz"; + url = "https://dev-www.libreoffice.org/src/freetype-2.13.3.tar.xz"; + sha256 = "0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289"; md5 = ""; - md5name = "12991c4e55c506dd7f9b765933e62fd2be2e06d421505d7950a132e4f1bb484d-freetype-2.13.2.tar.xz"; + md5name = "0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289-freetype-2.13.3.tar.xz"; } { - name = "frozen-1.1.1.tar.gz"; - url = "https://dev-www.libreoffice.org/src/frozen-1.1.1.tar.gz"; - sha256 = "f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45"; + name = "frozen-1.2.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/frozen-1.2.0.tar.gz"; + sha256 = "ed8339c017d7c5fe019ac2c642477f435278f0dc643c1d69d3f3b1e95915e823"; md5 = ""; - md5name = "f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45-frozen-1.1.1.tar.gz"; + md5name = "ed8339c017d7c5fe019ac2c642477f435278f0dc643c1d69d3f3b1e95915e823-frozen-1.2.0.tar.gz"; } { name = "glm-1.0.1.zip"; @@ -385,11 +434,11 @@ md5name = "09c5716296787e1f7fcb87b1cbdbf26814ec1288ed6259ccd30d5d9795809fa5-glm-1.0.1.zip"; } { - name = "gpgme-1.23.2.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/gpgme-1.23.2.tar.bz2"; - sha256 = "9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224"; + name = "gpgme-1.24.1.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/gpgme-1.24.1.tar.bz2"; + sha256 = "ea05d0258e71061d61716584ec34cef59330a91340571edc46b78374973ba85f"; md5 = ""; - md5name = "9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224-gpgme-1.23.2.tar.bz2"; + md5name = "ea05d0258e71061d61716584ec34cef59330a91340571edc46b78374973ba85f-gpgme-1.24.1.tar.bz2"; } { name = "graphite2-minimal-1.3.14.tgz"; @@ -434,25 +483,25 @@ md5name = "0e279003f5199f80031c6dcd08f79d6f65a0505139160e7df0d09b226bff4023-IAccessible2-1.3+git20231013.3d8c7f0.tar.gz"; } { - name = "icu4c-74_2-src.tgz"; - url = "https://dev-www.libreoffice.org/src/icu4c-74_2-src.tgz"; - sha256 = "68db082212a96d6f53e35d60f47d38b962e9f9d207a74cfac78029ae8ff5e08c"; + name = "icu4c-75_1-src.tgz"; + url = "https://dev-www.libreoffice.org/src/icu4c-75_1-src.tgz"; + sha256 = "cb968df3e4d2e87e8b11c49a5d01c787bd13b9545280fc6642f826527618caef"; md5 = ""; - md5name = "68db082212a96d6f53e35d60f47d38b962e9f9d207a74cfac78029ae8ff5e08c-icu4c-74_2-src.tgz"; + md5name = "cb968df3e4d2e87e8b11c49a5d01c787bd13b9545280fc6642f826527618caef-icu4c-75_1-src.tgz"; } { - name = "icu4c-74_2-data.zip"; - url = "https://dev-www.libreoffice.org/src/icu4c-74_2-data.zip"; - sha256 = "c28c3ca5f4ba3384781797138a294ca360988d4322674ad4d51e52f5d9b0a2b6"; + name = "icu4c-75_1-data.zip"; + url = "https://dev-www.libreoffice.org/src/icu4c-75_1-data.zip"; + sha256 = "a5104212dc317a64f9b035723ea706f2f4fd5a0f37b7923fae7aeb9d1d0061b1"; md5 = ""; - md5name = "c28c3ca5f4ba3384781797138a294ca360988d4322674ad4d51e52f5d9b0a2b6-icu4c-74_2-data.zip"; + md5name = "a5104212dc317a64f9b035723ea706f2f4fd5a0f37b7923fae7aeb9d1d0061b1-icu4c-75_1-data.zip"; } { - name = "Java-WebSocket-1.5.6.tar.gz"; - url = "https://dev-www.libreoffice.org/src/Java-WebSocket-1.5.6.tar.gz"; - sha256 = "167e86561cd7b5ed21b67d7543536134edcb14b373892739b28c417566a3832f"; + name = "Java-WebSocket-1.6.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/Java-WebSocket-1.6.0.tar.gz"; + sha256 = "f3ce29efde338707241d47ab4784b19a1e3658bfa0564b5bc5f80c27e5118728"; md5 = ""; - md5name = "167e86561cd7b5ed21b67d7543536134edcb14b373892739b28c417566a3832f-Java-WebSocket-1.5.6.tar.gz"; + md5name = "f3ce29efde338707241d47ab4784b19a1e3658bfa0564b5bc5f80c27e5118728-Java-WebSocket-1.6.0.tar.gz"; } { name = "flow-engine-0.9.4.zip"; @@ -539,11 +588,11 @@ md5name = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf-libjpeg-turbo-2.1.5.1.tar.gz"; } { - name = "language-subtag-registry-2024-06-14.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2024-06-14.tar.bz2"; - sha256 = "75bc394dd83ddfd62b172a462db1b66bdb5950f40823ed63b8c7db6b71e37e75"; + name = "language-subtag-registry-2025-01-21.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2025-01-21.tar.bz2"; + sha256 = "06b37484c2736816e84b8bdd2075011d5961c2316865bc2795831230b925608d"; md5 = ""; - md5name = "75bc394dd83ddfd62b172a462db1b66bdb5950f40823ed63b8c7db6b71e37e75-language-subtag-registry-2024-06-14.tar.bz2"; + md5name = "06b37484c2736816e84b8bdd2075011d5961c2316865bc2795831230b925608d-language-subtag-registry-2025-01-21.tar.bz2"; } { name = "lcms2-2.16.tar.gz"; @@ -581,18 +630,18 @@ md5name = "df0a59d413a5b202573d8d4f5159e33a8538da4f8e8e60979facc64d6290cebd-libexttextcat-3.4.7.tar.xz"; } { - name = "libffi-3.4.4.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libffi-3.4.4.tar.gz"; - sha256 = "d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676"; + name = "libffi-3.4.6.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libffi-3.4.6.tar.gz"; + sha256 = "b0dea9df23c863a7a50e825440f3ebffabd65df1497108e5d437747843895a4e"; md5 = ""; - md5name = "d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676-libffi-3.4.4.tar.gz"; + md5name = "b0dea9df23c863a7a50e825440f3ebffabd65df1497108e5d437747843895a4e-libffi-3.4.6.tar.gz"; } { - name = "libgpg-error-1.50.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/libgpg-error-1.50.tar.bz2"; - sha256 = "69405349e0a633e444a28c5b35ce8f14484684518a508dc48a089992fe93e20a"; + name = "libgpg-error-1.51.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libgpg-error-1.51.tar.bz2"; + sha256 = "be0f1b2db6b93eed55369cdf79f19f72750c8c7c39fc20b577e724545427e6b2"; md5 = ""; - md5name = "69405349e0a633e444a28c5b35ce8f14484684518a508dc48a089992fe93e20a-libgpg-error-1.50.tar.bz2"; + md5name = "be0f1b2db6b93eed55369cdf79f19f72750c8c7c39fc20b577e724545427e6b2-libgpg-error-1.51.tar.bz2"; } { name = "liblangtag-0.6.7.tar.bz2"; @@ -616,32 +665,32 @@ md5name = "296272d93435991308eb73607600c034b558807a07e829e751142e65ccfa9d08-ltm-1.3.0.tar.xz"; } { - name = "libwebp-1.4.0.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libwebp-1.4.0.tar.gz"; - sha256 = "61f873ec69e3be1b99535634340d5bde750b2e4447caa1db9f61be3fd49ab1e5"; + name = "libwebp-1.5.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libwebp-1.5.0.tar.gz"; + sha256 = "7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c"; md5 = ""; - md5name = "61f873ec69e3be1b99535634340d5bde750b2e4447caa1db9f61be3fd49ab1e5-libwebp-1.4.0.tar.gz"; + md5name = "7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c-libwebp-1.5.0.tar.gz"; } { - name = "xmlsec1-1.3.5.tar.gz"; - url = "https://dev-www.libreoffice.org/src/xmlsec1-1.3.5.tar.gz"; - sha256 = "2ffd4ad1f860ec93e47a680310ab2bc94968bd07566e71976bd96133d9504917"; + name = "xmlsec1-1.3.6.tar.gz"; + url = "https://dev-www.libreoffice.org/src/xmlsec1-1.3.6.tar.gz"; + sha256 = "952b626ad3f3be1a4598622dab52fdab2a8604d0837c1b00589f3637535af92f"; md5 = ""; - md5name = "2ffd4ad1f860ec93e47a680310ab2bc94968bd07566e71976bd96133d9504917-xmlsec1-1.3.5.tar.gz"; + md5name = "952b626ad3f3be1a4598622dab52fdab2a8604d0837c1b00589f3637535af92f-xmlsec1-1.3.6.tar.gz"; } { - name = "libxml2-2.12.9.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libxml2-2.12.9.tar.xz"; - sha256 = "59912db536ab56a3996489ea0299768c7bcffe57169f0235e7f962a91f483590"; + name = "libxml2-2.13.5.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxml2-2.13.5.tar.xz"; + sha256 = "74fc163217a3964257d3be39af943e08861263c4231f9ef5b496b6f6d4c7b2b6"; md5 = ""; - md5name = "59912db536ab56a3996489ea0299768c7bcffe57169f0235e7f962a91f483590-libxml2-2.12.9.tar.xz"; + md5name = "74fc163217a3964257d3be39af943e08861263c4231f9ef5b496b6f6d4c7b2b6-libxml2-2.13.5.tar.xz"; } { - name = "libxslt-1.1.41.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libxslt-1.1.41.tar.xz"; - sha256 = "3ad392af91115b7740f7b50d228cc1c5fc13afc1da7f16cb0213917a37f71bda"; + name = "libxslt-1.1.42.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxslt-1.1.42.tar.xz"; + sha256 = "85ca62cac0d41fc77d3f6033da9df6fd73d20ea2fc18b0a3609ffb4110e1baeb"; md5 = ""; - md5name = "3ad392af91115b7740f7b50d228cc1c5fc13afc1da7f16cb0213917a37f71bda-libxslt-1.1.41.tar.xz"; + md5name = "85ca62cac0d41fc77d3f6033da9df6fd73d20ea2fc18b0a3609ffb4110e1baeb-libxslt-1.1.42.tar.xz"; } { name = "lp_solve_5.5.tar.gz"; @@ -651,18 +700,18 @@ md5name = "26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"; } { - name = "lxml-5.2.2.tar.gz"; - url = "https://dev-www.libreoffice.org/src/lxml-5.2.2.tar.gz"; - sha256 = "bb2dc4898180bea79863d5487e5f9c7c34297414bad54bcd0f0852aee9cfdb87"; + name = "lxml-5.3.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/lxml-5.3.0.tar.gz"; + sha256 = "4e109ca30d1edec1ac60cdbe341905dc3b8f55b16855e03a54aaf59e51ec8c6f"; md5 = ""; - md5name = "bb2dc4898180bea79863d5487e5f9c7c34297414bad54bcd0f0852aee9cfdb87-lxml-5.2.2.tar.gz"; + md5name = "4e109ca30d1edec1ac60cdbe341905dc3b8f55b16855e03a54aaf59e51ec8c6f-lxml-5.3.0.tar.gz"; } { - name = "mariadb-connector-c-3.3.11-src.tar.gz"; - url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.11-src.tar.gz"; - sha256 = "f7ba02f70aa2ae2b13e9ee5acc78423f6bede38998afb91326a62be46cf5956a"; + name = "mariadb-connector-c-3.3.13-src.tar.gz"; + url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.13-src.tar.gz"; + sha256 = "1c03c30b394871ab354dbdb47574beae19e2657da21a911ecc9e33e9388a3bef"; md5 = ""; - md5name = "f7ba02f70aa2ae2b13e9ee5acc78423f6bede38998afb91326a62be46cf5956a-mariadb-connector-c-3.3.11-src.tar.gz"; + md5name = "1c03c30b394871ab354dbdb47574beae19e2657da21a911ecc9e33e9388a3bef-mariadb-connector-c-3.3.13-src.tar.gz"; } { name = "mdds-2.1.1.tar.xz"; @@ -735,11 +784,11 @@ md5name = "37206cf981e8409d048b59ac5839621ea107ff49af72beb9d7769a2f41da8d90-onlineupdate-c003be8b9727672e7d30972983b375f4c200233f-2.tar.xz"; } { - name = "openldap-2.6.8.tgz"; - url = "https://dev-www.libreoffice.org/src/openldap-2.6.8.tgz"; - sha256 = "48969323e94e3be3b03c6a132942dcba7ef8d545f2ad35401709019f696c3c4e"; + name = "openldap-2.6.9.tgz"; + url = "https://dev-www.libreoffice.org/src/openldap-2.6.9.tgz"; + sha256 = "2cb7dc73e9c8340dff0d99357fbaa578abf30cc6619f0521972c555681e6b2ff"; md5 = ""; - md5name = "48969323e94e3be3b03c6a132942dcba7ef8d545f2ad35401709019f696c3c4e-openldap-2.6.8.tgz"; + md5name = "2cb7dc73e9c8340dff0d99357fbaa578abf30cc6619f0521972c555681e6b2ff-openldap-2.6.9.tgz"; } { name = "openssl-3.0.15.tar.gz"; @@ -763,11 +812,11 @@ md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-6425.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/pdfium-6425.tar.bz2"; - sha256 = "fe0291b96d7352bac530d13ef2e5fd63ad9980e0128911f88b957b5992508f1c"; + name = "pdfium-6764.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/pdfium-6764.tar.bz2"; + sha256 = "59d5df3b38312b069d96a8de9d4f8d7f44a29835c9dc82bd792ea02be86c4e49"; md5 = ""; - md5name = "fe0291b96d7352bac530d13ef2e5fd63ad9980e0128911f88b957b5992508f1c-pdfium-6425.tar.bz2"; + md5name = "59d5df3b38312b069d96a8de9d4f8d7f44a29835c9dc82bd792ea02be86c4e49-pdfium-6764.tar.bz2"; } { name = "pixman-0.42.2.tar.gz"; @@ -777,11 +826,11 @@ md5name = "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e-pixman-0.42.2.tar.gz"; } { - name = "libpng-1.6.44.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libpng-1.6.44.tar.xz"; - sha256 = "60c4da1d5b7f0aa8d158da48e8f8afa9773c1c8baa5d21974df61f1886b8ce8e"; + name = "libpng-1.6.45.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libpng-1.6.45.tar.xz"; + sha256 = "926485350139ffb51ef69760db35f78846c805fef3d59bfdcb2fba704663f370"; md5 = ""; - md5name = "60c4da1d5b7f0aa8d158da48e8f8afa9773c1c8baa5d21974df61f1886b8ce8e-libpng-1.6.44.tar.xz"; + md5name = "926485350139ffb51ef69760db35f78846c805fef3d59bfdcb2fba704663f370-libpng-1.6.45.tar.xz"; } { name = "tiff-4.7.0.tar.xz"; @@ -791,11 +840,11 @@ md5name = "273a0a73b1f0bed640afee4a5df0337357ced5b53d3d5d1c405b936501f71017-tiff-4.7.0.tar.xz"; } { - name = "poppler-24.08.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/poppler-24.08.0.tar.xz"; - sha256 = "97453fbddf0c9a9eafa0ea45ac710d3d49bcf23a62e864585385d3c0b4403174"; + name = "poppler-25.01.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/poppler-25.01.0.tar.xz"; + sha256 = "7eefc122207bbbd72a303c5e0743f4941e8ae861e24dcf0501e18ce1d1414112"; md5 = ""; - md5name = "97453fbddf0c9a9eafa0ea45ac710d3d49bcf23a62e864585385d3c0b4403174-poppler-24.08.0.tar.xz"; + md5name = "7eefc122207bbbd72a303c5e0743f4941e8ae861e24dcf0501e18ce1d1414112-poppler-25.01.0.tar.xz"; } { name = "poppler-data-0.4.12.tar.gz"; @@ -805,18 +854,18 @@ md5name = "c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74-poppler-data-0.4.12.tar.gz"; } { - name = "postgresql-13.16.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/postgresql-13.16.tar.bz2"; - sha256 = "c9cbbb6129f02328204828066bb3785c00a85c8ca8fd329c2a8a53c1f5cd8865"; + name = "postgresql-14.15.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/postgresql-14.15.tar.bz2"; + sha256 = "02e891e314b4e9ee24cbd78028dab7c73f9c1ba3e30835bcbef71fe220401fc5"; md5 = ""; - md5name = "c9cbbb6129f02328204828066bb3785c00a85c8ca8fd329c2a8a53c1f5cd8865-postgresql-13.16.tar.bz2"; + md5name = "02e891e314b4e9ee24cbd78028dab7c73f9c1ba3e30835bcbef71fe220401fc5-postgresql-14.15.tar.bz2"; } { - name = "Python-3.9.20.tar.xz"; - url = "https://dev-www.libreoffice.org/src/Python-3.9.20.tar.xz"; - sha256 = "6b281279efd85294d2d6993e173983a57464c0133956fbbb5536ec9646beaf0c"; + name = "Python-3.10.16.tar.xz"; + url = "https://dev-www.libreoffice.org/src/Python-3.10.16.tar.xz"; + sha256 = "bfb249609990220491a1b92850a07135ed0831e41738cf681d63cf01b2a8fbd1"; md5 = ""; - md5name = "6b281279efd85294d2d6993e173983a57464c0133956fbbb5536ec9646beaf0c-Python-3.9.20.tar.xz"; + md5name = "bfb249609990220491a1b92850a07135ed0831e41738cf681d63cf01b2a8fbd1-Python-3.10.16.tar.xz"; } { name = "libqxp-0.0.2.tar.xz"; @@ -826,11 +875,11 @@ md5name = "e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c-libqxp-0.0.2.tar.xz"; } { - name = "raptor2-2.0.15.tar.gz"; - url = "https://dev-www.libreoffice.org/src/a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz"; - sha256 = "ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed"; - md5 = "a39f6c07ddb20d7dd2ff1f95fa21e2cd"; - md5name = "a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz"; + name = "raptor2-2.0.16.tar.gz"; + url = "https://dev-www.libreoffice.org/src/raptor2-2.0.16.tar.gz"; + sha256 = "089db78d7ac982354bdbf39d973baf09581e6904ac4c92a98c5caadb3de44680"; + md5 = ""; + md5name = "089db78d7ac982354bdbf39d973baf09581e6904ac4c92a98c5caadb3de44680-raptor2-2.0.16.tar.gz"; } { name = "rasqal-0.9.33.tar.gz"; @@ -854,18 +903,18 @@ md5name = "5892ca6796f7a2a93d580832e907e849b19d980b40d326a283b18877ab6de0c5-librevenge-0.0.5.tar.bz2"; } { - name = "rhino-1.7.14.zip"; - url = "https://dev-www.libreoffice.org/src/rhino-1.7.14.zip"; - sha256 = "bf4d2d0c5ff8889fd494486db09291cb7965f0bf2f93ef005d3b08070a5a4f5c"; + name = "rhino-1.7.15.zip"; + url = "https://dev-www.libreoffice.org/src/rhino-1.7.15.zip"; + sha256 = "42fce6baf1bf789b62bf938b8e8ec18a1ac92c989dd6e7221e9531454cbd97fa"; md5 = ""; - md5name = "bf4d2d0c5ff8889fd494486db09291cb7965f0bf2f93ef005d3b08070a5a4f5c-rhino-1.7.14.zip"; + md5name = "42fce6baf1bf789b62bf938b8e8ec18a1ac92c989dd6e7221e9531454cbd97fa-rhino-1.7.15.zip"; } { - name = "skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz"; - url = "https://dev-www.libreoffice.org/src/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz"; - sha256 = "2223ebce534458a37826e8fe4f24635b0712cde7ed1bd3208f089f6fdd796e01"; + name = "skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz"; + url = "https://dev-www.libreoffice.org/src/skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz"; + sha256 = "53f55303821158b6de9e6b90f1cc3a548611a7e430c1a0883ff159a8db89677d"; md5 = ""; - md5name = "2223ebce534458a37826e8fe4f24635b0712cde7ed1bd3208f089f6fdd796e01-skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz"; + md5name = "53f55303821158b6de9e6b90f1cc3a548611a7e430c1a0883ff159a8db89677d-skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz"; } { name = "libstaroffice-0.0.7.tar.xz"; diff --git a/pkgs/applications/office/libreoffice/src-fresh/help.nix b/pkgs/applications/office/libreoffice/src-fresh/help.nix index 9e0d85a01d75..47ce1f1ad9b0 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/help.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/help.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "04z77jzn816r19ig54fhl0p1arh3fpamn5bh2wc2v17rz73chp8y"; - url = "https://download.documentfoundation.org/libreoffice/src/24.8.3/libreoffice-help-24.8.3.2.tar.xz"; + sha256 = "1pfkmv9ad9n4w0yic0l3kqx9qs7v6vjakslrqr7laa2pxyl04zsz"; + url = "https://download.documentfoundation.org/libreoffice/src/25.2.0/libreoffice-help-25.2.0.3.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-fresh/main.nix b/pkgs/applications/office/libreoffice/src-fresh/main.nix index 871d41255bb9..8158b2236efd 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/main.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/main.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "1sa7bxxh7v26p77vj1mspynhn2l2b1vnz1mpyczhnmcxcan9nw2x"; - url = "https://download.documentfoundation.org/libreoffice/src/24.8.3/libreoffice-24.8.3.2.tar.xz"; + sha256 = "1d15sn9zq40qfjxwm9cqgj7big8mk4mviz6i825qbfzq6vblh94q"; + url = "https://download.documentfoundation.org/libreoffice/src/25.2.0/libreoffice-25.2.0.3.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-fresh/translations.nix b/pkgs/applications/office/libreoffice/src-fresh/translations.nix index cdc786d80e6a..9df9c51efc87 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/translations.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/translations.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "11qwbkn2i84g439ya5fw5by7wf4c8rs7is4k2v7yijpngrp9370a"; - url = "https://download.documentfoundation.org/libreoffice/src/24.8.3/libreoffice-translations-24.8.3.2.tar.xz"; + sha256 = "1sxcmkclwbzbq34mjxwkjj58qj8xf4vgnlzpyfxnmawwhnsq9x9f"; + url = "https://download.documentfoundation.org/libreoffice/src/25.2.0/libreoffice-translations-25.2.0.3.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-fresh/version.nix b/pkgs/applications/office/libreoffice/src-fresh/version.nix index 42484acdfd9c..5e70b4c8f84e 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/version.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/version.nix @@ -1 +1 @@ -"24.8.3.2" +"25.2.0.3" From 5fdddf2e7a5b302b031b263a7f7f4b8120ce7f7c Mon Sep 17 00:00:00 2001 From: Tert0 Date: Thu, 6 Feb 2025 19:49:19 +0000 Subject: [PATCH 0317/2168] libreoffice-still-unwrapped: 24.2.7.2 -> 24.8.4.2 --- .../office/libreoffice/src-still/deps.nix | 331 +++++++++--------- .../office/libreoffice/src-still/help.nix | 4 +- .../office/libreoffice/src-still/main.nix | 4 +- .../libreoffice/src-still/translations.nix | 4 +- .../office/libreoffice/src-still/version.nix | 2 +- 5 files changed, 169 insertions(+), 176 deletions(-) diff --git a/pkgs/applications/office/libreoffice/src-still/deps.nix b/pkgs/applications/office/libreoffice/src-still/deps.nix index 5f406733814a..bcc3344b5bad 100644 --- a/pkgs/applications/office/libreoffice/src-still/deps.nix +++ b/pkgs/applications/office/libreoffice/src-still/deps.nix @@ -14,11 +14,11 @@ md5name = "daf972a89577f8772602bf2eb38b6a3dd3d922bf5724d45e7f9589b5e830442c-phc-winner-argon2-20190702.tar.gz"; } { - name = "boost_1_82_0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/boost_1_82_0.tar.xz"; - sha256 = "e48ab6953fbd68ba47234bea5173e62427e9f6a7894e152305142895cfe955de"; + name = "boost_1_85_0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/boost_1_85_0.tar.xz"; + sha256 = "4e23218ff5036d57afd20f7cdab2e94cdbf6ba9c509d656ace643a81c40a985a"; md5 = ""; - md5name = "e48ab6953fbd68ba47234bea5173e62427e9f6a7894e152305142895cfe955de-boost_1_82_0.tar.xz"; + md5name = "4e23218ff5036d57afd20f7cdab2e94cdbf6ba9c509d656ace643a81c40a985a-boost_1_85_0.tar.xz"; } { name = "box2d-2.4.1.tar.gz"; @@ -35,11 +35,11 @@ md5name = "c44a2e898895cfc13b42d2371ba4b88b0777d7782214d6cdc91c33720f3b0d91-breakpad-b324760c7f53667af128a6b77b790323da04fcb9.tar.xz"; } { - name = "bsh-2.0b6-src.zip"; - url = "https://dev-www.libreoffice.org/src/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip"; - sha256 = "9e93c73e23aff644b17dfff656444474c14150e7f3b38b19635e622235e01c96"; - md5 = "beeca87be45ec87d241ddd0e1bad80c1"; - md5name = "beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip"; + name = "bsh-2.1.1-src.zip"; + url = "https://dev-www.libreoffice.org/src/bsh-2.1.1-src.zip"; + sha256 = "2248387ceaa319840434a3547a8b2fec12f95a8418ee039ce5ff5726053a139c"; + md5 = ""; + md5name = "2248387ceaa319840434a3547a8b2fec12f95a8418ee039ce5ff5726053a139c-bsh-2.1.1-src.zip"; } { name = "bzip2-1.0.8.tar.gz"; @@ -56,11 +56,11 @@ md5name = "4eebc4c2bad0402bc3f501db184417094657d111fb6c06f076a82ea191fe1faf-cairo-1.17.6.tar.xz"; } { - name = "libcdr-0.1.7.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libcdr-0.1.7.tar.xz"; - sha256 = "5666249d613466b9aa1e987ea4109c04365866e9277d80f6cd9663e86b8ecdd4"; + name = "libcdr-0.1.8.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libcdr-0.1.8.tar.xz"; + sha256 = "ced677c8300b29c91d3004bb1dddf0b99761bf5544991c26c2ee8f427e87193c"; md5 = ""; - md5name = "5666249d613466b9aa1e987ea4109c04365866e9277d80f6cd9663e86b8ecdd4-libcdr-0.1.7.tar.xz"; + md5name = "ced677c8300b29c91d3004bb1dddf0b99761bf5544991c26c2ee8f427e87193c-libcdr-0.1.8.tar.xz"; } { name = "clucene-core-2.3.3.4.tar.gz"; @@ -84,11 +84,11 @@ md5name = "0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4-dtoa-20180411.tgz"; } { - name = "libcmis-0.6.1.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libcmis-0.6.1.tar.xz"; - sha256 = "d54d19d86153dbc88e2d468f7136269a2cfe71b73227e12fded01d29ac268074"; + name = "libcmis-0.6.2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libcmis-0.6.2.tar.xz"; + sha256 = "1b5c2d7258ff93eb5f9958ff0e4dfd7332dc75a071bb717dde2217a26602a644"; md5 = ""; - md5name = "d54d19d86153dbc88e2d468f7136269a2cfe71b73227e12fded01d29ac268074-libcmis-0.6.1.tar.xz"; + md5name = "1b5c2d7258ff93eb5f9958ff0e4dfd7332dc75a071bb717dde2217a26602a644-libcmis-0.6.2.tar.xz"; } { name = "CoinMP-1.8.4.tgz"; @@ -105,11 +105,11 @@ md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz"; } { - name = "curl-8.10.1.tar.xz"; - url = "https://dev-www.libreoffice.org/src/curl-8.10.1.tar.xz"; - sha256 = "73a4b0e99596a09fa5924a4fb7e4b995a85fda0d18a2c02ab9cf134bebce04ee"; + name = "curl-8.11.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/curl-8.11.1.tar.xz"; + sha256 = "c7ca7db48b0909743eaef34250da02c19bc61d4f1dcedd6603f109409536ab56"; md5 = ""; - md5name = "73a4b0e99596a09fa5924a4fb7e4b995a85fda0d18a2c02ab9cf134bebce04ee-curl-8.10.1.tar.xz"; + md5name = "c7ca7db48b0909743eaef34250da02c19bc61d4f1dcedd6603f109409536ab56-curl-8.11.1.tar.xz"; } { name = "libe-book-0.1.3.tar.xz"; @@ -140,18 +140,18 @@ md5name = "03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad-libepubgen-0.1.1.tar.xz"; } { - name = "libetonyek-0.1.10.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libetonyek-0.1.10.tar.xz"; - sha256 = "b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a"; + name = "libetonyek-0.1.12.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libetonyek-0.1.12.tar.xz"; + sha256 = "b9fa82fbeb8cb7a701101060e4f3e1e4ef7c38f574b2859d3ecbe43604c21f83"; md5 = ""; - md5name = "b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a-libetonyek-0.1.10.tar.xz"; + md5name = "b9fa82fbeb8cb7a701101060e4f3e1e4ef7c38f574b2859d3ecbe43604c21f83-libetonyek-0.1.12.tar.xz"; } { - name = "expat-2.6.3.tar.xz"; - url = "https://dev-www.libreoffice.org/src/expat-2.6.3.tar.xz"; - sha256 = "274db254a6979bde5aad404763a704956940e465843f2a9bd9ed7af22e2c0efc"; + name = "expat-2.6.4.tar.xz"; + url = "https://dev-www.libreoffice.org/src/expat-2.6.4.tar.xz"; + sha256 = "a695629dae047055b37d50a0ff4776d1d45d0a4c842cf4ccee158441f55ff7ee"; md5 = ""; - md5name = "274db254a6979bde5aad404763a704956940e465843f2a9bd9ed7af22e2c0efc-expat-2.6.3.tar.xz"; + md5name = "a695629dae047055b37d50a0ff4776d1d45d0a4c842cf4ccee158441f55ff7ee-expat-2.6.4.tar.xz"; } { name = "Firebird-3.0.7.33374-0.tar.bz2"; @@ -161,11 +161,11 @@ md5name = "acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76-Firebird-3.0.7.33374-0.tar.bz2"; } { - name = "fontconfig-2.14.2.tar.xz"; - url = "https://dev-www.libreoffice.org/src/fontconfig-2.14.2.tar.xz"; - sha256 = "dba695b57bce15023d2ceedef82062c2b925e51f5d4cc4aef736cf13f60a468b"; + name = "fontconfig-2.15.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/fontconfig-2.15.0.tar.xz"; + sha256 = "63a0658d0e06e0fa886106452b58ef04f21f58202ea02a94c39de0d3335d7c0e"; md5 = ""; - md5name = "dba695b57bce15023d2ceedef82062c2b925e51f5d4cc4aef736cf13f60a468b-fontconfig-2.14.2.tar.xz"; + md5name = "63a0658d0e06e0fa886106452b58ef04f21f58202ea02a94c39de0d3335d7c0e-fontconfig-2.15.0.tar.xz"; } { name = "crosextrafonts-20130214.tar.gz"; @@ -203,11 +203,11 @@ md5name = "8879d89b5ff7b506c9fc28efc31a5c0b954bbe9333e66e5283d27d20a8519ea3-liberation-narrow-fonts-ttf-1.07.6.tar.gz"; } { - name = "liberation-fonts-ttf-2.1.4.tar.gz"; - url = "https://dev-www.libreoffice.org/src/liberation-fonts-ttf-2.1.4.tar.gz"; - sha256 = "26f85412dd0aa9d061504a1cc8aaf0aa12a70710e8d47d8b65a1251757c1a5ef"; + name = "liberation-fonts-ttf-2.1.5.tar.gz"; + url = "https://dev-www.libreoffice.org/src/liberation-fonts-ttf-2.1.5.tar.gz"; + sha256 = "7191c669bf38899f73a2094ed00f7b800553364f90e2637010a69c0e268f25d0"; md5 = ""; - md5name = "26f85412dd0aa9d061504a1cc8aaf0aa12a70710e8d47d8b65a1251757c1a5ef-liberation-fonts-ttf-2.1.4.tar.gz"; + md5name = "7191c669bf38899f73a2094ed00f7b800553364f90e2637010a69c0e268f25d0-liberation-fonts-ttf-2.1.5.tar.gz"; } { name = "LinLibertineG-20120116.zip"; @@ -224,18 +224,18 @@ md5name = "1b6880e4b8df09c3b9e246d6084bfd94bf32a0ffff60cf2dcffd3622d0e2d79f-NotoKufiArabic-v2.109.zip"; } { - name = "NotoSans-v2.012.zip"; - url = "https://dev-www.libreoffice.org/src/NotoSans-v2.012.zip"; - sha256 = "efef2f66ed2c5e005472cba156bd2afb68063a51bb628c6ee14143edc019d293"; + name = "NotoSans-v2.015.zip"; + url = "https://dev-www.libreoffice.org/src/NotoSans-v2.015.zip"; + sha256 = "0c34df072a3fa7efbb7cbf34950e1f971a4447cffe365d3a359e2d4089b958f5"; md5 = ""; - md5name = "efef2f66ed2c5e005472cba156bd2afb68063a51bb628c6ee14143edc019d293-NotoSans-v2.012.zip"; + md5name = "0c34df072a3fa7efbb7cbf34950e1f971a4447cffe365d3a359e2d4089b958f5-NotoSans-v2.015.zip"; } { - name = "NotoSerif-v2.012.zip"; - url = "https://dev-www.libreoffice.org/src/NotoSerif-v2.012.zip"; - sha256 = "3d4566a0e51e7fc14528f5a1eecc6f12e5ffbbec6484470d3da48b0d8ead345a"; + name = "NotoSerif-v2.015.zip"; + url = "https://dev-www.libreoffice.org/src/NotoSerif-v2.015.zip"; + sha256 = "0e9a43c8a4b94ac76f55069ed1d7385bbcaf6b99527a94deb5619e032b7e76c1"; md5 = ""; - md5name = "3d4566a0e51e7fc14528f5a1eecc6f12e5ffbbec6484470d3da48b0d8ead345a-NotoSerif-v2.012.zip"; + md5name = "0e9a43c8a4b94ac76f55069ed1d7385bbcaf6b99527a94deb5619e032b7e76c1-NotoSerif-v2.015.zip"; } { name = "NotoSerifHebrew-v2.004.zip"; @@ -280,11 +280,11 @@ md5name = "b21c198a4c76ae598a304decefb3b5c2a4c2d4c3ae226728eff359185f291c6f-NotoSerifArmenian-v2.008.zip"; } { - name = "NotoSansGeorgian-v2.003.zip"; - url = "https://dev-www.libreoffice.org/src/NotoSansGeorgian-v2.003.zip"; - sha256 = "bd75d1f0b9ef619b5ded0018d6258eeab2f9e976d8f8074bb7890f4e301648bf"; + name = "NotoSansGeorgian-v2.005.zip"; + url = "https://dev-www.libreoffice.org/src/NotoSansGeorgian-v2.005.zip"; + sha256 = "10e85011008108308e6feab0408242acb07804da61ede3d3ff236461ae07ab1b"; md5 = ""; - md5name = "bd75d1f0b9ef619b5ded0018d6258eeab2f9e976d8f8074bb7890f4e301648bf-NotoSansGeorgian-v2.003.zip"; + md5name = "10e85011008108308e6feab0408242acb07804da61ede3d3ff236461ae07ab1b-NotoSansGeorgian-v2.005.zip"; } { name = "NotoSerifGeorgian-v2.003.zip"; @@ -343,11 +343,11 @@ md5name = "926fe1bd7dfde8e55178281f645258bfced6420c951c6f2fd532fd21691bca30-Amiri-1.000.zip"; } { - name = "ReemKufi-1.2.zip"; - url = "https://dev-www.libreoffice.org/src/ReemKufi-1.2.zip"; - sha256 = "c4fd68a23c0ea471cc084ae7efe888da372b925cb208eeb0322c26792d2ef413"; + name = "ReemKufi-1.7.zip"; + url = "https://dev-www.libreoffice.org/src/ReemKufi-1.7.zip"; + sha256 = "2359f036c7bddeb4d5529d7b3c9139c3288c920cc26053d417cdbb563eafe0a4"; md5 = ""; - md5name = "c4fd68a23c0ea471cc084ae7efe888da372b925cb208eeb0322c26792d2ef413-ReemKufi-1.2.zip"; + md5name = "2359f036c7bddeb4d5529d7b3c9139c3288c920cc26053d417cdbb563eafe0a4-ReemKufi-1.7.zip"; } { name = "Scheherazade-2.100.zip"; @@ -364,11 +364,11 @@ md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz"; } { - name = "freetype-2.13.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/freetype-2.13.0.tar.xz"; - sha256 = "5ee23abd047636c24b2d43c6625dcafc66661d1aca64dec9e0d05df29592624c"; + name = "freetype-2.13.2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/freetype-2.13.2.tar.xz"; + sha256 = "12991c4e55c506dd7f9b765933e62fd2be2e06d421505d7950a132e4f1bb484d"; md5 = ""; - md5name = "5ee23abd047636c24b2d43c6625dcafc66661d1aca64dec9e0d05df29592624c-freetype-2.13.0.tar.xz"; + md5name = "12991c4e55c506dd7f9b765933e62fd2be2e06d421505d7950a132e4f1bb484d-freetype-2.13.2.tar.xz"; } { name = "frozen-1.1.1.tar.gz"; @@ -378,18 +378,18 @@ md5name = "f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45-frozen-1.1.1.tar.gz"; } { - name = "glm-0.9.9.8.zip"; - url = "https://dev-www.libreoffice.org/src/glm-0.9.9.8.zip"; - sha256 = "6bba5f032bed47c73ad9397f2313b9acbfb56253d0d0576b5873d3dcb25e99ad"; + name = "glm-1.0.1.zip"; + url = "https://dev-www.libreoffice.org/src/glm-1.0.1.zip"; + sha256 = "09c5716296787e1f7fcb87b1cbdbf26814ec1288ed6259ccd30d5d9795809fa5"; md5 = ""; - md5name = "6bba5f032bed47c73ad9397f2313b9acbfb56253d0d0576b5873d3dcb25e99ad-glm-0.9.9.8.zip"; + md5name = "09c5716296787e1f7fcb87b1cbdbf26814ec1288ed6259ccd30d5d9795809fa5-glm-1.0.1.zip"; } { - name = "gpgme-1.23.2.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/gpgme-1.23.2.tar.bz2"; - sha256 = "9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224"; + name = "gpgme-1.24.0.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/gpgme-1.24.0.tar.bz2"; + sha256 = "61e3a6ad89323fecfaff176bc1728fb8c3312f2faa83424d9d5077ba20f5f7da"; md5 = ""; - md5name = "9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224-gpgme-1.23.2.tar.bz2"; + md5name = "61e3a6ad89323fecfaff176bc1728fb8c3312f2faa83424d9d5077ba20f5f7da-gpgme-1.24.0.tar.bz2"; } { name = "graphite2-minimal-1.3.14.tgz"; @@ -399,11 +399,11 @@ md5name = "b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc-graphite2-minimal-1.3.14.tgz"; } { - name = "harfbuzz-8.2.2.tar.xz"; - url = "https://dev-www.libreoffice.org/src/harfbuzz-8.2.2.tar.xz"; - sha256 = "e433ad85fbdf57f680be29479b3f964577379aaf319f557eb76569f0ecbc90f3"; + name = "harfbuzz-8.5.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/harfbuzz-8.5.0.tar.xz"; + sha256 = "77e4f7f98f3d86bf8788b53e6832fb96279956e1c3961988ea3d4b7ca41ddc27"; md5 = ""; - md5name = "e433ad85fbdf57f680be29479b3f964577379aaf319f557eb76569f0ecbc90f3-harfbuzz-8.2.2.tar.xz"; + md5name = "77e4f7f98f3d86bf8788b53e6832fb96279956e1c3961988ea3d4b7ca41ddc27-harfbuzz-8.5.0.tar.xz"; } { name = "hsqldb_1_8_0.zip"; @@ -434,25 +434,25 @@ md5name = "0e279003f5199f80031c6dcd08f79d6f65a0505139160e7df0d09b226bff4023-IAccessible2-1.3+git20231013.3d8c7f0.tar.gz"; } { - name = "icu4c-73_2-src.tgz"; - url = "https://dev-www.libreoffice.org/src/icu4c-73_2-src.tgz"; - sha256 = "818a80712ed3caacd9b652305e01afc7fa167e6f2e94996da44b90c2ab604ce1"; + name = "icu4c-74_2-src.tgz"; + url = "https://dev-www.libreoffice.org/src/icu4c-74_2-src.tgz"; + sha256 = "68db082212a96d6f53e35d60f47d38b962e9f9d207a74cfac78029ae8ff5e08c"; md5 = ""; - md5name = "818a80712ed3caacd9b652305e01afc7fa167e6f2e94996da44b90c2ab604ce1-icu4c-73_2-src.tgz"; + md5name = "68db082212a96d6f53e35d60f47d38b962e9f9d207a74cfac78029ae8ff5e08c-icu4c-74_2-src.tgz"; } { - name = "icu4c-73_2-data.zip"; - url = "https://dev-www.libreoffice.org/src/icu4c-73_2-data.zip"; - sha256 = "ca1ee076163b438461e484421a7679fc33a64cd0a54f9d4b401893fa1eb42701"; + name = "icu4c-74_2-data.zip"; + url = "https://dev-www.libreoffice.org/src/icu4c-74_2-data.zip"; + sha256 = "c28c3ca5f4ba3384781797138a294ca360988d4322674ad4d51e52f5d9b0a2b6"; md5 = ""; - md5name = "ca1ee076163b438461e484421a7679fc33a64cd0a54f9d4b401893fa1eb42701-icu4c-73_2-data.zip"; + md5name = "c28c3ca5f4ba3384781797138a294ca360988d4322674ad4d51e52f5d9b0a2b6-icu4c-74_2-data.zip"; } { - name = "Java-WebSocket-1.5.4.tar.gz"; - url = "https://dev-www.libreoffice.org/src/Java-WebSocket-1.5.4.tar.gz"; - sha256 = "a6828b35d1f938fee2335945f3d3c563cbbfa58ce7eb0bf72778d0fa7a550720"; + name = "Java-WebSocket-1.5.6.tar.gz"; + url = "https://dev-www.libreoffice.org/src/Java-WebSocket-1.5.6.tar.gz"; + sha256 = "167e86561cd7b5ed21b67d7543536134edcb14b373892739b28c417566a3832f"; md5 = ""; - md5name = "a6828b35d1f938fee2335945f3d3c563cbbfa58ce7eb0bf72778d0fa7a550720-Java-WebSocket-1.5.4.tar.gz"; + md5name = "167e86561cd7b5ed21b67d7543536134edcb14b373892739b28c417566a3832f-Java-WebSocket-1.5.6.tar.gz"; } { name = "flow-engine-0.9.4.zip"; @@ -539,11 +539,11 @@ md5name = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf-libjpeg-turbo-2.1.5.1.tar.gz"; } { - name = "language-subtag-registry-2024-06-14.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2024-06-14.tar.bz2"; - sha256 = "75bc394dd83ddfd62b172a462db1b66bdb5950f40823ed63b8c7db6b71e37e75"; + name = "language-subtag-registry-2024-11-19.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2024-11-19.tar.bz2"; + sha256 = "121f27bd1fabac9a74fb042cf68396b6df74cdf5d1ccc30f4c9b78584cc13864"; md5 = ""; - md5name = "75bc394dd83ddfd62b172a462db1b66bdb5950f40823ed63b8c7db6b71e37e75-language-subtag-registry-2024-06-14.tar.bz2"; + md5name = "121f27bd1fabac9a74fb042cf68396b6df74cdf5d1ccc30f4c9b78584cc13864-language-subtag-registry-2024-11-19.tar.bz2"; } { name = "lcms2-2.16.tar.gz"; @@ -553,18 +553,18 @@ md5name = "d873d34ad8b9b4cea010631f1a6228d2087475e4dc5e763eb81acc23d9d45a51-lcms2-2.16.tar.gz"; } { - name = "libassuan-2.5.7.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/libassuan-2.5.7.tar.bz2"; - sha256 = "0103081ffc27838a2e50479153ca105e873d3d65d8a9593282e9c94c7e6afb76"; + name = "libassuan-3.0.1.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libassuan-3.0.1.tar.bz2"; + sha256 = "c8f0f42e6103dea4b1a6a483cb556654e97302c7465308f58363778f95f194b1"; md5 = ""; - md5name = "0103081ffc27838a2e50479153ca105e873d3d65d8a9593282e9c94c7e6afb76-libassuan-2.5.7.tar.bz2"; + md5name = "c8f0f42e6103dea4b1a6a483cb556654e97302c7465308f58363778f95f194b1-libassuan-3.0.1.tar.bz2"; } { - name = "libatomic_ops-7.8.0.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libatomic_ops-7.8.0.tar.gz"; - sha256 = "15676e7674e11bda5a7e50a73f4d9e7d60452271b8acf6fd39a71fefdf89fa31"; + name = "libatomic_ops-7.8.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libatomic_ops-7.8.2.tar.gz"; + sha256 = "d305207fe207f2b3fb5cb4c019da12b44ce3fcbc593dfd5080d867b1a2419b51"; md5 = ""; - md5name = "15676e7674e11bda5a7e50a73f4d9e7d60452271b8acf6fd39a71fefdf89fa31-libatomic_ops-7.8.0.tar.gz"; + md5name = "d305207fe207f2b3fb5cb4c019da12b44ce3fcbc593dfd5080d867b1a2419b51-libatomic_ops-7.8.2.tar.gz"; } { name = "libeot-0.01.tar.bz2"; @@ -574,11 +574,11 @@ md5name = "cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a-libeot-0.01.tar.bz2"; } { - name = "libexttextcat-3.4.6.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libexttextcat-3.4.6.tar.xz"; - sha256 = "6d77eace20e9ea106c1330e268ede70c9a4a89744ddc25715682754eca3368df"; + name = "libexttextcat-3.4.7.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libexttextcat-3.4.7.tar.xz"; + sha256 = "df0a59d413a5b202573d8d4f5159e33a8538da4f8e8e60979facc64d6290cebd"; md5 = ""; - md5name = "6d77eace20e9ea106c1330e268ede70c9a4a89744ddc25715682754eca3368df-libexttextcat-3.4.6.tar.xz"; + md5name = "df0a59d413a5b202573d8d4f5159e33a8538da4f8e8e60979facc64d6290cebd-libexttextcat-3.4.7.tar.xz"; } { name = "libffi-3.4.4.tar.gz"; @@ -588,11 +588,11 @@ md5name = "d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676-libffi-3.4.4.tar.gz"; } { - name = "libgpg-error-1.48.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/libgpg-error-1.48.tar.bz2"; - sha256 = "89ce1ae893e122924b858de84dc4f67aae29ffa610ebf668d5aa539045663d6f"; + name = "libgpg-error-1.51.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libgpg-error-1.51.tar.bz2"; + sha256 = "be0f1b2db6b93eed55369cdf79f19f72750c8c7c39fc20b577e724545427e6b2"; md5 = ""; - md5name = "89ce1ae893e122924b858de84dc4f67aae29ffa610ebf668d5aa539045663d6f-libgpg-error-1.48.tar.bz2"; + md5name = "be0f1b2db6b93eed55369cdf79f19f72750c8c7c39fc20b577e724545427e6b2-libgpg-error-1.51.tar.bz2"; } { name = "liblangtag-0.6.7.tar.bz2"; @@ -616,18 +616,18 @@ md5name = "296272d93435991308eb73607600c034b558807a07e829e751142e65ccfa9d08-ltm-1.3.0.tar.xz"; } { - name = "libwebp-1.3.2.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libwebp-1.3.2.tar.gz"; - sha256 = "2a499607df669e40258e53d0ade8035ba4ec0175244869d1025d460562aa09b4"; + name = "libwebp-1.4.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libwebp-1.4.0.tar.gz"; + sha256 = "61f873ec69e3be1b99535634340d5bde750b2e4447caa1db9f61be3fd49ab1e5"; md5 = ""; - md5name = "2a499607df669e40258e53d0ade8035ba4ec0175244869d1025d460562aa09b4-libwebp-1.3.2.tar.gz"; + md5name = "61f873ec69e3be1b99535634340d5bde750b2e4447caa1db9f61be3fd49ab1e5-libwebp-1.4.0.tar.gz"; } { - name = "xmlsec1-1.3.2.tar.gz"; - url = "https://dev-www.libreoffice.org/src/xmlsec1-1.3.2.tar.gz"; - sha256 = "4003c56b3d356d21b1db7775318540fad6bfedaf5f117e8f7c010811219be3cf"; + name = "xmlsec1-1.3.5.tar.gz"; + url = "https://dev-www.libreoffice.org/src/xmlsec1-1.3.5.tar.gz"; + sha256 = "2ffd4ad1f860ec93e47a680310ab2bc94968bd07566e71976bd96133d9504917"; md5 = ""; - md5name = "4003c56b3d356d21b1db7775318540fad6bfedaf5f117e8f7c010811219be3cf-xmlsec1-1.3.2.tar.gz"; + md5name = "2ffd4ad1f860ec93e47a680310ab2bc94968bd07566e71976bd96133d9504917-xmlsec1-1.3.5.tar.gz"; } { name = "libxml2-2.12.9.tar.xz"; @@ -637,11 +637,11 @@ md5name = "59912db536ab56a3996489ea0299768c7bcffe57169f0235e7f962a91f483590-libxml2-2.12.9.tar.xz"; } { - name = "libxslt-1.1.39.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libxslt-1.1.39.tar.xz"; - sha256 = "2a20ad621148339b0759c4d4e96719362dee64c9a096dbba625ba053846349f0"; + name = "libxslt-1.1.41.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxslt-1.1.41.tar.xz"; + sha256 = "3ad392af91115b7740f7b50d228cc1c5fc13afc1da7f16cb0213917a37f71bda"; md5 = ""; - md5name = "2a20ad621148339b0759c4d4e96719362dee64c9a096dbba625ba053846349f0-libxslt-1.1.39.tar.xz"; + md5name = "3ad392af91115b7740f7b50d228cc1c5fc13afc1da7f16cb0213917a37f71bda-libxslt-1.1.41.tar.xz"; } { name = "lp_solve_5.5.tar.gz"; @@ -651,18 +651,18 @@ md5name = "26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"; } { - name = "lxml-4.9.2.tgz"; - url = "https://dev-www.libreoffice.org/src/lxml-4.9.2.tgz"; - sha256 = "2455cfaeb7ac70338b3257f41e21f0724f4b5b0c0e7702da67ee6c3640835b67"; + name = "lxml-5.2.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/lxml-5.2.2.tar.gz"; + sha256 = "bb2dc4898180bea79863d5487e5f9c7c34297414bad54bcd0f0852aee9cfdb87"; md5 = ""; - md5name = "2455cfaeb7ac70338b3257f41e21f0724f4b5b0c0e7702da67ee6c3640835b67-lxml-4.9.2.tgz"; + md5name = "bb2dc4898180bea79863d5487e5f9c7c34297414bad54bcd0f0852aee9cfdb87-lxml-5.2.2.tar.gz"; } { - name = "mariadb-connector-c-3.3.11-src.tar.gz"; - url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.11-src.tar.gz"; - sha256 = "f7ba02f70aa2ae2b13e9ee5acc78423f6bede38998afb91326a62be46cf5956a"; + name = "mariadb-connector-c-3.3.13-src.tar.gz"; + url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.13-src.tar.gz"; + sha256 = "1c03c30b394871ab354dbdb47574beae19e2657da21a911ecc9e33e9388a3bef"; md5 = ""; - md5name = "f7ba02f70aa2ae2b13e9ee5acc78423f6bede38998afb91326a62be46cf5956a-mariadb-connector-c-3.3.11-src.tar.gz"; + md5name = "1c03c30b394871ab354dbdb47574beae19e2657da21a911ecc9e33e9388a3bef-mariadb-connector-c-3.3.13-src.tar.gz"; } { name = "mdds-2.1.1.tar.xz"; @@ -686,11 +686,11 @@ md5name = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba-libmspub-0.1.4.tar.xz"; } { - name = "libmwaw-0.3.21.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libmwaw-0.3.21.tar.xz"; - sha256 = "e8750123a78d61b943cef78b7736c8a7f20bb0a649aa112402124fba794fc21c"; + name = "libmwaw-0.3.22.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libmwaw-0.3.22.tar.xz"; + sha256 = "a1a39ffcea3ff2a7a7aae0c23877ddf4918b554bf82b0de5d7ce8e7f61ea8e32"; md5 = ""; - md5name = "e8750123a78d61b943cef78b7736c8a7f20bb0a649aa112402124fba794fc21c-libmwaw-0.3.21.tar.xz"; + md5name = "a1a39ffcea3ff2a7a7aae0c23877ddf4918b554bf82b0de5d7ce8e7f61ea8e32-libmwaw-0.3.22.tar.xz"; } { name = "mythes-1.2.5.tar.xz"; @@ -700,11 +700,11 @@ md5name = "19279f70707bbe5ffa619f2dc319f888cec0c4a8d339dc0a21330517bd6f521d-mythes-1.2.5.tar.xz"; } { - name = "nss-3.101.2-with-nspr-4.35.tar.gz"; - url = "https://dev-www.libreoffice.org/src/nss-3.101.2-with-nspr-4.35.tar.gz"; - sha256 = "ff602c1fa86a4f841b27109918dfff60f41582e1caf6dbd651cfa72bdc8a64aa"; + name = "nss-3.102.1-with-nspr-4.35.tar.gz"; + url = "https://dev-www.libreoffice.org/src/nss-3.102.1-with-nspr-4.35.tar.gz"; + sha256 = "ddfdec73fb4b0eedce5fc4de09de9ba14d2ddbfbf67e42372903e1510f2d3d65"; md5 = ""; - md5name = "ff602c1fa86a4f841b27109918dfff60f41582e1caf6dbd651cfa72bdc8a64aa-nss-3.101.2-with-nspr-4.35.tar.gz"; + md5name = "ddfdec73fb4b0eedce5fc4de09de9ba14d2ddbfbf67e42372903e1510f2d3d65-nss-3.102.1-with-nspr-4.35.tar.gz"; } { name = "libodfgen-0.1.8.tar.xz"; @@ -735,11 +735,11 @@ md5name = "37206cf981e8409d048b59ac5839621ea107ff49af72beb9d7769a2f41da8d90-onlineupdate-c003be8b9727672e7d30972983b375f4c200233f-2.tar.xz"; } { - name = "openldap-2.6.7.tgz"; - url = "https://dev-www.libreoffice.org/src/openldap-2.6.7.tgz"; - sha256 = "cd775f625c944ed78a3da18a03b03b08eea73c8aabc97b41bb336e9a10954930"; + name = "openldap-2.6.9.tgz"; + url = "https://dev-www.libreoffice.org/src/openldap-2.6.9.tgz"; + sha256 = "2cb7dc73e9c8340dff0d99357fbaa578abf30cc6619f0521972c555681e6b2ff"; md5 = ""; - md5name = "cd775f625c944ed78a3da18a03b03b08eea73c8aabc97b41bb336e9a10954930-openldap-2.6.7.tgz"; + md5name = "2cb7dc73e9c8340dff0d99357fbaa578abf30cc6619f0521972c555681e6b2ff-openldap-2.6.9.tgz"; } { name = "openssl-3.0.15.tar.gz"; @@ -763,11 +763,11 @@ md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-6179.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/pdfium-6179.tar.bz2"; - sha256 = "4d3f08fe0e2fda86246832085426616826dcca0912202874428bfbc24d13d95c"; + name = "pdfium-6425.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/pdfium-6425.tar.bz2"; + sha256 = "fe0291b96d7352bac530d13ef2e5fd63ad9980e0128911f88b957b5992508f1c"; md5 = ""; - md5name = "4d3f08fe0e2fda86246832085426616826dcca0912202874428bfbc24d13d95c-pdfium-6179.tar.bz2"; + md5name = "fe0291b96d7352bac530d13ef2e5fd63ad9980e0128911f88b957b5992508f1c-pdfium-6425.tar.bz2"; } { name = "pixman-0.42.2.tar.gz"; @@ -805,18 +805,18 @@ md5name = "c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74-poppler-data-0.4.12.tar.gz"; } { - name = "postgresql-13.16.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/postgresql-13.16.tar.bz2"; - sha256 = "c9cbbb6129f02328204828066bb3785c00a85c8ca8fd329c2a8a53c1f5cd8865"; + name = "postgresql-13.18.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/postgresql-13.18.tar.bz2"; + sha256 = "ceea92abee2a8c19408d278b68de6a78b6bd3dbb4fa2d653fa7ca745d666aab1"; md5 = ""; - md5name = "c9cbbb6129f02328204828066bb3785c00a85c8ca8fd329c2a8a53c1f5cd8865-postgresql-13.16.tar.bz2"; + md5name = "ceea92abee2a8c19408d278b68de6a78b6bd3dbb4fa2d653fa7ca745d666aab1-postgresql-13.18.tar.bz2"; } { - name = "Python-3.8.20.tar.xz"; - url = "https://dev-www.libreoffice.org/src/Python-3.8.20.tar.xz"; - sha256 = "6fb89a7124201c61125c0ab4cf7f6894df339a40c02833bfd28ab4d7691fafb4"; + name = "Python-3.9.21.tar.xz"; + url = "https://dev-www.libreoffice.org/src/Python-3.9.21.tar.xz"; + sha256 = "3126f59592c9b0d798584755f2bf7b081fa1ca35ce7a6fea980108d752a05bb1"; md5 = ""; - md5name = "6fb89a7124201c61125c0ab4cf7f6894df339a40c02833bfd28ab4d7691fafb4-Python-3.8.20.tar.xz"; + md5name = "3126f59592c9b0d798584755f2bf7b081fa1ca35ce7a6fea980108d752a05bb1-Python-3.9.21.tar.xz"; } { name = "libqxp-0.0.2.tar.xz"; @@ -847,18 +847,18 @@ md5name = "e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz"; } { - name = "librevenge-0.0.4.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/librevenge-0.0.4.tar.bz2"; - sha256 = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf"; + name = "librevenge-0.0.5.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/librevenge-0.0.5.tar.bz2"; + sha256 = "5892ca6796f7a2a93d580832e907e849b19d980b40d326a283b18877ab6de0c5"; md5 = ""; - md5name = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf-librevenge-0.0.4.tar.bz2"; + md5name = "5892ca6796f7a2a93d580832e907e849b19d980b40d326a283b18877ab6de0c5-librevenge-0.0.5.tar.bz2"; } { - name = "rhino1_5R5.zip"; - url = "https://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"; - sha256 = "1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753"; - md5 = "798b2ffdc8bcfe7bca2cf92b62caf685"; - md5name = "798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"; + name = "rhino-1.7.14.zip"; + url = "https://dev-www.libreoffice.org/src/rhino-1.7.14.zip"; + sha256 = "bf4d2d0c5ff8889fd494486db09291cb7965f0bf2f93ef005d3b08070a5a4f5c"; + md5 = ""; + md5name = "bf4d2d0c5ff8889fd494486db09291cb7965f0bf2f93ef005d3b08070a5a4f5c-rhino-1.7.14.zip"; } { name = "skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz"; @@ -874,13 +874,6 @@ md5 = ""; md5name = "f94fb0ad8216f97127bedef163a45886b43c62deac5e5b0f5e628e234220c8db-libstaroffice-0.0.7.tar.xz"; } - { - name = "swingExSrc.zip"; - url = "https://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"; - sha256 = "64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1"; - md5 = "35c94d2df8893241173de1d16b6034c0"; - md5name = "35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"; - } { name = "twaindsm_2.4.1.orig.tar.gz"; url = "https://dev-www.libreoffice.org/src/twaindsm_2.4.1.orig.tar.gz"; @@ -889,11 +882,11 @@ md5name = "82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6-twaindsm_2.4.1.orig.tar.gz"; } { - name = "libvisio-0.1.7.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libvisio-0.1.7.tar.xz"; - sha256 = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c"; + name = "libvisio-0.1.8.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libvisio-0.1.8.tar.xz"; + sha256 = "b4098ffbf4dcb9e71213fa0acddbd928f27bed30db2d80234813b15d53d0405b"; md5 = ""; - md5name = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c-libvisio-0.1.7.tar.xz"; + md5name = "b4098ffbf4dcb9e71213fa0acddbd928f27bed30db2d80234813b15d53d0405b-libvisio-0.1.8.tar.xz"; } { name = "libwpd-0.10.3.tar.xz"; @@ -945,10 +938,10 @@ md5name = "77d6c6ecb35952a8d8ce7f736b7a2bf466275c48210e309b73782d6b7e84dffd-zxcvbn-c-2.5.tar.gz"; } { - name = "zxing-cpp-2.1.0.tar.gz"; - url = "https://dev-www.libreoffice.org/src/zxing-cpp-2.1.0.tar.gz"; - sha256 = "6d54e403592ec7a143791c6526c1baafddf4c0897bb49b1af72b70a0f0c4a3fe"; + name = "zxing-cpp-2.2.1.tar.gz"; + url = "https://dev-www.libreoffice.org/src/zxing-cpp-2.2.1.tar.gz"; + sha256 = "02078ae15f19f9d423a441f205b1d1bee32349ddda7467e2c84e8f08876f8635"; md5 = ""; - md5name = "6d54e403592ec7a143791c6526c1baafddf4c0897bb49b1af72b70a0f0c4a3fe-zxing-cpp-2.1.0.tar.gz"; + md5name = "02078ae15f19f9d423a441f205b1d1bee32349ddda7467e2c84e8f08876f8635-zxing-cpp-2.2.1.tar.gz"; } ] diff --git a/pkgs/applications/office/libreoffice/src-still/help.nix b/pkgs/applications/office/libreoffice/src-still/help.nix index b61ff5be0e7b..2d3477707242 100644 --- a/pkgs/applications/office/libreoffice/src-still/help.nix +++ b/pkgs/applications/office/libreoffice/src-still/help.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "0g31xfmmxjd5c1xg203gflzvq2d2jlgfi9gmg1wxl18l9gjk4hds"; - url = "https://download.documentfoundation.org/libreoffice/src/24.2.7/libreoffice-help-24.2.7.2.tar.xz"; + sha256 = "0z09pif1xmivmrnf5rjbcqc72khj0sg44905qrphp8cgvbx4n3ph"; + url = "https://download.documentfoundation.org/libreoffice/src/24.8.4/libreoffice-help-24.8.4.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-still/main.nix b/pkgs/applications/office/libreoffice/src-still/main.nix index 2bb8d53a4de6..7315b6e7b9bb 100644 --- a/pkgs/applications/office/libreoffice/src-still/main.nix +++ b/pkgs/applications/office/libreoffice/src-still/main.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "1r8h8g5fs7z0fvf7f6fq44rw90q4v2z23kkwzdh1s8gaxlnb3sgm"; - url = "https://download.documentfoundation.org/libreoffice/src/24.2.7/libreoffice-24.2.7.2.tar.xz"; + sha256 = "05qs12z0xkpqy3yl7378d99y82rswic101aw65k1macslcpdwr0m"; + url = "https://download.documentfoundation.org/libreoffice/src/24.8.4/libreoffice-24.8.4.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-still/translations.nix b/pkgs/applications/office/libreoffice/src-still/translations.nix index fd248167fbc2..698f2eefb726 100644 --- a/pkgs/applications/office/libreoffice/src-still/translations.nix +++ b/pkgs/applications/office/libreoffice/src-still/translations.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "0g2wp8s3gxhy3l685jv3h63gzaljfclgcah437922dl60kpm9yjq"; - url = "https://download.documentfoundation.org/libreoffice/src/24.2.7/libreoffice-translations-24.2.7.2.tar.xz"; + sha256 = "0z84m2q5c9zjbb491m84s8sf2dgaxvvx03dl3f1qyajvpf1mnlld"; + url = "https://download.documentfoundation.org/libreoffice/src/24.8.4/libreoffice-translations-24.8.4.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-still/version.nix b/pkgs/applications/office/libreoffice/src-still/version.nix index 351ceee22bf4..845b695dd16b 100644 --- a/pkgs/applications/office/libreoffice/src-still/version.nix +++ b/pkgs/applications/office/libreoffice/src-still/version.nix @@ -1 +1 @@ -"24.2.7.2" +"24.8.4.2" From 509fae00c10ba47e0e9a45378cfe4eb903728086 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Feb 2025 20:02:42 +0000 Subject: [PATCH 0318/2168] jicofo: 1.0-1117 -> 1.0-1122 --- pkgs/servers/jicofo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jicofo/default.nix b/pkgs/servers/jicofo/default.nix index da3829bae8f8..3d4b22f6e1ff 100644 --- a/pkgs/servers/jicofo/default.nix +++ b/pkgs/servers/jicofo/default.nix @@ -9,10 +9,10 @@ let pname = "jicofo"; - version = "1.0-1117"; + version = "1.0-1122"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "PUIPLCdL68+cf3eue7+p0aptYavq046RtSaFM9XPgQQ="; + sha256 = "szvzp6z0SaMgBZGSwM68P7xrs4VkmHUeX1iTZWeJRHo="; }; in stdenv.mkDerivation { From a6e2023c7f6109719626c99173daa96c9bedd15f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Feb 2025 21:01:46 +0000 Subject: [PATCH 0319/2168] migrate-to-uv: 0.2.1 -> 0.6.0 --- pkgs/by-name/mi/migrate-to-uv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/migrate-to-uv/package.nix b/pkgs/by-name/mi/migrate-to-uv/package.nix index ce07335148c4..7da29ec35546 100644 --- a/pkgs/by-name/mi/migrate-to-uv/package.nix +++ b/pkgs/by-name/mi/migrate-to-uv/package.nix @@ -11,19 +11,19 @@ python3.pkgs.buildPythonApplication rec { pname = "migrate-to-uv"; - version = "0.2.1"; + version = "0.6.0"; pyproject = true; src = fetchFromGitHub { owner = "mkniewallner"; repo = "migrate-to-uv"; tag = version; - hash = "sha256-LA2tzTD3e6IPmeYHWKFD+PIsl6hsvfpYDKhN9upttHI="; + hash = "sha256-d3whOoDzCZWs9tO5t13jNKgsZe3fV3Eas3M+CJKbHno="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src pname version; - hash = "sha256-aiUCLRHCntJKZGCNdyfFCyRdIP+9Fr8yVzaDVct9Dv8="; + hash = "sha256-RQlShKbv3XqG2uVqRF2FIrGg3j49LPFI1YpZ6uhCWp4="; }; build-system = [ From 009b4054a60c65faa600762cf0d0a76bf231cf15 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Feb 2025 21:15:26 +0000 Subject: [PATCH 0320/2168] etesync-dav: 0.33.6 -> 0.34.0 --- pkgs/by-name/et/etesync-dav/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/et/etesync-dav/package.nix b/pkgs/by-name/et/etesync-dav/package.nix index 6f024cdca10c..ea44a675021a 100644 --- a/pkgs/by-name/et/etesync-dav/package.nix +++ b/pkgs/by-name/et/etesync-dav/package.nix @@ -8,13 +8,13 @@ }: python3Packages.buildPythonApplication rec { pname = "etesync-dav"; - version = "0.33.6"; + version = "0.34.0"; src = fetchFromGitHub { owner = "etesync"; repo = "etesync-dav"; tag = "v${version}"; - hash = "sha256-CkdO/63IgUOf8AC2fUDKPyax0CHWVs8AkoTaperWxFk="; + hash = "sha256-+rNqyksOmDUh0OuvgEDWv6tuZQkn1gizz35Ptr6izos="; }; dependencies = with python3Packages; [ From 8d2451762bfa92e504767dcac62cd69e3a4e4a97 Mon Sep 17 00:00:00 2001 From: emaryn <197520219+emaryn@users.noreply.github.com> Date: Thu, 6 Feb 2025 21:44:36 +0000 Subject: [PATCH 0321/2168] qtscrcpy: 3.0.1 -> 3.1.0 --- pkgs/by-name/qt/qtscrcpy/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/qt/qtscrcpy/package.nix b/pkgs/by-name/qt/qtscrcpy/package.nix index 3b93472102d7..b3233950779b 100644 --- a/pkgs/by-name/qt/qtscrcpy/package.nix +++ b/pkgs/by-name/qt/qtscrcpy/package.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation rec { pname = "qtscrcpy"; - version = "3.0.1"; + version = "3.1.0"; src = (fetchFromGitHub { owner = "barry-ran"; repo = "QtScrcpy"; tag = "v${version}"; - hash = "sha256-uAWVPmULT2aK+XVZ8eAjCbP8TgDlBDTEvKs25yZktCI="; + hash = "sha256-wnzJHSx+HcbtcXDDksog4SAXEf1spcuXQ6+vdysPYQY="; fetchSubmodules = true; }).overrideAttrs (_: { @@ -46,9 +46,9 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace QtScrcpy/QtScrcpyCore/{include/QtScrcpyCoreDef.h,src/device/server/server.h} \ - --replace-fail 'serverVersion = "2.1.1"' 'serverVersion = "${scrcpy.version}"' + --replace-fail 'serverVersion = "3.1"' 'serverVersion = "${scrcpy.version}"' substituteInPlace QtScrcpy/util/config.cpp \ - --replace-fail 'COMMON_SERVER_VERSION_DEF "2.1.1"' 'COMMON_SERVER_VERSION_DEF "${scrcpy.version}"' + --replace-fail 'COMMON_SERVER_VERSION_DEF "3.1"' 'COMMON_SERVER_VERSION_DEF "${scrcpy.version}"' substituteInPlace QtScrcpy/audio/audiooutput.cpp \ --replace-fail 'sndcpy.sh' "$out/share/qtscrcpy/sndcpy.sh" substituteInPlace QtScrcpy/sndcpy/sndcpy.sh \ From b7c15e2cd5acebbb4f10a662c02c98804a89ad29 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Feb 2025 23:24:54 +0000 Subject: [PATCH 0322/2168] terraform-providers.digitalocean: 2.47.0 -> 2.48.2 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 6b8fc339e89e..9e1c2457be98 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -354,11 +354,11 @@ "vendorHash": "sha256-quoFrJbB1vjz+MdV+jnr7FPACHuUe5Gx9POLubD2IaM=" }, "digitalocean": { - "hash": "sha256-JRBur7pH1niPZLN+5do6GiuoiSP18QsDZqWjlc9riek=", + "hash": "sha256-Tu73hGllUGkrzxgwfz9Eg3P8YOPYD6XiTCK//ABSUsI=", "homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean", "owner": "digitalocean", "repo": "terraform-provider-digitalocean", - "rev": "v2.47.0", + "rev": "v2.48.2", "spdx": "MPL-2.0", "vendorHash": null }, From cc2fac109ffc5a0841cd7acc474caa22003e0261 Mon Sep 17 00:00:00 2001 From: Cathal Mullan Date: Wed, 22 Jan 2025 13:32:55 +0000 Subject: [PATCH 0323/2168] dioxus-cli: 0.6.0 -> 0.6.2 --- .../dioxus-cli/fix-wasm-opt-target-dir.patch | 11 +++++++++ pkgs/by-name/di/dioxus-cli/package.nix | 23 +++++++++++++++---- 2 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 pkgs/by-name/di/dioxus-cli/fix-wasm-opt-target-dir.patch diff --git a/pkgs/by-name/di/dioxus-cli/fix-wasm-opt-target-dir.patch b/pkgs/by-name/di/dioxus-cli/fix-wasm-opt-target-dir.patch new file mode 100644 index 000000000000..1b1b9763235f --- /dev/null +++ b/pkgs/by-name/di/dioxus-cli/fix-wasm-opt-target-dir.patch @@ -0,0 +1,11 @@ +--- a/src/build/bundle.rs ++++ b/src/build/bundle.rs +@@ -334,7 +334,7 @@ impl AppBundle { + // Only run wasm-opt if the feature is enabled + // Wasm-opt has an expensive build script that makes it annoying to keep enabled for iterative dev + // We put it behind the "wasm-opt" feature flag so that it can be disabled when iterating on the cli +- self.run_wasm_opt(&self.build.exe_dir())?; ++ self.run_wasm_opt(&self.build.wasm_bindgen_out_dir())?; + + // Write the index.html file with the pre-configured contents we got from pre-rendering + std::fs::write( diff --git a/pkgs/by-name/di/dioxus-cli/package.nix b/pkgs/by-name/di/dioxus-cli/package.nix index a2b858cab97b..41d8e9437762 100644 --- a/pkgs/by-name/di/dioxus-cli/package.nix +++ b/pkgs/by-name/di/dioxus-cli/package.nix @@ -14,16 +14,24 @@ rustPlatform.buildRustPackage rec { pname = "dioxus-cli"; - version = "0.6.0"; + version = "0.6.2"; src = fetchCrate { inherit pname version; - hash = "sha256-0Kg2/+S8EuMYZQaK4Ao+mbS7K48VhVWjPL+LnoVJMSw="; + hash = "sha256-jUS/it2N5o5D7Jon0fKHWEt3f0wdtVgNIkqSNc7u830="; }; useFetchCargoVendor = true; - cargoHash = "sha256-uD3AHHY3edpqyQ8gnsTtxQsen8UzyVIbArSvpMa+B+8="; - buildFeatures = [ "optimizations" ]; + cargoHash = "sha256-izvo092FGZmci1cXLo+qhGlBh8W3A1TeBHrYXcjE6HU="; + cargoPatches = [ + # TODO: Remove once https://github.com/DioxusLabs/dioxus/issues/3659 is fixed upstream. + ./fix-wasm-opt-target-dir.patch + ]; + + buildFeatures = [ + "no-downloads" + "optimizations" + ]; nativeBuildInputs = [ pkg-config @@ -34,11 +42,18 @@ rustPlatform.buildRustPackage rec { OPENSSL_NO_VENDOR = 1; + # wasm-opt-sys build.rs tries to verify C++17 support, but the check appears to be faulty. + postPatch = '' + substituteInPlace $cargoDepsCopy/wasm-opt-sys-*/build.rs \ + --replace-fail 'check_cxx17_support()?;' '// check_cxx17_support()?;' + ''; + nativeCheckInputs = [ rustfmt ]; checkFlags = [ # requires network access "--skip=serve::proxy::test" + "--skip=wasm_bindgen::test" ]; passthru = { From 467b41829bbf08d9de5b2f81f6286b07ba2aaab4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Feb 2025 23:56:23 +0000 Subject: [PATCH 0324/2168] terraform-providers.snowflake: 1.0.2 -> 1.0.3 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 6b8fc339e89e..af8296180590 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1165,11 +1165,11 @@ "vendorHash": "sha256-F1AuO/dkldEDRvkwrbq2EjByxjg3K2rohZAM4DzKPUw=" }, "snowflake": { - "hash": "sha256-PzZ5vLAyJYT5UZ6C5mTzyoJTcru9JXu/Xy+cPJu4IB0=", + "hash": "sha256-s5jtG1UOAtvFVf4GZ3ruGjow1MRaKd8wpze9pxOAz6k=", "homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake", "owner": "Snowflake-Labs", "repo": "terraform-provider-snowflake", - "rev": "v1.0.2", + "rev": "v1.0.3", "spdx": "MIT", "vendorHash": "sha256-Nf3MBMjsGDOdxTrhHo72NxIXx2xYCU/SEmYGHO6C/3s=" }, From 673b34f06f731e558519cdd3743eeae8e078abac Mon Sep 17 00:00:00 2001 From: DaRacci Date: Sun, 2 Feb 2025 14:35:08 +1100 Subject: [PATCH 0325/2168] universal-pidff: 0.0.12 -> 0.1.0 --- pkgs/os-specific/linux/universal-pidff/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/universal-pidff/default.nix b/pkgs/os-specific/linux/universal-pidff/default.nix index 153383a56627..d0394b4302b9 100644 --- a/pkgs/os-specific/linux/universal-pidff/default.nix +++ b/pkgs/os-specific/linux/universal-pidff/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "universal-pidff"; - version = "0.0.12"; + version = "0.1.0"; src = fetchFromGitHub { owner = "JacKeTUs"; repo = "universal-pidff"; - rev = "23ec6488eddaa9f5b370b53b0198ba7b656ffa3d"; - hash = "sha256-aA1iRXoVgJ1wVQMxFZm7/GqB7G/IjcLXifAk6B8odCs="; + tag = version; + hash = "sha256-AlJIbu8xrlDXfEqzoMGyHsLLfHnBsyYcECdoU3XyE00="; }; postPatch = '' @@ -42,5 +42,8 @@ stdenv.mkDerivation rec { racci ]; platforms = lib.platforms.linux; + + # Broken due to missing linux/minmax.h + broken = kernel.kernelOlder "5.10"; }; } From 2f05c58320ac3d849e29cb10434f058efeff336b Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Wed, 5 Feb 2025 20:13:51 +0800 Subject: [PATCH 0326/2168] rustdesk-flutter: add pipewire gstreame plugin --- pkgs/by-name/ru/rustdesk-flutter/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ru/rustdesk-flutter/package.nix b/pkgs/by-name/ru/rustdesk-flutter/package.nix index 2b0e553d1609..6004513d2f4f 100644 --- a/pkgs/by-name/ru/rustdesk-flutter/package.nix +++ b/pkgs/by-name/ru/rustdesk-flutter/package.nix @@ -24,6 +24,7 @@ rustc, rustfmt, xdotool, + pipewire, }: let @@ -146,6 +147,7 @@ flutter319.buildFlutterApplication rec { libva libvdpau libvpx + pipewire libxkbcommon libyuv pam From 4081b09e7af48f2c40af054fc4090e6c3100999e Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Fri, 7 Feb 2025 00:28:37 -0500 Subject: [PATCH 0327/2168] resticprofile: 0.28.0 -> 0.29.1 --- pkgs/by-name/re/resticprofile/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/resticprofile/package.nix b/pkgs/by-name/re/resticprofile/package.nix index 5897f00446b4..7ce002647106 100644 --- a/pkgs/by-name/re/resticprofile/package.nix +++ b/pkgs/by-name/re/resticprofile/package.nix @@ -11,13 +11,13 @@ buildGo123Module rec { pname = "resticprofile"; - version = "0.28.0"; + version = "0.29.1"; src = fetchFromGitHub { owner = "creativeprojects"; repo = "resticprofile"; tag = "v${version}"; - hash = "sha256-Ab+XesAw/GkNEGwAp1ERUlfDlI9Kxmd0UnS52v+nWIs="; + hash = "sha256-6s58rI+YMu6sCV8UsG9GOdF46Br3cMWIUqciVd2d4dY="; }; postPatch = '' @@ -32,9 +32,10 @@ buildGo123Module rec { ''; - vendorHash = "sha256-LLFdVB4n07Sq/QH1C7rutdpzfhkJvM9lvRg5exyYixM="; + vendorHash = "sha256-N39zPGos5EYRXGylsHFSjJ4EcQ9jahBOGV8xn7fF7gc="; ldflags = [ + "-X main.version=${version}" "-X main.commit=${src.rev}" "-X main.date=unknown" "-X main.builtBy=nixpkgs" From 8b67f2a80351c42014021235b28f782c663d569d Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Fri, 7 Feb 2025 00:49:32 -0500 Subject: [PATCH 0328/2168] Revert "python3Packages.zarr: 2.18.3 -> 3.0.1" This reverts commit d63c6c91866921a7c64a0d6a15a75a8f5b459351. --- .../python-modules/zarr/default.nix | 35 +++---------------- 1 file changed, 5 insertions(+), 30 deletions(-) diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix index 2524c320b184..cc38c78b3c48 100644 --- a/pkgs/development/python-modules/zarr/default.nix +++ b/pkgs/development/python-modules/zarr/default.nix @@ -5,68 +5,43 @@ pythonOlder, # build-system - hatchling, - hatch-vcs, + setuptools-scm, # dependencies asciitree, - donfig, numpy, fasteners, numcodecs, # tests - aiohttp, - botocore, - fsspec, - hypothesis, - pytest-asyncio, pytestCheckHook, - requests, - rich, }: buildPythonPackage rec { pname = "zarr"; - version = "3.0.1"; + version = "2.18.3"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-AzhZxWA9ycKeU69JTt4ktC8bdh0rtiVGaZCjuKmvt5I="; + hash = "sha256-JYDYy23YRiF3GhDTHE13fcqKJ3BqGomyn0LS034t9c4="; }; build-system = [ - hatchling - hatch-vcs + setuptools-scm ]; dependencies = [ asciitree - donfig numpy fasteners numcodecs - ] ++ numcodecs.optional-dependencies.crc32c; + ] ++ numcodecs.optional-dependencies.msgpack; nativeCheckInputs = [ - aiohttp - botocore - fsspec - hypothesis - pytest-asyncio pytestCheckHook - requests - rich - ]; - - disabledTests = [ - # flaky - "test_vindex" - "test_zarr_hierarchy" - "test_zarr_store" ]; pythonImportsCheck = [ "zarr" ]; From 48b212a2ad5208cf9decfbdd9a7538fd6d373a1e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Feb 2025 06:02:21 +0000 Subject: [PATCH 0329/2168] terraform-providers.buildkite: 1.15.5 -> 1.16.1 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 6b8fc339e89e..b03b8bbec7bc 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -207,13 +207,13 @@ "vendorHash": "sha256-RnFY5fAkEV69nuFMcivCb232r/3sqqcgdMU/WYuK+yI=" }, "buildkite": { - "hash": "sha256-xz9gYf13tNU3J7nQscuIRU41CGjYc6qMXnLltAaPQac=", + "hash": "sha256-RKZQgp7ExTIA3b54pmVFGQagzLFhtUbpSTOUraf57rE=", "homepage": "https://registry.terraform.io/providers/buildkite/buildkite", "owner": "buildkite", "repo": "terraform-provider-buildkite", - "rev": "v1.15.5", + "rev": "v1.16.1", "spdx": "MIT", - "vendorHash": "sha256-6Tmxmm/X3MZtFxlNa2H/oXGADlpoZ8oUSvTqKPAr5fA=" + "vendorHash": "sha256-5YfwKTJd9874MP5kzOqpxgwavoNlZUTptcu1sXacFJA=" }, "ccloud": { "hash": "sha256-Dpx0eugcHCJV8GNPqjxx4P9ohgJgB10DTnHr+CeN/iQ=", From 74d45f2d7d370328e807e817860a59da9fb0dc6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 6 Feb 2025 21:38:59 -0800 Subject: [PATCH 0330/2168] libdeltachat: 1.155.1 -> 1.155.3 Diff: https://github.com/deltachat/deltachat-core-rust/compare/refs/tags/v1.155.1...v1.155.3 Changelog: https://github.com/deltachat/deltachat-core-rust/blob/v1.155.3/CHANGELOG.md --- pkgs/by-name/li/libdeltachat/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix index f3e7bc07a864..f7126433bd60 100644 --- a/pkgs/by-name/li/libdeltachat/package.nix +++ b/pkgs/by-name/li/libdeltachat/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.155.1"; + version = "1.155.3"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; tag = "v${version}"; - hash = "sha256-XZLKvOvdyvR5poRY/oo9MHi1f2XzBmSDR8VqjW3wq74="; + hash = "sha256-UFDQj3TWfWdHT20R16+NqZ2lBxp5r1G5bHwm2cAWpqY="; }; patches = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoVendor { pname = "deltachat-core-rust"; inherit version src; - hash = "sha256-ZxKR1M9wqmzKVbSdBKzTsKF9tDVRGHnd+Ra9Jy5CQQY="; + hash = "sha256-Y1/33KH5cRzunzcF+3QMSArDAb3iOR62pccHDAR3pEc="; }; nativeBuildInputs = [ From 14a9b932cd0e871d559086c8dd674d3e045df289 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Feb 2025 06:28:16 +0000 Subject: [PATCH 0331/2168] diesel-cli: 2.2.6 -> 2.2.7 --- pkgs/by-name/di/diesel-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/di/diesel-cli/package.nix b/pkgs/by-name/di/diesel-cli/package.nix index 2a46df08ac50..6c15ad70cfb8 100644 --- a/pkgs/by-name/di/diesel-cli/package.nix +++ b/pkgs/by-name/di/diesel-cli/package.nix @@ -27,16 +27,16 @@ assert lib.assertMsg (lib.elem true [ rustPlatform.buildRustPackage rec { pname = "diesel-cli"; - version = "2.2.6"; + version = "2.2.7"; src = fetchCrate { inherit version; crateName = "diesel_cli"; - hash = "sha256-jKTQxlmpTlb0eITwNbnYfONknGhHsO/nzdup04ikEB0="; + hash = "sha256-0rmuOeWPczO5XRlpkeFC7FXMSnWSy5FBd9GpClA+i7c="; }; useFetchCargoVendor = true; - cargoHash = "sha256-mMXLivUWH5LIdFbAxgkha8oEYZFt0eUVCxtyPlBPpVI="; + cargoHash = "sha256-waX8wkbU8rXN183j0RDfszHKsLxQdq19UMwrqI8gBOY="; nativeBuildInputs = [ installShellFiles From 6f7b63856fa01847c19af9eb3b96b81336e28d67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christina=20S=C3=B8rensen?= Date: Fri, 7 Feb 2025 07:37:42 +0100 Subject: [PATCH 0332/2168] eza: 0.20.19 -> 0.20.20 changelog: https://github.com/eza-community/eza/releases/tag/v0.20.20 --- pkgs/by-name/ez/eza/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix index d77fd374b12a..3c81fa198d91 100644 --- a/pkgs/by-name/ez/eza/package.nix +++ b/pkgs/by-name/ez/eza/package.nix @@ -15,17 +15,17 @@ rustPlatform.buildRustPackage rec { pname = "eza"; - version = "0.20.19"; + version = "0.20.20"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-Fgb2+tKDTL7KxJhRavNc5K8AG98eZFOmDOc+sVY7rdk="; + hash = "sha256-+duTIPM1SJoCijqKDWN3H5tO8rAaqMWzMMQbJvvurcE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-XF77+dC4AB79wniSybLz5E/XznzAiOrteHPyCD9laIQ="; + cargoHash = "sha256-9mHS74PgQWSwipRpazb9fmAHFXRCp35juVMcjwuD4bY="; nativeBuildInputs = [ cmake From 178845f8e455576b13c6c4185adc71c631fc04b9 Mon Sep 17 00:00:00 2001 From: Ivy Fan-Chiang Date: Fri, 7 Feb 2025 00:36:09 -0500 Subject: [PATCH 0333/2168] ghidra-with-extensions: add ivyfanchiang as maintainer --- pkgs/tools/security/ghidra/build-extension.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/ghidra/build-extension.nix b/pkgs/tools/security/ghidra/build-extension.nix index 652b7bcdf8bf..a677879f8a39 100644 --- a/pkgs/tools/security/ghidra/build-extension.nix +++ b/pkgs/tools/security/ghidra/build-extension.nix @@ -12,7 +12,12 @@ let oldMeta: oldMeta // { - maintainers = (oldMeta.maintainers or [ ]) ++ (with lib.maintainers; [ vringar ]); + maintainers = + (oldMeta.maintainers or [ ]) + ++ (with lib.maintainers; [ + vringar + ivyfanchiang + ]); platforms = oldMeta.platforms or ghidra.meta.platforms; }; From e3e51b26ccad3aa405826a7c8bd1b0c5e2d74dbf Mon Sep 17 00:00:00 2001 From: Ivy Fan-Chiang Date: Fri, 7 Feb 2025 01:11:43 -0500 Subject: [PATCH 0334/2168] ghidra-extensions.kaiju: init at 241204 --- pkgs/tools/security/ghidra/extensions.nix | 2 + .../ghidra/extensions/kaiju/default.nix | 73 ++++++++ .../ghidra/extensions/kaiju/deps.json | 163 ++++++++++++++++++ 3 files changed, 238 insertions(+) create mode 100644 pkgs/tools/security/ghidra/extensions/kaiju/default.nix create mode 100644 pkgs/tools/security/ghidra/extensions/kaiju/deps.json diff --git a/pkgs/tools/security/ghidra/extensions.nix b/pkgs/tools/security/ghidra/extensions.nix index d8b76862e743..c17eb7f7d1ef 100644 --- a/pkgs/tools/security/ghidra/extensions.nix +++ b/pkgs/tools/security/ghidra/extensions.nix @@ -23,6 +23,8 @@ lib.makeScope newScope (self: { gnudisassembler = self.callPackage ./extensions/gnudisassembler { inherit ghidra; }; + kaiju = self.callPackage ./extensions/kaiju { }; + lightkeeper = self.callPackage ./extensions/lightkeeper { }; machinelearning = self.callPackage ./extensions/machinelearning { inherit ghidra; }; diff --git a/pkgs/tools/security/ghidra/extensions/kaiju/default.nix b/pkgs/tools/security/ghidra/extensions/kaiju/default.nix new file mode 100644 index 000000000000..958de44a29e5 --- /dev/null +++ b/pkgs/tools/security/ghidra/extensions/kaiju/default.nix @@ -0,0 +1,73 @@ +{ + lib, + stdenv, + fetchFromGitHub, + buildGhidraExtension, + z3, + gradle, +}: +let + ghidraPlatformName = + { + x86_64-linux = "linux_x86_64"; + aarch64-linux = "linux_x86_64"; + x86_64-darwin = "mac_x86_64"; + aarch64-darwin = "mac_arm_64"; + } + .${stdenv.hostPlatform.system} + or (throw "${stdenv.hostPlatform.system} is an unsupported platform"); + + z3_lib = ( + z3.override { + javaBindings = true; + jdk = gradle.jdk; + } + ); + + self = buildGhidraExtension rec { + pname = "kaiju"; + version = "241204"; + + src = fetchFromGitHub { + owner = "CERTCC"; + repo = "kaiju"; + rev = version; + hash = "sha256-xJLdazqPQISB58Pfj4eQzdnTNhiuzO2Qwo61Q4L1m6M="; + }; + + buildInputs = [ + z3_lib + ]; + + # used to copy java bindings from nixpkgs z3 package instead of having kaiju's build.gradle build gradle from source + # https://github.com/CERTCC/kaiju/blob/c9dbb55484b3d2a6abd9dfca2197cd00fb7ee3c1/build.gradle#L189 + preBuild = '' + mkdir -p build/cmake/z3/java-bindings + ln -s ${lib.getOutput "lib" z3_lib}/lib/com.microsoft.z3.jar build/cmake/z3/java-bindings + mkdir -p os/${ghidraPlatformName} + cp ${lib.getOutput "lib" z3_lib}/lib/* os/${ghidraPlatformName} + ''; + + gradleFlags = [ "-PKAIJU_SKIP_Z3_BUILD=true" ]; + + mitmCache = gradle.fetchDeps { + pkg = self; + data = ./deps.json; + }; + + meta = { + description = "A Java implementation of some features of the CERT Pharos Binary Analysis Framework for Ghidra"; + homepage = "https://github.com/CERTCC/kaiju"; + downloadPage = "https://github.com/CERTCC/kaiju/releases/tag/${version}"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.ivyfanchiang ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; + }; + }; +in +self diff --git a/pkgs/tools/security/ghidra/extensions/kaiju/deps.json b/pkgs/tools/security/ghidra/extensions/kaiju/deps.json new file mode 100644 index 000000000000..883f4b469fcc --- /dev/null +++ b/pkgs/tools/security/ghidra/extensions/kaiju/deps.json @@ -0,0 +1,163 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://plugins.gradle.org/m2": { + "com/adarshr#gradle-test-logger-plugin/4.0.0": { + "jar": "sha256-5nhoOjPSvINWcb3U5YcQAErR2TFqqfmlTP4iQZpPbvk=", + "module": "sha256-jERLLH/UQgDNSrMYJyJwHCCXWkOyPH6e35sCJgSavcI=", + "pom": "sha256-ienBpTqmJS2mx9fZscN/t/j8qQuysaNq+Ti8cNni3GE=" + }, + "com/adarshr/test-logger#com.adarshr.test-logger.gradle.plugin/4.0.0": { + "pom": "sha256-sobTcqzS2uG4vHsg/ouoT49kiXMdiBpB83NqYCCFotc=" + }, + "com/github/tomtzook#castle/2.0.0": { + "jar": "sha256-00zgaBUmlsBRQcXYStVP4PhRNglOxFNf7P+kBr0A7hg=", + "pom": "sha256-3uocEIH4TsePK074yLEPseyHxbdkreKq1Uelx+60//0=" + }, + "com/google/code/gson#gson-parent/2.8.5": { + "pom": "sha256-jx/scrkaceo57Dn193jE0RJLawl8bVWzpQtVSlIjeyc=" + }, + "com/google/code/gson#gson/2.8.5": { + "jar": "sha256-IzoBSfw2XJ9u29aDz+JmsZvcdzvpjqva9rPJJLSOfYE=", + "pom": "sha256-uDCFV6f8zJLZ/nyM0FmSWLNhKF0uzedontqYhDJVoJI=" + }, + "de/undercouch#gradle-download-task/5.5.0": { + "jar": "sha256-q/7DKUbJfz8N62qP5HDon99K7FYneLm/bPp8RAehPiI=", + "module": "sha256-5q+RV5vPUg0udBmtEPB4j13RBsCLzLCc40sNB3UvlEc=", + "pom": "sha256-HXoKzY/wjdfQnruzxz1j1mYYyFGNudC9J0J7/BjL9Hs=" + }, + "de/undercouch/download#de.undercouch.download.gradle.plugin/5.5.0": { + "pom": "sha256-WNFNTmP4TrzAgj/2tk1804/2bFRtUp9gLj3ML1xPEZk=" + }, + "io/github/tomtzook#plugin/1.2.2": { + "jar": "sha256-tTNTLIWad6fNX4McGhtFiTkQqujQ14MXhv4llB2TjYs=", + "module": "sha256-91tklOgQk0ObuwzAs8+kumszoLjzK36bNUIChrb91Cc=", + "pom": "sha256-HliRlUYwjo3HQu/JqktYsiJy/TJTdvYTSuyHPH/3xys=" + }, + "io/github/tomtzook/gradle-cmake#io.github.tomtzook.gradle-cmake.gradle.plugin/1.2.2": { + "pom": "sha256-xqnleYCaGEjSEkRXp5CwK67T9sAJaxIIliGoxZTnDJo=" + }, + "org/fusesource#fusesource-pom/1.12": { + "pom": "sha256-xA2WDarc73sBwbHGZXr7rE//teUxaPj8sLKLhOb9zKE=" + }, + "org/fusesource/jansi#jansi/2.4.0": { + "jar": "sha256-bNkZkTI917L7KMqT16wSr1qGovUyeeKzWCezAxP9C58=", + "pom": "sha256-rECp8tDB7mMfw7CO+OLwvRS6IgEcp2/xvPZftWnq3zU=" + }, + "org/slf4j#slf4j-api/1.7.25": { + "jar": "sha256-GMSgCV1cHaa4F1kudnuyPSndL1YK1033X/OWHb3iW3k=", + "pom": "sha256-fNnXoLXZPf1GGhSIkbQ1Cc9AOpx/n7SQYNNVTfHIHh4=" + }, + "org/slf4j#slf4j-parent/1.7.25": { + "pom": "sha256-GPXFISDbA26I1hNviDnIMtB0vdqVx1bG9CkknS21SsY=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + } + }, + "https://repo.maven.apache.org/maven2": { + "com/google/code/gson#gson-parent/2.8.6": { + "pom": "sha256-NzZGOFnsGSZyleiUlAroKo9oRBMDESL+Nc58/34wp3Q=" + }, + "com/google/code/gson#gson/2.8.6": { + "jar": "sha256-yPtIOQVNKAswM/gA0fWpfeLwKOuLoutFitKH5Tbz8l8=", + "pom": "sha256-IXRBWmRzMtMP2gS9HPxwij7MhOr3UX9ZYYjYJE4QORE=" + }, + "junit#junit/4.12": { + "pom": "sha256-kPFj944/+28cetl96efrpO6iWAcUG4XW0SvmfKJUScQ=" + }, + "junit#junit/4.13.2": { + "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", + "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" + }, + "net/sf/jopt-simple#jopt-simple/5.0.4": { + "jar": "sha256-3ybMWPI19HfbB/dTulo6skPr5Xidn4ns9o3WLqmmbCg=", + "pom": "sha256-amd2O3avzZyAuV5cXiR4LRjMGw49m0VK0/h1THa3aBU=" + }, + "org/apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "org/commonmark#commonmark-parent/0.17.1": { + "pom": "sha256-VQ6X1IOuWsZblW66NsnxqdlIV/bHs+qVmta7R2N4DiI=" + }, + "org/commonmark#commonmark/0.17.1": { + "jar": "sha256-5jrQgyZPWHdSJ0c8NduGbs3DhDxHvSvy8kdan65e938=", + "pom": "sha256-UFfBCkUrXNVyngvDZU+0vAx+VGAgCv/BqN1PfGOWPXI=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/junit#junit-bom/5.9.2": { + "module": "sha256-qxN7pajjLJsGa/kSahx23VYUtyS6XAsCVJdyten0zx8=", + "pom": "sha256-LtB9ZYRRMfUzaoZHbJpAVrWdC1i5gVqzZ5uw82819wU=" + }, + "org/junit/jupiter#junit-jupiter-api/5.9.2": { + "jar": "sha256-92ehcPlxJ7CtNYK/M1jqu7vpgdn5ZBGFPmKdknaSb9U=", + "module": "sha256-y9Ae2F1HTMhbIT/iBrzpgmbWdZzSjWxeQb/kUJCepHs=", + "pom": "sha256-EK9g+mkKzNzr85TsWECdzs/x3sNwJopnA2ChFfcxxVw=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.9.2": { + "jar": "sha256-dM/Ek4j3YEE/80jKLJqzlSdIS1fe7NFX8idaX4pf6XE=", + "module": "sha256-WmigqdMTI0BieAXap0YY+zTEXMUZp8LsgzQedDixOTM=", + "pom": "sha256-nfOOgj4a3Zplas+5Wc5zsHAE32yffANnwmt0PmVrWa8=" + }, + "org/junit/jupiter#junit-jupiter-migrationsupport/5.9.2": { + "jar": "sha256-1DTOe1gzyuX+9ovSfSfyABPrJ9U7bcl9eL8yS7YaDgQ=", + "module": "sha256-0tnRvL9p+RLgxT3fNO/HonM/0gCAhCA0d3Sig2ZFVZM=", + "pom": "sha256-KkAZMJh5lh9z788rZrJsF3TSjqF1U/72qAbA9sNbgqY=" + }, + "org/junit/platform#junit-platform-commons/1.9.2": { + "jar": "sha256-Yko9dF7x0o6VWmpnr47boP38XJutaApz9npwu5UKaD0=", + "module": "sha256-a6TIRhPluJ5mjuaomXHw2Q0OG4FyG4tf4MgAWPDOue4=", + "pom": "sha256-JAI/IMI1ppYJ+y+Vpgc4VX/PlBPzrpKpLhMpVH1hRck=" + }, + "org/junit/platform#junit-platform-engine/1.9.2": { + "jar": "sha256-JfI9xTWgkencgMAI+vKdy5K+kC5pEfd6c2+68BmQg2c=", + "module": "sha256-HehRQa+fWBU+JFdQaaE3X7vt169dhEy+MoeWU0nLofc=", + "pom": "sha256-LflCCmsk5fTzFCNeAc2cO49kYoXbL26C2G7gbvevTiQ=" + }, + "org/junit/vintage#junit-vintage-engine/5.9.2": { + "jar": "sha256-QeFt0yyPRiu8AysrefI5RBkbMuw5jQWFi6212r/9BhI=", + "module": "sha256-jMz93WRdDOdyFmeJhOtqEruXJQk0SVgOepIxTIxj0qQ=", + "pom": "sha256-n0TiazxEQSZXNjh58YscZBQX6nrCm66O5yfi8g2w9Ck=" + }, + "org/opentest4j#opentest4j/1.2.0": { + "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=", + "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "systems/manifold#manifold-core-parent/2023.1.28": { + "pom": "sha256-ahN15Fn/32/sBPQOta1Tp+cScHjqREz7iUUTtPCfdJA=" + }, + "systems/manifold#manifold-deps-parent/2023.1.28": { + "pom": "sha256-DE+CPr0aN18k0zh2D7G5WreDvyrnO5Wd0wDt88AJbkY=" + }, + "systems/manifold#manifold-parent/2023.1.28": { + "pom": "sha256-J0ChX+GyGJ9xJMda85n+tR1IfdE6Ij0hhtaHYSOtU6w=" + }, + "systems/manifold#manifold-preprocessor/2023.1.28": { + "jar": "sha256-vRIrrVT6SX3zuMVcfSwhL9nHE0oqfrtMNXuKzli2UB8=", + "pom": "sha256-Ov7/Z6wWQo+0mSc5K9t4Yw0aehDcnQEBDSpy9fnGMiU=" + }, + "systems/manifold#manifold-rt/2023.1.28": { + "jar": "sha256-4cn28jDYci2C2tUEizvJkdv6LRe/BrLwypEC6N0sGl0=", + "pom": "sha256-SAJid1Td0/ltrFi7w2YDNDlWhggDxFB+jynCG/rYaok=" + }, + "systems/manifold#manifold-util/2023.1.28": { + "jar": "sha256-WjY+1jmh4gvUHjvEbreQqoIB54HBfoNoOIILZs3IT80=", + "pom": "sha256-CF4FlMbIuKBRMfa1OjcnIQ7EVgulP739XXFkui2/JR0=" + }, + "systems/manifold#manifold/2023.1.28": { + "jar": "sha256-kPQeNEgFGZkZPz3zejWHU9+npn6RYRpMgOftt+bksRw=", + "pom": "sha256-R2kHxQVkoYLTSSIm/jJhjeRx4uObTuHlTSWVp+jBkpw=" + } + } +} From 88b6a61040fe7a364cf7e5615dd3519bee1e3d2b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Feb 2025 08:18:56 +0000 Subject: [PATCH 0335/2168] microsoft-edge: 132.0.2957.127 -> 132.0.2957.140 --- pkgs/by-name/mi/microsoft-edge/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix index 8d7541949160..bc52c6158966 100644 --- a/pkgs/by-name/mi/microsoft-edge/package.nix +++ b/pkgs/by-name/mi/microsoft-edge/package.nix @@ -168,11 +168,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "microsoft-edge"; - version = "132.0.2957.127"; + version = "132.0.2957.140"; src = fetchurl { url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-uoC8oxkrMWgmkUbgn7OP21lpEadKZmb4Heb32zEvdjE="; + hash = "sha256-AOeqQB/NiWs1ETGmKX7/ucAwF6JODhhxNvwkf9ing0w="; }; # With strictDeps on, some shebangs were not being patched correctly From cddf3efbe92e4a17a99aa7bab3e1fb71eadb670e Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman <145775305+xokdvium@users.noreply.github.com> Date: Fri, 7 Feb 2025 11:01:24 +0300 Subject: [PATCH 0336/2168] liborcus: fix and enable strictDeps --- pkgs/by-name/li/liborcus/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/li/liborcus/package.nix b/pkgs/by-name/li/liborcus/package.nix index 4e3a48d10b8b..2a4a0910caa9 100644 --- a/pkgs/by-name/li/liborcus/package.nix +++ b/pkgs/by-name/li/liborcus/package.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config + python3.pythonOnBuildForHost ]; buildInputs = [ @@ -35,6 +36,8 @@ stdenv.mkDerivation rec { zlib ]; + strictDeps = true; + meta = with lib; { description = "Collection of parsers and import filters for spreadsheet documents"; homepage = "https://gitlab.com/orcus/orcus"; From c1197af4f52b51420e72f46ead50a3d8dc524c96 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 Feb 2025 09:28:47 +0100 Subject: [PATCH 0337/2168] sqlfluff: 3.3.0 -> 3.3.1 Changelog: https://github.com/sqlfluff/sqlfluff/blob/3.3.1/CHANGELOG.md --- pkgs/by-name/sq/sqlfluff/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sq/sqlfluff/package.nix b/pkgs/by-name/sq/sqlfluff/package.nix index e3ef6f08f1d0..edff3337e1fc 100644 --- a/pkgs/by-name/sq/sqlfluff/package.nix +++ b/pkgs/by-name/sq/sqlfluff/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "3.3.0"; + version = "3.3.1"; pyproject = true; src = fetchFromGitHub { owner = "sqlfluff"; repo = "sqlfluff"; tag = version; - hash = "sha256-srsSDMvZ7lDDfDuINB0nXR2u+X+bzMqOZL9tvl9GI/s="; + hash = "sha256-PQSGB8723y0+cptoLHpXzXfSQFicf5tasbTEf0efA8c="; }; build-system = with python3.pkgs; [ setuptools ]; @@ -62,6 +62,8 @@ python3.pkgs.buildPythonApplication rec { "test__linter__skip_dbt_model_disabled" "test_rules__test_helper_has_variable_introspection" "test__rules__std_file_dbt" + # Assertion failure + "test_html_with_external_css" ]; pythonImportsCheck = [ "sqlfluff" ]; From 85df60475bae271c21dfebdc0bbf54e81683e833 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 7 Feb 2025 09:48:38 +0100 Subject: [PATCH 0338/2168] python312Packages.pydantic_1: 1.10.16 -> 1.10.21 Diff: https://github.com/pydantic/pydantic/compare/v1.10.16...v1.10.21 --- .../development/python-modules/pydantic/1.nix | 66 ++++++++----------- 1 file changed, 26 insertions(+), 40 deletions(-) diff --git a/pkgs/development/python-modules/pydantic/1.nix b/pkgs/development/python-modules/pydantic/1.nix index cfd0df8c7603..0fa36cec41a1 100644 --- a/pkgs/development/python-modules/pydantic/1.nix +++ b/pkgs/development/python-modules/pydantic/1.nix @@ -1,41 +1,44 @@ { lib, buildPythonPackage, - cython_0, - email-validator, fetchFromGitHub, + + # build-system + cython, + setuptools, + + # dependencies + typing-extensions, + + # optional-dependencies + python-dotenv, + email-validator, + + # tests + distutils, pytest-mock, pytest7CheckHook, - python-dotenv, - pythonAtLeast, - pythonOlder, - setuptools, - typing-extensions, - libxcrypt, + writableTmpDirAsHomeHook, }: buildPythonPackage rec { pname = "pydantic"; - version = "1.10.16"; + version = "1.10.21"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "pydantic"; repo = "pydantic"; - rev = "refs/tags/v${version}"; - hash = "sha256-dn/ZsxbkyK2sJxpo6IsoMBRjq1STdu+xuqHXoNG+Kzk="; + tag = "v${version}"; + hash = "sha256-0kwqJsay+4xh+jgDStNciRPJmuqm8GzA+6ble4K4HuI="; }; - nativeBuildInputs = [ + build-system = [ + cython setuptools - cython_0 ]; - buildInputs = lib.optionals (pythonOlder "3.9") [ libxcrypt ]; - - propagatedBuildInputs = [ typing-extensions ]; + dependencies = [ typing-extensions ]; optional-dependencies = { dotenv = [ python-dotenv ]; @@ -43,38 +46,21 @@ buildPythonPackage rec { }; nativeCheckInputs = [ + distutils pytest-mock pytest7CheckHook + writableTmpDirAsHomeHook ] ++ lib.flatten (lib.attrValues optional-dependencies); - pytestFlagsArray = [ - # https://github.com/pydantic/pydantic/issues/4817 - "-W" - "ignore::pytest.PytestReturnNotNoneWarning" - ]; - - preCheck = '' - export HOME=$(mktemp -d) - ''; - - disabledTests = lib.optionals (pythonAtLeast "3.12") [ - # depends on distuils - "test_cython_function_untouched" - # AssertionError on exact types and wording - "test_model_subclassing_abstract_base_classes_without_implementation_raises_exception" - "test_partial_specification_name" - "test_secretfield" - ]; - enableParallelBuilding = true; pythonImportsCheck = [ "pydantic" ]; - meta = with lib; { + meta = { description = "Data validation and settings management using Python type hinting"; homepage = "https://github.com/pydantic/pydantic"; changelog = "https://github.com/pydantic/pydantic/blob/v${version}/HISTORY.md"; - license = licenses.mit; - maintainers = with maintainers; [ wd15 ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ wd15 ]; }; } From 17577323dee4f60c714984a9b7423b0fe87ae365 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Feb 2025 09:12:25 +0000 Subject: [PATCH 0339/2168] dracula-theme: 4.0.0-unstable-2025-01-10 -> 4.0.0-unstable-2025-02-05 --- pkgs/by-name/dr/dracula-theme/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/dr/dracula-theme/package.nix b/pkgs/by-name/dr/dracula-theme/package.nix index 2d2971dc6421..2fd09dafec0a 100644 --- a/pkgs/by-name/dr/dracula-theme/package.nix +++ b/pkgs/by-name/dr/dracula-theme/package.nix @@ -8,7 +8,7 @@ let themeName = "Dracula"; - version = "4.0.0-unstable-2025-01-10"; + version = "4.0.0-unstable-2025-02-05"; in stdenvNoCC.mkDerivation { pname = "dracula-theme"; @@ -17,8 +17,8 @@ stdenvNoCC.mkDerivation { src = fetchFromGitHub { owner = "dracula"; repo = "gtk"; - rev = "79235b53c33f02d826d76cf991f5aa8f04ed4e76"; - hash = "sha256-glcDK0zUSYRU3SOrjxDUI170Ky995Js24DPxmL1rSPA="; + rev = "c2210b503b6acf7948218ea99c6b472744b345b5"; + hash = "sha256-b6OMY++9UdK+jb7cAr+9+Fyy9ARYcIA/27UHRSIVu0g="; }; propagatedUserEnvPkgs = [ From ee6ca62b12becac9ae0fff31689a889c92ea7885 Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman <145775305+xokdvium@users.noreply.github.com> Date: Fri, 7 Feb 2025 11:16:44 +0300 Subject: [PATCH 0340/2168] liborcus: enable tests and parallel builds --- pkgs/by-name/li/liborcus/package.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/by-name/li/liborcus/package.nix b/pkgs/by-name/li/liborcus/package.nix index 2a4a0910caa9..d50b469fc91e 100644 --- a/pkgs/by-name/li/liborcus/package.nix +++ b/pkgs/by-name/li/liborcus/package.nix @@ -36,7 +36,25 @@ stdenv.mkDerivation rec { zlib ]; + preCheck = + '' + patchShebangs test/python + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}${ + lib.concatMapStringsSep ":" (d: "$(pwd)/src/${d}/.libs") [ + "liborcus" + "parser" + "python" + "spreadsheet" + ] + } + ''; + strictDeps = true; + doCheck = true; + enableParallelBuilding = true; + enableParallelChecking = true; meta = with lib; { description = "Collection of parsers and import filters for spreadsheet documents"; From 32e770bf0f0ed41702d020a2a58bb0634cb09b8a Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 7 Feb 2025 09:47:21 +0000 Subject: [PATCH 0341/2168] rocksndiamonds: fix the build (dangling symlink) Without the change `rocksndiamonds` fails on `master` as: ERROR: noBrokenSymlinks: the symlink /nix/store/567ydn8k4wv1abma2g9ghzrfqs05i5wl-rocksndiamonds-4.4.0.2/share/icons/hicolor/32x32/apps/rocksndiamonds.png points to a missing target /nix/store/567ydn8k4wv1abma2g9ghzrfqs05i5wl-rocksndiamonds-4.4.0.2/share/rocksndiamonds/graphics/gfx_classic/RocksIcon32x32.png ERROR: noBrokenSymlinks: found 1 dangling symlinks and 0 reflexive symlinks --- pkgs/by-name/ro/rocksndiamonds/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ro/rocksndiamonds/package.nix b/pkgs/by-name/ro/rocksndiamonds/package.nix index ac232630776c..572c4fa7d513 100644 --- a/pkgs/by-name/ro/rocksndiamonds/package.nix +++ b/pkgs/by-name/ro/rocksndiamonds/package.nix @@ -46,13 +46,17 @@ stdenv.mkDerivation rec { ''; installPhase = '' + runHook preInstall + appDir=$out/share/applications iconDir=$out/share/icons/hicolor/32x32/apps mkdir -p $out/bin $appDir $iconDir $dataDir cp rocksndiamonds $out/bin/ ln -s ${desktopItem}/share/applications/* $appDir/ - ln -s $dataDir/graphics/gfx_classic/RocksIcon32x32.png $iconDir/rocksndiamonds.png + ln -s $dataDir/graphics/gfx_classic/icons/icon.png $iconDir/rocksndiamonds.png cp -r conf docs graphics levels music sounds $dataDir + + runHook postInstall ''; enableParallelBuilding = true; From f97326d605544a0ab8bb17113902c7929e3381d0 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Fri, 7 Feb 2025 03:00:08 -0700 Subject: [PATCH 0342/2168] veracrypt: 1.26.18 -> 1.26.20, fix bug with system paths/sudo detection --- pkgs/by-name/ve/veracrypt/nix-system-paths.patch | 13 +++++++++++++ pkgs/by-name/ve/veracrypt/package.nix | 7 +++++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 pkgs/by-name/ve/veracrypt/nix-system-paths.patch diff --git a/pkgs/by-name/ve/veracrypt/nix-system-paths.patch b/pkgs/by-name/ve/veracrypt/nix-system-paths.patch new file mode 100644 index 000000000000..b6b86165d02a --- /dev/null +++ b/pkgs/by-name/ve/veracrypt/nix-system-paths.patch @@ -0,0 +1,13 @@ +diff --git a/Platform/Unix/Process.cpp b/Platform/Unix/Process.cpp +index 395d4bc..18601ad 100644 +--- a/Platform/Unix/Process.cpp ++++ b/Platform/Unix/Process.cpp +@@ -52,7 +52,7 @@ namespace VeraCrypt + #elif TC_OPENBSD + const char* defaultDirs[] = {"/sbin", "/bin", "/usr/sbin", "/usr/bin", "/usr/X11R6/bin", "/usr/local/sbin", "/usr/local/bin"}; + #else +- const char* defaultDirs[] = {"/usr/local/sbin", "/usr/local/bin", "/usr/sbin", "/usr/bin", "/sbin", "/bin"}; ++ const char* defaultDirs[] = {"/run/wrappers/bin", "/run/current-system/sw/bin", "/nix/var/nix/profiles/default/bin", "/etc/profiles/per-user/$USER", "/usr/local/sbin", "/usr/local/bin", "/usr/sbin", "/usr/bin", "/sbin", "/bin"}; + #endif + const size_t defaultDirCount = sizeof(defaultDirs) / sizeof(defaultDirs[0]); + diff --git a/pkgs/by-name/ve/veracrypt/package.nix b/pkgs/by-name/ve/veracrypt/package.nix index 39388512028b..55b17793e239 100644 --- a/pkgs/by-name/ve/veracrypt/package.nix +++ b/pkgs/by-name/ve/veracrypt/package.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "veracrypt"; - version = "1.26.18"; + version = "1.26.20"; src = fetchurl { url = "https://launchpad.net/veracrypt/trunk/${finalAttrs.version}/+download/VeraCrypt_${finalAttrs.version}_Source.tar.bz2"; - hash = "sha256-fWmvHvYCgHQi50CsjMKaGHFzw4vPYZLl7GqL3tO5XBw="; + hash = "sha256-qhVmQPigzEPuPe3aO8g3lR3HRPLEvdhaXfZAZ4IosRY="; }; patches = [ @@ -35,6 +35,9 @@ stdenv.mkDerivation (finalAttrs: { ntfs = "${ntfs3g}/bin/mkfs.ntfs"; btrfs = "${btrfs-progs}/bin/mkfs.btrfs"; }) + + # https://github.com/veracrypt/VeraCrypt/commit/2cca2e1dafa405addc3af8724baf8563f352ac1c + ./nix-system-paths.patch ]; sourceRoot = "src"; From 938b37044ce8274192db65bf0bd4f122aa32750a Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 25 Nov 2024 17:27:59 +0100 Subject: [PATCH 0343/2168] python312Packages.polars: 1.12.0 -> 1.21.0 Diff: https://github.com/pola-rs/polars/compare/refs/tags/py-1.12.0...py-1.21.0 Changelog: https://github.com/pola-rs/polars/releases/tag/py-1.21.0 --- .../python-modules/polars/Cargo.lock | 5222 ----------------- .../python-modules/polars/default.nix | 60 +- 2 files changed, 36 insertions(+), 5246 deletions(-) delete mode 100644 pkgs/development/python-modules/polars/Cargo.lock diff --git a/pkgs/development/python-modules/polars/Cargo.lock b/pkgs/development/python-modules/polars/Cargo.lock deleted file mode 100644 index 37d2c8c3717e..000000000000 --- a/pkgs/development/python-modules/polars/Cargo.lock +++ /dev/null @@ -1,5222 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 4 - -[[package]] -name = "addr2line" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler2" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" - -[[package]] -name = "adler32" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" - -[[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 = "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.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" - -[[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 = "anstyle" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" - -[[package]] -name = "anyhow" -version = "1.0.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" - -[[package]] -name = "apache-avro" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aef82843a0ec9f8b19567445ad2421ceeb1d711514384bdd3d49fe37102ee13" -dependencies = [ - "bigdecimal", - "crc32fast", - "digest", - "libflate 2.1.0", - "log", - "num-bigint", - "quad-rand", - "rand", - "regex-lite", - "serde", - "serde_bytes", - "serde_json", - "snap", - "strum", - "strum_macros", - "thiserror", - "typed-builder", - "uuid", -] - -[[package]] -name = "arboard" -version = "3.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df099ccb16cd014ff054ac1bf392c67feeef57164b05c42f037cd40f5d4357f4" -dependencies = [ - "clipboard-win", - "log", - "objc2", - "objc2-app-kit", - "objc2-foundation", - "parking_lot", - "x11rb", -] - -[[package]] -name = "argminmax" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52424b59d69d69d5056d508b260553afd91c57e21849579cd1f50ee8b8b88eaa" -dependencies = [ - "num-traits", -] - -[[package]] -name = "array-init-cursor" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7d0a018de4f6aa429b9d33d69edf69072b1c5b1cb8d3e4a5f7ef898fc3eb76" - -[[package]] -name = "arrayref" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" - -[[package]] -name = "arrayvec" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" - -[[package]] -name = "arrow2" -version = "0.17.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59c468daea140b747d781a1da9f7db5f0a8e6636d4af20cc539e43d05b0604fa" -dependencies = [ - "ahash", - "bytemuck", - "chrono", - "dyn-clone", - "either", - "ethnum", - "foreign_vec", - "getrandom", - "hash_hasher", - "num-traits", - "rustc_version", - "simdutf8", -] - -[[package]] -name = "async-stream" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476" -dependencies = [ - "async-stream-impl", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-stream-impl" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.79", -] - -[[package]] -name = "async-trait" -version = "0.1.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.79", -] - -[[package]] -name = "atoi" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" -dependencies = [ - "num-traits", -] - -[[package]] -name = "atoi_simd" -version = "0.15.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ae037714f313c1353189ead58ef9eec30a8e8dc101b2622d461418fd59e28a9" - -[[package]] -name = "atomic-waker" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" - -[[package]] -name = "autocfg" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" - -[[package]] -name = "avro-schema" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5281855b39aba9684d2f47bf96983fbfd8f1725f12fabb0513a8ab879647bbd" -dependencies = [ - "async-stream", - "crc", - "fallible-streaming-iterator", - "futures", - "libflate 1.4.0", - "serde", - "serde_json", - "snap", -] - -[[package]] -name = "aws-config" -version = "1.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8191fb3091fa0561d1379ef80333c3c7191c6f0435d986e85821bcf7acbd1126" -dependencies = [ - "aws-credential-types", - "aws-runtime", - "aws-sdk-sso", - "aws-sdk-ssooidc", - "aws-sdk-sts", - "aws-smithy-async", - "aws-smithy-http", - "aws-smithy-json", - "aws-smithy-runtime", - "aws-smithy-runtime-api", - "aws-smithy-types", - "aws-types", - "bytes", - "fastrand", - "hex", - "http 0.2.12", - "ring", - "time", - "tokio", - "tracing", - "url", - "zeroize", -] - -[[package]] -name = "aws-credential-types" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60e8f6b615cb5fc60a98132268508ad104310f0cfb25a1c22eee76efdf9154da" -dependencies = [ - "aws-smithy-async", - "aws-smithy-runtime-api", - "aws-smithy-types", - "zeroize", -] - -[[package]] -name = "aws-runtime" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a10d5c055aa540164d9561a0e2e74ad30f0dcf7393c3a92f6733ddf9c5762468" -dependencies = [ - "aws-credential-types", - "aws-sigv4", - "aws-smithy-async", - "aws-smithy-eventstream", - "aws-smithy-http", - "aws-smithy-runtime", - "aws-smithy-runtime-api", - "aws-smithy-types", - "aws-types", - "bytes", - "fastrand", - "http 0.2.12", - "http-body 0.4.6", - "once_cell", - "percent-encoding", - "pin-project-lite", - "tracing", - "uuid", -] - -[[package]] -name = "aws-sdk-s3" -version = "1.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67520cfee50a8a075a86e7960a6ff30a0a93f6b83ef36f7dff42a9fad9ec1818" -dependencies = [ - "ahash", - "aws-credential-types", - "aws-runtime", - "aws-sigv4", - "aws-smithy-async", - "aws-smithy-checksums", - "aws-smithy-eventstream", - "aws-smithy-http", - "aws-smithy-json", - "aws-smithy-runtime", - "aws-smithy-runtime-api", - "aws-smithy-types", - "aws-smithy-xml", - "aws-types", - "bytes", - "fastrand", - "hex", - "hmac", - "http 0.2.12", - "http-body 0.4.6", - "lru", - "once_cell", - "percent-encoding", - "regex-lite", - "sha2", - "tracing", - "url", -] - -[[package]] -name = "aws-sdk-sso" -version = "1.44.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b90cfe6504115e13c41d3ea90286ede5aa14da294f3fe077027a6e83850843c" -dependencies = [ - "aws-credential-types", - "aws-runtime", - "aws-smithy-async", - "aws-smithy-http", - "aws-smithy-json", - "aws-smithy-runtime", - "aws-smithy-runtime-api", - "aws-smithy-types", - "aws-types", - "bytes", - "http 0.2.12", - "once_cell", - "regex-lite", - "tracing", -] - -[[package]] -name = "aws-sdk-ssooidc" -version = "1.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167c0fad1f212952084137308359e8e4c4724d1c643038ce163f06de9662c1d0" -dependencies = [ - "aws-credential-types", - "aws-runtime", - "aws-smithy-async", - "aws-smithy-http", - "aws-smithy-json", - "aws-smithy-runtime", - "aws-smithy-runtime-api", - "aws-smithy-types", - "aws-types", - "bytes", - "http 0.2.12", - "once_cell", - "regex-lite", - "tracing", -] - -[[package]] -name = "aws-sdk-sts" -version = "1.44.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cb5f98188ec1435b68097daa2a37d74b9d17c9caa799466338a8d1544e71b9d" -dependencies = [ - "aws-credential-types", - "aws-runtime", - "aws-smithy-async", - "aws-smithy-http", - "aws-smithy-json", - "aws-smithy-query", - "aws-smithy-runtime", - "aws-smithy-runtime-api", - "aws-smithy-types", - "aws-smithy-xml", - "aws-types", - "http 0.2.12", - "once_cell", - "regex-lite", - "tracing", -] - -[[package]] -name = "aws-sigv4" -version = "1.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc8db6904450bafe7473c6ca9123f88cc11089e41a025408f992db4e22d3be68" -dependencies = [ - "aws-credential-types", - "aws-smithy-eventstream", - "aws-smithy-http", - "aws-smithy-runtime-api", - "aws-smithy-types", - "bytes", - "crypto-bigint 0.5.5", - "form_urlencoded", - "hex", - "hmac", - "http 0.2.12", - "http 1.1.0", - "once_cell", - "p256", - "percent-encoding", - "ring", - "sha2", - "subtle", - "time", - "tracing", - "zeroize", -] - -[[package]] -name = "aws-smithy-async" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62220bc6e97f946ddd51b5f1361f78996e704677afc518a4ff66b7a72ea1378c" -dependencies = [ - "futures-util", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "aws-smithy-checksums" -version = "0.60.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "509e33efbd853e1e670c47e49af2f4df3d2ae0de8b845b068ddbf04636a6700d" -dependencies = [ - "aws-smithy-http", - "aws-smithy-types", - "bytes", - "crc32c", - "crc32fast", - "hex", - "http 0.2.12", - "http-body 0.4.6", - "md-5", - "pin-project-lite", - "sha1", - "sha2", - "tracing", -] - -[[package]] -name = "aws-smithy-eventstream" -version = "0.60.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cef7d0a272725f87e51ba2bf89f8c21e4df61b9e49ae1ac367a6d69916ef7c90" -dependencies = [ - "aws-smithy-types", - "bytes", - "crc32fast", -] - -[[package]] -name = "aws-smithy-http" -version = "0.60.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c8bc3e8fdc6b8d07d976e301c02fe553f72a39b7a9fea820e023268467d7ab6" -dependencies = [ - "aws-smithy-eventstream", - "aws-smithy-runtime-api", - "aws-smithy-types", - "bytes", - "bytes-utils", - "futures-core", - "http 0.2.12", - "http-body 0.4.6", - "once_cell", - "percent-encoding", - "pin-project-lite", - "pin-utils", - "tracing", -] - -[[package]] -name = "aws-smithy-json" -version = "0.60.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4683df9469ef09468dad3473d129960119a0d3593617542b7d52086c8486f2d6" -dependencies = [ - "aws-smithy-types", -] - -[[package]] -name = "aws-smithy-query" -version = "0.60.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2fbd61ceb3fe8a1cb7352e42689cec5335833cd9f94103a61e98f9bb61c64bb" -dependencies = [ - "aws-smithy-types", - "urlencoding", -] - -[[package]] -name = "aws-smithy-runtime" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1ce695746394772e7000b39fe073095db6d45a862d0767dd5ad0ac0d7f8eb87" -dependencies = [ - "aws-smithy-async", - "aws-smithy-http", - "aws-smithy-runtime-api", - "aws-smithy-types", - "bytes", - "fastrand", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.6", - "http-body 1.0.1", - "httparse", - "hyper 0.14.30", - "hyper-rustls 0.24.2", - "once_cell", - "pin-project-lite", - "pin-utils", - "rustls 0.21.12", - "tokio", - "tracing", -] - -[[package]] -name = "aws-smithy-runtime-api" -version = "1.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e086682a53d3aa241192aa110fa8dfce98f2f5ac2ead0de84d41582c7e8fdb96" -dependencies = [ - "aws-smithy-async", - "aws-smithy-types", - "bytes", - "http 0.2.12", - "http 1.1.0", - "pin-project-lite", - "tokio", - "tracing", - "zeroize", -] - -[[package]] -name = "aws-smithy-types" -version = "1.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147100a7bea70fa20ef224a6bad700358305f5dc0f84649c53769761395b355b" -dependencies = [ - "base64-simd", - "bytes", - "bytes-utils", - "futures-core", - "http 0.2.12", - "http 1.1.0", - "http-body 0.4.6", - "http-body 1.0.1", - "http-body-util", - "itoa", - "num-integer", - "pin-project-lite", - "pin-utils", - "ryu", - "serde", - "time", - "tokio", - "tokio-util", -] - -[[package]] -name = "aws-smithy-xml" -version = "0.60.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab0b0166827aa700d3dc519f72f8b3a91c35d0b8d042dc5d643a91e6f80648fc" -dependencies = [ - "xmlparser", -] - -[[package]] -name = "aws-types" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5221b91b3e441e6675310829fd8984801b772cb1546ef6c0e54dec9f1ac13fef" -dependencies = [ - "aws-credential-types", - "aws-smithy-async", - "aws-smithy-runtime-api", - "aws-smithy-types", - "rustc_version", - "tracing", -] - -[[package]] -name = "backtrace" -version = "0.3.74" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" -dependencies = [ - "addr2line", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", - "windows-targets 0.52.6", -] - -[[package]] -name = "base16ct" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" - -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - -[[package]] -name = "base64" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" - -[[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 = "bigdecimal" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d712318a27c7150326677b321a5fa91b55f6d9034ffd67f20319e147d40cee" -dependencies = [ - "autocfg", - "libm", - "num-bigint", - "num-integer", - "num-traits", - "serde", -] - -[[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 = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" -dependencies = [ - "serde", -] - -[[package]] -name = "blake3" -version = "1.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7" -dependencies = [ - "arrayref", - "arrayvec", - "cc", - "cfg-if", - "constant_time_eq", -] - -[[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 = "block2" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" -dependencies = [ - "objc2", -] - -[[package]] -name = "brotli" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", - "brotli-decompressor", -] - -[[package]] -name = "brotli-decompressor" -version = "4.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", -] - -[[package]] -name = "bumpalo" -version = "3.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" - -[[package]] -name = "bytemuck" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" -dependencies = [ - "bytemuck_derive", -] - -[[package]] -name = "bytemuck_derive" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.79", -] - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "bytes" -version = "1.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" - -[[package]] -name = "bytes-utils" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dafe3a8757b027e2be6e4e5601ed563c55989fcf1546e933c66c8eb3a058d35" -dependencies = [ - "bytes", - "either", -] - -[[package]] -name = "casey" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614586263949597dcc18675da12ef9b429135e13628d92eb8b8c6fa50ca5656b" -dependencies = [ - "syn 1.0.109", -] - -[[package]] -name = "cast" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" - -[[package]] -name = "castaway" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0abae9be0aaf9ea96a3b1b8b1b55c602ca751eba1b1500220cea4ecbafe7c0d5" -dependencies = [ - "rustversion", -] - -[[package]] -name = "cc" -version = "1.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "812acba72f0a070b003d3697490d2b55b837230ae7c6c6497f05cc2ddbb8d938" -dependencies = [ - "jobserver", - "libc", - "shlex", -] - -[[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.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "num-traits", - "serde", - "windows-targets 0.52.6", -] - -[[package]] -name = "chrono-tz" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59ae0466b83e838b81a54256c39d5d7c20b9d7daa10510a242d9b75abd5936e" -dependencies = [ - "chrono", - "chrono-tz-build", - "phf", -] - -[[package]] -name = "chrono-tz-build" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433e39f13c9a060046954e0592a8d0a4bcb1040125cbf91cb8ee58964cfb350f" -dependencies = [ - "parse-zoneinfo", - "phf", - "phf_codegen", -] - -[[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.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7be5744db7978a28d9df86a214130d106a89ce49644cbc4e3f0c22c3fba30615" -dependencies = [ - "clap_builder", -] - -[[package]] -name = "clap_builder" -version = "4.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b" -dependencies = [ - "anstyle", - "clap_lex", -] - -[[package]] -name = "clap_lex" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" - -[[package]] -name = "clipboard-win" -version = "5.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892" -dependencies = [ - "error-code", -] - -[[package]] -name = "cmake" -version = "0.1.51" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a" -dependencies = [ - "cc", -] - -[[package]] -name = "comfy-table" -version = "7.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b34115915337defe99b2aff5c2ce6771e5fbc4079f4b506301f5cf394c8452f7" -dependencies = [ - "crossterm", - "strum", - "strum_macros", - "unicode-width", -] - -[[package]] -name = "compact_str" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6050c3a16ddab2e412160b31f2c871015704239bca62f72f6e5f0be631d3f644" -dependencies = [ - "castaway", - "cfg-if", - "itoa", - "rustversion", - "ryu", - "serde", - "static_assertions", -] - -[[package]] -name = "const-oid" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" - -[[package]] -name = "constant_time_eq" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" - -[[package]] -name = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" - -[[package]] -name = "core2" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505" -dependencies = [ - "memchr", -] - -[[package]] -name = "cpufeatures" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" -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 = "crc32c" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a47af21622d091a8f0fb295b88bc886ac74efcc613efc19f5d0b21de5c89e47" -dependencies = [ - "rustc_version", -] - -[[package]] -name = "crc32fast" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" -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", - "plotters", - "rayon", - "regex", - "serde", - "serde_derive", - "serde_json", - "tinytemplate", - "walkdir", -] - -[[package]] -name = "criterion-plot" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" -dependencies = [ - "cast", - "itertools 0.10.5", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" -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.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" - -[[package]] -name = "crossterm" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" -dependencies = [ - "bitflags", - "crossterm_winapi", - "libc", - "parking_lot", - "winapi", -] - -[[package]] -name = "crossterm_winapi" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" -dependencies = [ - "winapi", -] - -[[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.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" -dependencies = [ - "generic-array", - "rand_core", - "subtle", - "zeroize", -] - -[[package]] -name = "crypto-bigint" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" -dependencies = [ - "rand_core", - "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 = "dary_heap" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7762d17f1241643615821a8455a0b2c3e803784b058693d990b11f2dce25a0ca" - -[[package]] -name = "der" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" -dependencies = [ - "const-oid", - "zeroize", -] - -[[package]] -name = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", -] - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "crypto-common", - "subtle", -] - -[[package]] -name = "doc-comment" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" - -[[package]] -name = "dyn-clone" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" - -[[package]] -name = "ecdsa" -version = "0.14.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" -dependencies = [ - "der", - "elliptic-curve", - "rfc6979", - "signature", -] - -[[package]] -name = "either" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" -dependencies = [ - "serde", -] - -[[package]] -name = "elliptic-curve" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" -dependencies = [ - "base16ct", - "crypto-bigint 0.4.9", - "der", - "digest", - "ff", - "generic-array", - "group", - "pkcs8", - "rand_core", - "sec1", - "subtle", - "zeroize", -] - -[[package]] -name = "enum_dispatch" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa18ce2bc66555b3218614519ac839ddb759a7d6720732f979ef8d13be147ecd" -dependencies = [ - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.79", -] - -[[package]] -name = "env_logger" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" -dependencies = [ - "log", - "regex", -] - -[[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.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "error-code" -version = "3.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5d9305ccc6942a704f4335694ecd3de2ea531b114ac2d51f5f843750787a92f" - -[[package]] -name = "ethnum" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b90ca2580b73ab6a1f724b76ca11ab632df820fd6040c336200d2c1df7b3c82c" - -[[package]] -name = "fallible-streaming-iterator" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" - -[[package]] -name = "fast-float" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95765f67b4b18863968b4a1bd5bb576f732b29a4a28c7cd84c09fa3e2875f33c" - -[[package]] -name = "fastrand" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" - -[[package]] -name = "ff" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" -dependencies = [ - "rand_core", - "subtle", -] - -[[package]] -name = "flate2" -version = "1.0.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" -dependencies = [ - "crc32fast", - "libz-ng-sys", - "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 = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foldhash" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" - -[[package]] -name = "foreign_vec" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee1b05cbd864bcaecbd3455d6d967862d446e4ebfc3c2e5e5b9841e53cba6673" - -[[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 = "fs4" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c6b3bd49c37d2aa3f3f2220233b29a7cd23f79d1fe70e5337d25fb390793de" -dependencies = [ - "rustix", - "windows-sys 0.52.0", -] - -[[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", - "quote", - "syn 2.0.79", -] - -[[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 = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "gethostname" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" -dependencies = [ - "libc", - "windows-targets 0.48.5", -] - -[[package]] -name = "getrandom" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "wasi", - "wasm-bindgen", -] - -[[package]] -name = "gimli" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "group" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" -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.12", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "h2" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" -dependencies = [ - "atomic-waker", - "bytes", - "fnv", - "futures-core", - "futures-sink", - "http 1.1.0", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[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 = "halfbrown" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8588661a8607108a5ca69cab034063441a0413a0b041c13618a7dd348021ef6f" -dependencies = [ - "hashbrown 0.14.5", - "serde", -] - -[[package]] -name = "hash_hasher" -version = "2.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74721d007512d0cb3338cd20f0654ac913920061a4c4d0d8708edb3f2a698c0c" - -[[package]] -name = "hashbrown" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" -dependencies = [ - "ahash", - "allocator-api2", - "rayon", - "serde", -] - -[[package]] -name = "hashbrown" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" -dependencies = [ - "allocator-api2", - "equivalent", - "foldhash", - "rayon", - "serde", -] - -[[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 = "hermit-abi" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[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 = "http" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" -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.12", - "pin-project-lite", -] - -[[package]] -name = "http-body" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" -dependencies = [ - "bytes", - "http 1.1.0", -] - -[[package]] -name = "http-body-util" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" -dependencies = [ - "bytes", - "futures-util", - "http 1.1.0", - "http-body 1.0.1", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" - -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - -[[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.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.6", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "h2 0.4.6", - "http 1.1.0", - "http-body 1.0.1", - "httparse", - "itoa", - "pin-project-lite", - "smallvec", - "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.12", - "hyper 0.14.30", - "log", - "rustls 0.21.12", - "rustls-native-certs 0.6.3", - "tokio", - "tokio-rustls 0.24.1", -] - -[[package]] -name = "hyper-rustls" -version = "0.27.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" -dependencies = [ - "futures-util", - "http 1.1.0", - "hyper 1.4.1", - "hyper-util", - "rustls 0.23.13", - "rustls-native-certs 0.8.0", - "rustls-pki-types", - "tokio", - "tokio-rustls 0.26.0", - "tower-service", -] - -[[package]] -name = "hyper-util" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "http 1.1.0", - "http-body 1.0.1", - "hyper 1.4.1", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" -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 = "idna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "indexmap" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" -dependencies = [ - "equivalent", - "hashbrown 0.15.0", - "serde", -] - -[[package]] -name = "indoc" -version = "2.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" - -[[package]] -name = "inventory" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f958d3d68f4167080a18141e10381e7634563984a537f2a49a30fd8e53ac5767" - -[[package]] -name = "ipnet" -version = "2.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" - -[[package]] -name = "is-terminal" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" -dependencies = [ - "hermit-abi 0.4.0", - "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.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - -[[package]] -name = "itoap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9028f49264629065d057f340a86acb84867925865f73bbf8d47b4d149a7e88b8" - -[[package]] -name = "jemalloc-sys" -version = "0.5.4+5.3.0-patched" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac6c1946e1cea1788cbfde01c993b52a10e2da07f4bac608228d1bed20bfebf2" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "jemallocator" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0de374a9f8e63150e6f5e8a60cc14c668226d7a347d8aee1a45766e3c4dd3bc" -dependencies = [ - "jemalloc-sys", - "libc", -] - -[[package]] -name = "jobserver" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" -dependencies = [ - "libc", -] - -[[package]] -name = "js-sys" -version = "0.3.70" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "jsonpath_lib_polars_vendor" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4bd9354947622f7471ff713eacaabdb683ccb13bba4edccaab9860abf480b7d" -dependencies = [ - "log", - "serde", - "serde_json", -] - -[[package]] -name = "lazy_static" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" - -[[package]] -name = "libc" -version = "0.2.159" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" - -[[package]] -name = "libflate" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ff4ae71b685bbad2f2f391fe74f6b7659a34871c08b210fdc039e43bee07d18" -dependencies = [ - "adler32", - "crc32fast", - "libflate_lz77 1.2.0", -] - -[[package]] -name = "libflate" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45d9dfdc14ea4ef0900c1cddbc8dcd553fbaacd8a4a282cf4018ae9dd04fb21e" -dependencies = [ - "adler32", - "core2", - "crc32fast", - "dary_heap", - "libflate_lz77 2.1.0", -] - -[[package]] -name = "libflate_lz77" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a52d3a8bfc85f250440e4424db7d857e241a3aebbbe301f3eb606ab15c39acbf" -dependencies = [ - "rle-decode-fast", -] - -[[package]] -name = "libflate_lz77" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6e0d73b369f386f1c44abd9c570d5318f55ccde816ff4b562fa452e5182863d" -dependencies = [ - "core2", - "hashbrown 0.14.5", - "rle-decode-fast", -] - -[[package]] -name = "libloading" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" -dependencies = [ - "cfg-if", - "windows-targets 0.52.6", -] - -[[package]] -name = "libm" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" - -[[package]] -name = "libmimalloc-sys" -version = "0.1.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23aa6811d3bd4deb8a84dde645f943476d13b248d818edcf8ce0b2f37f036b44" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "libz-ng-sys" -version = "1.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4436751a01da56f1277f323c80d584ffad94a3d14aecd959dd0dff75aa73a438" -dependencies = [ - "cmake", - "libc", -] - -[[package]] -name = "linux-raw-sys" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" - -[[package]] -name = "lock_api" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" - -[[package]] -name = "lru" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" -dependencies = [ - "hashbrown 0.14.5", -] - -[[package]] -name = "lz4" -version = "1.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d1febb2b4a79ddd1980eede06a8f7902197960aa0383ffcfdd62fe723036725" -dependencies = [ - "lz4-sys", -] - -[[package]] -name = "lz4-sys" -version = "1.11.1+lz4-1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bd8c0d6c6ed0cd30b3652886bb8711dc4bb01d637a68105a3d5158039b418e6" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "lz4_flex" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75761162ae2b0e580d7e7c390558127e5f01b4194debd6221fd8c207fc80e3f5" -dependencies = [ - "twox-hash", -] - -[[package]] -name = "matrixmultiply" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9380b911e3e96d10c1f415da0876389aaf1b56759054eeb0de7df940c456ba1a" -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", - "digest", -] - -[[package]] -name = "memchr" -version = "2.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" - -[[package]] -name = "memmap2" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" -dependencies = [ - "libc", -] - -[[package]] -name = "memoffset" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" -dependencies = [ - "autocfg", -] - -[[package]] -name = "mimalloc" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68914350ae34959d83f732418d51e2427a794055d0b9529f48259ac07af65633" -dependencies = [ - "libmimalloc-sys", -] - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "miniz_oxide" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" -dependencies = [ - "adler2", -] - -[[package]] -name = "mio" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" -dependencies = [ - "hermit-abi 0.3.9", - "libc", - "wasi", - "windows-sys 0.52.0", -] - -[[package]] -name = "multiversion" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4851161a11d3ad0bf9402d90ffc3967bf231768bfd7aeb61755ad06dbf1a142" -dependencies = [ - "multiversion-macros", - "target-features", -] - -[[package]] -name = "multiversion-macros" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79a74ddee9e0c27d2578323c13905793e91622148f138ba29738f9dddb835e90" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "target-features", -] - -[[package]] -name = "ndarray" -version = "0.15.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb12d4e967ec485a5f71c6311fe28158e9d6f4bc4a447b474184d0f91a8fa32" -dependencies = [ - "matrixmultiply", - "num-complex", - "num-integer", - "num-traits", - "rawpointer", -] - -[[package]] -name = "now" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d89e9874397a1f0a52fc1f197a8effd9735223cb2390e9dcc83ac6cd02923d0" -dependencies = [ - "chrono", -] - -[[package]] -name = "ntapi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" -dependencies = [ - "winapi", -] - -[[package]] -name = "num-bigint" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" -dependencies = [ - "num-integer", - "num-traits", - "serde", -] - -[[package]] -name = "num-complex" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" -dependencies = [ - "num-traits", -] - -[[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-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -dependencies = [ - "autocfg", - "libm", -] - -[[package]] -name = "numpy" -version = "0.21.0" -source = "git+https://github.com/stinodego/rust-numpy.git?rev=9ba9962ae57ba26e35babdce6f179edf5fe5b9c8#9ba9962ae57ba26e35babdce6f179edf5fe5b9c8" -dependencies = [ - "libc", - "ndarray", - "num-complex", - "num-integer", - "num-traits", - "pyo3", - "rustc-hash 1.1.0", -] - -[[package]] -name = "objc-sys" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" - -[[package]] -name = "objc2" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" -dependencies = [ - "objc-sys", - "objc2-encode", -] - -[[package]] -name = "objc2-app-kit" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" -dependencies = [ - "bitflags", - "block2", - "libc", - "objc2", - "objc2-core-data", - "objc2-core-image", - "objc2-foundation", - "objc2-quartz-core", -] - -[[package]] -name = "objc2-core-data" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" -dependencies = [ - "bitflags", - "block2", - "objc2", - "objc2-foundation", -] - -[[package]] -name = "objc2-core-image" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" -dependencies = [ - "block2", - "objc2", - "objc2-foundation", - "objc2-metal", -] - -[[package]] -name = "objc2-encode" -version = "4.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" - -[[package]] -name = "objc2-foundation" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" -dependencies = [ - "bitflags", - "block2", - "libc", - "objc2", -] - -[[package]] -name = "objc2-metal" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" -dependencies = [ - "bitflags", - "block2", - "objc2", - "objc2-foundation", -] - -[[package]] -name = "objc2-quartz-core" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" -dependencies = [ - "bitflags", - "block2", - "objc2", - "objc2-foundation", - "objc2-metal", -] - -[[package]] -name = "object" -version = "0.36.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" -dependencies = [ - "memchr", -] - -[[package]] -name = "object_store" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6da452820c715ce78221e8202ccc599b4a52f3e1eb3eedb487b680c81a8e3f3" -dependencies = [ - "async-trait", - "base64 0.22.1", - "bytes", - "chrono", - "futures", - "humantime", - "hyper 1.4.1", - "itertools 0.13.0", - "md-5", - "parking_lot", - "percent-encoding", - "quick-xml", - "rand", - "reqwest", - "ring", - "rustls-pemfile 2.2.0", - "serde", - "serde_json", - "snafu", - "tokio", - "tracing", - "url", - "walkdir", -] - -[[package]] -name = "once_cell" -version = "1.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1" -dependencies = [ - "portable-atomic", -] - -[[package]] -name = "oorandom" -version = "11.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "outref" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4030760ffd992bef45b0ae3f10ce1aba99e33464c90d14dd7c039884963ddc7a" - -[[package]] -name = "p256" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" -dependencies = [ - "ecdsa", - "elliptic-curve", - "sha2", -] - -[[package]] -name = "parking_lot" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets 0.52.6", -] - -[[package]] -name = "parse-zoneinfo" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f2a05b18d44e2957b88f96ba460715e295bc1d7510468a2f3d3b44535d26c24" -dependencies = [ - "regex", -] - -[[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 = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkcs8" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" -dependencies = [ - "der", - "spki", -] - -[[package]] -name = "pkg-config" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" - -[[package]] -name = "planus" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc1691dd09e82f428ce8d6310bd6d5da2557c82ff17694d2a32cad7242aea89f" -dependencies = [ - "array-init-cursor", -] - -[[package]] -name = "plotters" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747" -dependencies = [ - "num-traits", - "plotters-backend", - "plotters-svg", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "plotters-backend" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a" - -[[package]] -name = "plotters-svg" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670" -dependencies = [ - "plotters-backend", -] - -[[package]] -name = "polars" -version = "0.43.1" -dependencies = [ - "ahash", - "apache-avro", - "avro-schema", - "either", - "ethnum", - "futures", - "getrandom", - "polars-arrow", - "polars-core", - "polars-error", - "polars-io", - "polars-lazy", - "polars-ops", - "polars-parquet", - "polars-plan", - "polars-sql", - "polars-time", - "polars-utils", - "proptest", - "rand", - "tokio", - "tokio-util", - "version_check", -] - -[[package]] -name = "polars-arrow" -version = "0.43.1" -dependencies = [ - "ahash", - "async-stream", - "atoi", - "atoi_simd", - "avro-schema", - "bytemuck", - "chrono", - "chrono-tz", - "criterion", - "crossbeam-channel", - "doc-comment", - "dyn-clone", - "either", - "ethnum", - "fast-float", - "flate2", - "futures", - "getrandom", - "hashbrown 0.15.0", - "hex", - "indexmap", - "itoa", - "itoap", - "lz4", - "multiversion", - "num-traits", - "parking_lot", - "polars-arrow-format", - "polars-error", - "polars-schema", - "polars-utils", - "proptest", - "rand", - "regex", - "regex-syntax 0.8.5", - "ryu", - "sample-arrow2", - "sample-std", - "sample-test", - "serde", - "simdutf8", - "streaming-iterator", - "strength_reduce", - "strum_macros", - "tokio", - "tokio-util", - "version_check", - "zstd", -] - -[[package]] -name = "polars-arrow-format" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b0ef2474af9396b19025b189d96e992311e6a47f90c53cd998b36c4c64b84c" -dependencies = [ - "planus", - "prost", - "prost-derive", - "serde", -] - -[[package]] -name = "polars-compute" -version = "0.43.1" -dependencies = [ - "bytemuck", - "either", - "num-traits", - "polars-arrow", - "polars-error", - "polars-utils", - "rand", - "strength_reduce", - "version_check", -] - -[[package]] -name = "polars-core" -version = "0.43.1" -dependencies = [ - "ahash", - "bincode", - "bitflags", - "bytemuck", - "chrono", - "chrono-tz", - "comfy-table", - "either", - "hashbrown 0.14.5", - "hashbrown 0.15.0", - "indexmap", - "ndarray", - "num-traits", - "once_cell", - "polars-arrow", - "polars-compute", - "polars-error", - "polars-row", - "polars-schema", - "polars-utils", - "rand", - "rand_distr", - "rayon", - "regex", - "serde", - "serde_json", - "strum_macros", - "thiserror", - "version_check", - "xxhash-rust", -] - -[[package]] -name = "polars-doc-examples" -version = "0.43.1" -dependencies = [ - "aws-config", - "aws-sdk-s3", - "aws-smithy-checksums", - "chrono", - "polars", - "rand", - "reqwest", - "tokio", -] - -[[package]] -name = "polars-error" -version = "0.43.1" -dependencies = [ - "avro-schema", - "object_store", - "polars-arrow-format", - "regex", - "simdutf8", - "thiserror", -] - -[[package]] -name = "polars-expr" -version = "0.43.1" -dependencies = [ - "ahash", - "bitflags", - "hashbrown 0.15.0", - "num-traits", - "once_cell", - "polars-arrow", - "polars-compute", - "polars-core", - "polars-io", - "polars-json", - "polars-ops", - "polars-plan", - "polars-row", - "polars-time", - "polars-utils", - "rayon", -] - -[[package]] -name = "polars-ffi" -version = "0.43.1" -dependencies = [ - "polars-arrow", - "polars-core", -] - -[[package]] -name = "polars-io" -version = "0.43.1" -dependencies = [ - "ahash", - "async-trait", - "atoi_simd", - "blake3", - "bytes", - "chrono", - "chrono-tz", - "fast-float", - "flate2", - "fs4", - "futures", - "glob", - "hashbrown 0.15.0", - "home", - "itoa", - "memchr", - "memmap2", - "num-traits", - "object_store", - "once_cell", - "percent-encoding", - "polars-arrow", - "polars-core", - "polars-error", - "polars-json", - "polars-parquet", - "polars-schema", - "polars-time", - "polars-utils", - "pyo3", - "rayon", - "regex", - "reqwest", - "ryu", - "serde", - "serde_json", - "simd-json", - "simdutf8", - "tempfile", - "tokio", - "tokio-util", - "url", - "zstd", -] - -[[package]] -name = "polars-json" -version = "0.43.1" -dependencies = [ - "ahash", - "chrono", - "chrono-tz", - "fallible-streaming-iterator", - "hashbrown 0.15.0", - "indexmap", - "itoa", - "num-traits", - "polars-arrow", - "polars-error", - "polars-utils", - "ryu", - "simd-json", - "streaming-iterator", -] - -[[package]] -name = "polars-lazy" -version = "0.43.1" -dependencies = [ - "ahash", - "bitflags", - "futures", - "memchr", - "once_cell", - "polars-arrow", - "polars-core", - "polars-expr", - "polars-io", - "polars-json", - "polars-mem-engine", - "polars-ops", - "polars-pipe", - "polars-plan", - "polars-stream", - "polars-time", - "polars-utils", - "pyo3", - "rayon", - "serde_json", - "tokio", - "version_check", -] - -[[package]] -name = "polars-mem-engine" -version = "0.43.1" -dependencies = [ - "futures", - "memmap2", - "polars-arrow", - "polars-core", - "polars-error", - "polars-expr", - "polars-io", - "polars-json", - "polars-ops", - "polars-plan", - "polars-time", - "polars-utils", - "pyo3", - "rayon", - "tokio", -] - -[[package]] -name = "polars-ops" -version = "0.43.1" -dependencies = [ - "ahash", - "aho-corasick", - "argminmax", - "base64 0.22.1", - "bytemuck", - "chrono", - "chrono-tz", - "either", - "hashbrown 0.15.0", - "hex", - "indexmap", - "jsonpath_lib_polars_vendor", - "memchr", - "num-traits", - "polars-arrow", - "polars-compute", - "polars-core", - "polars-error", - "polars-json", - "polars-schema", - "polars-utils", - "rand", - "rand_distr", - "rayon", - "regex", - "regex-syntax 0.8.5", - "serde", - "serde_json", - "strum_macros", - "unicode-reverse", - "version_check", -] - -[[package]] -name = "polars-parquet" -version = "0.43.1" -dependencies = [ - "ahash", - "async-stream", - "base64 0.22.1", - "brotli", - "bytemuck", - "ethnum", - "fallible-streaming-iterator", - "flate2", - "futures", - "hashbrown 0.15.0", - "lz4", - "lz4_flex", - "num-traits", - "polars-arrow", - "polars-compute", - "polars-error", - "polars-parquet-format", - "polars-utils", - "rand", - "serde", - "simdutf8", - "snap", - "streaming-decompression", - "xxhash-rust", - "zstd", -] - -[[package]] -name = "polars-parquet-format" -version = "2.10.0" -source = "git+https://github.com/pola-rs/parquet-format#b96e00d2b054739ee02da06987bcd7f44b82a4ef" -dependencies = [ - "async-trait", - "futures", -] - -[[package]] -name = "polars-pipe" -version = "0.43.1" -dependencies = [ - "crossbeam-channel", - "crossbeam-queue", - "enum_dispatch", - "futures", - "hashbrown 0.15.0", - "num-traits", - "polars-arrow", - "polars-compute", - "polars-core", - "polars-expr", - "polars-io", - "polars-ops", - "polars-plan", - "polars-row", - "polars-utils", - "rayon", - "tokio", - "uuid", - "version_check", -] - -[[package]] -name = "polars-plan" -version = "0.43.1" -dependencies = [ - "ahash", - "bitflags", - "bytemuck", - "bytes", - "chrono", - "chrono-tz", - "ciborium", - "either", - "futures", - "hashbrown 0.15.0", - "libloading", - "memmap2", - "num-traits", - "once_cell", - "percent-encoding", - "polars-arrow", - "polars-core", - "polars-ffi", - "polars-io", - "polars-json", - "polars-ops", - "polars-parquet", - "polars-time", - "polars-utils", - "pyo3", - "rayon", - "recursive", - "regex", - "serde", - "serde_json", - "strum_macros", - "version_check", -] - -[[package]] -name = "polars-python" -version = "0.43.1" -dependencies = [ - "ahash", - "arboard", - "bytemuck", - "bytes", - "ciborium", - "either", - "itoa", - "libc", - "ndarray", - "num-traits", - "numpy", - "once_cell", - "polars", - "polars-core", - "polars-error", - "polars-expr", - "polars-io", - "polars-lazy", - "polars-mem-engine", - "polars-ops", - "polars-parquet", - "polars-plan", - "polars-stream", - "polars-time", - "polars-utils", - "pyo3", - "recursive", - "serde_json", - "thiserror", - "version_check", -] - -[[package]] -name = "polars-row" -version = "0.43.1" -dependencies = [ - "bytemuck", - "polars-arrow", - "polars-error", - "polars-utils", -] - -[[package]] -name = "polars-schema" -version = "0.43.1" -dependencies = [ - "indexmap", - "polars-error", - "polars-utils", - "serde", - "version_check", -] - -[[package]] -name = "polars-sql" -version = "0.43.1" -dependencies = [ - "hex", - "once_cell", - "polars-arrow", - "polars-core", - "polars-error", - "polars-lazy", - "polars-ops", - "polars-plan", - "polars-time", - "polars-utils", - "rand", - "serde", - "serde_json", - "sqlparser", -] - -[[package]] -name = "polars-stream" -version = "0.43.1" -dependencies = [ - "atomic-waker", - "crossbeam-deque", - "crossbeam-utils", - "futures", - "memmap2", - "parking_lot", - "pin-project-lite", - "polars-core", - "polars-error", - "polars-expr", - "polars-io", - "polars-mem-engine", - "polars-parquet", - "polars-plan", - "polars-utils", - "rand", - "rayon", - "recursive", - "slotmap", - "tokio", - "version_check", -] - -[[package]] -name = "polars-time" -version = "0.43.1" -dependencies = [ - "atoi", - "bytemuck", - "chrono", - "chrono-tz", - "now", - "once_cell", - "polars-arrow", - "polars-core", - "polars-error", - "polars-ops", - "polars-utils", - "regex", - "serde", - "strum_macros", -] - -[[package]] -name = "polars-utils" -version = "0.43.1" -dependencies = [ - "ahash", - "bytemuck", - "bytes", - "compact_str", - "hashbrown 0.15.0", - "indexmap", - "libc", - "memmap2", - "num-traits", - "once_cell", - "polars-error", - "pyo3", - "rand", - "raw-cpuid", - "rayon", - "serde", - "stacker", - "sysinfo", - "version_check", -] - -[[package]] -name = "portable-atomic" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" - -[[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.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" -dependencies = [ - "zerocopy", -] - -[[package]] -name = "proc-macro2" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "proptest" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d" -dependencies = [ - "bitflags", - "lazy_static", - "num-traits", - "rand", - "rand_chacha", - "rand_xorshift", - "regex-syntax 0.8.5", - "unarray", -] - -[[package]] -name = "prost" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" -dependencies = [ - "bytes", - "prost-derive", -] - -[[package]] -name = "prost-derive" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" -dependencies = [ - "anyhow", - "itertools 0.10.5", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "psm" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa37f80ca58604976033fae9515a8a2989fc13797d953f7c04fb8fa36a11f205" -dependencies = [ - "cc", -] - -[[package]] -name = "py-polars" -version = "1.12.0" -dependencies = [ - "jemallocator", - "libc", - "mimalloc", - "polars", - "polars-python", - "pyo3", -] - -[[package]] -name = "pyo3" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e00b96a521718e08e03b1a622f01c8a8deb50719335de3f60b3b3950f069d8" -dependencies = [ - "cfg-if", - "chrono", - "indoc", - "inventory", - "libc", - "memoffset", - "parking_lot", - "portable-atomic", - "pyo3-build-config", - "pyo3-ffi", - "pyo3-macros", - "unindent", -] - -[[package]] -name = "pyo3-build-config" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7883df5835fafdad87c0d888b266c8ec0f4c9ca48a5bed6bbb592e8dedee1b50" -dependencies = [ - "once_cell", - "target-lexicon", -] - -[[package]] -name = "pyo3-ffi" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01be5843dc60b916ab4dad1dca6d20b9b4e6ddc8e15f50c47fe6d85f1fb97403" -dependencies = [ - "libc", - "pyo3-build-config", -] - -[[package]] -name = "pyo3-macros" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77b34069fc0682e11b31dbd10321cbf94808394c56fd996796ce45217dfac53c" -dependencies = [ - "proc-macro2", - "pyo3-macros-backend", - "quote", - "syn 2.0.79", -] - -[[package]] -name = "pyo3-macros-backend" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08260721f32db5e1a5beae69a55553f56b99bd0e1c3e6e0a5e8851a9d0f5a85c" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "pyo3-build-config", - "quote", - "syn 2.0.79", -] - -[[package]] -name = "quad-rand" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b76f1009795ca44bb5aaae8fd3f18953e209259c33d9b059b1f53d58ab7511db" - -[[package]] -name = "quick-xml" -version = "0.36.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe" -dependencies = [ - "memchr", - "serde", -] - -[[package]] -name = "quickcheck" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" -dependencies = [ - "env_logger", - "log", - "rand", -] - -[[package]] -name = "quinn" -version = "0.11.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684" -dependencies = [ - "bytes", - "pin-project-lite", - "quinn-proto", - "quinn-udp", - "rustc-hash 2.0.0", - "rustls 0.23.13", - "socket2", - "thiserror", - "tokio", - "tracing", -] - -[[package]] -name = "quinn-proto" -version = "0.11.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" -dependencies = [ - "bytes", - "rand", - "ring", - "rustc-hash 2.0.0", - "rustls 0.23.13", - "slab", - "thiserror", - "tinyvec", - "tracing", -] - -[[package]] -name = "quinn-udp" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b" -dependencies = [ - "libc", - "once_cell", - "socket2", - "tracing", - "windows-sys 0.59.0", -] - -[[package]] -name = "quote" -version = "1.0.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rand_distr" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" -dependencies = [ - "num-traits", - "rand", -] - -[[package]] -name = "rand_regex" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b2a9fe2d7d9eeaf3279d1780452a5bbd26b31b27938787ef1c3e930d1e9cfbd" -dependencies = [ - "rand", - "regex-syntax 0.6.29", -] - -[[package]] -name = "rand_xorshift" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" -dependencies = [ - "rand_core", -] - -[[package]] -name = "raw-cpuid" -version = "11.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ab240315c661615f2ee9f0f2cd32d5a7343a84d5ebcccb99d46e6637565e7b0" -dependencies = [ - "bitflags", -] - -[[package]] -name = "rawpointer" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" - -[[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 = "recursive" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0786a43debb760f491b1bc0269fe5e84155353c67482b9e60d0cfb596054b43e" -dependencies = [ - "recursive-proc-macro-impl", - "stacker", -] - -[[package]] -name = "recursive-proc-macro-impl" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76009fbe0614077fc1a2ce255e3a1881a2e3a3527097d5dc6d8212c585e7e38b" -dependencies = [ - "quote", - "syn 2.0.79", -] - -[[package]] -name = "redox_syscall" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" -dependencies = [ - "bitflags", -] - -[[package]] -name = "ref-cast" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccf0a6f84d5f1d581da8b41b47ec8600871962f2a528115b542b362d4b744931" -dependencies = [ - "ref-cast-impl", -] - -[[package]] -name = "ref-cast-impl" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.79", -] - -[[package]] -name = "regex" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax 0.8.5", -] - -[[package]] -name = "regex-automata" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.8.5", -] - -[[package]] -name = "regex-lite" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a" - -[[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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" - -[[package]] -name = "reqwest" -version = "0.12.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b" -dependencies = [ - "base64 0.22.1", - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2 0.4.6", - "http 1.1.0", - "http-body 1.0.1", - "http-body-util", - "hyper 1.4.1", - "hyper-rustls 0.27.3", - "hyper-util", - "ipnet", - "js-sys", - "log", - "mime", - "once_cell", - "percent-encoding", - "pin-project-lite", - "quinn", - "rustls 0.23.13", - "rustls-native-certs 0.8.0", - "rustls-pemfile 2.2.0", - "rustls-pki-types", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "tokio", - "tokio-rustls 0.26.0", - "tokio-util", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-streams", - "web-sys", - "windows-registry", -] - -[[package]] -name = "rfc6979" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" -dependencies = [ - "crypto-bigint 0.4.9", - "hmac", - "zeroize", -] - -[[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 = "rle-decode-fast" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422" - -[[package]] -name = "rustc-demangle" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustc-hash" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" - -[[package]] -name = "rustc_version" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" -dependencies = [ - "semver", -] - -[[package]] -name = "rustix" -version = "0.38.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" -dependencies = [ - "bitflags", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustls" -version = "0.21.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" -dependencies = [ - "log", - "ring", - "rustls-webpki 0.101.7", - "sct", -] - -[[package]] -name = "rustls" -version = "0.23.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" -dependencies = [ - "once_cell", - "ring", - "rustls-pki-types", - "rustls-webpki 0.102.8", - "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-native-certs" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a" -dependencies = [ - "openssl-probe", - "rustls-pemfile 2.2.0", - "rustls-pki-types", - "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.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" -dependencies = [ - "rustls-pki-types", -] - -[[package]] -name = "rustls-pki-types" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55" - -[[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.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" -dependencies = [ - "ring", - "rustls-pki-types", - "untrusted", -] - -[[package]] -name = "rustversion" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" - -[[package]] -name = "ryu" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" - -[[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 = "sample-arrow2" -version = "0.17.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "502b30097ae5cc57ee8359bb59d8af349db022492de04596119d83f561ab8977" -dependencies = [ - "arrow2", - "sample-std", -] - -[[package]] -name = "sample-std" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "948bd219c6eb2b2ca1e004d8aefa8bbcf12614f60e0139b1758b49f9a94358c8" -dependencies = [ - "casey", - "quickcheck", - "rand", - "rand_regex", - "regex", -] - -[[package]] -name = "sample-test" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8b253ca516416756b09b582e2b7275de8f51f35e5d5711e20712b9377c7d5bf" -dependencies = [ - "quickcheck", - "sample-std", - "sample-test-macros", -] - -[[package]] -name = "sample-test-macros" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc6439a7589bb4581fdadb6391700ce4d26f8bffd34e2a75acb320822e9b5ef" -dependencies = [ - "proc-macro2", - "quote", - "sample-std", - "syn 1.0.109", -] - -[[package]] -name = "schannel" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" -dependencies = [ - "windows-sys 0.59.0", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "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.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" -dependencies = [ - "base16ct", - "der", - "generic-array", - "pkcs8", - "subtle", - "zeroize", -] - -[[package]] -name = "security-framework" -version = "2.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" -dependencies = [ - "bitflags", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "semver" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" - -[[package]] -name = "serde" -version = "1.0.210" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_bytes" -version = "0.11.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_derive" -version = "1.0.210" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.79", -] - -[[package]] -name = "serde_json" -version = "1.0.128" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" -dependencies = [ - "indexmap", - "itoa", - "memchr", - "ryu", - "serde", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[package]] -name = "signal-hook-registry" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" -dependencies = [ - "libc", -] - -[[package]] -name = "signature" -version = "1.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" -dependencies = [ - "digest", - "rand_core", -] - -[[package]] -name = "simd-json" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f0b376aada35f30a0012f5790e50aed62f91804a0682669aefdbe81c7fcb91" -dependencies = [ - "ahash", - "getrandom", - "halfbrown", - "once_cell", - "ref-cast", - "serde", - "serde_json", - "simdutf8", - "value-trait", -] - -[[package]] -name = "simdutf8" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" - -[[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", -] - -[[package]] -name = "smallvec" -version = "1.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - -[[package]] -name = "snafu" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4de37ad025c587a29e8f3f5605c00f70b98715ef90b9061a815b9e59e9042d6" -dependencies = [ - "doc-comment", - "snafu-derive", -] - -[[package]] -name = "snafu-derive" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "snap" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b" - -[[package]] -name = "socket2" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" - -[[package]] -name = "spki" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" -dependencies = [ - "base64ct", - "der", -] - -[[package]] -name = "sqlparser" -version = "0.49.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a404d0e14905361b918cb8afdb73605e25c1d5029312bd9785142dcb3aa49e" -dependencies = [ - "log", -] - -[[package]] -name = "stacker" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "799c883d55abdb5e98af1a7b3f23b9b6de8ecada0ecac058672d7635eb48ca7b" -dependencies = [ - "cc", - "cfg-if", - "libc", - "psm", - "windows-sys 0.59.0", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "streaming-decompression" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf6cc3b19bfb128a8ad11026086e31d3ce9ad23f8ea37354b31383a187c44cf3" -dependencies = [ - "fallible-streaming-iterator", -] - -[[package]] -name = "streaming-iterator" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2231b7c3057d5e4ad0156fb3dc807d900806020c5ffa3ee6ff2c8c76fb8520" - -[[package]] -name = "strength_reduce" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe895eb47f22e2ddd4dabc02bce419d2e643c8e3b585c78158b349195bc24d82" - -[[package]] -name = "strum" -version = "0.26.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" - -[[package]] -name = "strum_macros" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" -dependencies = [ - "heck 0.5.0", - "proc-macro2", - "quote", - "rustversion", - "syn 2.0.79", -] - -[[package]] -name = "subtle" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "sync_wrapper" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" -dependencies = [ - "futures-core", -] - -[[package]] -name = "sysinfo" -version = "0.31.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "355dbe4f8799b304b05e1b0f05fc59b2a18d36645cf169607da45bde2f69a1be" -dependencies = [ - "core-foundation-sys", - "libc", - "memchr", - "ntapi", - "windows", -] - -[[package]] -name = "target-features" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1bbb9f3c5c463a01705937a24fdabc5047929ac764b2d5b9cf681c1f5041ed5" - -[[package]] -name = "target-lexicon" -version = "0.12.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" - -[[package]] -name = "tempfile" -version = "3.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" -dependencies = [ - "cfg-if", - "fastrand", - "once_cell", - "rustix", - "windows-sys 0.59.0", -] - -[[package]] -name = "thiserror" -version = "1.0.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.79", -] - -[[package]] -name = "time" -version = "0.3.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" -dependencies = [ - "deranged", - "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.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" -dependencies = [ - "num-conv", - "time-core", -] - -[[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.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" -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 = "tokio" -version = "1.40.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "pin-project-lite", - "signal-hook-registry", - "socket2", - "tokio-macros", - "windows-sys 0.52.0", -] - -[[package]] -name = "tokio-macros" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.79", -] - -[[package]] -name = "tokio-rustls" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" -dependencies = [ - "rustls 0.21.12", - "tokio", -] - -[[package]] -name = "tokio-rustls" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" -dependencies = [ - "rustls 0.23.13", - "rustls-pki-types", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.7.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" -dependencies = [ - "bytes", - "futures-core", - "futures-io", - "futures-sink", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tower-service" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" - -[[package]] -name = "tracing" -version = "0.1.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", - "quote", - "syn 2.0.79", -] - -[[package]] -name = "tracing-core" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", -] - -[[package]] -name = "try-lock" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" - -[[package]] -name = "twox-hash" -version = "1.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" -dependencies = [ - "cfg-if", - "static_assertions", -] - -[[package]] -name = "typed-builder" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06fbd5b8de54c5f7c91f6fe4cebb949be2125d7758e630bb58b1d831dbce600" -dependencies = [ - "typed-builder-macro", -] - -[[package]] -name = "typed-builder-macro" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9534daa9fd3ed0bd911d462a37f172228077e7abf18c18a5f67199d959205f8" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.79", -] - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "unarray" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" - -[[package]] -name = "unicode-bidi" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" - -[[package]] -name = "unicode-ident" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" - -[[package]] -name = "unicode-normalization" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-reverse" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6f4888ebc23094adfb574fdca9fdc891826287a6397d2cd28802ffd6f20c76" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "unicode-segmentation" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" - -[[package]] -name = "unicode-width" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" - -[[package]] -name = "unindent" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" - -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - -[[package]] -name = "url" -version = "2.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "urlencoding" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" - -[[package]] -name = "uuid" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" -dependencies = [ - "getrandom", - "serde", -] - -[[package]] -name = "value-trait" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcaa56177466248ba59d693a048c0959ddb67f1151b963f904306312548cf392" -dependencies = [ - "float-cmp", - "halfbrown", - "itoa", - "ryu", -] - -[[package]] -name = "version_check" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" - -[[package]] -name = "vsimd" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" - -[[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 = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" -dependencies = [ - "cfg-if", - "once_cell", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.79", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.79", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" - -[[package]] -name = "wasm-streams" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e072d4e72f700fb3443d8fe94a39315df013eef1104903cdb0a2abd322bbecd" -dependencies = [ - "futures-util", - "js-sys", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "web-sys" -version = "0.3.70" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[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.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" -dependencies = [ - "windows-sys 0.59.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" -version = "0.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143" -dependencies = [ - "windows-core 0.57.0", - "windows-targets 0.52.6", -] - -[[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.6", -] - -[[package]] -name = "windows-core" -version = "0.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" -dependencies = [ - "windows-implement", - "windows-interface", - "windows-result 0.1.2", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-implement" -version = "0.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.79", -] - -[[package]] -name = "windows-interface" -version = "0.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.79", -] - -[[package]] -name = "windows-registry" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" -dependencies = [ - "windows-result 0.2.0", - "windows-strings", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-result" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-result" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-strings" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" -dependencies = [ - "windows-result 0.2.0", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" - -[[package]] -name = "x11rb" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" -dependencies = [ - "gethostname", - "rustix", - "x11rb-protocol", -] - -[[package]] -name = "x11rb-protocol" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" - -[[package]] -name = "xmlparser" -version = "0.13.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" - -[[package]] -name = "xxhash-rust" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a5cbf750400958819fb6178eaa83bee5cd9c29a26a40cc241df8c70fdd46984" - -[[package]] -name = "zerocopy" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" -dependencies = [ - "byteorder", - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.79", -] - -[[package]] -name = "zeroize" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" - -[[package]] -name = "zstd" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" -dependencies = [ - "zstd-safe", -] - -[[package]] -name = "zstd-safe" -version = "7.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" -dependencies = [ - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "2.0.13+zstd.1.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" -dependencies = [ - "cc", - "pkg-config", -] diff --git a/pkgs/development/python-modules/polars/default.nix b/pkgs/development/python-modules/polars/default.nix index d4bb4daf5cd8..ce77a9b19867 100644 --- a/pkgs/development/python-modules/polars/default.nix +++ b/pkgs/development/python-modules/polars/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, cargo, cmake, - darwin, fetchFromGitHub, pkg-config, pkgs, # zstd hidden by python3Packages.zstd @@ -41,22 +40,22 @@ }: let - version = "1.12.0"; + version = "1.21.0"; # Hide symbols to prevent accidental use rust-jemalloc-sys = throw "polars: use polarsMemoryAllocator over rust-jemalloc-sys"; jemalloc = throw "polars: use polarsMemoryAllocator over jemalloc"; in -buildPythonPackage { +buildPythonPackage rec { pname = "polars"; inherit version; src = fetchFromGitHub { owner = "pola-rs"; repo = "polars"; - rev = "py-${version}"; - hash = "sha256-q//vt8FvVKY9N/BOIoOwxaSB/F/tNX1Zl/9jd0AzSH4="; + tag = "py-${version}"; + hash = "sha256-/MmuaQG8ozl2yAVBXIibbtKjCQbw98azBFSKiP2PE0A="; }; # Do not type-check assertions because some of them use unstable features (`is_none_or`) @@ -66,12 +65,9 @@ buildPythonPackage { done < <( find -iname '*.rs' -print0 ) ''; - cargoDeps = rustPlatform.importCargoLock { - lockFile = ./Cargo.lock; - outputHashes = { - "numpy-0.21.0" = "sha256-u0Z+6L8pXSPaA3cE1sUpY6sCoaU1clXUcj/avnNzmsw="; - "polars-parquet-format-2.10.0" = "sha256-iB3KZ72JSp7tJCLn9moukpDEGf9MUos04rIQ9rDGWfI="; - }; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit pname version src; + hash = "sha256-CVKT3x8SkpL7VFw6yc4pGwd0EYwufXtBp4Xl2eD88sM="; }; requiredSystemFeatures = [ "big-parallel" ]; @@ -88,16 +84,10 @@ buildPythonPackage { rustc ]; - buildInputs = - [ - polarsMemoryAllocator - (pkgs.__splicedPackages.zstd or pkgs.zstd) - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.IOKit - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + polarsMemoryAllocator + (pkgs.__splicedPackages.zstd or pkgs.zstd) + ]; env = { ZSTD_SYS_USE_PKG_CONFIG = true; @@ -210,6 +200,7 @@ buildPythonPackage { ps.altair ps.boto3 ps.deltalake + ps.fastexcel ps.flask ps.flask-cors ps.fsspec @@ -218,6 +209,7 @@ buildPythonPackage { ps.jax ps.jaxlib (ps.kuzu or null) + ps.matplotlib ps.moto ps.nest-asyncio ps.numpy @@ -225,7 +217,7 @@ buildPythonPackage { ps.pandas ps.pyarrow ps.pydantic - (ps.pyiceberg or null) + ps.pyiceberg ps.sqlalchemy ps.torch ps.xlsx2csv @@ -264,6 +256,25 @@ buildPythonPackage { # Internet access: "test_read_web_file" + "test_run_python_snippets" + + # AssertionError: Series are different (exact value mismatch) + "test_reproducible_hash_with_seeds" + + # AssertionError: assert 'PARTITIONED FORCE SPILLED' in 'OOC sort forced\nOOC sort started\nRUN STREAMING PIPELINE\n[df -> sort -> ordered_sink]\nfinished sinking into OOC so... sort took: 365.662µs\nstarted sort source phase\nsort source phase took: 2.169915ms\nfull ooc sort took: 4.502947ms\n' + "test_streaming_sort" + + # AssertionError assert sys.getrefcount(foos[0]) == base_count (3 == 2) + # tests/unit/dataframe/test_df.py::test_extension + "test_extension" + + # Internet access (https://bucket.s3.amazonaws.com/) + "test_scan_credential_provider" + "test_scan_credential_provider_serialization" + + # ModuleNotFoundError: ADBC 'adbc_driver_sqlite.dbapi' driver not detected. + "test_read_database" + "test_read_database_parameterised_uri" # Untriaged "test_pickle_lazyframe_nested_function_udf" @@ -274,8 +285,8 @@ buildPythonPackage { "tests/benchmark" "tests/docs" - "tests/unit/io/test_iceberg.py" # Package pyiceberg - "tests/unit/io/test_spreadsheet.py" # Package fastexcel + # Internet access + "tests/unit/io/cloud/test_credential_provider.py" # Wrong altair version "tests/unit/operations/namespaces/test_plot.py" @@ -294,6 +305,7 @@ buildPythonPackage { meta = { description = "Dataframes powered by a multithreaded, vectorized query engine, written in Rust"; homepage = "https://github.com/pola-rs/polars"; + changelog = "https://github.com/pola-rs/polars/releases/tag/py-${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ happysalada From c366c45b3d611a9397f978e27208a0a05ce48041 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 25 Nov 2024 23:11:28 +0100 Subject: [PATCH 0344/2168] python312Packages.fastexcel: remove useless dependency typing-extensions --- .../development/python-modules/fastexcel/default.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/fastexcel/default.nix b/pkgs/development/python-modules/fastexcel/default.nix index 7eb217114bd6..5d7714430c39 100644 --- a/pkgs/development/python-modules/fastexcel/default.nix +++ b/pkgs/development/python-modules/fastexcel/default.nix @@ -10,8 +10,6 @@ # dependencies pyarrow, - pythonOlder, - typing-extensions, # optional-dependencies pandas, @@ -46,13 +44,9 @@ buildPythonPackage rec { rustc ]; - dependencies = - [ - pyarrow - ] - ++ lib.optionals (pythonOlder "3.9") [ - typing-extensions - ]; + dependencies = [ + pyarrow + ]; optional-dependencies = { pandas = [ From 58551a953b98371da7e5dddbb7e250a276b30ea5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erin=E2=80=84Yuki=E2=80=89Schlarb?= Date: Fri, 7 Feb 2025 11:51:03 +0100 Subject: [PATCH 0345/2168] pythonPackages.django-ckeditor: Add known vulnerability description following its formal deprecation in Feburary 2024 --- .../django-ckeditor/default.nix | 33 ++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/django-ckeditor/default.nix b/pkgs/development/python-modules/django-ckeditor/default.nix index 5ee6e68988e3..ca3d81bc7abb 100644 --- a/pkgs/development/python-modules/django-ckeditor/default.nix +++ b/pkgs/development/python-modules/django-ckeditor/default.nix @@ -50,10 +50,41 @@ buildPythonPackage rec { pythonImportsCheck = [ "ckeditor" ]; meta = with lib; { - description = " Django admin CKEditor integration"; + description = "Django admin CKEditor integration"; homepage = "https://github.com/django-ckeditor/django-ckeditor"; changelog = "https://github.com/django-ckeditor/django-ckeditor/blob/${version}/CHANGELOG.rst"; license = licenses.bsd3; maintainers = with maintainers; [ onny ]; + knownVulnerabilities = [ + '' + django-ckeditor bundles CKEditor 4.22.1 which isn’t supported anmyore and + which does have unfixed security issues + + Existing users of django-ckeditor should consider switching to a + different editor such as CKEditor 5 (django-ckeditor-5), after verifying + that its GPL licensing terms are acceptable, or ProseMirror + (django-prose-mirror by the author of django-ckeditor). Support of the + CKEditor 4 package is provided by its upstream developers as a + non-free/commercial LTS package until December 2028. + + Note that while there are publically known vulnerabilities for the + CKEditor 4 series, the exploitability of these issues depends on how + CKEditor is used by the given Django application. + + Further information: + + * List of vulnerabilites fixed in CKEditor 4.24.0-lts: + + * GHSA-fq6h-4g8v-qqvm + * GHSA-fq6h-4g8v-qqvm + * GHSA-mw2c-vx6j-mg76 + + * The django-ckeditor deprecation notice: + + + * The non-free/commerical CKEditor 4 LTS package: + + '' + ]; }; } From 1547729e0dbdc7839033bc968be90faa191e552b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Feb 2025 11:26:01 +0000 Subject: [PATCH 0346/2168] labelle: 1.3.2 -> 1.4.0 --- pkgs/by-name/la/labelle/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/la/labelle/package.nix b/pkgs/by-name/la/labelle/package.nix index 7a1a3a4f5039..081ba8bb6b15 100644 --- a/pkgs/by-name/la/labelle/package.nix +++ b/pkgs/by-name/la/labelle/package.nix @@ -8,14 +8,14 @@ }: python3Packages.buildPythonApplication rec { pname = "labelle"; - version = "1.3.2"; + version = "1.4.0"; pyproject = true; src = fetchFromGitHub { owner = "labelle-org"; repo = "labelle"; tag = "v${version}"; - hash = "sha256-+aRq+zwnoHy+kXerFCw1b46OHmWDDpyOiBRu4IvYAQg="; + hash = "sha256-y26eJKR2QZv/qKORZzag/44b1RryXMwpyMuRgac2puE="; }; postPatch = '' @@ -54,7 +54,7 @@ python3Packages.buildPythonApplication rec { ]; meta = { - changelog = "https://github.com/labelle-org/labelle/releases/tag/v${version}"; + changelog = "https://github.com/labelle-org/labelle/releases/tag/${src.tag}"; description = "Print labels with LabelManager PnP from Dymo"; homepage = "https://github.com/labelle-org/labelle"; license = lib.licenses.asl20; From 1ede86c7a31444c37ac89271a7870cb023b24e44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Koutensk=C3=BD?= Date: Sun, 29 Dec 2024 20:43:47 +0100 Subject: [PATCH 0347/2168] anytype: build from source --- .../an/anytype/anytype-heart/default.nix | 89 + pkgs/by-name/an/anytype/package.nix | 126 +- .../anytype/tantivy-go/add-Cargo.lock.patch | 1615 +++++++++++++++++ .../by-name/an/anytype/tantivy-go/default.nix | 34 + 4 files changed, 1837 insertions(+), 27 deletions(-) create mode 100644 pkgs/by-name/an/anytype/anytype-heart/default.nix create mode 100644 pkgs/by-name/an/anytype/tantivy-go/add-Cargo.lock.patch create mode 100644 pkgs/by-name/an/anytype/tantivy-go/default.nix diff --git a/pkgs/by-name/an/anytype/anytype-heart/default.nix b/pkgs/by-name/an/anytype/anytype-heart/default.nix new file mode 100644 index 000000000000..20fa24580993 --- /dev/null +++ b/pkgs/by-name/an/anytype/anytype-heart/default.nix @@ -0,0 +1,89 @@ +{ + stdenv, + lib, + callPackage, + fetchFromGitHub, + buildGoModule, + protoc-gen-grpc-web, + protoc-gen-js, + protobuf, +}: + +let + tantivy-go = callPackage ../tantivy-go { }; + pname = "anytype-heart"; + version = "0.38.9"; + src = fetchFromGitHub { + owner = "anyproto"; + repo = "anytype-heart"; + tag = "v${version}"; + hash = "sha256-0MRtzPSUxbCBJQLJbHsdEpf6GEFoS4ud1S6j9GZWzAE="; + }; + + arch = + { + # https://github.com/anyproto/anytype-heart/blob/f33a6b09e9e4e597f8ddf845fc4d6fe2ef335622/pkg/lib/localstore/ftsearch/ftsearchtantivy.go#L3 + x86_64-linux = "linux-amd64-musl"; + aarch64-linux = "linux-arm64-musl"; + x86_64-darwin = "darwin-amd64"; + aarch64-darwin = "darwin-arm64"; + } + .${stdenv.hostPlatform.system}; +in +buildGoModule { + inherit pname version src; + + vendorHash = "sha256-8QN7SipgkoJ9yRCl1Hv8ZIkeEwbWcFS6QiumXIIN1Bg="; + + subPackages = [ "cmd/grpcserver" ]; + tags = [ + "nosigar" + "nowatchdog" + ]; + + env.CGO_ENABLED = 1; + proxyVendor = true; + + nativeBuildInputs = [ + protoc-gen-grpc-web + protoc-gen-js + protobuf + ]; + + preBuild = '' + mkdir -p deps/libs/${arch} + cp ${tantivy-go}/lib/libtantivy_go.a deps/libs/${arch} + ''; + + postBuild = '' + protoc -I ./ --js_out=import_style=commonjs,binary:./dist/js/pb pb/protos/service/*.proto pb/protos/*.proto pkg/lib/pb/model/protos/*.proto + protoc -I ./ --grpc-web_out=import_style=commonjs+dts,mode=grpcwebtext:./dist/js/pb pb/protos/service/*.proto pb/protos/*.proto pkg/lib/pb/model/protos/*.proto + ''; + + postInstall = '' + mv $out/bin/grpcserver $out/bin/anytypeHelper + mkdir -p $out/lib + cp -r dist/js/pb/* $out/lib + cp -r dist/js/pb/* $out/lib + + mkdir -p $out/lib/json/generated + cp pkg/lib/bundle/system*.json $out/lib/json/generated + cp pkg/lib/bundle/internal*.json $out/lib/json/generated + + mkdir -p $out/share + cp LICENSE.md $out/share + ''; + + meta = { + description = "Shared library for Anytype clients"; + homepage = "https://anytype.io/"; + license = lib.licenses.unfreeRedistributable; + maintainers = with lib.maintainers; [ autrimpo ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; + }; +} diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix index 58195f1454b9..99356784bff4 100644 --- a/pkgs/by-name/an/anytype/package.nix +++ b/pkgs/by-name/an/anytype/package.nix @@ -1,42 +1,106 @@ { lib, - fetchurl, - appimageTools, - makeWrapper, - nix-update-script, + callPackage, + fetchFromGitHub, + buildNpmPackage, + pkg-config, + libsecret, + electron, + makeDesktopItem, + copyDesktopItems, commandLineArgs ? "", + nix-update-script, }: let + anytype-heart = callPackage ./anytype-heart { }; pname = "anytype"; version = "0.44.0"; - name = "Anytype-${version}"; - src = fetchurl { - url = "https://github.com/anyproto/anytype-ts/releases/download/v${version}/${name}.AppImage"; - hash = "sha256-+Ae0xH6ipNZgIVrrAmgeG8bibm/I3NLiDMzS+fwf9RQ="; + + src = fetchFromGitHub { + owner = "anyproto"; + repo = "anytype-ts"; + tag = "v${version}"; + hash = "sha256-a2ZnTEAFzzTb+lxtQkC6QLG5SP1+gDSjI9dqUNZWfCg="; + }; + description = "P2P note-taking tool"; + + locales = fetchFromGitHub { + owner = "anyproto"; + repo = "l10n-anytype-ts"; + rev = "a5c81ad55383c4e6e9bb7893ecfcb879bac87bea"; + hash = "sha256-evSB0ohHm++tZiazXRMR4vj34IfW3HIkfZ2gwsi/2dk="; }; - appimageContents = appimageTools.extractType2 { inherit pname version src; }; in -appimageTools.wrapType2 { +buildNpmPackage { inherit pname version src; - nativeBuildInputs = [ makeWrapper ]; + npmDepsHash = "sha256-DDVsrXgijYYOeCc1gIe2nVb+oL8v4Hqq80d7l5b6MR0="; - extraPkgs = pkgs: [ pkgs.libsecret ]; + env = { + ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + }; - extraInstallCommands = '' - wrapProgram $out/bin/${pname} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ - --add-flags ${lib.escapeShellArg commandLineArgs} - install -m 444 -D ${appimageContents}/anytype.desktop -t $out/share/applications - substituteInPlace $out/share/applications/anytype.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' - for size in 16 32 64 128 256 512 1024; do - install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/''${size}x''${size}/apps/anytype.png \ - $out/share/icons/hicolor/''${size}x''${size}/apps/anytype.png + nativeBuildInputs = [ + pkg-config + copyDesktopItems + ]; + buildInputs = [ libsecret ]; + + buildPhase = '' + runHook preBuild + + cp -r ${anytype-heart}/lib dist/ + cp -r ${anytype-heart}/bin/anytypeHelper dist/ + + for lang in ${locales}/locales/*; do + cp "$lang" "dist/lib/json/lang/$(basename $lang)" done + + npm run build + + runHook postBuild ''; + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/node_modules/anytype + cp -r electron.js electron dist node_modules package.json $out/lib/node_modules/anytype/ + + for icon in $out/lib/node_modules/anytype/electron/img/icons/*.png; do + mkdir -p "$out/share/icons/hicolor/$(basename $icon .png)/apps" + ln -s "$icon" "$out/share/icons/hicolor/$(basename $icon .png)/apps/anytype.png" + done + + cp LICENSE.md $out/share + + makeWrapper '${lib.getExe electron}' $out/bin/anytype \ + --set-default ELECTRON_IS_DEV 0 \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ + --add-flags $out/lib/node_modules/anytype/ \ + --add-flags ${lib.escapeShellArg commandLineArgs} + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "Anytype"; + exec = "anytype"; + icon = "anytype"; + desktopName = "Anytype"; + comment = description; + categories = [ + "Utility" + "Office" + "Calendar" + "ProjectManagement" + ]; + startupWMClass = "anytype"; + }) + ]; + passthru.updateScript = nix-update-script { # Prevent updating to versions with '-' in them. # Necessary since Anytype uses Electron-based 'MAJOR.MINOR.PATCH(-{alpha,beta})?' versioning scheme where each @@ -48,12 +112,20 @@ appimageTools.wrapType2 { ]; }; - meta = with lib; { - description = "P2P note-taking tool"; + meta = { + inherit description; homepage = "https://anytype.io/"; - license = licenses.unfree; + license = lib.licenses.unfreeRedistributable; mainProgram = "anytype"; - maintainers = with maintainers; [ running-grass ]; - platforms = [ "x86_64-linux" ]; + maintainers = with lib.maintainers; [ + running-grass + autrimpo + ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; }; } diff --git a/pkgs/by-name/an/anytype/tantivy-go/add-Cargo.lock.patch b/pkgs/by-name/an/anytype/tantivy-go/add-Cargo.lock.patch new file mode 100644 index 000000000000..9b974186d55b --- /dev/null +++ b/pkgs/by-name/an/anytype/tantivy-go/add-Cargo.lock.patch @@ -0,0 +1,1615 @@ +diff --git a/rust/Cargo.lock b/rust/Cargo.lock +new file mode 100644 +index 0000000..942397e +--- /dev/null ++++ b/rust/Cargo.lock +@@ -0,0 +1,1609 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++version = 3 ++ ++[[package]] ++name = "adler32" ++version = "1.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" ++ ++[[package]] ++name = "ahash" ++version = "0.8.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" ++dependencies = [ ++ "cfg-if", ++ "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.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" ++ ++[[package]] ++name = "anstream" ++version = "0.6.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" ++dependencies = [ ++ "anstyle", ++ "anstyle-parse", ++ "anstyle-query", ++ "anstyle-wincon", ++ "colorchoice", ++ "is_terminal_polyfill", ++ "utf8parse", ++] ++ ++[[package]] ++name = "anstyle" ++version = "1.0.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" ++ ++[[package]] ++name = "anstyle-parse" ++version = "0.2.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" ++dependencies = [ ++ "utf8parse", ++] ++ ++[[package]] ++name = "anstyle-query" ++version = "1.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" ++dependencies = [ ++ "windows-sys 0.59.0", ++] ++ ++[[package]] ++name = "anstyle-wincon" ++version = "3.0.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" ++dependencies = [ ++ "anstyle", ++ "windows-sys 0.59.0", ++] ++ ++[[package]] ++name = "arc-swap" ++version = "1.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" ++ ++[[package]] ++name = "async-trait" ++version = "0.1.83" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn 2.0.93", ++] ++ ++[[package]] ++name = "autocfg" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" ++ ++[[package]] ++name = "base64" ++version = "0.22.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" ++ ++[[package]] ++name = "bitflags" ++version = "2.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" ++ ++[[package]] ++name = "bitpacking" ++version = "0.9.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4c1d3e2bfd8d06048a179f7b17afc3188effa10385e7b00dc65af6aae732ea92" ++dependencies = [ ++ "crunchy", ++] ++ ++[[package]] ++name = "bumpalo" ++version = "3.16.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" ++ ++[[package]] ++name = "byteorder" ++version = "1.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" ++ ++[[package]] ++name = "cbindgen" ++version = "0.27.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3fce8dd7fcfcbf3a0a87d8f515194b49d6135acab73e18bd380d1d93bb1a15eb" ++dependencies = [ ++ "clap", ++ "heck", ++ "indexmap", ++ "log", ++ "proc-macro2", ++ "quote", ++ "serde", ++ "serde_json", ++ "syn 2.0.93", ++ "tempfile", ++ "toml", ++] ++ ++[[package]] ++name = "cc" ++version = "1.2.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8d6dbb628b8f8555f86d0323c2eb39e3ec81901f4b83e091db8a6a76d316a333" ++dependencies = [ ++ "jobserver", ++ "libc", ++ "shlex", ++] ++ ++[[package]] ++name = "cedarwood" ++version = "0.4.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6d910bedd62c24733263d0bed247460853c9d22e8956bd4cd964302095e04e90" ++dependencies = [ ++ "smallvec", ++] ++ ++[[package]] ++name = "census" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4f4c707c6a209cbe82d10abd08e1ea8995e9ea937d2550646e02798948992be0" ++ ++[[package]] ++name = "cfg-if" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" ++ ++[[package]] ++name = "clap" ++version = "4.5.23" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84" ++dependencies = [ ++ "clap_builder", ++] ++ ++[[package]] ++name = "clap_builder" ++version = "4.5.23" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838" ++dependencies = [ ++ "anstream", ++ "anstyle", ++ "clap_lex", ++ "strsim", ++] ++ ++[[package]] ++name = "clap_lex" ++version = "0.7.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" ++ ++[[package]] ++name = "colorchoice" ++version = "1.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" ++ ++[[package]] ++name = "core2" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505" ++dependencies = [ ++ "memchr", ++] ++ ++[[package]] ++name = "crc32fast" ++version = "1.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" ++dependencies = [ ++ "cfg-if", ++] ++ ++[[package]] ++name = "crossbeam-channel" ++version = "0.5.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471" ++dependencies = [ ++ "crossbeam-utils", ++] ++ ++[[package]] ++name = "crossbeam-deque" ++version = "0.8.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" ++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.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" ++ ++[[package]] ++name = "crunchy" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" ++ ++[[package]] ++name = "dary_heap" ++version = "0.3.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "04d2cd9c18b9f454ed67da600630b021a8a80bf33f8c95896ab33aaf1c26b728" ++ ++[[package]] ++name = "deranged" ++version = "0.3.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" ++dependencies = [ ++ "powerfmt", ++ "serde", ++] ++ ++[[package]] ++name = "downcast-rs" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" ++ ++[[package]] ++name = "either" ++version = "1.13.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" ++ ++[[package]] ++name = "env_filter" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0" ++dependencies = [ ++ "log", ++ "regex", ++] ++ ++[[package]] ++name = "env_logger" ++version = "0.11.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dcaee3d8e3cfc3fd92428d477bc97fc29ec8716d180c0d74c643bb26166660e0" ++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.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" ++dependencies = [ ++ "libc", ++ "windows-sys 0.59.0", ++] ++ ++[[package]] ++name = "fastdivide" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9afc2bd4d5a73106dd53d10d73d3401c2f32730ba2c0b93ddb888a8983680471" ++ ++[[package]] ++name = "fastrand" ++version = "2.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" ++ ++[[package]] ++name = "fnv" ++version = "1.0.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" ++ ++[[package]] ++name = "foldhash" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f" ++ ++[[package]] ++name = "fs4" ++version = "0.8.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f7e180ac76c23b45e767bd7ae9579bc0bb458618c4bc71835926e098e61d15f8" ++dependencies = [ ++ "rustix", ++ "windows-sys 0.52.0", ++] ++ ++[[package]] ++name = "fxhash" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" ++dependencies = [ ++ "byteorder", ++] ++ ++[[package]] ++name = "getrandom" ++version = "0.2.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" ++dependencies = [ ++ "cfg-if", ++ "libc", ++ "wasi", ++] ++ ++[[package]] ++name = "hashbrown" ++version = "0.14.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" ++dependencies = [ ++ "ahash", ++ "allocator-api2", ++] ++ ++[[package]] ++name = "hashbrown" ++version = "0.15.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" ++dependencies = [ ++ "allocator-api2", ++ "equivalent", ++ "foldhash", ++] ++ ++[[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.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" ++ ++[[package]] ++name = "htmlescape" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e9025058dae765dee5070ec375f591e2ba14638c63feff74f13805a72e523163" ++ ++[[package]] ++name = "humantime" ++version = "2.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" ++ ++[[package]] ++name = "include-flate" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "df49c16750695486c1f34de05da5b7438096156466e7f76c38fcdf285cf0113e" ++dependencies = [ ++ "include-flate-codegen", ++ "lazy_static", ++ "libflate", ++] ++ ++[[package]] ++name = "include-flate-codegen" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8c5b246c6261be723b85c61ecf87804e8ea4a35cb68be0ff282ed84b95ffe7d7" ++dependencies = [ ++ "libflate", ++ "proc-macro2", ++ "quote", ++ "syn 2.0.93", ++] ++ ++[[package]] ++name = "indexmap" ++version = "2.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" ++dependencies = [ ++ "equivalent", ++ "hashbrown 0.15.2", ++] ++ ++[[package]] ++name = "instant" ++version = "0.1.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" ++dependencies = [ ++ "cfg-if", ++ "js-sys", ++ "wasm-bindgen", ++ "web-sys", ++] ++ ++[[package]] ++name = "is_terminal_polyfill" ++version = "1.70.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" ++ ++[[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.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" ++ ++[[package]] ++name = "jieba-macros" ++version = "0.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7c676b32a471d3cfae8dac2ad2f8334cd52e53377733cca8c1fb0a5062fec192" ++dependencies = [ ++ "phf_codegen", ++] ++ ++[[package]] ++name = "jieba-rs" ++version = "0.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9a77d0ae8831f870c4f6ffce310f708b5273ea2e7a88e6af770a10d1b4876311" ++dependencies = [ ++ "cedarwood", ++ "fxhash", ++ "include-flate", ++ "jieba-macros", ++ "lazy_static", ++ "phf", ++ "regex", ++] ++ ++[[package]] ++name = "jobserver" ++version = "0.1.32" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "js-sys" ++version = "0.3.76" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7" ++dependencies = [ ++ "once_cell", ++ "wasm-bindgen", ++] ++ ++[[package]] ++name = "lazy_static" ++version = "1.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" ++ ++[[package]] ++name = "levenshtein_automata" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0c2cdeb66e45e9f36bfad5bbdb4d2384e70936afbee843c6f6543f0c551ebb25" ++ ++[[package]] ++name = "libc" ++version = "0.2.169" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" ++ ++[[package]] ++name = "libflate" ++version = "2.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "45d9dfdc14ea4ef0900c1cddbc8dcd553fbaacd8a4a282cf4018ae9dd04fb21e" ++dependencies = [ ++ "adler32", ++ "core2", ++ "crc32fast", ++ "dary_heap", ++ "libflate_lz77", ++] ++ ++[[package]] ++name = "libflate_lz77" ++version = "2.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e6e0d73b369f386f1c44abd9c570d5318f55ccde816ff4b562fa452e5182863d" ++dependencies = [ ++ "core2", ++ "hashbrown 0.14.5", ++ "rle-decode-fast", ++] ++ ++[[package]] ++name = "libm" ++version = "0.2.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" ++ ++[[package]] ++name = "linux-raw-sys" ++version = "0.4.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" ++ ++[[package]] ++name = "log" ++version = "0.4.22" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" ++ ++[[package]] ++name = "logcall" ++version = "0.1.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "56e8309d7cbf9e9f27139956138cb375f14621cdb2f4cdd91468467ec04b6784" ++dependencies = [ ++ "proc-macro-error", ++ "proc-macro2", ++ "quote", ++ "syn 2.0.93", ++] ++ ++[[package]] ++name = "lru" ++version = "0.12.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" ++dependencies = [ ++ "hashbrown 0.15.2", ++] ++ ++[[package]] ++name = "lz4_flex" ++version = "0.11.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "75761162ae2b0e580d7e7c390558127e5f01b4194debd6221fd8c207fc80e3f5" ++ ++[[package]] ++name = "measure_time" ++version = "0.8.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dbefd235b0aadd181626f281e1d684e116972988c14c264e42069d5e8a5775cc" ++dependencies = [ ++ "instant", ++ "log", ++] ++ ++[[package]] ++name = "memchr" ++version = "2.7.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" ++ ++[[package]] ++name = "memmap2" ++version = "0.9.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "minimal-lexical" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" ++ ++[[package]] ++name = "murmurhash32" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2195bf6aa996a481483b29d62a7663eed3fe39600c460e323f8ff41e90bdd89b" ++ ++[[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 = "num-conv" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" ++ ++[[package]] ++name = "num-traits" ++version = "0.2.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" ++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", ++ "libc", ++] ++ ++[[package]] ++name = "once_cell" ++version = "1.20.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" ++ ++[[package]] ++name = "oneshot" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e296cf87e61c9cfc1a61c3c63a0f7f286ed4554e0e22be84e8a38e1d264a2a29" ++ ++[[package]] ++name = "ownedbytes" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c3a059efb063b8f425b948e042e6b9bd85edfe60e913630ed727b23e2dfcc558" ++dependencies = [ ++ "stable_deref_trait", ++] ++ ++[[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 = "pkg-config" ++version = "0.3.31" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" ++ ++[[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.20" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" ++dependencies = [ ++ "zerocopy", ++] ++ ++[[package]] ++name = "proc-macro-error" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" ++dependencies = [ ++ "proc-macro-error-attr", ++ "proc-macro2", ++ "quote", ++ "syn 1.0.109", ++ "version_check", ++] ++ ++[[package]] ++name = "proc-macro-error-attr" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "version_check", ++] ++ ++[[package]] ++name = "proc-macro2" ++version = "1.0.92" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" ++dependencies = [ ++ "unicode-ident", ++] ++ ++[[package]] ++name = "quote" ++version = "1.0.38" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" ++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 = "rand_distr" ++version = "0.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" ++dependencies = [ ++ "num-traits", ++ "rand", ++] ++ ++[[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 = "regex" ++version = "1.11.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" ++dependencies = [ ++ "aho-corasick", ++ "memchr", ++ "regex-automata", ++ "regex-syntax", ++] ++ ++[[package]] ++name = "regex-automata" ++version = "0.4.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" ++dependencies = [ ++ "aho-corasick", ++ "memchr", ++ "regex-syntax", ++] ++ ++[[package]] ++name = "regex-syntax" ++version = "0.8.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" ++ ++[[package]] ++name = "rle-decode-fast" ++version = "1.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422" ++ ++[[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.42" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" ++dependencies = [ ++ "bitflags", ++ "errno", ++ "libc", ++ "linux-raw-sys", ++ "windows-sys 0.59.0", ++] ++ ++[[package]] ++name = "ryu" ++version = "1.0.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" ++ ++[[package]] ++name = "serde" ++version = "1.0.217" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" ++dependencies = [ ++ "serde_derive", ++] ++ ++[[package]] ++name = "serde_derive" ++version = "1.0.217" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn 2.0.93", ++] ++ ++[[package]] ++name = "serde_json" ++version = "1.0.134" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d" ++dependencies = [ ++ "itoa", ++ "memchr", ++ "ryu", ++ "serde", ++] ++ ++[[package]] ++name = "serde_spanned" ++version = "0.6.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" ++dependencies = [ ++ "serde", ++] ++ ++[[package]] ++name = "shlex" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" ++ ++[[package]] ++name = "siphasher" ++version = "0.3.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" ++ ++[[package]] ++name = "sketches-ddsketch" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "85636c14b73d81f541e525f585c0a2109e6744e1565b5c1668e31c70c10ed65c" ++dependencies = [ ++ "serde", ++] ++ ++[[package]] ++name = "smallvec" ++version = "1.13.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" ++ ++[[package]] ++name = "stable_deref_trait" ++version = "1.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" ++ ++[[package]] ++name = "strsim" ++version = "0.11.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" ++ ++[[package]] ++name = "syn" ++version = "1.0.109" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" ++dependencies = [ ++ "proc-macro2", ++ "unicode-ident", ++] ++ ++[[package]] ++name = "syn" ++version = "2.0.93" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9c786062daee0d6db1132800e623df74274a0a87322d8e183338e01b3d98d058" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "unicode-ident", ++] ++ ++[[package]] ++name = "tantivy" ++version = "0.22.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f8d0582f186c0a6d55655d24543f15e43607299425c5ad8352c242b914b31856" ++dependencies = [ ++ "aho-corasick", ++ "arc-swap", ++ "base64", ++ "bitpacking", ++ "byteorder", ++ "census", ++ "crc32fast", ++ "crossbeam-channel", ++ "downcast-rs", ++ "fastdivide", ++ "fnv", ++ "fs4", ++ "htmlescape", ++ "itertools", ++ "levenshtein_automata", ++ "log", ++ "lru", ++ "lz4_flex", ++ "measure_time", ++ "memmap2", ++ "num_cpus", ++ "once_cell", ++ "oneshot", ++ "rayon", ++ "regex", ++ "rust-stemmers", ++ "rustc-hash", ++ "serde", ++ "serde_json", ++ "sketches-ddsketch", ++ "smallvec", ++ "tantivy-bitpacker", ++ "tantivy-columnar", ++ "tantivy-common", ++ "tantivy-fst", ++ "tantivy-query-grammar", ++ "tantivy-stacker", ++ "tantivy-tokenizer-api", ++ "tempfile", ++ "thiserror", ++ "time", ++ "uuid", ++ "winapi", ++] ++ ++[[package]] ++name = "tantivy-bitpacker" ++version = "0.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "284899c2325d6832203ac6ff5891b297fc5239c3dc754c5bc1977855b23c10df" ++dependencies = [ ++ "bitpacking", ++] ++ ++[[package]] ++name = "tantivy-columnar" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "12722224ffbe346c7fec3275c699e508fd0d4710e629e933d5736ec524a1f44e" ++dependencies = [ ++ "downcast-rs", ++ "fastdivide", ++ "itertools", ++ "serde", ++ "tantivy-bitpacker", ++ "tantivy-common", ++ "tantivy-sstable", ++ "tantivy-stacker", ++] ++ ++[[package]] ++name = "tantivy-common" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8019e3cabcfd20a1380b491e13ff42f57bb38bf97c3d5fa5c07e50816e0621f4" ++dependencies = [ ++ "async-trait", ++ "byteorder", ++ "ownedbytes", ++ "serde", ++ "time", ++] ++ ++[[package]] ++name = "tantivy-fst" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d60769b80ad7953d8a7b2c70cdfe722bbcdcac6bccc8ac934c40c034d866fc18" ++dependencies = [ ++ "byteorder", ++ "regex-syntax", ++ "utf8-ranges", ++] ++ ++[[package]] ++name = "tantivy-go" ++version = "0.2.0" ++dependencies = [ ++ "cbindgen", ++ "env_logger", ++ "lazy_static", ++ "log", ++ "logcall", ++ "serde", ++ "serde_json", ++ "tantivy", ++ "tantivy-jieba", ++ "unicode-segmentation", ++] ++ ++[[package]] ++name = "tantivy-jieba" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0f2fe65c125f0d76d06f0f2ce9fbb9287b53f0dafb51a6270d984a840e2f16c1" ++dependencies = [ ++ "jieba-rs", ++ "lazy_static", ++ "tantivy-tokenizer-api", ++] ++ ++[[package]] ++name = "tantivy-query-grammar" ++version = "0.22.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "847434d4af57b32e309f4ab1b4f1707a6c566656264caa427ff4285c4d9d0b82" ++dependencies = [ ++ "nom", ++] ++ ++[[package]] ++name = "tantivy-sstable" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c69578242e8e9fc989119f522ba5b49a38ac20f576fc778035b96cc94f41f98e" ++dependencies = [ ++ "tantivy-bitpacker", ++ "tantivy-common", ++ "tantivy-fst", ++ "zstd", ++] ++ ++[[package]] ++name = "tantivy-stacker" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c56d6ff5591fc332739b3ce7035b57995a3ce29a93ffd6012660e0949c956ea8" ++dependencies = [ ++ "murmurhash32", ++ "rand_distr", ++ "tantivy-common", ++] ++ ++[[package]] ++name = "tantivy-tokenizer-api" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2a0dcade25819a89cfe6f17d932c9cedff11989936bf6dd4f336d50392053b04" ++dependencies = [ ++ "serde", ++] ++ ++[[package]] ++name = "tempfile" ++version = "3.14.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" ++dependencies = [ ++ "cfg-if", ++ "fastrand", ++ "once_cell", ++ "rustix", ++ "windows-sys 0.59.0", ++] ++ ++[[package]] ++name = "thiserror" ++version = "1.0.69" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" ++dependencies = [ ++ "thiserror-impl", ++] ++ ++[[package]] ++name = "thiserror-impl" ++version = "1.0.69" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn 2.0.93", ++] ++ ++[[package]] ++name = "time" ++version = "0.3.37" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" ++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.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" ++dependencies = [ ++ "num-conv", ++ "time-core", ++] ++ ++[[package]] ++name = "toml" ++version = "0.8.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" ++dependencies = [ ++ "serde", ++ "serde_spanned", ++ "toml_datetime", ++ "toml_edit", ++] ++ ++[[package]] ++name = "toml_datetime" ++version = "0.6.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" ++dependencies = [ ++ "serde", ++] ++ ++[[package]] ++name = "toml_edit" ++version = "0.22.22" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" ++dependencies = [ ++ "indexmap", ++ "serde", ++ "serde_spanned", ++ "toml_datetime", ++ "winnow", ++] ++ ++[[package]] ++name = "unicode-ident" ++version = "1.0.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" ++ ++[[package]] ++name = "unicode-segmentation" ++version = "1.12.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" ++ ++[[package]] ++name = "utf8-ranges" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7fcfc827f90e53a02eaef5e535ee14266c1d569214c6aa70133a624d8a3164ba" ++ ++[[package]] ++name = "utf8parse" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" ++ ++[[package]] ++name = "uuid" ++version = "1.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" ++dependencies = [ ++ "getrandom", ++ "serde", ++] ++ ++[[package]] ++name = "version_check" ++version = "0.9.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" ++ ++[[package]] ++name = "wasi" ++version = "0.11.0+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" ++ ++[[package]] ++name = "wasm-bindgen" ++version = "0.2.99" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396" ++dependencies = [ ++ "cfg-if", ++ "once_cell", ++ "wasm-bindgen-macro", ++] ++ ++[[package]] ++name = "wasm-bindgen-backend" ++version = "0.2.99" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79" ++dependencies = [ ++ "bumpalo", ++ "log", ++ "proc-macro2", ++ "quote", ++ "syn 2.0.93", ++ "wasm-bindgen-shared", ++] ++ ++[[package]] ++name = "wasm-bindgen-macro" ++version = "0.2.99" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe" ++dependencies = [ ++ "quote", ++ "wasm-bindgen-macro-support", ++] ++ ++[[package]] ++name = "wasm-bindgen-macro-support" ++version = "0.2.99" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn 2.0.93", ++ "wasm-bindgen-backend", ++ "wasm-bindgen-shared", ++] ++ ++[[package]] ++name = "wasm-bindgen-shared" ++version = "0.2.99" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6" ++ ++[[package]] ++name = "web-sys" ++version = "0.3.76" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc" ++dependencies = [ ++ "js-sys", ++ "wasm-bindgen", ++] ++ ++[[package]] ++name = "winapi" ++version = "0.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", ++] ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" ++ ++[[package]] ++name = "windows-sys" ++version = "0.52.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" ++dependencies = [ ++ "windows-targets", ++] ++ ++[[package]] ++name = "windows-sys" ++version = "0.59.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" ++dependencies = [ ++ "windows-targets", ++] ++ ++[[package]] ++name = "windows-targets" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" ++dependencies = [ ++ "windows_aarch64_gnullvm", ++ "windows_aarch64_msvc", ++ "windows_i686_gnu", ++ "windows_i686_gnullvm", ++ "windows_i686_msvc", ++ "windows_x86_64_gnu", ++ "windows_x86_64_gnullvm", ++ "windows_x86_64_msvc", ++] ++ ++[[package]] ++name = "windows_aarch64_gnullvm" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" ++ ++[[package]] ++name = "windows_aarch64_msvc" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" ++ ++[[package]] ++name = "windows_i686_gnu" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" ++ ++[[package]] ++name = "windows_i686_gnullvm" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" ++ ++[[package]] ++name = "windows_i686_msvc" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" ++ ++[[package]] ++name = "windows_x86_64_gnu" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" ++ ++[[package]] ++name = "windows_x86_64_gnullvm" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" ++ ++[[package]] ++name = "windows_x86_64_msvc" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" ++ ++[[package]] ++name = "winnow" ++version = "0.6.20" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" ++dependencies = [ ++ "memchr", ++] ++ ++[[package]] ++name = "zerocopy" ++version = "0.7.35" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" ++dependencies = [ ++ "byteorder", ++ "zerocopy-derive", ++] ++ ++[[package]] ++name = "zerocopy-derive" ++version = "0.7.35" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn 2.0.93", ++] ++ ++[[package]] ++name = "zstd" ++version = "0.13.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" ++dependencies = [ ++ "zstd-safe", ++] ++ ++[[package]] ++name = "zstd-safe" ++version = "7.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" ++dependencies = [ ++ "zstd-sys", ++] ++ ++[[package]] ++name = "zstd-sys" ++version = "2.0.13+zstd.1.5.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" ++dependencies = [ ++ "cc", ++ "pkg-config", ++] diff --git a/pkgs/by-name/an/anytype/tantivy-go/default.nix b/pkgs/by-name/an/anytype/tantivy-go/default.nix new file mode 100644 index 000000000000..95153c1bb8f0 --- /dev/null +++ b/pkgs/by-name/an/anytype/tantivy-go/default.nix @@ -0,0 +1,34 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "tantivy-go"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "anyproto"; + repo = "tantivy-go"; + tag = "v${version}"; + hash = "sha256-IlGtyTjOAvmrbgmvy4NelTOgOWopxNta3INq2QcMEqY="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-3+HtZ7SAnvTNXtYlokX/Z9VD1lDw+nh6R/njYOZeGoE="; + + cargoPatches = [ + ./add-Cargo.lock.patch + ]; + + cargoRoot = "rust"; + buildAndTestSubdir = cargoRoot; + + meta = { + description = "Tantivy go bindings"; + homepage = "https://github.com/anyproto/tantivy-go"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ autrimpo ]; + }; +} From 04033b84845baaabd4f8030d6400501fa2d0bbf4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Feb 2025 12:32:08 +0000 Subject: [PATCH 0348/2168] v2ray: 5.25.1 -> 5.27.0 --- pkgs/by-name/v2/v2ray/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/v2/v2ray/package.nix b/pkgs/by-name/v2/v2ray/package.nix index 880c390e012b..57852edcdf44 100644 --- a/pkgs/by-name/v2/v2ray/package.nix +++ b/pkgs/by-name/v2/v2ray/package.nix @@ -16,18 +16,18 @@ buildGoModule rec { pname = "v2ray-core"; - version = "5.25.1"; + version = "5.27.0"; src = fetchFromGitHub { owner = "v2fly"; repo = "v2ray-core"; rev = "v${version}"; - hash = "sha256-XJVWja2LGBIXGdzYL8oHMcZn15Bg01t/ro/SRI6Xi/A="; + hash = "sha256-3cwVkhWWiqnmjPE0OIlo3FPS1G809HgnzYMamd2edLA="; }; # `nix-update` doesn't support `vendorHash` yet. # https://github.com/Mic92/nix-update/pull/95 - vendorHash = "sha256-8SFQUe52zZLii1XnFg2GBMseBlDxKAE0V56VVXGDlck="; + vendorHash = "sha256-f9S6X6NVJ9ZE00UPqmOsFZZSZmVwuJvy6vbF80jSABk="; ldflags = [ "-s" From 9add104a79cac0e067ee9b6b6049c7ca594bdcd2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Feb 2025 12:36:02 +0000 Subject: [PATCH 0349/2168] ne: 3.3.3 -> 3.3.4 --- pkgs/by-name/ne/ne/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/ne/package.nix b/pkgs/by-name/ne/ne/package.nix index 83a755ad2735..e19183bcb771 100644 --- a/pkgs/by-name/ne/ne/package.nix +++ b/pkgs/by-name/ne/ne/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "ne"; - version = "3.3.3"; + version = "3.3.4"; src = fetchFromGitHub { owner = "vigna"; repo = pname; rev = version; - sha256 = "sha256-lbXb/ZY0+vkOB8mXkHDaehXZMzrpx3A0jWnLpCjhMDE="; + sha256 = "sha256-n8PERQD9G4jmW4avQjbFofrSapyRoSbQ2k1LzVt0i1o="; }; postPatch = '' From edd56d131964652358fcaefcb800ac040e6e2fb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 7 Feb 2025 13:36:10 +0100 Subject: [PATCH 0350/2168] python312Packages.llama-index-readers-file: fix build --- .../python-modules/llama-index-readers-file/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/llama-index-readers-file/default.nix b/pkgs/development/python-modules/llama-index-readers-file/default.nix index e02618898251..f92751824544 100644 --- a/pkgs/development/python-modules/llama-index-readers-file/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-file/default.nix @@ -27,6 +27,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "pymupdf" "pypdf" + "striprtf" ]; build-system = [ poetry-core ]; From c5af5c95ff468dae9a6bd0335f974c722cb39415 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 7 Feb 2025 20:35:33 +0800 Subject: [PATCH 0351/2168] pantheon.wingpanel: 8.0.1 -> 8.0.2 https://github.com/elementary/wingpanel/compare/8.0.1...8.0.2 --- pkgs/desktops/pantheon/desktop/wingpanel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix index 392611e6dd45..7a11c2536b49 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "wingpanel"; - version = "8.0.1"; + version = "8.0.2"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-c77ebUTs4D5M3//AfvtWI643n1a1sPb5Z70P+4tX3y8="; + sha256 = "sha256-WUl6O3Mtw8Blsxe4Gm7NwRQXFurTNyOv+ZO1Fm1SkVg="; }; patches = [ From 2280309e1c07295b72f3ffea672cd9667ceea324 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Feb 2025 12:36:26 +0000 Subject: [PATCH 0352/2168] ephemeralpg: 3.3 -> 3.4 --- pkgs/by-name/ep/ephemeralpg/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ep/ephemeralpg/package.nix b/pkgs/by-name/ep/ephemeralpg/package.nix index 59ddbab10ec8..0bd24ea7e473 100644 --- a/pkgs/by-name/ep/ephemeralpg/package.nix +++ b/pkgs/by-name/ep/ephemeralpg/package.nix @@ -8,10 +8,10 @@ }: stdenv.mkDerivation rec { pname = "ephemeralpg"; - version = "3.3"; + version = "3.4"; src = fetchurl { url = "https://eradman.com/ephemeralpg/code/${pname}-${version}.tar.gz"; - hash = "sha256-pVQrfSpwJnxCRXAUpZQZsb0Z/wlLbjdaYmhVevgHrgo="; + hash = "sha256-IwAIJFW/ahDXGgINi4N9mG3XKw74JXK6+SLxGMZ8tS0="; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' From 18ceb0473147aa7e3e3cf461270ad29dff4be2b7 Mon Sep 17 00:00:00 2001 From: Oscar Molnar Date: Fri, 7 Feb 2025 13:02:47 +0000 Subject: [PATCH 0353/2168] Update flutter327: 3.27.1 -> 3.27.4 --- .../compilers/flutter/versions/3_27/data.json | 79 ++++++++----------- 1 file changed, 35 insertions(+), 44 deletions(-) diff --git a/pkgs/development/compilers/flutter/versions/3_27/data.json b/pkgs/development/compilers/flutter/versions/3_27/data.json index cd44befc2230..7468e7dc24a2 100644 --- a/pkgs/development/compilers/flutter/versions/3_27/data.json +++ b/pkgs/development/compilers/flutter/versions/3_27/data.json @@ -1,33 +1,24 @@ { - "version": "3.27.1", - "engineVersion": "cb4b5fff73850b2e42bd4de7cb9a4310a78ac40d", + "version": "3.27.4", + "engineVersion": "82bd5b7209295a5b7ff8cae0df96e7870171e3a5", "engineSwiftShaderHash": "sha256-mRLCvhNkmHz7Rv6GzXkY7OB1opBSq+ATWZ466qZdgto=", "engineSwiftShaderRev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f", "channel": "stable", - "engineHashes": { - "aarch64-linux": { - "aarch64-linux": "sha256-Qk4pKuuS9ixC2ufuevBGkL+JoMoI4e9l3jtJ6T9uqME=", - "x86_64-linux": "sha256-Qk4pKuuS9ixC2ufuevBGkL+JoMoI4e9l3jtJ6T9uqME=" - }, - "x86_64-linux": { - "aarch64-linux": "sha256-CwoRJUGfp3ZedloMNCtOQvzpbBuyIt2sKPzYENepSH8=", - "x86_64-linux": "sha256-CwoRJUGfp3ZedloMNCtOQvzpbBuyIt2sKPzYENepSH8=" - } - }, - "dartVersion": "3.6.0", + "engineHashes": {}, + "dartVersion": "3.6.2", "dartHash": { - "x86_64-linux": "sha256-Fte5Fvb2/pW7utKm+j5vVZbFX4Ex2uPWqUWYz+F9Tzc=", - "aarch64-linux": "sha256-GiZWwHEccyxM+nfYNyKTeHP4XuctQVR1Rba5bzZfi88=", - "x86_64-darwin": "sha256-47ch7I4jtYO2FPxa28sAbiNKvcyFCxwoZetwm7IeCrI=", - "aarch64-darwin": "sha256-BqqA1/jx+3vDY053H1klUhxlQernOWY+nFHdbFppcXM=" + "x86_64-linux": "sha256-um3/S/XleAVGor8YVUIjhViDAXUiSKnJI7RchM9k1yc=", + "aarch64-linux": "sha256-PSGO/MVDO3fgvlrfzdXQizgtVI5+fDWwHk/DG3yH0X4=", + "x86_64-darwin": "sha256-QshSLyTOYZn7N+vE6AfqLZ5CFei4h3xlWJo//iyaVA4=", + "aarch64-darwin": "sha256-Js1Mk0M19+0eQwprtlDSryI1vDEO5wvx8gzklb5au0Y=" }, - "flutterHash": "sha256-WK6Ecaxs2MAlqOyKDPfXg1d4mqyAi7NZ/lFdMZwqkzQ=", + "flutterHash": "sha256-OvWmEvrkXrGGda3vVVuMo90pZeZcWOzJUztL5qW5Foc=", "artifactHashes": { "android": { - "aarch64-darwin": "sha256-6MxPG5SM6qR/kVyFVjOEfLc1SgcHbwCp9ZTg0qnPlJA=", - "aarch64-linux": "sha256-x8l6etAf4Rwc6dwnN1ESkgd9Ug6QWZzVacw6r7Bh7fQ=", - "x86_64-darwin": "sha256-6MxPG5SM6qR/kVyFVjOEfLc1SgcHbwCp9ZTg0qnPlJA=", - "x86_64-linux": "sha256-x8l6etAf4Rwc6dwnN1ESkgd9Ug6QWZzVacw6r7Bh7fQ=" + "aarch64-darwin": "sha256-yaw7wBcJx1rZLdZCMc7xJMKgU1KIiDFDSZ+O4mMOBY8=", + "aarch64-linux": "sha256-53Jxb+GcrpABdMkQ1J+xEaXO5+AQTqRmaPVDY77Vu2Q=", + "x86_64-darwin": "sha256-yaw7wBcJx1rZLdZCMc7xJMKgU1KIiDFDSZ+O4mMOBY8=", + "x86_64-linux": "sha256-53Jxb+GcrpABdMkQ1J+xEaXO5+AQTqRmaPVDY77Vu2Q=" }, "fuchsia": { "aarch64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", @@ -36,38 +27,38 @@ "x86_64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=" }, "ios": { - "aarch64-darwin": "sha256-56CVLFN8km5lra4r+mD/nARSa+FdvgTiyMkZqn1uucU=", - "aarch64-linux": "sha256-56CVLFN8km5lra4r+mD/nARSa+FdvgTiyMkZqn1uucU=", - "x86_64-darwin": "sha256-56CVLFN8km5lra4r+mD/nARSa+FdvgTiyMkZqn1uucU=", - "x86_64-linux": "sha256-56CVLFN8km5lra4r+mD/nARSa+FdvgTiyMkZqn1uucU=" + "aarch64-darwin": "sha256-h0HdJl3Ptu/zNVMkg6oM/dtGC++KBjiUXhieJwhUUZk=", + "aarch64-linux": "sha256-h0HdJl3Ptu/zNVMkg6oM/dtGC++KBjiUXhieJwhUUZk=", + "x86_64-darwin": "sha256-h0HdJl3Ptu/zNVMkg6oM/dtGC++KBjiUXhieJwhUUZk=", + "x86_64-linux": "sha256-h0HdJl3Ptu/zNVMkg6oM/dtGC++KBjiUXhieJwhUUZk=" }, "linux": { - "aarch64-darwin": "sha256-4n4t8RchtHr1VglhREQA+/D5YTMPK41u+wB6nq97YDs=", - "aarch64-linux": "sha256-4n4t8RchtHr1VglhREQA+/D5YTMPK41u+wB6nq97YDs=", - "x86_64-darwin": "sha256-NmtvMof+onO8ZYrSd8RAao8OsDmnupbAkQhlhF82cNs=", - "x86_64-linux": "sha256-NmtvMof+onO8ZYrSd8RAao8OsDmnupbAkQhlhF82cNs=" + "aarch64-darwin": "sha256-Mrj4+et2rr7ePrrMHk4jyQCR3YnyA5ltCeVLtp5ZlAk=", + "aarch64-linux": "sha256-Mrj4+et2rr7ePrrMHk4jyQCR3YnyA5ltCeVLtp5ZlAk=", + "x86_64-darwin": "sha256-us1EjjtmJ8Diy/uCqnzt8xVlIvS9uQnR8AqZCTqBXWg=", + "x86_64-linux": "sha256-us1EjjtmJ8Diy/uCqnzt8xVlIvS9uQnR8AqZCTqBXWg=" }, "macos": { - "aarch64-darwin": "sha256-I67I2HbhNF1dZ+yXOnFGrqPH49Uq3DOLMeYohAbueL8=", - "aarch64-linux": "sha256-I67I2HbhNF1dZ+yXOnFGrqPH49Uq3DOLMeYohAbueL8=", - "x86_64-darwin": "sha256-I67I2HbhNF1dZ+yXOnFGrqPH49Uq3DOLMeYohAbueL8=", - "x86_64-linux": "sha256-I67I2HbhNF1dZ+yXOnFGrqPH49Uq3DOLMeYohAbueL8=" + "aarch64-darwin": "sha256-rRqZ/gDOxGpeT6CEU972DzLBBH/gNaQvZVkOT/PNt5M=", + "aarch64-linux": "sha256-rRqZ/gDOxGpeT6CEU972DzLBBH/gNaQvZVkOT/PNt5M=", + "x86_64-darwin": "sha256-rRqZ/gDOxGpeT6CEU972DzLBBH/gNaQvZVkOT/PNt5M=", + "x86_64-linux": "sha256-rRqZ/gDOxGpeT6CEU972DzLBBH/gNaQvZVkOT/PNt5M=" }, "universal": { - "aarch64-darwin": "sha256-W6X355Fck0op/b6YuR+BOMVl+h+UIQEpaGL/Y7vApzg=", - "aarch64-linux": "sha256-k6JykwlucffTtt49QJULea5ldzR58f/qZ8QoCwKCU4g=", - "x86_64-darwin": "sha256-CJ6TZnb7X6wHHIf53OK+V+zdVQ7s58sm/T31NogywUA=", - "x86_64-linux": "sha256-01GvK8iBy+HrbjYkXnT7hBYpEHxlb8Zc+CS2ax/05KE=" + "aarch64-darwin": "sha256-48EzEp20xrYt63fo7onlTkb74w0zipIkM3vBlV8x5DE=", + "aarch64-linux": "sha256-m1eTxvOef6V6Mo5nXd+Jr3NNrOhE8lq9QBz+93ipvS8=", + "x86_64-darwin": "sha256-05XSP1LcjchgwTNg4qTyFRQRLS04N1e13lNSdk5YaXQ=", + "x86_64-linux": "sha256-QwcKF6APpvTLGVRKHHwAJ0QYYaQPC7PeMggb+fn61ro=" }, "web": { - "aarch64-darwin": "sha256-5iw2jKBWOkZYXu03OLUFhRerMr30kyXarc6HjhxhCuU=", - "aarch64-linux": "sha256-5iw2jKBWOkZYXu03OLUFhRerMr30kyXarc6HjhxhCuU=", - "x86_64-darwin": "sha256-5iw2jKBWOkZYXu03OLUFhRerMr30kyXarc6HjhxhCuU=", - "x86_64-linux": "sha256-5iw2jKBWOkZYXu03OLUFhRerMr30kyXarc6HjhxhCuU=" + "aarch64-darwin": "sha256-hYRBoRRVKauvFaorijlEPcVvY3RtXQmCe+9XBHJABpc=", + "aarch64-linux": "sha256-hYRBoRRVKauvFaorijlEPcVvY3RtXQmCe+9XBHJABpc=", + "x86_64-darwin": "sha256-hYRBoRRVKauvFaorijlEPcVvY3RtXQmCe+9XBHJABpc=", + "x86_64-linux": "sha256-hYRBoRRVKauvFaorijlEPcVvY3RtXQmCe+9XBHJABpc=" }, "windows": { - "x86_64-darwin": "sha256-91KAFNbrJEt5+0joKSqvE+T8jxkN0KZyHkh7tXbH0vQ=", - "x86_64-linux": "sha256-91KAFNbrJEt5+0joKSqvE+T8jxkN0KZyHkh7tXbH0vQ=" + "x86_64-darwin": "sha256-QIZm6Ro+47B1aPjit8mlVt/p3Fwg69AOdzDXF+Yodqg=", + "x86_64-linux": "sha256-QIZm6Ro+47B1aPjit8mlVt/p3Fwg69AOdzDXF+Yodqg=" } }, "pubspecLock": { From 13b10627307dcd9f5fee0a54a9d571132f1effa1 Mon Sep 17 00:00:00 2001 From: Arian van Putten Date: Wed, 5 Feb 2025 15:11:59 +0100 Subject: [PATCH 0354/2168] services/journald: re-enable systemd-journald-audit.socket This was broken due to https://github.com/systemd/systemd/pull/25687 but we never noticed. --- nixos/modules/system/boot/systemd/journald.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/system/boot/systemd/journald.nix b/nixos/modules/system/boot/systemd/journald.nix index bfcacc4fa8eb..c72e2c5ed1c1 100644 --- a/nixos/modules/system/boot/systemd/journald.nix +++ b/nixos/modules/system/boot/systemd/journald.nix @@ -116,6 +116,8 @@ in "syslog.socket" ]; + systemd.sockets.systemd-journald-audit.wantedBy = [ "systemd-journald.service" "sockets.target" ]; + environment.etc = { "systemd/journald.conf".text = '' [Journal] From a4d1b7dd25625b5413502c7d2be38f708f18d833 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 7 Feb 2025 15:03:17 +0100 Subject: [PATCH 0355/2168] headscale: 0.24.2 -> 0.24.3 Diff: https://github.com/juanfont/headscale/compare/v0.24.2...v0.24.3 --- pkgs/servers/headscale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/headscale/default.nix b/pkgs/servers/headscale/default.nix index d1a99a741e7d..d28d445120ae 100644 --- a/pkgs/servers/headscale/default.nix +++ b/pkgs/servers/headscale/default.nix @@ -8,13 +8,13 @@ }: buildGoModule rec { pname = "headscale"; - version = "0.24.2"; + version = "0.24.3"; src = fetchFromGitHub { owner = "juanfont"; repo = "headscale"; rev = "v${version}"; - hash = "sha256-LNTXXzCly0FMriS+J6VhSbvRmo7ILKOjNmfgp3h4SYo="; + hash = "sha256-G1MGu/AVFhiBOfhmhdH9+kayPybtsQsvj73omtZVfBU="; }; vendorHash = "sha256-SBfeixT8DQOrK2SWmHHSOBtzRdSZs+pwomHpw6Jd+qc="; From 745feb584b527d0df785a9509aee8858c28dc7d9 Mon Sep 17 00:00:00 2001 From: John Chadwick Date: Thu, 6 Feb 2025 16:59:02 -0500 Subject: [PATCH 0356/2168] ghidra: 11.2.1 -> 11.3 --- .../0001-Use-protobuf-gradle-plugin.patch | 63 ++--- .../0004-Fix-build-on-Gradle-8.12.patch | 13 - pkgs/tools/security/ghidra/build.nix | 10 +- pkgs/tools/security/ghidra/deps.json | 224 +++++++++++++----- 4 files changed, 185 insertions(+), 125 deletions(-) delete mode 100644 pkgs/tools/security/ghidra/0004-Fix-build-on-Gradle-8.12.patch diff --git a/pkgs/tools/security/ghidra/0001-Use-protobuf-gradle-plugin.patch b/pkgs/tools/security/ghidra/0001-Use-protobuf-gradle-plugin.patch index 14065f3aa770..73d4dc6aef44 100644 --- a/pkgs/tools/security/ghidra/0001-Use-protobuf-gradle-plugin.patch +++ b/pkgs/tools/security/ghidra/0001-Use-protobuf-gradle-plugin.patch @@ -1,48 +1,26 @@ -From ffb6777d58f068db7e14372415154cd93f77766e Mon Sep 17 00:00:00 2001 +From be4c852769e260e3a9b516bb5626a6a6a68a2cd3 Mon Sep 17 00:00:00 2001 From: roblabla Date: Wed, 31 Jan 2024 13:19:55 +0100 Subject: [PATCH] Use com.google.protobuf:protobuf-gradle-plugin --- - Ghidra/Debug/Debugger-gadp/build.gradle | 7 +- Ghidra/Debug/Debugger-isf/build.gradle | 8 +- - Ghidra/Debug/Debugger-rmi-trace/build.gradle | 14 +-- + Ghidra/Debug/Debugger-rmi-trace/build.gradle | 16 ++-- build.gradle | 6 ++ - gradle/hasProtobuf.gradle | 94 -------------------- - 5 files changed, 26 insertions(+), 103 deletions(-) + gradle/hasProtobuf.gradle | 94 -------------------- + 4 files changed, 22 insertions(+), 102 deletions(-) + delete mode 100644 gradle/hasProtobuf.gradle -diff --git a/Ghidra/Debug/Debugger-gadp/build.gradle b/Ghidra/Debug/Debugger-gadp/build.gradle -index 9e1c57faf..3a3242eb5 100644 ---- a/Ghidra/Debug/Debugger-gadp/build.gradle -+++ b/Ghidra/Debug/Debugger-gadp/build.gradle -@@ -18,11 +18,16 @@ apply from: "${rootProject.projectDir}/gradle/javaProject.gradle" - apply from: "${rootProject.projectDir}/gradle/jacocoProject.gradle" - apply from: "${rootProject.projectDir}/gradle/javaTestProject.gradle" - apply from: "${rootProject.projectDir}/gradle/distributableGhidraModule.gradle" --apply from: "${rootProject.projectDir}/gradle/hasProtobuf.gradle" -+apply plugin: 'com.google.protobuf' - - apply plugin: 'eclipse' - eclipse.project.name = 'Debug Debugger-gadp' - -+buildscript { -+ dependencies { -+ classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.18' -+ } -+} - dependencies { - api project(':Framework-AsyncComm') - api project(':Framework-Debugging') diff --git a/Ghidra/Debug/Debugger-isf/build.gradle b/Ghidra/Debug/Debugger-isf/build.gradle -index d135294a0..785681ca2 100644 +index f6c8464405..396b52d188 100644 --- a/Ghidra/Debug/Debugger-isf/build.gradle +++ b/Ghidra/Debug/Debugger-isf/build.gradle -@@ -18,11 +18,15 @@ apply from: "${rootProject.projectDir}/gradle/javaProject.gradle" +@@ -18,11 +18,17 @@ apply from: "${rootProject.projectDir}/gradle/javaProject.gradle" apply from: "${rootProject.projectDir}/gradle/jacocoProject.gradle" apply from: "${rootProject.projectDir}/gradle/javaTestProject.gradle" apply from: "${rootProject.projectDir}/gradle/distributableGhidraModule.gradle" -apply from: "${rootProject.projectDir}/gradle/hasProtobuf.gradle" -- + +apply plugin: 'com.google.protobuf' apply plugin: 'eclipse' eclipse.project.name = 'Debug Debugger-isf' @@ -52,21 +30,22 @@ index d135294a0..785681ca2 100644 + classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.18' + } +} ++ dependencies { api project(':Framework-AsyncComm') - api project(':Framework-Debugging') + api project(':ProposedUtils') diff --git a/Ghidra/Debug/Debugger-rmi-trace/build.gradle b/Ghidra/Debug/Debugger-rmi-trace/build.gradle -index 40fbc17ab..7517ffe6e 100644 +index 8b6589f035..05da5a7a7e 100644 --- a/Ghidra/Debug/Debugger-rmi-trace/build.gradle +++ b/Ghidra/Debug/Debugger-rmi-trace/build.gradle -@@ -18,12 +18,17 @@ apply from: "${rootProject.projectDir}/gradle/javaProject.gradle" +@@ -19,12 +19,17 @@ apply from: "${rootProject.projectDir}/gradle/helpProject.gradle" apply from: "${rootProject.projectDir}/gradle/jacocoProject.gradle" apply from: "${rootProject.projectDir}/gradle/javaTestProject.gradle" apply from: "${rootProject.projectDir}/gradle/distributableGhidraModule.gradle" -apply from: "${rootProject.projectDir}/gradle/hasProtobuf.gradle" -+apply plugin: 'com.google.protobuf' apply from: "${rootProject.projectDir}/gradle/hasPythonPackage.gradle" - +- ++apply plugin: 'com.google.protobuf' apply plugin: 'eclipse' eclipse.project.name = 'Debug Debugger-rmi-trace' @@ -75,6 +54,7 @@ index 40fbc17ab..7517ffe6e 100644 + classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.18' + } +} ++ dependencies { api project(':Pty') api project(':Debugger') @@ -94,11 +74,11 @@ index 40fbc17ab..7517ffe6e 100644 commandLine exe, "--python_out=$outdir", "-I$srcdir" args src diff --git a/build.gradle b/build.gradle -index b0c717fb1..5f56506a5 100644 +index 2d75307a08..aa8f1d7604 100644 --- a/build.gradle +++ b/build.gradle -@@ -74,6 +74,12 @@ if (flatRepo.isDirectory()) { - jcenter() +@@ -80,6 +80,12 @@ if (flatRepo.isDirectory()) { + mavenCentral() flatDir name: "flat", dirs:["$flatRepo"] } + buildscript { @@ -111,9 +91,10 @@ index b0c717fb1..5f56506a5 100644 } else { diff --git a/gradle/hasProtobuf.gradle b/gradle/hasProtobuf.gradle -index 23b4ce74b..e69de29bb 100644 +deleted file mode 100644 +index 23b4ce74bb..0000000000 --- a/gradle/hasProtobuf.gradle -+++ b/gradle/hasProtobuf.gradle ++++ /dev/null @@ -1,94 +0,0 @@ -/* ### - * IP: GHIDRA @@ -210,5 +191,5 @@ index 23b4ce74b..e69de29bb 100644 -} -zipSourceSubproject.dependsOn generateProto -- -2.42.0 +2.47.0 diff --git a/pkgs/tools/security/ghidra/0004-Fix-build-on-Gradle-8.12.patch b/pkgs/tools/security/ghidra/0004-Fix-build-on-Gradle-8.12.patch deleted file mode 100644 index 2d1e9f77bf95..000000000000 --- a/pkgs/tools/security/ghidra/0004-Fix-build-on-Gradle-8.12.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/gradle/hasPythonPackage.gradle b/gradle/hasPythonPackage.gradle -index 2d83cf0cd3..8f3205f9ff 100644 ---- a/gradle/hasPythonPackage.gradle -+++ b/gradle/hasPythonPackage.gradle -@@ -44,7 +44,7 @@ task buildPyPackage { - doLast { - File setuptools = project(":Debugger-rmi-trace").findPyDep(".") - exec { -- workingDir { "build/pypkg" } -+ workingDir { file("build/pypkg") } - commandLine rootProject.PYTHON3, "-m", "pip" - args "wheel", "-w", "dist/", "--no-index", "--no-deps" - args "-f", setuptools diff --git a/pkgs/tools/security/ghidra/build.nix b/pkgs/tools/security/ghidra/build.nix index e079283c9162..37c55ae43bdf 100644 --- a/pkgs/tools/security/ghidra/build.nix +++ b/pkgs/tools/security/ghidra/build.nix @@ -20,7 +20,7 @@ let pkg_path = "$out/lib/ghidra"; pname = "ghidra"; - version = "11.2.1"; + version = "11.3"; releaseName = "NIX"; distroPrefix = "ghidra_${version}_${releaseName}"; @@ -28,7 +28,7 @@ let owner = "NationalSecurityAgency"; repo = "Ghidra"; rev = "Ghidra_${version}_build"; - hash = "sha256-UVX56yNZSAbUejiQ0AIn00r7R+fUW1DEjZmCr1iYwV4="; + hash = "sha256-N4uwAGs/dnnskuBX960BxrMv0Z8vlKt6EPor4qRqgJk="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -52,10 +52,6 @@ let # Remove build dates from output filenames for easier reference ./0003-Remove-build-datestamp.patch - - # Fix build on Gradle 8.12 - # Upstream: https://github.com/NationalSecurityAgency/ghidra/commit/20285e267d110cfa585676dfd40804a59031598b - ./0004-Fix-build-on-Gradle-8.12.patch ]; postPatch = '' @@ -68,7 +64,7 @@ let echo "application.revision.ghidra=$(cat COMMIT)" >> Ghidra/application.properties # Tells ghidra to use our own protoc binary instead of the prebuilt one. - cat >>Ghidra/Debug/Debugger-gadp/build.gradle < Date: Fri, 7 Feb 2025 15:26:29 +0100 Subject: [PATCH 0358/2168] ogre: 14.3.3 -> 14.3.4 --- pkgs/development/libraries/ogre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index 5ad09c0931fe..9ec54c3828da 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -128,8 +128,8 @@ let in { ogre_14 = common { - version = "14.3.3"; - hash = "sha256-+ZWrYwgQFmL+9QA+pDQHqacJoONUDVTT+PQLmpLTChg="; + version = "14.3.4"; + hash = "sha256-4ZfScIBGy5J3pwGpnoFkiMhfaZKJz9oSOtFrK2pZnvc="; # https://github.com/OGRECave/ogre/blob/v14.3.3/Components/Overlay/CMakeLists.txt imguiVersion = "1.91.2"; imguiHash = "sha256-B7XXQNuEPcT1ID5nMYbAV+aNCG9gIrC9J7BLnYB8yjI="; From 5fc6559219d71ca673c731f2e130b6cbf861d16f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Feb 2025 14:48:23 +0000 Subject: [PATCH 0359/2168] leftwm: 0.5.3 -> 0.5.4 --- pkgs/by-name/le/leftwm/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/le/leftwm/package.nix b/pkgs/by-name/le/leftwm/package.nix index d847009d37f2..925242225d67 100644 --- a/pkgs/by-name/le/leftwm/package.nix +++ b/pkgs/by-name/le/leftwm/package.nix @@ -15,17 +15,17 @@ in rustPlatform.buildRustPackage rec { pname = "leftwm"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "leftwm"; repo = "leftwm"; tag = version; - hash = "sha256-3voGKM6MKisc+ZVdZ5sCrs3XVfeRayozIk4SXNjw820="; + hash = "sha256-eH7HuGZnWlXigTaUAc4S00+uOIEVftnBOD8x03KJLaE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-i0rMgV1rV9k7j25zoJc1hHXTpTPfDMSOMciJOvInO34="; + cargoHash = "sha256-nFyhpCp8xsYjRl+2bqPfWzq31pM/yYcDuxkWEjjcqwA="; buildInputs = rpathLibs; From fb3a809479bed991e35fc4a05d932d261e9434de Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 1 Feb 2025 18:15:40 +0100 Subject: [PATCH 0360/2168] freefilesync: 13.9 -> 14.0 --- pkgs/by-name/fr/freefilesync/package.nix | 28 +++++++++-- .../by-name/fr/freefilesync/wxcolorhook.patch | 50 +++++++++++++++++++ 2 files changed, 75 insertions(+), 3 deletions(-) create mode 100644 pkgs/by-name/fr/freefilesync/wxcolorhook.patch diff --git a/pkgs/by-name/fr/freefilesync/package.nix b/pkgs/by-name/fr/freefilesync/package.nix index 0eb7a56ce9ea..d44beae80ccc 100644 --- a/pkgs/by-name/fr/freefilesync/package.nix +++ b/pkgs/by-name/fr/freefilesync/package.nix @@ -4,6 +4,7 @@ fetchurl, fetchpatch, fetchDebianPatch, + fetchFromGitHub, copyDesktopItems, pkg-config, wrapGAppsHook3, @@ -17,9 +18,30 @@ makeDesktopItem, }: +let + wxwidgets_3_3 = wxGTK32.overrideAttrs ( + finalAttrs: previousAttrs: { + version = "3.3.0-unstable-2025-02-02"; + src = fetchFromGitHub { + owner = "wxWidgets"; + repo = "wxWidgets"; + rev = "969c5a46b5c1da57836f721a4ce5df9feaa437f9"; + fetchSubmodules = true; + hash = "sha256-ODPE896xc5RxdyfIzdPB5fsTeBm3O+asYJd99fuW6AY="; + }; + patches = [ + ./wxcolorhook.patch + ]; + configureFlags = lib.subtractLists [ + "--disable-compat28" + "--enable-unicode" + ] previousAttrs.configureFlags; + } + ); +in stdenv.mkDerivation (finalAttrs: { pname = "freefilesync"; - version = "13.9"; + version = "14.0"; src = fetchurl { url = "https://freefilesync.org/download/FreeFileSync_${finalAttrs.version}_Source.zip"; @@ -28,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { rm -f $out tryDownload "$url" ''; - hash = "sha256-53UPGg02JZr15r99ntkpZKqB/DgPjkGTQyuMt703t6s="; + hash = "sha256-qxt6fpJT0jKcSYJ+WVneks6PI18/wwSc5H84qICegag="; }; sourceRoot = "."; @@ -72,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: { gtk3 libssh2 openssl - wxGTK32 + wxwidgets_3_3 ]; env.NIX_CFLAGS_COMPILE = toString [ diff --git a/pkgs/by-name/fr/freefilesync/wxcolorhook.patch b/pkgs/by-name/fr/freefilesync/wxcolorhook.patch new file mode 100644 index 000000000000..9c93bf1209cb --- /dev/null +++ b/pkgs/by-name/fr/freefilesync/wxcolorhook.patch @@ -0,0 +1,50 @@ +diff --git a/include/wx/settings.h b/include/wx/settings.h +index 3967b98b46..8d7f3d2870 100644 +--- a/include/wx/settings.h ++++ b/include/wx/settings.h +@@ -13,6 +13,8 @@ + #include "wx/colour.h" + #include "wx/font.h" + ++#include ++ + class WXDLLIMPEXP_FWD_CORE wxWindow; + + // possible values for wxSystemSettings::GetFont() parameter +@@ -241,9 +243,28 @@ public: + // include the declaration of the real platform-dependent class + // ---------------------------------------------------------------------------- + ++struct wxColorHook ++{ ++ virtual ~wxColorHook() {} ++ virtual wxColor getColor(wxSystemColour index) const = 0; ++}; ++WXDLLIMPEXP_CORE inline std::unique_ptr& refGlobalColorHook() ++{ ++ static std::unique_ptr globalColorHook; ++ return globalColorHook; ++} ++ + class WXDLLIMPEXP_CORE wxSystemSettings : public wxSystemSettingsNative + { + public: ++ static wxColour GetColour(wxSystemColour index) ++ { ++ if (refGlobalColorHook()) ++ return refGlobalColorHook()->getColor(index); ++ ++ return wxSystemSettingsNative::GetColour(index); ++ } ++ + #ifdef __WXUNIVERSAL__ + // in wxUniversal we want to use the theme standard colours instead of the + // system ones, otherwise wxSystemSettings is just the same as +@@ -264,7 +285,6 @@ public: + + // Value + static wxSystemScreenType ms_screen; +- + }; + + #endif From ff78e34e0b63972761db8a5b02a357d6ac5494d3 Mon Sep 17 00:00:00 2001 From: Arian van Putten Date: Wed, 5 Feb 2025 15:19:25 +0100 Subject: [PATCH 0361/2168] services/journald: introduce audit option We default this option to null ; which is different from upstream which defaults this to true. Defaulting this to true leads to log-spam in /dev/kmesg and thus in our opinion is a bad default https://github.com/systemd/systemd/issues/15324 --- .../modules/system/boot/systemd/journald.nix | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/systemd/journald.nix b/nixos/modules/system/boot/systemd/journald.nix index c72e2c5ed1c1..97b72a6c97f5 100644 --- a/nixos/modules/system/boot/systemd/journald.nix +++ b/nixos/modules/system/boot/systemd/journald.nix @@ -2,6 +2,7 @@ config, lib, pkgs, + utils, ... }: let @@ -78,6 +79,23 @@ in ''; }; + services.journald.audit = lib.mkOption { + default = null; + type = lib.types.nullOr lib.types.bool; + description = '' + If enabled systemd-journald will turn on auditing on start-up. + If disabled it will turn it off. If unset it will neither enable nor disable it, leaving the previous state unchanged. + + NixOS defaults to leaving this unset as enabling audit without auditd running leads to spamming /dev/kmesg with random messages + and if you enable auditd then auditd is responsible for turning auditing on. + + If you want to have audit logs in journald and do not mind audit logs also ending up in /dev/kmesg you can set this option to true. + + If you want to for some ununderstandable reason disable auditing if auditd enabled it then you can set this option to false. + It is of NixOS' opinion that setting this to false is definitely the wrong thing to do - but it's an option. + ''; + }; + services.journald.extraConfig = lib.mkOption { default = ""; type = lib.types.lines; @@ -116,7 +134,10 @@ in "syslog.socket" ]; - systemd.sockets.systemd-journald-audit.wantedBy = [ "systemd-journald.service" "sockets.target" ]; + systemd.sockets.systemd-journald-audit.wantedBy = [ + "systemd-journald.service" + "sockets.target" + ]; environment.etc = { "systemd/journald.conf".text = '' @@ -131,6 +152,7 @@ in ${lib.optionalString (cfg.forwardToSyslog) '' ForwardToSyslog=yes ''} + Audit=${utils.systemdUtils.lib.toOption cfg.audit} ${cfg.extraConfig} ''; }; From bf3a70020c624e8f4aec631c4a22f58666b735e1 Mon Sep 17 00:00:00 2001 From: Arian van Putten Date: Fri, 7 Feb 2025 14:10:48 +0100 Subject: [PATCH 0362/2168] nixos/tests/systemd-journal: test audit behaviour This also tests the presence of an upstream bug --- nixos/tests/systemd-journal.nix | 41 +++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/nixos/tests/systemd-journal.nix b/nixos/tests/systemd-journal.nix index a0c2f7ee19bb..63ae58970e84 100644 --- a/nixos/tests/systemd-journal.nix +++ b/nixos/tests/systemd-journal.nix @@ -7,12 +7,49 @@ import ./make-test-python.nix ( maintainers = [ lewo ]; }; - nodes.machine = { }; + nodes.machine = { + environment.systemPackages = [ pkgs.audit ]; + }; + nodes.auditd = { + security.auditd.enable = true; + environment.systemPackages = [ pkgs.audit ]; + }; + nodes.journaldAudit = { + services.journald.audit = true; + environment.systemPackages = [ pkgs.audit ]; + }; testScript = '' machine.wait_for_unit("multi-user.target") - machine.succeed("journalctl --grep=systemd") + + with subtest("no audit messages"): + machine.fail("journalctl _TRANSPORT=audit --grep 'unit=systemd-journald'") + machine.fail("journalctl _TRANSPORT=kernel --grep 'unit=systemd-journald'") + + with subtest("auditd enabled"): + auditd.wait_for_unit("multi-user.target") + + # logs should end up in the journald + auditd.succeed("journalctl _TRANSPORT=audit --grep 'unit=systemd-journald'") + # logs should end up in the auditd audit log + auditd.succeed("grep 'unit=systemd-journald' /var/log/audit/audit.log") + # logs should not end up in kmesg + machine.fail("journalctl _TRANSPORT=kernel --grep 'unit=systemd-journald'") + + + with subtest("journald audit"): + journaldAudit.wait_for_unit("multi-user.target") + + # logs should end up in the journald + journaldAudit.succeed("journalctl _TRANSPORT=audit --grep 'unit=systemd-journald'") + # logs should NOT end up in audit log + journaldAudit.fail("grep 'unit=systemd-journald' /var/log/audit/audit.log") + # FIXME: If systemd fixes #15324 this test will start failing. + # You can fix this text by removing the below line. + # logs ideally should NOT end up in kmesg, but they do due to + # https://github.com/systemd/systemd/issues/15324 + journaldAudit.succeed("journalctl _TRANSPORT=kernel --grep 'unit=systemd-journald'") ''; } ) From 30898cd8b7b2a797dfa68a4ce1f597ff218b8ab3 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 7 Feb 2025 16:06:11 +0100 Subject: [PATCH 0363/2168] python313Packages.gurobipy: 12.0.0 -> 12.0.1 --- .../python-modules/gurobipy/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/gurobipy/default.nix b/pkgs/development/python-modules/gurobipy/default.nix index f4f5aae68df4..57b817440c09 100644 --- a/pkgs/development/python-modules/gurobipy/default.nix +++ b/pkgs/development/python-modules/gurobipy/default.nix @@ -10,21 +10,22 @@ let format = "wheel"; pyShortVersion = "cp" + builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; platforms = rec { - aarch64-darwin = "macosx_10_9_universal2"; + aarch64-darwin = + if pyShortVersion == "cp313" then "macosx_10_13_universal2" else "macosx_10_9_universal2"; aarch64-linux = "manylinux2014_aarch64.manylinux_2_17_aarch64"; x86_64-darwin = aarch64-darwin; x86_64-linux = "manylinux2014_x86_64.manylinux_2_17_x86_64"; }; platform = platforms.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); hashes = rec { - cp311-aarch64-darwin = "sha256-KRC3fY7KUVCfI4u+TQQjgqLLIEunkzgIZxiuTol2/50="; - cp311-aarch64-linux = "sha256-/DiS49iND4oB2nXxL3QCPTmO9Zmp4a3WbtdjE3M+MPs="; - cp311-x86_64-darwin = cp311-aarch64-darwin; - cp311-x86_64-linux = "sha256-oI+0Kl58sCzbmTwTgci4xaO67tyt1W5yiNhFile4FEI="; - cp312-aarch64-darwin = "sha256-tcNcuYGmFScBaFUyTgVMrkc0lnhdtX8Ggr1W1YSpbu4="; - cp312-aarch64-linux = "sha256-+Ch951NcO5yX9KqHFpadcDAqlyvQnp07b71yZsoOq3I="; + cp312-aarch64-darwin = "sha256-ZCrGAEiKZ/u/gmVmEanbVJPXDmzglk4ZHER6ZBBsMlw="; + cp312-aarch64-linux = "sha256-Rf8dzgH3hbL7XPfqYtqQSkSSC7JulID7/t8dL2fawa4="; cp312-x86_64-darwin = cp312-aarch64-darwin; - cp312-x86_64-linux = "sha256-kLukle+yXP9aOCYViv974pY30ugKzMOompjLhjCFYQY="; + cp312-x86_64-linux = "sha256-42xX3wMwxCdylNCQVlpWxWoIPYPXDDCvjpxETYCoVKU="; + cp313-aarch64-darwin = "sha256-ykkK56TacwNhszVkNQqUwK1gXL9wvnMwcbHHtSJmU1U="; + cp313-aarch64-linux = "sha256-yXHkDdzhdR4HfhYFk+0412pz0pg2X9P5BzfBVDEEQk0="; + cp313-x86_64-darwin = cp313-aarch64-darwin; + cp313-x86_64-linux = "sha256-bgB87cLGn1oXkY0P406I6V8WcLXCSsgooN8rFxY0NFk="; }; hash = hashes."${pyShortVersion}-${stdenv.system}" @@ -32,7 +33,7 @@ let in buildPythonPackage rec { pname = "gurobipy"; - version = "12.0.0"; + version = "12.0.1"; inherit format; src = fetchPypi { From 436b335c14928b849fbfba7fa38ccd4f0de47de6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 Feb 2025 16:19:06 +0100 Subject: [PATCH 0364/2168] python312Packages.diff-cover: disable failing test --- pkgs/development/python-modules/diff-cover/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/diff-cover/default.nix b/pkgs/development/python-modules/diff-cover/default.nix index 6a21fda8b18b..7079f082b028 100644 --- a/pkgs/development/python-modules/diff-cover/default.nix +++ b/pkgs/development/python-modules/diff-cover/default.nix @@ -56,6 +56,9 @@ buildPythonPackage rec { "file_does_not_exist" # Comparing console output doesn't work reliable "console" + # Assertion failure + "test_html_with_external_css" + "test_style_defs" ]; pythonImportsCheck = [ "diff_cover" ]; From b92e8eeefa29843f6b8e6416afab90a793a802a2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 Feb 2025 16:20:10 +0100 Subject: [PATCH 0365/2168] python312Packages.diff-cover: refactor --- pkgs/development/python-modules/diff-cover/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/diff-cover/default.nix b/pkgs/development/python-modules/diff-cover/default.nix index 7079f082b028..c1e0f4f64b85 100644 --- a/pkgs/development/python-modules/diff-cover/default.nix +++ b/pkgs/development/python-modules/diff-cover/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "diff-cover"; version = "9.2.1"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -31,9 +31,9 @@ buildPythonPackage rec { hash = "sha256-X6Wy1xzPXRbNIipxwsoGnZv1+j1lf2+sm02cIzeTI78="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ chardet jinja2 jinja2-pluralize From ab3bdb072013d6c303982bbc6c8529aac6f9f7f2 Mon Sep 17 00:00:00 2001 From: ilys <185637611+ilyist@users.noreply.github.com> Date: Sun, 2 Feb 2025 02:57:03 +0100 Subject: [PATCH 0366/2168] moonlight: init at 1.3.9 --- pkgs/by-name/mo/moonlight/package.nix | 66 +++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 pkgs/by-name/mo/moonlight/package.nix diff --git a/pkgs/by-name/mo/moonlight/package.nix b/pkgs/by-name/mo/moonlight/package.nix new file mode 100644 index 000000000000..1a08a488d80d --- /dev/null +++ b/pkgs/by-name/mo/moonlight/package.nix @@ -0,0 +1,66 @@ +{ + lib, + stdenv, + nodejs, + pnpm_9, + fetchFromGitHub, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "moonlight"; + version = "1.3.9"; + + src = fetchFromGitHub { + owner = "moonlight-mod"; + repo = "moonlight"; + tag = "v${finalAttrs.version}"; + hash = "sha256-WhPQ7JYfE8RBhDknBunKdW1VBxrklb3UGnMgk5LFVFA="; + }; + + nativeBuildInputs = [ + nodejs + pnpm_9.configHook + ]; + + pnpmDeps = pnpm_9.fetchDeps { + inherit (finalAttrs) pname version src; + + hash = "sha256-KZFHcW/OVjTDXZltxPYGuO+NWjuD5o6HE/E9JQZmrG8="; + }; + + buildPhase = '' + runHook preBuild + + pnpm run build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + cp -r dist $out + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Discord client modification, focused on enhancing user and developer experience"; + longDescription = '' + Moonlight is a ***passion project***—yet another Discord client mod—focused on providing a decent user + and developer experience. Heavily inspired by hh3 (a private client mod) and the projects before it, namely EndPwn. + All core code is original or used with permission from their respective authors where not copyleft. + ''; + homepage = "https://moonlight-mod.github.io"; + changelog = "https://github.com/moonlight-mod/moonlight/blob/main/CHANGELOG.md"; + + license = licenses.lgpl3; + maintainers = with maintainers; [ + ilys + donteatoreo + ]; + }; +}) From 54fbefb06736187a6c05c18a85fb34aba0d900f7 Mon Sep 17 00:00:00 2001 From: ilys <185637611+ilyist@users.noreply.github.com> Date: Sun, 2 Feb 2025 03:08:20 +0100 Subject: [PATCH 0367/2168] maintainers: add ilys --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 97dd67dc0acf..4191d927d279 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9885,6 +9885,11 @@ github = "ilyakooo0"; githubId = 6209627; }; + ilys = { + name = "ilys"; + github = "ilyist"; + githubId = 185637611; + }; imadnyc = { email = "me@imad.nyc"; github = "imadnyc"; From c13d37adc3287dfd94e22aa085ac7b9b24f9c2f7 Mon Sep 17 00:00:00 2001 From: ilys <185637611+ilyist@users.noreply.github.com> Date: Sun, 2 Feb 2025 03:17:02 +0100 Subject: [PATCH 0368/2168] discord: add option to install moonlight client mod Co-authored-by: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> --- .../instant-messengers/discord/darwin.nix | 13 +++++++++++++ .../networking/instant-messengers/discord/linux.nix | 12 ++++++++++++ 2 files changed, 25 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/discord/darwin.nix b/pkgs/applications/networking/instant-messengers/discord/darwin.nix index e81f1f488c07..46ef6977cc75 100644 --- a/pkgs/applications/networking/instant-messengers/discord/darwin.nix +++ b/pkgs/applications/networking/instant-messengers/discord/darwin.nix @@ -17,8 +17,14 @@ openasar, withVencord ? false, vencord, + withMoonlight ? false, + moonlight, }: +assert lib.assertMsg ( + !(withMoonlight && withVencord) +) "discord: Moonlight and Vencord can not be enabled at the same time"; + let disableBreakingUpdates = runCommand "disable-breaking-updates.py" @@ -72,6 +78,13 @@ stdenv.mkDerivation { mkdir $out/Applications/${desktopName}.app/Contents/Resources/app.asar echo '{"name":"discord","main":"index.js"}' > $out/Applications/${desktopName}.app/Contents/Resources/app.asar/package.json echo 'require("${vencord}/patcher.js")' > $out/Applications/${desktopName}.app/Contents/Resources/app.asar/index.js + '' + + + lib.strings.optionalString withMoonlight '' + mv $out/Applications/${desktopName}.app/Contents/Resources/app.asar $out/Applications/${desktopName}.app/Contents/Resources/_app.asar + mkdir $out/Applications/${desktopName}.app/Contents/Resources/app.asar + echo '{"name":"discord","main":"injector.js","private": true}' > $out/Applications/${desktopName}.app/Contents/Resources/app.asar/package.json + echo 'require("${moonlight}/injector.js").inject(require("path").join(__dirname, "../_app.asar"));' > $out/Applications/${desktopName}.app/Contents/Resources/app.asar/injector.js ''; passthru = { diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix index a0870e86efcd..b513aa380489 100644 --- a/pkgs/applications/networking/instant-messengers/discord/linux.nix +++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix @@ -62,9 +62,15 @@ openasar, withVencord ? false, vencord, + withMoonlight ? false, + moonlight, withTTS ? true, }: +assert lib.assertMsg ( + !(withMoonlight && withVencord) +) "discord: Moonlight and Vencord can not be enabled at the same time"; + let disableBreakingUpdates = runCommand "disable-breaking-updates.py" @@ -195,6 +201,12 @@ stdenv.mkDerivation rec { mkdir $out/opt/${binaryName}/resources/app.asar echo '{"name":"discord","main":"index.js"}' > $out/opt/${binaryName}/resources/app.asar/package.json echo 'require("${vencord}/patcher.js")' > $out/opt/${binaryName}/resources/app.asar/index.js + '' + + lib.strings.optionalString withMoonlight '' + mv $out/opt/${binaryName}/resources/app.asar $out/opt/${binaryName}/resources/_app.asar + mkdir $out/opt/${binaryName}/resources/app + echo '{"name":"discord","main":"injector.js","private": true}' > $out/opt/${binaryName}/resources/app/package.json + echo 'require("${moonlight}/injector.js").inject(require("path").join(__dirname, "../_app.asar"));' > $out/opt/${binaryName}/resources/app/injector.js ''; desktopItem = makeDesktopItem { From a7920d854ab23e343ec800b27a8c6c19ddb03d7e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Feb 2025 15:40:33 +0000 Subject: [PATCH 0369/2168] mopac: 23.0.3 -> 23.1.0 --- pkgs/by-name/mo/mopac/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mo/mopac/package.nix b/pkgs/by-name/mo/mopac/package.nix index 903b178869d6..901556bf7f51 100644 --- a/pkgs/by-name/mo/mopac/package.nix +++ b/pkgs/by-name/mo/mopac/package.nix @@ -13,13 +13,13 @@ assert blas.isILP64 == lapack.isILP64; stdenv.mkDerivation rec { pname = "mopac"; - version = "23.0.3"; + version = "23.1.0"; src = fetchFromGitHub { owner = "openmopac"; repo = pname; rev = "v${version}"; - hash = "sha256-y9/b+ro9CgDo0ld9q+3xaCFE9J5ssZp6W9ct6WQgD/o="; + hash = "sha256-E7iiAAV+QPYAuTNh0qYOvB2GS/UXQ8YjPYy+Ms7aN3M="; }; nativeBuildInputs = [ From 9440dc204ee058c6c233a0161927cde062e0bc8c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 Feb 2025 16:43:23 +0100 Subject: [PATCH 0370/2168] python312Packages.reflex-hosting-cli: add pyyaml --- pkgs/development/python-modules/reflex-hosting-cli/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/reflex-hosting-cli/default.nix b/pkgs/development/python-modules/reflex-hosting-cli/default.nix index a4b7700170e4..c64f5c81cabd 100644 --- a/pkgs/development/python-modules/reflex-hosting-cli/default.nix +++ b/pkgs/development/python-modules/reflex-hosting-cli/default.nix @@ -9,6 +9,7 @@ platformdirs, pydantic, python-dateutil, + pyyaml, rich, tabulate, typer, @@ -38,6 +39,7 @@ buildPythonPackage rec { platformdirs pydantic python-dateutil + pyyaml rich tabulate typer From 63ed3456a3069e3d82eec68b04bf1c673605fd07 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Fri, 7 Feb 2025 12:54:18 -0300 Subject: [PATCH 0371/2168] komac: 2.10.0 -> 2.10.1 --- pkgs/by-name/ko/komac/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ko/komac/package.nix b/pkgs/by-name/ko/komac/package.nix index 205be903c3d4..a6d7a759ca37 100644 --- a/pkgs/by-name/ko/komac/package.nix +++ b/pkgs/by-name/ko/komac/package.nix @@ -17,12 +17,12 @@ }: let - version = "2.10.0"; + version = "2.10.1"; src = fetchFromGitHub { owner = "russellbanks"; repo = "Komac"; tag = "v${version}"; - hash = "sha256-qlaNJ9pgQe1gjPW4gjEJys/SqgKzpO3H8SenowsUi4o="; + hash = "sha256-oqnFenSFWCe3vax5mqstvNNTFWOecLOkuhJzaxv78yE="; }; in rustPlatform.buildRustPackage { @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage { pname = "komac"; useFetchCargoVendor = true; - cargoHash = "sha256-sTYR8e6RX/kXZDlRA1uMvJGpg9amDj2oEjbGEE9wh60="; + cargoHash = "sha256-g7R4Vk6bFaJ5TA4IdeXRiFzZOcj1T4JY3HsOt+Zx2mU="; nativeBuildInputs = [ From f87f5893ab4bf8da5d49ef867e0148857ff6cce4 Mon Sep 17 00:00:00 2001 From: Jaakko Paju <36770267+JPaju@users.noreply.github.com> Date: Fri, 7 Feb 2025 18:00:34 +0200 Subject: [PATCH 0372/2168] metals: 1.5.0 -> 1.5.1 --- pkgs/by-name/me/metals/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/me/metals/package.nix b/pkgs/by-name/me/metals/package.nix index cd84a6449d9f..a9c9450d09f3 100644 --- a/pkgs/by-name/me/metals/package.nix +++ b/pkgs/by-name/me/metals/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "1.5.0"; + version = "1.5.1"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-JRuQ5R4EVDP2wVez3FnD4Vx8h200ShiXRhyRtKhs8V4="; + outputHash = "sha256-2FA2B/WzNGU4B785pn5zZ9Xj64huzbSbr2Or+CxUMlI="; }; nativeBuildInputs = [ From a7cb5b1ba5746d3f3e84a77a730d750a1ecb831d Mon Sep 17 00:00:00 2001 From: Sandro Date: Fri, 7 Feb 2025 17:10:08 +0100 Subject: [PATCH 0373/2168] nixos/home-assistant: use full path for option in description --- nixos/modules/services/home-automation/home-assistant.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix index 2f59cc25ce78..0ea92b8f27bd 100644 --- a/nixos/modules/services/home-automation/home-assistant.nix +++ b/nixos/modules/services/home-automation/home-assistant.nix @@ -517,7 +517,7 @@ in { description = '' List of ${domain} [blueprints](https://www.home-assistant.io/docs/blueprint/) to - install into {file}`''${configDir}/blueprints/${domain}`. + install into {file}`''${config.services.home-assistant.configDir}/blueprints/${domain}`. ''; example = if domain == "automation" then From 1c224e4df7e1b18a5835f04caf7dd711d92cf2ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Feb 2025 16:19:38 +0000 Subject: [PATCH 0374/2168] octave: 9.3.0 -> 9.4.0 --- pkgs/development/interpreters/octave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index f86785ac2887..68c5ec0d1712 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -98,12 +98,12 @@ let allPkgs = pkgs; in stdenv.mkDerivation (finalAttrs: { - version = "9.3.0"; + version = "9.4.0"; pname = "octave"; src = fetchurl { url = "mirror://gnu/octave/octave-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-gJ+jmnrMhIFb9NxNLX5rIoznWgfzskE/MxOqjgqqMoc="; + sha256 = "sha256-2pSBIFv6cXZgt9ShZzLYstWKrc6rSZPUEkKo4oSOpsE="; }; postPatch = '' From d45d5d9c6d8ca770c96a197b470b5983c9b09bbc Mon Sep 17 00:00:00 2001 From: Pamplemousse Date: Fri, 7 Feb 2025 17:17:10 +0100 Subject: [PATCH 0375/2168] dep-scan: fix build --- pkgs/by-name/de/dep-scan/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/de/dep-scan/package.nix b/pkgs/by-name/de/dep-scan/package.nix index 561d97debfa1..bb69f4cb0f87 100644 --- a/pkgs/by-name/de/dep-scan/package.nix +++ b/pkgs/by-name/de/dep-scan/package.nix @@ -9,7 +9,7 @@ let python3.pkgs.appthreat-vulnerability-db.overrideAttrs (oldAttrs: rec { version = "5.7.8"; src = oldAttrs.src.override { - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-R00/a9+1NctVPi+EL7K65w/e88c9oSW5xXGgno+MCXo="; }; }) @@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "owasp-dep-scan"; repo = "dep-scan"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-QTvxKoqBxTb/xFaIHsYe3N+7ABJ6sDd2vVcjkMbm3xI="; }; From 5ee577c1df6a15bebc47e0a708227bdfbd7c10af Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Fri, 7 Feb 2025 16:42:45 +0000 Subject: [PATCH 0376/2168] python313Packages.dataproperty: refactor, use setuptools-scm setuptools-scm is required to report the correct package version --- .../python-modules/dataproperty/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/dataproperty/default.nix b/pkgs/development/python-modules/dataproperty/default.nix index 1b65ced8353f..050d0351fff3 100644 --- a/pkgs/development/python-modules/dataproperty/default.nix +++ b/pkgs/development/python-modules/dataproperty/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools-scm, loguru, mbstrdecoder, pytestCheckHook, @@ -14,18 +15,20 @@ buildPythonPackage rec { pname = "dataproperty"; version = "1.1.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "thombashi"; - repo = pname; + repo = "dataproperty"; tag = "v${version}"; hash = "sha256-IEEwdOcC9nKwVumWnjpZlqYKCFGwZebMh7nGdGVjibE="; }; - propagatedBuildInputs = [ + build-system = [ setuptools-scm ]; + + dependencies = [ mbstrdecoder typepy tcolorpy @@ -42,11 +45,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "dataproperty" ]; - meta = with lib; { + meta = { description = "Library for extracting properties from data"; - homepage = "https://github.com/thombashi/dataproperty"; + homepage = "https://github.com/thombashi/DataProperty"; changelog = "https://github.com/thombashi/DataProperty/releases/tag/${src.tag}"; - license = licenses.mit; - maintainers = with maintainers; [ genericnerdyusername ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ genericnerdyusername ]; }; } From 87ba9a0fc0a51f29674bb71bf05afa7b332ddff1 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Fri, 7 Feb 2025 16:42:45 +0000 Subject: [PATCH 0377/2168] python313Packages.pytablewriter: refactor, use setuptools-scm setuptools-scm is required to report the correct package version --- .../python-modules/pytablewriter/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pytablewriter/default.nix b/pkgs/development/python-modules/pytablewriter/default.nix index 26807a887cda..75ec06feea3f 100644 --- a/pkgs/development/python-modules/pytablewriter/default.nix +++ b/pkgs/development/python-modules/pytablewriter/default.nix @@ -12,7 +12,7 @@ pytestCheckHook, pythonOlder, pyyaml, - setuptools, + setuptools-scm, simplejson, tabledata, tcolorpy, @@ -25,20 +25,20 @@ buildPythonPackage rec { pname = "pytablewriter"; version = "1.2.1"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "thombashi"; - repo = pname; + repo = "pytablewriter"; tag = "v${version}"; hash = "sha256-YuuSMKTSG3oybvA6TDWNnGg4EiDAw2tRlM0S9mBQlkc="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ dataproperty mbstrdecoder pathvalidate @@ -103,11 +103,11 @@ buildPythonPackage rec { "test/writer/test_elasticsearch_writer.py" ]; - meta = with lib; { + meta = { description = "Library to write a table in various formats"; homepage = "https://github.com/thombashi/pytablewriter"; changelog = "https://github.com/thombashi/pytablewriter/releases/tag/${src.tag}"; - license = licenses.mit; - maintainers = with maintainers; [ genericnerdyusername ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ genericnerdyusername ]; }; } From e024f6f2935c4c58974c01d13c216a4af2826002 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Fri, 7 Feb 2025 16:42:45 +0000 Subject: [PATCH 0378/2168] python313Packages.tabledata: refactor, use setuptools-scm setuptools-scm is required to report the correct package version --- .../python-modules/tabledata/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/tabledata/default.nix b/pkgs/development/python-modules/tabledata/default.nix index c995f8b36a1d..ea20066ae34d 100644 --- a/pkgs/development/python-modules/tabledata/default.nix +++ b/pkgs/development/python-modules/tabledata/default.nix @@ -2,6 +2,7 @@ buildPythonPackage, fetchFromGitHub, lib, + setuptools-scm, dataproperty, typepy, pytestCheckHook, @@ -10,27 +11,29 @@ buildPythonPackage rec { pname = "tabledata"; version = "1.3.4"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "thombashi"; - repo = pname; + repo = "tabledata"; tag = "v${version}"; hash = "sha256-kZAEKUOcxb3fK3Oh6+4byJJlB/xzDAEGNpUDEKyVkhs="; }; - propagatedBuildInputs = [ + build-system = [ setuptools-scm ]; + + dependencies = [ dataproperty typepy ]; nativeCheckInputs = [ pytestCheckHook ]; - meta = with lib; { + meta = { homepage = "https://github.com/thombashi/tabledata"; description = "Library to represent tabular data"; changelog = "https://github.com/thombashi/tabledata/releases/tag/${src.tag}"; - maintainers = with maintainers; [ genericnerdyusername ]; - license = licenses.mit; + maintainers = with lib.maintainers; [ genericnerdyusername ]; + license = lib.licenses.mit; }; } From 1b092ec7710b17cd2609a30fb80e2654d4a33b42 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Fri, 7 Feb 2025 16:42:45 +0000 Subject: [PATCH 0379/2168] python313Packages.typepy: refactor, use setuptools-scm setuptools-scm is required to report the correct package version --- .../development/python-modules/typepy/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/typepy/default.nix b/pkgs/development/python-modules/typepy/default.nix index 313e04cd4a5f..1e5e8b2f7059 100644 --- a/pkgs/development/python-modules/typepy/default.nix +++ b/pkgs/development/python-modules/typepy/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools-scm, mbstrdecoder, python-dateutil, pytz, @@ -14,18 +15,20 @@ buildPythonPackage rec { pname = "typepy"; version = "1.3.4"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "thombashi"; - repo = pname; + repo = "typepy"; tag = "v${version}"; hash = "sha256-lgwXoEtv2nBRKiWQH5bDrAIfikKN3cOqcHLEdnSAMpc="; }; - propagatedBuildInputs = [ mbstrdecoder ]; + build-system = [ setuptools-scm ]; + + dependencies = [ mbstrdecoder ]; optional-dependencies = { datetime = [ @@ -42,11 +45,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "typepy" ]; - meta = with lib; { + meta = { description = "Library for variable type checker/validator/converter at a run time"; homepage = "https://github.com/thombashi/typepy"; changelog = "https://github.com/thombashi/typepy/releases/tag/${src.tag}"; - license = licenses.mit; - maintainers = with maintainers; [ genericnerdyusername ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ genericnerdyusername ]; }; } From c30829cc0cd6b1fd7e6d4c03a20088089d1bc565 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 7 Feb 2025 16:08:41 +0100 Subject: [PATCH 0380/2168] python312Packages.blackjax: 1.2.4 -> 1.2.5 Diff: https://github.com/blackjax-devs/blackjax/compare/refs/tags/1.2.4...1.2.5 Changelog: https://github.com/blackjax-devs/blackjax/releases/tag/1.2.5 --- pkgs/development/python-modules/blackjax/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/blackjax/default.nix b/pkgs/development/python-modules/blackjax/default.nix index 5b02bf3450d6..e89e390771a7 100644 --- a/pkgs/development/python-modules/blackjax/default.nix +++ b/pkgs/development/python-modules/blackjax/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "blackjax"; - version = "1.2.4"; + version = "1.2.5"; pyproject = true; src = fetchFromGitHub { owner = "blackjax-devs"; repo = "blackjax"; tag = version; - hash = "sha256-qaQBbRAKExRHr4Uhm5/Q1Ydon6ePsjG2PWbwSdR9QZM="; + hash = "sha256-2GTjKjLIWFaluTjdWdUF9Iim973y81xv715xspghRZI="; }; build-system = [ setuptools-scm ]; From cf53cd618af9ec744e9deb57b127eb993ce847bc Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 7 Feb 2025 16:44:20 +0100 Subject: [PATCH 0381/2168] python312Packages.cvxpy: disable failing tests --- pkgs/development/python-modules/cvxpy/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index de88b31cce3e..bd32bc8ebedb 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -75,6 +75,11 @@ buildPythonPackage rec { "test_diffcp_sdp_example" "test_huber" "test_partial_problem" + + # cvxpy.error.SolverError: Solver 'CVXOPT' failed. Try another solver, or solve with verbose=True for more information. + "test_oprelcone_1_m1_k3_complex" + "test_oprelcone_1_m3_k1_complex" + "test_oprelcone_2" ]; pythonImportsCheck = [ "cvxpy" ]; From 53f87ad49044225133e30695fb2c3bdf08f68281 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Feb 2025 17:18:41 +0000 Subject: [PATCH 0382/2168] blackfire: 2.28.22 -> 2.28.23 --- pkgs/development/tools/misc/blackfire/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/misc/blackfire/default.nix b/pkgs/development/tools/misc/blackfire/default.nix index fb45464155ce..adefdfa804fc 100644 --- a/pkgs/development/tools/misc/blackfire/default.nix +++ b/pkgs/development/tools/misc/blackfire/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "blackfire"; - version = "2.28.22"; + version = "2.28.23"; src = passthru.sources.${stdenv.hostPlatform.system} @@ -60,23 +60,23 @@ stdenv.mkDerivation rec { sources = { "x86_64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb"; - sha256 = "vZemxC5Vg916imzecW2Wa88nBO9NH8zMY0RFfRjKoF4="; + sha256 = "rhcZZc77Y9zIYFbqDU9l+5vhQTSKs+tLzCEKLP6x/jo="; }; "i686-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb"; - sha256 = "hTqeL5xLyd6QWk4aFH3k5/GBc4fsc4EHZ5PMpT9j24g="; + sha256 = "Iqq7hBlO2XF2Sv0bdBXj93BQxHzayKJGAPDDB/peAW4="; }; "aarch64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb"; - sha256 = "ARYJY5xDDzhatUWmyyjmewRV47hmNYgC5xlOdHBV0Po="; + sha256 = "lzTuEMEtLTFrMeRhYinEUrxZA3+uI+cykHHpslR19kU="; }; "aarch64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz"; - sha256 = "gqA40eKuDneFKAC1oCby9aE6iLGwO2VNjazkf0U+uzU="; + sha256 = "rXSC16/bJfGATlhdN+DfhxDqBAUrtyHtM149if5fgxA="; }; "x86_64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz"; - sha256 = "hgtQJtu3beRrcDuR8reX+82D/5n8XiRBOSmNtykf1RE="; + sha256 = "NW2zlaT5+NdXxBuyt5iBd3AmjaNbd1ktCi7HtXh5MmI="; }; }; From 9b08089459b5244bba4e5d8974f036a715a7b2ad Mon Sep 17 00:00:00 2001 From: Joshua Park Date: Fri, 7 Feb 2025 12:34:32 -0500 Subject: [PATCH 0383/2168] buildFHSEnv: implement chdirToPwd for disabling automatic chdir --- pkgs/build-support/build-fhsenv-bubblewrap/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix index c204628d1668..e6df8f2eabc2 100644 --- a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix @@ -30,6 +30,7 @@ unshareUts ? false, unshareCgroup ? false, privateTmp ? false, + chdirToPwd ? true, dieWithParent ? true, ... }@args: @@ -279,7 +280,7 @@ let ${bubblewrap}/bin/bwrap --dev-bind /dev /dev --proc /proc - --chdir "$(pwd)" + ${optionalString chdirToPwd ''--chdir "$(pwd)"''} ${optionalString unshareUser "--unshare-user"} ${optionalString unshareIpc "--unshare-ipc"} ${optionalString unsharePid "--unshare-pid"} From 1bc4ebfb35a9f74f9b0d1d22bb3a76a47461239f Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 7 Feb 2025 17:13:40 +0100 Subject: [PATCH 0384/2168] python312Packages.qutip: add aarch64-linux to badPlatforms --- .../python-modules/qutip/default.nix | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/qutip/default.nix b/pkgs/development/python-modules/qutip/default.nix index d5c0dea156b0..28d8d16087e7 100644 --- a/pkgs/development/python-modules/qutip/default.nix +++ b/pkgs/development/python-modules/qutip/default.nix @@ -17,6 +17,7 @@ # tests pytestCheckHook, pytest-rerunfailures, + writableTmpDirAsHomeHook, python, # optional-dependencies @@ -38,11 +39,12 @@ buildPythonPackage rec { hash = "sha256-5j47Wqt9i6vC3uwRzQ9+8pk+ENl5w6PvnP+830RLCls="; }; - postPatch = '' + postPatch = # build-time constriant, used to ensure forward and backward compat - substituteInPlace pyproject.toml setup.cfg \ - --replace-fail "numpy>=2.0.0" "numpy" - ''; + '' + substituteInPlace pyproject.toml setup.cfg \ + --replace-fail "numpy>=2.0.0" "numpy" + ''; build-system = [ cython_0 @@ -59,6 +61,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-rerunfailures + writableTmpDirAsHomeHook ] ++ lib.flatten (builtins.attrValues optional-dependencies); # QuTiP tries to access the home directory to create an rc file for us. @@ -66,7 +69,6 @@ buildPythonPackage rec { # This is due to the Cython-compiled modules not being in the correct location # of the source tree. preCheck = '' - export HOME=$(mktemp -d); export OMP_NUM_THREADS=$NIX_BUILD_CORES mkdir -p test && cd test ''; @@ -80,11 +82,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "qutip" ]; - pytestFlagsArray = lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ - # Fatal Python error: Aborted - "--deselect=../tests/core/test_metrics.py::Test_hellinger_dist::test_monotonicity[25]" - ]; - optional-dependencies = { graphics = [ matplotlib ]; ipython = [ ipython ]; @@ -104,6 +101,10 @@ buildPythonPackage rec { # Tests fail at ~80% # ../tests/test_animation.py::test_result_state Fatal Python error: Aborted lib.systems.inspect.patterns.isDarwin + + # Several tests fail with a segfault + # ../tests/test_random.py::test_rand_super_bcsz[int-CSR-choi-None-rep(1)] Fatal Python error: Aborted + "aarch64-linux" ]; }; } From ab5798054510314b016990c6594b4a4e2f92cc6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 7 Feb 2025 18:35:12 +0100 Subject: [PATCH 0385/2168] python313Packages.pyzbar: switch to pyproject = true, misc cleanup --- pkgs/development/python-modules/pyzbar/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyzbar/default.nix b/pkgs/development/python-modules/pyzbar/default.nix index 3a5c0b6ff36f..df3157915943 100644 --- a/pkgs/development/python-modules/pyzbar/default.nix +++ b/pkgs/development/python-modules/pyzbar/default.nix @@ -7,23 +7,26 @@ pillow, zbar, pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "pyzbar"; version = "0.1.9"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "NaturalHistoryMuseum"; repo = "pyzbar"; - rev = "v${version}"; + tag = "v${version}"; sha256 = "8IZQY6qB4r1SUPItDlTDnVQuPs0I38K3yJ6LiPJuwbU="; }; + build-system = [ setuptools ]; + buildInputs = [ zbar ]; - propagatedBuildInputs = [ + dependencies = [ pillow numpy ]; @@ -34,7 +37,7 @@ buildPythonPackage rec { # https://github.com/NixOS/nixpkgs/issues/7307 postPatch = '' substituteInPlace pyzbar/zbar_library.py \ - --replace \ + --replace-fail \ "find_library('zbar')" \ '"${lib.getLib zbar}/lib/libzbar${stdenv.hostPlatform.extensions.sharedLibrary}"' ''; From 8b14bd43791b37367d3a44d2b6e0d2fa8daaba3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 7 Feb 2025 18:35:25 +0100 Subject: [PATCH 0386/2168] python313Packages.pyzbar: use minimal zbar library --- pkgs/development/python-modules/pyzbar/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyzbar/default.nix b/pkgs/development/python-modules/pyzbar/default.nix index df3157915943..8bfd6f404bc5 100644 --- a/pkgs/development/python-modules/pyzbar/default.nix +++ b/pkgs/development/python-modules/pyzbar/default.nix @@ -10,6 +10,12 @@ setuptools, }: +let + zbar' = zbar.override { + enableVideo = false; + withXorg = false; + }; +in buildPythonPackage rec { pname = "pyzbar"; version = "0.1.9"; @@ -24,7 +30,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; - buildInputs = [ zbar ]; + buildInputs = [ zbar' ]; dependencies = [ pillow @@ -39,7 +45,7 @@ buildPythonPackage rec { substituteInPlace pyzbar/zbar_library.py \ --replace-fail \ "find_library('zbar')" \ - '"${lib.getLib zbar}/lib/libzbar${stdenv.hostPlatform.extensions.sharedLibrary}"' + '"${lib.getLib zbar'}/lib/libzbar${stdenv.hostPlatform.extensions.sharedLibrary}"' ''; disabledTests = [ From 79197604fec8ded346a9fd469dc514965508f981 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Feb 2025 18:03:01 +0000 Subject: [PATCH 0387/2168] astal.io: 0-unstable-2025-01-23 -> 0-unstable-2025-02-06 --- pkgs/development/libraries/astal/buildAstalModule.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/astal/buildAstalModule.nix b/pkgs/development/libraries/astal/buildAstalModule.nix index b6d748b141eb..c6c86211d9a3 100644 --- a/pkgs/development/libraries/astal/buildAstalModule.nix +++ b/pkgs/development/libraries/astal/buildAstalModule.nix @@ -39,7 +39,7 @@ let cleanArgs args // { pname = "astal-${name}"; - version = "0-unstable-2025-01-23"; + version = "0-unstable-2025-02-06"; __structuredAttrs = true; strictDeps = true; @@ -47,8 +47,8 @@ let src = fetchFromGitHub { owner = "Aylur"; repo = "astal"; - rev = "127e9cdcbf173846a3c40ddc0abfbb038df48042"; - hash = "sha256-ZCxxshGN7XooabArcoGkYSNx5yVunqjKJi2aTv6cznI="; + rev = "173e35fb3b4e2e219524e1232e93683283e8fe81"; + hash = "sha256-lVxK8StUBzK7xx68/JoXBbzKrYvD/Yub4vvJ9COnbrs="; }; sourceRoot = "${finalAttrs.src.name}/${sourceRoot}"; From 0ad4c6bced20b24da5919ded0384eb95e1dc508f Mon Sep 17 00:00:00 2001 From: Gerg-L Date: Fri, 7 Feb 2025 13:10:02 -0500 Subject: [PATCH 0388/2168] filet: remove --- pkgs/by-name/fi/filet/package.nix | 28 ---------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 pkgs/by-name/fi/filet/package.nix diff --git a/pkgs/by-name/fi/filet/package.nix b/pkgs/by-name/fi/filet/package.nix deleted file mode 100644 index 94d43744245c..000000000000 --- a/pkgs/by-name/fi/filet/package.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, -}: - -stdenv.mkDerivation rec { - pname = "filet"; - version = "0.1.3"; - - src = fetchFromGitHub { - owner = "buffet"; - repo = "filet"; - rev = version; - sha256 = "0hm7589ih30axafqxhhs4fg1pvfhlqzyzzmfi2ilx8haq5111fsf"; - }; - - makeFlags = [ "PREFIX=$(out)" ]; - - meta = with lib; { - description = "Fucking fucking fast file fucker (afffff)"; - homepage = "https://github.com/buffet/filet"; - license = licenses.mpl20; - platforms = platforms.all; - maintainers = [ ]; - mainProgram = "filet"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6157b05df0af..d8fec36a4fc4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -400,6 +400,7 @@ mapAliases { ffmpeg_5-full = throw "ffmpeg_5-full has been removed, please use another version"; # Added 2024-07-12 FIL-plugins = fil-plugins; # Added 2024-06-12 fileschanged = throw "'fileschanged' has been removed as it is unmaintained upstream"; # Added 2024-04-19 + filet = throw "'filet' has been removed as the upstream repo has been deleted"; # Added 2025-02-07 finger_bsd = bsd-finger; fingerd_bsd = bsd-fingerd; fira-code-nerdfont = lib.warnOnInstantiate "fira-code-nerdfont is redundant. Use nerd-fonts.fira-code instead." nerd-fonts.fira-code; # Added 2024-11-10 From 7654daca5128adb49c067758d27fa131036f87e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Fri, 7 Feb 2025 19:18:29 +0100 Subject: [PATCH 0389/2168] yaml-language-server: fix strictDeps --- pkgs/by-name/ya/yaml-language-server/package.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/by-name/ya/yaml-language-server/package.nix b/pkgs/by-name/ya/yaml-language-server/package.nix index 740c525f06b0..34f05c5deeef 100644 --- a/pkgs/by-name/ya/yaml-language-server/package.nix +++ b/pkgs/by-name/ya/yaml-language-server/package.nix @@ -29,11 +29,9 @@ stdenv.mkDerivation rec { makeWrapper fixup-yarn-lock yarn - ]; - - buildInputs = [ nodejs ]; + strictDeps = true; configurePhase = '' runHook preConfigure From ed0460e075b8de5ae05834845f520be9b21d32d4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Feb 2025 18:34:33 +0000 Subject: [PATCH 0390/2168] renode-dts2repl: 0-unstable-2025-01-14 -> 0-unstable-2025-01-31 --- pkgs/by-name/re/renode-dts2repl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/renode-dts2repl/package.nix b/pkgs/by-name/re/renode-dts2repl/package.nix index 01ebb6c336c7..d214b24aa106 100644 --- a/pkgs/by-name/re/renode-dts2repl/package.nix +++ b/pkgs/by-name/re/renode-dts2repl/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication { pname = "renode-dts2repl"; - version = "0-unstable-2025-01-14"; + version = "0-unstable-2025-01-31"; pyproject = true; src = fetchFromGitHub { owner = "antmicro"; repo = "dts2repl"; - rev = "cba1604ee130e7fa831392b315b55a142c5adc46"; - hash = "sha256-8xFixNOPFL5af+6Lbp84Z6C/ZFWsCcKPf6G4KpBbj/A="; + rev = "fb9a4a69a79701ffc40672ac85001a75c39d02f3"; + hash = "sha256-Ud6GQgPw5nMW5crHZWSRur0EWuKfWd60OvVizslWQ4U="; }; nativeBuildInputs = [ From 2d215c6ad3b3dbda08b76caf2bc605ca45324f52 Mon Sep 17 00:00:00 2001 From: amesgen Date: Fri, 7 Feb 2025 12:22:20 +0100 Subject: [PATCH 0391/2168] bao: 0.12.1 -> 0.13.0 --- pkgs/by-name/ba/bao/package.nix | 11 +++----- pkgs/by-name/ba/bao/test-exe.patch | 40 ------------------------------ 2 files changed, 3 insertions(+), 48 deletions(-) delete mode 100644 pkgs/by-name/ba/bao/test-exe.patch diff --git a/pkgs/by-name/ba/bao/package.nix b/pkgs/by-name/ba/bao/package.nix index c0477ea969d2..56a3071df33a 100644 --- a/pkgs/by-name/ba/bao/package.nix +++ b/pkgs/by-name/ba/bao/package.nix @@ -6,21 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "bao"; - version = "0.12.1"; + version = "0.13.0"; src = fetchCrate { inherit version; pname = "${pname}_bin"; - hash = "sha256-+MjfqIg/aKPWhzxbPJ0dnS4egCj50Ib7ob3zXUSBXRg="; + hash = "sha256-MpMNhL1n8dNJJcJJiDXv/qWUgCNqQIvvcR8veH+abuI="; }; - cargoPatches = [ - # https://github.com/oconnor663/bao/pull/55 - ./test-exe.patch - ]; - useFetchCargoVendor = true; - cargoHash = "sha256-gJj+4NAtvSpAlX3q2GEQh1CgqKhw5vd6huPrV8NRsiE="; + cargoHash = "sha256-Vw8T/pgGMjI8QklkQNuZSYmKcKhaR320q8ZBAT4HPZ8="; meta = { description = "Implementation of BLAKE3 verified streaming"; diff --git a/pkgs/by-name/ba/bao/test-exe.patch b/pkgs/by-name/ba/bao/test-exe.patch deleted file mode 100644 index 0dd08724b53a..000000000000 --- a/pkgs/by-name/ba/bao/test-exe.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/Cargo.toml b/Cargo.toml -index 2f66e42..34240e8 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -26,6 +26,9 @@ path = "src/main.rs" - [dependencies.arrayref] - version = "0.3.5" - -+[dependencies.assert_cmd] -+version = "2.0.16" -+ - [dependencies.bao] - version = "0.12" - -diff --git a/tests/test.rs b/tests/test.rs -index f9427bd..48aabca 100644 ---- a/tests/test.rs -+++ b/tests/test.rs -@@ -1,8 +1,7 @@ - use duct::cmd; - use rand::prelude::*; --use std::env::consts::EXE_EXTENSION; - use std::fs; --use std::path::{Path, PathBuf}; -+use std::path::PathBuf; - use std::sync::Once; - use tempfile::tempdir; - -@@ -15,10 +14,7 @@ pub fn bao_exe() -> PathBuf { - .expect("build failed"); - }); - -- Path::new("target") -- .join("debug") -- .join("bao") -- .with_extension(EXE_EXTENSION) -+ assert_cmd::cargo::cargo_bin("bao") - } - - #[test] From 233b8ba17c06c3ec3bf1a55d67d1ce4773ccb68b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Feb 2025 18:48:23 +0000 Subject: [PATCH 0392/2168] terraform-providers.tencentcloud: 1.81.164 -> 1.81.165 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 6b8fc339e89e..0a54c7103df4 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1273,11 +1273,11 @@ "vendorHash": "sha256-Cqo7aq0uBISrnpQPrmJBNACSt2mAt12I4xpf8yDd0AU=" }, "tencentcloud": { - "hash": "sha256-g4UQs7GdU5GFkrC9eeFLMYGLR2Wt2UbSSX5yP1CExT0=", + "hash": "sha256-0MkjN9gQZqi7qmbnFyVIFvRD3bpRtfsUqyjARLtkLBA=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.81.164", + "rev": "v1.81.165", "spdx": "MPL-2.0", "vendorHash": null }, From dd768e90b44b296bfbe0d4906a21008c3c15acb1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Feb 2025 18:50:19 +0000 Subject: [PATCH 0393/2168] livepeer: 0.8.1 -> 0.8.3 --- pkgs/by-name/li/livepeer/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/livepeer/package.nix b/pkgs/by-name/li/livepeer/package.nix index ad26e4d346e1..5934c1c3b0ce 100644 --- a/pkgs/by-name/li/livepeer/package.nix +++ b/pkgs/by-name/li/livepeer/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "livepeer"; - version = "0.8.1"; + version = "0.8.3"; proxyVendor = true; - vendorHash = "sha256-vNZ2HHMv2cdMcd1xMdwFNIo3lYh3N88o60GfiG4+eAs="; + vendorHash = "sha256-bHlBHoofFBd34tp3Qsefr4Bpo7Zp1xn5F4z8kFtKeWQ="; src = fetchFromGitHub { owner = "livepeer"; repo = "go-livepeer"; tag = "v${version}"; - hash = "sha256-vJeYlMOJ0/C+IKVx5gqzb8LGwLP1ca9OreCUMryqWKs="; + hash = "sha256-93sy+NX934Dh2vJwYpzlmz69yzbThpAw+eSQsZ1bMd0="; }; nativeBuildInputs = [ From 19ed2a43610ebe15e256863d4855bf93dbbe67b4 Mon Sep 17 00:00:00 2001 From: Alois Wohlschlager Date: Fri, 7 Feb 2025 19:49:14 +0100 Subject: [PATCH 0394/2168] mercurial: don't allowGitDependencies Without allowGitDependencies set to false, there is a dependency chain fetchCargoVendor -> nix-prefetch-git -> nix. Since Lix requires Mercurial for its tests, this would cause infinite recursion when the nix package was overlaid with Lix. Since Mercurial does not have Git dependencies, simply disallow them. --- pkgs/applications/version-management/mercurial/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 8806d8bec6d4..b01036d2292e 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -55,6 +55,7 @@ let rustPlatform.fetchCargoVendor { inherit src; name = "mercurial-${version}"; + allowGitDependencies = false; hash = "sha256-k/K1BupCqnlB++2T7hJxu82yID0jG8HwLNmb2eyx29o="; sourceRoot = "mercurial-${version}/rust"; } From 283424e706bbf3c7f8f672b239ce1a96d14040aa Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Fri, 7 Feb 2025 13:52:38 -0500 Subject: [PATCH 0395/2168] gleam: 1.7.0 -> 1.8.0 --- pkgs/development/compilers/gleam/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index dbffcc09c88a..6c71fdd534f1 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -14,13 +14,13 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; tag = "v${version}"; - hash = "sha256-Nr8OpinQ1Dmo6e8XpBYrtaRRhcX2s1TW/5nM1LxApGg="; + hash = "sha256-gBVr4kAec8hrDBiRXa/sQUNYvgSX3nTVMwFGYRFCbSA="; }; nativeBuildInputs = [ @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { ]; useFetchCargoVendor = true; - cargoHash = "sha256-3McEZ/qwrLm8W2Umtah5shU74iFxLfe4ihp7x4YEvKc="; + cargoHash = "sha256-tYSqE+bn0GUQe/xVBZTh37XsMyzFnmxgVCL0II2/3jQ="; passthru.updateScript = nix-update-script { }; From f78ea06b5b680f53ef56e712620c781f1478e4e3 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Fri, 7 Feb 2025 18:59:38 +0000 Subject: [PATCH 0396/2168] arc-browser: 1.79.0-57949 -> 1.79.1-58230 Changelog: https://arc.net/e/2A19CFFC-742D-45CB-92F1-0B8D9CCE1497 --- pkgs/by-name/ar/arc-browser/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ar/arc-browser/package.nix b/pkgs/by-name/ar/arc-browser/package.nix index e8fbc5afe95b..35ddef88b01f 100644 --- a/pkgs/by-name/ar/arc-browser/package.nix +++ b/pkgs/by-name/ar/arc-browser/package.nix @@ -10,11 +10,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "arc-browser"; - version = "1.79.0-57949"; + version = "1.79.1-58230"; src = fetchurl { url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg"; - hash = "sha256-qGcqtBLy83/5PtDxaB3aD5fCeSGQ1/63EpLCA26TDgM="; + hash = "sha256-BYlKiDcgVviKeKI++qjTALRblI+kFNq7gm5EFmaa3sM="; }; nativeBuildInputs = [ undmg ]; From 1012d54b3ae5acc1423d4e6da9a43750ffb0ca1b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Feb 2025 19:04:27 +0000 Subject: [PATCH 0397/2168] factoriolab: 3.10.0 -> 3.11.4 --- pkgs/by-name/fa/factoriolab/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fa/factoriolab/package.nix b/pkgs/by-name/fa/factoriolab/package.nix index 2c4ba6303308..049dd57fdf17 100644 --- a/pkgs/by-name/fa/factoriolab/package.nix +++ b/pkgs/by-name/fa/factoriolab/package.nix @@ -10,13 +10,13 @@ }: buildNpmPackage rec { pname = "factoriolab"; - version = "3.10.0"; + version = "3.11.4"; src = fetchFromGitHub { owner = "factoriolab"; repo = "factoriolab"; tag = "v${version}"; - hash = "sha256-MSiwtFd9u8IFrHDy++jO//P7Yn4Arip1DwBufR8KIRU="; + hash = "sha256-fn9qvUC14a37vQJJiu5jf+wOpeMFsUeR47TDmemNdEc="; }; buildInputs = [ vips ]; nativeBuildInputs = [ From d7327f74b8a49a6e9941ae8c6181cef80dbfca58 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Feb 2025 19:28:51 +0000 Subject: [PATCH 0398/2168] heptabase: 1.51.1 -> 1.52.0 --- pkgs/by-name/he/heptabase/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/he/heptabase/package.nix b/pkgs/by-name/he/heptabase/package.nix index d75879d80d9f..f3dd381b6c24 100644 --- a/pkgs/by-name/he/heptabase/package.nix +++ b/pkgs/by-name/he/heptabase/package.nix @@ -5,10 +5,10 @@ }: let pname = "heptabase"; - version = "1.51.1"; + version = "1.52.0"; src = fetchurl { url = "https://github.com/heptameta/project-meta/releases/download/v${version}/Heptabase-${version}.AppImage"; - hash = "sha256-ANVgH20I6pCy2WI3Umni8YCCWxgGrnyP154iHttlQTs="; + hash = "sha256-r0fpP50CIhEm+TOIWy9lsuM+uXZkjH7kAkfuH4RqHt0="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; From 8a73d99096c927dd9baae07f27c02b55c33e48fd Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Fri, 7 Feb 2025 20:48:24 +0100 Subject: [PATCH 0399/2168] sonarr: format --- pkgs/by-name/so/sonarr/package.nix | 127 ++++++++++++++++------------- 1 file changed, 71 insertions(+), 56 deletions(-) diff --git a/pkgs/by-name/so/sonarr/package.nix b/pkgs/by-name/so/sonarr/package.nix index 77c4a82d1aae..dfb1833493ad 100644 --- a/pkgs/by-name/so/sonarr/package.nix +++ b/pkgs/by-name/so/sonarr/package.nix @@ -1,21 +1,22 @@ -{ lib -, stdenvNoCC -, fetchFromGitHub -, buildDotnetModule -, dotnetCorePackages -, sqlite -, withFFmpeg ? true # replace bundled ffprobe binary with symlink to ffmpeg package. -, ffmpeg -, fetchYarnDeps -, yarn -, fixup-yarn-lock -, nodejs -, nixosTests +{ + lib, + stdenvNoCC, + fetchFromGitHub, + buildDotnetModule, + dotnetCorePackages, + sqlite, + withFFmpeg ? true, # replace bundled ffprobe binary with symlink to ffmpeg package. + ffmpeg, + fetchYarnDeps, + yarn, + fixup-yarn-lock, + nodejs, + nixosTests, # update script -, writers -, python3Packages -, nix -, prefetch-yarn-deps + writers, + python3Packages, + nix, + prefetch-yarn-deps, }: let version = "4.0.11.2680"; @@ -36,7 +37,12 @@ buildDotnetModule { ]; strictDeps = true; - nativeBuildInputs = [ nodejs yarn prefetch-yarn-deps fixup-yarn-lock ]; + nativeBuildInputs = [ + nodejs + yarn + prefetch-yarn-deps + fixup-yarn-lock + ]; yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; @@ -54,12 +60,14 @@ buildDotnetModule { postBuild = '' yarn --offline run build --env production ''; - postInstall = lib.optionalString withFFmpeg '' - rm -- "$out/lib/sonarr/ffprobe" - ln -s -- "$ffprobe" "$out/lib/sonarr/ffprobe" - '' + '' - cp -a -- _output/UI "$out/lib/sonarr/UI" - ''; + postInstall = + lib.optionalString withFFmpeg '' + rm -- "$out/lib/sonarr/ffprobe" + ln -s -- "$ffprobe" "$out/lib/sonarr/ffprobe" + '' + + '' + cp -a -- _output/UI "$out/lib/sonarr/UI" + ''; # Add an alias for compatibility with Sonarr v3 package. postFixup = '' ln -s -- Sonarr "$out/bin/NzbDrone" @@ -107,32 +115,34 @@ buildDotnetModule { # Skip manual, integration, automation and platform-dependent tests. dotnetTestFlags = [ - "--filter:${lib.concatStringsSep "&" [ - "TestCategory!=ManualTest" - "TestCategory!=IntegrationTest" - "TestCategory!=AutomationTest" + "--filter:${ + lib.concatStringsSep "&" [ + "TestCategory!=ManualTest" + "TestCategory!=IntegrationTest" + "TestCategory!=AutomationTest" - # setgid tests - "FullyQualifiedName!=NzbDrone.Mono.Test.DiskProviderTests.DiskProviderFixture.should_preserve_setgid_on_set_folder_permissions" - "FullyQualifiedName!=NzbDrone.Mono.Test.DiskProviderTests.DiskProviderFixture.should_clear_setgid_on_set_folder_permissions" + # setgid tests + "FullyQualifiedName!=NzbDrone.Mono.Test.DiskProviderTests.DiskProviderFixture.should_preserve_setgid_on_set_folder_permissions" + "FullyQualifiedName!=NzbDrone.Mono.Test.DiskProviderTests.DiskProviderFixture.should_clear_setgid_on_set_folder_permissions" - # we do not set application data directory during tests (i.e. XDG data directory) - "FullyQualifiedName!=NzbDrone.Mono.Test.DiskProviderTests.FreeSpaceFixture.should_return_free_disk_space" + # we do not set application data directory during tests (i.e. XDG data directory) + "FullyQualifiedName!=NzbDrone.Mono.Test.DiskProviderTests.FreeSpaceFixture.should_return_free_disk_space" - # attempts to read /etc/*release and fails since it does not exist - "FullyQualifiedName!=NzbDrone.Mono.Test.EnvironmentInfo.ReleaseFileVersionAdapterFixture.should_get_version_info" + # attempts to read /etc/*release and fails since it does not exist + "FullyQualifiedName!=NzbDrone.Mono.Test.EnvironmentInfo.ReleaseFileVersionAdapterFixture.should_get_version_info" - # fails to start test dummy because it cannot locate .NET runtime for some reason - "FullyQualifiedName!=NzbDrone.Common.Test.ProcessProviderFixture.Should_be_able_to_start_process" - "FullyQualifiedName!=NzbDrone.Common.Test.ProcessProviderFixture.kill_all_should_kill_all_process_with_name" + # fails to start test dummy because it cannot locate .NET runtime for some reason + "FullyQualifiedName!=NzbDrone.Common.Test.ProcessProviderFixture.Should_be_able_to_start_process" + "FullyQualifiedName!=NzbDrone.Common.Test.ProcessProviderFixture.kill_all_should_kill_all_process_with_name" - # makes real HTTP requests - "FullyQualifiedName!~NzbDrone.Core.Test.TvTests.RefreshEpisodeServiceFixture" - "FullyQualifiedName!~NzbDrone.Core.Test.UpdateTests.UpdatePackageProviderFixture" + # makes real HTTP requests + "FullyQualifiedName!~NzbDrone.Core.Test.TvTests.RefreshEpisodeServiceFixture" + "FullyQualifiedName!~NzbDrone.Core.Test.UpdateTests.UpdatePackageProviderFixture" - # fails on macOS - "FullyQualifiedName!~NzbDrone.Core.Test.Http.HttpProxySettingsProviderFixture" - ]}" + # fails on macOS + "FullyQualifiedName!~NzbDrone.Core.Test.Http.HttpProxySettingsProviderFixture" + ] + }" ]; passthru = { @@ -140,24 +150,29 @@ buildDotnetModule { inherit (nixosTests) sonarr; }; - updateScript = writers.writePython3 "sonarr-updater" - { - libraries = with python3Packages; [ requests ]; - makeWrapperArgs = [ - "--prefix" - "PATH" - ":" - (lib.makeBinPath [ nix prefetch-yarn-deps ]) - ]; - } - ./update.py; + updateScript = writers.writePython3 "sonarr-updater" { + libraries = with python3Packages; [ requests ]; + makeWrapperArgs = [ + "--prefix" + "PATH" + ":" + (lib.makeBinPath [ + nix + prefetch-yarn-deps + ]) + ]; + } ./update.py; }; meta = { description = "Smart PVR for newsgroup and bittorrent users"; homepage = "https://sonarr.tv"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ fadenb purcell tie ]; + maintainers = with lib.maintainers; [ + fadenb + purcell + tie + ]; mainProgram = "Sonarr"; # platforms inherited from dotnet-sdk. }; From 16e717892acca7f7782e46021e7c9af2c8d83464 Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Fri, 7 Feb 2025 09:34:59 +0100 Subject: [PATCH 0400/2168] sonarr: use json output in update script --- pkgs/by-name/so/sonarr/update.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/so/sonarr/update.py b/pkgs/by-name/so/sonarr/update.py index aef98f3ab496..80dc8e5f7552 100644 --- a/pkgs/by-name/so/sonarr/update.py +++ b/pkgs/by-name/so/sonarr/update.py @@ -112,7 +112,7 @@ new_yarn_hash = nix_hash_to_sri(subprocess.run( package_dir = package_attrs["dir"] package_file_name = "package.nix" -deps_file_name = "deps.nix" +deps_file_name = "deps.json" # To update deps.nix, we copy the package to a temporary directory and run # passthru.fetch-deps script there. From 5e864681f40ef505d1e238ba390dc39bfea6a49a Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Fri, 7 Feb 2025 09:34:59 +0100 Subject: [PATCH 0401/2168] sonarr: 4.0.11.2680 -> 4.0.12.2823 --- pkgs/by-name/so/sonarr/deps.json | 113 +++++++++++------------------ pkgs/by-name/so/sonarr/package.nix | 8 +- 2 files changed, 48 insertions(+), 73 deletions(-) diff --git a/pkgs/by-name/so/sonarr/deps.json b/pkgs/by-name/so/sonarr/deps.json index 75f1375072a8..1391182c91d4 100644 --- a/pkgs/by-name/so/sonarr/deps.json +++ b/pkgs/by-name/so/sonarr/deps.json @@ -1,4 +1,9 @@ [ + { + "pname": "BouncyCastle.Cryptography", + "version": "2.4.0", + "hash": "sha256-DoDZNWtYM+0OLIclOEZ+tjcGXymGlXvdvq2ZMPmiAJA=" + }, { "pname": "Castle.Core", "version": "5.1.1", @@ -63,8 +68,8 @@ }, { "pname": "Ical.Net", - "version": "4.2.0", - "hash": "sha256-OcUvqj2nIyZ93MUYvRN+752xPkbtE/Uoi6T+W51eDKc=" + "version": "4.3.1", + "hash": "sha256-jpohvCiUBe61A3O+BJwCqsPW+3jUt4cKeCqZb/0cw0M=" }, { "pname": "ImpromptuInterface", @@ -78,18 +83,18 @@ }, { "pname": "IPAddressRange", - "version": "6.0.0", - "hash": "sha256-3qa0BOBto1+SzJjepSWrvjRryw8RBaKOlPFXtVTvyjo=" + "version": "6.1.0", + "hash": "sha256-Fvgeh6X6/XtRuU6rwi/38tBRMcXgQlqjLClzsI/iAQ4=" }, { "pname": "Lib.Harmony", - "version": "2.0.1", - "hash": "sha256-mmzIoIUDbByhbGIA87aVHlyMpFBZnpJPZiD1Gja2MVU=" + "version": "2.3.3", + "hash": "sha256-h7Y925LwT8uJwwt+uuRzyUjdZegFaeuUrvCLFjvDv2M=" }, { "pname": "MailKit", - "version": "3.6.0", - "hash": "sha256-ECpS2Bt7e3h/uJ5Twng2/lw3j20C3UZgiivcW+KW7sQ=" + "version": "4.8.0", + "hash": "sha256-ONvrVOwjxyNrIQM8FMzT5mLzlU56Kc8oOwkzegNAiXM=" }, { "pname": "Microsoft.AspNetCore.Cryptography.Internal", @@ -143,8 +148,8 @@ }, { "pname": "Microsoft.Data.SqlClient", - "version": "2.1.2", - "hash": "sha256-f70eHp8t/kB56AOumNb2MkkEuHsMzCLKw1WG1/DeONE=" + "version": "2.1.7", + "hash": "sha256-gJrFmVSx+XT0hrltODk/TK7MyR5YA2rfdYWARUv89IM=" }, { "pname": "Microsoft.Data.SqlClient.SNI.runtime", @@ -483,19 +488,14 @@ }, { "pname": "MimeKit", - "version": "3.6.0", - "hash": "sha256-z6s6cAHlU9XaKdQtjfh21pJOG63lE2XAAtJioIdrpFA=" + "version": "4.8.0", + "hash": "sha256-4EB54ktBXuq5QRID9i8E7FzU7YZTE4wwH+2yr7ivi/Q=" }, { "pname": "Mono.Cecil", "version": "0.11.1", "hash": "sha256-J8+oOA/aJIit4nmhZ3NugJKRupHp9SgivRZUvMHP+jA=" }, - { - "pname": "Mono.Cecil", - "version": "0.11.2", - "hash": "sha256-qvQjZ5FXIJ+yu4F5EXvxzPUST94vmAZQidcapaRvkYQ=" - }, { "pname": "Mono.Nat", "version": "3.0.1", @@ -507,11 +507,6 @@ "hash": "sha256-aqzdoJkz+Vnof1hM9NCccE+/5otsiEvuF+ZiEztAz7Y=", "url": "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/9845f7c9-6c8c-4845-b5ee-58375c59e0d8/nuget/v3/flat2/mono.posix.netstandard/5.20.1.34-servarr24/mono.posix.netstandard.5.20.1.34-servarr24.nupkg" }, - { - "pname": "MonoMod.Common", - "version": "20.5.7.1", - "hash": "sha256-LwfM2W7oNaX8l34NjD1RFlekMkDwy0G+KoMEW04MRqk=" - }, { "pname": "MonoTorrent", "version": "2.0.7", @@ -554,18 +549,18 @@ }, { "pname": "NLog", - "version": "5.3.2", - "hash": "sha256-b/y/IFUSe7qsSeJ8JVB0VFmJlkviFb8h934ktnn9Fgc=" + "version": "5.3.4", + "hash": "sha256-Cwr1Wu9VbOcRz3GdVKkt7lIpNwC1E4Hdb0g+qEkEr3k=" }, { "pname": "NLog.Extensions.Logging", - "version": "5.3.11", - "hash": "sha256-DP3R51h+9kk06N63U+1C4/JCZTFiADeYTROToAA2R0g=" + "version": "5.3.15", + "hash": "sha256-otzOJncsEmzeGkJ9yxuwQgYFlKIG9ALX+DaKJ/Jhux4=" }, { "pname": "NLog.Layouts.ClefJsonLayout", - "version": "1.0.0", - "hash": "sha256-WLtMT2pa+hQoZe8joknTEoJEVARNzdKRLYIn++L1kX0=" + "version": "1.0.2", + "hash": "sha256-VTdLir7lZdMHCexnT0oiyDx3X75lCZiWbkGZd+VltgM=" }, { "pname": "NLog.Targets.Syslog", @@ -574,13 +569,13 @@ }, { "pname": "NodaTime", - "version": "3.0.0", - "hash": "sha256-kOiGkTez5eIWsBJVYURe8WRuyIhQgMiq/c/m42+XZuY=" + "version": "3.2.0", + "hash": "sha256-kt59MWEzmMFBgpw5tOPlcYwZKe74WkA9N5ggrLS3tUM=" }, { "pname": "Npgsql", - "version": "7.0.7", - "hash": "sha256-AvHPEO2QP7r0kCOHSLhXLJDzYMOLGH2dyhHgEUPSWuc=" + "version": "7.0.9", + "hash": "sha256-4W/YbZtDUcnrPLlyLA+GRZam5AWR1b7LGGDl46FAbDk=" }, { "pname": "NuGet.Frameworks", @@ -614,8 +609,8 @@ }, { "pname": "Polly", - "version": "8.3.1", - "hash": "sha256-VPPoVGvEJBHoUR4hU57sdY2pF3P9igLSQSBtPRLRB6c=" + "version": "8.5.0", + "hash": "sha256-oXIqYMkFXoF/9y704LJSX5Non9mry19OSKA7JFviu5Q=" }, { "pname": "Polly.Contrib.WaitAndRetry", @@ -624,13 +619,8 @@ }, { "pname": "Polly.Core", - "version": "8.3.1", - "hash": "sha256-i1R9e4aKZ5U+y96+GOxTknsAtGn7fmeBNSdfzhqe1Jc=" - }, - { - "pname": "Portable.BouncyCastle", - "version": "1.9.0", - "hash": "sha256-GOXM4TdTTodWlGzEfbMForTfTQI/ObJGnFZMSD6X8E4=" + "version": "8.5.0", + "hash": "sha256-vN/OoQi5F8+oKNO46FwjPcKrgfhGMGjAQ2yCQUlHtOc=" }, { "pname": "RestSharp", @@ -990,8 +980,8 @@ }, { "pname": "SixLabors.ImageSharp", - "version": "3.1.5", - "hash": "sha256-3UehX9T+I81nfgv2dTHlpoPgYzXFk7kHr1mmlQOCBfw=" + "version": "3.1.6", + "hash": "sha256-FQjLyC4158F1GyhlKjzjGo6TxAu698rYWTY9lkko/fA=" }, { "pname": "Swashbuckle.AspNetCore.Annotations", @@ -1171,8 +1161,8 @@ }, { "pname": "System.Formats.Asn1", - "version": "6.0.0", - "hash": "sha256-KaMHgIRBF7Nf3VwOo+gJS1DcD+41cJDPWFh+TDQ8ee8=" + "version": "8.0.1", + "hash": "sha256-may/Wg+esmm1N14kQTG4ESMBi+GQKPp0ZrrBo/o6OXM=" }, { "pname": "System.Globalization", @@ -1266,8 +1256,8 @@ }, { "pname": "System.Memory", - "version": "4.5.5", - "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI=" + "version": "4.6.0", + "hash": "sha256-OhAEKzUM6eEaH99DcGaMz2pFLG/q/N4KVWqqiBYUOFo=" }, { "pname": "System.Net.Http", @@ -1334,11 +1324,6 @@ "version": "4.3.0", "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA=" }, - { - "pname": "System.Reflection.Emit.ILGeneration", - "version": "4.7.0", - "hash": "sha256-GUnQeGo/DtvZVQpFnESGq7lJcjB30/KnDY7Kd2G/ElE=" - }, { "pname": "System.Reflection.Emit.Lightweight", "version": "4.0.1", @@ -1349,11 +1334,6 @@ "version": "4.3.0", "hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I=" }, - { - "pname": "System.Reflection.Emit.Lightweight", - "version": "4.7.0", - "hash": "sha256-V0Wz/UUoNIHdTGS9e1TR89u58zJjo/wPUWw6VaVyclU=" - }, { "pname": "System.Reflection.Extensions", "version": "4.0.1", @@ -1394,11 +1374,6 @@ "version": "4.3.0", "hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng=" }, - { - "pname": "System.Reflection.TypeExtensions", - "version": "4.7.0", - "hash": "sha256-GEtCGXwtOnkYejSV+Tfl+DqyGq5jTUaVyL9eMupMHBM=" - }, { "pname": "System.Resources.ResourceManager", "version": "4.0.1", @@ -1429,11 +1404,6 @@ "version": "4.4.0", "hash": "sha256-SeTI4+yVRO2SmAKgOrMni4070OD+Oo8L1YiEVeKDyig=" }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "4.7.1", - "hash": "sha256-UvyoDV8O0oY3HPG1GbA56YVdvwTGEfjYR5gW1O7IK4U=" - }, { "pname": "System.Runtime.CompilerServices.Unsafe", "version": "6.0.0", @@ -1546,8 +1516,8 @@ }, { "pname": "System.Security.Cryptography.Pkcs", - "version": "6.0.0", - "hash": "sha256-xMSJGgn+UGGe9eGNaZ04OsyiFO7fYtDfz7zsya/9AOE=" + "version": "8.0.0", + "hash": "sha256-yqfIIeZchsII2KdcxJyApZNzxM/VKknjs25gDWlweBI=" }, { "pname": "System.Security.Cryptography.Primitives", @@ -1654,6 +1624,11 @@ "version": "6.0.10", "hash": "sha256-UijYh0dxFjFinMPSTJob96oaRkNm+Wsa+7Ffg6mRnsc=" }, + { + "pname": "System.Text.Json", + "version": "6.0.9", + "hash": "sha256-5jjvxV8ubGYjkydDhLsGZXB6ml3O/7CGauQcu1ikeLs=" + }, { "pname": "System.Text.RegularExpressions", "version": "4.1.0", diff --git a/pkgs/by-name/so/sonarr/package.nix b/pkgs/by-name/so/sonarr/package.nix index dfb1833493ad..1eed555f67eb 100644 --- a/pkgs/by-name/so/sonarr/package.nix +++ b/pkgs/by-name/so/sonarr/package.nix @@ -19,12 +19,12 @@ prefetch-yarn-deps, }: let - version = "4.0.11.2680"; + version = "4.0.12.2823"; src = fetchFromGitHub { owner = "Sonarr"; repo = "Sonarr"; tag = "v${version}"; - hash = "sha256-+Ezr+O5BeOAf21l1TjHSQ7OoHPuQ9HXVvmuQvo8V9ss="; + hash = "sha256-gAvbA3Idx73QEDthLwrM8Jbt6YhXxK8LzEJI6eF2k20="; }; rid = dotnetCorePackages.systemToDotnetRid stdenvNoCC.hostPlatform.system; in @@ -46,7 +46,7 @@ buildDotnetModule { yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-S1USzvQ/BcIr+od+gQd+uWxaEz5/qtyOkuIIVK5b7lg="; + hash = "sha256-ejAf8/zWX9TbC645vbpyLwa6mrnitU7ByImrJ1d/uX0="; }; ffprobe = lib.optionalDrvAttr withFFmpeg (lib.getExe' ffmpeg "ffprobe"); @@ -107,7 +107,7 @@ buildDotnetModule { "--property:TargetFramework=net6.0" "--property:EnableAnalyzers=false" # Override defaults in src/Directory.Build.props that use current time. - "--property:Copyright=Copyright 2014-2024 sonarr.tv (GNU General Public v3)" + "--property:Copyright=Copyright 2014-2025 sonarr.tv (GNU General Public v3)" "--property:AssemblyVersion=${version}" "--property:AssemblyConfiguration=main" "--property:RuntimeIdentifier=${rid}" From e48baaf3730da3c3eb45a1a2a1f1e137d3b52efd Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 7 Feb 2025 20:57:29 +0100 Subject: [PATCH 0402/2168] fcft: 3.1.9 -> 3.1.10 https://codeberg.org/dnkl/fcft/releases/tag/3.1.10 --- pkgs/by-name/fc/fcft/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fc/fcft/package.nix b/pkgs/by-name/fc/fcft/package.nix index 5809b417aa22..2d9289a7d6df 100644 --- a/pkgs/by-name/fc/fcft/package.nix +++ b/pkgs/by-name/fc/fcft/package.nix @@ -34,14 +34,14 @@ in stdenv.mkDerivation rec { pname = "fcft"; - version = "3.1.9"; + version = "3.1.10"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "fcft"; rev = version; - hash = "sha256-D4W62IHuM7ofEeU/3sp038tv2a1+xQd0mdSKXaY7Ikg="; + hash = "sha256:0hydhpw31c28lq7v5yvknm3dzvkkls98hcmpp0z2h9m9f32nq4s9"; }; depsBuildBuild = [ pkg-config ]; From fb58323ee3b4665871e925aa2e7d93cec0616099 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Feb 2025 19:58:38 +0000 Subject: [PATCH 0403/2168] mise: 2025.2.0 -> 2025.2.1 --- pkgs/by-name/mi/mise/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/mise/package.nix b/pkgs/by-name/mi/mise/package.nix index 43c57afe2d16..0e0642139817 100644 --- a/pkgs/by-name/mi/mise/package.nix +++ b/pkgs/by-name/mi/mise/package.nix @@ -23,17 +23,17 @@ rustPlatform.buildRustPackage rec { pname = "mise"; - version = "2025.2.0"; + version = "2025.2.1"; src = fetchFromGitHub { owner = "jdx"; repo = "mise"; rev = "v${version}"; - hash = "sha256-mZZBazE8QCaz3osbLoeaIHa7tsGji6B4UkaMlKAvF0M="; + hash = "sha256-SqFug6Z1VAbERwiho73YDSzVPtzl7fBsE8++NfGkeW4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-ObvBSaBtf9PiC2zjcToNn59ihzR6qIxSRgi0FKNCIpY="; + cargoHash = "sha256-kz6WJyK+eb1I+ZjgL94je0HYNHWfcUvnxD7UThlP7wU="; nativeBuildInputs = [ installShellFiles From 108d1379650bfca60d5d53715bac7a993c7a1518 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 7 Feb 2025 21:08:38 +0100 Subject: [PATCH 0404/2168] chroma: 2.8.0 -> 2.15.0 --- pkgs/by-name/ch/chroma/package.nix | 4 ++-- pkgs/by-name/ch/chroma/src.json | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ch/chroma/package.nix b/pkgs/by-name/ch/chroma/package.nix index 379fd6384bdc..20c100d07f31 100644 --- a/pkgs/by-name/ch/chroma/package.nix +++ b/pkgs/by-name/ch/chroma/package.nix @@ -10,7 +10,7 @@ in buildGoModule rec { pname = "chroma"; - version = "2.8.0"; + version = "2.15.0"; # To update: # nix-prefetch-git --rev v${version} https://github.com/alecthomas/chroma.git > src.json @@ -21,7 +21,7 @@ buildGoModule rec { inherit (srcInfo) sha256; }; - vendorHash = "sha256-Bol5yMvNYuoVnSjEgf3h6X4CeUooy2Hpdy3SCaNXXOE="; + vendorHash = "sha256:14jg809xz647yv6sc8rnnksg2bpnn75panj8a2kdk2v87yrpq2zr"; modRoot = "./cmd/chroma"; diff --git a/pkgs/by-name/ch/chroma/src.json b/pkgs/by-name/ch/chroma/src.json index 8bba14faf188..e9cee45b9f29 100644 --- a/pkgs/by-name/ch/chroma/src.json +++ b/pkgs/by-name/ch/chroma/src.json @@ -1,9 +1,10 @@ { "url": "https://github.com/alecthomas/chroma.git", - "rev": "e8acfc274c22a76fd38030d2977a2246cd4322b3", - "date": "2023-06-30T08:43:39+10:00", - "path": "/nix/store/57y15g11dmdy2s6vxrjzl03s03j509gy-chroma", - "sha256": "0fdgpi5r0k42qzdn4lxh81ww1zcn9mwfildwrqf1s7crsqmr9dc5", + "rev": "009385f9487ee14c8a54e49aaf4331fea0830310", + "date": "2024-12-30T09:27:18+11:00", + "path": "/nix/store/rr2cj4bmlfw803diwyfpbrpai35gifaw-chroma", + "sha256": "088w3aixwfk8s04iyb2mjn3kx5dl3gb9q14jzawabcdy2ar7iijn", + "hash": "sha256-VsZ4shK+saW4+pIEnNYbtJU+h5VVLB8J0Gg63qMaHCE=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, From 7539f8d17e3ae1b967503dcbd3f418ff9cf7d6e0 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 7 Feb 2025 20:49:34 +0100 Subject: [PATCH 0405/2168] licensee: 9.16.1 -> 9.18.0 --- .../package-management/licensee/Gemfile.lock | 50 ++++---- .../package-management/licensee/gemset.nix | 118 +++++++++++------- 2 files changed, 97 insertions(+), 71 deletions(-) diff --git a/pkgs/tools/package-management/licensee/Gemfile.lock b/pkgs/tools/package-management/licensee/Gemfile.lock index 6bfe70664bd1..85997a8d96a9 100644 --- a/pkgs/tools/package-management/licensee/Gemfile.lock +++ b/pkgs/tools/package-management/licensee/Gemfile.lock @@ -1,38 +1,42 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) - base64 (0.2.0) - dotenv (2.8.1) - faraday (2.8.1) - base64 - faraday-net_http (>= 2.0, < 3.1) - ruby2_keywords (>= 0.0.4) - faraday-net_http (3.0.2) - licensee (9.16.1) - dotenv (~> 2.0) - octokit (>= 4.20, < 9.0) - reverse_markdown (>= 1, < 3) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + dotenv (3.1.7) + faraday (2.12.2) + faraday-net_http (>= 2.0, < 3.5) + json + logger + faraday-net_http (3.4.0) + net-http (>= 0.5.0) + json (2.9.1) + licensee (9.18.0) + dotenv (>= 2, < 4) + octokit (>= 4.20, < 10.0) + reverse_markdown (>= 1, < 4) rugged (>= 0.24, < 2.0) thor (>= 0.19, < 2.0) - mini_portile2 (2.8.5) - nokogiri (1.16.0) + logger (1.6.5) + mini_portile2 (2.8.8) + net-http (0.6.0) + uri + nokogiri (1.18.2) mini_portile2 (~> 2.8.2) racc (~> 1.4) - octokit (8.0.0) + octokit (9.2.0) faraday (>= 1, < 3) sawyer (~> 0.9) - public_suffix (5.0.4) - racc (1.7.3) - reverse_markdown (2.1.1) + public_suffix (6.0.1) + racc (1.8.1) + reverse_markdown (3.0.0) nokogiri - ruby2_keywords (0.0.5) - rugged (1.7.1) + rugged (1.9.0) sawyer (0.9.2) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) - thor (1.3.0) + thor (1.3.2) + uri (1.0.2) PLATFORMS ruby @@ -41,4 +45,4 @@ DEPENDENCIES licensee BUNDLED WITH - 2.4.22 + 2.5.22 diff --git a/pkgs/tools/package-management/licensee/gemset.nix b/pkgs/tools/package-management/licensee/gemset.nix index 032f6c9433a7..abc4f2ced445 100644 --- a/pkgs/tools/package-management/licensee/gemset.nix +++ b/pkgs/tools/package-management/licensee/gemset.nix @@ -5,55 +5,56 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr"; + sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6"; type = "gem"; }; - version = "2.8.6"; - }; - base64 = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; - type = "gem"; - }; - version = "0.2.0"; + version = "2.8.7"; }; dotenv = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1n0pi8x8ql5h1mijvm8lgn6bhq4xjb5a500p5r1krq4s6j9lg565"; + sha256 = "1wrw6fm0s38cd6h55w79bkvjhcj2zfkargjpws4kilkmhr3xyw66"; type = "gem"; }; - version = "2.8.1"; + version = "3.1.7"; }; faraday = { dependencies = [ - "base64" "faraday-net_http" - "ruby2_keywords" + "json" + "logger" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "19p45ryrvxff6ggdj4fq76dk7wlkfgrh474c3kwzdsjx3xpdq8x8"; + sha256 = "1mls9g490k63rdmjc9shqshqzznfn1y21wawkxrwp2vvbk13jwqm"; type = "gem"; }; - version = "2.8.1"; + version = "2.12.2"; }; faraday-net_http = { + dependencies = [ "net-http" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "13byv3mp1gsjyv8k0ih4612y6vw5kqva6i03wcg4w2fqpsd950k8"; + sha256 = "0jp5ci6g40d6i50bsywp35l97nc2fpi9a592r2cibwicdb6y9wd1"; type = "gem"; }; - version = "3.0.2"; + version = "3.4.0"; + }; + json = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "048danb0x10mpch6mf88mky35zjn6wk4hpbqq68ssbq58i3fzgfj"; + type = "gem"; + }; + version = "2.9.1"; }; licensee = { dependencies = [ @@ -67,20 +68,41 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "05g5w9c4jlfhwn0hfz117s1c7hfdm5yn7cywr4mah7xr41yvbh04"; + sha256 = "0xyzk7gzi91l6xlwfvf2z0963jwd2csf987yk0ffbr5p9ycdp0ry"; type = "gem"; }; - version = "9.16.1"; + version = "9.18.0"; + }; + logger = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0sz584vw17pwrrc5zg6yd8lqcgfpjf4qplq3s7fr0r3505nybky3"; + type = "gem"; + }; + version = "1.6.5"; }; mini_portile2 = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1kl9c3kdchjabrihdqfmcplk3lq4cw1rr9f378y6q22qwy5dndvs"; + sha256 = "0x8asxl83msn815lwmb2d7q5p29p7drhjv5va0byhk60v9n16iwf"; type = "gem"; }; - version = "2.8.5"; + version = "2.8.8"; + }; + net-http = { + dependencies = [ "uri" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1ysrwaabhf0sn24jrp0nnp51cdv0jf688mh5i6fsz63q2c6b48cn"; + type = "gem"; + }; + version = "0.6.0"; }; nokogiri = { dependencies = [ @@ -91,10 +113,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1l8b0i24h4irivyhwy9xmkjbggw86cxkzkiqdqg0jpcp9qc8h4rl"; + sha256 = "1gzqcs1kkykj8lrnbxc1iwr1wqmmaml8l6wyxdvy0vqq6gxiqyck"; type = "gem"; }; - version = "1.16.0"; + version = "1.18.2"; }; octokit = { dependencies = [ @@ -105,30 +127,30 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "11fhv1a43c51jkgmqf62aypf9yw74lc6ph4qmzsh2bydwwzbwqn3"; + sha256 = "05j3gz79gxkid3lc2balyllqik4v4swnm0rcvxz14m76bkrpz92g"; type = "gem"; }; - version = "8.0.0"; + version = "9.2.0"; }; public_suffix = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1bni4qjrsh2q49pnmmd6if4iv3ak36bd2cckrs6npl111n769k9m"; + sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31"; type = "gem"; }; - version = "5.0.4"; + version = "6.0.1"; }; racc = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp"; + sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa"; type = "gem"; }; - version = "1.7.3"; + version = "1.8.1"; }; reverse_markdown = { dependencies = [ "nokogiri" ]; @@ -136,30 +158,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0087vhw5ik50lxvddicns01clkx800fk5v5qnrvi3b42nrk6885j"; + sha256 = "195c7yra7amggqj7rir0yr09r4v29c2hgkbkb21mj0jsfs3868mb"; type = "gem"; }; - version = "2.1.1"; - }; - ruby2_keywords = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; - type = "gem"; - }; - version = "0.0.5"; + version = "3.0.0"; }; rugged = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "02m9zksfy3dwzhbv56xq2wwmlghca5209hdg895pi2x2d2sbkahi"; + sha256 = "1b7gcf6pxg4x607bica68dbz22b4kch33yi0ils6x3c8ql9akakz"; type = "gem"; }; - version = "1.7.1"; + version = "1.9.0"; }; sawyer = { dependencies = [ @@ -180,9 +192,19 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1hx77jxkrwi66yvs10wfxqa8s25ds25ywgrrf66acm9nbfg7zp0s"; + sha256 = "1nmymd86a0vb39pzj2cwv57avdrl6pl3lf5bsz58q594kqxjkw7f"; type = "gem"; }; - version = "1.3.0"; + version = "1.3.2"; + }; + uri = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "09qyg6a29cfgd46qid8qvx4sjbv596v19ym73xvhanbyxd6500xk"; + type = "gem"; + }; + version = "1.0.2"; }; } From 10b4344b185e7731e80d4050abb7a8ea75fd5825 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Fri, 7 Feb 2025 15:19:34 -0500 Subject: [PATCH 0406/2168] zed-editor: 0.172.9 -> 0.172.10 --- pkgs/by-name/ze/zed-editor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 6ebb25b2e56f..a9063b74d076 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -96,7 +96,7 @@ let in rustPlatform.buildRustPackage rec { pname = "zed-editor"; - version = "0.172.9"; + version = "0.172.10"; outputs = [ "out" ] ++ lib.optional buildRemoteServer "remote_server"; @@ -104,7 +104,7 @@ rustPlatform.buildRustPackage rec { owner = "zed-industries"; repo = "zed"; tag = "v${version}"; - hash = "sha256-mS2LyeqaFRL0M+6ZkmBowOOK0AJJIKiLpLjAvO7nqX0="; + hash = "sha256-4R7s+575ofL9JK1Axvvk2Z9QgHPxvJrgl9zCv3m+sZY="; }; patches = [ @@ -124,7 +124,7 @@ rustPlatform.buildRustPackage rec { ''; useFetchCargoVendor = true; - cargoHash = "sha256-G+/dAVlh+uHsQx7Lymi8tkKclwPjgtuKBX2d9KUc/IU="; + cargoHash = "sha256-yzShyOn90U79Ts+sKLhAK6SYiqPX7MKT/9fgF2plgI4="; nativeBuildInputs = [ From 2a9b5f46a76a59b3bf106de7b9254db0a73e91a6 Mon Sep 17 00:00:00 2001 From: emaryn Date: Sat, 8 Feb 2025 04:27:46 +0800 Subject: [PATCH 0407/2168] tmuxPlugins.resurrect: fix build --- pkgs/misc/tmux-plugins/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 48f077445220..2d9450274703 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -537,7 +537,8 @@ in rec { owner = "tmux-plugins"; repo = "tmux-resurrect"; rev = "ca6468e2deef11efadfe3a62832ae67742505432"; - hash = "sha256-dkiIbTPIn3ampK7LItndOL69cMVfuJyOIQZL4lt58jQ="; + hash = "sha256-wl9/5XvFq+AjV8CwYgIZjPOE0/kIuEYBNQqNDidjNFo="; + fetchSubmodules = true; }; meta = { homepage = "https://github.com/tmux-plugins/tmux-resurrect"; From 23ef66d70cbf6d9dd914a8d6f1b03c08b82285a5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Feb 2025 20:51:33 +0000 Subject: [PATCH 0408/2168] treesheets: 0-unstable-2025-01-16 -> 0-unstable-2025-02-05 --- pkgs/applications/office/treesheets/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index 99c0ccfccabf..580cf2fe8745 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "0-unstable-2025-01-16"; + version = "0-unstable-2025-02-05"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "f8edf8abe4d7f18528cec6460831d34ee30881e3"; - hash = "sha256-6EwlpdbLEBu5oUQx6IawaFMkBbmfoRb+lZMZiVLAk8k="; + rev = "474b0cd2e779e22fc8e6de225a27ad88bc5eec65"; + hash = "sha256-qJ30qjwV4ayTvf2XAZnAdn907YdYCb/XAhxaExDeHZI="; }; nativeBuildInputs = [ From c2b636ffa8e8f8451f39d316da77343981e848f6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 7 Feb 2025 20:19:37 +0100 Subject: [PATCH 0409/2168] python313Packages.pyezvizapi: fix pname --- pkgs/development/python-modules/pyezvizapi/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyezvizapi/default.nix b/pkgs/development/python-modules/pyezvizapi/default.nix index 16e19ddb27c4..51ade8376315 100644 --- a/pkgs/development/python-modules/pyezvizapi/default.nix +++ b/pkgs/development/python-modules/pyezvizapi/default.nix @@ -5,14 +5,13 @@ paho-mqtt, pandas, pycryptodome, - pythonOlder, requests, setuptools, xmltodict, }: buildPythonPackage rec { - pname = "pyezviz"; + pname = "pyezvizapi"; version = "1.0.0.9"; pyproject = true; From 74c425c7a62de863c0cc63dd22dd7d6dac958607 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 7 Feb 2025 20:21:18 +0100 Subject: [PATCH 0410/2168] python313Packages.aioshelly: 12.3.2 -> 12.4.1 https://github.com/home-assistant-libs/aioshelly/releases/tag/12.4.1 --- pkgs/development/python-modules/aioshelly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index 8ef2c6a89bbf..63980cd75b45 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "12.3.2"; + version = "12.4.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "aioshelly"; tag = version; - hash = "sha256-Xuh1iOQHoFU1pTehPVmwS6bNTelnYMHW8wnkhxTSrnw="; + hash = "sha256-OhfLl/IJUSmzVHoYjJszxwN4RZEr5zCfxxh5T0/z2Bg="; }; build-system = [ setuptools ]; From 5acafd6ac581fa7b63b591e31a21961cae7f667b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 7 Feb 2025 20:21:52 +0100 Subject: [PATCH 0411/2168] python313Packages.eheimdigital: 1.0.5 -> 1.0.6 https://github.com/autinerd/eheimdigital/releases/tag/1.0.6 --- pkgs/development/python-modules/eheimdigital/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eheimdigital/default.nix b/pkgs/development/python-modules/eheimdigital/default.nix index b2f701b20b5c..35497ca9a13f 100644 --- a/pkgs/development/python-modules/eheimdigital/default.nix +++ b/pkgs/development/python-modules/eheimdigital/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "eheimdigital"; - version = "1.0.5"; + version = "1.0.6"; pyproject = true; src = fetchFromGitHub { owner = "autinerd"; repo = "eheimdigital"; tag = version; - hash = "sha256-fzvQrguwZoaQCoJlXzFCF7WUZpBe0EMQNcyKnmhQ4l8="; + hash = "sha256-ocDw7ZwuKSGQT8fPcZEbkKyRH0sCOJusopV0kM11rCw="; }; build-system = [ hatchling ]; From 59aadb772f9cb989f6e5204e7514ad2e32ca52ed Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 7 Feb 2025 20:22:28 +0100 Subject: [PATCH 0412/2168] python313Packages.google-nest-sdm: 7.1.1 -> 7.1.3 https://github.com/allenporter/python-google-nest-sdm/releases/tag/7.1.3 --- pkgs/development/python-modules/google-nest-sdm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix index b659eb9566e4..e30c7b93bf22 100644 --- a/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "google-nest-sdm"; - version = "7.1.1"; + version = "7.1.3"; pyproject = true; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "python-google-nest-sdm"; tag = version; - hash = "sha256-hBpAwDRmqRRWW0DiG3aXy+OXZPCXdhPzAP79mXOn1kg="; + hash = "sha256-iVdFl90nP2U5KGqFPvS7qHgSUQjlKnbfZTLq42y/Mrc="; }; build-system = [ setuptools ]; From fe9998772269de9b60d23bced5137c67406dd3e6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 7 Feb 2025 20:24:30 +0100 Subject: [PATCH 0413/2168] python313Packages.govee-ble: 0.42.0 -> 0.43.0 https://github.com/bluetooth-devices/govee-ble/blob/v0.43.0/CHANGELOG.md --- pkgs/development/python-modules/govee-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/govee-ble/default.nix b/pkgs/development/python-modules/govee-ble/default.nix index 7b30475a1b94..5a3fb5ecfea0 100644 --- a/pkgs/development/python-modules/govee-ble/default.nix +++ b/pkgs/development/python-modules/govee-ble/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "govee-ble"; - version = "0.42.0"; + version = "0.43.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "govee-ble"; tag = "v${version}"; - hash = "sha256-R2FHkXurWif9BZTGry9PGZgM30CYIgbKAD8iLxmmJfw="; + hash = "sha256-MC5ql5Cd9atpgQCoTIfasioplJ2f1M+RrGR/oI/fdMI="; }; build-system = [ poetry-core ]; From b84070a22450830d7902b55472375595678959a3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 7 Feb 2025 20:24:50 +0100 Subject: [PATCH 0414/2168] python313Packages.pyfireservicerota: 0.0.45 -> 0.0.46 https://github.com/cyberjunky/python-fireservicerota/releases/tag/0.0.46 --- pkgs/development/python-modules/pyfireservicerota/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyfireservicerota/default.nix b/pkgs/development/python-modules/pyfireservicerota/default.nix index a07daa519cf5..2fb94c1b28df 100644 --- a/pkgs/development/python-modules/pyfireservicerota/default.nix +++ b/pkgs/development/python-modules/pyfireservicerota/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyfireservicerota"; - version = "0.0.45"; + version = "0.0.46"; pyproject = true; disabled = pythonOlder "3.10"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "cyberjunky"; repo = "python-fireservicerota"; tag = version; - hash = "sha256-lQkn/DlqJMLxQlh1sn+v7d6xHHCC9r8mnUJchyTTUqA="; + hash = "sha256-2pCv/9VwGUDS5wFdJCxOevl7vWg+iXInI/xY3jPp7BM="; }; build-system = [ pdm-backend ]; From 864c73667b9cae72bfe1c3f02edd17e1383c1f30 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 7 Feb 2025 20:25:30 +0100 Subject: [PATCH 0415/2168] python313Packages.reolink-aio: 0.11.9 -> 0.11.10 https://github.com/starkillerOG/reolink_aio/releases/tag/0.11.10 --- pkgs/development/python-modules/reolink-aio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index 4652d875f1c9..1fdfbeb8f018 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.11.9"; + version = "0.11.10"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; tag = version; - hash = "sha256-hqecKAk3kpm3b9wtQTJtWA3H6WxCNiKl4auaolzrvtI="; + hash = "sha256-qEcu+jdzPSNzgT5aK1nZxT6EAlH1ady5Vyx11PTsTic="; }; build-system = [ setuptools ]; From 38e87d26c7171ad2a025baf8bb6f250cb800034f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 7 Feb 2025 20:26:05 +0100 Subject: [PATCH 0416/2168] python313Packages.zha-quirks: 0.0.131 -> 0.0.132 https://github.com/zigpy/zha-device-handlers/releases/tag/0.0.132 --- pkgs/development/python-modules/zha-quirks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 2ed4b3aa9249..27e070a78790 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.131"; + version = "0.0.132"; pyproject = true; disabled = pythonOlder "3.12"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; tag = version; - hash = "sha256-MSTlSvZhamWX7lNzJjDGxyo9KfshZ7T1ED8axx1Aghs="; + hash = "sha256-T5A6XIYdV0SxEj3Rw/zOAE74B1ans2FDyuWD5Hnbd5k="; }; postPatch = '' From e46e36e4062bfe201cf95fda8499a451b9752f91 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 7 Feb 2025 20:41:14 +0100 Subject: [PATCH 0417/2168] python313Packages.zha: 0.0.47 -> 0.0.48 https://github.com/zigpy/zha/releases/tag/0.0.48 --- pkgs/development/python-modules/zha/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zha/default.nix b/pkgs/development/python-modules/zha/default.nix index 5c0ee8391ec9..70e0c5d08d60 100644 --- a/pkgs/development/python-modules/zha/default.nix +++ b/pkgs/development/python-modules/zha/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "zha"; - version = "0.0.47"; + version = "0.0.48"; pyproject = true; disabled = pythonOlder "3.12"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha"; tag = version; - hash = "sha256-BDZqReJWmxodP1w3fdxUHbjY9dL+6hUQZ0YazeiERrM="; + hash = "sha256-qPqFmFfvCR6gk4qmZNrkC/DcdOUzyLv7KALv35R6oNw="; }; postPatch = '' From e7f92d9368444277402b11ffbb0ba0d73bc9bd44 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 7 Feb 2025 21:36:00 +0100 Subject: [PATCH 0418/2168] python313Packages.aiohttp-asyncmdnsresolver: 0.0.3 -> 0.1.0 https://github.com/aio-libs/aiohttp-asyncmdnsresolver/blob/v0.1.0/CHANGES.rst --- .../python-modules/aiohttp-asyncmdnsresolver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohttp-asyncmdnsresolver/default.nix b/pkgs/development/python-modules/aiohttp-asyncmdnsresolver/default.nix index 0b62e0e4f723..19ae19352c2b 100644 --- a/pkgs/development/python-modules/aiohttp-asyncmdnsresolver/default.nix +++ b/pkgs/development/python-modules/aiohttp-asyncmdnsresolver/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aiohttp-asyncmdnsresolver"; - version = "0.0.3"; + version = "0.1.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "aio-libs"; repo = "aiohttp-asyncmdnsresolver"; rev = "v${version}"; - hash = "sha256-YtBPMhRbilLY0VV1qVIPBYT0w91MbsUo2nbr4ODgCZA="; + hash = "sha256-z0m8dlzl6mglTOW9BwLbFcRjxcF14yz8+SE8SqjNu+c="; }; build-system = [ setuptools ]; From 1207a9b70f7761514999d33e1797251a6549807a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 7 Feb 2025 21:08:38 +0100 Subject: [PATCH 0419/2168] home-assistant: 2025.2.0 -> 2025.2.1 https://github.com/home-assistant/core/releases/tag/2025.2.1 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 132e2528e0fa..ff0cca567b1f 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2025.2.0"; + version = "2025.2.1"; components = { "3_day_blinds" = ps: with ps; [ diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index e2820564630a..23f28b18597d 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -369,7 +369,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2025.2.0"; + hassVersion = "2025.2.1"; in python.pkgs.buildPythonApplication rec { @@ -390,13 +390,13 @@ python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-TGlfqvmYUPA5wdvZWD89z6lfvDr+K/1kgu6NjkRpNxs="; + hash = "sha256-iWOrBIKsN+fi5pzMzekmTBIk2FoM2HOsWujkuZ45lHE="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-+dkS6AuqyzvC2NiGCGkDAGxF/kS/LuKkMFXWXjC3I8Y="; + hash = "sha256-GToOHfDOWrjiQEcxgX9h2tCYqGUv3mXxVh1/GchiNRU="; }; build-system = with python.pkgs; [ @@ -450,9 +450,6 @@ python.pkgs.buildPythonApplication rec { substituteInPlace tests/test_core_config.py --replace-fail '"/usr"' "\"$NIX_BUILD_TOP/media\"" sed -i 's/setuptools[~=]/setuptools>/' pyproject.toml - - substituteInPlace tests/components/hassio/test_backup.py \ - --replace-fail setup_integration setup_backup_integration ''; dependencies = with python.pkgs; [ From d1e4dfa05782028cd6f0eb366cc9f84da3df86ad Mon Sep 17 00:00:00 2001 From: "Alexandre Cavalheiro S. Tiago da Silva" Date: Tue, 28 Jan 2025 04:45:42 -0300 Subject: [PATCH 0420/2168] nvidia_oc: add driver runpath hook This adds the `autoAddDriverRunpath` hook to `nvidia_oc`, patching the ELF and giving the program the path where `libnvidia-ml.so` is located. --- pkgs/by-name/nv/nvidia_oc/package.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/nv/nvidia_oc/package.nix b/pkgs/by-name/nv/nvidia_oc/package.nix index e5282d152240..1d6ca57286ae 100644 --- a/pkgs/by-name/nv/nvidia_oc/package.nix +++ b/pkgs/by-name/nv/nvidia_oc/package.nix @@ -1,7 +1,8 @@ { lib, - fetchFromGitHub, rustPlatform, + fetchFromGitHub, + autoAddDriverRunpath, versionCheckHook, }: @@ -19,6 +20,10 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-DuuHqBhL25ghgcYxcOtWRArUqL9+c3d5mBrAcWTAFW8="; + nativeBuildInputs = [ + autoAddDriverRunpath + ]; + doInstallCheck = true; nativeInstallCheckInputs = [ From af3198dd1c85f7bfde40abf92c1b2dfe3a70a13e Mon Sep 17 00:00:00 2001 From: linuxissuper Date: Fri, 7 Feb 2025 22:13:40 +0100 Subject: [PATCH 0421/2168] lxqt-panel-profiles: fix paths adjust out paths so the bin and .desktop file are found --- pkgs/by-name/lx/lxqt-panel-profiles/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lx/lxqt-panel-profiles/package.nix b/pkgs/by-name/lx/lxqt-panel-profiles/package.nix index d87630bddf16..0587b72220cf 100644 --- a/pkgs/by-name/lx/lxqt-panel-profiles/package.nix +++ b/pkgs/by-name/lx/lxqt-panel-profiles/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { substituteInPlace usr/bin/lxqt-panel-profiles \ --replace-fail "/bin/bash" "${bash}/bin/bash" \ - --replace-fail "/usr/share/" "$out/usr/share/" \ + --replace-fail "/usr/share/" "$out/share/" \ --replace-fail "python3" "${pythonWithPyqt6}/bin/python" substituteInPlace usr/share/lxqt-panel-profiles/lxqt-panel-profiles.py \ @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir $out - mv usr $out/usr + mv usr/* $out ''; meta = { From 84cd89f0d794fd0b7f4397bab74c1382899191ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Feb 2025 21:16:58 +0000 Subject: [PATCH 0422/2168] amdvlk: 2024.Q4.3 -> 2025.Q1.1 --- pkgs/by-name/am/amdvlk/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/am/amdvlk/package.nix b/pkgs/by-name/am/amdvlk/package.nix index bf09dcaf4b5c..0e11b46783b2 100644 --- a/pkgs/by-name/am/amdvlk/package.nix +++ b/pkgs/by-name/am/amdvlk/package.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "amdvlk"; - version = "2024.Q4.3"; + version = "2025.Q1.1"; src = fetchRepoProject { name = "amdvlk-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${finalAttrs.version}"; - hash = "sha256-PQxTRCSOk8E6y7pXyqxt1QKtRsqnrj/9dQZ8NjnUbhA="; + hash = "sha256-snwNyi/8voptLhZkXLK0QNh7pKo4SFx1iQojNzVr1Ms="; }; buildInputs = From dc29c94aac6ebcd5c4b6da2eeff268614a353db4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Feb 2025 21:28:11 +0000 Subject: [PATCH 0423/2168] cloudflare-utils: 1.3.4 -> 1.3.5 --- pkgs/by-name/cl/cloudflare-utils/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cl/cloudflare-utils/package.nix b/pkgs/by-name/cl/cloudflare-utils/package.nix index 48f34dd0e08d..d1f35537098c 100644 --- a/pkgs/by-name/cl/cloudflare-utils/package.nix +++ b/pkgs/by-name/cl/cloudflare-utils/package.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "cloudflare-utils"; - version = "1.3.4"; + version = "1.3.5"; src = fetchFromGitHub { owner = "Cyb3r-Jak3"; repo = "cloudflare-utils"; rev = "v${version}"; - hash = "sha256-XYOYun7PmZEQQRVCi46tBYoNZdXedmhpdUygtVlU0bE="; + hash = "sha256-LbqH48ysOp2s+e+52doHIyaxUbzzCdJqhdvLuIJ3CCc="; }; vendorHash = "sha256-fg2BJkXdCWAO83kMoxkHlEyZuVezu9rs0hEda17KObE="; From 8fff54379ca15c3f4fa2a8fc62acc1b0b0a15c31 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Feb 2025 12:55:18 +0000 Subject: [PATCH 0424/2168] lobster: 2024.0 -> 2025.0 --- pkgs/development/compilers/lobster/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/lobster/default.nix b/pkgs/development/compilers/lobster/default.nix index e54c71ebab64..c8f6fdddf163 100644 --- a/pkgs/development/compilers/lobster/default.nix +++ b/pkgs/development/compilers/lobster/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lobster"; - version = "2024.0"; + version = "2025.0"; src = fetchFromGitHub { owner = "aardappel"; repo = "lobster"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-EBgb442wI9qU/o6EVCwPnMtPuv1f6Xk2+CZpKWXf3tY="; + sha256 = "sha256-yigWrbFQg1nQt7X1Rx7Us5cKfKW4YOmPt0/lyBvspqo="; }; nativeBuildInputs = [ cmake ]; From 4fdf8f6a55fa0c340c9a9c2bed4d029a80cdc306 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Feb 2025 21:58:15 +0000 Subject: [PATCH 0425/2168] marmite: 0.2.4 -> 0.2.5 --- pkgs/by-name/ma/marmite/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/marmite/package.nix b/pkgs/by-name/ma/marmite/package.nix index ff00e7335e87..e86839fe74a5 100644 --- a/pkgs/by-name/ma/marmite/package.nix +++ b/pkgs/by-name/ma/marmite/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "marmite"; - version = "0.2.4"; + version = "0.2.5"; src = fetchFromGitHub { owner = "rochacbruno"; repo = "marmite"; tag = version; - hash = "sha256-IfmwPN2PbBXJJXHgwseC5L3sDOjaVlRE//H8uHazSNA="; + hash = "sha256-FxI+Qh3ZM6ZgE/KyZ/gU3CutBHETymgvkjNkYAJ012E="; }; useFetchCargoVendor = true; - cargoHash = "sha256-C2GGQQ4Aphi1hNQjSWGK9ZnvbwdZSWugKxsUrB5KtHU="; + cargoHash = "sha256-LMoakr7LGKFkxymOC8cNxxFbDDqw5gniqh/3ImnEbB8="; nativeBuildInputs = [ pkg-config From 09526f37b5fa36ff11704823da63d20d1c7607c4 Mon Sep 17 00:00:00 2001 From: Bradley Cooley Date: Fri, 7 Feb 2025 15:11:10 -0700 Subject: [PATCH 0426/2168] vimPlugins.nvim-dap-cortex-debug: init at 2024-12-01 --- .../editors/vim/plugins/generated.nix | 46 ++++++++++++++----- .../editors/vim/plugins/overrides.nix | 4 ++ .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 39 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index c0758b97c7c7..fa8f0a0eaccd 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1420,18 +1420,7 @@ final: prev: sha256 = "17c41flnjp25c5gry4lq8ik8mk3pbh1qwj86rby57jr4f4wvfykk"; }; meta.homepage = "https://github.com/Kaiser-Yang/blink-cmp-dictionary/"; - }; - - blink-cmp-spell = buildVimPlugin { - pname = "blink-cmp-spell"; - version = "2025-02-01"; - src = fetchFromGitHub { - owner = "ribru17"; - repo = "blink-cmp-spell"; - rev = "38d6797dea6f72baa6e8b3bfca6da96d8fcac64d"; - sha256 = "19pnasa446iiapgsr3z2fpk0nnrzh8g5wrzrq8n0y4q0z6spc9f6"; - }; - meta.homepage = "https://github.com/ribru17/blink-cmp-spell/"; + meta.hydraPlatforms = [ ]; }; blink-cmp-git = buildVimPlugin { @@ -1444,6 +1433,20 @@ final: prev: sha256 = "08hfwnjgsl88bkphpdxkdswdnc10mlxpsrk084kgzk4j19w55gyq"; }; meta.homepage = "https://github.com/Kaiser-Yang/blink-cmp-git/"; + meta.hydraPlatforms = [ ]; + }; + + blink-cmp-spell = buildVimPlugin { + pname = "blink-cmp-spell"; + version = "2025-02-01"; + src = fetchFromGitHub { + owner = "ribru17"; + repo = "blink-cmp-spell"; + rev = "38d6797dea6f72baa6e8b3bfca6da96d8fcac64d"; + sha256 = "19pnasa446iiapgsr3z2fpk0nnrzh8g5wrzrq8n0y4q0z6spc9f6"; + }; + meta.homepage = "https://github.com/ribru17/blink-cmp-spell/"; + meta.hydraPlatforms = [ ]; }; blink-compat = buildVimPlugin { @@ -1664,6 +1667,7 @@ final: prev: sha256 = "1s0zmpwg7z76l3ca1p426mkh33cw94m18q7rfsvnz4h4xwlsafpa"; }; meta.homepage = "https://github.com/kwkarlwang/bufresize.nvim/"; + meta.hydraPlatforms = [ ]; }; bullets-vim = buildVimPlugin { @@ -3315,6 +3319,7 @@ final: prev: sha256 = "06h388vkp8nv15wbh96pza85994xf979s7kjqrli4s6y5ygw6m02"; }; meta.homepage = "https://github.com/netmute/ctags-lsp.nvim/"; + meta.hydraPlatforms = [ ]; }; ctrlp-cmatcher = buildVimPlugin { @@ -8072,6 +8077,7 @@ final: prev: sha256 = "06d7s9949aylda4vq36h4s9hnnp3lycwm2nrjid5vxb98gy3d3xn"; }; meta.homepage = "https://github.com/milanglacier/minuet-ai.nvim/"; + meta.hydraPlatforms = [ ]; }; mkdir-nvim = buildVimPlugin { @@ -9819,6 +9825,19 @@ final: prev: meta.hydraPlatforms = [ ]; }; + nvim-dap-cortex-debug = buildVimPlugin { + pname = "nvim-dap-cortex-debug"; + version = "2024-12-01"; + src = fetchFromGitHub { + owner = "jedrzejboczar"; + repo = "nvim-dap-cortex-debug"; + rev = "e09ad083da385fdb74f81fe808f3d2a1593d910d"; + sha256 = "02yv6byx207wgfgsck9g25mrbqhc607cyqfvc13j0dfjc6f7lfka"; + }; + meta.homepage = "https://github.com/jedrzejboczar/nvim-dap-cortex-debug/"; + meta.hydraPlatforms = [ ]; + }; + nvim-dap-go = buildVimPlugin { pname = "nvim-dap-go"; version = "2025-01-14"; @@ -13662,6 +13681,7 @@ final: prev: sha256 = "18m46gj68xv6basaqzbschr60sc9xzi4dx21cvnx401bk97cqpgi"; }; meta.homepage = "https://github.com/xiyaowong/telescope-emoji.nvim/"; + meta.hydraPlatforms = [ ]; }; telescope-file-browser-nvim = buildVimPlugin { @@ -13766,6 +13786,7 @@ final: prev: sha256 = "0n1mdiwkkciqpxjad1nngrc7px5yziyan0daxgs9jsgdqmy1lzp8"; }; meta.homepage = "https://github.com/ghassan0/telescope-glyph.nvim/"; + meta.hydraPlatforms = [ ]; }; telescope-live-grep-args-nvim = buildVimPlugin { @@ -14052,6 +14073,7 @@ final: prev: sha256 = "0bp6m6b7bsw9d4iyn1b8bw3avnvjlk7pi8h941m68fw54n3mf06f"; }; meta.homepage = "https://github.com/rebelot/terminal.nvim/"; + meta.hydraPlatforms = [ ]; }; terminus = buildVimPlugin { diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 5be981762200..ccefd96632d0 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -2267,6 +2267,10 @@ in dependencies = [ self.plenary-nvim ]; }; + nvim-dap-cortex-debug = super.nvim-dap-cortex-debug.overrideAttrs { + dependencies = [ self.nvim-dap ]; + }; + nvim-coverage = super.nvim-coverage.overrideAttrs { dependencies = with self; [ neotest diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index bcc627f512ec..2831f9b89797 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -752,6 +752,7 @@ https://github.com/klen/nvim-config-local/,, https://github.com/andythigpen/nvim-coverage/,HEAD, https://github.com/ya2s/nvim-cursorline/,, https://github.com/mfussenegger/nvim-dap/,, +https://github.com/jedrzejboczar/nvim-dap-cortex-debug/,HEAD, https://github.com/leoluz/nvim-dap-go/,HEAD, https://github.com/julianolf/nvim-dap-lldb/,HEAD, https://github.com/mfussenegger/nvim-dap-python/,HEAD, From 7d2ad8a9b70985eb3496ef8687997d0d30c3f991 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Feb 2025 22:14:03 +0000 Subject: [PATCH 0427/2168] pv-migrate: 2.1.0 -> 2.2.0 --- pkgs/by-name/pv/pv-migrate/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pv/pv-migrate/package.nix b/pkgs/by-name/pv/pv-migrate/package.nix index b59d4d1a31d7..0488e41ae9e6 100644 --- a/pkgs/by-name/pv/pv-migrate/package.nix +++ b/pkgs/by-name/pv/pv-migrate/package.nix @@ -7,18 +7,18 @@ buildGoModule rec { pname = "pv-migrate"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "utkuozdemir"; repo = pname; tag = "v${version}"; - sha256 = "sha256-41yuxvGsJ+BTvw96hWhVRqqJ1UXhvqGO9Y0hU7PfjTU="; + sha256 = "sha256-yYY3UgqHdFXoGj6n4kY45J/2QujPboWucnmbbXjjhRM="; }; subPackages = [ "cmd/pv-migrate" ]; - vendorHash = "sha256-bkyANbdQIsb8XHRQvI//RogFfVr7x6wwsieru1KIppU="; + vendorHash = "sha256-wMlwfWMrjvo+9VUt8ZUcYHrsa9NOZhCj6LArdqXVCI4="; ldflags = [ "-s" From 9eadc59459dbfbc2fdd9f1c9d4ee0312df06e6a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Feb 2025 22:15:25 +0000 Subject: [PATCH 0428/2168] lua-language-server: 3.13.5 -> 3.13.6 --- pkgs/by-name/lu/lua-language-server/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lu/lua-language-server/package.nix b/pkgs/by-name/lu/lua-language-server/package.nix index 72429925b7b8..38509eed727d 100644 --- a/pkgs/by-name/lu/lua-language-server/package.nix +++ b/pkgs/by-name/lu/lua-language-server/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lua-language-server"; - version = "3.13.5"; + version = "3.13.6"; src = fetchFromGitHub { owner = "luals"; repo = "lua-language-server"; tag = finalAttrs.version; - hash = "sha256-t1kKRLrh5gVWIiVNEW2O3YAyECVzWc84Wp91Sc9fTrU="; + hash = "sha256-LaetDI9kNPRY4+m3gSsh6vbysRjUKHl+zunuyedjZGY="; fetchSubmodules = true; }; From f39eb448eb043bb0329a7f4549aae048675067a6 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 7 Feb 2025 00:01:50 +0100 Subject: [PATCH 0429/2168] python312Packages.orbax-checkpoint: 0.11.2 -> 0.11.4 Diff: https://github.com/google/orbax/compare/refs/tags/v0.11.2...v0.11.4 Changelog: https://github.com/google/orbax/blob/v0.11.4/checkpoint/CHANGELOG.md --- pkgs/development/python-modules/orbax-checkpoint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/orbax-checkpoint/default.nix b/pkgs/development/python-modules/orbax-checkpoint/default.nix index 9ede2980a7c9..9adafbe609d1 100644 --- a/pkgs/development/python-modules/orbax-checkpoint/default.nix +++ b/pkgs/development/python-modules/orbax-checkpoint/default.nix @@ -34,14 +34,14 @@ buildPythonPackage rec { pname = "orbax-checkpoint"; - version = "0.11.2"; + version = "0.11.4"; pyproject = true; src = fetchFromGitHub { owner = "google"; repo = "orbax"; tag = "v${version}"; - hash = "sha256-68mqz+4FJQr/mKR53L5CSenRB0SjV3dbBdtBylFW1y8="; + hash = "sha256-zKQcqDW0dOQIGNllrK6bPdTr8mkKU6eevdfvMGssd9w="; }; sourceRoot = "${src.name}/checkpoint"; From ea51b761844c6748a3ef9c871207ac250bb25b33 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Fri, 7 Feb 2025 14:35:28 -0800 Subject: [PATCH 0430/2168] llvmPackages.compiler-rt: drop libc-free patch --- .../llvm/20/compiler-rt/libc-free.patch | 68 ------------------- .../compilers/llvm/common/default.nix | 7 +- 2 files changed, 1 insertion(+), 74 deletions(-) delete mode 100644 pkgs/development/compilers/llvm/20/compiler-rt/libc-free.patch diff --git a/pkgs/development/compilers/llvm/20/compiler-rt/libc-free.patch b/pkgs/development/compilers/llvm/20/compiler-rt/libc-free.patch deleted file mode 100644 index e36b3414aef1..000000000000 --- a/pkgs/development/compilers/llvm/20/compiler-rt/libc-free.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 5eaae2daff7722ee01eee239e131ee1f62643abe Mon Sep 17 00:00:00 2001 -From: Peter Waller -Date: Wed, 5 Feb 2025 19:46:15 +0000 -Subject: [PATCH] [compiler-rt][AArch64] Enable libc-free builtins Linux build - -Without this change, libc++abi.so.1.0 fails to link with: - -``` -error: undefined sybol: __aarch64_sme_accessible -``` - -This symbol is provided by baremetal libc's such as newlib. - -In order to compile a libc with compiler-rt, it is necessary first to -build a compiler-rt with no dependency on libc to acquire the builtins. -The intended linux test requires getauxval which is provided by libc. - -To that end, there are examples in the wild of building a compiler-rt -without libc by specifying -DCOMPILER_RT_BAREMETAL_BUILD=ON. -On Linux, this gives a builtins build with (almost) no libc dependencies. - -See for example: - -https://github.com/NixOS/nixpkgs/blob/d7fe3bcaca37e79d8b3cbde4dd69edeafbd35313/pkgs/development/compilers/llvm/common/compiler-rt/default.nix#L116-L118 - -``` - ] ++ lib.optionals (!haveLibc || bareMetal) [ - "-DCMAKE_C_COMPILER_WORKS=ON" - "-DCOMPILER_RT_BAREMETAL_BUILD=ON" -``` - -The above specifies that a !haveLibc build sets -`-DCOMPILER_RT_BAREMETAL_BUILD`, which is done for example in a `pkgsLLVM` build. - -AIUI, acquiring such a builtins build of compiler-rt is necessary to build a -pure LLVM toolchain, since builtins are required to build libc (and -libcxx is required to build a full compiler-rt). - -The effect of falling back to unimplemented is that this early-stage -builtins build is incapable of doing function multiversioning tests and -falls back to behaving as-if the feature is unavailable. - -This behaviour changed in -https://github.com/llvm/llvm-project/pull/119414, which introduced a -subtle change in semantics in the removal of -compiler-rt/lib/builtins/aarch64/sme-abi-init.c (definition of getauxval -macro, which was bracketed by `#if defined(__linux__)`) vs the new -definition which does not test for linux. - -The proposed change is reinstating things as they were before #119414. ---- - compiler-rt/lib/builtins/cpu_model/aarch64.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/builtins/cpu_model/aarch64.c b/lib/builtins/cpu_model/aarch64.c -index 4082fd62ea11a25..50438bcc7ddd885 100644 ---- a/lib/builtins/cpu_model/aarch64.c -+++ b/lib/builtins/cpu_model/aarch64.c -@@ -80,7 +80,7 @@ struct { - #include "aarch64/fmv/getauxval.inc" - #elif defined(_WIN32) - #include "aarch64/fmv/windows.inc" --#elif defined(ENABLE_BAREMETAL_AARCH64_FMV) -+#elif defined(ENABLE_BAREMETAL_AARCH64_FMV) && !defined(__linux__) - #include "aarch64/fmv/baremetal.inc" - #else - #include "aarch64/fmv/unimplemented.inc" - diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index ff3f6d0d853d..a40ffd4044b4 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -1086,12 +1086,7 @@ let url = "https://github.com/llvm/llvm-project/pull/99837/commits/14ae0a660a38e1feb151928a14f35ff0f4487351.patch"; hash = "sha256-JykABCaNNhYhZQxCvKiBn54DZ5ZguksgCHnpdwWF2no="; relative = "compiler-rt"; - }) - # Fixes baremetal - # PR: https://github.com/llvm/llvm-project/pull/125922 - ++ lib.optional (lib.versionAtLeast metadata.release_version "20") ( - metadata.getVersionFile "compiler-rt/libc-free.patch" - ); + }); in ( { From 1d3682197005d337628f10a501d945a127aa052c Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 7 Feb 2025 23:36:42 +0100 Subject: [PATCH 0431/2168] lomiri.lomiri-thumbnailer: Raise default extraction timeout --- ...001-Raise-default-extraction-timeout.patch | 70 +++++++++++++++++++ .../services/lomiri-thumbnailer/default.nix | 4 ++ 2 files changed, 74 insertions(+) create mode 100644 pkgs/desktops/lomiri/services/lomiri-thumbnailer/2001-Raise-default-extraction-timeout.patch diff --git a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/2001-Raise-default-extraction-timeout.patch b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/2001-Raise-default-extraction-timeout.patch new file mode 100644 index 000000000000..4b5fcd5b063a --- /dev/null +++ b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/2001-Raise-default-extraction-timeout.patch @@ -0,0 +1,70 @@ +From d2f977692f931faaad0972f8d121252ddea27501 Mon Sep 17 00:00:00 2001 +From: OPNA2608 +Date: Fri, 7 Feb 2025 19:13:13 +0100 +Subject: [PATCH] data/com.lomiri.Thumbnailer.gschema.xml: Raise + extraction-timeout + +--- + data/com.lomiri.Thumbnailer.gschema.xml | 2 +- + .../liblomiri-thumbnailer-qt_test.cpp | 4 ++-- + tests/settings/settings_test.cpp | 4 ++-- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/data/com.lomiri.Thumbnailer.gschema.xml b/data/com.lomiri.Thumbnailer.gschema.xml +index 094f850..9de4ab0 100644 +--- a/data/com.lomiri.Thumbnailer.gschema.xml ++++ b/data/com.lomiri.Thumbnailer.gschema.xml +@@ -66,7 +66,7 @@ + + + +- 10 ++ 20 + Maximum amount of time to wait for an image extraction or download (in seconds) + + This parameter sets the amount of time (in seconds) to wait for a remote image download or a thumbnail extraction before giving up. +diff --git a/tests/liblomiri-thumbnailer-qt/liblomiri-thumbnailer-qt_test.cpp b/tests/liblomiri-thumbnailer-qt/liblomiri-thumbnailer-qt_test.cpp +index 8fc06cf..278ebbb 100644 +--- a/tests/liblomiri-thumbnailer-qt/liblomiri-thumbnailer-qt_test.cpp ++++ b/tests/liblomiri-thumbnailer-qt/liblomiri-thumbnailer-qt_test.cpp +@@ -467,13 +467,13 @@ TEST_F(LibThumbnailerTest, request_timeout) + } + + Thumbnailer thumbnailer(dbus_->connection()); +- auto reply = thumbnailer.getArtistArt("sleep", "12", QSize(256, 256)); ++ auto reply = thumbnailer.getArtistArt("sleep", "22", QSize(256, 256)); + + reply->waitForFinished(); + + EXPECT_TRUE(reply->isFinished()); + EXPECT_EQ("Thumbnailer: RequestImpl::dbusCallFinished(): D-Bus error: Handler::createFinished(): " +- "could not get thumbnail for artist: sleep/12 (256,256): TIMEOUT", ++ "could not get thumbnail for artist: sleep/22 (256,256): TIMEOUT", + reply->errorMessage()); + EXPECT_FALSE(reply->isValid()); + } +diff --git a/tests/settings/settings_test.cpp b/tests/settings/settings_test.cpp +index cd5931e..8a9a839 100644 +--- a/tests/settings/settings_test.cpp ++++ b/tests/settings/settings_test.cpp +@@ -46,7 +46,7 @@ TEST(Settings, defaults_from_schema) + EXPECT_EQ(7200, settings.retry_error_max_seconds()); + EXPECT_EQ(8, settings.max_downloads()); + EXPECT_EQ(0, settings.max_extractions()); +- EXPECT_EQ(10, settings.extraction_timeout()); ++ EXPECT_EQ(20, settings.extraction_timeout()); + EXPECT_EQ(10, settings.max_backlog()); + EXPECT_FALSE(settings.trace_client()); + EXPECT_EQ(1, settings.log_level()); +@@ -69,7 +69,7 @@ TEST(Settings, missing_schema) + EXPECT_EQ(7200, settings.retry_error_max_seconds()); + EXPECT_EQ(8, settings.max_downloads()); + EXPECT_EQ(0, settings.max_extractions()); +- EXPECT_EQ(10, settings.extraction_timeout()); ++ EXPECT_EQ(20, settings.extraction_timeout()); + EXPECT_EQ(10, settings.max_backlog()); + EXPECT_FALSE(settings.trace_client()); + EXPECT_EQ(1, settings.log_level()); +-- +2.47.1 + diff --git a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix index c6ba7ef33a0b..3f00b43fcbfc 100644 --- a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix @@ -53,6 +53,10 @@ stdenv.mkDerivation (finalAttrs: { ./1003-doc-liblomiri-thumbnailer-qt-examples-Drop-qt5_use_m.patch ./1004-Re-enable-coverge-reporting.patch ./1005-Make-GTest-available-to-example-test.patch + + # In aarch64 lomiri-gallery-app VM tests, default 10s timeout for thumbnail extractor is often too tight + # Raise to 20s to work around this (too much more will run into D-Bus' call timeout) + ./2001-Raise-default-extraction-timeout.patch ]; postPatch = '' From b1ffdffb010759f842ac20b1db4f81e941c2bcd7 Mon Sep 17 00:00:00 2001 From: PerchunPak Date: Fri, 24 Jan 2025 12:40:22 +0100 Subject: [PATCH 0432/2168] vimPlugins: disallow packaging plugins that are already in luaPackages --- .../editors/vim/plugins/generated.nix | 230 ++---------------- .../editors/vim/plugins/overrides.nix | 90 ++++--- .../editors/vim/plugins/update.py | 2 + .../editors/vim/plugins/vim-plugin-names | 13 - 4 files changed, 64 insertions(+), 271 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index c0758b97c7c7..fa5d7c772e4a 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1420,18 +1420,7 @@ final: prev: sha256 = "17c41flnjp25c5gry4lq8ik8mk3pbh1qwj86rby57jr4f4wvfykk"; }; meta.homepage = "https://github.com/Kaiser-Yang/blink-cmp-dictionary/"; - }; - - blink-cmp-spell = buildVimPlugin { - pname = "blink-cmp-spell"; - version = "2025-02-01"; - src = fetchFromGitHub { - owner = "ribru17"; - repo = "blink-cmp-spell"; - rev = "38d6797dea6f72baa6e8b3bfca6da96d8fcac64d"; - sha256 = "19pnasa446iiapgsr3z2fpk0nnrzh8g5wrzrq8n0y4q0z6spc9f6"; - }; - meta.homepage = "https://github.com/ribru17/blink-cmp-spell/"; + meta.hydraPlatforms = [ ]; }; blink-cmp-git = buildVimPlugin { @@ -1444,6 +1433,20 @@ final: prev: sha256 = "08hfwnjgsl88bkphpdxkdswdnc10mlxpsrk084kgzk4j19w55gyq"; }; meta.homepage = "https://github.com/Kaiser-Yang/blink-cmp-git/"; + meta.hydraPlatforms = [ ]; + }; + + blink-cmp-spell = buildVimPlugin { + pname = "blink-cmp-spell"; + version = "2025-02-01"; + src = fetchFromGitHub { + owner = "ribru17"; + repo = "blink-cmp-spell"; + rev = "38d6797dea6f72baa6e8b3bfca6da96d8fcac64d"; + sha256 = "19pnasa446iiapgsr3z2fpk0nnrzh8g5wrzrq8n0y4q0z6spc9f6"; + }; + meta.homepage = "https://github.com/ribru17/blink-cmp-spell/"; + meta.hydraPlatforms = [ ]; }; blink-compat = buildVimPlugin { @@ -1664,6 +1667,7 @@ final: prev: sha256 = "1s0zmpwg7z76l3ca1p426mkh33cw94m18q7rfsvnz4h4xwlsafpa"; }; meta.homepage = "https://github.com/kwkarlwang/bufresize.nvim/"; + meta.hydraPlatforms = [ ]; }; bullets-vim = buildVimPlugin { @@ -3315,6 +3319,7 @@ final: prev: sha256 = "06h388vkp8nv15wbh96pza85994xf979s7kjqrli4s6y5ygw6m02"; }; meta.homepage = "https://github.com/netmute/ctags-lsp.nvim/"; + meta.hydraPlatforms = [ ]; }; ctrlp-cmatcher = buildVimPlugin { @@ -4530,19 +4535,6 @@ final: prev: meta.hydraPlatforms = [ ]; }; - fidget-nvim = buildNeovimPlugin { - pname = "fidget.nvim"; - version = "2025-01-08"; - src = fetchFromGitHub { - owner = "j-hui"; - repo = "fidget.nvim"; - rev = "a0abbf18084b77d28bc70e24752e4f4fd54aea17"; - sha256 = "1117w5i7996vxx32vibb09zpzzgwaipj5ldkdgck3ds5vkcdlk53"; - }; - meta.homepage = "https://github.com/j-hui/fidget.nvim/"; - meta.hydraPlatforms = [ ]; - }; - file-line = buildVimPlugin { pname = "file-line"; version = "2016-10-21"; @@ -5104,19 +5096,6 @@ final: prev: meta.hydraPlatforms = [ ]; }; - gitsigns-nvim = buildNeovimPlugin { - pname = "gitsigns.nvim"; - version = "2025-01-24"; - src = fetchFromGitHub { - owner = "lewis6991"; - repo = "gitsigns.nvim"; - rev = "d8918f06624dd53b9a82bd0e29c31bcfd541b40d"; - sha256 = "19j7y5z9sz967rcyk4lxb3l5z3rrk07fi6wakvxqnwqwqvag4x9x"; - }; - meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; - meta.hydraPlatforms = [ ]; - }; - gitv = buildVimPlugin { pname = "gitv"; version = "2019-08-22"; @@ -5899,19 +5878,6 @@ final: prev: meta.hydraPlatforms = [ ]; }; - image-nvim = buildNeovimPlugin { - pname = "image.nvim"; - version = "2025-01-17"; - src = fetchFromGitHub { - owner = "3rd"; - repo = "image.nvim"; - rev = "6ffafab2e98b5bda46bf227055aa84b90add8cdc"; - sha256 = "105k4ccv18nynm70lphb4ac3ih1ad4hlh2syrhmyi1i1jwdirjgz"; - }; - meta.homepage = "https://github.com/3rd/image.nvim/"; - meta.hydraPlatforms = [ ]; - }; - img-clip-nvim = buildVimPlugin { pname = "img-clip.nvim"; version = "2025-01-24"; @@ -7111,20 +7077,6 @@ final: prev: meta.hydraPlatforms = [ ]; }; - luasnip = buildNeovimPlugin { - pname = "luasnip"; - version = "2025-01-04"; - src = fetchFromGitHub { - owner = "l3mon4d3"; - repo = "luasnip"; - rev = "c9b9a22904c97d0eb69ccb9bab76037838326817"; - sha256 = "1m9a2vka968yklknp8fcmg5lz7w0lb7rwn13b0ppy89ixy0mjxj5"; - fetchSubmodules = true; - }; - meta.homepage = "https://github.com/l3mon4d3/luasnip/"; - meta.hydraPlatforms = [ ]; - }; - luasnip-latex-snippets-nvim = buildVimPlugin { pname = "luasnip-latex-snippets.nvim"; version = "2024-11-25"; @@ -7151,19 +7103,6 @@ final: prev: meta.hydraPlatforms = [ ]; }; - lush-nvim = buildNeovimPlugin { - pname = "lush.nvim"; - version = "2024-08-16"; - src = fetchFromGitHub { - owner = "rktjmp"; - repo = "lush.nvim"; - rev = "45a79ec4acb5af783a6a29673a999ce37f00497e"; - sha256 = "0ac93sdhsi41hpwpshffpkvj5c3kklflsy0pln77743x69g05rcr"; - }; - meta.homepage = "https://github.com/rktjmp/lush.nvim/"; - meta.hydraPlatforms = [ ]; - }; - lushtags = buildVimPlugin { pname = "lushtags"; version = "2017-04-19"; @@ -8072,6 +8011,7 @@ final: prev: sha256 = "06d7s9949aylda4vq36h4s9hnnp3lycwm2nrjid5vxb98gy3d3xn"; }; meta.homepage = "https://github.com/milanglacier/minuet-ai.nvim/"; + meta.hydraPlatforms = [ ]; }; mkdir-nvim = buildVimPlugin { @@ -8763,19 +8703,6 @@ final: prev: meta.hydraPlatforms = [ ]; }; - neotest = buildNeovimPlugin { - pname = "neotest"; - version = "2025-01-02"; - src = fetchFromGitHub { - owner = "nvim-neotest"; - repo = "neotest"; - rev = "d66cf4e05a116957f0d3a7755a24291c7d1e1f72"; - sha256 = "09bxarrrfnqvyv22ls6lm0y03ngcp6r372b8hy4rld902psdb11q"; - }; - meta.homepage = "https://github.com/nvim-neotest/neotest/"; - meta.hydraPlatforms = [ ]; - }; - neotest-bash = buildVimPlugin { pname = "neotest-bash"; version = "2024-05-06"; @@ -9507,19 +9434,6 @@ final: prev: meta.hydraPlatforms = [ ]; }; - nui-nvim = buildNeovimPlugin { - pname = "nui.nvim"; - version = "2024-12-10"; - src = fetchFromGitHub { - owner = "MunifTanjim"; - repo = "nui.nvim"; - rev = "53e907ffe5eedebdca1cd503b00aa8692068ca46"; - sha256 = "1m4vlf9qcs01a8qrq3salcz966sp8cpf01gbrg8dbf255vzc8kp9"; - }; - meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; - meta.hydraPlatforms = [ ]; - }; - null-ls-nvim = buildVimPlugin { pname = "null-ls.nvim"; version = "2023-08-12"; @@ -9689,19 +9603,6 @@ final: prev: meta.hydraPlatforms = [ ]; }; - nvim-cmp = buildNeovimPlugin { - pname = "nvim-cmp"; - version = "2025-01-23"; - src = fetchFromGitHub { - owner = "hrsh7th"; - repo = "nvim-cmp"; - rev = "12509903a5723a876abd65953109f926f4634c30"; - sha256 = "0a592vvfbyv1y1j9bbiq7wxy0vp63bwngjav0qkm0czdf8y4b3kb"; - }; - meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; - meta.hydraPlatforms = [ ]; - }; - nvim-code-action-menu = buildVimPlugin { pname = "nvim-code-action-menu"; version = "2023-12-11"; @@ -10417,19 +10318,6 @@ final: prev: meta.hydraPlatforms = [ ]; }; - nvim-nio = buildNeovimPlugin { - pname = "nvim-nio"; - version = "2025-01-20"; - src = fetchFromGitHub { - owner = "nvim-neotest"; - repo = "nvim-nio"; - rev = "21f5324bfac14e22ba26553caf69ec76ae8a7662"; - sha256 = "1bz5msxwk232zkkhfxcmr7a665la8pgkdx70q99ihl4x04jg6dkq"; - }; - meta.homepage = "https://github.com/nvim-neotest/nvim-nio/"; - meta.hydraPlatforms = [ ]; - }; - nvim-nonicons = buildVimPlugin { pname = "nvim-nonicons"; version = "2023-02-04"; @@ -11367,19 +11255,6 @@ final: prev: meta.hydraPlatforms = [ ]; }; - orgmode = buildNeovimPlugin { - pname = "orgmode"; - version = "2025-01-26"; - src = fetchFromGitHub { - owner = "nvim-orgmode"; - repo = "orgmode"; - rev = "98bf44d0adfaa04bd02c0ae630b182fba892cbbd"; - sha256 = "08rryqbqynaw0c8rqy7j22adyplm091x2qhxbfzq39qi15h4b2dp"; - }; - meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; - meta.hydraPlatforms = [ ]; - }; - other-nvim = buildVimPlugin { pname = "other.nvim"; version = "2024-11-30"; @@ -11524,19 +11399,6 @@ final: prev: meta.hydraPlatforms = [ ]; }; - papis-nvim = buildNeovimPlugin { - pname = "papis.nvim"; - version = "2025-01-27"; - src = fetchFromGitHub { - owner = "jghauser"; - repo = "papis.nvim"; - rev = "77e4e489ce1adfbc27b41f57a444ca2828f367c5"; - sha256 = "1qwihqd0lkj22k0vvwxi6g7shiys86y7wb85f1771b8hvals2qwx"; - }; - meta.homepage = "https://github.com/jghauser/papis.nvim/"; - meta.hydraPlatforms = [ ]; - }; - parpar-nvim = buildVimPlugin { pname = "parpar.nvim"; version = "2023-09-12"; @@ -11693,19 +11555,6 @@ final: prev: meta.hydraPlatforms = [ ]; }; - plenary-nvim = buildNeovimPlugin { - pname = "plenary.nvim"; - version = "2025-01-12"; - src = fetchFromGitHub { - owner = "nvim-lua"; - repo = "plenary.nvim"; - rev = "3707cdb1e43f5cea73afb6037e6494e7ce847a66"; - sha256 = "1h73y4ahj8rf6qiyjkm3jw9158fbkiix4kzig78jknvq8vgdgk6p"; - }; - meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; - meta.hydraPlatforms = [ ]; - }; - poimandres-nvim = buildVimPlugin { pname = "poimandres.nvim"; version = "2024-10-19"; @@ -12307,20 +12156,6 @@ final: prev: meta.hydraPlatforms = [ ]; }; - rest-nvim = buildNeovimPlugin { - pname = "rest.nvim"; - version = "2025-01-01"; - src = fetchFromGitHub { - owner = "rest-nvim"; - repo = "rest.nvim"; - rev = "62606c3599bd304227457d6e20580965939b191e"; - sha256 = "0rbp8fq0ya2rx9njxs9ynrrw4pv50rpkd1lfvvw2p1c06xr63a75"; - fetchSubmodules = true; - }; - meta.homepage = "https://github.com/rest-nvim/rest.nvim/"; - meta.hydraPlatforms = [ ]; - }; - restore-view-vim = buildVimPlugin { pname = "restore-view-vim"; version = "2014-11-21"; @@ -13662,6 +13497,7 @@ final: prev: sha256 = "18m46gj68xv6basaqzbschr60sc9xzi4dx21cvnx401bk97cqpgi"; }; meta.homepage = "https://github.com/xiyaowong/telescope-emoji.nvim/"; + meta.hydraPlatforms = [ ]; }; telescope-file-browser-nvim = buildVimPlugin { @@ -13766,6 +13602,7 @@ final: prev: sha256 = "0n1mdiwkkciqpxjad1nngrc7px5yziyan0daxgs9jsgdqmy1lzp8"; }; meta.homepage = "https://github.com/ghassan0/telescope-glyph.nvim/"; + meta.hydraPlatforms = [ ]; }; telescope-live-grep-args-nvim = buildVimPlugin { @@ -13794,19 +13631,6 @@ final: prev: meta.hydraPlatforms = [ ]; }; - telescope-manix = buildNeovimPlugin { - pname = "telescope-manix"; - version = "2025-01-26"; - src = fetchFromGitHub { - owner = "MrcJkb"; - repo = "telescope-manix"; - rev = "fce4719aecfefdc7ddd15b1b82136d75f7994a4c"; - sha256 = "1v5a60smjyrfsmwmjnpbapzskzf705lknn3ii7lw90xav82dj9sp"; - }; - meta.homepage = "https://github.com/MrcJkb/telescope-manix/"; - meta.hydraPlatforms = [ ]; - }; - telescope-media-files-nvim = buildVimPlugin { pname = "telescope-media-files.nvim"; version = "2023-02-19"; @@ -13820,19 +13644,6 @@ final: prev: meta.hydraPlatforms = [ ]; }; - telescope-nvim = buildNeovimPlugin { - pname = "telescope.nvim"; - version = "2025-01-08"; - src = fetchFromGitHub { - owner = "nvim-telescope"; - repo = "telescope.nvim"; - rev = "415af52339215926d705cccc08145f3782c4d132"; - sha256 = "1hzyqax197i36a6z1rm25grwbl0r7k3qwhybjils20lshanjqbz7"; - }; - meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; - meta.hydraPlatforms = [ ]; - }; - telescope-project-nvim = buildVimPlugin { pname = "telescope-project.nvim"; version = "2024-12-01"; @@ -14052,6 +13863,7 @@ final: prev: sha256 = "0bp6m6b7bsw9d4iyn1b8bw3avnvjlk7pi8h941m68fw54n3mf06f"; }; meta.homepage = "https://github.com/rebelot/terminal.nvim/"; + meta.hydraPlatforms = [ ]; }; terminus = buildVimPlugin { diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 5be981762200..a22e1dd11e0f 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1222,7 +1222,7 @@ in fzf-lua = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.fzf-lua; - propagatedBuildInputs = [ fzf ]; + runtimeDeps = [ fzf ]; }; fzf-vim = super.fzf-vim.overrideAttrs { @@ -1630,10 +1630,6 @@ in dependencies = [ self.plenary-nvim ]; }; - lsp-progress-nvim = neovimUtils.buildNeovimPlugin { - luaAttr = luaPackages.lsp-progress-nvim; - }; - lsp_lines-nvim = callPackage ./non-generated/lsp_lines-nvim { }; lspecho-nvim = super.lspecho-nvim.overrideAttrs { @@ -1671,18 +1667,6 @@ in checkInputs = [ self.luasnip ]; }; - lz-n = neovimUtils.buildNeovimPlugin { - luaAttr = luaPackages.lz-n; - }; - - lze = neovimUtils.buildNeovimPlugin { - luaAttr = luaPackages.lze; - }; - - lzn-auto-require = neovimUtils.buildNeovimPlugin { - luaAttr = luaPackages.lzn-auto-require; - }; - magma-nvim = super.magma-nvim.overrideAttrs { passthru.python3Dependencies = ps: with ps; [ @@ -1729,7 +1713,7 @@ in }; markid = super.markid.overrideAttrs { - dependencies = with super; [ nvim-treesitter ]; + dependencies = [ self.nvim-treesitter ]; }; mason-lspconfig-nvim = super.mason-lspconfig-nvim.overrideAttrs { @@ -1773,10 +1757,6 @@ in meta.maintainers = with lib.maintainers; [ vcunat ]; }; - middleclass = neovimUtils.buildNeovimPlugin { - luaAttr = luaPackages.middleclass; - }; - mind-nvim = super.mind-nvim.overrideAttrs { dependencies = [ self.plenary-nvim ]; }; @@ -1920,12 +1900,6 @@ in ]; }; - neorg = neovimUtils.buildNeovimPlugin { - luaAttr = luaPackages.neorg; - - doInstallCheck = true; - }; - neorg-telescope = super.neorg-telescope.overrideAttrs { buildInputs = [ luaPackages.lua-utils-nvim ]; dependencies = with self; [ @@ -2743,14 +2717,9 @@ in ]; }; - # TODO: runtimedeps - plenary-nvim = super.plenary-nvim.overrideAttrs { - postPatch = '' - sed -Ei lua/plenary/curl.lua \ - -e 's@(command\s*=\s*")curl(")@\1${curl}/bin/curl\2@' - ''; - - doInstallCheck = true; + plenary-nvim = neovimUtils.buildNeovimPlugin { + luaAttr = luaPackages.plenary-nvim; + runtimeDeps = [ curl ]; }; poimandres-nvim = super.poimandres-nvim.overrideAttrs { @@ -2858,18 +2827,6 @@ in ]; }; - rocks-nvim = neovimUtils.buildNeovimPlugin { - luaAttr = luaPackages.rocks-nvim; - }; - - rocks-config-nvim = neovimUtils.buildNeovimPlugin { - luaAttr = luaPackages.rocks-config-nvim; - }; - - rtp-nvim = neovimUtils.buildNeovimPlugin { - luaAttr = luaPackages.rtp-nvim; - }; - rustaceanvim = neovimUtils.buildNeovimPlugin { checkInputs = [ # Optional integration @@ -3018,7 +2975,7 @@ in }; startup-nvim = super.startup-nvim.overrideAttrs { - dependencies = with super; [ plenary-nvim ]; + dependencies = [ self.plenary-nvim ]; }; statix = buildVimPlugin rec { @@ -4062,3 +4019,38 @@ in in lib.genAttrs nodePackageNames nodePackage2VimPackage ) +// ( + let + luarocksPackageNames = [ + "fidget-nvim" + "gitsigns-nvim" + "image-nvim" + "lsp-progress-nvim" + "luasnip" + "lush-nvim" + "lz-n" + "lze" + "lzn-auto-require" + "middleclass" + "neorg" + "neotest" + "nui-nvim" + "nvim-cmp" + "nvim-nio" + "orgmode" + "papis-nvim" + "rest-nvim" + "rocks-config-nvim" + "rocks-nvim" + "rtp-nvim" + "telescope-manix" + "telescope-nvim" + ]; + toVimPackage = + name: + neovimUtils.buildNeovimPlugin { + luaAttr = luaPackages.${name}; + }; + in + lib.genAttrs luarocksPackageNames toVimPackage +) diff --git a/pkgs/applications/editors/vim/plugins/update.py b/pkgs/applications/editors/vim/plugins/update.py index 1c449967b12d..a973a1919eff 100755 --- a/pkgs/applications/editors/vim/plugins/update.py +++ b/pkgs/applications/editors/vim/plugins/update.py @@ -103,6 +103,8 @@ class VimEditor(pluginupdate.Editor): def plugin2nix( self, pdesc: PluginDesc, plugin: pluginupdate.Plugin, isNeovim: bool ) -> str: + if isNeovim: + raise RuntimeError(f"Plugin {plugin.name} is already packaged in `luaPackages`, please use that") repo = pdesc.repo content = f" {plugin.normalized_name} = " diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index bcc627f512ec..b6478e0959ae 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -346,7 +346,6 @@ https://github.com/lilydjwg/fcitx.vim/,fcitx5, https://github.com/freddiehaddad/feline.nvim/,, https://github.com/bakpakin/fennel.vim/,, https://github.com/wincent/ferret/,, -https://github.com/j-hui/fidget.nvim/,, https://github.com/bogado/file-line/,, https://github.com/lewis6991/fileline.nvim/,, https://github.com/glacambre/firenvim/,HEAD, @@ -390,7 +389,6 @@ https://github.com/ThePrimeagen/git-worktree.nvim/,, https://github.com/wintermute-cell/gitignore.nvim/,HEAD, https://github.com/vim-scripts/gitignore.vim/,, https://github.com/ruifm/gitlinker.nvim/,, -https://github.com/lewis6991/gitsigns.nvim/,, https://github.com/gregsexton/gitv/,, https://github.com/DNLHC/glance.nvim/,HEAD, https://github.com/gleam-lang/gleam.vim/,, @@ -451,7 +449,6 @@ https://github.com/cocopon/iceberg.vim/,, https://github.com/idris-hackers/idris-vim/,, https://github.com/idris-community/idris2-nvim/,, https://github.com/edwinb/idris2-vim/,, -https://github.com/3rd/image.nvim/,HEAD, https://github.com/HakonHarnes/img-clip.nvim/,HEAD, https://github.com/lewis6991/impatient.nvim/,, https://github.com/backdround/improved-search.nvim/,HEAD, @@ -544,10 +541,8 @@ https://github.com/barreiroleo/ltex_extra.nvim/,HEAD, https://github.com/nvim-java/lua-async/,HEAD, https://github.com/arkav/lualine-lsp-progress/,, https://github.com/nvim-lualine/lualine.nvim/,, -https://github.com/l3mon4d3/luasnip/,, https://github.com/evesdropper/luasnip-latex-snippets.nvim/,HEAD, https://github.com/alvarosevilla95/luatab.nvim/,, -https://github.com/rktjmp/lush.nvim/,, https://github.com/mkasa/lushtags/,, https://github.com/Bilal2453/luvit-meta/,HEAD, https://github.com/dccsillag/magma-nvim/,HEAD, @@ -671,7 +666,6 @@ https://github.com/karb94/neoscroll.nvim/,, https://github.com/Shougo/neosnippet-snippets/,, https://github.com/Shougo/neosnippet.vim/,, https://github.com/kassio/neoterm/,, -https://github.com/nvim-neotest/neotest/,HEAD, https://github.com/rcasia/neotest-bash/,HEAD, https://github.com/sidlatau/neotest-dart/,HEAD, https://github.com/MarkEmmons/neotest-deno/,HEAD, @@ -728,7 +722,6 @@ https://github.com/shaunsingh/nord.nvim/,, https://github.com/andersevenrud/nordic.nvim/,, https://github.com/vigoux/notifier.nvim/,HEAD, https://github.com/jlesquembre/nterm.nvim/,, -https://github.com/MunifTanjim/nui.nvim/,main, https://github.com/jose-elias-alvarez/null-ls.nvim/,, https://github.com/nacro90/numb.nvim/,, https://github.com/nvchad/nvchad/,HEAD, @@ -796,7 +789,6 @@ https://github.com/gpanders/nvim-moonwalk/,, https://github.com/SmiteshP/nvim-navbuddy/,, https://github.com/smiteshp/nvim-navic/,HEAD, https://github.com/AckslD/nvim-neoclip.lua/,, -https://github.com/nvim-neotest/nvim-nio/,HEAD, https://github.com/ya2s/nvim-nonicons/,, https://github.com/rcarriga/nvim-notify/,, https://github.com/LhKipp/nvim-nu/,HEAD, @@ -869,7 +861,6 @@ https://github.com/tyru/open-browser-github.vim/,, https://github.com/tyru/open-browser.vim/,, https://github.com/Almo7aya/openingh.nvim/,, https://github.com/salkin-mada/openscad.nvim/,HEAD, -https://github.com/nvim-orgmode/orgmode/,, https://github.com/rgroli/other.nvim/,HEAD, https://github.com/jmbuhr/otter.nvim/,, https://github.com/hedyhli/outline.nvim/,HEAD, @@ -881,7 +872,6 @@ https://github.com/drewtempelmeyer/palenight.vim/,, https://github.com/JoosepAlviste/palenightfall.nvim/,, https://github.com/roobert/palette.nvim/,HEAD, https://github.com/NLKNguyen/papercolor-theme/,, -https://github.com/jghauser/papis.nvim/,HEAD, https://github.com/dundalek/parpar.nvim/,, https://github.com/tmsvg/pear-tree/,, https://github.com/steelsojka/pears.nvim/,, @@ -894,7 +884,6 @@ https://github.com/motus/pig.vim/,, https://github.com/weirongxu/plantuml-previewer.vim/,HEAD, https://github.com/aklt/plantuml-syntax/,, https://github.com/nvim-treesitter/playground/,, -https://github.com/nvim-lua/plenary.nvim/,, https://github.com/olivercederborg/poimandres.nvim/,HEAD, https://github.com/epwalsh/pomo.nvim/,HEAD, https://github.com/dleonard0/pony-vim-syntax/,, @@ -941,7 +930,6 @@ https://github.com/MeanderingProgrammer/render-markdown.nvim/,, https://github.com/gabrielpoca/replacer.nvim/,HEAD, https://github.com/9seconds/repolink.nvim/,HEAD, https://github.com/stevearc/resession.nvim/,HEAD, -https://github.com/rest-nvim/rest.nvim/,, https://github.com/vim-scripts/restore_view.vim/,HEAD,restore-view-vim https://github.com/gu-fan/riv.vim/,, https://github.com/kevinhwang91/rnvimr/,, @@ -1068,7 +1056,6 @@ https://github.com/tom-anders/telescope-vim-bookmarks.nvim/,, https://github.com/nvim-telescope/telescope-z.nvim/,, https://github.com/natecraddock/telescope-zf-native.nvim/,HEAD, https://github.com/jvgrootveld/telescope-zoxide/,, -https://github.com/nvim-telescope/telescope.nvim/,, https://github.com/luc-tielen/telescope_hoogle/,HEAD, https://github.com/joerdav/templ.vim/,HEAD, https://github.com/axelvc/template-string.nvim/,HEAD, From b90176a221626c6c7e2449673da089b9586ee035 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Feb 2025 23:00:05 +0000 Subject: [PATCH 0433/2168] python312Packages.niaclass: 0.2.2 -> 0.2.3 --- pkgs/development/python-modules/niaclass/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/niaclass/default.nix b/pkgs/development/python-modules/niaclass/default.nix index aeb0b7099110..fd89e1a88422 100644 --- a/pkgs/development/python-modules/niaclass/default.nix +++ b/pkgs/development/python-modules/niaclass/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "niaclass"; - version = "0.2.2"; + version = "0.2.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "firefly-cpp"; repo = "NiaClass"; tag = version; - hash = "sha256-2VNLXVciWInkZwk9O+U+6oU+FOVQx3InV4UVgny/B6I="; + hash = "sha256-cowB+nBb5vH2ntLrcctqICYcf3I4m8rw3g4vO3/rokw="; }; pythonRelaxDeps = [ @@ -55,7 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Framework for solving classification tasks using Nature-inspired algorithms"; homepage = "https://github.com/firefly-cpp/NiaClass"; - changelog = "https://github.com/firefly-cpp/NiaClass/releases/tag/${version}"; + changelog = "https://github.com/firefly-cpp/NiaClass/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ firefly-cpp ]; }; From 332c7fe132f90964639167721464d93aa25abf09 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Feb 2025 23:00:54 +0000 Subject: [PATCH 0434/2168] python312Packages.python-gvm: 25.1.1 -> 26.0.0 --- pkgs/development/python-modules/python-gvm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-gvm/default.nix b/pkgs/development/python-modules/python-gvm/default.nix index bf20f271b584..31dfd6863ab9 100644 --- a/pkgs/development/python-modules/python-gvm/default.nix +++ b/pkgs/development/python-modules/python-gvm/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "python-gvm"; - version = "25.1.1"; + version = "26.0.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = "python-gvm"; tag = "v${version}"; - hash = "sha256-z78JnyAyWqNqFGuauIXitPO0D0WtHicBlD6Jno4G74Y="; + hash = "sha256-KJiyOaoRjiMlYi50iPtJXGlQ3KYS2gYA+Q5NRSn/ATI="; }; build-system = [ poetry-core ]; From 7098d5322ac8915cb2a06cf88c78204d9dc2eee2 Mon Sep 17 00:00:00 2001 From: networkException Date: Sat, 8 Feb 2025 00:04:31 +0100 Subject: [PATCH 0435/2168] ungoogled-chromium: 132.0.6834.159-1 -> 133.0.6943.53-1 https://chromereleases.googleblog.com/2025/02/stable-channel-update-for-desktop.html This update includes 12 security fixes. CVEs: CVE-2025-0444 CVE-2025-0445 CVE-2025-0451 --- .../networking/browsers/chromium/info.json | 325 ++++++++++-------- 1 file changed, 175 insertions(+), 150 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index 294733def83d..ec6ffb4603a7 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -791,53 +791,53 @@ } }, "ungoogled-chromium": { - "version": "132.0.6834.159", + "version": "133.0.6943.53", "deps": { "depot_tools": { - "rev": "41d43a2a2290450aeab946883542f8049b155c87", - "hash": "sha256-m/6b4VZZTUQOeED1mYvZOQCx8Re+Zd4O8SKDMjJ9Djo=" + "rev": "423f1e1914ab4aa7b2bdf804e216d4c097853ba2", + "hash": "sha256-R7cGQLM6yJgFL43UO+zAGbq+9XEbKbtJVFRwdIUB1F8=" }, "gn": { - "rev": "feafd1012a32c05ec6095f69ddc3850afb621f3a", - "hash": "sha256-zZoD5Bx7wIEP2KJkHef6wHrxU3px+8Vseq29QcK32bg=" + "rev": "c97a86a72105f3328a540f5a5ab17d11989ab7dd", + "hash": "sha256-T2dcISln9WCODoI/LsE2ldkRfFdMwVOmqqjQinAmZss=" }, "ungoogled-patches": { - "rev": "132.0.6834.159-1", - "hash": "sha256-sot7YixPnt8ALPR2IIPgR1NtN/Oc14qlzyB3Vny+DAM=" + "rev": "133.0.6943.53-1", + "hash": "sha256-8n0BST0sqQRcfv0lCiEflrvyxt8Agj/kK0O2fVzWqCY=" }, - "npmHash": "sha256-H1/h3x+Cgp1x94Ze3UPPHxRVpylZDvpMXMOuS+jk2dw=" + "npmHash": "sha256-oVoTruhxTymYiGkELd2Oa1wOfjGLtChQZozP4GzOO1A=" }, "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "2d77d3fc4452661469b78f115e0aed4d71269739", - "hash": "sha256-LbLIxN13fx6zzU5xzGvkTpw7tKRQBel2PYhflHLbWE8=", + "rev": "9a80935019b0925b01cc21d254da203bc3986f04", + "hash": "sha256-doJ/HygMtLxr04S73lhs5kTt8qC7SHrCxHbjAoFPv2M=", "recompress": true }, "src/third_party/clang-format/script": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git", - "rev": "3c0acd2d4e73dd911309d9e970ba09d58bf23a62", - "hash": "sha256-whD8isX2ZhLrFzdxHhFP1S/sZDRgyrzLFaVd7OEFqYo=" + "rev": "37f6e68a107df43b7d7e044fd36a13cbae3413f2", + "hash": "sha256-d9uweklBffiuCWEb03ti1eFLnMac2qRtvggzXY1n/RU=" }, "src/third_party/libc++/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git", - "rev": "8e31ad42561900383e10dbefc1d3e8f38cedfbe9", - "hash": "sha256-kmhTlz/qjvN0Qlra7Wz05O6X058hPPn0nVvAxFXQDC4=" + "rev": "1f7db7501cf902d5d3ad5fd9b31bea33bb8bf9da", + "hash": "sha256-d1Am+7O7KYKEfs9HpAHlw6n6nWpd219gw2Cr5RaBl7w=" }, "src/third_party/libc++abi/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git", - "rev": "cec7f478354a8c8599f264ed8bb6043b5468f72d", - "hash": "sha256-CwiK9Td8aRS08RywItHKFvibzDAUYYd0YNRKxYPLTD8=" + "rev": "83dfa1f5bfce32d5f75695542468e37ead8163b8", + "hash": "sha256-SUpg+lGtjchvh2CejKEIADAo6ozvHYj2BxzMcMZODCw=" }, "src/third_party/libunwind/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git", - "rev": "5b01ea4a6f3b666b7d190e7cb7c31db2ed4d94ce", - "hash": "sha256-uA+t5Ecc/iK3mllHR8AMVGRfU/7z1G3yrw0TamPQiOY=" + "rev": "d1e95b102f113ded38974cf06a65fe0457b6004b", + "hash": "sha256-cRqctLgtiqODZf3B8ZIA2wJWCiEsuYTH24ppFtzDh3M=" }, "src/third_party/llvm-libc/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git", - "rev": "ca74a72e2b32ad804522bbef04dfe32560a10206", - "hash": "sha256-av9JdqLOQbezgRS4P8QXmvfB5l47v04WRagNJJgT5u4=" + "rev": "039fea2058d14b408637a931b36a717169617227", + "hash": "sha256-Uf9DfH62xWzcOsvaekeqXiwsIaIJMFK7kXK82ReY66Y=" }, "src/chrome/test/data/perf/canvas_bench": { "url": "https://chromium.googlesource.com/chromium/canvas_bench.git", @@ -856,18 +856,18 @@ }, "src/docs/website": { "url": "https://chromium.googlesource.com/website.git", - "rev": "be9c3dfd3781964fc0bab0d6c91d9ad117b71b02", - "hash": "sha256-CqveHvjPEcRWnzi8w13xr2OainrmABNO8uj0GzKmQqo=" + "rev": "4d214097ba7305ec2b3f2dfcf0aa4fd2104c960a", + "hash": "sha256-QvwWHVdLnDqJ6hz0Eli5AnM5gaXDya0En7BIm4vlm6c=" }, "src/media/cdm/api": { "url": "https://chromium.googlesource.com/chromium/cdm.git", - "rev": "eb21edc44e8e5a82095037be80c8b15c51624293", - "hash": "sha256-6J6aSYW0or99VAgMNJJOdJqMJspoG7w1HxDN50MV5bw=" + "rev": "06395a2863cb1ebdb47617a995b73f95c14fe120", + "hash": "sha256-bx0zCgqgGPjm3wjo8Y3T5kWp14WW9uoDtvn5+QOAPw0=" }, "src/net/third_party/quiche/src": { "url": "https://quiche.googlesource.com/quiche.git", - "rev": "9616efc903b7469161996006c8cf963238e26503", - "hash": "sha256-Z2uFWfZDYcY0m4R6mFMZJLnnVHu3/hQOAkCPQ5049SQ=" + "rev": "981c424462d9e5210dc843e92b325c93d3bee4e9", + "hash": "sha256-O/3qN0pCHSzTURuqzk4schY+aRgRCHHbaTVzbQl3ur4=" }, "src/testing/libfuzzer/fuzzers/wasm_corpus": { "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git", @@ -881,8 +881,8 @@ }, "src/third_party/angle": { "url": "https://chromium.googlesource.com/angle/angle.git", - "rev": "ce13a00a2b049a1ef5e0e70a3d333ce70838ef7b", - "hash": "sha256-fMIHpa2QFsQQ19LGyhvV3Ihh6Ls8wwwhqTtpLoTEaf4=" + "rev": "8304737811a7851e2bfdcf6f667b68dbac4e962a", + "hash": "sha256-kjBkeTaZ0aCpMVyHOJLK5mbGBMB5xG1bnx7pr6d92jc=" }, "src/third_party/angle/third_party/glmark2/src": { "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2", @@ -896,8 +896,8 @@ }, "src/third_party/angle/third_party/VK-GL-CTS/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS", - "rev": "f674555ab03e6355e0981a647c115097e9fe5324", - "hash": "sha256-2ZhG4cJf85zO7x+SGG6RD2qgOxZVosxAIbuZt9GYUKs=" + "rev": "9509eb274dfec320e970d4c85e17ecf15f27ebe3", + "hash": "sha256-EZBAJP6puSn1vIO+JRPzZkp+uftneyga0zOXpf0W2os=" }, "src/third_party/anonymous_tokens/src": { "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git", @@ -911,13 +911,13 @@ }, "src/third_party/dav1d/libdav1d": { "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git", - "rev": "93f12c117a4e1c0cc2b129dcc52e84dbd9b84200", - "hash": "sha256-Q2CaWvDqOmfaPG6a+SUHG5rFHalPEf4Oq/ytT3xuSOk=" + "rev": "b129d9f2cb897cedba77a60bd5e3621c14ee5484", + "hash": "sha256-79NsUzY9fxOXlzwutAF80salew+uVHsadj2BgtEQbfo=" }, "src/third_party/dawn": { "url": "https://dawn.googlesource.com/dawn.git", - "rev": "73dbf565079c89a531e6e01c4e8fc048a8a9660b", - "hash": "sha256-6P3Mw60+xZVsFbrhG6UkTlz8xvvEOptV3Ar1sos0CsU=" + "rev": "d4321eef8c5c94107783d903355c1cbbbb8a3776", + "hash": "sha256-28I6Q/Ip6FhlZa2uFuMrW5YJFaDJrv/bc/wztpfO42g=" }, "src/third_party/dawn/third_party/glfw": { "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw", @@ -926,8 +926,8 @@ }, "src/third_party/dawn/third_party/dxc": { "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler", - "rev": "ac36a797d3470e8ee906b98457a59270d01db30d", - "hash": "sha256-rhUNPA5b0H3PBsOpXbAeRLpS0tNQkiHbjRBWmJycSAY=" + "rev": "a8a4e98a2367080af683c48feedd7f7481a31a96", + "hash": "sha256-kc3s0LLYi3rNVTPzKQiX46JqnPkqV98tbVQr7OHuRvs=" }, "src/third_party/dawn/third_party/dxheaders": { "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers", @@ -951,8 +951,8 @@ }, "src/third_party/dawn/third_party/webgpu-cts": { "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts", - "rev": "8690defa74b6975c10e85c113f121d4b2a3f2564", - "hash": "sha256-ArbHGjkHd1sko7gDPFksYz7XHKNge+e6tVy6oKPuqzg=" + "rev": "ba2bd8ab91d41b60b879b134d850d326eb86ef12", + "hash": "sha256-FOHgZOI7w7LzZZ14O72b7B/D/Gkvv/2KCf8+bZEPXNM=" }, "src/third_party/highway/src": { "url": "https://chromium.googlesource.com/external/github.com/google/highway.git", @@ -966,13 +966,13 @@ }, "src/third_party/boringssl/src": { "url": "https://boringssl.googlesource.com/boringssl.git", - "rev": "571c76e919c0c48219ced35bef83e1fc83b00eed", - "hash": "sha256-ib9wbV6S64OFc4zx0wQsQ84+5RxbETK0PS9Wm1BFQ1U=" + "rev": "d777ea2a7004ff7ef40ef983b41a5125f316f898", + "hash": "sha256-GOzeQ6BOXSqpDtgYOIyQae+jCKkqzMsU5N2WE95UR6Q=" }, "src/third_party/breakpad/breakpad": { "url": "https://chromium.googlesource.com/breakpad/breakpad.git", - "rev": "47f7823bdf4b1f39e462b2a497a674860e922e38", - "hash": "sha256-cFXUi2oO/614jF0GV7oW0ss62dXWFHDNWNT8rWHAiQc=" + "rev": "02dd5c3ffbfed2bcbc93b553ed0e90a1ac951cb4", + "hash": "sha256-1JL9QLMycOXvSrwuvqHxYjSxru6qOmrsJIKMAzPId2s=" }, "src/third_party/cast_core/public/src": { "url": "https://chromium.googlesource.com/cast_core/public", @@ -981,8 +981,8 @@ }, "src/third_party/catapult": { "url": "https://chromium.googlesource.com/catapult.git", - "rev": "b91cf840ac3255ef03b23cc93621369627422a1a", - "hash": "sha256-65cZPyqZUdSnYPJYUMYeJgx3mUC6L/qb9P2bDqd2Zkk=" + "rev": "8e5d239c953a309d4bf8aa70481bafa921834cc3", + "hash": "sha256-2sBXPPb9o/YKE9v9W+IxJ7o/6yOzP0q5GZWcWvohUM4=" }, "src/third_party/ced/src": { "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git", @@ -991,8 +991,8 @@ }, "src/third_party/chromium-variations": { "url": "https://chromium.googlesource.com/chromium-variations.git", - "rev": "c170abb48f7715c237f4c06eaed0fe6f8a4c6f8d", - "hash": "sha256-mg5mu2jcy0xyNJ650ywWUMC94keRsqhZQuPZclHmyLI=" + "rev": "0fcd7c5b11aca584c5c03b2af870c9f3af6c631c", + "hash": "sha256-K9saSXK6fCRuRBdX2PPmotO2K3tatiDwuciCDK6O1MU=" }, "src/third_party/cld_3/src": { "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git", @@ -1011,8 +1011,8 @@ }, "src/third_party/cpuinfo/src": { "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git", - "rev": "8df44962d437a0477f07ba6b8843d0b6a48646a4", - "hash": "sha256-FlvmSjY8kt5XHymDLaZdPuZ4k5xcagJk8w/U6adTkWI=" + "rev": "ca156f7bc9109c552973414a63d310f76ef0cbf8", + "hash": "sha256-hIGizsl1NSGySXPI9Xx69xCfQLAMpYviYhBXX201N4o=" }, "src/third_party/crc32c/src": { "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git", @@ -1021,23 +1021,23 @@ }, "src/third_party/cros_system_api": { "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git", - "rev": "554629b9242e6ae832ef14e3384654426f7fcc06", - "hash": "sha256-fvGypRhgl2uX9YE2cwjL7d3pYBa3Imd5p0RLhMYRgrc=" + "rev": "497b90c6e283745f976d783ed2beaafeef42b1bf", + "hash": "sha256-s8ot4NvZfpUbLz/AMNX4F9e78AquKWk/YjguErBZCYE=" }, "src/third_party/crossbench": { "url": "https://chromium.googlesource.com/crossbench.git", - "rev": "ae6f165652e0ea983d73f5d04b7470d08c869e4f", - "hash": "sha256-/K6eM9s+fd2wjCrK0g0CgFNy0zxEN9SxTvmE50hMtXw=" + "rev": "1b41ed2574ef931f2d1157ebb153c9d552f69670", + "hash": "sha256-FgI0D1neQ/jrNaQxMsj2hOM6nF14ZYfGHuqUznRK4Rc=" }, "src/third_party/depot_tools": { "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git", - "rev": "41d43a2a2290450aeab946883542f8049b155c87", - "hash": "sha256-m/6b4VZZTUQOeED1mYvZOQCx8Re+Zd4O8SKDMjJ9Djo=" + "rev": "423f1e1914ab4aa7b2bdf804e216d4c097853ba2", + "hash": "sha256-R7cGQLM6yJgFL43UO+zAGbq+9XEbKbtJVFRwdIUB1F8=" }, "src/third_party/devtools-frontend/src": { "url": "https://chromium.googlesource.com/devtools/devtools-frontend", - "rev": "f2f3682c9db8ca427f8c64f0402cc2c5152c6c24", - "hash": "sha256-mBWZdbgZfO01Pt2lZSHX/d5r+8A/+qCZA8MRtZdeTrs=" + "rev": "41deafc3d1ae776a97d8fd1cfb457a06908e3a6d", + "hash": "sha256-8ev0h+/R1L8VXQqpKJ3zVIQ+kYHKWyNJYcGhPdVhSa4=" }, "src/third_party/dom_distiller_js/dist": { "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git", @@ -1046,8 +1046,8 @@ }, "src/third_party/eigen3/src": { "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git", - "rev": "b396a6fbb2e173f52edb3360485dedf3389ef830", - "hash": "sha256-UroGjERR5TW9KbyLwR/NBpytXrW1tHfu6ZvQPngROq4=" + "rev": "24e0c2a125d2b37b35719124d1f758777c150ca8", + "hash": "sha256-c0QHya0eDKQc5YvvxIoL722fPm3XD3PagJb+pEwSAGQ=" }, "src/third_party/farmhash/src": { "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git", @@ -1061,8 +1061,8 @@ }, "src/third_party/ffmpeg": { "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git", - "rev": "591ae4b02eaff9a03e2ec863da895128b0b49910", - "hash": "sha256-wwHxNuZe2hBmGBpVg/iQJBoL350jfPYPTPqDn3RiqZE=" + "rev": "d10a0f8bf5ddcce572df95105152bc74041cae0c", + "hash": "sha256-OXumpRb9XB38dOCJmL3jDcabiJ08wAvydVlJwMgpCoQ=" }, "src/third_party/flac": { "url": "https://chromium.googlesource.com/chromium/deps/flac.git", @@ -1096,8 +1096,8 @@ }, "src/third_party/freetype/src": { "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git", - "rev": "0ae7e607370cc66218ccfacf5de4db8a35424c2f", - "hash": "sha256-+nbRZi3vAMTURhhFVUu5+59fVIv0GH3YZog2JavyVLY=" + "rev": "afc7000cacb8cc90ae61036858c5306defa1236a", + "hash": "sha256-ZaAoUxqr3GZ05Zux2jDS4YCbFaeJ4Z+dc3gZCRL09NE=" }, "src/third_party/freetype-testing/src": { "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git", @@ -1111,13 +1111,13 @@ }, "src/third_party/harfbuzz-ng/src": { "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git", - "rev": "1da053e87f0487382404656edca98b85fe51f2fd", - "hash": "sha256-iR49rfGDKxPObCff1/30hYHpP5FpZ28ROgMZhNk9eFY=" + "rev": "1c249be96e27eafd15eb86d832b67fbc3751634b", + "hash": "sha256-TStJvz3Txn4cvU1tCPPZn6RLslvM+VNUqt8l8g67JN4=" }, "src/third_party/ink/src": { "url": "https://chromium.googlesource.com/external/github.com/google/ink.git", - "rev": "4300dc7402a257b85fc5bf2559137edacb050227", - "hash": "sha256-+Ikr9E7KlXBFyf6fSDmIF3ygNUiwlXeA5bmO2CtkI7Q=" + "rev": "e5673a4ff2d82f29b22f7bec114161cbc1ff8cf8", + "hash": "sha256-/F4p2VRDWJ0bZRtSoWtgK8gnQDaOrHwoKwGvuSRq3a0=" }, "src/third_party/ink_stroke_modeler/src": { "url": "https://chromium.googlesource.com/external/github.com/google/ink-stroke-modeler.git", @@ -1126,8 +1126,8 @@ }, "src/third_party/instrumented_libs": { "url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git", - "rev": "bb6dbcf2df7a9beb34c3773ef4df161800e3aed9", - "hash": "sha256-kHKGADAgzlaeckXFbpU1GhJK+zkiRd9XvdtPF6qrQFY=" + "rev": "3cc43119a29158bcde39d288a8def4b8ec49baf8", + "hash": "sha256-7w5wMcmPcKLS91buxyRdcgaQjbKGFdmrKClvYVO3iko=" }, "src/third_party/emoji-segmenter/src": { "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git", @@ -1146,8 +1146,8 @@ }, "src/third_party/googletest/src": { "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git", - "rev": "d144031940543e15423a25ae5a8a74141044862f", - "hash": "sha256-n7tiIFAj8AiSCa9Tw+1j+ro9cSt5vagZpkbBBUUtYQY=" + "rev": "7d76a231b0e29caf86e68d1df858308cd53b2a66", + "hash": "sha256-ssYxqE/NZJGTAbuWTXg150qlvMS3QNaonEk9dK8jJWI=" }, "src/third_party/hunspell_dictionaries": { "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git", @@ -1156,8 +1156,8 @@ }, "src/third_party/icu": { "url": "https://chromium.googlesource.com/chromium/deps/icu.git", - "rev": "ba7ed88cc5ffa428a82a0f787dd61031aa5ef4ca", - "hash": "sha256-WtCoxcbEkkZayB6kXdQEhZ7/ue+ka6cguhFbpeWUBJA=" + "rev": "bbccc2f6efc1b825de5f2c903c48be685cd0cf22", + "hash": "sha256-O9qrAt8lwNBg5LCVz+SfTe48uJx8onVYwn0LRXIhUvY=" }, "src/third_party/jsoncpp/source": { "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git", @@ -1166,18 +1166,18 @@ }, "src/third_party/leveldatabase/src": { "url": "https://chromium.googlesource.com/external/leveldb.git", - "rev": "23e35d792b9154f922b8b575b12596a4d8664c65", - "hash": "sha256-y3awFXL8ih2UhEqWj8JRgkhzSxfQciLztb020JHJ350=" + "rev": "578eeb702ec0fbb6b9780f3d4147b1076630d633", + "hash": "sha256-tOSl9w9hEUnuQR+DxfZlHqEXXcpeyDlZrw2NWDUyXoY=" }, "src/third_party/libFuzzer/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git", - "rev": "a7128317fe7935a43d6c9f39df54f21113951941", - "hash": "sha256-jPS+Xi/ia0sMspxSGN38zasmVS/HslxH/qOFsV9TguE=" + "rev": "e31b99917861f891308269c36a32363b120126bb", + "hash": "sha256-Lb+HczYax0T7qvC0/Nwhc5l2szQTUYDouWRMD/Qz7sA=" }, "src/third_party/fuzztest/src": { "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git", - "rev": "0021f30508bc7f73fa5270962d022acb480d242f", - "hash": "sha256-UYmzjOX8k+CWL+xOIF3NiEL3TRUjS8JflortB2RUT4o=" + "rev": "3b4a590f7fc75a77823580c4c4e19d1c7bd6da52", + "hash": "sha256-+m6F1rqfIQcxKZbAJgQfKbokYPZSR+PrEHxMiE9IVKA=" }, "src/third_party/domato/src": { "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git", @@ -1191,23 +1191,23 @@ }, "src/third_party/libaom/source/libaom": { "url": "https://aomedia.googlesource.com/aom.git", - "rev": "be60f06ab420d6a65c477213f04c8b0f2e12ba2e", - "hash": "sha256-9VhEVOG9cReDOGoX+x5G/jJ8Y5RDoQIiLMoZtt5c9pI=" + "rev": "0c13a5d54053f82bf8500b421b5cdefb1cc1b3ed", + "hash": "sha256-uGvdLJNzvd7WxRAjTxYVaX5Y7Oc54f8fLEtpErAdCdg=" }, "src/third_party/libavif/src": { "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git", - "rev": "1cdeff7ecf456492c47cf48fc0cef6591cdc95da", - "hash": "sha256-lUuVyh2srhWMNUp4lEivyDic3MSZf5s63iAb84We80M=" + "rev": "e9a27bc6a84f01b6670c05c301c445f33a464992", + "hash": "sha256-4slyN5V7UCDbGHK/xZfC5MuOGhctVF6r/1lSnOHJB5Y=" }, "src/third_party/crabbyavif/src": { "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git", - "rev": "c3548280e0a516ed7cad7ff1591b5807cef64aa4", - "hash": "sha256-hO5epHYNYI6pGwVSUv1Hp3qb7qOv8uOs4u+IdhDxd8Q=" + "rev": "879ca873d6648a01de65e4cb0b86336b581aa513", + "hash": "sha256-JF1s3rDH0u5srtzyGQt/LU8iVlx1qPqE4RBE1AR8KPQ=" }, "src/third_party/nearby/src": { "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git", - "rev": "8e87a6e51c93e7836ecdbcc0a520c7992f3ece13", - "hash": "sha256-DO3FW5Q233ctFKk4K5F8oZec9kfrVl6uxAwMn0niKz4=" + "rev": "1864b0b55506bfc1eafc3785502f085f41aa0921", + "hash": "sha256-tTJ9tJBiWbAurKvb8aPn0KLHd724CYk5wlVIVZPWB0o=" }, "src/third_party/beto-core/src": { "url": "https://beto-core.googlesource.com/beto-core.git", @@ -1219,11 +1219,26 @@ "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84", "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=" }, + "src/third_party/speedometer/main": { + "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git", + "rev": "67bc21f1f44567a3ba41d7a3d8d0bec0e74f4a9e", + "hash": "sha256-mx4Z/co1mZcu//nlGIg5yH+XiTWB0sdiEK8Jvbi4THU=" + }, "src/third_party/speedometer/v3.0": { "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git", "rev": "8d67f28d0281ac4330f283495b7f48286654ad7d", "hash": "sha256-qMQ4naX+4uUu3vtzzinjkhxX9/dNoTwj6vWCu4FdQmU=" }, + "src/third_party/speedometer/v2.0": { + "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git", + "rev": "732af0dfe867f8815e662ac637357e55f285dbbb", + "hash": "sha256-p7WUS8gZUaS+LOm7pNmRkwgxjx+V8R6yy7bbaEHaIs4=" + }, + "src/third_party/speedometer/v2.1": { + "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git", + "rev": "8bf7946e39e47c875c00767177197aea5727e84a", + "hash": "sha256-0z5tZlz32fYh9I1ALqfLm2WWO8HiRBwt0hcmgKQhaeM=" + }, "src/third_party/ukey2/src": { "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git", "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47", @@ -1231,8 +1246,8 @@ }, "src/third_party/cros-components/src": { "url": "https://chromium.googlesource.com/external/google3/cros_components.git", - "rev": "9129cf4b2a5ca775c280243257a0b4856a93c7fb", - "hash": "sha256-owXaTIj0pbhUeJkirxaRoCmgIN9DwNzY3h771kaN+Fc=" + "rev": "59dd6e3d06e111c6a3d323a92e6478b9bbf15915", + "hash": "sha256-x9udwohR5jKPL6x2Hxu2FdS2aW3T8VIGZ4mLtgNQ5io=" }, "src/third_party/libdrm/src": { "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git", @@ -1261,8 +1276,8 @@ }, "src/third_party/libphonenumber/dist": { "url": "https://chromium.googlesource.com/external/libphonenumber.git", - "rev": "140dfeb81b753388e8a672900fb7a971e9a0d362", - "hash": "sha256-3hSnTFTD3KAdbyxfKg12qbIYTmw6YlTCH64gMP/HUJo=" + "rev": "9d46308f313f2bf8dbce1dfd4f364633ca869ca7", + "hash": "sha256-ZbuDrZEUVp/ekjUP8WO/FsjAomRjeDBptT4nQZvTVi4=" }, "src/third_party/libprotobuf-mutator/src": { "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git", @@ -1271,18 +1286,23 @@ }, "src/third_party/libsrtp": { "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git", - "rev": "000edd791434c8738455f10e0dd6b268a4852c0b", - "hash": "sha256-4qEZ9MD97MoqCUlZtbEhIKy+fDO1iIWqyrBsKwkjXTg=" + "rev": "a52756acb1c5e133089c798736dd171567df11f5", + "hash": "sha256-bkG1+ss+1a2rCHGwZjhvf5UaNVbPPZJt9HZSIPBKGwM=" }, "src/third_party/libsync/src": { "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git", "rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6", "hash": "sha256-Mkl6C1LxF3RYLwYbxiSfoQPt8QKFwQWj/Ati2sNJ32E=" }, + "src/third_party/libva-fake-driver/src": { + "url": "https://chromium.googlesource.com/chromiumos/platform/libva-fake-driver.git", + "rev": "a9bcab9cd6b15d4e3634ca44d5e5f7652c612194", + "hash": "sha256-em/8rNqwv6szlxyji7mnYr3nObSW/x3OzEEnkiLuqpI=" + }, "src/third_party/libvpx/source/libvpx": { "url": "https://chromium.googlesource.com/webm/libvpx.git", - "rev": "727319a77ffe68e9aacb08e09ae7151b3a8f70a3", - "hash": "sha256-QGm37X4uid8zv+vRu0pVTvoQd2WcKztrj3tJkDjx82o=" + "rev": "8058a0b54991257a0e1a2fcf08d993a8b70c1d3a", + "hash": "sha256-iwUQ7WI9ThluB2+a4T7FlE7gPyBxTt9PZJnG6k5PYew=" }, "src/third_party/libwebm/source": { "url": "https://chromium.googlesource.com/webm/libwebm.git", @@ -1291,13 +1311,13 @@ }, "src/third_party/libwebp/src": { "url": "https://chromium.googlesource.com/webm/libwebp.git", - "rev": "845d5476a866141ba35ac133f856fa62f0b7445f", - "hash": "sha256-xuRpEwOnaLGZmrPvfUn3DSoJANd94CG+JXcN7Mdmk5I=" + "rev": "2af6c034ac871c967e04c8c9f8bf2dbc2e271b18", + "hash": "sha256-0sKGhXr6Rrpq0eoitAdLQ4l4fgNOzMWIEICrPyzwNz4=" }, "src/third_party/libyuv": { "url": "https://chromium.googlesource.com/libyuv/libyuv.git", - "rev": "6ac7c8f25170c85265fca69fd1fe5d31baf3344f", - "hash": "sha256-vPVq7RzqO7gBUgYuNX0Fwxqok9jtXXJZgbhVFchG5Ws=" + "rev": "47ddac2996378c34aab9318f0d218303b1d282e7", + "hash": "sha256-sB5iCuc3+Dp9uVm2mUt4XhQ3zazsueEVNNw6uTMGTuQ=" }, "src/third_party/lss": { "url": "https://chromium.googlesource.com/linux-syscall-support.git", @@ -1321,8 +1341,8 @@ }, "src/third_party/neon_2_sse/src": { "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git", - "rev": "a15b489e1222b2087007546b4912e21293ea86ff", - "hash": "sha256-299ZptvdTmCnIuVVBkrpf5ZTxKPwgcGUob81tEI91F0=" + "rev": "eb8b80b28f956275e291ea04a7beb5ed8289e872", + "hash": "sha256-AkDAHOPO5NdXXk0hETS5D67mzw0RVXwPDDKqM0XXo5g=" }, "src/third_party/openh264/src": { "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264", @@ -1331,8 +1351,8 @@ }, "src/third_party/openscreen/src": { "url": "https://chromium.googlesource.com/openscreen", - "rev": "cb6fd42532fc3a831d6863d5006217e32a67c417", - "hash": "sha256-IlGxfw6Mhc7FYvhU2+Ngt9qflqr4JMC2OcplvksGI+U=" + "rev": "991678c7c3b66807cb40619e46ebb7de1bc45a18", + "hash": "sha256-ULAd+neG99IXGMOT4Ur4tDdV+jxMucwQFid2xhHqcMY=" }, "src/third_party/openscreen/src/buildtools": { "url": "https://chromium.googlesource.com/chromium/src/buildtools", @@ -1346,13 +1366,13 @@ }, "src/third_party/pdfium": { "url": "https://pdfium.googlesource.com/pdfium.git", - "rev": "84a8011ec69d0e2de271c05be7d62979608040d9", - "hash": "sha256-d8qJECIdq01ct+sS7cHVKFulYJarwahKCEcVf762JNI=" + "rev": "c674dba647e81805158339785c0c7e3b57643f8c", + "hash": "sha256-2Z7Dg3IuxMB+xKFURo0Z7NztPQht7Fd+A1dX99gQ+A4=" }, "src/third_party/perfetto": { "url": "https://android.googlesource.com/platform/external/perfetto.git", - "rev": "ea011a2c2d3aecdc4f1674887e107a56d2905edd", - "hash": "sha256-3vervpsq/QLMrR7RcJMwwh+CdFvSEj8yAzj6s9d1XMo=" + "rev": "2473cc95bc0d2d0c3c240be49ce4c2d0dc48edd4", + "hash": "sha256-OUnQ4XStZ0Olm/IvlaLzcRdHo/EMPlQ6ekVTSrG7HW0=" }, "src/third_party/protobuf-javascript/src": { "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript", @@ -1386,23 +1406,23 @@ }, "src/third_party/ruy/src": { "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git", - "rev": "c08ec529fc91722bde519628d9449258082eb847", - "hash": "sha256-4NVvqUZn2BdwTxJINTHwPeRqbGXZrWdcd7jv1Y+eoKY=" + "rev": "95484c3e02206f73309c08ee5ee23d2304ca092b", + "hash": "sha256-BaRyNHZLpXNsJltffV7T19QrMWkTcCq37JZiWjAdSHo=" }, "src/third_party/skia": { "url": "https://skia.googlesource.com/skia.git", - "rev": "c17fe9bc158c29de3cdd655ac73d14f52c17810a", - "hash": "sha256-mRfkEm+NzEX0DkJejk1THx4G7v0sIFmRrAnt3Zl5uco=" + "rev": "ecebe831881cdf52c65df518777210071f7970dd", + "hash": "sha256-9pq0MEWRlR6bOamQW+onZkhGH82FUYRn3P1ooDUqnPY=" }, "src/third_party/smhasher/src": { "url": "https://chromium.googlesource.com/external/smhasher.git", - "rev": "e87738e57558e0ec472b2fc3a643b838e5b6e88f", + "rev": "3e1f0d1d8340cfe136d33fd27c75eb7694148214", "hash": "sha256-RyC//me08hwGXRrWcK8GZ1uhIkBq4FByA7fHCVDsniw=" }, "src/third_party/snappy/src": { "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git", - "rev": "c9f9edf6d75bb065fa47468bf035e051a57bec7c", - "hash": "sha256-5fV6NfO8vmqK+iCwpLtE2YjYOzjsshctauyjNIOxrH0=" + "rev": "32ded457c0b1fe78ceb8397632c416568d6714a0", + "hash": "sha256-jUwnjbaqXz7fgI2TPRK7SlUPQUVzcpjp4ZlFbEzwA+o=" }, "src/third_party/sqlite/src": { "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git", @@ -1411,8 +1431,8 @@ }, "src/third_party/swiftshader": { "url": "https://swiftshader.googlesource.com/SwiftShader.git", - "rev": "d5c4284774115bb1e32c012a2be1b5fbeb1ab1f9", - "hash": "sha256-h2BHyaOM0oscfX5cu8s4N1yyOkg/yQbvwD1DxF+RAQc=" + "rev": "52586b554f93e50bc67277c6031673ed23a8d903", + "hash": "sha256-WPTpjJK6qFzXJg5eYLpEb6hqGgNzAkQOlSeA5a78Vpk=" }, "src/third_party/text-fragments-polyfill/src": { "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git", @@ -1421,18 +1441,18 @@ }, "src/third_party/tflite/src": { "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git", - "rev": "658227d3b535287dc6859788bde6076c4fe3fe7c", - "hash": "sha256-gOUt/NljRK5wMFwy2aLqZ5NHwk4y/GxbQ+AZ3MxM0M8=" + "rev": "b25df276c8e912c22f57263ffcae6ca8f4c64342", + "hash": "sha256-Xl5dgjiKpkwf3Iv15Oj83AR1iJQ5qNzClCk24Y28TVw=" }, "src/third_party/vulkan-deps": { "url": "https://chromium.googlesource.com/vulkan-deps", - "rev": "0b56dd5952b25fad65139b64096fcd187048ed38", - "hash": "sha256-LVWvbMLjkMyAUM+0UpQ4oRsfcRU5F/xY60wiwxth4Ko=" + "rev": "915d114daeb26a3dbdad1622f5a72c0aa255acbb", + "hash": "sha256-K7HND6c357xoDFAczG77RY4E7lGyEvt0J4NidSkRYTE=" }, "src/third_party/glslang/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang", - "rev": "9c644fcb5b9a1a9c975c50a790fd14c5451292b0", - "hash": "sha256-twWSeJp9bNbLYFszCWv9BCztfbXUBKSWV55/U+hd2hw=" + "rev": "10fb91c403b2f5e2142c751884dd12ed3fb13952", + "hash": "sha256-MvX2ApY5EF/jVMCkSSLHkPVIyHPe+CIlKJnkURzmxLU=" }, "src/third_party/spirv-cross/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross", @@ -1441,44 +1461,49 @@ }, "src/third_party/spirv-headers/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers", - "rev": "996c728cf7dcfb29845cfa15222822318f047810", - "hash": "sha256-FrT/kVIMjcu2zv+7kDeNKM77NnOyMBb8pV0w8DBP42A=" + "rev": "36d5e2ddaa54c70d2f29081510c66f4fc98e5e53", + "hash": "sha256-8hx8/1vaY4mRnfNaBsghWqpzyzY4hkVkNFbQEFZif9g=" }, "src/third_party/spirv-tools/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools", - "rev": "9117e042b93d4ff08d2406542708170f77aaa2a3", - "hash": "sha256-m/a1i26u8lzpKuQHyAy6ktWWjbLZEaio1awz8VovTGE=" + "rev": "f3c4a5053f1bd34056282e56659659873f9d47ad", + "hash": "sha256-1qIdXDDRDXT27O8o9gFNEQHQKJVAoqN3BDepL/iu1zQ=" }, "src/third_party/vulkan-headers/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers", - "rev": "cbcad3c0587dddc768d76641ea00f5c45ab5a278", - "hash": "sha256-exXzafLgrgxyRvaF+4pCF+OLtPT2gDmcvzazQ4EQ1eA=" + "rev": "36872f9062b17b1a30b8ed1d81ca5ea6bb608a72", + "hash": "sha256-+29yOL4VBAR8QpsK/WcCiJkPQxSoReTXVSoAhzsPPKc=" }, "src/third_party/vulkan-loader/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader", - "rev": "b0177a972b8d47e823a4500cf88df88a8c27add7", - "hash": "sha256-NDp2TLeMLAHb92R+PjaPDTx8ckIlpSsS3BNx3lerB68=" + "rev": "081b529a37f43249225114c4c0dea12a29ce605f", + "hash": "sha256-QyWnBxTo5KcbEB1/Kcz2679KCsSTRDini4Ef9YRY+lw=" }, "src/third_party/vulkan-tools/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools", - "rev": "15f2de809304aba619ee327f3273425418ca83de", - "hash": "sha256-PiWKL045DAOGm+Hl/UyO6vmD4fVfuf2fSvXK6gSYbwo=" + "rev": "86d6be76350413def51e96ed98a25cc2c9d048c9", + "hash": "sha256-2LQGTmViNb4G19zcHyEpor2E0c1wD9+JDknLfeT1M2Y=" }, "src/third_party/vulkan-utility-libraries/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries", - "rev": "87ab6b39a97d084a2ef27db85e3cbaf5d2622a09", - "hash": "sha256-luDw6g/EMSK67Et2wNta74PHGQU6Y7IRpDlSpgDYV6Q=" + "rev": "b538fb5b08513aa78346cd414ad5e576a2a3e920", + "hash": "sha256-XoMQ9VhyS4eJ8TLxNKZ1YygeOJp65AsFSk2galRM7BE=" }, "src/third_party/vulkan-validation-layers/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers", - "rev": "bc2c38412f739c298d6f5c076c064e6b5696959f", - "hash": "sha256-WWV+P++0Czeqg5p2UTqIP81pY8oz7cS7E7Z/sc0km6g=" + "rev": "24ad452082bfbf3eb749d7894266666a8aae4bbb", + "hash": "sha256-OUdlPRua+Ujn2rdzmg62OLqlsgByBNh4yUnL11oM5gE=" }, "src/third_party/vulkan_memory_allocator": { "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git", "rev": "56300b29fbfcc693ee6609ddad3fdd5b7a449a21", "hash": "sha256-YzxHZagz/M8Y54UnI4h1wu5jSTuaOgv0ifC9d3fJZlQ=" }, + "src/third_party/wasm_tts_engine/src": { + "url": "https://chromium.googlesource.com/chromium/wasm-tts-engine", + "rev": "6d5bc87a28e49361dac2964015957698b04a0df8", + "hash": "sha256-uqPCMa95uoLhf+cjmc5iz3m3qGy2BNrr8oipfDbColA=" + }, "src/third_party/wayland/src": { "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git", "rev": "a156431ea66fe67d69c9fbba8a8ad34dabbab81c", @@ -1511,13 +1536,18 @@ }, "src/third_party/webgpu-cts/src": { "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git", - "rev": "b9f32fd2943dd2b3d0033bf938c9d843f4b5c9a9", - "hash": "sha256-Dd5uWNtnBIc2jiMkh9KjI5O1tJtmMvdlMA2nf+VOkQQ=" + "rev": "e99550b44ea9eedb364beb553d1a48549d0da115", + "hash": "sha256-uklVbu4Sgb9FmmKcaep8ncd5FNfdPGwdKMvzVr2qUBI=" + }, + "src/third_party/webpagereplay": { + "url": "https://chromium.googlesource.com/webpagereplay.git", + "rev": "d812e180206934eb3b7ae411d82d61bc21c22f70", + "hash": "sha256-KAkkFVxEfQxbSjD+55LO4UZYWWwmGK6B9ENFSPljNu0=" }, "src/third_party/webrtc": { "url": "https://webrtc.googlesource.com/src.git", - "rev": "afaf497805cbb502da89991c2dcd783201efdd08", - "hash": "sha256-S8kGTd3+lf5OTayCMOqqrjxH4tcbT0NLZBpKmTCysMs=" + "rev": "283b6ef9d3eabe5bb3ed7c9d6b6d211a92f9b6d0", + "hash": "sha256-KMyO88KoYiTHq+stdbc8vRYqeQbrqexDIiOeWbqytrU=" }, "src/third_party/wuffs/src": { "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git", @@ -1536,23 +1566,18 @@ }, "src/third_party/xnnpack/src": { "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git", - "rev": "d1d33679661a34f03a806af2b813f699db3004f9", - "hash": "sha256-aDPlmLxNY9M5+Qb8VtdfxphHXU/X6JwYhkUSXkLh/FE=" - }, - "src/tools/page_cycler/acid3": { - "url": "https://chromium.googlesource.com/chromium/deps/acid3.git", - "rev": "a926d0a32e02c4c03ae95bb798e6c780e0e184ba", - "hash": "sha256-s/49EaYQRsyxuLejXc1zGDYTD7uO0ddaQIJBP50Bvw0=" + "rev": "7440eee88f66c4b81d4e7d31f6ae07af66e059ea", + "hash": "sha256-qC4hSubtlNKwRikKNYtiEnvCtV0/IGvQegnhrMCTKKs=" }, "src/third_party/zstd/src": { "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git", - "rev": "7fb5347e88f10472226c9aa1962a148e55d8c480", - "hash": "sha256-4J/F2v2W3mMdhqQ4q35gYkGaqTKlcG6OxUt3vQ8pcLs=" + "rev": "b0a179d469680276adbd4007435989a6b7fd8b4f", + "hash": "sha256-uFzzxbTxCUl69URMJdb9BL9cHkwwiuSHyXGSVo2xX6w=" }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "210ec27ca748c70580fe374f9811761667312b41", - "hash": "sha256-pfkztEU22T15H2amf+b5bpALQ6Er1YAxZoxbbfb2YU8=" + "rev": "fe051262efbbd92479a08436f733eba9f756e008", + "hash": "sha256-l3hMgnhy2Ml6kExwGFWi+M6Oq4YFsOSIkRDCmji+syY=" } } } From e87f642cb989f82f21582819705a9259c0b5d658 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 8 Feb 2025 00:10:44 +0100 Subject: [PATCH 0436/2168] python312Packages.wandb: 0.19.5 -> 0.19.6 Diff: https://github.com/wandb/wandb/compare/refs/tags/v0.19.5...v0.19.6 Changelog: https://github.com/wandb/wandb/raw/v0.19.6/CHANGELOG.md --- pkgs/development/python-modules/wandb/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index ef7ac2817471..9636de89d64a 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -10,7 +10,6 @@ ## gpu-stats rustPlatform, - darwin, ## wandb buildPythonPackage, @@ -72,15 +71,16 @@ tenacity, torch, tqdm, + writableTmpDirAsHomeHook, }: let - version = "0.19.5"; + version = "0.19.6"; src = fetchFromGitHub { owner = "wandb"; repo = "wandb"; tag = "v${version}"; - hash = "sha256-NkwXHogHBsDdaWdATWujdvnSr0oXp3RbWq5hQX53WR8="; + hash = "sha256-snyr0IlE4otk1ctWUrJEFAmHYsXe+k6qULCaO3aW0e4="; }; gpu-stats = rustPlatform.buildRustPackage { @@ -236,12 +236,9 @@ buildPythonPackage rec { tenacity torch tqdm + writableTmpDirAsHomeHook ]; - preCheck = '' - export HOME=$(mktemp -d) - ''; - # test_matplotlib_image_with_multiple_axes may take >60s pytestFlagsArray = [ "--timeout=1024" From 5e69c8f295ca14ae11947531554e042bd5f9e802 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 8 Feb 2025 07:29:25 +0800 Subject: [PATCH 0437/2168] mint-l-icons: Temporarily set dontCheckForBrokenSymlinks To unbreak nixosTests.cinnamon. --- pkgs/by-name/mi/mint-l-icons/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/mi/mint-l-icons/package.nix b/pkgs/by-name/mi/mint-l-icons/package.nix index 63692168c262..953fd87fdb6d 100644 --- a/pkgs/by-name/mi/mint-l-icons/package.nix +++ b/pkgs/by-name/mi/mint-l-icons/package.nix @@ -30,6 +30,8 @@ stdenvNoCC.mkDerivation rec { gtk3 ]; + # FIXME: https://hydra.nixos.org/build/287344480/nixlog/5 + dontCheckForBrokenSymlinks = true; dontDropIconThemeCache = true; installPhase = '' From 3dea7372a434c93bb6eab3e51ca9fd1bb4db0a86 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Feb 2025 23:31:20 +0000 Subject: [PATCH 0438/2168] python312Packages.langsmith: 0.3.4 -> 0.3.6 --- pkgs/development/python-modules/langsmith/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index 1a39a1734206..e4a9c71cd8f0 100644 --- a/pkgs/development/python-modules/langsmith/default.nix +++ b/pkgs/development/python-modules/langsmith/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "langsmith"; - version = "0.3.4"; + version = "0.3.6"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langsmith-sdk"; tag = "v${version}"; - hash = "sha256-mJS9Sdt4ESh9YRyjiUdVHC6R400SKhTeSdTjnbtY61I="; + hash = "sha256-V52sBGC4acQHfgsK5uCKQIWoeiaUnyEObVrt5TBRukU="; }; sourceRoot = "${src.name}/python"; From 92c262824d525b7dd63361f18607bd66ca33b683 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Feb 2025 23:36:26 +0000 Subject: [PATCH 0439/2168] vacuum-go: 0.16.1 -> 0.16.2 --- pkgs/by-name/va/vacuum-go/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/va/vacuum-go/package.nix b/pkgs/by-name/va/vacuum-go/package.nix index 4c4cfc91562e..46bc764d3a20 100644 --- a/pkgs/by-name/va/vacuum-go/package.nix +++ b/pkgs/by-name/va/vacuum-go/package.nix @@ -8,17 +8,17 @@ buildGoModule rec { pname = "vacuum-go"; - version = "0.16.1"; + version = "0.16.2"; src = fetchFromGitHub { owner = "daveshanley"; repo = "vacuum"; # using refs/tags because simple version gives: 'the given path has multiple possibilities' error tag = "v${version}"; - hash = "sha256-TljvCGquQJl+uJXRBJCximR5OgsdAgK/+eobQW9+fZo="; + hash = "sha256-x3AYHFQFS8PGv5bi+zg4rut7gVgQi9PS3+0YGJ47YMQ="; }; - vendorHash = "sha256-Yuibhb0N8QHHjdB4v3jFVxz1T6SkhgFfcouPAjjA0lU="; + vendorHash = "sha256-1lr1VQU4JHg0PZbjAUmALFZJiYc+HTwrk0E/t/1qXqE="; env.CGO_ENABLED = 0; ldflags = [ From 00eabcdf1806ecf97882619577d2c9b30c59e77a Mon Sep 17 00:00:00 2001 From: moni-dz Date: Sat, 8 Feb 2025 06:53:44 +0800 Subject: [PATCH 0440/2168] linux_xanmod, linux_xanmod_latest: 2025-02-08 updates --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index d9c39f19eb27..e017735533bb 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -14,12 +14,12 @@ let # kernel config in the xanmod version commit variants = { lts = { - version = "6.6.70"; - hash = "sha256-5G3Lo+dWObVDaBRzn2Ho24R2vMjsupx5z2jRIQ0NAl0="; + version = "6.12.12"; + hash = "sha256-k+nRkmqZXqHTYVT4r+Lt7SG9uLDsefM3ivV5Ps6VL8c="; }; main = { - version = "6.12.9"; - hash = "sha256-vA1/OhhwSKVIaLJ7uN2ut1b1/UX/mIAITQ3BqTZD9Uk="; + version = "6.12.12"; + hash = "sha256-k+nRkmqZXqHTYVT4r+Lt7SG9uLDsefM3ivV5Ps6VL8c="; }; }; From cb467f0e1f3219ebf9e6e12bebe4b32c69481e09 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 8 Feb 2025 00:43:55 +0100 Subject: [PATCH 0441/2168] python312Packages.python-lsp-server: 1.12.1 -> 1.12.2 Diff: https://github.com/python-lsp/python-lsp-server/compare/refs/tags/v1.12.1...v1.12.2 Changelog: https://github.com/python-lsp/python-lsp-server/blob/v1.12.2/CHANGELOG.md --- pkgs/development/python-modules/python-lsp-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix index e3b81e6f8103..b670eb569231 100644 --- a/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/pkgs/development/python-modules/python-lsp-server/default.nix @@ -41,14 +41,14 @@ buildPythonPackage rec { pname = "python-lsp-server"; - version = "1.12.1"; + version = "1.12.2"; pyproject = true; src = fetchFromGitHub { owner = "python-lsp"; repo = "python-lsp-server"; tag = "v${version}"; - hash = "sha256-1jWui48QmnTw18Dvl24lgxsUkm0/mxyjIZP6+ScjGY4="; + hash = "sha256-tdhYLAXs1Yf3DqCzf/pLOlJvr/zYRkSlAF6hsavSu+A="; }; pythonRelaxDeps = [ From 503823388fe5bd02b16912963b418f91b4f18b7d Mon Sep 17 00:00:00 2001 From: r-vdp Date: Sat, 8 Feb 2025 00:51:50 +0100 Subject: [PATCH 0442/2168] neovim-node-client: create binary in $out/bin Recreate a link to the binary, the link was lost after https://github.com/NixOS/nixpkgs/pull/380018. This fixes the build of the neovim wrapper. --- pkgs/by-name/ne/neovim-node-client/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/ne/neovim-node-client/package.nix b/pkgs/by-name/ne/neovim-node-client/package.nix index d4113c263141..5fe372124b4c 100644 --- a/pkgs/by-name/ne/neovim-node-client/package.nix +++ b/pkgs/by-name/ne/neovim-node-client/package.nix @@ -27,6 +27,11 @@ buildNpmPackage rec { runHook postBuild ''; + postInstall = '' + mkdir $out/bin + ln -s $out/lib/node_modules/neovim/node_modules/.bin/neovim-node-host $out/bin/neovim-node-host + ''; + meta = { mainProgram = "neovim-node-host"; description = "Nvim msgpack API client and remote plugin provider"; From 98cc4354ee8de6cef8e0163f503dd3a0b9eb7a73 Mon Sep 17 00:00:00 2001 From: merrkry Date: Thu, 6 Feb 2025 10:09:08 +0100 Subject: [PATCH 0443/2168] memogram: init at 0.2.2 --- pkgs/by-name/me/memogram/package.nix | 33 ++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 pkgs/by-name/me/memogram/package.nix diff --git a/pkgs/by-name/me/memogram/package.nix b/pkgs/by-name/me/memogram/package.nix new file mode 100644 index 000000000000..1fef943879bb --- /dev/null +++ b/pkgs/by-name/me/memogram/package.nix @@ -0,0 +1,33 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: +buildGoModule rec { + pname = "memogram"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "usememos"; + repo = "telegram-integration"; + tag = "v${version}"; + hash = "sha256-CUo5fPWNE4FP1Dtwb1rPNSPP/CAJvYGYYIMAx/oeSOc="; + }; + + vendorHash = "sha256-BDGA7GpXS3/esBvb3+rC8ZgtER2OgBJ1bHZ6AHP/i4s="; + + subPackages = [ "bin/memogram" ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Easy to use integration service for syncing messages and images from a Telegram bot into your Memos"; + homepage = "https://github.com/usememos/telegram-integration"; + changelog = "https://github.com/usememos/telegram-integration/releases/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ merrkry ]; + mainProgram = "memogram"; + platforms = lib.platforms.linux; + }; +} From 6d25c42a433063aaf688ef0bccac7556ce56043c Mon Sep 17 00:00:00 2001 From: Carlos Date: Sat, 8 Feb 2025 00:43:09 +0100 Subject: [PATCH 0444/2168] gphoto2: remove patch already applied upstream --- .../misc/gphoto2/add-type-casts.diff | 21 ------------------- pkgs/applications/misc/gphoto2/default.nix | 2 -- 2 files changed, 23 deletions(-) delete mode 100644 pkgs/applications/misc/gphoto2/add-type-casts.diff diff --git a/pkgs/applications/misc/gphoto2/add-type-casts.diff b/pkgs/applications/misc/gphoto2/add-type-casts.diff deleted file mode 100644 index fd0f6f88c331..000000000000 --- a/pkgs/applications/misc/gphoto2/add-type-casts.diff +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/gphoto2/main.c b/gphoto2/main.c -index 2bf5964..cd84467 100644 ---- a/gphoto2/main.c -+++ b/gphoto2/main.c -@@ -1215,14 +1215,14 @@ start_timeout_func (Camera *camera, unsigned int timeout, - - pthread_create (&tid, NULL, thread_func, td); - -- return (tid); -+ return (unsigned int)tid; - } - - static void - stop_timeout_func (Camera __unused__ *camera, unsigned int id, - void __unused__ *data) - { -- pthread_t tid = id; -+ pthread_t tid = (pthread_t)id; - - pthread_cancel (tid); - pthread_join (tid, NULL); diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix index 42037008d0ef..3822b1655b1b 100644 --- a/pkgs/applications/misc/gphoto2/default.nix +++ b/pkgs/applications/misc/gphoto2/default.nix @@ -24,8 +24,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-t5EnM4WaDbOTPM+rJW+hQxBgNErnnZEN9lZvxTKoDhA="; }; - patches = [ ./add-type-casts.diff ]; - nativeBuildInputs = [ autoreconfHook pkg-config From e844559f572034ac95892284cc0a481fb49a83b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 7 Feb 2025 16:02:36 -0800 Subject: [PATCH 0445/2168] python313Packages.flexit-bacnet: 2.2.2 -> 2.2.3 Diff: https://github.com/piotrbulinski/flexit_bacnet/compare/refs/tags/2.2.2...2.2.3 Changelog: https://github.com/piotrbulinski/flexit_bacnet/releases/tag/2.2.3 --- pkgs/development/python-modules/flexit-bacnet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flexit-bacnet/default.nix b/pkgs/development/python-modules/flexit-bacnet/default.nix index 7bdba2f731ab..67dfe86ff378 100644 --- a/pkgs/development/python-modules/flexit-bacnet/default.nix +++ b/pkgs/development/python-modules/flexit-bacnet/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "flexit-bacnet"; - version = "2.2.2"; + version = "2.2.3"; pyproject = true; src = fetchFromGitHub { owner = "piotrbulinski"; repo = "flexit_bacnet"; tag = version; - hash = "sha256-c5561ewnAybYcdqesWYEgfT7Y+TetOjxLZeMTJ1ToUk="; + hash = "sha256-MudBn+ki/jqeFK1iz/vAXaXkkddLThO+1T4BXFJ90lk="; }; build-system = [ setuptools ]; From b34dcf6eb1c7f50279a75c610858ff0d78fe1fbd Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Fri, 7 Feb 2025 16:02:39 -0800 Subject: [PATCH 0446/2168] =?UTF-8?q?gnome-shell-extensions:=2047.3=20?= =?UTF-8?q?=E2=86=92=2047.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Anders Kaseorg --- pkgs/by-name/gn/gnome-shell-extensions/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-shell-extensions/package.nix b/pkgs/by-name/gn/gnome-shell-extensions/package.nix index e714fefcabca..e4afb7341f61 100644 --- a/pkgs/by-name/gn/gnome-shell-extensions/package.nix +++ b/pkgs/by-name/gn/gnome-shell-extensions/package.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-shell-extensions"; - version = "47.3"; + version = "47.4"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major finalAttrs.version}/gnome-shell-extensions-${finalAttrs.version}.tar.xz"; - hash = "sha256-GpFCpOhdeit9xbrTfjTfnuuzjoSW9JOL4teys1iD0Tk="; + hash = "sha256-VDN57FsNBCAO5iofa6JAcWoJ11rQrd3bIFvjjOgpP1g="; }; patches = [ From 417aac8ea5d4dd4c7a6590c67b39362d4f749812 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Sun, 2 Feb 2025 21:06:26 +0000 Subject: [PATCH 0447/2168] python3Packages.langgraph: 0.2.56 -> 0.2.70 Changelog: https://github.com/langchain-ai/langgraph/releases/tag/0.2.70 --- .../python-modules/langgraph/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/langgraph/default.nix b/pkgs/development/python-modules/langgraph/default.nix index 251da435a1ee..c2a4326df3d2 100644 --- a/pkgs/development/python-modules/langgraph/default.nix +++ b/pkgs/development/python-modules/langgraph/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pname = "langgraph"; - version = "0.2.56"; + version = "0.2.70"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; - tag = version; - hash = "sha256-X/IMNEmggu9bSJFUaTohbFYxGZBguf+eFb3ObmQGplk="; + tag = "${version}"; + hash = "sha256-Vz2ZoikEZuMvt3j9tvBIcXCwWSrCV8MI7x9PIHodl8Y="; }; postgresqlTestSetupPost = '' @@ -112,12 +112,14 @@ buildPythonPackage rec { # psycopg.errors.InsufficientPrivilege: permission denied to create database "tests/test_pregel_async.py" "tests/test_pregel.py" + "tests/test_large_cases.py" + "tests/test_large_cases_async.py" ]; - passthru.updateScript = langgraph-sdk.updateScript; - - # multiple tags confuse the bulk updater - passthru.skipBulkUpdate = true; + passthru = { + inherit (langgraph-sdk) updateScript; + skipBulkUpdate = true; # Broken, see https://github.com/NixOS/nixpkgs/issues/379898 + }; meta = { description = "Build resilient language agents as graphs"; From 40b72309ebcbaf7116fbd1c1ffd4390645873d03 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Sun, 2 Feb 2025 13:34:24 -0800 Subject: [PATCH 0448/2168] python3Packages.langgraph-sdk: 0.1.46 -> 0.1.51 --- .../python-modules/langgraph-sdk/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/langgraph-sdk/default.nix b/pkgs/development/python-modules/langgraph-sdk/default.nix index beadf9aedf71..71a8e443c88d 100644 --- a/pkgs/development/python-modules/langgraph-sdk/default.nix +++ b/pkgs/development/python-modules/langgraph-sdk/default.nix @@ -10,6 +10,7 @@ httpx, httpx-sse, orjson, + typing-extensions, # passthru writeScript, @@ -17,14 +18,14 @@ buildPythonPackage rec { pname = "langgraph-sdk"; - version = "0.1.43"; + version = "0.1.51"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; tag = "sdk==${version}"; - hash = "sha256-mG04V36Aa5Df5pUgr+xWej8i2XYx+O/N61sSzxwN9Go="; + hash = "sha256-BkwH9O59gG/OtnFWYEFe2WD0sIidptlkPACX9i7kCb8="; }; sourceRoot = "${src.name}/libs/sdk-py"; @@ -35,6 +36,7 @@ buildPythonPackage rec { httpx httpx-sse orjson + typing-extensions ]; disabledTests = [ "test_aevaluate_results" ]; # Compares execution time to magic number @@ -54,9 +56,7 @@ buildPythonPackage rec { nix-update --commit --version-regex 'checkpointpostgres==(.*)' python3Packages.langgraph-checkpoint-postgres nix-update --commit --version-regex 'checkpointsqlite==(.*)' python3Packages.langgraph-checkpoint-sqlite ''; - - # multiple tags confuse the bulk updater - skipBulkUpdate = true; + skipBulkUpdate = true; # Broken, see https://github.com/NixOS/nixpkgs/issues/379898 }; meta = { From 2529ca71c17aa2efba2062cbb1f8673056c53af0 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Sun, 2 Feb 2025 13:41:58 -0800 Subject: [PATCH 0449/2168] python3Packages.langgraph-checkpoint: 2.0.8 -> 2.0.10 --- .../python-modules/langgraph-checkpoint/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/langgraph-checkpoint/default.nix b/pkgs/development/python-modules/langgraph-checkpoint/default.nix index 02d936c7f17a..d8b74d1e8ec5 100644 --- a/pkgs/development/python-modules/langgraph-checkpoint/default.nix +++ b/pkgs/development/python-modules/langgraph-checkpoint/default.nix @@ -10,21 +10,18 @@ pytest-asyncio, pytest-mock, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { pname = "langgraph-checkpoint"; - version = "2.0.8"; + version = "2.0.10"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; tag = "checkpoint==${version}"; - hash = "sha256-obDK6wn+oo8zDQsidogwKTIgT5wuUH/l4y+12cttkd0="; + hash = "sha256-Bs8XWSyI/6a756iWXT40vvNIe/XZ/vnMsZbXjTW3770="; }; sourceRoot = "${src.name}/libs/checkpoint"; @@ -53,9 +50,7 @@ buildPythonPackage rec { passthru = { updateScript = langgraph-sdk.updateScript; - - # multiple tags confuse the bulk updater - skipBulkUpdate = true; + skipBulkUpdate = true; # Broken, see https://github.com/NixOS/nixpkgs/issues/379898 }; meta = { From 8a1334a62beb3c84eec0c75d5329303840722a19 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Sun, 2 Feb 2025 13:56:33 -0800 Subject: [PATCH 0450/2168] python3Packages.langgraph-checkpoint-duckdb: 2.0.1 -> 2.0.2 --- .../langgraph-checkpoint-duckdb/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/langgraph-checkpoint-duckdb/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-duckdb/default.nix index a140a10b74ab..a0ca4c328599 100644 --- a/pkgs/development/python-modules/langgraph-checkpoint-duckdb/default.nix +++ b/pkgs/development/python-modules/langgraph-checkpoint-duckdb/default.nix @@ -9,21 +9,18 @@ pytestCheckHook, langgraph-sdk, poetry-core, - pythonOlder, }: buildPythonPackage rec { pname = "langgraph-checkpoint-duckdb"; - version = "2.0.1"; + version = "2.0.2"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; tag = "checkpointduckdb==${version}"; - hash = "sha256-wSrlFBfTcTgyE46uwv9GCyxRT1xVafgWyP2g87KUTAU="; + hash = "sha256-ppgViNRkkCTOGPfdB04DOnEzFgHN1KGDLLVjuwhRgNE="; }; sourceRoot = "${src.name}/libs/checkpoint-duckdb"; @@ -49,10 +46,9 @@ buildPythonPackage rec { disabledTests = [ "test_basic_store_ops" ]; # depends on networking passthru = { - updateScript = langgraph-sdk.updateScript; + inherit (langgraph-sdk) updateScript; - # multiple tags confuse the bulk updater - skipBulkUpdate = true; + skipBulkUpdate = true; # Broken, see https://github.com/NixOS/nixpkgs/issues/379898 }; meta = { From 5699ec02572a3904db23f15f8f2f482c8b3c6717 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Sun, 2 Feb 2025 14:32:26 -0800 Subject: [PATCH 0451/2168] python3Packages.langgraph-checkpoint-sqlite: 2.0.1 -> 2.0.3 --- .../langgraph-checkpoint-sqlite/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix index 97c9959c536e..149eaf5a2547 100644 --- a/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix +++ b/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix @@ -8,21 +8,18 @@ pytestCheckHook, langgraph-sdk, poetry-core, - pythonOlder, }: buildPythonPackage rec { pname = "langgraph-checkpoint-sqlite"; - version = "2.0.1"; + version = "2.0.3"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; tag = "checkpointsqlite==${version}"; - hash = "sha256-dh+cjcOp6rGFntz82VNfVyetcrQBdBFdXk5xFb0aR5c="; + hash = "sha256-u3tKh63bOu+Ko2YynEfxQ/nGElEfwwTQ6Z1RhqF51Qs="; }; sourceRoot = "${src.name}/libs/checkpoint-sqlite"; @@ -45,10 +42,8 @@ buildPythonPackage rec { ]; passthru = { - updateScript = langgraph-sdk.updateScript; - - # multiple tags confuse the bulk updater - skipBulkUpdate = true; + inherit (langgraph-sdk) updateScript; + skipBulkUpdate = true; # Broken, see https://github.com/NixOS/nixpkgs/issues/379898 }; meta = { From b4014e21f553028204300eedfb6b38261f2cd722 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Sun, 2 Feb 2025 14:59:02 -0800 Subject: [PATCH 0452/2168] python3Packages.langgraph-cli: 0.1.52 -> 0.1.70 --- .../python-modules/langgraph-cli/default.nix | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/langgraph-cli/default.nix b/pkgs/development/python-modules/langgraph-cli/default.nix index 9fbad3120837..ea74852e47d4 100644 --- a/pkgs/development/python-modules/langgraph-cli/default.nix +++ b/pkgs/development/python-modules/langgraph-cli/default.nix @@ -3,16 +3,22 @@ buildPythonPackage, click, fetchFromGitHub, - nix-update-script, poetry-core, + + # for update script + langgraph-sdk, + + # testing pytest-asyncio, pytestCheckHook, + docker-compose, + pythonOlder, }: buildPythonPackage rec { pname = "langgraph-cli"; - version = "0.1.52"; + version = "0.1.71"; pyproject = true; disabled = pythonOlder "3.10"; @@ -21,7 +27,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langgraph"; tag = "cli==${version}"; - hash = "sha256-zTBeDJB1Xu/rWsvEC/L4BRzxyh04lPYV7HQNHoJcskk="; + hash = "sha256-bTW+je4wuoR0YX5T1wdAee4w/T2jMTQybLLpCxouJxA="; }; sourceRoot = "${src.name}/libs/cli"; @@ -33,6 +39,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-asyncio pytestCheckHook + docker-compose ]; pytestFlagsArray = [ "tests/unit_tests" ]; @@ -48,18 +55,15 @@ buildPythonPackage rec { "test_config_to_compose_end_to_end" "test_config_to_compose_simple_config" "test_config_to_compose_watch" + # Tests exit value, needs to happen in a passthru test + "test_dockerfile_command_with_docker_compose" ]; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version-regex" - "cli==(.*)" - ]; + passthru = { + inherit (langgraph-sdk) updateScript; + skipBulkUpdate = true; # Broken, see https://github.com/NixOS/nixpkgs/issues/379898 }; - # multiple tags confuse the bulk updater - passthru.skipBulkUpdate = true; - meta = { description = "Official CLI for LangGraph API"; homepage = "https://github.com/langchain-ai/langgraph/libs/cli"; From 480049f9d321914badfb7a254609fdade1a7d3a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Feb 2025 00:29:13 +0000 Subject: [PATCH 0453/2168] acr: 2.1.4 -> 2.2.0 --- pkgs/by-name/ac/acr/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ac/acr/package.nix b/pkgs/by-name/ac/acr/package.nix index 3b8ba5727c8b..35ffd56daade 100644 --- a/pkgs/by-name/ac/acr/package.nix +++ b/pkgs/by-name/ac/acr/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "acr"; - version = "2.1.4"; + version = "2.2.0"; src = fetchFromGitHub { owner = "radareorg"; repo = "acr"; rev = finalAttrs.version; - hash = "sha256-RPqbL21gxM66Wjov0QVuiFJNAfia+xxF53fNdksU5fQ="; + hash = "sha256-GgF2sen7RcnuXrtLzkeGllMvY65LffR+jPPqUhbsOGk="; }; preConfigure = '' From ff1741e20dc77f83e5f2ad0f5564fd271a01965e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Feb 2025 00:32:14 +0000 Subject: [PATCH 0454/2168] argo: 3.6.2 -> 3.6.3 --- pkgs/by-name/ar/argo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ar/argo/package.nix b/pkgs/by-name/ar/argo/package.nix index 6947234dc673..f4a8825b9554 100644 --- a/pkgs/by-name/ar/argo/package.nix +++ b/pkgs/by-name/ar/argo/package.nix @@ -34,16 +34,16 @@ let in buildGoModule rec { pname = "argo"; - version = "3.6.2"; + version = "3.6.3"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; tag = "v${version}"; - hash = "sha256-GRs6xF9/vZi5LdkDA4RkBR6ElvWi0uji/05h0Y7P2eU="; + hash = "sha256-FbhF/oPWtcDqukeQf+NjfSCieQmrSTKBn3vbRr9IQIE="; }; - vendorHash = "sha256-8+0iBtXNHyLwE6+AeDDQRERt0930kPIjhQ5abqEqey0="; + vendorHash = "sha256-uCIdZkoPgppJtrFf7nOVIyEXo1bVILYXNs5LtLLLmsY="; doCheck = false; From a4fc9eb64e518f4b4aae9d50609229a82c9025fe Mon Sep 17 00:00:00 2001 From: Tom Herbers Date: Sat, 8 Feb 2025 01:39:34 +0100 Subject: [PATCH 0455/2168] batman-adv: 2024.4 -> 2025.0 Changelog: https://www.open-mesh.org/news/120 --- pkgs/os-specific/linux/batman-adv/version.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/batman-adv/version.nix b/pkgs/os-specific/linux/batman-adv/version.nix index 15b32737a6ea..7568be6d053f 100644 --- a/pkgs/os-specific/linux/batman-adv/version.nix +++ b/pkgs/os-specific/linux/batman-adv/version.nix @@ -1,16 +1,14 @@ { - version = "2024.4"; + version = "2025.0"; # To get these, run: # # ``` - # for tool in alfred batctl batman-adv; do - # nix-prefetch-url https://downloads.open-mesh.org/batman/releases/batman-adv-2024.4/$tool-2024.4.tar.gz --type sha256 | xargs nix hash to-sri --type sha256 - # done + # for tool in alfred batctl batman-adv; do nix-prefetch-url https://downloads.open-mesh.org/batman/releases/batman-adv-2025.0/$tool-2025.0.tar.gz --type sha256 | xargs nix hash convert --hash-algo sha256 --to sri; done # ``` sha256 = { - alfred = "sha256-06WtkGtygDbkc1+dZKcrlzHxb4Hz2N9Ay0eFkaO9IpQ="; - batctl = "sha256-5CvfGk7LSxiLzTrKF+EgSWpCtlR1k7kX4//PlD4/KRM="; - batman-adv = "sha256-pVTfb8erzMayQ/Vup7GESGyV6phtsRM/h6r+I32pLyE="; + alfred = "sha256-x7U5aZp0RuoKGLh9uF/Y+SCiv0mnAqkD+ACitygRI4s="; + batctl = "sha256-3V9bcd0XUOuo1p3TrfcHiXQcbPY4zyvyzLwvuE9cFo8="; + batman-adv = "sha256-uQxFRNPPOfbXzZIGEmsWL1EQ+7SYDeltRfvPUDPQhRo="; }; } From d8646f1a35eff90922edf84a532c63e3fca0ad64 Mon Sep 17 00:00:00 2001 From: merrkry Date: Sat, 8 Feb 2025 01:19:33 +0100 Subject: [PATCH 0456/2168] rog-control-center: fix libxkbcommon.so not found crash --- pkgs/by-name/as/asusctl/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/as/asusctl/package.nix b/pkgs/by-name/as/asusctl/package.nix index 9ccab48bdaca..9e3fe7db571b 100644 --- a/pkgs/by-name/as/asusctl/package.nix +++ b/pkgs/by-name/as/asusctl/package.nix @@ -88,6 +88,9 @@ rustPlatform.buildRustPackage rec { postInstall = '' make prefix=$out install-data + + patchelf $out/bin/rog-control-center \ + --add-needed ${lib.getLib libxkbcommon}/lib/libxkbcommon.so.0 ''; meta = with lib; { From 3f0b3d009c044f8ddf2f6fd8e2e7a77fe97a9ada Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Feb 2025 00:44:40 +0000 Subject: [PATCH 0457/2168] slsa-verifier: 2.6.0 -> 2.7.0 --- pkgs/by-name/sl/slsa-verifier/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sl/slsa-verifier/package.nix b/pkgs/by-name/sl/slsa-verifier/package.nix index 4aadc0fe52b9..d42dfd90798b 100644 --- a/pkgs/by-name/sl/slsa-verifier/package.nix +++ b/pkgs/by-name/sl/slsa-verifier/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "slsa-verifier"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "slsa-framework"; repo = "slsa-verifier"; rev = "v${version}"; - hash = "sha256-x9phhfQVeUO7NRjB6n1rdwkpeCu4VMUcJTrkP6PfVyA="; + hash = "sha256-wOK0S0XJ0LbFSr8Z/KEnKolq0u/SyBNDiugOAD0OmgY="; }; - vendorHash = "sha256-HJ3/RY0Co86y1t2Mas5C+rjwRRG4ZJgxjkz9iWcKf5E="; + vendorHash = "sha256-nvksImn3c04ato67oPnYkJj8TgxlP+Pjer+LdvfdhD8="; env.CGO_ENABLED = 0; From 2bafb0e95a6f5b71deaa059feb5a9d5505605dcc Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 8 Feb 2025 01:45:55 +0100 Subject: [PATCH 0458/2168] neovim-node-client: add versionCheckHook and updateScript --- pkgs/by-name/ne/neovim-node-client/package.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ne/neovim-node-client/package.nix b/pkgs/by-name/ne/neovim-node-client/package.nix index 5fe372124b4c..4c000ed895ab 100644 --- a/pkgs/by-name/ne/neovim-node-client/package.nix +++ b/pkgs/by-name/ne/neovim-node-client/package.nix @@ -3,6 +3,8 @@ buildNpmPackage, fetchNpmDeps, fetchFromGitHub, + versionCheckHook, + nix-update-script, }: buildNpmPackage rec { @@ -32,12 +34,23 @@ buildNpmPackage rec { ln -s $out/lib/node_modules/neovim/node_modules/.bin/neovim-node-host $out/bin/neovim-node-host ''; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgram = "${placeholder "out"}/bin/neovim-node-host"; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + + passthru = { + updateScript = nix-update-script { }; + }; + meta = { - mainProgram = "neovim-node-host"; description = "Nvim msgpack API client and remote plugin provider"; homepage = "https://github.com/neovim/node-client"; changelog = "https://github.com/neovim/node-client/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fidgetingbits ]; + mainProgram = "neovim-node-host"; }; } From f4684aef57303a5398cb5261e89b299142abf77d Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 1 Feb 2025 11:07:09 +0800 Subject: [PATCH 0459/2168] pb: 0.5.2 -> 0.6.0 --- pkgs/by-name/pb/pb/package.nix | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/pb/pb/package.nix b/pkgs/by-name/pb/pb/package.nix index d765030fae8b..d9508ef6cb33 100644 --- a/pkgs/by-name/pb/pb/package.nix +++ b/pkgs/by-name/pb/pb/package.nix @@ -2,22 +2,20 @@ lib, buildGoModule, fetchFromGitHub, - testers, - pb, }: buildGoModule rec { pname = "pb"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "parseablehq"; - repo = pname; - rev = "v${version}"; - hash = "sha256-KedO/ngAlabuf3/NPKhutnzLphz6/VxJ+XJvADIP3PQ="; + repo = "pb"; + tag = "v${version}"; + hash = "sha256-OXxLHi7v/xJZVvxHZvJ0eH4MYrlLFxDAMT9CVG2mWTM="; }; - vendorHash = "sha256-RAb2OvN3DF54fsVI5tRtNp1BYwB2qfYome7tj8zxxCY="; + vendorHash = "sha256-N6m0qvj65Ls3yQmVGw0AklsO1zs1KHdi/Y6FZRghnCs="; ldflags = [ "-s" @@ -27,10 +25,7 @@ buildGoModule rec { tags = [ "kqueue" ]; - passthru.tests.version = testers.testVersion { - package = pb; - command = "pb version"; - }; + # Version test has been removed since it requires network access. meta = { homepage = "https://github.com/parseablehq/pb"; From d46c14d61709ca827c98f19c5114b6f59820ed78 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Feb 2025 01:09:21 +0000 Subject: [PATCH 0460/2168] sftpgo: 2.6.4 -> 2.6.5 --- pkgs/by-name/sf/sftpgo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sf/sftpgo/package.nix b/pkgs/by-name/sf/sftpgo/package.nix index bc106eb0bb12..24c44beefa9e 100644 --- a/pkgs/by-name/sf/sftpgo/package.nix +++ b/pkgs/by-name/sf/sftpgo/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "sftpgo"; - version = "2.6.4"; + version = "2.6.5"; src = fetchFromGitHub { owner = "drakkan"; repo = "sftpgo"; tag = "v${version}"; - hash = "sha256-4TGbOoF6cpaqZ3Jh6cAI+Jyk5R35om6NnuMoNRS/LY4="; + hash = "sha256-dxHEcdsdH7/9NQA5m5TwkabsUMUM+Jrp1AnEW/f/Lpw="; }; - vendorHash = "sha256-DYyRcV/QxWFgo+85iG4HW0Fp2+JM86nDQj6GpO3Z9eA="; + vendorHash = "sha256-XSqReUYfqH/NOYnvjJQLbnD4fEJjps7i0fWtujdYqV4="; ldflags = [ "-s" From 41a70217287d4a26f407254e639386cacc8eeab4 Mon Sep 17 00:00:00 2001 From: oluceps Date: Sat, 8 Feb 2025 09:11:03 +0800 Subject: [PATCH 0461/2168] tuic: drop --- pkgs/by-name/tu/tuic/Cargo.lock | 1052 ------------------------------ pkgs/by-name/tu/tuic/package.nix | 43 -- 2 files changed, 1095 deletions(-) delete mode 100644 pkgs/by-name/tu/tuic/Cargo.lock delete mode 100644 pkgs/by-name/tu/tuic/package.nix diff --git a/pkgs/by-name/tu/tuic/Cargo.lock b/pkgs/by-name/tu/tuic/Cargo.lock deleted file mode 100644 index d57b2870b369..000000000000 --- a/pkgs/by-name/tu/tuic/Cargo.lock +++ /dev/null @@ -1,1052 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "async-trait" -version = "0.1.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "base64" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bumpalo" -version = "3.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "bytes" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" - -[[package]] -name = "cc" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "core-foundation" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" - -[[package]] -name = "crossbeam-utils" -version = "0.8.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "env_logger" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" -dependencies = [ - "humantime", - "log", -] - -[[package]] -name = "futures-core" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" - -[[package]] -name = "futures-io" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" - -[[package]] -name = "futures-sink" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" - -[[package]] -name = "futures-task" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" - -[[package]] -name = "futures-util" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" -dependencies = [ - "futures-core", - "futures-io", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "getrandom" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[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.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "lexopt" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baff4b617f7df3d896f97fe922b64817f6cd9a756bb81d40f8883f2f66dcb401" - -[[package]] -name = "libc" -version = "0.2.146" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" - -[[package]] -name = "lock_api" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" -dependencies = [ - "serde", -] - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "mio" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" -dependencies = [ - "libc", - "wasi", - "windows-sys 0.48.0", -] - -[[package]] -name = "num_cpus" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "once_cell" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" -dependencies = [ - "parking_lot_core", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[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.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "proc-macro2" -version = "1.0.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quinn" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21252f1c0fc131f1b69182db8f34837e8a69737b8251dff75636a9be0518c324" -dependencies = [ - "bytes", - "futures-io", - "pin-project-lite", - "quinn-proto", - "quinn-udp", - "rustc-hash", - "rustls", - "thiserror", - "tokio", - "tracing", -] - -[[package]] -name = "quinn-proto" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85af4ed6ee5a89f26a26086e9089a6643650544c025158449a3626ebf72884b3" -dependencies = [ - "bytes", - "rand", - "ring", - "rustc-hash", - "rustls", - "slab", - "thiserror", - "tinyvec", - "tracing", -] - -[[package]] -name = "quinn-udp" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6df19e284d93757a9fb91d63672f7741b129246a669db09d1c0063071debc0c0" -dependencies = [ - "bytes", - "libc", - "socket2 0.5.3", - "tracing", - "windows-sys 0.48.0", -] - -[[package]] -name = "quote" -version = "1.0.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" -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 = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags", -] - -[[package]] -name = "register-count" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6d8b2af7d3e6675306d6757f10b4cf0b218a9fa6a0b44d668f2132684ae4893" - -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin", - "untrusted", - "web-sys", - "winapi", -] - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustls" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e32ca28af694bc1bbf399c33a516dbdf1c90090b8ab23c2bc24f834aa2247f5f" -dependencies = [ - "ring", - "rustls-webpki", - "sct", -] - -[[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", - "schannel", - "security-framework", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" -dependencies = [ - "base64", -] - -[[package]] -name = "rustls-webpki" -version = "0.100.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "ryu" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" - -[[package]] -name = "schannel" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" -dependencies = [ - "windows-sys 0.42.0", -] - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "sct" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "security-framework" -version = "2.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" -dependencies = [ - "bitflags", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "serde" -version = "1.0.164" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.164" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.97" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf3bf93142acad5821c99197022e170842cdbc1c30482b98750c688c640842a" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "slab" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" - -[[package]] -name = "socket2" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "socket2" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" -dependencies = [ - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "socks5-proto" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8d1cbdbbffd5e2418d31ae833045a219062f1740f5f0f34baefa8e5bb2053ff" -dependencies = [ - "byteorder", - "bytes", - "tokio", -] - -[[package]] -name = "socks5-server" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7260a3af0411620eca9c63032069ec9f0d92ef4214e017672c864f573d6a21" -dependencies = [ - "async-trait", - "bytes", - "socks5-proto", - "tokio", -] - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "syn" -version = "2.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "thiserror" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[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 = "tokio" -version = "1.28.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2" -dependencies = [ - "autocfg", - "bytes", - "libc", - "mio", - "num_cpus", - "parking_lot", - "pin-project-lite", - "socket2 0.4.9", - "tokio-macros", - "windows-sys 0.48.0", -] - -[[package]] -name = "tokio-macros" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tokio-util" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" -dependencies = [ - "bytes", - "futures-core", - "futures-io", - "futures-sink", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tracing" -version = "0.1.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" -dependencies = [ - "cfg-if", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tracing-core" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" -dependencies = [ - "once_cell", -] - -[[package]] -name = "tuic" -version = "5.0.0" -dependencies = [ - "bytes", - "futures-util", - "parking_lot", - "register-count", - "thiserror", - "tuic", - "uuid", -] - -[[package]] -name = "tuic-client" -version = "1.0.0" -dependencies = [ - "bytes", - "crossbeam-utils", - "env_logger", - "humantime", - "lexopt", - "log", - "once_cell", - "parking_lot", - "quinn", - "register-count", - "rustls", - "rustls-native-certs", - "rustls-pemfile", - "serde", - "serde_json", - "socket2 0.5.3", - "socks5-proto", - "socks5-server", - "thiserror", - "tokio", - "tokio-util", - "tuic", - "tuic-quinn", - "uuid", -] - -[[package]] -name = "tuic-quinn" -version = "0.1.0" -dependencies = [ - "bytes", - "futures-util", - "quinn", - "thiserror", - "tuic", - "uuid", -] - -[[package]] -name = "tuic-server" -version = "1.0.0" -dependencies = [ - "bytes", - "crossbeam-utils", - "env_logger", - "humantime", - "lexopt", - "log", - "parking_lot", - "quinn", - "register-count", - "rustls", - "rustls-pemfile", - "serde", - "serde_json", - "socket2 0.5.3", - "thiserror", - "tokio", - "tokio-util", - "tuic", - "tuic-quinn", - "uuid", -] - -[[package]] -name = "unicode-ident" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" - -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "uuid" -version = "1.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa2982af2eec27de306107c027578ff7f423d65f7250e40ce0fea8f45248b81" -dependencies = [ - "serde", -] - -[[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.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" - -[[package]] -name = "web-sys" -version = "0.3.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "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-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" -dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", -] - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" diff --git a/pkgs/by-name/tu/tuic/package.nix b/pkgs/by-name/tu/tuic/package.nix deleted file mode 100644 index 17fbd99fd0bf..000000000000 --- a/pkgs/by-name/tu/tuic/package.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rustPlatform, - darwin, -}: - -rustPlatform.buildRustPackage rec { - pname = "tuic"; - version = "1.0.0"; - - src = fetchFromGitHub { - owner = "EAimTY"; - repo = pname; - rev = "tuic-server-${version}"; - hash = "sha256-VoNr91vDqBlt9asT/dwCeYk13UNiDexNNiKwD5DSn8k="; - }; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - ] - ); - - postPatch = '' - ln -sf ${./Cargo.lock} Cargo.lock - ''; - - cargoLock.lockFile = ./Cargo.lock; - - # doc test will fail in this version - checkFlags = [ "--skip=lib" ]; - - meta = with lib; { - homepage = "https://github.com/EAimTY/tuic"; - description = "Delicately-TUICed 0-RTT proxy protocol"; - license = licenses.gpl3Only; - platforms = platforms.unix; - maintainers = with maintainers; [ oluceps ]; - }; -} From 52c912847694c4847af2593b89e39a2c5630a2bc Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 7 Feb 2025 23:48:06 +0800 Subject: [PATCH 0462/2168] nixos/tests/pantheon: Pgrep io.elementary.files.xdg-desktop-portal Hopefully this is less flaky. --- nixos/tests/pantheon-wayland.nix | 3 +-- nixos/tests/pantheon.nix | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/nixos/tests/pantheon-wayland.nix b/nixos/tests/pantheon-wayland.nix index 2a99c6cb1272..74bc57eae78c 100644 --- a/nixos/tests/pantheon-wayland.nix +++ b/nixos/tests/pantheon-wayland.nix @@ -69,8 +69,7 @@ import ./make-test-python.nix ( # https://github.com/elementary/gala/pull/2140 for i in ["gala", "io.elementary.wingpanel", "io.elementary.dock", "gsd-media-keys", "gsd-xsettings", "io.elementary.desktop.agent-polkit"]: machine.wait_until_succeeds(f"pgrep -f {i}") - for i in ["io.elementary.files.xdg-desktop-portal.service"]: - machine.wait_for_unit(i, "${user.name}") + machine.wait_until_succeeds("pgrep -xf ${pkgs.pantheon.elementary-files}/libexec/io.elementary.files.xdg-desktop-portal") with subtest("Check if various environment variables are set"): cmd = "xargs --null --max-args=1 echo < /proc/$(pgrep -xf ${pkgs.pantheon.gala}/bin/gala)/environ" diff --git a/nixos/tests/pantheon.nix b/nixos/tests/pantheon.nix index 7a19d6432fb0..b29c6ca6ce8b 100644 --- a/nixos/tests/pantheon.nix +++ b/nixos/tests/pantheon.nix @@ -60,8 +60,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : machine.wait_until_succeeds(f"pgrep -f {i}") for i in ["gala", "io.elementary.wingpanel", "io.elementary.dock"]: machine.wait_for_window(i) - for i in ["io.elementary.files.xdg-desktop-portal.service"]: - machine.wait_for_unit(i, "${user.name}") + machine.wait_until_succeeds("pgrep -xf ${pkgs.pantheon.elementary-files}/libexec/io.elementary.files.xdg-desktop-portal") with subtest("Check if various environment variables are set"): cmd = "xargs --null --max-args=1 echo < /proc/$(pgrep -xf ${pkgs.pantheon.gala}/bin/gala)/environ" From 85f968e054340bc15a3b6fb28474a2223d689eb9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Feb 2025 01:18:31 +0000 Subject: [PATCH 0463/2168] fast-downward: 24.06.0 -> 24.06.1 --- pkgs/by-name/fa/fast-downward/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fa/fast-downward/package.nix b/pkgs/by-name/fa/fast-downward/package.nix index e74ef6423e86..500aa339baa4 100644 --- a/pkgs/by-name/fa/fast-downward/package.nix +++ b/pkgs/by-name/fa/fast-downward/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fast-downward"; - version = "24.06.0"; + version = "24.06.1"; src = fetchFromGitHub { owner = "aibasel"; repo = "downward"; rev = "release-${version}"; - sha256 = "sha256-iIBoJZCFd05bKUeftvl2YBTmSQuFvATIQAYMITDywWA="; + sha256 = "sha256-JwBdV44h6LAJeIjKHPouvb3ZleydAc55QiuaFGrFx1Y="; }; nativeBuildInputs = [ From fa1cd7ab89351153944d83fb11de25fccaf6e46c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Feb 2025 01:19:10 +0000 Subject: [PATCH 0464/2168] pdns: 4.9.3 -> 4.9.4 --- pkgs/by-name/pd/pdns/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pd/pdns/package.nix b/pkgs/by-name/pd/pdns/package.nix index b2b0798e9570..b889ad441072 100644 --- a/pkgs/by-name/pd/pdns/package.nix +++ b/pkgs/by-name/pd/pdns/package.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "pdns"; - version = "4.9.3"; + version = "4.9.4"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-${finalAttrs.version}.tar.bz2"; - hash = "sha256-suZwRqe5WCXDXdyRGe1uLoU1N6V20MTukIC7XwrT6NU="; + hash = "sha256-ysRm18sFZDTGBjLlVL5QVDywzs2dOzO7V4XBSbWXn8E="; }; # redact configure flags from version output to reduce closure size patches = [ ./version.patch ]; From f7ef0c35ac9609f9ba08755f9710b2fa5980d29d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 8 Feb 2025 07:29:59 +0800 Subject: [PATCH 0465/2168] qogir-icon-theme: Temporarily set dontCheckForBrokenSymlinks To unbreak nixosTests.budgie. --- pkgs/by-name/qo/qogir-icon-theme/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/qo/qogir-icon-theme/package.nix b/pkgs/by-name/qo/qogir-icon-theme/package.nix index 97ce4e435935..179b138e60fa 100644 --- a/pkgs/by-name/qo/qogir-icon-theme/package.nix +++ b/pkgs/by-name/qo/qogir-icon-theme/package.nix @@ -39,6 +39,8 @@ lib.checkListOfEnum "${pname}: color variants" [ "standard" "dark" "all" ] color propagatedBuildInputs = [ hicolor-icon-theme ]; + # FIXME: https://hydra.nixos.org/build/286997490/nixlog/5 + dontCheckForBrokenSymlinks = true; dontDropIconThemeCache = true; # These fixup steps are slow and unnecessary. From d339cc6d0dc7fcef02e335d5ce4bc9da2a791ead Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 8 Feb 2025 09:11:36 +0800 Subject: [PATCH 0466/2168] nixos/tests/cinnamon: Scale slick-greeter for OCR tests Otherwise it sometimes fails to find Alice Foobar for me. --- nixos/tests/cinnamon.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/tests/cinnamon.nix b/nixos/tests/cinnamon.nix index e52146568ae5..34777f8ee7b2 100644 --- a/nixos/tests/cinnamon.nix +++ b/nixos/tests/cinnamon.nix @@ -18,6 +18,11 @@ import ./make-test-python.nix ( # For the sessionPath subtest. services.xserver.desktopManager.cinnamon.sessionPath = [ pkgs.gpaste ]; + + # For OCR test. + services.xserver.displayManager.lightdm.greeters.slick.extraConfig = '' + enable-hidpi = on + ''; }; enableOCR = true; From c1193da08af5e4638d948f2215b8c5e2c735649b Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 8 Feb 2025 11:22:50 +1000 Subject: [PATCH 0467/2168] python3Packages.mkdocs-redirects: switch to pyproject, hatchling was done upstream in https://github.com/mkdocs/mkdocs-redirects/commit/f3d0e12c982f3b25b4b7d128eba1704b8a60ff17 which was included in the 1.2.2 release --- pkgs/development/python-modules/mkdocs-redirects/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/mkdocs-redirects/default.nix b/pkgs/development/python-modules/mkdocs-redirects/default.nix index 6ffc9d975689..6a2d973b1af6 100644 --- a/pkgs/development/python-modules/mkdocs-redirects/default.nix +++ b/pkgs/development/python-modules/mkdocs-redirects/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + hatchling, mkdocs, pytestCheckHook, }: @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "mkdocs-redirects"; version = "1.2.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "mkdocs"; @@ -18,6 +19,8 @@ buildPythonPackage rec { hash = "sha256-YsMA00yajeGSqSB6CdKxGqyClC9Cgc3ImRBTucHEHhs="; }; + build-system = [ hatchling ]; + propagatedBuildInputs = [ mkdocs ]; nativeCheckInputs = [ pytestCheckHook ]; From 1a7364dbbf24d748f9b6658f3a45cc5425e2ce99 Mon Sep 17 00:00:00 2001 From: YooLc Date: Sat, 8 Feb 2025 10:20:13 +0800 Subject: [PATCH 0468/2168] feishu: fix broken symlink to curl --- pkgs/by-name/fe/feishu/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/fe/feishu/package.nix b/pkgs/by-name/fe/feishu/package.nix index 9cc30fcf92c6..9ceb57eb3fda 100644 --- a/pkgs/by-name/fe/feishu/package.nix +++ b/pkgs/by-name/fe/feishu/package.nix @@ -204,7 +204,7 @@ stdenv.mkDerivation { # and has many dependencies that are hard to satisfy # e.g. openldap version 2.4 # so replace it with our own libcurl.so - ln -sf ${curl}/lib/libcurl.so $out/opt/bytedance/feishu/libcurl.so + ln -sf ${curl.out}/lib/libcurl.so $out/opt/bytedance/feishu/libcurl.so ''; passthru = { From 8393b3761f3b50661911afa572e80e0e6c996a1f Mon Sep 17 00:00:00 2001 From: Matt Moriarity Date: Fri, 7 Feb 2025 20:03:40 -0700 Subject: [PATCH 0469/2168] inv-sig-helper: 0-unstable-2025-01-31 -> 0-unstable-2025-02-07 --- pkgs/by-name/in/inv-sig-helper/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/in/inv-sig-helper/package.nix b/pkgs/by-name/in/inv-sig-helper/package.nix index 84c80d6caa50..716af6e814b7 100644 --- a/pkgs/by-name/in/inv-sig-helper/package.nix +++ b/pkgs/by-name/in/inv-sig-helper/package.nix @@ -16,17 +16,17 @@ rustPlatform.buildRustPackage { pname = "inv-sig-helper"; - version = "0-unstable-2025-01-31"; + version = "0-unstable-2025-02-07"; src = fetchFromGitHub { owner = "iv-org"; repo = "inv_sig_helper"; - rev = "40835906774cc7cdefa76b2648216afd063ad0e2"; - hash = "sha256-yjVN81VSXPOXSOhhlF6Jjc/7sYsdoWT+Tr1BA+C2XQI="; + rev = "ac006283c0b6821c856d6293c2ce49b61fa8c46a"; + hash = "sha256-cQXWo+idyfFeJ2nnT8HKgjCd0Htc4pOE6aODsl3sf/8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-4SuddTLbENm9D+v/DB86hJ7LNchbcwm5on3aAtUiVcc="; + cargoHash = "sha256-DnJL7kkcVn5dW3AoPCn829WmkaCjpDZtYUXnpiB857Q="; nativeBuildInputs = [ pkg-config From bd01ca1647f587adf67574556e95f1f65082414f Mon Sep 17 00:00:00 2001 From: Matt Moriarity Date: Fri, 7 Feb 2025 20:37:16 -0700 Subject: [PATCH 0470/2168] peertube: don't check for broken symlinks --- pkgs/servers/peertube/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/peertube/default.nix b/pkgs/servers/peertube/default.nix index 3b52900577af..a43d959baff1 100644 --- a/pkgs/servers/peertube/default.nix +++ b/pkgs/servers/peertube/default.nix @@ -77,6 +77,9 @@ stdenv.mkDerivation rec { hash = "sha256-x5qFCprn8q0xC88HudLV7W53X1Nkbz3F52RMp2PxIu8="; }; + # There are broken symlinks in the node_modules + dontCheckForBrokenSymlinks = true; + outputs = [ "out" "cli" From 3ef0b7d54955bc40dbdb249f31d29db3c5ed427f Mon Sep 17 00:00:00 2001 From: linsui <36977733+linsui@users.noreply.github.com> Date: Sat, 8 Feb 2025 12:18:08 +0800 Subject: [PATCH 0471/2168] python3Packages.dataset: use sqlalchemy_1_4 --- pkgs/development/python-modules/dataset/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/dataset/default.nix b/pkgs/development/python-modules/dataset/default.nix index 778082fc276f..88ba3b024da0 100644 --- a/pkgs/development/python-modules/dataset/default.nix +++ b/pkgs/development/python-modules/dataset/default.nix @@ -5,7 +5,7 @@ buildPythonPackage, fetchPypi, pythonOlder, - sqlalchemy, + sqlalchemy_1_4, }: buildPythonPackage rec { @@ -21,9 +21,11 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - alembic + (alembic.override { sqlalchemy = sqlalchemy_1_4; }) banal - sqlalchemy + # SQLAlchemy >= 2.0.0 is unsupported + # https://github.com/pudo/dataset/issues/411 + sqlalchemy_1_4 ]; # checks attempt to import nonexistent module 'test.test' and fail @@ -36,8 +38,5 @@ buildPythonPackage rec { homepage = "https://dataset.readthedocs.io"; license = licenses.mit; maintainers = with maintainers; [ xfnw ]; - # SQLAlchemy >= 2.0.0 is unsupported - # https://github.com/pudo/dataset/issues/411 - broken = true; }; } From fb051bd15a05d9502fc255dff87a752cdaa69422 Mon Sep 17 00:00:00 2001 From: linsui <36977733+linsui@users.noreply.github.com> Date: Sat, 8 Feb 2025 12:18:48 +0800 Subject: [PATCH 0472/2168] python3Packages.androguard: fix 4.1.2 --- .../python-modules/androguard/default.nix | 30 ++++++++++++------- .../drop-removed-networkx-formats.patch | 14 --------- .../python-modules/androguard/fix-tests.patch | 26 ---------------- 3 files changed, 19 insertions(+), 51 deletions(-) delete mode 100644 pkgs/development/python-modules/androguard/drop-removed-networkx-formats.patch delete mode 100644 pkgs/development/python-modules/androguard/fix-tests.patch diff --git a/pkgs/development/python-modules/androguard/default.nix b/pkgs/development/python-modules/androguard/default.nix index 67303275d78c..f98f379c5fb7 100644 --- a/pkgs/development/python-modules/androguard/default.nix +++ b/pkgs/development/python-modules/androguard/default.nix @@ -2,19 +2,25 @@ lib, buildPythonPackage, fetchFromGitHub, - setuptools, - future, + poetry-core, + apkinspector, networkx, pygments, lxml, colorama, + cryptography, + dataset, + frida-python, + loguru, matplotlib, asn1crypto, click, + mutf8, + pyyaml, pydot, ipython, + oscrypto, pyqt5, - pyperclip, pytestCheckHook, python-magic, qt5, @@ -39,38 +45,40 @@ buildPythonPackage rec { sha256 = "sha256-rBoYqhkjDcLhv1VVlIt5Uj05MyBk+QbLD1aCjQkrmqw="; }; - patches = [ - ./drop-removed-networkx-formats.patch - ./fix-tests.patch + build-system = [ + poetry-core ]; - build-system = [ setuptools ]; - nativeBuildInputs = lib.optionals withGui [ qt5.wrapQtAppsHook ]; dependencies = [ + apkinspector asn1crypto click colorama - future + cryptography + dataset + frida-python ipython + loguru lxml matplotlib + mutf8 networkx + oscrypto pydot pygments + pyyaml ] ++ networkx.optional-dependencies.default ++ networkx.optional-dependencies.extra ++ lib.optionals withGui [ pyqt5 - pyperclip ]; nativeCheckInputs = [ pytestCheckHook - pyperclip pyqt5 python-magic ]; diff --git a/pkgs/development/python-modules/androguard/drop-removed-networkx-formats.patch b/pkgs/development/python-modules/androguard/drop-removed-networkx-formats.patch deleted file mode 100644 index 214fbaa2dafd..000000000000 --- a/pkgs/development/python-modules/androguard/drop-removed-networkx-formats.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/androguard/cli/main.py b/androguard/cli/main.py -index 13bc1d0ab7..a79b4fe5fa 100644 ---- a/androguard/cli/main.py -+++ b/androguard/cli/main.py -@@ -110,9 +110,7 @@ - - write_methods = dict(gml=_write_gml, - gexf=nx.write_gexf, -- gpickle=nx.write_gpickle, - graphml=nx.write_graphml, -- yaml=nx.write_yaml, - net=nx.write_pajek, - ) - diff --git a/pkgs/development/python-modules/androguard/fix-tests.patch b/pkgs/development/python-modules/androguard/fix-tests.patch deleted file mode 100644 index 267f839eb91b..000000000000 --- a/pkgs/development/python-modules/androguard/fix-tests.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/tests/dataflow_test.py b/tests/dataflow_test.py -index e9ac3cdb..edef8200 100644 ---- a/tests/dataflow_test.py -+++ b/tests/dataflow_test.py -@@ -5,7 +5,7 @@ import sys - sys.path.append('.') - - import collections --import mock -+from unittest import mock - import unittest - from androguard.decompiler.dad import dataflow - from androguard.decompiler.dad import graph -diff --git a/tests/test_types.py b/tests/test_types.py -index 127dfc20..f1c89f07 100644 ---- a/tests/test_types.py -+++ b/tests/test_types.py -@@ -182,7 +182,7 @@ class TypesTest(unittest.TestCase): - for i in filter(lambda x: 'const' in x.get_name(), method.get_instructions()): - i.show(0) - # ins should only have one literal -- self.assertEquals(len(i.get_literals()), 1) -+ self.assertEqual(len(i.get_literals()), 1) - - fmt, value = VALUES[method.full_name].pop(0) - converted = format_value(i.get_literals()[0], i, fmt) From 6791ba35d50610a6de7d21807945caa9d0fd11a8 Mon Sep 17 00:00:00 2001 From: oluceps Date: Sat, 8 Feb 2025 13:32:28 +0800 Subject: [PATCH 0473/2168] tuic: remove --- pkgs/top-level/aliases.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4120b6f45bdd..0eec1a762dc0 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1426,6 +1426,8 @@ mapAliases { typst-fmt = typstfmt; # Added 2023-07-15 typst-lsp = throw "'typst-lsp' has been removed due to lack of upstream maintenance, consider using 'tinymist' instead"; # Added 2025-01-25 typst-preview = throw "The features of 'typst-preview' have been consolidated to 'tinymist', an all-in-one language server for typst"; # Added 2024-07-07 + tuic = throw "`tuic` has been removed due to lack of upstream maintenance, consider using other tuic implementations"; # Added 2025-02-08 + ### U ### From abf2fe76a8927cddf842782763578636ee5999c1 Mon Sep 17 00:00:00 2001 From: Mitchell Pleune Date: Sat, 8 Feb 2025 07:02:10 +0000 Subject: [PATCH 0474/2168] cpuinfo: disable tests The tests look to identify the host cpu, and will fail they cannot. --- pkgs/by-name/cp/cpuinfo/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/cp/cpuinfo/package.nix b/pkgs/by-name/cp/cpuinfo/package.nix index 357e71fa0379..455e6f3d34e9 100644 --- a/pkgs/by-name/cp/cpuinfo/package.nix +++ b/pkgs/by-name/cp/cpuinfo/package.nix @@ -37,7 +37,11 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "USE_SYSTEM_LIBS" true) ]; - doCheck = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); + # The tests check what CPU the host has and makes sure it can query information. + # not all build environments may have this information availaible. And, cpuinfo may + # not understand all CPUs (causing test failures such as https://github.com/pytorch/cpuinfo/issues/132) + # Instead, allow building in any environment. + doCheck = false; meta = { description = "Tools and library to detect essential for performance optimization information about host CPU"; From b6c8f0a8979fd377b9d158701b4292950ad00280 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 6 Feb 2025 11:18:00 +0100 Subject: [PATCH 0475/2168] udev: choose implementation with availableOn check This means we don't have to repeat the list of platforms we can't use systemd on, and can instead rely on the list in systemd's derivation. This means that the right thing will happen on other platforms that can't use systemd, one example being microblaze. --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e7a7b20e32e..900b41006d34 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12402,8 +12402,8 @@ with pkgs; }; udev = - if (with stdenv.hostPlatform; isLinux && isStatic) then libudev-zero - else systemdLibs; + if lib.meta.availableOn stdenv.hostPlatform systemdLibs then systemdLibs + else libudev-zero; sysvtools = sysvinit.override { withoutInitTools = true; From f51384492939c906342c96cbac0b352309d685a9 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Sat, 8 Feb 2025 08:22:32 +0000 Subject: [PATCH 0476/2168] python313Packages.sacrebleu: refactor, add missing setuptools-scm --- .../python-modules/sacrebleu/default.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/sacrebleu/default.nix b/pkgs/development/python-modules/sacrebleu/default.nix index c9f167bbf2ee..01cd4961d213 100644 --- a/pkgs/development/python-modules/sacrebleu/default.nix +++ b/pkgs/development/python-modules/sacrebleu/default.nix @@ -3,6 +3,9 @@ buildPythonPackage, fetchFromGitHub, + # build-system + setuptools-scm, + # Propagated build inputs portalocker, regex, @@ -20,21 +23,18 @@ let in buildPythonPackage { inherit pname version; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "mjpost"; - repo = pname; + repo = "sacrebleu"; tag = "v${version}"; hash = "sha256-ErssNc8X376E26maGJo/P19CA7FDxZ4/h6mgRB+YNZc="; }; - # postPatch = '' - # substituteInPlace setup.py \ - # --replace "portalocker==" "portalocker>=" - # ''; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ portalocker regex tabulate @@ -43,7 +43,7 @@ buildPythonPackage { lxml ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTestPaths = [ # require network access @@ -57,12 +57,12 @@ buildPythonPackage { pythonImportsCheck = [ "sacrebleu" ]; - meta = with lib; { + meta = { description = "Hassle-free computation of shareable, comparable, and reproducible BLEU, chrF, and TER scores"; mainProgram = "sacrebleu"; homepage = "https://github.com/mjpost/sacrebleu"; - changelog = "https://github.com/mjpost/sacrebleu/blob/v{version}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ happysalada ]; + changelog = "https://github.com/mjpost/sacrebleu/blob/v${version}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ happysalada ]; }; } From 22b3d78d9f8a68bcbc8a4de2fe9aae21fe80187c Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Sat, 8 Feb 2025 08:22:32 +0000 Subject: [PATCH 0477/2168] python313Packages.sacrebleu: 2.5.0 -> 2.5.1 https://github.com/mjpost/sacrebleu/blob/v2.5.1/CHANGELOG.md https://github.com/mjpost/sacrebleu/compare/refs/tags/v2.5.0...refs/tags/v2.5.1 --- pkgs/development/python-modules/sacrebleu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sacrebleu/default.nix b/pkgs/development/python-modules/sacrebleu/default.nix index 01cd4961d213..72ea5077cd80 100644 --- a/pkgs/development/python-modules/sacrebleu/default.nix +++ b/pkgs/development/python-modules/sacrebleu/default.nix @@ -19,7 +19,7 @@ }: let pname = "sacrebleu"; - version = "2.5.0"; + version = "2.5.1"; in buildPythonPackage { inherit pname version; @@ -29,7 +29,7 @@ buildPythonPackage { owner = "mjpost"; repo = "sacrebleu"; tag = "v${version}"; - hash = "sha256-ErssNc8X376E26maGJo/P19CA7FDxZ4/h6mgRB+YNZc="; + hash = "sha256-nLZotWQLrN9hB1fBuDJkvGr4SMvQz8Ucl8ybpNhf9Ic="; }; build-system = [ setuptools-scm ]; From 8e9875265f6504b27ceb18ee97b22c81bc9ddfa1 Mon Sep 17 00:00:00 2001 From: javigomezo Date: Sat, 8 Feb 2025 09:16:54 +0100 Subject: [PATCH 0478/2168] keepalived: add meta.mainProgram --- pkgs/by-name/ke/keepalived/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ke/keepalived/package.nix b/pkgs/by-name/ke/keepalived/package.nix index 7e2e8526a649..338c1908eecc 100644 --- a/pkgs/by-name/ke/keepalived/package.nix +++ b/pkgs/by-name/ke/keepalived/package.nix @@ -60,5 +60,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.raitobezarius ]; + mainProgram = "keepalived"; }; } From 6293f614787c863a88a6f0ba8d38534383dbaeb1 Mon Sep 17 00:00:00 2001 From: Isidor Zeuner Date: Tue, 2 Jan 2024 15:53:57 +0100 Subject: [PATCH 0479/2168] rakarrack: fix ALSA plugins load path --- pkgs/applications/audio/rakarrack/default.nix | 35 ++++++++++++++++--- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/rakarrack/default.nix b/pkgs/applications/audio/rakarrack/default.nix index e78502eb23f7..a5e0ca3a1819 100644 --- a/pkgs/applications/audio/rakarrack/default.nix +++ b/pkgs/applications/audio/rakarrack/default.nix @@ -1,7 +1,21 @@ -{ lib, stdenv, fetchurl, alsa-lib, alsa-utils, fltk, libjack2, libXft, -libXpm, libjpeg, libpng, libsamplerate, libsndfile, zlib }: +{ + lib, + stdenv, + fetchurl, + alsa-lib-with-plugins, + alsa-utils, + fltk, + libjack2, + libXft, + libXpm, + libjpeg, + libpng, + libsamplerate, + libsndfile, + zlib, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "rakarrack"; version = "0.6.1"; @@ -14,8 +28,19 @@ stdenv.mkDerivation rec { patches = [ ./fltk-path.patch ]; - buildInputs = [ alsa-lib alsa-utils fltk libjack2 libXft libXpm libjpeg - libpng libsamplerate libsndfile zlib ]; + buildInputs = [ + alsa-lib-with-plugins + alsa-utils + fltk + libjack2 + libXft + libXpm + libjpeg + libpng + libsamplerate + libsndfile + zlib + ]; meta = with lib; { description = "Multi-effects processor emulating a guitar effects pedalboard"; From 5c5a3e9d383b29839bc8074f73c85a0d2b3af31b Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Sat, 8 Feb 2025 10:35:47 +0100 Subject: [PATCH 0480/2168] signalbackup-tools: 20250202 -> 20250207 Diff: https://github.com/bepaald/signalbackup-tools/compare/20250202...20250207 --- pkgs/by-name/si/signalbackup-tools/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix index 917e9946c1b3..4c86cc146f16 100644 --- a/pkgs/by-name/si/signalbackup-tools/package.nix +++ b/pkgs/by-name/si/signalbackup-tools/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20250202"; + version = "20250207"; src = fetchFromGitHub { owner = "bepaald"; repo = "signalbackup-tools"; rev = version; - hash = "sha256-RYklp/jrp/bdS6tuIBHSgF1GJYnYydj4fcwsgcuZPeY="; + hash = "sha256-pFaL6BWD6Kaw8fJhrPL7b2iDKjHr99gkytP5Kosf7Gw="; }; nativeBuildInputs = [ From 7c30daaa70c03e826547e92034beb90d48de593d Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Sat, 8 Feb 2025 10:18:19 +0100 Subject: [PATCH 0481/2168] python312Packages.msal-extensions: disable failing tests on darwin Signed-off-by: Florian Brandes --- .../msal-extensions/default.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/msal-extensions/default.nix b/pkgs/development/python-modules/msal-extensions/default.nix index cedd3f2a1c38..5ee21cb824a9 100644 --- a/pkgs/development/python-modules/msal-extensions/default.nix +++ b/pkgs/development/python-modules/msal-extensions/default.nix @@ -5,6 +5,7 @@ msal, portalocker, setuptools, + stdenv, pythonOlder, pytestCheckHook, }: @@ -34,12 +35,18 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - disabledTests = [ - # `from gi.repository import Secret` fails to find libsecret - "test_token_cache_roundtrip_with_persistence_builder" - "test_libsecret_persistence" - "test_nonexistent_libsecret_persistence" - ]; + disabledTests = + [ + # `from gi.repository import Secret` fails to find libsecret + "test_token_cache_roundtrip_with_persistence_builder" + "test_libsecret_persistence" + "test_nonexistent_libsecret_persistence" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # msal_extensions.osx.KeychainError + "test_keychain_roundtrip" + "test_keychain_persistence" + ]; pythonImportsCheck = [ "msal_extensions" ]; From cb8f1fa80b7e5aa9da8554e61e8a5c30d5bfd195 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Sat, 8 Feb 2025 09:50:42 +0100 Subject: [PATCH 0482/2168] pgadmin4: 8.12 -> 9.0 Signed-off-by: Florian Brandes --- pkgs/tools/admin/pgadmin/default.nix | 9 +- pkgs/tools/admin/pgadmin/yarn.lock | 5810 +++++++++++++------------- 2 files changed, 2880 insertions(+), 2939 deletions(-) diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index 57300e9798a3..55ca22d1b40d 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -16,14 +16,14 @@ let pname = "pgadmin"; - version = "8.12"; - yarnHash = "sha256-C5CI8oP9vEana3OEs1yAsSSTvO2uLEuCU1nHhC7LerY="; + version = "9.0"; + yarnHash = "sha256-CVanJx4gmhtiCMpmDzViY/kw9cu9ey0S6r5SPZKzVxA="; src = fetchFromGitHub { owner = "pgadmin-org"; repo = "pgadmin4"; rev = "REL-${lib.versions.major version}_${lib.versions.minor version}"; - hash = "sha256-OIFHaU+Ty0xJn42iqYhse8dfFJZpx8AV/10RNxp1Y4o="; + hash = "sha256-WscqFuxdy29SIaTfKgKu7pKcQrU0f6tNvC7BifaDnYQ="; }; # keep the scope, as it is used throughout the derivation and tests @@ -78,7 +78,7 @@ pythonPackages.buildPythonApplication rec { sed 's|*|0|g' -i requirements.txt # remove packageManager from package.json so we can work without corepack substituteInPlace web/package.json \ - --replace-fail "\"packageManager\": \"yarn@3.8.3\"" "\"\": \"\"" + --replace-fail "\"packageManager\": \"yarn@3.8.7\"" "\"\": \"\"" substituteInPlace pkg/pip/setup_pip.py \ --replace-fail "req = req.replace('psycopg[c]', 'psycopg[binary]')" "req = req" ${lib.optionalString (!server-mode) '' @@ -196,7 +196,6 @@ pythonPackages.buildPythonApplication rec { azure-identity sphinxcontrib-youtube dnspython - greenlet speaklater3 google-auth-oauthlib google-api-python-client diff --git a/pkgs/tools/admin/pgadmin/yarn.lock b/pkgs/tools/admin/pgadmin/yarn.lock index a4203d6f3763..178074ad0700 100644 --- a/pkgs/tools/admin/pgadmin/yarn.lock +++ b/pkgs/tools/admin/pgadmin/yarn.lock @@ -3,9 +3,9 @@ "@adobe/css-tools@^4.4.0": - version "4.4.0" - resolved "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.4.0.tgz#728c484f4e10df03d5a3acd0d8adcbbebff8ad63" - integrity sha512-Ff9+ksdQQB3rMncgqDK78uLznstjyfIf2Arnh22pW8kBpLs6rpKDwgnZT46hin5Hl1WzazzK64DOrhSwYpS7bQ== + version "4.4.1" + resolved "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.4.1.tgz#2447a230bfe072c1659e6815129c03cf170710e3" + integrity sha512-12WGKBQzjUAI4ayyF4IAtfw2QR/IDoqk6jTddXDhtYTJF9ASmoE1zst7cVtP0aL/F1jUJL5r+JxKXKEgHNbEUQ== "@ampproject/remapping@^2.2.0": version "2.3.0" @@ -15,118 +15,112 @@ "@jridgewell/gen-mapping" "^0.3.5" "@jridgewell/trace-mapping" "^0.3.24" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz#882fd9e09e8ee324e496bd040401c6f046ef4465" - integrity sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA== +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.25.9", "@babel/code-frame@^7.26.2": + version "7.26.2" + resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz#4b5fab97d33338eff916235055f0ebc21e573a85" + integrity sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ== dependencies: - "@babel/highlight" "^7.24.7" + "@babel/helper-validator-identifier" "^7.25.9" + js-tokens "^4.0.0" picocolors "^1.0.0" -"@babel/compat-data@^7.20.5", "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.25.2", "@babel/compat-data@^7.25.4": - version "7.25.4" - resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.4.tgz#7d2a80ce229890edcf4cc259d4d696cb4dae2fcb" - integrity sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ== +"@babel/compat-data@^7.20.5", "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.26.5": + version "7.26.5" + resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.5.tgz#df93ac37f4417854130e21d72c66ff3d4b897fc7" + integrity sha512-XvcZi1KWf88RVbF9wn8MN6tYFloU5qX8KjuF3E1PVBmJ9eypXfs4GRiJwLuTZL0iSnJUKn1BFPa5BPZZJyFzPg== "@babel/core@^7.10.2", "@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.21.3", "@babel/core@^7.23.9": - version "7.25.2" - resolved "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz#ed8eec275118d7613e77a352894cd12ded8eba77" - integrity sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA== + version "7.26.7" + resolved "https://registry.npmjs.org/@babel/core/-/core-7.26.7.tgz#0439347a183b97534d52811144d763a17f9d2b24" + integrity sha512-SRijHmF0PSPgLIBYlWnG0hyeJLwXE2CgpsXaMOrtt2yp9/86ALw6oUlj9KYuZ0JN07T4eBMVIW4li/9S1j2BGA== dependencies: "@ampproject/remapping" "^2.2.0" - "@babel/code-frame" "^7.24.7" - "@babel/generator" "^7.25.0" - "@babel/helper-compilation-targets" "^7.25.2" - "@babel/helper-module-transforms" "^7.25.2" - "@babel/helpers" "^7.25.0" - "@babel/parser" "^7.25.0" - "@babel/template" "^7.25.0" - "@babel/traverse" "^7.25.2" - "@babel/types" "^7.25.2" + "@babel/code-frame" "^7.26.2" + "@babel/generator" "^7.26.5" + "@babel/helper-compilation-targets" "^7.26.5" + "@babel/helper-module-transforms" "^7.26.0" + "@babel/helpers" "^7.26.7" + "@babel/parser" "^7.26.7" + "@babel/template" "^7.25.9" + "@babel/traverse" "^7.26.7" + "@babel/types" "^7.26.7" convert-source-map "^2.0.0" debug "^4.1.0" gensync "^1.0.0-beta.2" json5 "^2.2.3" semver "^6.3.1" -"@babel/eslint-parser@^7.24.7": - version "7.25.1" - resolved "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.25.1.tgz#469cee4bd18a88ff3edbdfbd227bd20e82aa9b82" - integrity sha512-Y956ghgTT4j7rKesabkh5WeqgSFZVFwaPR0IWFm7KFHFmmJ4afbG49SmfW4S+GyRPx0Dy5jxEWA5t0rpxfElWg== +"@babel/eslint-parser@^7.26.5": + version "7.26.5" + resolved "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.26.5.tgz#aa669f4d873f9cd617050cf3c40c19cd96307efb" + integrity sha512-Kkm8C8uxI842AwQADxl0GbcG1rupELYLShazYEZO/2DYjhyWXJIOUVOE3tBYm6JXzUCNJOZEzqc4rCW/jsEQYQ== dependencies: "@nicolo-ribaudo/eslint-scope-5-internals" "5.1.1-v1" eslint-visitor-keys "^2.1.0" semver "^6.3.1" "@babel/eslint-plugin@^7.24.7": - version "7.25.1" - resolved "https://registry.npmjs.org/@babel/eslint-plugin/-/eslint-plugin-7.25.1.tgz#fc7fff590ab566c9d643fdecf346b69064157ef9" - integrity sha512-jF04YOsrCbEeQk4s+FwsuRddwBiAHooMDG9/nrV83HiYQwEuQppbXTeXyydxCoH5oEWmVBI51wHuZrcIXMkPfw== + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/eslint-plugin/-/eslint-plugin-7.25.9.tgz#a5b6cc46085e0a7d45c5dae36055ce30c5125dab" + integrity sha512-MWg1lz+JiP9l1fXkE0qCUVo+1XwgNRPs6GTc88hmw6qN3AdgmfTSkyHt0e1xOTsKdXW5xlh2Lsk3wrFZbW5rzQ== dependencies: eslint-rule-composer "^0.3.0" -"@babel/generator@^7.25.0", "@babel/generator@^7.25.6", "@babel/generator@^7.7.2": - version "7.25.6" - resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.25.6.tgz#0df1ad8cb32fe4d2b01d8bf437f153d19342a87c" - integrity sha512-VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw== +"@babel/generator@^7.26.5", "@babel/generator@^7.7.2": + version "7.26.5" + resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.26.5.tgz#e44d4ab3176bbcaf78a5725da5f1dc28802a9458" + integrity sha512-2caSP6fN9I7HOe6nqhtft7V4g7/V/gfDsC3Ag4W7kEzzvRGKqiv0pu0HogPiZ3KaVSoNDhUws6IJjDjpfmYIXw== dependencies: - "@babel/types" "^7.25.6" + "@babel/parser" "^7.26.5" + "@babel/types" "^7.26.5" "@jridgewell/gen-mapping" "^0.3.5" "@jridgewell/trace-mapping" "^0.3.25" - jsesc "^2.5.1" + jsesc "^3.0.2" -"@babel/helper-annotate-as-pure@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz#5373c7bc8366b12a033b4be1ac13a206c6656aab" - integrity sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg== +"@babel/helper-annotate-as-pure@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz#d8eac4d2dc0d7b6e11fa6e535332e0d3184f06b4" + integrity sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g== dependencies: - "@babel/types" "^7.24.7" + "@babel/types" "^7.25.9" -"@babel/helper-builder-binary-assignment-operator-visitor@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.24.7.tgz#37d66feb012024f2422b762b9b2a7cfe27c7fba3" - integrity sha512-xZeCVVdwb4MsDBkkyZ64tReWYrLRHlMN72vP7Bdm3OUOuyFZExhsHUUnuWnm2/XOlAJzR0LfPpB56WXZn0X/lA== +"@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.25.9", "@babel/helper-compilation-targets@^7.26.5": + version "7.26.5" + resolved "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.26.5.tgz#75d92bb8d8d51301c0d49e52a65c9a7fe94514d8" + integrity sha512-IXuyn5EkouFJscIDuFF5EsiSolseme1s0CZB+QxVugqJLYmKdxI1VfIBOst0SUu4rnk2Z7kqTwmoO1lp3HIfnA== dependencies: - "@babel/traverse" "^7.24.7" - "@babel/types" "^7.24.7" - -"@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.24.7", "@babel/helper-compilation-targets@^7.24.8", "@babel/helper-compilation-targets@^7.25.2": - version "7.25.2" - resolved "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz#e1d9410a90974a3a5a66e84ff55ef62e3c02d06c" - integrity sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw== - dependencies: - "@babel/compat-data" "^7.25.2" - "@babel/helper-validator-option" "^7.24.8" - browserslist "^4.23.1" + "@babel/compat-data" "^7.26.5" + "@babel/helper-validator-option" "^7.25.9" + browserslist "^4.24.0" lru-cache "^5.1.1" semver "^6.3.1" -"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.24.7", "@babel/helper-create-class-features-plugin@^7.25.0", "@babel/helper-create-class-features-plugin@^7.25.4": - version "7.25.4" - resolved "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.4.tgz#57eaf1af38be4224a9d9dd01ddde05b741f50e14" - integrity sha512-ro/bFs3/84MDgDmMwbcHgDa8/E6J3QKNTk4xJJnVeFtGE+tL0K26E3pNxhYz2b67fJpt7Aphw5XcploKXuCvCQ== +"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.9.tgz#7644147706bb90ff613297d49ed5266bde729f83" + integrity sha512-UTZQMvt0d/rSz6KI+qdu7GQze5TIajwTS++GUozlw8VBJDEOAqSXwm1WvmYEZwqdqSGQshRocPDqrt4HBZB3fQ== dependencies: - "@babel/helper-annotate-as-pure" "^7.24.7" - "@babel/helper-member-expression-to-functions" "^7.24.8" - "@babel/helper-optimise-call-expression" "^7.24.7" - "@babel/helper-replace-supers" "^7.25.0" - "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7" - "@babel/traverse" "^7.25.4" + "@babel/helper-annotate-as-pure" "^7.25.9" + "@babel/helper-member-expression-to-functions" "^7.25.9" + "@babel/helper-optimise-call-expression" "^7.25.9" + "@babel/helper-replace-supers" "^7.25.9" + "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9" + "@babel/traverse" "^7.25.9" semver "^6.3.1" -"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.24.7", "@babel/helper-create-regexp-features-plugin@^7.25.0", "@babel/helper-create-regexp-features-plugin@^7.25.2": - version "7.25.2" - resolved "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.2.tgz#24c75974ed74183797ffd5f134169316cd1808d9" - integrity sha512-+wqVGP+DFmqwFD3EH6TMTfUNeqDehV3E/dl+Sd54eaXqm17tEUNbEIn4sVivVowbvUpOtIGxdo3GoXyDH9N/9g== +"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.25.9": + version "7.26.3" + resolved "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.26.3.tgz#5169756ecbe1d95f7866b90bb555b022595302a0" + integrity sha512-G7ZRb40uUgdKOQqPLjfD12ZmGA54PzqDFUv2BKImnC9QIfGhIHKvVML0oN8IUiDq4iRqpq74ABpvOaerfWdong== dependencies: - "@babel/helper-annotate-as-pure" "^7.24.7" - regexpu-core "^5.3.1" + "@babel/helper-annotate-as-pure" "^7.25.9" + regexpu-core "^6.2.0" semver "^6.3.1" -"@babel/helper-define-polyfill-provider@^0.6.2": - version "0.6.2" - resolved "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz#18594f789c3594acb24cfdb4a7f7b7d2e8bd912d" - integrity sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ== +"@babel/helper-define-polyfill-provider@^0.6.2", "@babel/helper-define-polyfill-provider@^0.6.3": + version "0.6.3" + resolved "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.3.tgz#f4f2792fae2ef382074bc2d713522cf24e6ddb21" + integrity sha512-HK7Bi+Hj6H+VTHA3ZvBis7V/6hu9QuTrnMXNybfUf2iiuU/N97I8VjB+KbhFF8Rld/Lx5MzoCwPCpPjfK+n8Cg== dependencies: "@babel/helper-compilation-targets" "^7.22.6" "@babel/helper-plugin-utils" "^7.22.5" @@ -134,165 +128,146 @@ lodash.debounce "^4.0.8" resolve "^1.14.2" -"@babel/helper-member-expression-to-functions@^7.24.8": - version "7.24.8" - resolved "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.8.tgz#6155e079c913357d24a4c20480db7c712a5c3fb6" - integrity sha512-LABppdt+Lp/RlBxqrh4qgf1oEH/WxdzQNDJIu5gC/W1GyvPVrOBiItmmM8wan2fm4oYqFuFfkXmlGpLQhPY8CA== +"@babel/helper-member-expression-to-functions@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.9.tgz#9dfffe46f727005a5ea29051ac835fb735e4c1a3" + integrity sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ== dependencies: - "@babel/traverse" "^7.24.8" - "@babel/types" "^7.24.8" + "@babel/traverse" "^7.25.9" + "@babel/types" "^7.25.9" -"@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz#f2f980392de5b84c3328fc71d38bd81bbb83042b" - integrity sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA== +"@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz#e7f8d20602ebdbf9ebbea0a0751fb0f2a4141715" + integrity sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw== dependencies: - "@babel/traverse" "^7.24.7" - "@babel/types" "^7.24.7" + "@babel/traverse" "^7.25.9" + "@babel/types" "^7.25.9" -"@babel/helper-module-transforms@^7.24.7", "@babel/helper-module-transforms@^7.24.8", "@babel/helper-module-transforms@^7.25.0", "@babel/helper-module-transforms@^7.25.2": - version "7.25.2" - resolved "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz#ee713c29768100f2776edf04d4eb23b8d27a66e6" - integrity sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ== +"@babel/helper-module-transforms@^7.25.9", "@babel/helper-module-transforms@^7.26.0": + version "7.26.0" + resolved "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz#8ce54ec9d592695e58d84cd884b7b5c6a2fdeeae" + integrity sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw== dependencies: - "@babel/helper-module-imports" "^7.24.7" - "@babel/helper-simple-access" "^7.24.7" - "@babel/helper-validator-identifier" "^7.24.7" - "@babel/traverse" "^7.25.2" + "@babel/helper-module-imports" "^7.25.9" + "@babel/helper-validator-identifier" "^7.25.9" + "@babel/traverse" "^7.25.9" -"@babel/helper-optimise-call-expression@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.24.7.tgz#8b0a0456c92f6b323d27cfd00d1d664e76692a0f" - integrity sha512-jKiTsW2xmWwxT1ixIdfXUZp+P5yURx2suzLZr5Hi64rURpDYdMW0pv+Uf17EYk2Rd428Lx4tLsnjGJzYKDM/6A== +"@babel/helper-optimise-call-expression@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.9.tgz#3324ae50bae7e2ab3c33f60c9a877b6a0146b54e" + integrity sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ== dependencies: - "@babel/types" "^7.24.7" + "@babel/types" "^7.25.9" -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.24.7", "@babel/helper-plugin-utils@^7.24.8", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": - version "7.24.8" - resolved "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz#94ee67e8ec0e5d44ea7baeb51e571bd26af07878" - integrity sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg== +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.25.9", "@babel/helper-plugin-utils@^7.26.5", "@babel/helper-plugin-utils@^7.8.0": + version "7.26.5" + resolved "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz#18580d00c9934117ad719392c4f6585c9333cc35" + integrity sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg== -"@babel/helper-remap-async-to-generator@^7.24.7", "@babel/helper-remap-async-to-generator@^7.25.0": - version "7.25.0" - resolved "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.0.tgz#d2f0fbba059a42d68e5e378feaf181ef6055365e" - integrity sha512-NhavI2eWEIz/H9dbrG0TuOicDhNexze43i5z7lEqwYm0WEZVTwnPpA0EafUTP7+6/W79HWIP2cTe3Z5NiSTVpw== +"@babel/helper-remap-async-to-generator@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.9.tgz#e53956ab3d5b9fb88be04b3e2f31b523afd34b92" + integrity sha512-IZtukuUeBbhgOcaW2s06OXTzVNJR0ybm4W5xC1opWFFJMZbwRj5LCk+ByYH7WdZPZTt8KnFwA8pvjN2yqcPlgw== dependencies: - "@babel/helper-annotate-as-pure" "^7.24.7" - "@babel/helper-wrap-function" "^7.25.0" - "@babel/traverse" "^7.25.0" + "@babel/helper-annotate-as-pure" "^7.25.9" + "@babel/helper-wrap-function" "^7.25.9" + "@babel/traverse" "^7.25.9" -"@babel/helper-replace-supers@^7.24.7", "@babel/helper-replace-supers@^7.25.0": - version "7.25.0" - resolved "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.0.tgz#ff44deac1c9f619523fe2ca1fd650773792000a9" - integrity sha512-q688zIvQVYtZu+i2PsdIu/uWGRpfxzr5WESsfpShfZECkO+d2o+WROWezCi/Q6kJ0tfPa5+pUGUlfx2HhrA3Bg== +"@babel/helper-replace-supers@^7.25.9": + version "7.26.5" + resolved "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.26.5.tgz#6cb04e82ae291dae8e72335dfe438b0725f14c8d" + integrity sha512-bJ6iIVdYX1YooY2X7w1q6VITt+LnUILtNk7zT78ykuwStx8BauCzxvFqFaHjOpW1bVnSUM1PN1f0p5P21wHxvg== dependencies: - "@babel/helper-member-expression-to-functions" "^7.24.8" - "@babel/helper-optimise-call-expression" "^7.24.7" - "@babel/traverse" "^7.25.0" + "@babel/helper-member-expression-to-functions" "^7.25.9" + "@babel/helper-optimise-call-expression" "^7.25.9" + "@babel/traverse" "^7.26.5" -"@babel/helper-simple-access@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz#bcade8da3aec8ed16b9c4953b74e506b51b5edb3" - integrity sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg== +"@babel/helper-skip-transparent-expression-wrappers@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.9.tgz#0b2e1b62d560d6b1954893fd2b705dc17c91f0c9" + integrity sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA== dependencies: - "@babel/traverse" "^7.24.7" - "@babel/types" "^7.24.7" + "@babel/traverse" "^7.25.9" + "@babel/types" "^7.25.9" -"@babel/helper-skip-transparent-expression-wrappers@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.24.7.tgz#5f8fa83b69ed5c27adc56044f8be2b3ea96669d9" - integrity sha512-IO+DLT3LQUElMbpzlatRASEyQtfhSE0+m465v++3jyyXeBTBUjtVZg28/gHeV5mrTJqvEKhKroBGAvhW+qPHiQ== +"@babel/helper-string-parser@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz#1aabb72ee72ed35789b4bbcad3ca2862ce614e8c" + integrity sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA== + +"@babel/helper-validator-identifier@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz#24b64e2c3ec7cd3b3c547729b8d16871f22cbdc7" + integrity sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ== + +"@babel/helper-validator-option@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz#86e45bd8a49ab7e03f276577f96179653d41da72" + integrity sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw== + +"@babel/helper-wrap-function@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.9.tgz#d99dfd595312e6c894bd7d237470025c85eea9d0" + integrity sha512-ETzz9UTjQSTmw39GboatdymDq4XIQbR8ySgVrylRhPOFpsd+JrKHIuF0de7GCWmem+T4uC5z7EZguod7Wj4A4g== dependencies: - "@babel/traverse" "^7.24.7" - "@babel/types" "^7.24.7" + "@babel/template" "^7.25.9" + "@babel/traverse" "^7.25.9" + "@babel/types" "^7.25.9" -"@babel/helper-string-parser@^7.24.8": - version "7.24.8" - resolved "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz#5b3329c9a58803d5df425e5785865881a81ca48d" - integrity sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ== - -"@babel/helper-validator-identifier@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz#75b889cfaf9e35c2aaf42cf0d72c8e91719251db" - integrity sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w== - -"@babel/helper-validator-option@^7.24.7", "@babel/helper-validator-option@^7.24.8": - version "7.24.8" - resolved "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz#3725cdeea8b480e86d34df15304806a06975e33d" - integrity sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q== - -"@babel/helper-wrap-function@^7.25.0": - version "7.25.0" - resolved "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.0.tgz#dab12f0f593d6ca48c0062c28bcfb14ebe812f81" - integrity sha512-s6Q1ebqutSiZnEjaofc/UKDyC4SbzV5n5SrA2Gq8UawLycr3i04f1dX4OzoQVnexm6aOCh37SQNYlJ/8Ku+PMQ== +"@babel/helpers@^7.26.7": + version "7.26.7" + resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.7.tgz#fd1d2a7c431b6e39290277aacfd8367857c576a4" + integrity sha512-8NHiL98vsi0mbPQmYAGWwfcFaOy4j2HY49fXJCfuDcdE7fMIsH9a7GdaeXpIBsbT7307WU8KCMp5pUVDNL4f9A== dependencies: - "@babel/template" "^7.25.0" - "@babel/traverse" "^7.25.0" - "@babel/types" "^7.25.0" + "@babel/template" "^7.25.9" + "@babel/types" "^7.26.7" -"@babel/helpers@^7.25.0": - version "7.25.6" - resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.6.tgz#57ee60141829ba2e102f30711ffe3afab357cc60" - integrity sha512-Xg0tn4HcfTijTwfDwYlvVCl43V6h4KyVVX2aEm4qdO/PC6L2YvzLHFdmxhoeSA3eslcE6+ZVXHgWwopXYLNq4Q== +"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.23.9", "@babel/parser@^7.25.9", "@babel/parser@^7.26.5", "@babel/parser@^7.26.7": + version "7.26.7" + resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.26.7.tgz#e114cd099e5f7d17b05368678da0fb9f69b3385c" + integrity sha512-kEvgGGgEjRUutvdVvZhbn/BxVt+5VSpwXz1j3WYXQbXDo8KzFOPNG2GQbdAiNq8g6wn1yKk7C/qrke03a84V+w== dependencies: - "@babel/template" "^7.25.0" - "@babel/types" "^7.25.6" + "@babel/types" "^7.26.7" -"@babel/highlight@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz#a05ab1df134b286558aae0ed41e6c5f731bf409d" - integrity sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw== +"@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.9.tgz#cc2e53ebf0a0340777fff5ed521943e253b4d8fe" + integrity sha512-ZkRyVkThtxQ/J6nv3JFYv1RYY+JT5BvU0y3k5bWrmuG4woXypRa4PXmm9RhOwodRkYFWqC0C0cqcJ4OqR7kW+g== dependencies: - "@babel/helper-validator-identifier" "^7.24.7" - chalk "^2.4.2" - js-tokens "^4.0.0" - picocolors "^1.0.0" + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/traverse" "^7.25.9" -"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.23.9", "@babel/parser@^7.25.0", "@babel/parser@^7.25.6": - version "7.25.6" - resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.25.6.tgz#85660c5ef388cbbf6e3d2a694ee97a38f18afe2f" - integrity sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q== +"@babel/plugin-bugfix-safari-class-field-initializer-scope@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.9.tgz#af9e4fb63ccb8abcb92375b2fcfe36b60c774d30" + integrity sha512-MrGRLZxLD/Zjj0gdU15dfs+HH/OXvnw/U4jJD8vpcP2CJQapPEv1IWwjc/qMg7ItBlPwSv1hRBbb7LeuANdcnw== dependencies: - "@babel/types" "^7.25.6" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.25.3": - version "7.25.3" - resolved "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.3.tgz#dca427b45a6c0f5c095a1c639dfe2476a3daba7f" - integrity sha512-wUrcsxZg6rqBXG05HG1FPYgsP6EvwF4WpBbxIpWIIYnH8wG0gzx3yZY3dtEHas4sTAOGkbTsc9EGPxwff8lRoA== +"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.9.tgz#e8dc26fcd616e6c5bf2bd0d5a2c151d4f92a9137" + integrity sha512-2qUwwfAFpJLZqxd02YW9btUCZHl+RFvdDkNfZwaIJrvB8Tesjsk8pEQkTvGwZXLqXUx/2oyY3ySRhm6HOXuCug== dependencies: - "@babel/helper-plugin-utils" "^7.24.8" - "@babel/traverse" "^7.25.3" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-bugfix-safari-class-field-initializer-scope@^7.25.0": - version "7.25.0" - resolved "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.0.tgz#cd0c583e01369ef51676bdb3d7b603e17d2b3f73" - integrity sha512-Bm4bH2qsX880b/3ziJ8KD711LT7z4u8CFudmjqle65AZj/HNUFhEf90dqYv6O86buWvSBmeQDjv0Tn2aF/bIBA== +"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.25.9.tgz#807a667f9158acac6f6164b4beb85ad9ebc9e1d1" + integrity sha512-6xWgLZTJXwilVjlnV7ospI3xi+sl8lN8rXXbBD6vYn3UYDlGsag8wrZkKcSI8G6KgqKP7vNFaDgeDnfAABq61g== dependencies: - "@babel/helper-plugin-utils" "^7.24.8" + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9" + "@babel/plugin-transform-optional-chaining" "^7.25.9" -"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.25.0": - version "7.25.0" - resolved "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.0.tgz#749bde80356b295390954643de7635e0dffabe73" - integrity sha512-lXwdNZtTmeVOOFtwM/WDe7yg1PL8sYhRk/XH0FzbR2HDQ0xC+EnQ/JHeoMYSavtU115tnUk0q9CDyq8si+LMAA== +"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.9.tgz#de7093f1e7deaf68eadd7cc6b07f2ab82543269e" + integrity sha512-aLnMXYPnzwwqhYSCyXfKkIkYgJ8zv9RK+roo9DkTXz38ynIhd9XCbN08s3MGvqL2MYGVUGdRQLL/JqBIeJhJBg== dependencies: - "@babel/helper-plugin-utils" "^7.24.8" - -"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.7.tgz#e4eabdd5109acc399b38d7999b2ef66fc2022f89" - integrity sha512-+izXIbke1T33mY4MSNnrqhPXDz01WYhEf3yF5NbnUtkiNnm+XBZJl3kNfoK6NKmYlz/D07+l2GWVK/QfDkNCuQ== - dependencies: - "@babel/helper-plugin-utils" "^7.24.7" - "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7" - "@babel/plugin-transform-optional-chaining" "^7.24.7" - -"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@^7.25.0": - version "7.25.0" - resolved "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.0.tgz#3a82a70e7cb7294ad2559465ebcb871dfbf078fb" - integrity sha512-tggFrk1AIShG/RUQbEwt2Tr/E+ObkfwrPjR6BjbRvsx24+PSjK8zrq0GWPNCjo8qpRx4DuJzlcvWJqlm+0h3kw== - dependencies: - "@babel/helper-plugin-utils" "^7.24.8" - "@babel/traverse" "^7.25.0" + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/traverse" "^7.25.9" "@babel/plugin-proposal-class-properties@^7.10.4": version "7.18.6" @@ -346,33 +321,19 @@ dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-syntax-dynamic-import@^7.8.3": - version "7.8.3" - resolved "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3" - integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ== +"@babel/plugin-syntax-import-assertions@^7.26.0": + version "7.26.0" + resolved "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.26.0.tgz#620412405058efa56e4a564903b79355020f445f" + integrity sha512-QCWT5Hh830hK5EQa7XzuqIkQU9tT/whqbDz7kuaZMHFl1inRRg7JnuAEOQ0Ur0QUl0NufCk1msK2BeY79Aj/eg== dependencies: - "@babel/helper-plugin-utils" "^7.8.0" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-syntax-export-namespace-from@^7.8.3": - version "7.8.3" - resolved "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a" - integrity sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q== +"@babel/plugin-syntax-import-attributes@^7.24.7", "@babel/plugin-syntax-import-attributes@^7.26.0": + version "7.26.0" + resolved "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.26.0.tgz#3b1412847699eea739b4f2602c74ce36f6b0b0f7" + integrity sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A== dependencies: - "@babel/helper-plugin-utils" "^7.8.3" - -"@babel/plugin-syntax-import-assertions@^7.24.7": - version "7.25.6" - resolved "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.25.6.tgz#bb918905c58711b86f9710d74a3744b6c56573b5" - integrity sha512-aABl0jHw9bZ2karQ/uUD6XP4u0SG22SJrOHFoL6XB1R7dTovOP4TzTlsxOYC5yQ1pdscVK2JTUnF6QL3ARoAiQ== - dependencies: - "@babel/helper-plugin-utils" "^7.24.8" - -"@babel/plugin-syntax-import-attributes@^7.24.7": - version "7.25.6" - resolved "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.25.6.tgz#6d4c78f042db0e82fd6436cd65fec5dc78ad2bde" - integrity sha512-sXaDXaJN9SNLymBdlWFA+bjzBhFD617ZaFiY13dGt7TVslVvVgA6fkZOP7Ki3IGElC45lwHdOTrCtKZGVAWeLQ== - dependencies: - "@babel/helper-plugin-utils" "^7.24.8" + "@babel/helper-plugin-utils" "^7.25.9" "@babel/plugin-syntax-import-meta@^7.10.4": version "7.10.4" @@ -388,12 +349,12 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-jsx@^7.16.0", "@babel/plugin-syntax-jsx@^7.24.7", "@babel/plugin-syntax-jsx@^7.7.2": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.7.tgz#39a1fa4a7e3d3d7f34e2acc6be585b718d30e02d" - integrity sha512-6ddciUPe/mpMnOKv/U+RSd2vvVy+Yw/JfBB0ZHYjEZt9NLHmCUylNYlsbqCCS1Bffjlb0fCwC9Vqz+sBz6PsiQ== +"@babel/plugin-syntax-jsx@^7.16.0", "@babel/plugin-syntax-jsx@^7.25.9", "@babel/plugin-syntax-jsx@^7.7.2": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.9.tgz#a34313a178ea56f1951599b929c1ceacee719290" + integrity sha512-ld6oezHQMZsZfp6pWtbjaNDF2tiiCYYDqQszHt5VV437lewP9aSi2Of99CK0D0XB21k7FLgnLcmQKyKzynfeAA== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-plugin-utils" "^7.25.9" "@babel/plugin-syntax-logical-assignment-operators@^7.10.4": version "7.10.4" @@ -451,12 +412,12 @@ dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-syntax-typescript@^7.24.7", "@babel/plugin-syntax-typescript@^7.7.2": - version "7.25.4" - resolved "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.4.tgz#04db9ce5a9043d9c635e75ae7969a2cd50ca97ff" - integrity sha512-uMOCoHVU52BsSWxPOMVv5qKRdeSlPuImUCB2dlPuBSU+W2/ROE7/Zg8F2Kepbk+8yBa68LlRKxO+xgEVWorsDg== +"@babel/plugin-syntax-typescript@^7.25.9", "@babel/plugin-syntax-typescript@^7.7.2": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.9.tgz#67dda2b74da43727cf21d46cf9afef23f4365399" + integrity sha512-hjMgRy5hb8uJJjUcdWunWVcoi9bGpJp8p5Ol1229PoN6aytsLwNMgmdftO23wnCLMfVmTwZDWMPNq/D1SY60JQ== dependencies: - "@babel/helper-plugin-utils" "^7.24.8" + "@babel/helper-plugin-utils" "^7.25.9" "@babel/plugin-syntax-unicode-sets-regex@^7.18.6": version "7.18.6" @@ -466,549 +427,529 @@ "@babel/helper-create-regexp-features-plugin" "^7.18.6" "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-arrow-functions@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.7.tgz#4f6886c11e423bd69f3ce51dbf42424a5f275514" - integrity sha512-Dt9LQs6iEY++gXUwY03DNFat5C2NbO48jj+j/bSAz6b3HgPs39qcPiYt77fDObIcFwj3/C2ICX9YMwGflUoSHQ== +"@babel/plugin-transform-arrow-functions@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.25.9.tgz#7821d4410bee5daaadbb4cdd9a6649704e176845" + integrity sha512-6jmooXYIwn9ca5/RylZADJ+EnSxVUS5sjeJ9UPk6RWRzXCmOJCy6dqItPJFpw2cuCangPK4OYr5uhGKcmrm5Qg== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-async-generator-functions@^7.25.4": - version "7.25.4" - resolved "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.4.tgz#2afd4e639e2d055776c9f091b6c0c180ed8cf083" - integrity sha512-jz8cV2XDDTqjKPwVPJBIjORVEmSGYhdRa8e5k5+vN+uwcjSrSxUaebBRa4ko1jqNF2uxyg8G6XYk30Jv285xzg== +"@babel/plugin-transform-async-generator-functions@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.9.tgz#1b18530b077d18a407c494eb3d1d72da505283a2" + integrity sha512-RXV6QAzTBbhDMO9fWwOmwwTuYaiPbggWQ9INdZqAYeSHyG7FzQ+nOZaUUjNwKv9pV3aE4WFqFm1Hnbci5tBCAw== dependencies: - "@babel/helper-plugin-utils" "^7.24.8" - "@babel/helper-remap-async-to-generator" "^7.25.0" - "@babel/plugin-syntax-async-generators" "^7.8.4" - "@babel/traverse" "^7.25.4" + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-remap-async-to-generator" "^7.25.9" + "@babel/traverse" "^7.25.9" -"@babel/plugin-transform-async-to-generator@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.7.tgz#72a3af6c451d575842a7e9b5a02863414355bdcc" - integrity sha512-SQY01PcJfmQ+4Ash7NE+rpbLFbmqA2GPIgqzxfFTL4t1FKRq4zTms/7htKpoCUI9OcFYgzqfmCdH53s6/jn5fA== +"@babel/plugin-transform-async-to-generator@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.25.9.tgz#c80008dacae51482793e5a9c08b39a5be7e12d71" + integrity sha512-NT7Ejn7Z/LjUH0Gv5KsBCxh7BH3fbLTV0ptHvpeMvrt3cPThHfJfst9Wrb7S8EvJ7vRTFI7z+VAvFVEQn/m5zQ== dependencies: - "@babel/helper-module-imports" "^7.24.7" - "@babel/helper-plugin-utils" "^7.24.7" - "@babel/helper-remap-async-to-generator" "^7.24.7" + "@babel/helper-module-imports" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-remap-async-to-generator" "^7.25.9" -"@babel/plugin-transform-block-scoped-functions@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.7.tgz#a4251d98ea0c0f399dafe1a35801eaba455bbf1f" - integrity sha512-yO7RAz6EsVQDaBH18IDJcMB1HnrUn2FJ/Jslc/WtPPWcjhpUJXU/rjbwmluzp7v/ZzWcEhTMXELnnsz8djWDwQ== +"@babel/plugin-transform-block-scoped-functions@^7.26.5": + version "7.26.5" + resolved "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.26.5.tgz#3dc4405d31ad1cbe45293aa57205a6e3b009d53e" + integrity sha512-chuTSY+hq09+/f5lMj8ZSYgCFpppV2CbYrhNFJ1BFoXpiWPnnAb7R0MqrafCpN8E1+YRrtM1MXZHJdIx8B6rMQ== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-plugin-utils" "^7.26.5" -"@babel/plugin-transform-block-scoping@^7.25.0": - version "7.25.0" - resolved "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.0.tgz#23a6ed92e6b006d26b1869b1c91d1b917c2ea2ac" - integrity sha512-yBQjYoOjXlFv9nlXb3f1casSHOZkWr29NX+zChVanLg5Nc157CrbEX9D7hxxtTpuFy7Q0YzmmWfJxzvps4kXrQ== +"@babel/plugin-transform-block-scoping@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.9.tgz#c33665e46b06759c93687ca0f84395b80c0473a1" + integrity sha512-1F05O7AYjymAtqbsFETboN1NvBdcnzMerO+zlMyJBEz6WkMdejvGWw9p05iTSjC85RLlBseHHQpYaM4gzJkBGg== dependencies: - "@babel/helper-plugin-utils" "^7.24.8" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-class-properties@^7.25.4": - version "7.25.4" - resolved "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.4.tgz#bae7dbfcdcc2e8667355cd1fb5eda298f05189fd" - integrity sha512-nZeZHyCWPfjkdU5pA/uHiTaDAFUEqkpzf1YoQT2NeSynCGYq9rxfyI3XpQbfx/a0hSnFH6TGlEXvae5Vi7GD8g== +"@babel/plugin-transform-class-properties@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.9.tgz#a8ce84fedb9ad512549984101fa84080a9f5f51f" + integrity sha512-bbMAII8GRSkcd0h0b4X+36GksxuheLFjP65ul9w6C3KgAamI3JqErNgSrosX6ZPj+Mpim5VvEbawXxJCyEUV3Q== dependencies: - "@babel/helper-create-class-features-plugin" "^7.25.4" - "@babel/helper-plugin-utils" "^7.24.8" + "@babel/helper-create-class-features-plugin" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-class-static-block@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.7.tgz#c82027ebb7010bc33c116d4b5044fbbf8c05484d" - integrity sha512-HMXK3WbBPpZQufbMG4B46A90PkuuhN9vBCb5T8+VAHqvAqvcLi+2cKoukcpmUYkszLhScU3l1iudhrks3DggRQ== +"@babel/plugin-transform-class-static-block@^7.26.0": + version "7.26.0" + resolved "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.26.0.tgz#6c8da219f4eb15cae9834ec4348ff8e9e09664a0" + integrity sha512-6J2APTs7BDDm+UMqP1useWqhcRAXo0WIoVj26N7kPFB6S73Lgvyka4KTZYIxtgYXiN5HTyRObA72N2iu628iTQ== dependencies: - "@babel/helper-create-class-features-plugin" "^7.24.7" - "@babel/helper-plugin-utils" "^7.24.7" - "@babel/plugin-syntax-class-static-block" "^7.14.5" + "@babel/helper-create-class-features-plugin" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-classes@^7.25.4": - version "7.25.4" - resolved "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.4.tgz#d29dbb6a72d79f359952ad0b66d88518d65ef89a" - integrity sha512-oexUfaQle2pF/b6E0dwsxQtAol9TLSO88kQvym6HHBWFliV2lGdrPieX+WgMRLSJDVzdYywk7jXbLPuO2KLTLg== +"@babel/plugin-transform-classes@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.9.tgz#7152457f7880b593a63ade8a861e6e26a4469f52" + integrity sha512-mD8APIXmseE7oZvZgGABDyM34GUmK45Um2TXiBUt7PnuAxrgoSVf123qUzPxEr/+/BHrRn5NMZCdE2m/1F8DGg== dependencies: - "@babel/helper-annotate-as-pure" "^7.24.7" - "@babel/helper-compilation-targets" "^7.25.2" - "@babel/helper-plugin-utils" "^7.24.8" - "@babel/helper-replace-supers" "^7.25.0" - "@babel/traverse" "^7.25.4" + "@babel/helper-annotate-as-pure" "^7.25.9" + "@babel/helper-compilation-targets" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-replace-supers" "^7.25.9" + "@babel/traverse" "^7.25.9" globals "^11.1.0" -"@babel/plugin-transform-computed-properties@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.7.tgz#4cab3214e80bc71fae3853238d13d097b004c707" - integrity sha512-25cS7v+707Gu6Ds2oY6tCkUwsJ9YIDbggd9+cu9jzzDgiNq7hR/8dkzxWfKWnTic26vsI3EsCXNd4iEB6e8esQ== +"@babel/plugin-transform-computed-properties@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.25.9.tgz#db36492c78460e534b8852b1d5befe3c923ef10b" + integrity sha512-HnBegGqXZR12xbcTHlJ9HGxw1OniltT26J5YpfruGqtUHlz/xKf/G2ak9e+t0rVqrjXa9WOhvYPz1ERfMj23AA== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" - "@babel/template" "^7.24.7" + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/template" "^7.25.9" -"@babel/plugin-transform-destructuring@^7.24.8": - version "7.24.8" - resolved "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.8.tgz#c828e814dbe42a2718a838c2a2e16a408e055550" - integrity sha512-36e87mfY8TnRxc7yc6M9g9gOB7rKgSahqkIKwLpz4Ppk2+zC2Cy1is0uwtuSG6AE4zlTOUa+7JGz9jCJGLqQFQ== +"@babel/plugin-transform-destructuring@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.9.tgz#966ea2595c498224340883602d3cfd7a0c79cea1" + integrity sha512-WkCGb/3ZxXepmMiX101nnGiU+1CAdut8oHyEOHxkKuS1qKpU2SMXE2uSvfz8PBuLd49V6LEsbtyPhWC7fnkgvQ== dependencies: - "@babel/helper-plugin-utils" "^7.24.8" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-dotall-regex@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.7.tgz#5f8bf8a680f2116a7207e16288a5f974ad47a7a0" - integrity sha512-ZOA3W+1RRTSWvyqcMJDLqbchh7U4NRGqwRfFSVbOLS/ePIP4vHB5e8T8eXcuqyN1QkgKyj5wuW0lcS85v4CrSw== +"@babel/plugin-transform-dotall-regex@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.25.9.tgz#bad7945dd07734ca52fe3ad4e872b40ed09bb09a" + integrity sha512-t7ZQ7g5trIgSRYhI9pIJtRl64KHotutUJsh4Eze5l7olJv+mRSg4/MmbZ0tv1eeqRbdvo/+trvJD/Oc5DmW2cA== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.24.7" - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-create-regexp-features-plugin" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-duplicate-keys@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.7.tgz#dd20102897c9a2324e5adfffb67ff3610359a8ee" - integrity sha512-JdYfXyCRihAe46jUIliuL2/s0x0wObgwwiGxw/UbgJBr20gQBThrokO4nYKgWkD7uBaqM7+9x5TU7NkExZJyzw== +"@babel/plugin-transform-duplicate-keys@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.25.9.tgz#8850ddf57dce2aebb4394bb434a7598031059e6d" + integrity sha512-LZxhJ6dvBb/f3x8xwWIuyiAHy56nrRG3PeYTpBkkzkYRRQ6tJLu68lEF5VIqMUZiAV7a8+Tb78nEoMCMcqjXBw== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-duplicate-named-capturing-groups-regex@^7.25.0": - version "7.25.0" - resolved "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.0.tgz#809af7e3339466b49c034c683964ee8afb3e2604" - integrity sha512-YLpb4LlYSc3sCUa35un84poXoraOiQucUTTu8X1j18JV+gNa8E0nyUf/CjZ171IRGr4jEguF+vzJU66QZhn29g== +"@babel/plugin-transform-duplicate-named-capturing-groups-regex@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.9.tgz#6f7259b4de127721a08f1e5165b852fcaa696d31" + integrity sha512-0UfuJS0EsXbRvKnwcLjFtJy/Sxc5J5jhLHnFhy7u4zih97Hz6tJkLU+O+FMMrNZrosUPxDi6sYxJ/EA8jDiAog== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.25.0" - "@babel/helper-plugin-utils" "^7.24.8" + "@babel/helper-create-regexp-features-plugin" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-dynamic-import@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.24.7.tgz#4d8b95e3bae2b037673091aa09cd33fecd6419f4" - integrity sha512-sc3X26PhZQDb3JhORmakcbvkeInvxz+A8oda99lj7J60QRuPZvNAk9wQlTBS1ZynelDrDmTU4pw1tyc5d5ZMUg== +"@babel/plugin-transform-dynamic-import@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.25.9.tgz#23e917de63ed23c6600c5dd06d94669dce79f7b8" + integrity sha512-GCggjexbmSLaFhqsojeugBpeaRIgWNTcgKVq/0qIteFEqY2A+b9QidYadrWlnbWQUrW5fn+mCvf3tr7OeBFTyg== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" - "@babel/plugin-syntax-dynamic-import" "^7.8.3" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-exponentiation-operator@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.7.tgz#b629ee22645f412024297d5245bce425c31f9b0d" - integrity sha512-Rqe/vSc9OYgDajNIK35u7ot+KeCoetqQYFXM4Epf7M7ez3lWlOjrDjrwMei6caCVhfdw+mIKD4cgdGNy5JQotQ== +"@babel/plugin-transform-exponentiation-operator@^7.26.3": + version "7.26.3" + resolved "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.26.3.tgz#e29f01b6de302c7c2c794277a48f04a9ca7f03bc" + integrity sha512-7CAHcQ58z2chuXPWblnn1K6rLDnDWieghSOEmqQsrBenH0P9InCUtOJYD89pvngljmZlJcz3fcmgYsXFNGa1ZQ== dependencies: - "@babel/helper-builder-binary-assignment-operator-visitor" "^7.24.7" - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-export-namespace-from@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.24.7.tgz#176d52d8d8ed516aeae7013ee9556d540c53f197" - integrity sha512-v0K9uNYsPL3oXZ/7F9NNIbAj2jv1whUEtyA6aujhekLs56R++JDQuzRcP2/z4WX5Vg/c5lE9uWZA0/iUoFhLTA== +"@babel/plugin-transform-export-namespace-from@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.25.9.tgz#90745fe55053394f554e40584cda81f2c8a402a2" + integrity sha512-2NsEz+CxzJIVOPx2o9UsW1rXLqtChtLoVnwYHHiB04wS5sgn7mrV45fWMBX0Kk+ub9uXytVYfNP2HjbVbCB3Ww== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" - "@babel/plugin-syntax-export-namespace-from" "^7.8.3" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-for-of@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.7.tgz#f25b33f72df1d8be76399e1b8f3f9d366eb5bc70" - integrity sha512-wo9ogrDG1ITTTBsy46oGiN1dS9A7MROBTcYsfS8DtsImMkHk9JXJ3EWQM6X2SUw4x80uGPlwj0o00Uoc6nEE3g== +"@babel/plugin-transform-for-of@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.25.9.tgz#4bdc7d42a213397905d89f02350c5267866d5755" + integrity sha512-LqHxduHoaGELJl2uhImHwRQudhCM50pT46rIBNvtT/Oql3nqiS3wOwP+5ten7NpYSXrrVLgtZU3DZmPtWZo16A== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" - "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7" + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9" -"@babel/plugin-transform-function-name@^7.25.1": - version "7.25.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.1.tgz#b85e773097526c1a4fc4ba27322748643f26fc37" - integrity sha512-TVVJVdW9RKMNgJJlLtHsKDTydjZAbwIsn6ySBPQaEAUU5+gVvlJt/9nRmqVbsV/IBanRjzWoaAQKLoamWVOUuA== +"@babel/plugin-transform-function-name@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.9.tgz#939d956e68a606661005bfd550c4fc2ef95f7b97" + integrity sha512-8lP+Yxjv14Vc5MuWBpJsoUCd3hD6V9DgBon2FVYL4jJgbnVQ9fTgYmonchzZJOVNgzEgbxp4OwAf6xz6M/14XA== dependencies: - "@babel/helper-compilation-targets" "^7.24.8" - "@babel/helper-plugin-utils" "^7.24.8" - "@babel/traverse" "^7.25.1" + "@babel/helper-compilation-targets" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/traverse" "^7.25.9" -"@babel/plugin-transform-json-strings@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.24.7.tgz#f3e9c37c0a373fee86e36880d45b3664cedaf73a" - integrity sha512-2yFnBGDvRuxAaE/f0vfBKvtnvvqU8tGpMHqMNpTN2oWMKIR3NqFkjaAgGwawhqK/pIN2T3XdjGPdaG0vDhOBGw== +"@babel/plugin-transform-json-strings@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.25.9.tgz#c86db407cb827cded902a90c707d2781aaa89660" + integrity sha512-xoTMk0WXceiiIvsaquQQUaLLXSW1KJ159KP87VilruQm0LNNGxWzahxSS6T6i4Zg3ezp4vA4zuwiNUR53qmQAw== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" - "@babel/plugin-syntax-json-strings" "^7.8.3" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-literals@^7.25.2": - version "7.25.2" - resolved "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.2.tgz#deb1ad14fc5490b9a65ed830e025bca849d8b5f3" - integrity sha512-HQI+HcTbm9ur3Z2DkO+jgESMAMcYLuN/A7NRw9juzxAezN9AvqvUTnpKP/9kkYANz6u7dFlAyOu44ejuGySlfw== +"@babel/plugin-transform-literals@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.9.tgz#1a1c6b4d4aa59bc4cad5b6b3a223a0abd685c9de" + integrity sha512-9N7+2lFziW8W9pBl2TzaNht3+pgMIRP74zizeCSrtnSKVdUl8mAjjOP2OOVQAfZ881P2cNjDj1uAMEdeD50nuQ== dependencies: - "@babel/helper-plugin-utils" "^7.24.8" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-logical-assignment-operators@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.24.7.tgz#a58fb6eda16c9dc8f9ff1c7b1ba6deb7f4694cb0" - integrity sha512-4D2tpwlQ1odXmTEIFWy9ELJcZHqrStlzK/dAOWYyxX3zT0iXQB6banjgeOJQXzEc4S0E0a5A+hahxPaEFYftsw== +"@babel/plugin-transform-logical-assignment-operators@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.25.9.tgz#b19441a8c39a2fda0902900b306ea05ae1055db7" + integrity sha512-wI4wRAzGko551Y8eVf6iOY9EouIDTtPb0ByZx+ktDGHwv6bHFimrgJM/2T021txPZ2s4c7bqvHbd+vXG6K948Q== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" - "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-member-expression-literals@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.7.tgz#3b4454fb0e302e18ba4945ba3246acb1248315df" - integrity sha512-T/hRC1uqrzXMKLQ6UCwMT85S3EvqaBXDGf0FaMf4446Qx9vKwlghvee0+uuZcDUCZU5RuNi4781UQ7R308zzBw== +"@babel/plugin-transform-member-expression-literals@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.25.9.tgz#63dff19763ea64a31f5e6c20957e6a25e41ed5de" + integrity sha512-PYazBVfofCQkkMzh2P6IdIUaCEWni3iYEerAsRWuVd8+jlM1S9S9cz1dF9hIzyoZ8IA3+OwVYIp9v9e+GbgZhA== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-modules-amd@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.7.tgz#65090ed493c4a834976a3ca1cde776e6ccff32d7" - integrity sha512-9+pB1qxV3vs/8Hdmz/CulFB8w2tuu6EB94JZFsjdqxQokwGa9Unap7Bo2gGBGIvPmDIVvQrom7r5m/TCDMURhg== +"@babel/plugin-transform-modules-amd@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.25.9.tgz#49ba478f2295101544abd794486cd3088dddb6c5" + integrity sha512-g5T11tnI36jVClQlMlt4qKDLlWnG5pP9CSM4GhdRciTNMRgkfpo5cR6b4rGIOYPgRRuFAvwjPQ/Yk+ql4dyhbw== dependencies: - "@babel/helper-module-transforms" "^7.24.7" - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-module-transforms" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-modules-commonjs@^7.24.7", "@babel/plugin-transform-modules-commonjs@^7.24.8": - version "7.24.8" - resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.8.tgz#ab6421e564b717cb475d6fff70ae7f103536ea3c" - integrity sha512-WHsk9H8XxRs3JXKWFiqtQebdh9b/pTk4EgueygFzYlTKAg0Ud985mSevdNjdXdFBATSKVJGQXP1tv6aGbssLKA== +"@babel/plugin-transform-modules-commonjs@^7.25.9", "@babel/plugin-transform-modules-commonjs@^7.26.3": + version "7.26.3" + resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.26.3.tgz#8f011d44b20d02c3de44d8850d971d8497f981fb" + integrity sha512-MgR55l4q9KddUDITEzEFYn5ZsGDXMSsU9E+kh7fjRXTIC3RHqfCo8RPRbyReYJh44HQ/yomFkqbOFohXvDCiIQ== dependencies: - "@babel/helper-module-transforms" "^7.24.8" - "@babel/helper-plugin-utils" "^7.24.8" - "@babel/helper-simple-access" "^7.24.7" + "@babel/helper-module-transforms" "^7.26.0" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-modules-systemjs@^7.25.0": - version "7.25.0" - resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.0.tgz#8f46cdc5f9e5af74f3bd019485a6cbe59685ea33" - integrity sha512-YPJfjQPDXxyQWg/0+jHKj1llnY5f/R6a0p/vP4lPymxLu7Lvl4k2WMitqi08yxwQcCVUUdG9LCUj4TNEgAp3Jw== +"@babel/plugin-transform-modules-systemjs@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.9.tgz#8bd1b43836269e3d33307151a114bcf3ba6793f8" + integrity sha512-hyss7iIlH/zLHaehT+xwiymtPOpsiwIIRlCAOwBB04ta5Tt+lNItADdlXw3jAWZ96VJ2jlhl/c+PNIQPKNfvcA== dependencies: - "@babel/helper-module-transforms" "^7.25.0" - "@babel/helper-plugin-utils" "^7.24.8" - "@babel/helper-validator-identifier" "^7.24.7" - "@babel/traverse" "^7.25.0" + "@babel/helper-module-transforms" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-validator-identifier" "^7.25.9" + "@babel/traverse" "^7.25.9" -"@babel/plugin-transform-modules-umd@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.7.tgz#edd9f43ec549099620df7df24e7ba13b5c76efc8" - integrity sha512-3aytQvqJ/h9z4g8AsKPLvD4Zqi2qT+L3j7XoFFu1XBlZWEl2/1kWnhmAbxpLgPrHSY0M6UA02jyTiwUVtiKR6A== +"@babel/plugin-transform-modules-umd@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.25.9.tgz#6710079cdd7c694db36529a1e8411e49fcbf14c9" + integrity sha512-bS9MVObUgE7ww36HEfwe6g9WakQ0KF07mQF74uuXdkoziUPfKyu/nIm663kz//e5O1nPInPFx36z7WJmJ4yNEw== dependencies: - "@babel/helper-module-transforms" "^7.24.7" - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-module-transforms" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-named-capturing-groups-regex@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.24.7.tgz#9042e9b856bc6b3688c0c2e4060e9e10b1460923" - integrity sha512-/jr7h/EWeJtk1U/uz2jlsCioHkZk1JJZVcc8oQsJ1dUlaJD83f4/6Zeh2aHt9BIFokHIsSeDfhUmju0+1GPd6g== +"@babel/plugin-transform-named-capturing-groups-regex@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.25.9.tgz#454990ae6cc22fd2a0fa60b3a2c6f63a38064e6a" + integrity sha512-oqB6WHdKTGl3q/ItQhpLSnWWOpjUJLsOCLVyeFgeTktkBSCiurvPOsyt93gibI9CmuKvTUEtWmG5VhZD+5T/KA== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.24.7" - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-create-regexp-features-plugin" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-new-target@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.7.tgz#31ff54c4e0555cc549d5816e4ab39241dfb6ab00" - integrity sha512-RNKwfRIXg4Ls/8mMTza5oPF5RkOW8Wy/WgMAp1/F1yZ8mMbtwXW+HDoJiOsagWrAhI5f57Vncrmr9XeT4CVapA== +"@babel/plugin-transform-new-target@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.25.9.tgz#42e61711294b105c248336dcb04b77054ea8becd" + integrity sha512-U/3p8X1yCSoKyUj2eOBIx3FOn6pElFOKvAAGf8HTtItuPyB+ZeOqfn+mvTtg9ZlOAjsPdK3ayQEjqHjU/yLeVQ== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-nullish-coalescing-operator@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.24.7.tgz#1de4534c590af9596f53d67f52a92f12db984120" - integrity sha512-Ts7xQVk1OEocqzm8rHMXHlxvsfZ0cEF2yomUqpKENHWMF4zKk175Y4q8H5knJes6PgYad50uuRmt3UJuhBw8pQ== +"@babel/plugin-transform-nullish-coalescing-operator@^7.26.6": + version "7.26.6" + resolved "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.26.6.tgz#fbf6b3c92cb509e7b319ee46e3da89c5bedd31fe" + integrity sha512-CKW8Vu+uUZneQCPtXmSBUC6NCAUdya26hWCElAWh5mVSlSRsmiCPUUDKb3Z0szng1hiAJa098Hkhg9o4SE35Qw== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" - "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" + "@babel/helper-plugin-utils" "^7.26.5" -"@babel/plugin-transform-numeric-separator@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.24.7.tgz#bea62b538c80605d8a0fac9b40f48e97efa7de63" - integrity sha512-e6q1TiVUzvH9KRvicuxdBTUj4AdKSRwzIyFFnfnezpCfP2/7Qmbb8qbU2j7GODbl4JMkblitCQjKYUaX/qkkwA== +"@babel/plugin-transform-numeric-separator@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.25.9.tgz#bfed75866261a8b643468b0ccfd275f2033214a1" + integrity sha512-TlprrJ1GBZ3r6s96Yq8gEQv82s8/5HnCVHtEJScUj90thHQbwe+E5MLhi2bbNHBEJuzrvltXSru+BUxHDoog7Q== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" - "@babel/plugin-syntax-numeric-separator" "^7.10.4" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-object-rest-spread@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.7.tgz#d13a2b93435aeb8a197e115221cab266ba6e55d6" - integrity sha512-4QrHAr0aXQCEFni2q4DqKLD31n2DL+RxcwnNjDFkSG0eNQ/xCavnRkfCUjsyqGC2OviNJvZOF/mQqZBw7i2C5Q== +"@babel/plugin-transform-object-rest-spread@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.25.9.tgz#0203725025074164808bcf1a2cfa90c652c99f18" + integrity sha512-fSaXafEE9CVHPweLYw4J0emp1t8zYTXyzN3UuG+lylqkvYd7RMrsOQ8TYx5RF231be0vqtFC6jnx3UmpJmKBYg== dependencies: - "@babel/helper-compilation-targets" "^7.24.7" - "@babel/helper-plugin-utils" "^7.24.7" - "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-transform-parameters" "^7.24.7" + "@babel/helper-compilation-targets" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/plugin-transform-parameters" "^7.25.9" -"@babel/plugin-transform-object-super@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.7.tgz#66eeaff7830bba945dd8989b632a40c04ed625be" - integrity sha512-A/vVLwN6lBrMFmMDmPPz0jnE6ZGx7Jq7d6sT/Ev4H65RER6pZ+kczlf1DthF5N0qaPHBsI7UXiE8Zy66nmAovg== +"@babel/plugin-transform-object-super@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.25.9.tgz#385d5de135162933beb4a3d227a2b7e52bb4cf03" + integrity sha512-Kj/Gh+Rw2RNLbCK1VAWj2U48yxxqL2x0k10nPtSdRa0O2xnHXalD0s+o1A6a0W43gJ00ANo38jxkQreckOzv5A== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" - "@babel/helper-replace-supers" "^7.24.7" + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-replace-supers" "^7.25.9" -"@babel/plugin-transform-optional-catch-binding@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.24.7.tgz#00eabd883d0dd6a60c1c557548785919b6e717b4" - integrity sha512-uLEndKqP5BfBbC/5jTwPxLh9kqPWWgzN/f8w6UwAIirAEqiIVJWWY312X72Eub09g5KF9+Zn7+hT7sDxmhRuKA== +"@babel/plugin-transform-optional-catch-binding@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.25.9.tgz#10e70d96d52bb1f10c5caaac59ac545ea2ba7ff3" + integrity sha512-qM/6m6hQZzDcZF3onzIhZeDHDO43bkNNlOX0i8n3lR6zLbu0GN2d8qfM/IERJZYauhAHSLHy39NF0Ctdvcid7g== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" - "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-optional-chaining@^7.24.7", "@babel/plugin-transform-optional-chaining@^7.24.8": - version "7.24.8" - resolved "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.8.tgz#bb02a67b60ff0406085c13d104c99a835cdf365d" - integrity sha512-5cTOLSMs9eypEy8JUVvIKOu6NgvbJMnpG62VpIHrTmROdQ+L5mDAaI40g25k5vXti55JWNX5jCkq3HZxXBQANw== +"@babel/plugin-transform-optional-chaining@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.25.9.tgz#e142eb899d26ef715435f201ab6e139541eee7dd" + integrity sha512-6AvV0FsLULbpnXeBjrY4dmWF8F7gf8QnvTEoO/wX/5xm/xE1Xo8oPuD3MPS+KS9f9XBEAWN7X1aWr4z9HdOr7A== dependencies: - "@babel/helper-plugin-utils" "^7.24.8" - "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7" - "@babel/plugin-syntax-optional-chaining" "^7.8.3" + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9" -"@babel/plugin-transform-parameters@^7.20.7", "@babel/plugin-transform-parameters@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.7.tgz#5881f0ae21018400e320fc7eb817e529d1254b68" - integrity sha512-yGWW5Rr+sQOhK0Ot8hjDJuxU3XLRQGflvT4lhlSY0DFvdb3TwKaY26CJzHtYllU0vT9j58hc37ndFPsqT1SrzA== +"@babel/plugin-transform-parameters@^7.20.7", "@babel/plugin-transform-parameters@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.9.tgz#b856842205b3e77e18b7a7a1b94958069c7ba257" + integrity sha512-wzz6MKwpnshBAiRmn4jR8LYz/g8Ksg0o80XmwZDlordjwEk9SxBzTWC7F5ef1jhbrbOW2DJ5J6ayRukrJmnr0g== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-private-methods@^7.25.4": - version "7.25.4" - resolved "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.4.tgz#9bbefbe3649f470d681997e0b64a4b254d877242" - integrity sha512-ao8BG7E2b/URaUQGqN3Tlsg+M3KlHY6rJ1O1gXAEUnZoyNQnvKyH87Kfg+FoxSeyWUB8ISZZsC91C44ZuBFytw== +"@babel/plugin-transform-private-methods@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.9.tgz#847f4139263577526455d7d3223cd8bda51e3b57" + integrity sha512-D/JUozNpQLAPUVusvqMxyvjzllRaF8/nSrP1s2YGQT/W4LHK4xxsMcHjhOGTS01mp9Hda8nswb+FblLdJornQw== dependencies: - "@babel/helper-create-class-features-plugin" "^7.25.4" - "@babel/helper-plugin-utils" "^7.24.8" + "@babel/helper-create-class-features-plugin" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-private-property-in-object@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.7.tgz#4eec6bc701288c1fab5f72e6a4bbc9d67faca061" - integrity sha512-9z76mxwnwFxMyxZWEgdgECQglF2Q7cFLm0kMf8pGwt+GSJsY0cONKj/UuO4bOH0w/uAel3ekS4ra5CEAyJRmDA== +"@babel/plugin-transform-private-property-in-object@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.25.9.tgz#9c8b73e64e6cc3cbb2743633885a7dd2c385fe33" + integrity sha512-Evf3kcMqzXA3xfYJmZ9Pg1OvKdtqsDMSWBDzZOPLvHiTt36E75jLDQo5w1gtRU95Q4E5PDttrTf25Fw8d/uWLw== dependencies: - "@babel/helper-annotate-as-pure" "^7.24.7" - "@babel/helper-create-class-features-plugin" "^7.24.7" - "@babel/helper-plugin-utils" "^7.24.7" - "@babel/plugin-syntax-private-property-in-object" "^7.14.5" + "@babel/helper-annotate-as-pure" "^7.25.9" + "@babel/helper-create-class-features-plugin" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-property-literals@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.7.tgz#f0d2ed8380dfbed949c42d4d790266525d63bbdc" - integrity sha512-EMi4MLQSHfd2nrCqQEWxFdha2gBCqU4ZcCng4WBGZ5CJL4bBRW0ptdqqDdeirGZcpALazVVNJqRmsO8/+oNCBA== +"@babel/plugin-transform-property-literals@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.25.9.tgz#d72d588bd88b0dec8b62e36f6fda91cedfe28e3f" + integrity sha512-IvIUeV5KrS/VPavfSM/Iu+RE6llrHrYIKY1yfCzyO/lMXHQ+p7uGhonmGVisv6tSBSVgWzMBohTcvkC9vQcQFA== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-plugin-utils" "^7.25.9" "@babel/plugin-transform-react-constant-elements@^7.21.3": - version "7.25.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.25.1.tgz#71a665ed16ce618067d05f4a98130207349d82ae" - integrity sha512-SLV/giH/V4SmloZ6Dt40HjTGTAIkxn33TVIHxNGNvo8ezMhrxBkzisj4op1KZYPIOHFLqhv60OHvX+YRu4xbmQ== + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.25.9.tgz#08a1de35a301929b60fdf2788a54b46cd8ecd0ef" + integrity sha512-Ncw2JFsJVuvfRsa2lSHiC55kETQVLSnsYGQ1JDDwkUeWGTL/8Tom8aLTnlqgoeuopWrbbGndrc9AlLYrIosrow== dependencies: - "@babel/helper-plugin-utils" "^7.24.8" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-react-display-name@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.24.7.tgz#9caff79836803bc666bcfe210aeb6626230c293b" - integrity sha512-H/Snz9PFxKsS1JLI4dJLtnJgCJRoo0AUm3chP6NYr+9En1JMKloheEiLIhlp5MDVznWo+H3AAC1Mc8lmUEpsgg== +"@babel/plugin-transform-react-display-name@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.25.9.tgz#4b79746b59efa1f38c8695065a92a9f5afb24f7d" + integrity sha512-KJfMlYIUxQB1CJfO3e0+h0ZHWOTLCPP115Awhaz8U0Zpq36Gl/cXlpoyMRnUWlhNUBAzldnCiAZNvCDj7CrKxQ== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-react-jsx-development@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.24.7.tgz#eaee12f15a93f6496d852509a850085e6361470b" - integrity sha512-QG9EnzoGn+Qar7rxuW+ZOsbWOt56FvvI93xInqsZDC5fsekx1AlIO4KIJ5M+D0p0SqSH156EpmZyXq630B8OlQ== +"@babel/plugin-transform-react-jsx-development@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.25.9.tgz#8fd220a77dd139c07e25225a903b8be8c829e0d7" + integrity sha512-9mj6rm7XVYs4mdLIpbZnHOYdpW42uoiBCTVowg7sP1thUOiANgMb4UtpRivR0pp5iL+ocvUv7X4mZgFRpJEzGw== dependencies: - "@babel/plugin-transform-react-jsx" "^7.24.7" + "@babel/plugin-transform-react-jsx" "^7.25.9" -"@babel/plugin-transform-react-jsx@^7.24.7": - version "7.25.2" - resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.25.2.tgz#e37e8ebfa77e9f0b16ba07fadcb6adb47412227a" - integrity sha512-KQsqEAVBpU82NM/B/N9j9WOdphom1SZH3R+2V7INrQUH+V9EBFwZsEJl8eBIVeQE62FxJCc70jzEZwqU7RcVqA== +"@babel/plugin-transform-react-jsx@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.25.9.tgz#06367940d8325b36edff5e2b9cbe782947ca4166" + integrity sha512-s5XwpQYCqGerXl+Pu6VDL3x0j2d82eiV77UJ8a2mDHAW7j9SWRqQ2y1fNo1Z74CdcYipl5Z41zvjj4Nfzq36rw== dependencies: - "@babel/helper-annotate-as-pure" "^7.24.7" - "@babel/helper-module-imports" "^7.24.7" - "@babel/helper-plugin-utils" "^7.24.8" - "@babel/plugin-syntax-jsx" "^7.24.7" - "@babel/types" "^7.25.2" + "@babel/helper-annotate-as-pure" "^7.25.9" + "@babel/helper-module-imports" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/plugin-syntax-jsx" "^7.25.9" + "@babel/types" "^7.25.9" -"@babel/plugin-transform-react-pure-annotations@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.24.7.tgz#bdd9d140d1c318b4f28b29a00fb94f97ecab1595" - integrity sha512-PLgBVk3fzbmEjBJ/u8kFzOqS9tUeDjiaWud/rRym/yjCo/M9cASPlnrd2ZmmZpQT40fOOrvR8jh+n8jikrOhNA== +"@babel/plugin-transform-react-pure-annotations@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.25.9.tgz#ea1c11b2f9dbb8e2d97025f43a3b5bc47e18ae62" + integrity sha512-KQ/Takk3T8Qzj5TppkS1be588lkbTp5uj7w6a0LeQaTMSckU/wK0oJ/pih+T690tkgI5jfmg2TqDJvd41Sj1Cg== dependencies: - "@babel/helper-annotate-as-pure" "^7.24.7" - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-annotate-as-pure" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-regenerator@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.7.tgz#021562de4534d8b4b1851759fd7af4e05d2c47f8" - integrity sha512-lq3fvXPdimDrlg6LWBoqj+r/DEWgONuwjuOuQCSYgRroXDH/IdM1C0IZf59fL5cHLpjEH/O6opIRBbqv7ELnuA== +"@babel/plugin-transform-regenerator@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.25.9.tgz#03a8a4670d6cebae95305ac6defac81ece77740b" + integrity sha512-vwDcDNsgMPDGP0nMqzahDWE5/MLcX8sv96+wfX7as7LoF/kr97Bo/7fI00lXY4wUXYfVmwIIyG80fGZ1uvt2qg== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-plugin-utils" "^7.25.9" regenerator-transform "^0.15.2" -"@babel/plugin-transform-reserved-words@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.7.tgz#80037fe4fbf031fc1125022178ff3938bb3743a4" - integrity sha512-0DUq0pHcPKbjFZCfTss/pGkYMfy3vFWydkUBd9r0GHpIyfs2eCDENvqadMycRS9wZCXR41wucAfJHJmwA0UmoQ== +"@babel/plugin-transform-regexp-modifiers@^7.26.0": + version "7.26.0" + resolved "https://registry.npmjs.org/@babel/plugin-transform-regexp-modifiers/-/plugin-transform-regexp-modifiers-7.26.0.tgz#2f5837a5b5cd3842a919d8147e9903cc7455b850" + integrity sha512-vN6saax7lrA2yA/Pak3sCxuD6F5InBjn9IcrIKQPjpsLvuHYLVroTxjdlVRHjjBWxKOqIwpTXDkOssYT4BFdRw== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-create-regexp-features-plugin" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/plugin-transform-reserved-words@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.25.9.tgz#0398aed2f1f10ba3f78a93db219b27ef417fb9ce" + integrity sha512-7DL7DKYjn5Su++4RXu8puKZm2XBPHyjWLUidaPEkCUBbE7IPcsrkRHggAOOKydH1dASWdcUBxrkOGNxUv5P3Jg== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" "@babel/plugin-transform-runtime@^7.22.15": - version "7.25.4" - resolved "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.25.4.tgz#96e4ad7bfbbe0b4a7b7e6f2a533ca326cf204963" - integrity sha512-8hsyG+KUYGY0coX6KUCDancA0Vw225KJ2HJO0yCNr1vq5r+lJTleDaJf0K7iOhjw4SWhu03TMBzYTJ9krmzULQ== + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.25.9.tgz#62723ea3f5b31ffbe676da9d6dae17138ae580ea" + integrity sha512-nZp7GlEl+yULJrClz0SwHPqir3lc0zsPrDHQUcxGspSL7AKrexNSEfTbfqnDNJUO13bgKyfuOLMF8Xqtu8j3YQ== dependencies: - "@babel/helper-module-imports" "^7.24.7" - "@babel/helper-plugin-utils" "^7.24.8" + "@babel/helper-module-imports" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" babel-plugin-polyfill-corejs2 "^0.4.10" babel-plugin-polyfill-corejs3 "^0.10.6" babel-plugin-polyfill-regenerator "^0.6.1" semver "^6.3.1" -"@babel/plugin-transform-shorthand-properties@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.7.tgz#85448c6b996e122fa9e289746140aaa99da64e73" - integrity sha512-KsDsevZMDsigzbA09+vacnLpmPH4aWjcZjXdyFKGzpplxhbeB4wYtury3vglQkg6KM/xEPKt73eCjPPf1PgXBA== +"@babel/plugin-transform-shorthand-properties@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.9.tgz#bb785e6091f99f826a95f9894fc16fde61c163f2" + integrity sha512-MUv6t0FhO5qHnS/W8XCbHmiRWOphNufpE1IVxhK5kuN3Td9FT1x4rx4K42s3RYdMXCXpfWkGSbCSd0Z64xA7Ng== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-spread@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.7.tgz#e8a38c0fde7882e0fb8f160378f74bd885cc7bb3" - integrity sha512-x96oO0I09dgMDxJaANcRyD4ellXFLLiWhuwDxKZX5g2rWP1bTPkBSwCYv96VDXVT1bD9aPj8tppr5ITIh8hBng== +"@babel/plugin-transform-spread@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.25.9.tgz#24a35153931b4ba3d13cec4a7748c21ab5514ef9" + integrity sha512-oNknIB0TbURU5pqJFVbOOFspVlrpVwo2H1+HUIsVDvp5VauGGDP1ZEvO8Nn5xyMEs3dakajOxlmkNW7kNgSm6A== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" - "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7" + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9" -"@babel/plugin-transform-sticky-regex@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.7.tgz#96ae80d7a7e5251f657b5cf18f1ea6bf926f5feb" - integrity sha512-kHPSIJc9v24zEml5geKg9Mjx5ULpfncj0wRpYtxbvKyTtHCYDkVE3aHQ03FrpEo4gEe2vrJJS1Y9CJTaThA52g== +"@babel/plugin-transform-sticky-regex@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.25.9.tgz#c7f02b944e986a417817b20ba2c504dfc1453d32" + integrity sha512-WqBUSgeVwucYDP9U/xNRQam7xV8W5Zf+6Eo7T2SRVUFlhRiMNFdFz58u0KZmCVVqs2i7SHgpRnAhzRNmKfi2uA== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-template-literals@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.7.tgz#a05debb4a9072ae8f985bcf77f3f215434c8f8c8" - integrity sha512-AfDTQmClklHCOLxtGoP7HkeMw56k1/bTQjwsfhL6pppo/M4TOBSq+jjBUBLmV/4oeFg4GWMavIl44ZeCtmmZTw== +"@babel/plugin-transform-template-literals@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.25.9.tgz#6dbd4a24e8fad024df76d1fac6a03cf413f60fe1" + integrity sha512-o97AE4syN71M/lxrCtQByzphAdlYluKPDBzDVzMmfCobUjjhAryZV0AIpRPrxN0eAkxXO6ZLEScmt+PNhj2OTw== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-typeof-symbol@^7.24.8": - version "7.24.8" - resolved "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.8.tgz#383dab37fb073f5bfe6e60c654caac309f92ba1c" - integrity sha512-adNTUpDCVnmAE58VEqKlAA6ZBlNkMnWD0ZcW76lyNFN3MJniyGFZfNwERVk8Ap56MCnXztmDr19T4mPTztcuaw== +"@babel/plugin-transform-typeof-symbol@^7.26.7": + version "7.26.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.26.7.tgz#d0e33acd9223744c1e857dbd6fa17bd0a3786937" + integrity sha512-jfoTXXZTgGg36BmhqT3cAYK5qkmqvJpvNrPhaK/52Vgjhw4Rq29s9UqpWWV0D6yuRmgiFH/BUVlkl96zJWqnaw== dependencies: - "@babel/helper-plugin-utils" "^7.24.8" + "@babel/helper-plugin-utils" "^7.26.5" -"@babel/plugin-transform-typescript@^7.24.7": - version "7.25.2" - resolved "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.25.2.tgz#237c5d10de6d493be31637c6b9fa30b6c5461add" - integrity sha512-lBwRvjSmqiMYe/pS0+1gggjJleUJi7NzjvQ1Fkqtt69hBa/0t1YuW/MLQMAPixfwaQOHUXsd6jeU3Z+vdGv3+A== +"@babel/plugin-transform-typescript@^7.25.9": + version "7.26.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.26.7.tgz#64339515ea3eff610160f62499c3ef437d0ac83d" + integrity sha512-5cJurntg+AT+cgelGP9Bt788DKiAw9gIMSMU2NJrLAilnj0m8WZWUNZPSLOmadYsujHutpgElO+50foX+ib/Wg== dependencies: - "@babel/helper-annotate-as-pure" "^7.24.7" - "@babel/helper-create-class-features-plugin" "^7.25.0" - "@babel/helper-plugin-utils" "^7.24.8" - "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7" - "@babel/plugin-syntax-typescript" "^7.24.7" + "@babel/helper-annotate-as-pure" "^7.25.9" + "@babel/helper-create-class-features-plugin" "^7.25.9" + "@babel/helper-plugin-utils" "^7.26.5" + "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9" + "@babel/plugin-syntax-typescript" "^7.25.9" -"@babel/plugin-transform-unicode-escapes@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.7.tgz#2023a82ced1fb4971630a2e079764502c4148e0e" - integrity sha512-U3ap1gm5+4edc2Q/P+9VrBNhGkfnf+8ZqppY71Bo/pzZmXhhLdqgaUl6cuB07O1+AQJtCLfaOmswiNbSQ9ivhw== +"@babel/plugin-transform-unicode-escapes@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.25.9.tgz#a75ef3947ce15363fccaa38e2dd9bc70b2788b82" + integrity sha512-s5EDrE6bW97LtxOcGj1Khcx5AaXwiMmi4toFWRDP9/y0Woo6pXC+iyPu/KuhKtfSrNFd7jJB+/fkOtZy6aIC6Q== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-unicode-property-regex@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.24.7.tgz#9073a4cd13b86ea71c3264659590ac086605bbcd" - integrity sha512-uH2O4OV5M9FZYQrwc7NdVmMxQJOCCzFeYudlZSzUAHRFeOujQefa92E74TQDVskNHCzOXoigEuoyzHDhaEaK5w== +"@babel/plugin-transform-unicode-property-regex@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.25.9.tgz#a901e96f2c1d071b0d1bb5dc0d3c880ce8f53dd3" + integrity sha512-Jt2d8Ga+QwRluxRQ307Vlxa6dMrYEMZCgGxoPR8V52rxPyldHu3hdlHspxaqYmE7oID5+kB+UKUB/eWS+DkkWg== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.24.7" - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-create-regexp-features-plugin" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-unicode-regex@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.7.tgz#dfc3d4a51127108099b19817c0963be6a2adf19f" - integrity sha512-hlQ96MBZSAXUq7ltkjtu3FJCCSMx/j629ns3hA3pXnBXjanNP0LHi+JpPeA81zaWgVK1VGH95Xuy7u0RyQ8kMg== +"@babel/plugin-transform-unicode-regex@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.25.9.tgz#5eae747fe39eacf13a8bd006a4fb0b5d1fa5e9b1" + integrity sha512-yoxstj7Rg9dlNn9UQxzk4fcNivwv4nUYz7fYXBaKxvw/lnmPuOm/ikoELygbYq68Bls3D/D+NBPHiLwZdZZ4HA== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.24.7" - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-create-regexp-features-plugin" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-unicode-sets-regex@^7.25.4": - version "7.25.4" - resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.4.tgz#be664c2a0697ffacd3423595d5edef6049e8946c" - integrity sha512-qesBxiWkgN1Q+31xUE9RcMk79eOXXDCv6tfyGMRSs4RGlioSg2WVyQAm07k726cSE56pa+Kb0y9epX2qaXzTvA== +"@babel/plugin-transform-unicode-sets-regex@^7.25.9": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.9.tgz#65114c17b4ffc20fa5b163c63c70c0d25621fabe" + integrity sha512-8BYqO3GeVNHtx69fdPshN3fnzUNLrWdHhk/icSwigksJGczKSizZ+Z6SBCxTs723Fr5VSNorTIK7a+R2tISvwQ== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.25.2" - "@babel/helper-plugin-utils" "^7.24.8" + "@babel/helper-create-regexp-features-plugin" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" "@babel/preset-env@^7.10.2", "@babel/preset-env@^7.20.2": - version "7.25.4" - resolved "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.25.4.tgz#be23043d43a34a2721cd0f676c7ba6f1481f6af6" - integrity sha512-W9Gyo+KmcxjGahtt3t9fb14vFRWvPpu5pT6GBlovAK6BTBcxgjfVMSQCfJl4oi35ODrxP6xx2Wr8LNST57Mraw== + version "7.26.7" + resolved "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.26.7.tgz#24d38e211f4570b8d806337035cc3ae798e0c36d" + integrity sha512-Ycg2tnXwixaXOVb29rana8HNPgLVBof8qqtNQ9LE22IoyZboQbGSxI6ZySMdW3K5nAe6gu35IaJefUJflhUFTQ== dependencies: - "@babel/compat-data" "^7.25.4" - "@babel/helper-compilation-targets" "^7.25.2" - "@babel/helper-plugin-utils" "^7.24.8" - "@babel/helper-validator-option" "^7.24.8" - "@babel/plugin-bugfix-firefox-class-in-computed-class-key" "^7.25.3" - "@babel/plugin-bugfix-safari-class-field-initializer-scope" "^7.25.0" - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.25.0" - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.24.7" - "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly" "^7.25.0" + "@babel/compat-data" "^7.26.5" + "@babel/helper-compilation-targets" "^7.26.5" + "@babel/helper-plugin-utils" "^7.26.5" + "@babel/helper-validator-option" "^7.25.9" + "@babel/plugin-bugfix-firefox-class-in-computed-class-key" "^7.25.9" + "@babel/plugin-bugfix-safari-class-field-initializer-scope" "^7.25.9" + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.25.9" + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.25.9" + "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly" "^7.25.9" "@babel/plugin-proposal-private-property-in-object" "7.21.0-placeholder-for-preset-env.2" - "@babel/plugin-syntax-async-generators" "^7.8.4" - "@babel/plugin-syntax-class-properties" "^7.12.13" - "@babel/plugin-syntax-class-static-block" "^7.14.5" - "@babel/plugin-syntax-dynamic-import" "^7.8.3" - "@babel/plugin-syntax-export-namespace-from" "^7.8.3" - "@babel/plugin-syntax-import-assertions" "^7.24.7" - "@babel/plugin-syntax-import-attributes" "^7.24.7" - "@babel/plugin-syntax-import-meta" "^7.10.4" - "@babel/plugin-syntax-json-strings" "^7.8.3" - "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" - "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" - "@babel/plugin-syntax-numeric-separator" "^7.10.4" - "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" - "@babel/plugin-syntax-optional-chaining" "^7.8.3" - "@babel/plugin-syntax-private-property-in-object" "^7.14.5" - "@babel/plugin-syntax-top-level-await" "^7.14.5" + "@babel/plugin-syntax-import-assertions" "^7.26.0" + "@babel/plugin-syntax-import-attributes" "^7.26.0" "@babel/plugin-syntax-unicode-sets-regex" "^7.18.6" - "@babel/plugin-transform-arrow-functions" "^7.24.7" - "@babel/plugin-transform-async-generator-functions" "^7.25.4" - "@babel/plugin-transform-async-to-generator" "^7.24.7" - "@babel/plugin-transform-block-scoped-functions" "^7.24.7" - "@babel/plugin-transform-block-scoping" "^7.25.0" - "@babel/plugin-transform-class-properties" "^7.25.4" - "@babel/plugin-transform-class-static-block" "^7.24.7" - "@babel/plugin-transform-classes" "^7.25.4" - "@babel/plugin-transform-computed-properties" "^7.24.7" - "@babel/plugin-transform-destructuring" "^7.24.8" - "@babel/plugin-transform-dotall-regex" "^7.24.7" - "@babel/plugin-transform-duplicate-keys" "^7.24.7" - "@babel/plugin-transform-duplicate-named-capturing-groups-regex" "^7.25.0" - "@babel/plugin-transform-dynamic-import" "^7.24.7" - "@babel/plugin-transform-exponentiation-operator" "^7.24.7" - "@babel/plugin-transform-export-namespace-from" "^7.24.7" - "@babel/plugin-transform-for-of" "^7.24.7" - "@babel/plugin-transform-function-name" "^7.25.1" - "@babel/plugin-transform-json-strings" "^7.24.7" - "@babel/plugin-transform-literals" "^7.25.2" - "@babel/plugin-transform-logical-assignment-operators" "^7.24.7" - "@babel/plugin-transform-member-expression-literals" "^7.24.7" - "@babel/plugin-transform-modules-amd" "^7.24.7" - "@babel/plugin-transform-modules-commonjs" "^7.24.8" - "@babel/plugin-transform-modules-systemjs" "^7.25.0" - "@babel/plugin-transform-modules-umd" "^7.24.7" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.24.7" - "@babel/plugin-transform-new-target" "^7.24.7" - "@babel/plugin-transform-nullish-coalescing-operator" "^7.24.7" - "@babel/plugin-transform-numeric-separator" "^7.24.7" - "@babel/plugin-transform-object-rest-spread" "^7.24.7" - "@babel/plugin-transform-object-super" "^7.24.7" - "@babel/plugin-transform-optional-catch-binding" "^7.24.7" - "@babel/plugin-transform-optional-chaining" "^7.24.8" - "@babel/plugin-transform-parameters" "^7.24.7" - "@babel/plugin-transform-private-methods" "^7.25.4" - "@babel/plugin-transform-private-property-in-object" "^7.24.7" - "@babel/plugin-transform-property-literals" "^7.24.7" - "@babel/plugin-transform-regenerator" "^7.24.7" - "@babel/plugin-transform-reserved-words" "^7.24.7" - "@babel/plugin-transform-shorthand-properties" "^7.24.7" - "@babel/plugin-transform-spread" "^7.24.7" - "@babel/plugin-transform-sticky-regex" "^7.24.7" - "@babel/plugin-transform-template-literals" "^7.24.7" - "@babel/plugin-transform-typeof-symbol" "^7.24.8" - "@babel/plugin-transform-unicode-escapes" "^7.24.7" - "@babel/plugin-transform-unicode-property-regex" "^7.24.7" - "@babel/plugin-transform-unicode-regex" "^7.24.7" - "@babel/plugin-transform-unicode-sets-regex" "^7.25.4" + "@babel/plugin-transform-arrow-functions" "^7.25.9" + "@babel/plugin-transform-async-generator-functions" "^7.25.9" + "@babel/plugin-transform-async-to-generator" "^7.25.9" + "@babel/plugin-transform-block-scoped-functions" "^7.26.5" + "@babel/plugin-transform-block-scoping" "^7.25.9" + "@babel/plugin-transform-class-properties" "^7.25.9" + "@babel/plugin-transform-class-static-block" "^7.26.0" + "@babel/plugin-transform-classes" "^7.25.9" + "@babel/plugin-transform-computed-properties" "^7.25.9" + "@babel/plugin-transform-destructuring" "^7.25.9" + "@babel/plugin-transform-dotall-regex" "^7.25.9" + "@babel/plugin-transform-duplicate-keys" "^7.25.9" + "@babel/plugin-transform-duplicate-named-capturing-groups-regex" "^7.25.9" + "@babel/plugin-transform-dynamic-import" "^7.25.9" + "@babel/plugin-transform-exponentiation-operator" "^7.26.3" + "@babel/plugin-transform-export-namespace-from" "^7.25.9" + "@babel/plugin-transform-for-of" "^7.25.9" + "@babel/plugin-transform-function-name" "^7.25.9" + "@babel/plugin-transform-json-strings" "^7.25.9" + "@babel/plugin-transform-literals" "^7.25.9" + "@babel/plugin-transform-logical-assignment-operators" "^7.25.9" + "@babel/plugin-transform-member-expression-literals" "^7.25.9" + "@babel/plugin-transform-modules-amd" "^7.25.9" + "@babel/plugin-transform-modules-commonjs" "^7.26.3" + "@babel/plugin-transform-modules-systemjs" "^7.25.9" + "@babel/plugin-transform-modules-umd" "^7.25.9" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.25.9" + "@babel/plugin-transform-new-target" "^7.25.9" + "@babel/plugin-transform-nullish-coalescing-operator" "^7.26.6" + "@babel/plugin-transform-numeric-separator" "^7.25.9" + "@babel/plugin-transform-object-rest-spread" "^7.25.9" + "@babel/plugin-transform-object-super" "^7.25.9" + "@babel/plugin-transform-optional-catch-binding" "^7.25.9" + "@babel/plugin-transform-optional-chaining" "^7.25.9" + "@babel/plugin-transform-parameters" "^7.25.9" + "@babel/plugin-transform-private-methods" "^7.25.9" + "@babel/plugin-transform-private-property-in-object" "^7.25.9" + "@babel/plugin-transform-property-literals" "^7.25.9" + "@babel/plugin-transform-regenerator" "^7.25.9" + "@babel/plugin-transform-regexp-modifiers" "^7.26.0" + "@babel/plugin-transform-reserved-words" "^7.25.9" + "@babel/plugin-transform-shorthand-properties" "^7.25.9" + "@babel/plugin-transform-spread" "^7.25.9" + "@babel/plugin-transform-sticky-regex" "^7.25.9" + "@babel/plugin-transform-template-literals" "^7.25.9" + "@babel/plugin-transform-typeof-symbol" "^7.26.7" + "@babel/plugin-transform-unicode-escapes" "^7.25.9" + "@babel/plugin-transform-unicode-property-regex" "^7.25.9" + "@babel/plugin-transform-unicode-regex" "^7.25.9" + "@babel/plugin-transform-unicode-sets-regex" "^7.25.9" "@babel/preset-modules" "0.1.6-no-external-plugins" babel-plugin-polyfill-corejs2 "^0.4.10" babel-plugin-polyfill-corejs3 "^0.10.6" babel-plugin-polyfill-regenerator "^0.6.1" - core-js-compat "^3.37.1" + core-js-compat "^3.38.1" semver "^6.3.1" "@babel/preset-modules@0.1.6-no-external-plugins": @@ -1021,70 +962,64 @@ esutils "^2.0.2" "@babel/preset-react@^7.12.13", "@babel/preset-react@^7.18.6": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.24.7.tgz#480aeb389b2a798880bf1f889199e3641cbb22dc" - integrity sha512-AAH4lEkpmzFWrGVlHaxJB7RLH21uPQ9+He+eFLWHmF9IuFQVugz8eAsamaW0DXRrTfco5zj1wWtpdcXJUOfsag== + version "7.26.3" + resolved "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.26.3.tgz#7c5e028d623b4683c1f83a0bd4713b9100560caa" + integrity sha512-Nl03d6T9ky516DGK2YMxrTqvnpUW63TnJMOMonj+Zae0JiPC5BC9xPMSL6L8fiSpA5vP88qfygavVQvnLp+6Cw== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" - "@babel/helper-validator-option" "^7.24.7" - "@babel/plugin-transform-react-display-name" "^7.24.7" - "@babel/plugin-transform-react-jsx" "^7.24.7" - "@babel/plugin-transform-react-jsx-development" "^7.24.7" - "@babel/plugin-transform-react-pure-annotations" "^7.24.7" + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-validator-option" "^7.25.9" + "@babel/plugin-transform-react-display-name" "^7.25.9" + "@babel/plugin-transform-react-jsx" "^7.25.9" + "@babel/plugin-transform-react-jsx-development" "^7.25.9" + "@babel/plugin-transform-react-pure-annotations" "^7.25.9" "@babel/preset-typescript@^7.21.0", "@babel/preset-typescript@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.24.7.tgz#66cd86ea8f8c014855671d5ea9a737139cbbfef1" - integrity sha512-SyXRe3OdWwIwalxDg5UtJnJQO+YPcTfwiIY2B0Xlddh9o7jpWLvv8X1RthIeDOxQ+O1ML5BLPCONToObyVQVuQ== + version "7.26.0" + resolved "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.26.0.tgz#4a570f1b8d104a242d923957ffa1eaff142a106d" + integrity sha512-NMk1IGZ5I/oHhoXEElcm+xUnL/szL6xflkFZmoEU9xj1qSJXpiS7rsspYo92B4DRCDvZn2erT5LdsCeXAKNCkg== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" - "@babel/helper-validator-option" "^7.24.7" - "@babel/plugin-syntax-jsx" "^7.24.7" - "@babel/plugin-transform-modules-commonjs" "^7.24.7" - "@babel/plugin-transform-typescript" "^7.24.7" + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-validator-option" "^7.25.9" + "@babel/plugin-syntax-jsx" "^7.25.9" + "@babel/plugin-transform-modules-commonjs" "^7.25.9" + "@babel/plugin-transform-typescript" "^7.25.9" -"@babel/regjsgen@^0.8.0": - version "0.8.0" - resolved "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310" - integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA== - -"@babel/runtime@^7.0.0", "@babel/runtime@^7.10.1", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.5", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.7", "@babel/runtime@^7.23.9", "@babel/runtime@^7.25.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": - version "7.25.6" - resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.6.tgz#9afc3289f7184d8d7f98b099884c26317b9264d2" - integrity sha512-VBj9MYyDb9tuLq7yzqjgzt6Q+IBQLrGZfdjOekyEirZPHxXWoTSGUTMrpsfi58Up73d13NfYLv8HT9vmznjzhQ== +"@babel/runtime@^7.0.0", "@babel/runtime@^7.10.1", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.5", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.7", "@babel/runtime@^7.24.4", "@babel/runtime@^7.25.7", "@babel/runtime@^7.26.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": + version "7.26.7" + resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.7.tgz#f4e7fe527cd710f8dc0618610b61b4b060c3c341" + integrity sha512-AOPI3D+a8dXnja+iwsUqGRjr1BbZIe771sXdapOtYI531gSqpi92vXivKcq2asu/DFpdl1ceFAKZyRzK2PCVcQ== dependencies: regenerator-runtime "^0.14.0" -"@babel/template@^7.24.7", "@babel/template@^7.25.0", "@babel/template@^7.3.3": - version "7.25.0" - resolved "https://registry.npmjs.org/@babel/template/-/template-7.25.0.tgz#e733dc3134b4fede528c15bc95e89cb98c52592a" - integrity sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q== +"@babel/template@^7.25.9", "@babel/template@^7.3.3": + version "7.25.9" + resolved "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz#ecb62d81a8a6f5dc5fe8abfc3901fc52ddf15016" + integrity sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg== dependencies: - "@babel/code-frame" "^7.24.7" - "@babel/parser" "^7.25.0" - "@babel/types" "^7.25.0" + "@babel/code-frame" "^7.25.9" + "@babel/parser" "^7.25.9" + "@babel/types" "^7.25.9" -"@babel/traverse@^7.24.7", "@babel/traverse@^7.24.8", "@babel/traverse@^7.25.0", "@babel/traverse@^7.25.1", "@babel/traverse@^7.25.2", "@babel/traverse@^7.25.3", "@babel/traverse@^7.25.4": - version "7.25.6" - resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.6.tgz#04fad980e444f182ecf1520504941940a90fea41" - integrity sha512-9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ== +"@babel/traverse@^7.25.9", "@babel/traverse@^7.26.5", "@babel/traverse@^7.26.7": + version "7.26.7" + resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.7.tgz#99a0a136f6a75e7fb8b0a1ace421e0b25994b8bb" + integrity sha512-1x1sgeyRLC3r5fQOM0/xtQKsYjyxmFjaOrLJNtZ81inNjyJHGIolTULPiSc/2qe1/qfpFLisLQYFnnZl7QoedA== dependencies: - "@babel/code-frame" "^7.24.7" - "@babel/generator" "^7.25.6" - "@babel/parser" "^7.25.6" - "@babel/template" "^7.25.0" - "@babel/types" "^7.25.6" + "@babel/code-frame" "^7.26.2" + "@babel/generator" "^7.26.5" + "@babel/parser" "^7.26.7" + "@babel/template" "^7.25.9" + "@babel/types" "^7.26.7" debug "^4.3.1" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.21.3", "@babel/types@^7.24.7", "@babel/types@^7.24.8", "@babel/types@^7.25.0", "@babel/types@^7.25.2", "@babel/types@^7.25.6", "@babel/types@^7.3.3", "@babel/types@^7.4.4": - version "7.25.6" - resolved "https://registry.npmjs.org/@babel/types/-/types-7.25.6.tgz#893942ddb858f32ae7a004ec9d3a76b3463ef8e6" - integrity sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw== +"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.21.3", "@babel/types@^7.25.9", "@babel/types@^7.26.5", "@babel/types@^7.26.7", "@babel/types@^7.3.3", "@babel/types@^7.4.4": + version "7.26.7" + resolved "https://registry.npmjs.org/@babel/types/-/types-7.26.7.tgz#5e2b89c0768e874d4d061961f3a5a153d71dc17a" + integrity sha512-t8kDRGrKXyp6+tjUh7hw2RLyclsW4TRoRvRHtSyAX9Bb5ldlFh+90YAYY6awRXrlB4G5G2izNeGySpATlFzmOg== dependencies: - "@babel/helper-string-parser" "^7.24.8" - "@babel/helper-validator-identifier" "^7.24.7" - to-fast-properties "^2.0.0" + "@babel/helper-string-parser" "^7.25.9" + "@babel/helper-validator-identifier" "^7.25.9" "@bcoe/v8-coverage@^0.2.3": version "0.2.3" @@ -1092,9 +1027,9 @@ integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== "@codemirror/autocomplete@^6.0.0": - version "6.18.0" - resolved "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.18.0.tgz#5f39b05daca04c95e990b70024144df47b2aa635" - integrity sha512-5DbOvBbY4qW5l57cjDsmmpDh3/TeK1vXfTHa+BUMrRzdWdcxKZ4U4V7vQaTtOpApNU4kLS4FQ6cINtLg245LXA== + version "6.18.4" + resolved "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.18.4.tgz#4394f55d6771727179f2e28a871ef46bbbeb11b1" + integrity sha512-sFAphGQIqyQZfP2ZBsSHV7xQvo9Py0rV0dW7W3IMRdS+zDuNb2l3no78CvUaWKGfzFjI4FTrLdUSj86IGb2hRA== dependencies: "@codemirror/language" "^6.0.0" "@codemirror/state" "^6.0.0" @@ -1102,9 +1037,9 @@ "@lezer/common" "^1.0.0" "@codemirror/commands@^6.0.0": - version "6.6.0" - resolved "https://registry.npmjs.org/@codemirror/commands/-/commands-6.6.0.tgz#d308f143fe1b8896ca25fdb855f66acdaf019dd4" - integrity sha512-qnY+b7j1UNcTS31Eenuc/5YJB6gQOzkUoNmJQc0rznwqSRpeaWWpjkWy2C/MPTcePpsKJEM26hXrOXl1+nceXg== + version "6.8.0" + resolved "https://registry.npmjs.org/@codemirror/commands/-/commands-6.8.0.tgz#92f200b66f852939bd6ebb90d48c2d9e9c813d64" + integrity sha512-q8VPEFaEP4ikSlt6ZxjB3zW72+7osfAYW9i8Zu943uqbKuz6utc1+F170hyLUCUltXORjQXRyYQNfkckzA/bPQ== dependencies: "@codemirror/language" "^6.0.0" "@codemirror/state" "^6.4.0" @@ -1119,10 +1054,10 @@ "@codemirror/language" "^6.0.0" "@lezer/json" "^1.0.0" -"@codemirror/lang-sql@^6.6.5": - version "6.7.1" - resolved "https://registry.npmjs.org/@codemirror/lang-sql/-/lang-sql-6.7.1.tgz#314211eb79fbba96b4dd0d24fa954be9803368ab" - integrity sha512-flQa7zemrLKk0TIrOJnpeyH/b29BcVybtsTeZMgAo40O6kGbrnUSCgwI3TF5iJY3O9VXJKKCA+i0CBVvDfr88w== +"@codemirror/lang-sql@^6.8.0": + version "6.8.0" + resolved "https://registry.npmjs.org/@codemirror/lang-sql/-/lang-sql-6.8.0.tgz#1ae68ad49f378605ff88a4cc428ba667ce056068" + integrity sha512-aGLmY4OwGqN3TdSx3h6QeA1NrvaYtF7kkoWR/+W7/JzB0gQtJ+VJxewlnE3+VImhA4WVlhmkJr109PefOOhjLg== dependencies: "@codemirror/autocomplete" "^6.0.0" "@codemirror/language" "^6.0.0" @@ -1132,9 +1067,9 @@ "@lezer/lr" "^1.0.0" "@codemirror/language@^6.0.0": - version "6.10.2" - resolved "https://registry.npmjs.org/@codemirror/language/-/language-6.10.2.tgz#4056dc219619627ffe995832eeb09cea6060be61" - integrity sha512-kgbTYTo0Au6dCSc/TFy7fK3fpJmgHDv1sG1KNQKJXVi+xBTEeBPY/M30YXiU6mMXeH+YIDLsbrT4ZwNRdtF+SA== + version "6.10.8" + resolved "https://registry.npmjs.org/@codemirror/language/-/language-6.10.8.tgz#3e3a346a2b0a8cf63ee1cfe03349eb1965dce5f9" + integrity sha512-wcP8XPPhDH2vTqf181U8MbZnW+tDyPYy0UzVOa+oHORjyT+mhhom9vBd7dApJwoDz9Nb/a8kHjJIsuA/t8vNFw== dependencies: "@codemirror/state" "^6.0.0" "@codemirror/view" "^6.23.0" @@ -1144,64 +1079,71 @@ style-mod "^4.0.0" "@codemirror/lint@^6.0.0": - version "6.8.1" - resolved "https://registry.npmjs.org/@codemirror/lint/-/lint-6.8.1.tgz#6427848815baaf68c08e98c7673b804d3d8c0e7f" - integrity sha512-IZ0Y7S4/bpaunwggW2jYqwLuHj0QtESf5xcROewY6+lDNwZ/NzvR4t+vpYgg9m7V8UXLPYqG+lu3DF470E5Oxg== + version "6.8.4" + resolved "https://registry.npmjs.org/@codemirror/lint/-/lint-6.8.4.tgz#7d8aa5d1a6dec89ffcc23ad45ddca2e12e90982d" + integrity sha512-u4q7PnZlJUojeRe8FJa/njJcMctISGgPQ4PnWsd9268R4ZTtU+tfFYmwkBvgcrK2+QQ8tYFVALVb5fVJykKc5A== dependencies: "@codemirror/state" "^6.0.0" - "@codemirror/view" "^6.0.0" + "@codemirror/view" "^6.35.0" crelt "^1.0.5" "@codemirror/search@^6.0.0": - version "6.5.6" - resolved "https://registry.npmjs.org/@codemirror/search/-/search-6.5.6.tgz#8f858b9e678d675869112e475f082d1e8488db93" - integrity sha512-rpMgcsh7o0GuCDUXKPvww+muLA1pDJaFrpq/CCHtpQJYz8xopu4D1hPcKRoDD0YlF8gZaqTNIRa4VRBWyhyy7Q== + version "6.5.8" + resolved "https://registry.npmjs.org/@codemirror/search/-/search-6.5.8.tgz#b59b3659b46184cc75d6108d7c050a4ca344c3a0" + integrity sha512-PoWtZvo7c1XFeZWmmyaOp2G0XVbOnm+fJzvghqGAktBW3cufwJUWvSCcNG0ppXiBEM05mZu6RhMtXPv2hpllig== dependencies: "@codemirror/state" "^6.0.0" "@codemirror/view" "^6.0.0" crelt "^1.0.5" -"@codemirror/state@^6.0.0", "@codemirror/state@^6.4.0": - version "6.4.1" - resolved "https://registry.npmjs.org/@codemirror/state/-/state-6.4.1.tgz#da57143695c056d9a3c38705ed34136e2b68171b" - integrity sha512-QkEyUiLhsJoZkbumGZlswmAhA7CBU02Wrz7zvH4SrcifbsqwlXShVXg65f3v/ts57W3dqyamEriMhij1Z3Zz4A== - -"@codemirror/view@^6.0.0", "@codemirror/view@^6.17.0", "@codemirror/view@^6.23.0", "@codemirror/view@^6.27.0": - version "6.33.0" - resolved "https://registry.npmjs.org/@codemirror/view/-/view-6.33.0.tgz#51e270410fc3af92a6e38798e80ebf8add7dc3ec" - integrity sha512-AroaR3BvnjRW8fiZBalAaK+ZzB5usGgI014YKElYZvQdNH5ZIidHlO+cyf/2rWzyBFRkvG6VhiXeAEbC53P2YQ== +"@codemirror/state@^6.0.0", "@codemirror/state@^6.4.0", "@codemirror/state@^6.5.0": + version "6.5.1" + resolved "https://registry.npmjs.org/@codemirror/state/-/state-6.5.1.tgz#e5c0599f7b43cf03f19e05861317df5425c07904" + integrity sha512-3rA9lcwciEB47ZevqvD8qgbzhM9qMb8vCcQCNmDfVRPQG4JT9mSb0Jg8H7YjKGGQcFnLN323fj9jdnG59Kx6bg== dependencies: - "@codemirror/state" "^6.4.0" + "@marijn/find-cluster-break" "^1.0.0" + +"@codemirror/view@^6.0.0", "@codemirror/view@^6.17.0", "@codemirror/view@^6.23.0", "@codemirror/view@^6.27.0", "@codemirror/view@^6.35.0": + version "6.36.2" + resolved "https://registry.npmjs.org/@codemirror/view/-/view-6.36.2.tgz#aeb644e161440734ac5a153bf6e5b4a4355047be" + integrity sha512-DZ6ONbs8qdJK0fdN7AB82CgI6tYXf4HWk1wSVa0+9bhVznCuuvhQtX8bFBoy3dv8rZSQqUd8GvhVAcielcidrA== + dependencies: + "@codemirror/state" "^6.5.0" style-mod "^4.1.0" w3c-keyname "^2.2.4" -"@date-io/core@^3.0.0": - version "3.0.0" - resolved "https://registry.npmjs.org/@date-io/core/-/core-3.0.0.tgz#9fd2375383b5791b7211dfce3e576211f9ddce5e" - integrity sha512-S3j+IAQVBYNkQzchVVhX40eBkGDreBpScy9RXwTS5j2+k07+62pMVPisQ44Gq76Rqy5AOG/EZXCwBpY/jbemvA== +"@date-io/core@^3.0.0", "@date-io/core@^3.2.0": + version "3.2.0" + resolved "https://registry.npmjs.org/@date-io/core/-/core-3.2.0.tgz#7c8985ac26ccacf4f1b1fec10e2e22c75a28288a" + integrity sha512-hqwXvY8/YBsT9RwQITG868ZNb1MVFFkF7W1Ecv4P472j/ZWa7EFcgSmxy8PUElNVZfvhdvfv+a8j6NWJqOX5mA== "@date-io/date-fns@3.x": - version "3.0.0" - resolved "https://registry.npmjs.org/@date-io/date-fns/-/date-fns-3.0.0.tgz#b082daa73ab9f1f8be55fe99a529653f69a7275b" - integrity sha512-hsLAbsdP8LKfi7OQ729cXMWfmHQEq0hn3ysXfAAoc92j6j6sBq0s0tplnkWu6O4iBUpVCYRPGuNjQQhTaOu2AA== + version "3.2.0" + resolved "https://registry.npmjs.org/@date-io/date-fns/-/date-fns-3.2.0.tgz#7e20464df5da2502d4b3b8c9a2cdb4ee00776012" + integrity sha512-qkWB6E8lTwlwWq1xodXsY7On3gUoLsibdRu5cSAL1+oklrMOqpKmTzoZ9UFdvTs4Z0RYAi1D9ZelfqOCjT2quQ== dependencies: - "@date-io/core" "^3.0.0" + "@date-io/core" "^3.2.0" -"@discoveryjs/json-ext@0.5.7", "@discoveryjs/json-ext@^0.5.0": +"@discoveryjs/json-ext@0.5.7": version "0.5.7" resolved "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70" integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw== -"@emotion/babel-plugin@^11.12.0": - version "11.12.0" - resolved "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.12.0.tgz#7b43debb250c313101b3f885eba634f1d723fcc2" - integrity sha512-y2WQb+oP8Jqvvclh8Q55gLUyb7UFvgv7eJfsj7td5TToBrIUtPay2kMrZi4xjq9qw2vD0ZR5fSho0yqoFgX7Rw== +"@discoveryjs/json-ext@^0.6.1": + version "0.6.3" + resolved "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.6.3.tgz#f13c7c205915eb91ae54c557f5e92bddd8be0e83" + integrity sha512-4B4OijXeVNOPZlYA2oEwWOTkzyltLao+xbotHQeqN++Rv27Y6s818+n2Qkp8q+Fxhn0t/5lA5X1Mxktud8eayQ== + +"@emotion/babel-plugin@^11.13.5": + version "11.13.5" + resolved "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.13.5.tgz#eab8d65dbded74e0ecfd28dc218e75607c4e7bc0" + integrity sha512-pxHCpT2ex+0q+HH91/zsdHkw/lXd468DIN2zvfvLtPKLLMo6gQj7oLObq8PhkrxOZb/gGCq03S3Z7PDhS8pduQ== dependencies: "@babel/helper-module-imports" "^7.16.7" "@babel/runtime" "^7.18.3" "@emotion/hash" "^0.9.2" "@emotion/memoize" "^0.9.0" - "@emotion/serialize" "^1.2.0" + "@emotion/serialize" "^1.3.3" babel-plugin-macros "^3.1.0" convert-source-map "^1.5.0" escape-string-regexp "^4.0.0" @@ -1209,14 +1151,14 @@ source-map "^0.5.7" stylis "4.2.0" -"@emotion/cache@^11.11.0", "@emotion/cache@^11.13.0", "@emotion/cache@^11.4.0": - version "11.13.1" - resolved "https://registry.npmjs.org/@emotion/cache/-/cache-11.13.1.tgz#fecfc54d51810beebf05bf2a161271a1a91895d7" - integrity sha512-iqouYkuEblRcXmylXIwwOodiEK5Ifl7JcX7o6V4jI3iW4mLXX3dmt5xwBtIkJiQEXFAI+pC8X0i67yiPkH9Ucw== +"@emotion/cache@^11.13.5", "@emotion/cache@^11.14.0", "@emotion/cache@^11.4.0": + version "11.14.0" + resolved "https://registry.npmjs.org/@emotion/cache/-/cache-11.14.0.tgz#ee44b26986eeb93c8be82bb92f1f7a9b21b2ed76" + integrity sha512-L/B1lc/TViYk4DcpGxtAVbx0ZyiKM5ktoIyafGkH6zg/tj+mA+NE//aPYKG0k8kCHSHVJrpLpcAlOBEXQ3SavA== dependencies: "@emotion/memoize" "^0.9.0" "@emotion/sheet" "^1.4.0" - "@emotion/utils" "^1.4.0" + "@emotion/utils" "^1.4.2" "@emotion/weak-memoize" "^0.4.0" stylis "4.2.0" @@ -1226,9 +1168,9 @@ integrity sha512-MyqliTZGuOm3+5ZRSaaBGP3USLw6+EGykkwZns2EPC5g8jJ4z9OrdZY9apkl3+UP9+sdz76YYkwCKP5gh8iY3g== "@emotion/is-prop-valid@^1.3.0": - version "1.3.0" - resolved "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.3.0.tgz#bd84ba972195e8a2d42462387581560ef780e4e2" - integrity sha512-SHetuSLvJDzuNbOdtPVbq6yMMMlLoW5Q94uDqJZqy50gcmAjxFkVqmzqSGEFq9gT2iMuIeKV1PXVWmvUhuZLlQ== + version "1.3.1" + resolved "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.3.1.tgz#8d5cf1132f836d7adbe42cf0b49df7816fc88240" + integrity sha512-/ACwoqx7XQi9knQs/G0qKvv5teDMhD7bXYns9N/wM8ah8iNb8jZ2uNO0YOgiq2o2poIvVtJS2YALasQuMSQ7Kw== dependencies: "@emotion/memoize" "^0.9.0" @@ -1238,28 +1180,28 @@ integrity sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ== "@emotion/react@^11.11.1", "@emotion/react@^11.11.3", "@emotion/react@^11.8.1": - version "11.13.3" - resolved "https://registry.npmjs.org/@emotion/react/-/react-11.13.3.tgz#a69d0de2a23f5b48e0acf210416638010e4bd2e4" - integrity sha512-lIsdU6JNrmYfJ5EbUCf4xW1ovy5wKQ2CkPRM4xogziOxH1nXxBSjpC9YqbFAP7circxMfYp+6x676BqWcEiixg== + version "11.14.0" + resolved "https://registry.npmjs.org/@emotion/react/-/react-11.14.0.tgz#cfaae35ebc67dd9ef4ea2e9acc6cd29e157dd05d" + integrity sha512-O000MLDBDdk/EohJPFUqvnp4qnHeYkVP5B0xEG0D/L7cOKP9kefu2DXn8dj74cQfsEzUqh+sr1RzFqiL1o+PpA== dependencies: "@babel/runtime" "^7.18.3" - "@emotion/babel-plugin" "^11.12.0" - "@emotion/cache" "^11.13.0" - "@emotion/serialize" "^1.3.1" - "@emotion/use-insertion-effect-with-fallbacks" "^1.1.0" - "@emotion/utils" "^1.4.0" + "@emotion/babel-plugin" "^11.13.5" + "@emotion/cache" "^11.14.0" + "@emotion/serialize" "^1.3.3" + "@emotion/use-insertion-effect-with-fallbacks" "^1.2.0" + "@emotion/utils" "^1.4.2" "@emotion/weak-memoize" "^0.4.0" hoist-non-react-statics "^3.3.1" -"@emotion/serialize@^1.2.0", "@emotion/serialize@^1.3.0", "@emotion/serialize@^1.3.1": - version "1.3.1" - resolved "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.3.1.tgz#490b660178f43d2de8e92b278b51079d726c05c3" - integrity sha512-dEPNKzBPU+vFPGa+z3axPRn8XVDetYORmDC0wAiej+TNcOZE70ZMJa0X7JdeoM6q/nWTMZeLpN/fTnD9o8MQBA== +"@emotion/serialize@^1.3.3": + version "1.3.3" + resolved "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.3.3.tgz#d291531005f17d704d0463a032fe679f376509e8" + integrity sha512-EISGqt7sSNWHGI76hC7x1CksiXPahbxEOrC5RjmFRJTqLyEK9/9hZvBbiYn70dw4wuwMKiEMCUlR6ZXTSWQqxA== dependencies: "@emotion/hash" "^0.9.2" "@emotion/memoize" "^0.9.0" "@emotion/unitless" "^0.10.0" - "@emotion/utils" "^1.4.0" + "@emotion/utils" "^1.4.2" csstype "^3.0.2" "@emotion/sheet@^1.0.1", "@emotion/sheet@^1.4.0": @@ -1268,31 +1210,31 @@ integrity sha512-fTBW9/8r2w3dXWYM4HCB1Rdp8NLibOw2+XELH5m5+AkWiL/KqYX6dc0kKYlaYyKjrQ6ds33MCdMPEwgs2z1rqg== "@emotion/styled@^11.*", "@emotion/styled@^11.11.0": - version "11.13.0" - resolved "https://registry.npmjs.org/@emotion/styled/-/styled-11.13.0.tgz#633fd700db701472c7a5dbef54d6f9834e9fb190" - integrity sha512-tkzkY7nQhW/zC4hztlwucpT8QEZ6eUzpXDRhww/Eej4tFfO0FxQYWRyg/c5CCXa4d/f174kqeXYjuQRnhzf6dA== + version "11.14.0" + resolved "https://registry.npmjs.org/@emotion/styled/-/styled-11.14.0.tgz#f47ca7219b1a295186d7661583376fcea95f0ff3" + integrity sha512-XxfOnXFffatap2IyCeJyNov3kiDQWoR08gPUQxvbL7fxKryGBKUZUkG6Hz48DZwVrJSVh9sJboyV1Ds4OW6SgA== dependencies: "@babel/runtime" "^7.18.3" - "@emotion/babel-plugin" "^11.12.0" + "@emotion/babel-plugin" "^11.13.5" "@emotion/is-prop-valid" "^1.3.0" - "@emotion/serialize" "^1.3.0" - "@emotion/use-insertion-effect-with-fallbacks" "^1.1.0" - "@emotion/utils" "^1.4.0" + "@emotion/serialize" "^1.3.3" + "@emotion/use-insertion-effect-with-fallbacks" "^1.2.0" + "@emotion/utils" "^1.4.2" "@emotion/unitless@^0.10.0": version "0.10.0" resolved "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.10.0.tgz#2af2f7c7e5150f497bdabd848ce7b218a27cf745" integrity sha512-dFoMUuQA20zvtVTuxZww6OHoJYgrzfKM1t52mVySDJnMSEa08ruEvdYQbhvyu6soU+NeLVd3yKfTfT0NeV6qGg== -"@emotion/use-insertion-effect-with-fallbacks@^1.1.0": - version "1.1.0" - resolved "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.1.0.tgz#1a818a0b2c481efba0cf34e5ab1e0cb2dcb9dfaf" - integrity sha512-+wBOcIV5snwGgI2ya3u99D7/FJquOIniQT1IKyDsBmEgwvpxMNeS65Oib7OnE2d2aY+3BU4OiH+0Wchf8yk3Hw== +"@emotion/use-insertion-effect-with-fallbacks@^1.2.0": + version "1.2.0" + resolved "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.2.0.tgz#8a8cb77b590e09affb960f4ff1e9a89e532738bf" + integrity sha512-yJMtVdH59sxi/aVJBpk9FQq+OR8ll5GT8oWd57UpeaKEVGab41JWaCFA7FRLoMLloOZF/c/wsPoe+bfGmRKgDg== -"@emotion/utils@^1.0.0", "@emotion/utils@^1.4.0": - version "1.4.0" - resolved "https://registry.npmjs.org/@emotion/utils/-/utils-1.4.0.tgz#262f1d02aaedb2ec91c83a0955dd47822ad5fbdd" - integrity sha512-spEnrA1b6hDR/C68lC2M7m6ALPUHZC0lIY7jAS/B/9DuuO1ZP04eov8SMv/6fwRd8pzmsn2AuJEznRREWlQrlQ== +"@emotion/utils@^1.0.0", "@emotion/utils@^1.4.2": + version "1.4.2" + resolved "https://registry.npmjs.org/@emotion/utils/-/utils-1.4.2.tgz#6df6c45881fcb1c412d6688a311a98b7f59c1b52" + integrity sha512-3vLclRofFziIa3J2wDh9jjbkUz9qk5Vi3IZ/FSTKViB0k+ef0fPV7dYrUIugbgupYDx7v9ud/SjrtEP8Y4xLoA== "@emotion/weak-memoize@^0.4.0": version "0.4.0" @@ -1300,30 +1242,37 @@ integrity sha512-snKqtPW01tN0ui7yu9rGv69aJXr/a/Ywvl11sUjNtEcRc+ng/mQriFL0wLXMef74iHa/EkftbDzU9F8iFbH+zg== "@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0": - version "4.4.0" - resolved "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59" - integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA== + version "4.4.1" + resolved "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz#d1145bf2c20132d6400495d6df4bf59362fd9d56" + integrity sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA== dependencies: - eslint-visitor-keys "^3.3.0" + eslint-visitor-keys "^3.4.3" -"@eslint-community/regexpp@^4.10.0", "@eslint-community/regexpp@^4.11.0": - version "4.11.0" - resolved "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz#b0ffd0312b4a3fd2d6f77237e7248a5ad3a680ae" - integrity sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A== +"@eslint-community/regexpp@^4.10.0", "@eslint-community/regexpp@^4.12.1": + version "4.12.1" + resolved "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz#cfc6cffe39df390a3841cde2abccf92eaa7ae0e0" + integrity sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ== -"@eslint/config-array@^0.18.0": - version "0.18.0" - resolved "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.18.0.tgz#37d8fe656e0d5e3dbaea7758ea56540867fd074d" - integrity sha512-fTxvnS1sRMu3+JjXwJG0j/i4RT9u4qJ+lqS/yCGap4lH4zZGzQ7tu+xZqQmcMZq5OBZDL4QRxQzRjkWcGt8IVw== +"@eslint/config-array@^0.19.0": + version "0.19.1" + resolved "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.1.tgz#734aaea2c40be22bbb1f2a9dac687c57a6a4c984" + integrity sha512-fo6Mtm5mWyKjA/Chy1BYTdn5mGJoDNjC7C64ug20ADsRDGrA85bN3uK3MaKbeRkRuuIEAR5N33Jr1pbm411/PA== dependencies: - "@eslint/object-schema" "^2.1.4" + "@eslint/object-schema" "^2.1.5" debug "^4.3.1" minimatch "^3.1.2" -"@eslint/eslintrc@^3.1.0": - version "3.1.0" - resolved "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.1.0.tgz#dbd3482bfd91efa663cbe7aa1f506839868207b6" - integrity sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ== +"@eslint/core@^0.10.0": + version "0.10.0" + resolved "https://registry.npmjs.org/@eslint/core/-/core-0.10.0.tgz#23727063c21b335f752dbb3a16450f6f9cbc9091" + integrity sha512-gFHJ+xBOo4G3WRlR1e/3G8A6/KZAH6zcE/hkLRCZTi/B9avAG365QhFA8uOGzTMqgTghpn7/fSnscW++dpMSAw== + dependencies: + "@types/json-schema" "^7.0.15" + +"@eslint/eslintrc@^3.2.0": + version "3.2.0" + resolved "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.2.0.tgz#57470ac4e2e283a6bf76044d63281196e370542c" + integrity sha512-grOjVNN8P3hjJn/eIETF1wwd12DdnwFDoyceUJLYYdkpbwq3nLi+4fqrTAONx7XDALqlL220wC/RHSC/QTI/0w== dependencies: ajv "^6.12.4" debug "^4.3.2" @@ -1335,62 +1284,88 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@eslint/js@9.9.1": - version "9.9.1" - resolved "https://registry.npmjs.org/@eslint/js/-/js-9.9.1.tgz#4a97e85e982099d6c7ee8410aacb55adaa576f06" - integrity sha512-xIDQRsfg5hNBqHz04H1R3scSVwmI+KUbqjsQKHKQ1DAUSaUjYPReZZmS/5PNiKu1fUvzDd6H7DEDKACSEhu+TQ== +"@eslint/js@9.19.0": + version "9.19.0" + resolved "https://registry.npmjs.org/@eslint/js/-/js-9.19.0.tgz#51dbb140ed6b49d05adc0b171c41e1a8713b7789" + integrity sha512-rbq9/g38qjfqFLOVPvwjIvFFdNziEC5S65jmjPw5r6A//QH+W91akh9irMwjDN8zKUTak6W9EsAv4m/7Wnw0UQ== -"@eslint/object-schema@^2.1.4": - version "2.1.4" - resolved "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.4.tgz#9e69f8bb4031e11df79e03db09f9dbbae1740843" - integrity sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ== +"@eslint/object-schema@^2.1.5": + version "2.1.5" + resolved "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.5.tgz#8670a8f6258a2be5b2c620ff314a1d984c23eb2e" + integrity sha512-o0bhxnL89h5Bae5T318nFoFzGy+YE5i/gGkoPAgkmTVdRKTiv3p8JHevPiPaMwoloKfEiiaHlawCqaZMqRm+XQ== + +"@eslint/plugin-kit@^0.2.5": + version "0.2.5" + resolved "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.5.tgz#ee07372035539e7847ef834e3f5e7b79f09e3a81" + integrity sha512-lB05FkqEdUg2AA0xEbUz0SnkXT1LcCTa438W4IWTUh4hdOnVbQyOJ81OrDXsJk/LSiJHubgGEFoR5EHq1NsH1A== + dependencies: + "@eslint/core" "^0.10.0" + levn "^0.4.1" "@floating-ui/core@^1.6.0": - version "1.6.7" - resolved "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.7.tgz#7602367795a390ff0662efd1c7ae8ca74e75fb12" - integrity sha512-yDzVT/Lm101nQ5TCVeK65LtdN7Tj4Qpr9RTXJ2vPFLqtLxwOrpoxAHAJI8J3yYWUc40J0BDBheaitK5SJmno2g== + version "1.6.9" + resolved "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.9.tgz#64d1da251433019dafa091de9b2886ff35ec14e6" + integrity sha512-uMXCuQ3BItDUbAMhIXw7UPXRfAlOAvZzdK9BWpE60MCn+Svt3aLn9jsPTi/WNGlRUu2uI0v5S7JiIUsbsvh3fw== dependencies: - "@floating-ui/utils" "^0.2.7" + "@floating-ui/utils" "^0.2.9" "@floating-ui/dom@^1.0.0", "@floating-ui/dom@^1.0.1": - version "1.6.10" - resolved "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.10.tgz#b74c32f34a50336c86dcf1f1c845cf3a39e26d6f" - integrity sha512-fskgCFv8J8OamCmyun8MfjB1Olfn+uZKjOKZ0vhYF3gRmEUXcGOjxWL8bBr7i4kIuPZ2KD2S3EUIOxnjC8kl2A== + version "1.6.13" + resolved "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.13.tgz#a8a938532aea27a95121ec16e667a7cbe8c59e34" + integrity sha512-umqzocjDgNRGTuO7Q8CU32dkHkECqI8ZdMZ5Swb6QAM0t5rnlrN3lGo1hdpscRd3WS8T6DKYK4ephgIH9iRh3w== dependencies: "@floating-ui/core" "^1.6.0" - "@floating-ui/utils" "^0.2.7" + "@floating-ui/utils" "^0.2.9" "@floating-ui/react-dom@^2.0.8": - version "2.1.1" - resolved "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.1.tgz#cca58b6b04fc92b4c39288252e285e0422291fb0" - integrity sha512-4h84MJt3CHrtG18mGsXuLCHMrug49d7DFkU0RMIyshRveBeyV2hmV/pDaF2Uxtu8kgq5r46llp5E5FQiR0K2Yg== + version "2.1.2" + resolved "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.2.tgz#a1349bbf6a0e5cb5ded55d023766f20a4d439a31" + integrity sha512-06okr5cgPzMNBy+Ycse2A6udMi4bqwW/zgBF/rwjcNqWkyr82Mcg8b0vjX8OJpZFy/FKjJmw6wV7t44kK6kW7A== dependencies: "@floating-ui/dom" "^1.0.0" -"@floating-ui/utils@^0.2.7": - version "0.2.7" - resolved "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.7.tgz#d0ece53ce99ab5a8e37ebdfe5e32452a2bfc073e" - integrity sha512-X8R8Oj771YRl/w+c1HqAC1szL8zWQRwFvgDwT129k9ACdBoud/+/rX9V0qiMl6LWUdP9voC2nDVZYPMQQsb6eA== +"@floating-ui/utils@^0.2.9": + version "0.2.9" + resolved "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.9.tgz#50dea3616bc8191fb8e112283b49eaff03e78429" + integrity sha512-MDWhGtE+eHw5JW7lq4qhc5yRLS11ERl1c7Z6Xd0a58DozHES6EnNNwUWbMiG4J9Cgj053Bhk8zvlhFYKVhULwg== "@fortawesome/fontawesome-free@latest": - version "6.6.0" - resolved "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.6.0.tgz#0e984f0f2344ee513c185d87d77defac4c0c8224" - integrity sha512-60G28ke/sXdtS9KZCpZSHHkCbdsOGEhIUGlwq6yhY74UpTiToIh8np7A8yphhM4BWsvNFtIvLpi4co+h9Mr9Ow== + version "6.7.2" + resolved "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.7.2.tgz#8249de9b7e22fcb3ceb5e66090c30a1d5492b81a" + integrity sha512-JUOtgFW6k9u4Y+xeIaEiLr3+cjoUPiAuLXoyKOJSia6Duzb7pq+A76P9ZdPDoAoxHdHzq6gE9/jKBGXlZT8FbA== "@gar/promisify@^1.1.3": version "1.1.3" resolved "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6" integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw== +"@humanfs/core@^0.19.1": + version "0.19.1" + resolved "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz#17c55ca7d426733fe3c561906b8173c336b40a77" + integrity sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA== + +"@humanfs/node@^0.16.6": + version "0.16.6" + resolved "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz#ee2a10eaabd1131987bf0488fd9b820174cd765e" + integrity sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw== + dependencies: + "@humanfs/core" "^0.19.1" + "@humanwhocodes/retry" "^0.3.0" + "@humanwhocodes/module-importer@^1.0.1": version "1.0.1" resolved "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c" integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA== "@humanwhocodes/retry@^0.3.0": - version "0.3.0" - resolved "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.0.tgz#6d86b8cb322660f03d3f0aa94b99bdd8e172d570" - integrity sha512-d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew== + version "0.3.1" + resolved "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz#c72a5c76a9fbaf3488e231b13dc52c0da7bab42a" + integrity sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA== + +"@humanwhocodes/retry@^0.4.1": + version "0.4.1" + resolved "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.1.tgz#9a96ce501bc62df46c4031fbd970e3cc6b10f07b" + integrity sha512-c7hNEllBlenFTHBky65mhq8WD2kbN9Q6gk0bTk8lSBvc554jpXSkST1iePudpt7+A/AQvuHs9EMqjHDXMY1lrA== "@isaacs/cliui@^8.0.2": version "8.0.2" @@ -1404,6 +1379,13 @@ wrap-ansi "^8.1.0" wrap-ansi-cjs "wrap-ansi@^7.0.0" +"@isaacs/fs-minipass@^4.0.0": + version "4.0.1" + resolved "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz#2d59ae3ab4b38fb4270bfa23d30f8e2e86c7fe32" + integrity sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w== + dependencies: + minipass "^7.0.4" + "@istanbuljs/load-nyc-config@^1.0.0": version "1.1.0" resolved "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced" @@ -1613,9 +1595,9 @@ chalk "^4.0.0" "@jridgewell/gen-mapping@^0.3.5": - version "0.3.5" - resolved "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz#dcce6aff74bdf6dad1a95802b69b04a2fcb1fb36" - integrity sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg== + version "0.3.8" + resolved "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz#4f0e06362e01362f823d348f1872b08f666d8142" + integrity sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA== dependencies: "@jridgewell/set-array" "^1.2.1" "@jridgewell/sourcemap-codec" "^1.4.10" @@ -1644,7 +1626,7 @@ resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz#3188bcb273a414b0d215fd22a58540b989b9409a" integrity sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ== -"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.18", "@jridgewell/trace-mapping@^0.3.20", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25": +"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.18", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25": version "0.3.25" resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0" integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ== @@ -1653,9 +1635,9 @@ "@jridgewell/sourcemap-codec" "^1.4.14" "@lezer/common@^1.0.0", "@lezer/common@^1.1.0", "@lezer/common@^1.2.0": - version "1.2.1" - resolved "https://registry.npmjs.org/@lezer/common/-/common-1.2.1.tgz#198b278b7869668e1bebbe687586e12a42731049" - integrity sha512-yemX0ZD2xS/73llMZIK6KplkjIjf2EvAHcinDi/TfJ9hS25G0388+ClHt6/3but0oOxinTcQHJLDXh6w1crzFQ== + version "1.2.3" + resolved "https://registry.npmjs.org/@lezer/common/-/common-1.2.3.tgz#138fcddab157d83da557554851017c6c1e5667fd" + integrity sha512-w7ojc8ejBqr2REPsWxJjrMFsA/ysDCFICn8zEOR9mrqzOu2amhITYuLD8ag6XZf0CFXDrhKqw7+tW8cX66NaDA== "@lezer/highlight@^1.0.0": version "1.2.1" @@ -1665,9 +1647,9 @@ "@lezer/common" "^1.0.0" "@lezer/json@^1.0.0": - version "1.0.2" - resolved "https://registry.npmjs.org/@lezer/json/-/json-1.0.2.tgz#bdc849e174113e2d9a569a5e6fb1a27e2f703eaf" - integrity sha512-xHT2P4S5eeCYECyKNPhr4cbEL9tc8w83SPwRC373o9uEdrvGKTZoJVAGxpOsZckMlEh9W23Pc72ew918RWQOBQ== + version "1.0.3" + resolved "https://registry.npmjs.org/@lezer/json/-/json-1.0.3.tgz#e773a012ad0088fbf07ce49cfba875cc9e5bc05f" + integrity sha512-BP9KzdF9Y35PDpv04r0VeSTKDeox5vVr3efE7eBbx3r4s3oNLfunchejZhjArmeieBH+nVOpgIiBJpEAv8ilqQ== dependencies: "@lezer/common" "^1.2.0" "@lezer/highlight" "^1.0.0" @@ -1680,124 +1662,140 @@ dependencies: "@lezer/common" "^1.0.0" -"@mui/base@5.0.0-beta.40": - version "5.0.0-beta.40" - resolved "https://registry.npmjs.org/@mui/base/-/base-5.0.0-beta.40.tgz#1f8a782f1fbf3f84a961e954c8176b187de3dae2" - integrity sha512-I/lGHztkCzvwlXpjD2+SNmvNQvB4227xBXhISPjEaJUXGImOQ9f3D2Yj/T3KasSI/h0MLWy74X0J6clhPmsRbQ== +"@marijn/find-cluster-break@^1.0.0": + version "1.0.2" + resolved "https://registry.npmjs.org/@marijn/find-cluster-break/-/find-cluster-break-1.0.2.tgz#775374306116d51c0c500b8c4face0f9a04752d8" + integrity sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g== + +"@mui/base@5.0.0-beta.42": + version "5.0.0-beta.42" + resolved "https://registry.npmjs.org/@mui/base/-/base-5.0.0-beta.42.tgz#d70fb479c57a60ce080d0700fe137db8686abe3e" + integrity sha512-fWRiUJVCHCPF+mxd5drn08bY2qRw3jj5f1SSQdUXmaJ/yKpk23ys8MgLO2KGVTRtbks/+ctRfgffGPbXifj0Ug== dependencies: - "@babel/runtime" "^7.23.9" + "@babel/runtime" "^7.24.4" "@floating-ui/react-dom" "^2.0.8" "@mui/types" "^7.2.14" - "@mui/utils" "^5.15.14" + "@mui/utils" "^6.0.0-alpha.1" "@popperjs/core" "^2.11.8" clsx "^2.1.0" prop-types "^15.8.1" -"@mui/core-downloads-tracker@^5.16.7": - version "5.16.7" - resolved "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.16.7.tgz#182a325a520f7ebd75de051fceabfc0314cfd004" - integrity sha512-RtsCt4Geed2/v74sbihWzzRs+HsIQCfclHeORh5Ynu2fS4icIKozcSubwuG7vtzq2uW3fOR1zITSP84TNt2GoQ== +"@mui/core-downloads-tracker@^6.4.1": + version "6.4.1" + resolved "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-6.4.1.tgz#5f9b31768c5be562522c5e5816f3c4f8bada1202" + integrity sha512-SfDLWMV5b5oXgDf3NTa2hCTPC1d2defhDH2WgFKmAiejC4mSfXYbyi+AFCLzpizauXhgBm8OaZy9BHKnrSpahQ== -"@mui/icons-material@^5.16.6": - version "5.16.7" - resolved "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.16.7.tgz#e27f901af792065efc9f3d75d74a66af7529a10a" - integrity sha512-UrGwDJCXEszbDI7yV047BYU5A28eGJ79keTCP4cc74WyncuVrnurlmIRxaHL8YK+LI1Kzq+/JM52IAkNnv4u+Q== +"@mui/icons-material@^6.4.0": + version "6.4.1" + resolved "https://registry.npmjs.org/@mui/icons-material/-/icons-material-6.4.1.tgz#e12f2a93bd5226aa65258533b7161f156b515b8d" + integrity sha512-wsxFcUTQxt4s+7Bg4GgobqRjyaHLmZGNOs+HJpbwrwmLbT6mhIJxhpqsKzzWq9aDY8xIe7HCjhpH7XI5UD6teA== dependencies: - "@babel/runtime" "^7.23.9" + "@babel/runtime" "^7.26.0" -"@mui/lab@^5.0.0-alpha.165": - version "5.0.0-alpha.173" - resolved "https://registry.npmjs.org/@mui/lab/-/lab-5.0.0-alpha.173.tgz#a0f9696d93a765b48d69a7da5aaca0affa510ae8" - integrity sha512-Gt5zopIWwxDgGy/MXcp6GueD84xFFugFai4hYiXY0zowJpTVnIrTQCQXV004Q7rejJ7aaCntX9hpPJqCrioshA== +"@mui/lab@^6.0.0-beta.16": + version "6.0.0-dev.240424162023-9968b4889d" + resolved "https://registry.npmjs.org/@mui/lab/-/lab-6.0.0-dev.240424162023-9968b4889d.tgz#83e383bf21d9c6b7f09a482ed099d0d94f9d5b84" + integrity sha512-iKFAz7/EeWI4PaFsP4jK2FcYJmUYDBkn3XZwpQSAl5806yYq5J2U2mPQLuZBdhrH50gT2O98p95i3vwL4YBwAg== dependencies: - "@babel/runtime" "^7.23.9" - "@mui/base" "5.0.0-beta.40" - "@mui/system" "^5.16.5" - "@mui/types" "^7.2.15" - "@mui/utils" "^5.16.5" + "@babel/runtime" "^7.24.4" + "@mui/base" "5.0.0-beta.42" + "@mui/system" "^6.0.0-dev.240424162023-9968b4889d" + "@mui/types" "^7.2.14" + "@mui/utils" "^6.0.0-alpha.3" clsx "^2.1.0" prop-types "^15.8.1" -"@mui/material@^5.15.10": - version "5.16.7" - resolved "https://registry.npmjs.org/@mui/material/-/material-5.16.7.tgz#6e814e2eefdaf065a769cecf549c3569e107a50b" - integrity sha512-cwwVQxBhK60OIOqZOVLFt55t01zmarKJiJUWbk0+8s/Ix5IaUzAShqlJchxsIQ4mSrWqgcKCCXKtIlG5H+/Jmg== +"@mui/material@^6.1.10": + version "6.4.1" + resolved "https://registry.npmjs.org/@mui/material/-/material-6.4.1.tgz#8f5d027b99928a632654f4161292a6f62ae69257" + integrity sha512-MFBfia6UiKxyoLeGkAh8M15bkeDmfnsUTMRJd/vTQue6YQ8AQ6lw9HqDthyYghzDEWIvZO/lQQzLrZE8XwNJLA== dependencies: - "@babel/runtime" "^7.23.9" - "@mui/core-downloads-tracker" "^5.16.7" - "@mui/system" "^5.16.7" - "@mui/types" "^7.2.15" - "@mui/utils" "^5.16.6" + "@babel/runtime" "^7.26.0" + "@mui/core-downloads-tracker" "^6.4.1" + "@mui/system" "^6.4.1" + "@mui/types" "^7.2.21" + "@mui/utils" "^6.4.1" "@popperjs/core" "^2.11.8" - "@types/react-transition-group" "^4.4.10" - clsx "^2.1.0" + "@types/react-transition-group" "^4.4.12" + clsx "^2.1.1" csstype "^3.1.3" prop-types "^15.8.1" - react-is "^18.3.1" + react-is "^19.0.0" react-transition-group "^4.4.5" -"@mui/private-theming@^5.16.6": - version "5.16.6" - resolved "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.16.6.tgz#547671e7ae3f86b68d1289a0b90af04dfcc1c8c9" - integrity sha512-rAk+Rh8Clg7Cd7shZhyt2HGTTE5wYKNSJ5sspf28Fqm/PZ69Er9o6KX25g03/FG2dfpg5GCwZh/xOojiTfm3hw== +"@mui/private-theming@^6.4.1": + version "6.4.1" + resolved "https://registry.npmjs.org/@mui/private-theming/-/private-theming-6.4.1.tgz#b4085e456edabc5b3fe2d1f777397a907404ad48" + integrity sha512-DcT7mwK89owwgcEuiE7w458te4CIjHbYWW6Kn6PiR6eLtxBsoBYphA968uqsQAOBQDpbYxvkuFLwhgk4bxoN/Q== dependencies: - "@babel/runtime" "^7.23.9" - "@mui/utils" "^5.16.6" + "@babel/runtime" "^7.26.0" + "@mui/utils" "^6.4.1" prop-types "^15.8.1" -"@mui/styled-engine@^5.16.6": - version "5.16.6" - resolved "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.16.6.tgz#60110c106dd482dfdb7e2aa94fd6490a0a3f8852" - integrity sha512-zaThmS67ZmtHSWToTiHslbI8jwrmITcN93LQaR2lKArbvS7Z3iLkwRoiikNWutx9MBs8Q6okKvbZq1RQYB3v7g== +"@mui/styled-engine@^6.4.0": + version "6.4.0" + resolved "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-6.4.0.tgz#1f01a5218964f0e3bd8eb13170e12b5f55c4f159" + integrity sha512-ek/ZrDujrger12P6o4luQIfRd2IziH7jQod2WMbLqGE03Iy0zUwYmckRTVhRQTLPNccpD8KXGcALJF+uaUQlbg== dependencies: - "@babel/runtime" "^7.23.9" - "@emotion/cache" "^11.11.0" + "@babel/runtime" "^7.26.0" + "@emotion/cache" "^11.13.5" + "@emotion/serialize" "^1.3.3" + "@emotion/sheet" "^1.4.0" csstype "^3.1.3" prop-types "^15.8.1" -"@mui/system@^5.16.5", "@mui/system@^5.16.7": - version "5.16.7" - resolved "https://registry.npmjs.org/@mui/system/-/system-5.16.7.tgz#4583ca5bf3b38942e02c15a1e622ba869ac51393" - integrity sha512-Jncvs/r/d/itkxh7O7opOunTqbbSSzMTHzZkNLM+FjAOg+cYAZHrPDlYe1ZGKUYORwwb2XexlWnpZp0kZ4AHuA== +"@mui/system@^6.0.0-dev.240424162023-9968b4889d", "@mui/system@^6.4.1": + version "6.4.1" + resolved "https://registry.npmjs.org/@mui/system/-/system-6.4.1.tgz#6491bbeae8b10d4f1e38afbec27f586445e05b6e" + integrity sha512-rgQzgcsHCTtzF9MZ+sL0tOhf2ZBLazpjrujClcb4Siju5lTrK0xX4PsiropActzCemNfM+mOu+0jezAVnfRK8g== dependencies: - "@babel/runtime" "^7.23.9" - "@mui/private-theming" "^5.16.6" - "@mui/styled-engine" "^5.16.6" - "@mui/types" "^7.2.15" - "@mui/utils" "^5.16.6" - clsx "^2.1.0" + "@babel/runtime" "^7.26.0" + "@mui/private-theming" "^6.4.1" + "@mui/styled-engine" "^6.4.0" + "@mui/types" "^7.2.21" + "@mui/utils" "^6.4.1" + clsx "^2.1.1" csstype "^3.1.3" prop-types "^15.8.1" -"@mui/types@^7.2.14", "@mui/types@^7.2.15": - version "7.2.16" - resolved "https://registry.npmjs.org/@mui/types/-/types-7.2.16.tgz#66710c691b51cd4fca95322100cd74ec230cfe30" - integrity sha512-qI8TV3M7ShITEEc8Ih15A2vLzZGLhD+/UPNwck/hcls2gwg7dyRjNGXcQYHKLB5Q7PuTRfrTkAoPa2VV1s67Ag== +"@mui/types@^7.2.14", "@mui/types@^7.2.21": + version "7.2.21" + resolved "https://registry.npmjs.org/@mui/types/-/types-7.2.21.tgz#63f50874eda8e4a021a69aaa8ba9597369befda2" + integrity sha512-6HstngiUxNqLU+/DPqlUJDIPbzUBxIVHb1MmXP0eTWDIROiCR2viugXpEif0PPe2mLqqakPzzRClWAnK+8UJww== -"@mui/utils@^5.15.14", "@mui/utils@^5.16.5", "@mui/utils@^5.16.6": - version "5.16.6" - resolved "https://registry.npmjs.org/@mui/utils/-/utils-5.16.6.tgz#905875bbc58d3dcc24531c3314a6807aba22a711" - integrity sha512-tWiQqlhxAt3KENNiSRL+DIn9H5xNVK6Jjf70x3PnfQPz1MPBdh7yyIcAyVBT9xiw7hP3SomRhPR7hzBMBCjqEA== +"@mui/utils@^5.16.6 || ^6.0.0", "@mui/utils@^6.0.0-alpha.1", "@mui/utils@^6.0.0-alpha.3", "@mui/utils@^6.4.1": + version "6.4.1" + resolved "https://registry.npmjs.org/@mui/utils/-/utils-6.4.1.tgz#19e71af7f94a35fe6f43023a4badafc5807ab429" + integrity sha512-iQUDUeYh87SvR4lVojaRaYnQix8BbRV51MxaV6MBmqthecQoxwSbS5e2wnbDJUeFxY2ppV505CiqPLtd0OWkqw== dependencies: - "@babel/runtime" "^7.23.9" - "@mui/types" "^7.2.15" - "@types/prop-types" "^15.7.12" + "@babel/runtime" "^7.26.0" + "@mui/types" "^7.2.21" + "@types/prop-types" "^15.7.14" clsx "^2.1.1" prop-types "^15.8.1" - react-is "^18.3.1" + react-is "^19.0.0" -"@mui/x-date-pickers@^7.7.1": - version "7.15.0" - resolved "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-7.15.0.tgz#a2e0979dda5d38fd34e5be76064b8331ef228894" - integrity sha512-YQEQICNxUEFYp/I/yP58cqihA8yhXaXSNZ1/N0JANu2IlCwoJ4Jzi+S0s4RN7RghpiDyoSMFijROBC5HfpTjiw== +"@mui/x-date-pickers@^7.23.2": + version "7.24.1" + resolved "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-7.24.1.tgz#8cf54b7c167a71378c1115b01ca14a113780dfc6" + integrity sha512-ykQugMQHuQKBk3kViW/r0PpubtHQOlrd54bgbdafgTMCeM2VpXvv4zimzOu5IGnM6wEN8hupC7EXZbkrT6x46w== dependencies: - "@babel/runtime" "^7.25.4" - "@mui/utils" "^5.16.6" + "@babel/runtime" "^7.25.7" + "@mui/utils" "^5.16.6 || ^6.0.0" + "@mui/x-internals" "7.24.1" "@types/react-transition-group" "^4.4.11" clsx "^2.1.1" prop-types "^15.8.1" react-transition-group "^4.4.5" +"@mui/x-internals@7.24.1": + version "7.24.1" + resolved "https://registry.npmjs.org/@mui/x-internals/-/x-internals-7.24.1.tgz#34d63f13db0ac4c24033735a11efabe0b9f0fb73" + integrity sha512-9BvJzpLJnS9BDphvkiv6v0QOLxbnu8jhwcexFjtCQ2ZyxtVuVsWzGZ2npT9sGOil7+eaFDmWnJtea/tgrPvSwQ== + dependencies: + "@babel/runtime" "^7.25.7" + "@mui/utils" "^5.16.6 || ^6.0.0" + "@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1": version "5.1.1-v1" resolved "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz#dbf733a965ca47b1973177dc0bb6c889edcfb129" @@ -1818,7 +1816,7 @@ resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== -"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8": +"@nodelib/fs.walk@^1.2.3": version "1.2.8" resolved "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== @@ -1826,10 +1824,10 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@npmcli/agent@^2.0.0": - version "2.2.2" - resolved "https://registry.npmjs.org/@npmcli/agent/-/agent-2.2.2.tgz#967604918e62f620a648c7975461c9c9e74fc5d5" - integrity sha512-OrcNPXdpSl9UX7qPVRWbmWMCSXrcDa2M9DvrbOTj7ao1S4PlqVFYv9/yLKMkrJKZ/V5A/kDBC690or307i26Og== +"@npmcli/agent@^3.0.0": + version "3.0.0" + resolved "https://registry.npmjs.org/@npmcli/agent/-/agent-3.0.0.tgz#1685b1fbd4a1b7bb4f930cbb68ce801edfe7aa44" + integrity sha512-S79NdEgDQd/NGCay6TCoVzXSj74skRZIKJcpJjC5lOq34SZzyI6MqtiiWoiVWoVrTcGjNeC4ipbh1VIHlpfF5Q== dependencies: agent-base "^7.1.0" http-proxy-agent "^7.0.0" @@ -1845,10 +1843,10 @@ "@gar/promisify" "^1.1.3" semver "^7.3.5" -"@npmcli/fs@^3.1.0": - version "3.1.1" - resolved "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz#59cdaa5adca95d135fc00f2bb53f5771575ce726" - integrity sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg== +"@npmcli/fs@^4.0.0": + version "4.0.0" + resolved "https://registry.npmjs.org/@npmcli/fs/-/fs-4.0.0.tgz#a1eb1aeddefd2a4a347eca0fab30bc62c0e1c0f2" + integrity sha512-/xGlezI6xfGO9NwuJlnwz/K14qD1kCSAGtacBHnGzeAIuJGazcp45KP5NuyARXoKb7cwulAGWVsbeSxdG/cb0Q== dependencies: semver "^7.3.5" @@ -1866,9 +1864,9 @@ integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg== "@polka/url@^1.0.0-next.24": - version "1.0.0-next.25" - resolved "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.25.tgz#f077fdc0b5d0078d30893396ff4827a13f99e817" - integrity sha512-j7P6Rgr3mmtdkeDGTe0E/aYyWEWVtc5yFXtHCRHs28/jptDEWfaVOc5T7cblqy1XKPPfCxJc/8DwQ5YgLOZOVQ== + version "1.0.0-next.28" + resolved "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.28.tgz#d45e01c4a56f143ee69c54dd6b12eade9e270a73" + integrity sha512-8LduaNlMZGwdZ6qWrKlfa+2M4gahzFkprZiAt2TF8uS0qQgBizKXpXURqvTJ4WtmupWxaLqjRb2UCTe72mu+Aw== "@popperjs/core@^2.11.8": version "2.11.8" @@ -1978,6 +1976,11 @@ resolved "https://registry.npmjs.org/@react-leaflet/core/-/core-2.1.0.tgz#383acd31259d7c9ae8fb1b02d5e18fe613c2a13d" integrity sha512-Qk7Pfu8BSarKGqILj4x7bCSZ1pjuAPZ+qmRwH5S7mDS91VSbVVsJSrW4qA+GPrro8t69gFYVMWb1Zc4yFmPiVg== +"@sec-ant/readable-stream@^0.4.1": + version "0.4.1" + resolved "https://registry.npmjs.org/@sec-ant/readable-stream/-/readable-stream-0.4.1.tgz#60de891bb126abfdc5410fdc6166aca065f10a0c" + integrity sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg== + "@simonwep/pickr@^1.5.1": version "1.9.1" resolved "https://registry.npmjs.org/@simonwep/pickr/-/pickr-1.9.1.tgz#10d86dab514b8888b2d6b90299a477f254067c43" @@ -1996,6 +1999,11 @@ resolved "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd" integrity sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow== +"@sindresorhus/is@^6.3.0": + version "6.3.1" + resolved "https://registry.npmjs.org/@sindresorhus/is/-/is-6.3.1.tgz#43bbe2a94de0d7a11b95b7fc8100fa0e4694bbe0" + integrity sha512-FX4MfcifwJyFOI2lPoX7PQxCqx8BG1HCho7WdiXwpEQx1Ycij0JxkfYtGK7yqNScrZGSlt6RE6sw8QYoH7eKnQ== + "@sindresorhus/merge-streams@^2.1.0": version "2.3.0" resolved "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-2.3.0.tgz#719df7fb41766bc143369eaa0dd56d8dc87c9958" @@ -2131,54 +2139,53 @@ "@svgr/plugin-jsx" "8.1.0" "@svgr/plugin-svgo" "8.1.0" -"@szhsin/react-menu@^2.2.0": - version "2.3.4" - resolved "https://registry.npmjs.org/@szhsin/react-menu/-/react-menu-2.3.4.tgz#304b9bb1692a2a487d7738b608a7cdfd82ef18ec" - integrity sha512-RYgrAxAeEjqE62G2r3LFO89uWulJcTZReo5DtUnSkBbGx1aXrl8I7v1p/YUdJSYbimEsRB0qMHiQpQGQmOwDKw== +"@szhsin/react-menu@^4.2.2": + version "4.3.0" + resolved "https://registry.npmjs.org/@szhsin/react-menu/-/react-menu-4.3.0.tgz#22a77578164816cb90a936598e635162a5cfeac8" + integrity sha512-TklTnPT6cYZcOO0GYnBQX6qVvpsdHvI0GkWsL90/fisIMlFfv+rpEPy4YNm+qNTUuCPeOkcRYVU7ooH0yUFTgQ== dependencies: - prop-types "^15.7.2" - react-transition-state "^1.1.3" + react-transition-state "^2.2.0" -"@tanstack/query-core@5.36.1": - version "5.36.1" - resolved "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.36.1.tgz#ae46f935c4752812a56c6815305061a3da82e7b8" - integrity sha512-BteWYEPUcucEu3NBcDAgKuI4U25R9aPrHSP6YSf2NvaD2pSlIQTdqOfLRsxH9WdRYg7k0Uom35Uacb6nvbIMJg== +"@tanstack/query-core@5.64.2": + version "5.64.2" + resolved "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.64.2.tgz#be06e7c7966d14ea3e7c82bea1086b463f2f6809" + integrity sha512-hdO8SZpWXoADNTWXV9We8CwTkXU88OVWRBcsiFrk7xJQnhm6WRlweDzMD+uH+GnuieTBVSML6xFa17C2cNV8+g== -"@tanstack/react-query@5.37.1": - version "5.37.1" - resolved "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.37.1.tgz#82d79cdf54923b1f0638c080e8f0439a6a8a2ddc" - integrity sha512-EhtBNA8GL3XFeSx6VYUjXQ96n44xe3JGKZCzBINrCYlxbZP6UwBafv7ti4eSRWc2Fy+fybQre0w17gR6lMzULA== +"@tanstack/react-query@5.64.2": + version "5.64.2" + resolved "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.64.2.tgz#199c8a5a8ff92a8565f8cdd378747398347512a2" + integrity sha512-3pakNscZNm8KJkxmovvtZ4RaXLyiYYobwleTMvpIGUoKRa8j8VlrQKNl5W8VUEfVfZKkikvXVddLuWMbcSCA1Q== dependencies: - "@tanstack/query-core" "5.36.1" + "@tanstack/query-core" "5.64.2" "@tanstack/react-table@^8.16.0": - version "8.20.5" - resolved "https://registry.npmjs.org/@tanstack/react-table/-/react-table-8.20.5.tgz#19987d101e1ea25ef5406dce4352cab3932449d8" - integrity sha512-WEHopKw3znbUZ61s9i0+i9g8drmDo6asTWbrQh8Us63DAk/M0FkmIqERew6P71HI75ksZ2Pxyuf4vvKh9rAkiA== + version "8.20.6" + resolved "https://registry.npmjs.org/@tanstack/react-table/-/react-table-8.20.6.tgz#a1f3103327aa59aa621931f4087a7604a21054d0" + integrity sha512-w0jluT718MrOKthRcr2xsjqzx+oEM7B7s/XXyfs19ll++hlId3fjTm+B2zrR3ijpANpkzBAr15j1XGVOMxpggQ== dependencies: "@tanstack/table-core" "8.20.5" "@tanstack/react-virtual@^3.8.4": - version "3.10.6" - resolved "https://registry.npmjs.org/@tanstack/react-virtual/-/react-virtual-3.10.6.tgz#f90f97d50a8d83dcd3c3a2d425aadbb55d4837db" - integrity sha512-xaSy6uUxB92O8mngHZ6CvbhGuqxQ5lIZWCBy+FjhrbHmOwc6BnOnKkYm2FsB1/BpKw/+FVctlMbEtI+F6I1aJg== + version "3.11.3" + resolved "https://registry.npmjs.org/@tanstack/react-virtual/-/react-virtual-3.11.3.tgz#cd62ecc431043c4a9ca24ea8dfcc2a70f4805380" + integrity sha512-vCU+OTylXN3hdC8RKg68tPlBPjjxtzon7Ys46MgrSLE+JhSjSTPvoQifV6DQJeJmA8Q3KT6CphJbejupx85vFw== dependencies: - "@tanstack/virtual-core" "3.10.6" + "@tanstack/virtual-core" "3.11.3" "@tanstack/table-core@8.20.5": version "8.20.5" resolved "https://registry.npmjs.org/@tanstack/table-core/-/table-core-8.20.5.tgz#3974f0b090bed11243d4107283824167a395cf1d" integrity sha512-P9dF7XbibHph2PFRz8gfBKEXEY/HJPOhym8CHmjF8y3q5mWpKx9xtZapXQUWCgkqvsK0R46Azuz+VaxD4Xl+Tg== -"@tanstack/virtual-core@3.10.6": - version "3.10.6" - resolved "https://registry.npmjs.org/@tanstack/virtual-core/-/virtual-core-3.10.6.tgz#babe3989b2344a5f12fc64129f9bbed5d3402999" - integrity sha512-1giLc4dzgEKLMx5pgKjL6HlG5fjZMgCjzlKAlpr7yoUtetVPELgER1NtephAI910nMwfPTHNyWKSFmJdHkz2Cw== +"@tanstack/virtual-core@3.11.3": + version "3.11.3" + resolved "https://registry.npmjs.org/@tanstack/virtual-core/-/virtual-core-3.11.3.tgz#ab92ff899825e2d71fc9914dda2847a099d43862" + integrity sha512-v2mrNSnMwnPJtcVqNvV0c5roGCBqeogN8jDtgtuHCphdwBasOZ17x8UV8qpHUh+u0MLfX43c0uUHKje0s+Zb0w== -"@testing-library/dom@10.2.0": - version "10.2.0" - resolved "https://registry.npmjs.org/@testing-library/dom/-/dom-10.2.0.tgz#d3b22515bc0603a06f119c6ae6670669c3f2085f" - integrity sha512-CytIvb6tVOADRngTHGWNxH8LPgO/3hi/BdCEHOf7Qd2GvZVClhVP0Wo/QHzWhpki49Bk0b4VT6xpt3fx8HTSIw== +"@testing-library/dom@10.4.0": + version "10.4.0" + resolved "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.0.tgz#82a9d9462f11d240ecadbf406607c6ceeeff43a8" + integrity sha512-pemlzrSESWbdAloYml3bAJMEfNh1Z7EduzqPKprCH5S341frlpYnUEW0H72dLxa6IsYr+mPno20GiSm+h9dEdQ== dependencies: "@babel/code-frame" "^7.10.4" "@babel/runtime" "^7.12.5" @@ -2189,10 +2196,10 @@ lz-string "^1.5.0" pretty-format "^27.0.2" -"@testing-library/jest-dom@^6.4.6": - version "6.5.0" - resolved "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-6.5.0.tgz#50484da3f80fb222a853479f618a9ce5c47bfe54" - integrity sha512-xGGHpBXYSHUUr6XsKBfs85TWlYKpTc37cSBBVrXcib2MkHLboWlkClhWF37JKlDb9KEq3dHs+f2xR7XJEWGBxA== +"@testing-library/jest-dom@^6.6.3": + version "6.6.3" + resolved "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-6.6.3.tgz#26ba906cf928c0f8172e182c6fe214eb4f9f2bd2" + integrity sha512-IteBhl4XqYNkM54f4ejhLRJiZNqcSCoXUOG2CPK7qbD322KjQozM4kHQOfkG2oln9b9HTYqs+Sae8vBATubxxA== dependencies: "@adobe/css-tools" "^4.4.0" aria-query "^5.0.0" @@ -2202,17 +2209,17 @@ lodash "^4.17.21" redent "^3.0.0" -"@testing-library/react@16.0.0": - version "16.0.0" - resolved "https://registry.npmjs.org/@testing-library/react/-/react-16.0.0.tgz#0a1e0c7a3de25841c3591b8cb7fb0cf0c0a27321" - integrity sha512-guuxUKRWQ+FgNX0h0NS0FIq3Q3uLtWVpBzcLOggmfMoUpgBnzBzvLLd4fbm6yS8ydJd94cIfY4yP9qUQjM2KwQ== +"@testing-library/react@16.2.0": + version "16.2.0" + resolved "https://registry.npmjs.org/@testing-library/react/-/react-16.2.0.tgz#c96126ee01a49cdb47175721911b4a9432afc601" + integrity sha512-2cSskAvA1QNtKc8Y9VJQRv0tm3hLVgxRGDB+KYhIaPQJ1I+RHbhIXcM+zClKXzMes/wshsMVzf4B9vS4IZpqDQ== dependencies: "@babel/runtime" "^7.12.5" "@testing-library/user-event@^14.5.2": - version "14.5.2" - resolved "https://registry.npmjs.org/@testing-library/user-event/-/user-event-14.5.2.tgz#db7257d727c891905947bd1c1a99da20e03c2ebd" - integrity sha512-YAh82Wh4TIrxYLmfGcixwD18oIjyC1pFQC2Y01F2lzV2HTMiYrI0nze0FD0ocB//CKS/7jIUgae+adPqxK5yCQ== + version "14.6.1" + resolved "https://registry.npmjs.org/@testing-library/user-event/-/user-event-14.6.1.tgz#13e09a32d7a8b7060fe38304788ebf4197cd2149" + integrity sha512-vq7fv0rnt+QTXgPxr5Hjc210p6YKq2kmdziLgnsZGgLJ9e6VAShx1pACLuRjd/AS/sr7phAR58OIIpf0LlmQNw== "@tokenizer/token@^0.3.0": version "0.3.0" @@ -2267,17 +2274,38 @@ dependencies: "@babel/types" "^7.20.7" -"@types/classnames@^2.2.6": - version "2.3.0" - resolved "https://registry.npmjs.org/@types/classnames/-/classnames-2.3.0.tgz#681b6bacf918e00c1836ad286a872e0a90aada87" - integrity sha512-3GsbOoDYteFShlrBTKzI2Eii4vPg/jAf7LXRIn0WQePKlmhpkV0KoTMuawA7gZJkrbPrZGwv9IEAfIWaOaQK8w== +"@types/classnames@^2.3.4": + version "2.3.4" + resolved "https://registry.npmjs.org/@types/classnames/-/classnames-2.3.4.tgz#1a1fdf5023ef216219f13e702543f9ce9b394560" + integrity sha512-dwmfrMMQb9ujX1uYGvB5ERDlOzBNywnZAZBtOe107/hORWP05ESgU4QyaanZMWYYfd2BzrG78y13/Bju8IQcMQ== dependencies: classnames "*" -"@types/estree@^1.0.5": - version "1.0.5" - resolved "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4" - integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw== +"@types/ejs@^3.1.2": + version "3.1.5" + resolved "https://registry.npmjs.org/@types/ejs/-/ejs-3.1.5.tgz#49d738257cc73bafe45c13cb8ff240683b4d5117" + integrity sha512-nv+GSx77ZtXiJzwKdsASqi+YQ5Z7vwHsTP0JY2SiQgjGckkBRKZnk8nIM+7oUZ1VCtuTz0+By4qVR7fqzp/Dfg== + +"@types/eslint-scope@^3.7.7": + version "3.7.7" + resolved "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz#3108bd5f18b0cdb277c867b3dd449c9ed7079ac5" + integrity sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg== + dependencies: + "@types/eslint" "*" + "@types/estree" "*" + +"@types/eslint@*": + version "9.6.1" + resolved "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz#d5795ad732ce81715f27f75da913004a56751584" + integrity sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag== + dependencies: + "@types/estree" "*" + "@types/json-schema" "*" + +"@types/estree@*", "@types/estree@^1.0.6": + version "1.0.6" + resolved "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz#628effeeae2064a1b4e79f78e81d87b7e5fc7b50" + integrity sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw== "@types/graceful-fs@^4.1.3": version "4.1.9" @@ -2286,6 +2314,11 @@ dependencies: "@types/node" "*" +"@types/hammerjs@^2.0.45": + version "2.0.46" + resolved "https://registry.npmjs.org/@types/hammerjs/-/hammerjs-2.0.46.tgz#381daaca1360ff8a7c8dff63f32e69745b9fb1e1" + integrity sha512-ynRvcq6wvqexJ9brDMS4BnBLzmr0e14d6ZJTEShTBWKymQiHwlAyGu0ZPEFI2Fh1U53F7tN9ufClWM5KvqkKOw== + "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1": version "2.0.6" resolved "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz#7739c232a1fee9b4d3ce8985f314c0c6d33549d7" @@ -2306,9 +2339,9 @@ "@types/istanbul-lib-report" "*" "@types/jest@^29.5.4": - version "29.5.12" - resolved "https://registry.npmjs.org/@types/jest/-/jest-29.5.12.tgz#7f7dc6eb4cf246d2474ed78744b05d06ce025544" - integrity sha512-eDC8bTvT/QhYdxJAulQikueigY5AsdBRH2yDKW3yveW7svY3+DzN84/2NUgkw10RTiJbWqZrTtoGVdYlvFJdLw== + version "29.5.14" + resolved "https://registry.npmjs.org/@types/jest/-/jest-29.5.14.tgz#2b910912fa1d6856cadcd0c1f95af7df1d6049e5" + integrity sha512-ZN+4sdnLUbo8EVvVc2ao0GFW6oVrQRPn4K2lglySj7APvSrgzxHiNNK99us4WDMi57xxA2yggblIAMNhXOotLQ== dependencies: expect "^29.0.0" pretty-format "^29.0.0" @@ -2322,7 +2355,7 @@ "@types/tough-cookie" "*" parse5 "^7.0.0" -"@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": +"@types/json-schema@*", "@types/json-schema@^7.0.15", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": version "7.0.15" resolved "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841" integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA== @@ -2340,11 +2373,11 @@ integrity sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag== "@types/node@*": - version "22.5.1" - resolved "https://registry.npmjs.org/@types/node/-/node-22.5.1.tgz#de01dce265f6b99ed32b295962045d10b5b99560" - integrity sha512-KkHsxej0j9IW1KKOOAA/XBA0z08UFSrRQHErzEfA3Vgq57eXIMYboIlHJuYIfd+lwCQjtKqUu3UnmKbtUc9yRw== + version "22.12.0" + resolved "https://registry.npmjs.org/@types/node/-/node-22.12.0.tgz#bf8af3b2af0837b5a62a368756ff2b705ae0048c" + integrity sha512-Fll2FZ1riMjNmlmJOdAyY5pUbkftXslB5DgEzlIuNaiWhXd00FhWxVC/r4yV/4wBb9JfImTu+jiSvXTkJ7F/gA== dependencies: - undici-types "~6.19.2" + undici-types "~6.20.0" "@types/normalize-package-data@^2.4.0": version "2.4.4" @@ -2356,29 +2389,25 @@ resolved "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.2.tgz#5950e50960793055845e956c427fc2b0d70c5239" integrity sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw== -"@types/prop-types@*", "@types/prop-types@^15.7.12": - version "15.7.12" - resolved "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.12.tgz#12bb1e2be27293c1406acb6af1c3f3a1481d98c6" - integrity sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q== +"@types/prop-types@*", "@types/prop-types@^15.7.14": + version "15.7.14" + resolved "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.14.tgz#1433419d73b2a7ebfc6918dcefd2ec0d5cd698f2" + integrity sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ== "@types/react-dom@^18.0.0": - version "18.3.0" - resolved "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.0.tgz#0cbc818755d87066ab6ca74fbedb2547d74a82b0" - integrity sha512-EhwApuTmMBmXuFOikhQLIBUn6uFg81SwLMOAUgodJF14SOBOCMdU04gDoYi0WOJJHD144TL32z4yDqCW3dnkQg== - dependencies: - "@types/react" "*" + version "18.3.5" + resolved "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.5.tgz#45f9f87398c5dcea085b715c58ddcf1faf65f716" + integrity sha512-P4t6saawp+b/dFrUr2cvkVsfvPguwsxtH6dNIYRllMsefqFzkZk5UIjzyDOv5g1dXIPdG4Sp1yCR4Z6RCUsG/Q== -"@types/react-transition-group@^4.4.0", "@types/react-transition-group@^4.4.10", "@types/react-transition-group@^4.4.11": - version "4.4.11" - resolved "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.11.tgz#d963253a611d757de01ebb241143b1017d5d63d5" - integrity sha512-RM05tAniPZ5DZPzzNFP+DmrcOdD0efDUxMy3145oljWSl3x9ZV5vhme98gTxFrj2lhXvmGNnUiuDyJgY9IKkNA== - dependencies: - "@types/react" "*" +"@types/react-transition-group@^4.4.0", "@types/react-transition-group@^4.4.11", "@types/react-transition-group@^4.4.12": + version "4.4.12" + resolved "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.12.tgz#b5d76568485b02a307238270bfe96cb51ee2a044" + integrity sha512-8TV6R3h2j7a91c+1DXdJi3Syo69zzIZbz7Lg5tORM5LEJG7X/E6a1V3drRyBRZq7/utz7A+c4OgYLiLcYGHG6w== -"@types/react@*", "@types/react@^18.0.2": - version "18.3.4" - resolved "https://registry.npmjs.org/@types/react/-/react-18.3.4.tgz#dfdd534a1d081307144c00e325c06e00312c93a3" - integrity sha512-J7W30FTdfCxDDjmfRM+/JqLHBIyl7xUIp9kwK637FGmY7+mkSFSe6L4jpZzhj5QMfLssSDP4/i75AKkrdC7/Jw== +"@types/react@^18.0.2": + version "18.3.18" + resolved "https://registry.npmjs.org/@types/react/-/react-18.3.18.tgz#9b382c4cd32e13e463f97df07c2ee3bbcd26904b" + integrity sha512-t4yC+vtgnkYjNSKlFx1jkAhH8LgTo2N/7Qvi83kdEaUtMDiwpbLAktKDaAMlRcJ5eSxZkH74eEGt1ky31d7kfQ== dependencies: "@types/prop-types" "*" csstype "^3.0.2" @@ -2412,86 +2441,86 @@ dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/eslint-plugin@8.3.0": - version "8.3.0" - resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.3.0.tgz#726627fad16d41d20539637efee8c2329fe6be32" - integrity sha512-FLAIn63G5KH+adZosDYiutqkOkYEx0nvcwNNfJAf+c7Ae/H35qWwTYvPZUKFj5AS+WfHG/WJJfWnDnyNUlp8UA== +"@typescript-eslint/eslint-plugin@8.22.0": + version "8.22.0" + resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.22.0.tgz#63a1b0d24d85a971949f8d71d693019f58d2e861" + integrity sha512-4Uta6REnz/xEJMvwf72wdUnC3rr4jAQf5jnTkeRQ9b6soxLxhDEbS/pfMPoJLDfFPNVRdryqWUIV/2GZzDJFZw== dependencies: "@eslint-community/regexpp" "^4.10.0" - "@typescript-eslint/scope-manager" "8.3.0" - "@typescript-eslint/type-utils" "8.3.0" - "@typescript-eslint/utils" "8.3.0" - "@typescript-eslint/visitor-keys" "8.3.0" + "@typescript-eslint/scope-manager" "8.22.0" + "@typescript-eslint/type-utils" "8.22.0" + "@typescript-eslint/utils" "8.22.0" + "@typescript-eslint/visitor-keys" "8.22.0" graphemer "^1.4.0" ignore "^5.3.1" natural-compare "^1.4.0" - ts-api-utils "^1.3.0" + ts-api-utils "^2.0.0" -"@typescript-eslint/parser@8.3.0": - version "8.3.0" - resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.3.0.tgz#3c72c32bc909cb91ce3569e7d11d729ad84deafa" - integrity sha512-h53RhVyLu6AtpUzVCYLPhZGL5jzTD9fZL+SYf/+hYOx2bDkyQXztXSc4tbvKYHzfMXExMLiL9CWqJmVz6+78IQ== +"@typescript-eslint/parser@8.22.0": + version "8.22.0" + resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.22.0.tgz#f21c5db24271f182ebbb4ba8c7ad3eb76e5f5f3a" + integrity sha512-MqtmbdNEdoNxTPzpWiWnqNac54h8JDAmkWtJExBVVnSrSmi9z+sZUt0LfKqk9rjqmKOIeRhO4fHHJ1nQIjduIQ== dependencies: - "@typescript-eslint/scope-manager" "8.3.0" - "@typescript-eslint/types" "8.3.0" - "@typescript-eslint/typescript-estree" "8.3.0" - "@typescript-eslint/visitor-keys" "8.3.0" + "@typescript-eslint/scope-manager" "8.22.0" + "@typescript-eslint/types" "8.22.0" + "@typescript-eslint/typescript-estree" "8.22.0" + "@typescript-eslint/visitor-keys" "8.22.0" debug "^4.3.4" -"@typescript-eslint/scope-manager@8.3.0": - version "8.3.0" - resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.3.0.tgz#834301d2e70baf924c26818b911bdc40086f7468" - integrity sha512-mz2X8WcN2nVu5Hodku+IR8GgCOl4C0G/Z1ruaWN4dgec64kDBabuXyPAr+/RgJtumv8EEkqIzf3X2U5DUKB2eg== +"@typescript-eslint/scope-manager@8.22.0": + version "8.22.0" + resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.22.0.tgz#e85836ddeb8eae715f870628bcc32fe96aaf4d0e" + integrity sha512-/lwVV0UYgkj7wPSw0o8URy6YI64QmcOdwHuGuxWIYznO6d45ER0wXUbksr9pYdViAofpUCNJx/tAzNukgvaaiQ== dependencies: - "@typescript-eslint/types" "8.3.0" - "@typescript-eslint/visitor-keys" "8.3.0" + "@typescript-eslint/types" "8.22.0" + "@typescript-eslint/visitor-keys" "8.22.0" -"@typescript-eslint/type-utils@8.3.0": - version "8.3.0" - resolved "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.3.0.tgz#c1ae6af8c21a27254321016b052af67ddb44a9ac" - integrity sha512-wrV6qh//nLbfXZQoj32EXKmwHf4b7L+xXLrP3FZ0GOUU72gSvLjeWUl5J5Ue5IwRxIV1TfF73j/eaBapxx99Lg== +"@typescript-eslint/type-utils@8.22.0": + version "8.22.0" + resolved "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.22.0.tgz#cd9f23c23f021357ef0baa3490d4d96edcc97509" + integrity sha512-NzE3aB62fDEaGjaAYZE4LH7I1MUwHooQ98Byq0G0y3kkibPJQIXVUspzlFOmOfHhiDLwKzMlWxaNv+/qcZurJA== dependencies: - "@typescript-eslint/typescript-estree" "8.3.0" - "@typescript-eslint/utils" "8.3.0" + "@typescript-eslint/typescript-estree" "8.22.0" + "@typescript-eslint/utils" "8.22.0" debug "^4.3.4" - ts-api-utils "^1.3.0" + ts-api-utils "^2.0.0" -"@typescript-eslint/types@8.3.0": - version "8.3.0" - resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.3.0.tgz#378e62447c2d7028236e55a81d3391026600563b" - integrity sha512-y6sSEeK+facMaAyixM36dQ5NVXTnKWunfD1Ft4xraYqxP0lC0POJmIaL/mw72CUMqjY9qfyVfXafMeaUj0noWw== +"@typescript-eslint/types@8.22.0": + version "8.22.0" + resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.22.0.tgz#d9dec7116479ad03aeb6c8ac9c5223c4c79cf360" + integrity sha512-0S4M4baNzp612zwpD4YOieP3VowOARgK2EkN/GBn95hpyF8E2fbMT55sRHWBq+Huaqk3b3XK+rxxlM8sPgGM6A== -"@typescript-eslint/typescript-estree@8.3.0": - version "8.3.0" - resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.3.0.tgz#3e3d38af101ba61a8568f034733b72bfc9f176b9" - integrity sha512-Mq7FTHl0R36EmWlCJWojIC1qn/ZWo2YiWYc1XVtasJ7FIgjo0MVv9rZWXEE7IK2CGrtwe1dVOxWwqXUdNgfRCA== +"@typescript-eslint/typescript-estree@8.22.0": + version "8.22.0" + resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.22.0.tgz#c188c3e19529d5b3145577c0bd967e2683b114df" + integrity sha512-SJX99NAS2ugGOzpyhMza/tX+zDwjvwAtQFLsBo3GQxiGcvaKlqGBkmZ+Y1IdiSi9h4Q0Lr5ey+Cp9CGWNY/F/w== dependencies: - "@typescript-eslint/types" "8.3.0" - "@typescript-eslint/visitor-keys" "8.3.0" + "@typescript-eslint/types" "8.22.0" + "@typescript-eslint/visitor-keys" "8.22.0" debug "^4.3.4" fast-glob "^3.3.2" is-glob "^4.0.3" minimatch "^9.0.4" semver "^7.6.0" - ts-api-utils "^1.3.0" + ts-api-utils "^2.0.0" -"@typescript-eslint/utils@8.3.0", "@typescript-eslint/utils@^6.0.0 || ^7.0.0 || ^8.0.0": - version "8.3.0" - resolved "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.3.0.tgz#b10972319deac5959c7a7075d0cf2b5e1de7ec08" - integrity sha512-F77WwqxIi/qGkIGOGXNBLV7nykwfjLsdauRB/DOFPdv6LTF3BHHkBpq81/b5iMPSF055oO2BiivDJV4ChvNtXA== +"@typescript-eslint/utils@8.22.0", "@typescript-eslint/utils@^6.0.0 || ^7.0.0 || ^8.0.0": + version "8.22.0" + resolved "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.22.0.tgz#c8cc4e52a9c711af8a741a82dc5d7242b7a8dd44" + integrity sha512-T8oc1MbF8L+Bk2msAvCUzjxVB2Z2f+vXYfcucE2wOmYs7ZUwco5Ep0fYZw8quNwOiw9K8GYVL+Kgc2pETNTLOg== dependencies: "@eslint-community/eslint-utils" "^4.4.0" - "@typescript-eslint/scope-manager" "8.3.0" - "@typescript-eslint/types" "8.3.0" - "@typescript-eslint/typescript-estree" "8.3.0" + "@typescript-eslint/scope-manager" "8.22.0" + "@typescript-eslint/types" "8.22.0" + "@typescript-eslint/typescript-estree" "8.22.0" -"@typescript-eslint/visitor-keys@8.3.0": - version "8.3.0" - resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.3.0.tgz#320d747d107af1eef1eb43fbc4ccdbddda13068b" - integrity sha512-RmZwrTbQ9QveF15m/Cl28n0LXD6ea2CjkhH5rQ55ewz3H24w+AMCJHPVYaZ8/0HoG8Z3cLLFFycRXxeO2tz9FA== +"@typescript-eslint/visitor-keys@8.22.0": + version "8.22.0" + resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.22.0.tgz#02cc005014c372033eb9171e2275b76cba722a3f" + integrity sha512-AWpYAXnUgvLNabGTy3uBylkgZoosva/miNd1I8Bz3SjotmQPbVqhO4Cczo8AsZ44XVErEBPr/CRSgaj8sG7g0w== dependencies: - "@typescript-eslint/types" "8.3.0" - eslint-visitor-keys "^3.4.3" + "@typescript-eslint/types" "8.22.0" + eslint-visitor-keys "^4.2.0" "@vusion/webfonts-generator@^0.8.0": version "0.8.0" @@ -2509,141 +2538,141 @@ underscore "^1.9.1" url-join "^4.0.0" -"@webassemblyjs/ast@1.12.1", "@webassemblyjs/ast@^1.12.1": - version "1.12.1" - resolved "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz#bb16a0e8b1914f979f45864c23819cc3e3f0d4bb" - integrity sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg== +"@webassemblyjs/ast@1.14.1", "@webassemblyjs/ast@^1.14.1": + version "1.14.1" + resolved "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz#a9f6a07f2b03c95c8d38c4536a1fdfb521ff55b6" + integrity sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ== dependencies: - "@webassemblyjs/helper-numbers" "1.11.6" - "@webassemblyjs/helper-wasm-bytecode" "1.11.6" + "@webassemblyjs/helper-numbers" "1.13.2" + "@webassemblyjs/helper-wasm-bytecode" "1.13.2" -"@webassemblyjs/floating-point-hex-parser@1.11.6": - version "1.11.6" - resolved "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz#dacbcb95aff135c8260f77fa3b4c5fea600a6431" - integrity sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw== +"@webassemblyjs/floating-point-hex-parser@1.13.2": + version "1.13.2" + resolved "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz#fcca1eeddb1cc4e7b6eed4fc7956d6813b21b9fb" + integrity sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA== -"@webassemblyjs/helper-api-error@1.11.6": - version "1.11.6" - resolved "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz#6132f68c4acd59dcd141c44b18cbebbd9f2fa768" - integrity sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q== +"@webassemblyjs/helper-api-error@1.13.2": + version "1.13.2" + resolved "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz#e0a16152248bc38daee76dd7e21f15c5ef3ab1e7" + integrity sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ== -"@webassemblyjs/helper-buffer@1.12.1": - version "1.12.1" - resolved "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz#6df20d272ea5439bf20ab3492b7fb70e9bfcb3f6" - integrity sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw== +"@webassemblyjs/helper-buffer@1.14.1": + version "1.14.1" + resolved "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz#822a9bc603166531f7d5df84e67b5bf99b72b96b" + integrity sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA== -"@webassemblyjs/helper-numbers@1.11.6": - version "1.11.6" - resolved "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz#cbce5e7e0c1bd32cf4905ae444ef64cea919f1b5" - integrity sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g== +"@webassemblyjs/helper-numbers@1.13.2": + version "1.13.2" + resolved "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz#dbd932548e7119f4b8a7877fd5a8d20e63490b2d" + integrity sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA== dependencies: - "@webassemblyjs/floating-point-hex-parser" "1.11.6" - "@webassemblyjs/helper-api-error" "1.11.6" + "@webassemblyjs/floating-point-hex-parser" "1.13.2" + "@webassemblyjs/helper-api-error" "1.13.2" "@xtuc/long" "4.2.2" -"@webassemblyjs/helper-wasm-bytecode@1.11.6": - version "1.11.6" - resolved "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz#bb2ebdb3b83aa26d9baad4c46d4315283acd51e9" - integrity sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA== +"@webassemblyjs/helper-wasm-bytecode@1.13.2": + version "1.13.2" + resolved "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz#e556108758f448aae84c850e593ce18a0eb31e0b" + integrity sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA== -"@webassemblyjs/helper-wasm-section@1.12.1": - version "1.12.1" - resolved "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz#3da623233ae1a60409b509a52ade9bc22a37f7bf" - integrity sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g== +"@webassemblyjs/helper-wasm-section@1.14.1": + version "1.14.1" + resolved "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz#9629dda9c4430eab54b591053d6dc6f3ba050348" + integrity sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw== dependencies: - "@webassemblyjs/ast" "1.12.1" - "@webassemblyjs/helper-buffer" "1.12.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.6" - "@webassemblyjs/wasm-gen" "1.12.1" + "@webassemblyjs/ast" "1.14.1" + "@webassemblyjs/helper-buffer" "1.14.1" + "@webassemblyjs/helper-wasm-bytecode" "1.13.2" + "@webassemblyjs/wasm-gen" "1.14.1" -"@webassemblyjs/ieee754@1.11.6": - version "1.11.6" - resolved "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz#bb665c91d0b14fffceb0e38298c329af043c6e3a" - integrity sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg== +"@webassemblyjs/ieee754@1.13.2": + version "1.13.2" + resolved "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz#1c5eaace1d606ada2c7fd7045ea9356c59ee0dba" + integrity sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw== dependencies: "@xtuc/ieee754" "^1.2.0" -"@webassemblyjs/leb128@1.11.6": - version "1.11.6" - resolved "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz#70e60e5e82f9ac81118bc25381a0b283893240d7" - integrity sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ== +"@webassemblyjs/leb128@1.13.2": + version "1.13.2" + resolved "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz#57c5c3deb0105d02ce25fa3fd74f4ebc9fd0bbb0" + integrity sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw== dependencies: "@xtuc/long" "4.2.2" -"@webassemblyjs/utf8@1.11.6": - version "1.11.6" - resolved "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz#90f8bc34c561595fe156603be7253cdbcd0fab5a" - integrity sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA== +"@webassemblyjs/utf8@1.13.2": + version "1.13.2" + resolved "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz#917a20e93f71ad5602966c2d685ae0c6c21f60f1" + integrity sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ== -"@webassemblyjs/wasm-edit@^1.12.1": - version "1.12.1" - resolved "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz#9f9f3ff52a14c980939be0ef9d5df9ebc678ae3b" - integrity sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g== +"@webassemblyjs/wasm-edit@^1.14.1": + version "1.14.1" + resolved "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz#ac6689f502219b59198ddec42dcd496b1004d597" + integrity sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ== dependencies: - "@webassemblyjs/ast" "1.12.1" - "@webassemblyjs/helper-buffer" "1.12.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.6" - "@webassemblyjs/helper-wasm-section" "1.12.1" - "@webassemblyjs/wasm-gen" "1.12.1" - "@webassemblyjs/wasm-opt" "1.12.1" - "@webassemblyjs/wasm-parser" "1.12.1" - "@webassemblyjs/wast-printer" "1.12.1" + "@webassemblyjs/ast" "1.14.1" + "@webassemblyjs/helper-buffer" "1.14.1" + "@webassemblyjs/helper-wasm-bytecode" "1.13.2" + "@webassemblyjs/helper-wasm-section" "1.14.1" + "@webassemblyjs/wasm-gen" "1.14.1" + "@webassemblyjs/wasm-opt" "1.14.1" + "@webassemblyjs/wasm-parser" "1.14.1" + "@webassemblyjs/wast-printer" "1.14.1" -"@webassemblyjs/wasm-gen@1.12.1": - version "1.12.1" - resolved "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz#a6520601da1b5700448273666a71ad0a45d78547" - integrity sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w== +"@webassemblyjs/wasm-gen@1.14.1": + version "1.14.1" + resolved "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz#991e7f0c090cb0bb62bbac882076e3d219da9570" + integrity sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg== dependencies: - "@webassemblyjs/ast" "1.12.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.6" - "@webassemblyjs/ieee754" "1.11.6" - "@webassemblyjs/leb128" "1.11.6" - "@webassemblyjs/utf8" "1.11.6" + "@webassemblyjs/ast" "1.14.1" + "@webassemblyjs/helper-wasm-bytecode" "1.13.2" + "@webassemblyjs/ieee754" "1.13.2" + "@webassemblyjs/leb128" "1.13.2" + "@webassemblyjs/utf8" "1.13.2" -"@webassemblyjs/wasm-opt@1.12.1": - version "1.12.1" - resolved "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz#9e6e81475dfcfb62dab574ac2dda38226c232bc5" - integrity sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg== +"@webassemblyjs/wasm-opt@1.14.1": + version "1.14.1" + resolved "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz#e6f71ed7ccae46781c206017d3c14c50efa8106b" + integrity sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw== dependencies: - "@webassemblyjs/ast" "1.12.1" - "@webassemblyjs/helper-buffer" "1.12.1" - "@webassemblyjs/wasm-gen" "1.12.1" - "@webassemblyjs/wasm-parser" "1.12.1" + "@webassemblyjs/ast" "1.14.1" + "@webassemblyjs/helper-buffer" "1.14.1" + "@webassemblyjs/wasm-gen" "1.14.1" + "@webassemblyjs/wasm-parser" "1.14.1" -"@webassemblyjs/wasm-parser@1.12.1", "@webassemblyjs/wasm-parser@^1.12.1": - version "1.12.1" - resolved "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz#c47acb90e6f083391e3fa61d113650eea1e95937" - integrity sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ== +"@webassemblyjs/wasm-parser@1.14.1", "@webassemblyjs/wasm-parser@^1.14.1": + version "1.14.1" + resolved "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz#b3e13f1893605ca78b52c68e54cf6a865f90b9fb" + integrity sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ== dependencies: - "@webassemblyjs/ast" "1.12.1" - "@webassemblyjs/helper-api-error" "1.11.6" - "@webassemblyjs/helper-wasm-bytecode" "1.11.6" - "@webassemblyjs/ieee754" "1.11.6" - "@webassemblyjs/leb128" "1.11.6" - "@webassemblyjs/utf8" "1.11.6" + "@webassemblyjs/ast" "1.14.1" + "@webassemblyjs/helper-api-error" "1.13.2" + "@webassemblyjs/helper-wasm-bytecode" "1.13.2" + "@webassemblyjs/ieee754" "1.13.2" + "@webassemblyjs/leb128" "1.13.2" + "@webassemblyjs/utf8" "1.13.2" -"@webassemblyjs/wast-printer@1.12.1": - version "1.12.1" - resolved "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz#bcecf661d7d1abdaf989d8341a4833e33e2b31ac" - integrity sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA== +"@webassemblyjs/wast-printer@1.14.1": + version "1.14.1" + resolved "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz#3bb3e9638a8ae5fdaf9610e7a06b4d9f9aa6fe07" + integrity sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw== dependencies: - "@webassemblyjs/ast" "1.12.1" + "@webassemblyjs/ast" "1.14.1" "@xtuc/long" "4.2.2" -"@webpack-cli/configtest@^2.1.1": - version "2.1.1" - resolved "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-2.1.1.tgz#3b2f852e91dac6e3b85fb2a314fb8bef46d94646" - integrity sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw== +"@webpack-cli/configtest@^3.0.1": + version "3.0.1" + resolved "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-3.0.1.tgz#76ac285b9658fa642ce238c276264589aa2b6b57" + integrity sha512-u8d0pJ5YFgneF/GuvEiDA61Tf1VDomHHYMjv/wc9XzYj7nopltpG96nXN5dJRstxZhcNpV1g+nT6CydO7pHbjA== -"@webpack-cli/info@^2.0.2": - version "2.0.2" - resolved "https://registry.npmjs.org/@webpack-cli/info/-/info-2.0.2.tgz#cc3fbf22efeb88ff62310cf885c5b09f44ae0fdd" - integrity sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A== +"@webpack-cli/info@^3.0.1": + version "3.0.1" + resolved "https://registry.npmjs.org/@webpack-cli/info/-/info-3.0.1.tgz#3cff37fabb7d4ecaab6a8a4757d3826cf5888c63" + integrity sha512-coEmDzc2u/ffMvuW9aCjoRzNSPDl/XLuhPdlFRpT9tZHmJ/039az33CE7uH+8s0uL1j5ZNtfdv0HkfaKRBGJsQ== -"@webpack-cli/serve@^2.0.5": - version "2.0.5" - resolved "https://registry.npmjs.org/@webpack-cli/serve/-/serve-2.0.5.tgz#325db42395cd49fe6c14057f9a900e427df8810e" - integrity sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ== +"@webpack-cli/serve@^3.0.1": + version "3.0.1" + resolved "https://registry.npmjs.org/@webpack-cli/serve/-/serve-3.0.1.tgz#bd8b1f824d57e30faa19eb78e4c0951056f72f00" + integrity sha512-sbgw03xQaCLiT6gcY/6u3qBDn01CWw/nbaXl3gTdTFuJJ75Gffv3E3DBpgvY2fkkrdS1fpjaXNOmJlnbtKauKg== "@xmldom/xmldom@^0.7.2": version "0.7.13" @@ -2698,15 +2727,15 @@ abbrev@^1.0.0: resolved "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== -abbrev@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz#cf59829b8b4f03f89dda2771cb7f3653828c89bf" - integrity sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ== +abbrev@^3.0.0: + version "3.0.0" + resolved "https://registry.npmjs.org/abbrev/-/abbrev-3.0.0.tgz#c29a6337e167ac61a84b41b80461b29c5c271a27" + integrity sha512-+/kfrslGQ7TNV2ecmQwMJj/B65g5KVq1/L3SGVZ3tCYGqlzFuFCGBZJtMP99wH3NpEUyAjn0zPdPUg0D+DwrOA== -ace-builds@^1.31.1: - version "1.36.1" - resolved "https://registry.npmjs.org/ace-builds/-/ace-builds-1.36.1.tgz#f44e29293173b4e66e46a2827c75efe5fd36f734" - integrity sha512-/Rngkz+KgR7GFF16zO3itstku3wezjp4PTqrev3QvGfEix+Ilzsgp6X/VFSaprH9Cqd36rwT8c6eXwMKVgc+Kg== +ace-builds@^1.36.2: + version "1.37.5" + resolved "https://registry.npmjs.org/ace-builds/-/ace-builds-1.37.5.tgz#8cf3c3a2e869f32a193d314c8f4346e6218bfdae" + integrity sha512-VMJ4Cnhq6L9dwvOCyuyyvQuiVTSwdZC7zDKJBBBJJax0wGQ7MvzQZFoi0gMmCm2I4Zuv/ZbtwU/dlglIhCNLhw== acorn-globals@^7.0.0: version "7.0.1" @@ -2716,11 +2745,6 @@ acorn-globals@^7.0.0: acorn "^8.1.0" acorn-walk "^8.0.2" -acorn-import-attributes@^1.9.5: - version "1.9.5" - resolved "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz#7eb1557b1ba05ef18b5ed0ec67591bfab04688ef" - integrity sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ== - acorn-jsx@^5.3.2: version "5.3.2" resolved "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" @@ -2741,9 +2765,9 @@ acorn-walk@^7.0.0: integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA== "acorn-walk@^8.0.0", "acorn-walk@^8.0.2": - version "8.3.3" - resolved "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.3.tgz#9caeac29eefaa0c41e3d4c65137de4d6f34df43e" - integrity sha512-MxXdReSRhGO7VlFe1bRG/oI7/mdLV9B9JJT0N8vZOhF7gFRR5l3M8W9G8JxmKV+JC5mGqJ0QvqfSOLsCPa4nUw== + version "8.3.4" + resolved "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz#794dd169c3977edf4ba4ea47583587c5866236b7" + integrity sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g== dependencies: acorn "^8.11.0" @@ -2752,10 +2776,10 @@ acorn@^7.0.0: resolved "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -"acorn@^8.0.4", "acorn@^8.1.0", "acorn@^8.11.0", "acorn@^8.12.0", "acorn@^8.7.1", "acorn@^8.8.1", "acorn@^8.8.2": - version "8.12.1" - resolved "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz#71616bdccbe25e27a54439e0046e89ca76df2248" - integrity sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg== +"acorn@^8.0.4", "acorn@^8.1.0", "acorn@^8.11.0", "acorn@^8.14.0", "acorn@^8.8.1", "acorn@^8.8.2": + version "8.14.0" + resolved "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz#063e2c70cac5fb4f6467f0b11152e04c682795b0" + integrity sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA== "agent-base@6", "agent-base@^6.0.2": version "6.0.2" @@ -2764,17 +2788,15 @@ acorn@^7.0.0: dependencies: debug 4 -"agent-base@^7.0.2", "agent-base@^7.1.0", "agent-base@^7.1.1": - version "7.1.1" - resolved "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz#bdbded7dfb096b751a2a087eeeb9664725b2e317" - integrity sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA== - dependencies: - debug "^4.3.4" +"agent-base@^7.1.0", "agent-base@^7.1.2": + version "7.1.3" + resolved "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz#29435eb821bc4194633a5b89e5bc4703bafc25a1" + integrity sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw== agentkeepalive@^4.2.1: - version "4.5.0" - resolved "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.5.0.tgz#2673ad1389b3c418c5a20c5d7364f93ca04be923" - integrity sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew== + version "4.6.0" + resolved "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.6.0.tgz#35f73e94b3f40bf65f105219c623ad19c136ea6a" + integrity sha512-kja8j7PjmncONqaTsB8fQ+wE2mSU2DJ9D4XKoJ5PFWIdRMa6SLSN1ff4mOr4jCbfRSsxR4keIiySJU0N9T5hIQ== dependencies: humanize-ms "^1.2.1" @@ -2838,16 +2860,9 @@ ansi-regex@^5.0.1: integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== ansi-regex@^6.0.1: - version "6.0.1" - resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a" - integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA== - -ansi-styles@^3.2.1: - version "3.2.1" - resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" - integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== - dependencies: - color-convert "^1.9.0" + version "6.1.0" + resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz#95ec409c69619d6cb1b8b34f14b660ef28ebd654" + integrity sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA== "ansi-styles@^4.0.0", "ansi-styles@^4.1.0": version "4.3.0" @@ -2919,20 +2934,25 @@ argparse@^2.0.1: resolved "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== -"aria-query@5.3.0", "aria-query@^5.0.0": +aria-query@5.3.0: version "5.3.0" resolved "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz#650c569e41ad90b51b3d7df5e5eed1c7549c103e" integrity sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A== dependencies: dequal "^2.0.3" -array-buffer-byte-length@^1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz#1e5583ec16763540a27ae52eed99ff899223568f" - integrity sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg== +aria-query@^5.0.0: + version "5.3.2" + resolved "https://registry.npmjs.org/aria-query/-/aria-query-5.3.2.tgz#93f81a43480e33a338f19163a3d10a50c01dcd59" + integrity sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw== + +"array-buffer-byte-length@^1.0.1", "array-buffer-byte-length@^1.0.2": + version "1.0.2" + resolved "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz#384d12a37295aec3769ab022ad323a18a51ccf8b" + integrity sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw== dependencies: - call-bind "^1.0.5" - is-array-buffer "^3.0.4" + call-bound "^1.0.3" + is-array-buffer "^3.0.5" "array-includes@^3.1.6", "array-includes@^3.1.8": version "3.1.8" @@ -2964,24 +2984,24 @@ array.prototype.findlast@^1.2.5: es-shim-unscopables "^1.0.2" array.prototype.flat@^1.3.1: - version "1.3.2" - resolved "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz#1476217df8cff17d72ee8f3ba06738db5b387d18" - integrity sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA== + version "1.3.3" + resolved "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.3.tgz#534aaf9e6e8dd79fb6b9a9917f839ef1ec63afe5" + integrity sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg== dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - es-shim-unscopables "^1.0.0" + call-bind "^1.0.8" + define-properties "^1.2.1" + es-abstract "^1.23.5" + es-shim-unscopables "^1.0.2" -array.prototype.flatmap@^1.3.2: - version "1.3.2" - resolved "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz#c9a7c6831db8e719d6ce639190146c24bbd3e527" - integrity sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ== +array.prototype.flatmap@^1.3.3: + version "1.3.3" + resolved "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.3.tgz#712cc792ae70370ae40586264629e33aab5dd38b" + integrity sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg== dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - es-shim-unscopables "^1.0.0" + call-bind "^1.0.8" + define-properties "^1.2.1" + es-abstract "^1.23.5" + es-shim-unscopables "^1.0.2" array.prototype.tosorted@^1.1.4: version "1.1.4" @@ -2994,19 +3014,18 @@ array.prototype.tosorted@^1.1.4: es-errors "^1.3.0" es-shim-unscopables "^1.0.2" -arraybuffer.prototype.slice@^1.0.3: - version "1.0.3" - resolved "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz#097972f4255e41bc3425e37dc3f6421cf9aefde6" - integrity sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A== +arraybuffer.prototype.slice@^1.0.4: + version "1.0.4" + resolved "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz#9d760d84dbdd06d0cbf92c8849615a1a7ab3183c" + integrity sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ== dependencies: array-buffer-byte-length "^1.0.1" - call-bind "^1.0.5" + call-bind "^1.0.8" define-properties "^1.2.1" - es-abstract "^1.22.3" - es-errors "^1.2.1" - get-intrinsic "^1.2.3" + es-abstract "^1.23.5" + es-errors "^1.3.0" + get-intrinsic "^1.2.6" is-array-buffer "^3.0.4" - is-shared-array-buffer "^1.0.2" arrify@^1.0.1: version "1.0.1" @@ -3054,6 +3073,11 @@ assert@^1.4.0: object.assign "^4.1.4" util "^0.10.4" +async-function@^1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/async-function/-/async-function-1.0.0.tgz#509c9fca60eaf85034c6829838188e4e4c8ffb2b" + integrity sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA== + async@^2.1.4: version "2.6.4" resolved "https://registry.npmjs.org/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221" @@ -3071,10 +3095,10 @@ asynckit@^0.4.0: resolved "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== -attr-accept@^2.2.2: - version "2.2.2" - resolved "https://registry.npmjs.org/attr-accept/-/attr-accept-2.2.2.tgz#646613809660110749e92f2c10833b70968d929b" - integrity sha512-7prDjvt9HmqiZ0cl5CRjtS84sEyhsHP2coDkaZKRKVfCDo9s7iw7ChVmar78Gu9pC4SoR/28wFu/G5JJhTnqEg== +attr-accept@^2.2.4: + version "2.2.5" + resolved "https://registry.npmjs.org/attr-accept/-/attr-accept-2.2.5.tgz#d7061d958e6d4f97bf8665c68b75851a0713ab5e" + integrity sha512-0bDNnY/u6pPwHDMoF0FieU354oBi0a8rD9FcsLwzcGWbc8KS8KPIi7y+s13OlVY+gMWc/9xEMUgNE6Qm8ZllYQ== autoprefixer@^10.2.4: version "10.4.20" @@ -3095,18 +3119,18 @@ available-typed-arrays@^1.0.7: dependencies: possible-typed-array-names "^1.0.0" -axios-mock-adapter@^1.17.0: - version "1.22.0" - resolved "https://registry.npmjs.org/axios-mock-adapter/-/axios-mock-adapter-1.22.0.tgz#0f3e6be0fc9b55baab06f2d49c0b71157e7c053d" - integrity sha512-dmI0KbkyAhntUR05YY96qg2H6gg0XMl2+qTW0xmYg6Up+BFBAJYRLROMXRdDEL06/Wqwa0TJThAYvFtSFdRCZw== +axios-mock-adapter@^2.1.0: + version "2.1.0" + resolved "https://registry.npmjs.org/axios-mock-adapter/-/axios-mock-adapter-2.1.0.tgz#25ab2d7558f915e391744a40bbeb7374ad5985a4" + integrity sha512-AZUe4OjECGCNNssH8SOdtneiQELsqTsat3SQQCWLPjN436/H+L9AjWfV7bF+Zg/YL9cgbhrz5671hoh+Tbn98w== dependencies: fast-deep-equal "^3.1.3" is-buffer "^2.0.5" -axios@^1.7.4: - version "1.7.5" - resolved "https://registry.npmjs.org/axios/-/axios-1.7.5.tgz#21eed340eb5daf47d29b6e002424b3e88c8c54b1" - integrity sha512-fZu86yCo+svH3uqJ/yTdQ0QHpQu5oL+/QE+QPSv6BZSkDAoky9vytxp7u5qk83OJFS3kEBcesWni9WTZAv3tSw== +axios@^1.7.9: + version "1.7.9" + resolved "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz#d7d071380c132a24accda1b2cfc1535b79ec650a" + integrity sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw== dependencies: follow-redirects "^1.15.6" form-data "^4.0.0" @@ -3126,9 +3150,9 @@ babel-jest@^29.7.0: slash "^3.0.0" babel-loader@^9.1.3: - version "9.1.3" - resolved "https://registry.npmjs.org/babel-loader/-/babel-loader-9.1.3.tgz#3d0e01b4e69760cc694ee306fe16d358aa1c6f9a" - integrity sha512-xG3ST4DglodGf8qSwv0MdeWLhrDsw/32QMdTO5T1ZIp9gQur0HkCyFs7Awskr10JKXFXwpAhiCuYX5oGXnRGbw== + version "9.2.1" + resolved "https://registry.npmjs.org/babel-loader/-/babel-loader-9.2.1.tgz#04c7835db16c246dd19ba0914418f3937797587b" + integrity sha512-fqe8naHt46e0yIdkjUZYqddSXfej3AHajX+CSO5X7oy0EmPc6o5Xh+RClNoHjnieWz9AW4kZxW9yyFMhVB1QLA== dependencies: find-cache-dir "^4.0.0" schema-utils "^4.0.0" @@ -3164,12 +3188,12 @@ babel-plugin-macros@^3.1.0: resolve "^1.19.0" babel-plugin-polyfill-corejs2@^0.4.10: - version "0.4.11" - resolved "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.11.tgz#30320dfe3ffe1a336c15afdcdafd6fd615b25e33" - integrity sha512-sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q== + version "0.4.12" + resolved "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.12.tgz#ca55bbec8ab0edeeef3d7b8ffd75322e210879a9" + integrity sha512-CPWT6BwvhrTO2d8QVorhTCQw9Y43zOu7G9HigcfxvepOU6b8o3tcWad6oVgZIsZCTt42FFv97aA7ZJsbM4+8og== dependencies: "@babel/compat-data" "^7.22.6" - "@babel/helper-define-polyfill-provider" "^0.6.2" + "@babel/helper-define-polyfill-provider" "^0.6.3" semver "^6.3.1" babel-plugin-polyfill-corejs3@^0.10.6: @@ -3181,11 +3205,11 @@ babel-plugin-polyfill-corejs3@^0.10.6: core-js-compat "^3.38.0" babel-plugin-polyfill-regenerator@^0.6.1: - version "0.6.2" - resolved "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.2.tgz#addc47e240edd1da1058ebda03021f382bba785e" - integrity sha512-2R25rQZWP63nGwaAswvDazbPXfrM3HwVoBXK6HcqeKrSrL/JqcC/rDcf95l4r7LXLyxDXc8uQDa064GubtCABg== + version "0.6.3" + resolved "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.3.tgz#abeb1f3f1c762eace37587f42548b08b57789bc8" + integrity sha512-LiWSbl4CRSIa5x/JAU6jZiG9eit9w6mz+yVMFwDE83LAWvt0AfGBoZ7HS/mkhrKuh2ZlzfVZYKoLjXdqw6Yt7Q== dependencies: - "@babel/helper-define-polyfill-provider" "^0.6.2" + "@babel/helper-define-polyfill-provider" "^0.6.3" babel-preset-current-node-syntax@^1.0.0: version "1.1.0" @@ -3305,11 +3329,11 @@ bl@^1.0.0: safe-buffer "^5.1.1" "bn.js@^4.0.0", "bn.js@^4.1.0", "bn.js@^4.11.9": - version "4.12.0" - resolved "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88" - integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA== + version "4.12.1" + resolved "https://registry.npmjs.org/bn.js/-/bn.js-4.12.1.tgz#215741fe3c9dba2d7e12c001d0cfdbae43975ba7" + integrity sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg== -"bn.js@^5.0.0", "bn.js@^5.2.1": +bn.js@^5.2.1: version "5.2.1" resolved "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz#0bc527a6a0d18d0aa8d5b0538ce4a77dccfa7b70" integrity sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ== @@ -3395,7 +3419,7 @@ browserfs@^1.4.3: inherits "^2.0.1" safe-buffer "^5.0.1" -browserify-cipher@^1.0.0: +browserify-cipher@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0" integrity sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w== @@ -3415,14 +3439,15 @@ browserify-des@^1.0.0: safe-buffer "^5.1.2" "browserify-rsa@^4.0.0", "browserify-rsa@^4.1.0": - version "4.1.0" - resolved "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz#b2fd06b5b75ae297f7ce2dc651f918f5be158c8d" - integrity sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog== + version "4.1.1" + resolved "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.1.tgz#06e530907fe2949dc21fc3c2e2302e10b1437238" + integrity sha512-YBjSAiTqM04ZVei6sXighu679a3SqWORA3qZTEqZImnlkDIFtKc6pNutpjyZ8RJTjQtuYfeetkxM11GwoYXMIQ== dependencies: - bn.js "^5.0.0" - randombytes "^2.0.1" + bn.js "^5.2.1" + randombytes "^2.1.0" + safe-buffer "^5.2.1" -browserify-sign@^4.0.0: +browserify-sign@^4.2.3: version "4.2.3" resolved "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.3.tgz#7afe4c01ec7ee59a89a558a4b75bd85ae62d4208" integrity sha512-JWCZW6SKhfhjJxO8Tyiiy+XYB7cqd2S5/+WeYHsKdNKFlCBhKbblba1A/HN/90YwtxKc8tCErjffZl++UNmGiw== @@ -3446,9 +3471,9 @@ browserify-zlib@~0.2.0: pako "~1.0.5" browserify@^17.0.0: - version "17.0.0" - resolved "https://registry.npmjs.org/browserify/-/browserify-17.0.0.tgz#4c48fed6c02bfa2b51fd3b670fddb805723cdc22" - integrity sha512-SaHqzhku9v/j6XsQMRxPyBrSP3gnwmE27gLJYZgMT2GeK3J0+0toN+MnuNYDfHwVGQfLiMZ7KSNSIXHemy905w== + version "17.0.1" + resolved "https://registry.npmjs.org/browserify/-/browserify-17.0.1.tgz#d822fa701431ca94cb405b033bb2551951e5d97d" + integrity sha512-pxhT00W3ylMhCHwG5yfqtZjNnFuX5h2IJdaBfSo4ChaaBsIp9VLrEMQ1bHV+Xr1uLPXuNDDM1GlJkjli0qkRsw== dependencies: JSONStream "^1.0.3" assert "^1.4.0" @@ -3467,7 +3492,7 @@ browserify@^17.0.0: duplexer2 "~0.1.2" events "^3.0.0" glob "^7.1.0" - has "^1.0.0" + hasown "^2.0.0" htmlescape "^1.1.0" https-browserify "^1.0.0" inherits "~2.0.1" @@ -3499,15 +3524,15 @@ browserify@^17.0.0: vm-browserify "^1.0.0" xtend "^4.0.0" -"browserslist@^4.0.0", "browserslist@^4.21.10", "browserslist@^4.21.4", "browserslist@^4.23.0", "browserslist@^4.23.1", "browserslist@^4.23.3": - version "4.23.3" - resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz#debb029d3c93ebc97ffbc8d9cbb03403e227c800" - integrity sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA== +"browserslist@^4.0.0", "browserslist@^4.23.3", "browserslist@^4.24.0", "browserslist@^4.24.3": + version "4.24.4" + resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz#c6b2865a3f08bcb860a0e827389003b9fe686e4b" + integrity sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A== dependencies: - caniuse-lite "^1.0.30001646" - electron-to-chromium "^1.5.4" - node-releases "^2.0.18" - update-browserslist-db "^1.1.0" + caniuse-lite "^1.0.30001688" + electron-to-chromium "^1.5.73" + node-releases "^2.0.19" + update-browserslist-db "^1.1.1" bser@2.1.1: version "2.1.1" @@ -3609,12 +3634,12 @@ cacache@^16.1.0: tar "^6.1.11" unique-filename "^2.0.0" -cacache@^18.0.0: - version "18.0.4" - resolved "https://registry.npmjs.org/cacache/-/cacache-18.0.4.tgz#4601d7578dadb59c66044e157d02a3314682d6a5" - integrity sha512-B+L5iIa9mgcjLbliir2th36yEwPftrzteHYujzsx3dFP/31GCHcIeS8f5MGd80odLOjaOvSpU3EEAmRQptkxLQ== +cacache@^19.0.1: + version "19.0.1" + resolved "https://registry.npmjs.org/cacache/-/cacache-19.0.1.tgz#3370cc28a758434c85c2585008bd5bdcff17d6cd" + integrity sha512-hdsUxulXCi5STId78vRVYEtDAjq99ICAUktLTeTYsLoTE6Z8dS0c8pWNCxwdrk9YfJeobDZc2Y186hD/5ZQgFQ== dependencies: - "@npmcli/fs" "^3.1.0" + "@npmcli/fs" "^4.0.0" fs-minipass "^3.0.0" glob "^10.2.2" lru-cache "^10.0.1" @@ -3622,10 +3647,10 @@ cacache@^18.0.0: minipass-collect "^2.0.1" minipass-flush "^1.0.5" minipass-pipeline "^1.2.4" - p-map "^4.0.0" - ssri "^10.0.0" - tar "^6.1.11" - unique-filename "^3.0.0" + p-map "^7.0.2" + ssri "^12.0.0" + tar "^7.4.3" + unique-filename "^4.0.0" cacheable-request@^2.1.1: version "2.1.4" @@ -3645,22 +3670,42 @@ cacheable-request@^2.1.1: resolved "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.1.0.tgz#865576dfef39c0d6a7defde794d078f5308e3ef3" integrity sha512-WF0LihfemtesFcJgO7xfOoOcnWzY/QHR4qeDqV44jPU3HTI54+LnfXK3SA27AVVGCdZFgjjFFaqUA9Jx7dMJZA== -"call-bind@^1.0.2", "call-bind@^1.0.5", "call-bind@^1.0.6", "call-bind@^1.0.7": - version "1.0.7" - resolved "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9" - integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w== +"call-bind-apply-helpers@^1.0.0", "call-bind-apply-helpers@^1.0.1": + version "1.0.1" + resolved "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.1.tgz#32e5892e6361b29b0b545ba6f7763378daca2840" + integrity sha512-BhYE+WDaywFg2TBWYNXAE+8B1ATnThNBqXHP5nQu0jWJdVvY2hvkpyB3qOmtmDePiS5/BDQ8wASEWGMWRG148g== dependencies: - es-define-property "^1.0.0" es-errors "^1.3.0" function-bind "^1.1.2" + +"call-bind@^1.0.7", "call-bind@^1.0.8": + version "1.0.8" + resolved "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz#0736a9660f537e3388826f440d5ec45f744eaa4c" + integrity sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww== + dependencies: + call-bind-apply-helpers "^1.0.0" + es-define-property "^1.0.0" get-intrinsic "^1.2.4" - set-function-length "^1.2.1" + set-function-length "^1.2.2" + +"call-bound@^1.0.2", "call-bound@^1.0.3": + version "1.0.3" + resolved "https://registry.npmjs.org/call-bound/-/call-bound-1.0.3.tgz#41cfd032b593e39176a71533ab4f384aa04fd681" + integrity sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA== + dependencies: + call-bind-apply-helpers "^1.0.1" + get-intrinsic "^1.2.6" callsites@^3.0.0: version "3.1.0" resolved "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== +callsites@^4.1.0: + version "4.2.0" + resolved "https://registry.npmjs.org/callsites/-/callsites-4.2.0.tgz#98761d5be3ce092e4b9c92f7fb8c8eb9b83cadc8" + integrity sha512-kfzR4zzQtAE9PC7CzZsjl3aBNbXWuXiSeOCdLcPpBfGW8YuCqQHcRPFDbr/BPVmd3EEPVpuFzLyuT/cUhPr4OQ== + camelcase-keys@^7.0.0: version "7.0.2" resolved "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-7.0.2.tgz#d048d8c69448745bb0de6fc4c1c52a30dfbe7252" @@ -3691,10 +3736,10 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -"caniuse-lite@^1.0.0", "caniuse-lite@^1.0.30001646": - version "1.0.30001653" - resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001653.tgz#b8af452f8f33b1c77f122780a4aecebea0caca56" - integrity sha512-XGWQVB8wFQ2+9NZwZ10GxTYC5hk0Fa+q8cSkr0tgvMhYhMHP/QC+WTgrePMDBWiWc/pV+1ik82Al20XOK25Gcw== +"caniuse-lite@^1.0.0", "caniuse-lite@^1.0.30001646", "caniuse-lite@^1.0.30001688": + version "1.0.30001695" + resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001695.tgz#39dfedd8f94851132795fdf9b79d29659ad9c4d4" + integrity sha512-vHyLade6wTgI2u1ec3WQBxv+2BrTERV28UXQu9LO6lZ9pYeMk34vjXFLOxo1A4UBA8XTL4njRQZdno/yYaSmWw== "caw@^2.0.0", "caw@^2.0.1": version "2.0.1" @@ -3706,15 +3751,6 @@ caniuse-api@^3.0.0: tunnel-agent "^0.6.0" url-to-options "^1.0.1" -chalk@^2.4.2: - version "2.4.2" - resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" - integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - chalk@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" @@ -3731,6 +3767,11 @@ chalk@^3.0.0: ansi-styles "^4.1.0" supports-color "^7.1.0" +change-file-extension@^0.1.1: + version "0.1.1" + resolved "https://registry.npmjs.org/change-file-extension/-/change-file-extension-0.1.1.tgz#46a342c4f327cdc0578ac7fc8412c364561da677" + integrity sha512-lB0j9teu8JtDPDHRfU8pNH33w4wMu5bOaKoT4PxH+AKugBrIfpiJMTTKIm0TErNeJPkeQEgvH31YpccTwOKPRg== + char-regex@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf" @@ -3742,10 +3783,11 @@ chart.js@^3.0.0: integrity sha512-Ro2JbLmvg83gXF5F4sniaQ+lTbSv18E+TIf2cOeiH1Iqd2PGFOtem+DUufMZsCJwFE7ywPOpfXFBwRTGq7dh6w== chartjs-plugin-zoom@^2.0.1: - version "2.0.1" - resolved "https://registry.npmjs.org/chartjs-plugin-zoom/-/chartjs-plugin-zoom-2.0.1.tgz#3db76f92a4741e46cb148cb966181c1b1a974abc" - integrity sha512-ogOmLu6e+Q7E1XWOCOz9YwybMslz9qNfGV2a+qjfmqJYpsw5ZMoRHZBUyW+NGhkpQ5PwwPA/+rikHpBZb7PZuA== + version "2.2.0" + resolved "https://registry.npmjs.org/chartjs-plugin-zoom/-/chartjs-plugin-zoom-2.2.0.tgz#79928acf2d22bd60b5442e0ef73139b261c65d19" + integrity sha512-in6kcdiTlP6npIVLMd4zXZ08PDUXC52gZ4FAy5oyjk1zX3gKarXMAof7B9eFiisf9WOC3bh2saHg+J5WtLXZeA== dependencies: + "@types/hammerjs" "^2.0.45" hammerjs "^2.0.8" chownr@^2.0.0: @@ -3753,6 +3795,11 @@ chownr@^2.0.0: resolved "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== +chownr@^3.0.0: + version "3.0.0" + resolved "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz#9855e64ecd240a9cc4267ce8a4aa5d24a1da15e4" + integrity sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g== + chrome-trace-event@^1.0.2: version "1.0.4" resolved "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz#05bffd7ff928465093314708c93bdfa9bd1f0f5b" @@ -3764,17 +3811,17 @@ ci-info@^3.2.0: integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ== "cipher-base@^1.0.0", "cipher-base@^1.0.1", "cipher-base@^1.0.3": - version "1.0.4" - resolved "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de" - integrity sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q== + version "1.0.6" + resolved "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.6.tgz#8fe672437d01cd6c4561af5334e0cc50ff1955f7" + integrity sha512-3Ek9H3X6pj5TgenXYtNWdaBon1tgYCaebd+XPg0keyjEbEfkD4KkmAxkQ/i1vYvxdcT5nscLBfq9VJRmCBcFSw== dependencies: - inherits "^2.0.1" - safe-buffer "^5.0.1" + inherits "^2.0.4" + safe-buffer "^5.2.1" cjs-module-lexer@^1.0.0: - version "1.4.0" - resolved "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.0.tgz#677de7ed7efff67cc40c9bf1897fea79d41b5215" - integrity sha512-N1NGmowPlGBLsOZLPvm48StN04V4YvQRL0i6b7ctrVY3epjP/ct7hFLOItz6pDIvRjwpfPxi52a2UWV2ziir8g== + version "1.4.1" + resolved "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.1.tgz#707413784dbb3a72aa11c2f2b042a0bef4004170" + integrity sha512-cuSVIHi9/9E/+821Qjdvngor+xpnlwnuwIyZOaLmHBVdXL+gP+I6QQB9VkO7RI77YIcTV+S1W9AreJ5eN63JBA== "classnames@*", "classnames@2.x", "classnames@^2.2.1", "classnames@^2.2.5", "classnames@^2.2.6", "classnames@^2.5.1": version "2.5.1" @@ -3844,13 +3891,6 @@ collect-v8-coverage@^1.0.0: resolved "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz#c0b29bcd33bcd0779a1344c2136051e6afd3d9e9" integrity sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q== -color-convert@^1.9.0: - version "1.9.3" - resolved "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" - integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== - dependencies: - color-name "1.1.3" - color-convert@^2.0.1: version "2.0.1" resolved "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" @@ -3858,11 +3898,6 @@ color-convert@^2.0.1: dependencies: color-name "~1.1.4" -color-name@1.1.3: - version "1.1.3" - resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== - color-name@~1.1.4: version "1.1.4" resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" @@ -3873,7 +3908,7 @@ color-support@^1.1.3: resolved "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg== -"colord@^2.9.1", "colord@^2.9.3": +colord@^2.9.3: version "2.9.3" resolved "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz#4f8ce919de456f1d5c1c368c307fe20f3e59fb43" integrity sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw== @@ -3900,10 +3935,15 @@ combined-stream@^1.0.8: dependencies: delayed-stream "~1.0.0" -commander@^10.0.1: - version "10.0.1" - resolved "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06" - integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug== +commander@^11.0.0: + version "11.1.0" + resolved "https://registry.npmjs.org/commander/-/commander-11.1.0.tgz#62fdce76006a68e5c1ab3314dc92e800eb83d906" + integrity sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ== + +commander@^12.1.0: + version "12.1.0" + resolved "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz#01423b36f501259fdaac4d0e4d60c96c991585d3" + integrity sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA== "commander@^2.19.0", "commander@^2.20.0", "commander@^2.8.1": version "2.20.3" @@ -3915,11 +3955,6 @@ commander@^7.2.0: resolved "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== -commander@^9.3.0: - version "9.5.0" - resolved "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz#bc08d1eb5cedf7ccb797a96199d41c7bc3e60d30" - integrity sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ== - common-path-prefix@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz#7d007a7e07c58c4b4d5f433131a19141b29f11e0" @@ -3970,6 +4005,11 @@ content-disposition@^0.5.2: dependencies: safe-buffer "5.2.1" +convert-hrtime@^5.0.0: + version "5.0.0" + resolved "https://registry.npmjs.org/convert-hrtime/-/convert-hrtime-5.0.0.tgz#f2131236d4598b95de856926a67100a0a97e9fa3" + integrity sha512-lOETlkIeYSJWcbbcvjRKGxVMXJR+8+OQb/mTPbA4ObPMytYIsUbuOE0Jzy60hjARYszq1id0j8KgVhC+WGZVTg== + convert-source-map@^1.5.0: version "1.9.0" resolved "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f" @@ -4005,12 +4045,12 @@ copy-webpack-plugin@^12.0.2: schema-utils "^4.2.0" serialize-javascript "^6.0.2" -"core-js-compat@^3.37.1", "core-js-compat@^3.38.0": - version "3.38.1" - resolved "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.38.1.tgz#2bc7a298746ca5a7bcb9c164bcb120f2ebc09a09" - integrity sha512-JRH6gfXxGmrzF3tZ57lFx97YARxCXPaMzPo6jELZhv88pBH5VXpQ+y0znKGlFnzuaihqhLbefxSJxWJMPtfDzw== +"core-js-compat@^3.38.0", "core-js-compat@^3.38.1": + version "3.40.0" + resolved "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.40.0.tgz#7485912a5a4a4315c2fdb2cbdc623e6881c88b38" + integrity sha512-0XEDpr5y5mijvw8Lbc6E5AkjrHfp7eEoPlu36SWeAbcL8fn1G1ANe8DBlo2XoNN89oVpxWwOjYIPVzR4ZvsKCQ== dependencies: - browserslist "^4.23.3" + browserslist "^4.24.3" core-js@3.37.0: version "3.37.0" @@ -4053,7 +4093,7 @@ cosmiconfig@^9.0.0: js-yaml "^4.1.0" parse-json "^5.2.0" -create-ecdh@^4.0.0: +create-ecdh@^4.0.4: version "4.0.4" resolved "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz#d6e7f4bffa66736085a0762fd3a632684dabcc4e" integrity sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A== @@ -4072,7 +4112,7 @@ create-ecdh@^4.0.0: ripemd160 "^2.0.1" sha.js "^2.4.0" -"create-hmac@^1.1.0", "create-hmac@^1.1.4", "create-hmac@^1.1.7": +"create-hmac@^1.1.4", "create-hmac@^1.1.7": version "1.1.7" resolved "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff" integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg== @@ -4119,9 +4159,9 @@ cross-spawn@^5.0.1: which "^1.2.9" cross-spawn@^6.0.0: - version "6.0.5" - resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" - integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== + version "6.0.6" + resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.6.tgz#30d0efa0712ddb7eb5a76e1e8721bffafa6b5d57" + integrity sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw== dependencies: nice-try "^1.0.4" path-key "^2.0.1" @@ -4129,36 +4169,32 @@ cross-spawn@^6.0.0: shebang-command "^1.2.0" which "^1.2.9" -"cross-spawn@^7.0.0", "cross-spawn@^7.0.1", "cross-spawn@^7.0.2", "cross-spawn@^7.0.3": - version "7.0.3" - resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" - integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== +"cross-spawn@^7.0.0", "cross-spawn@^7.0.1", "cross-spawn@^7.0.3", "cross-spawn@^7.0.6": + version "7.0.6" + resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f" + integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA== dependencies: path-key "^3.1.0" shebang-command "^2.0.0" which "^2.0.1" crypto-browserify@^3.0.0: - version "3.12.0" - resolved "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec" - integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg== + version "3.12.1" + resolved "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.1.tgz#bb8921bec9acc81633379aa8f52d69b0b69e0dac" + integrity sha512-r4ESw/IlusD17lgQi1O20Fa3qNnsckR126TdUuBgAu7GBYSIPvdNyONd3Zrxh0xCwA4+6w/TDArBPsMvhur+KQ== dependencies: - browserify-cipher "^1.0.0" - browserify-sign "^4.0.0" - create-ecdh "^4.0.0" - create-hash "^1.1.0" - create-hmac "^1.1.0" - diffie-hellman "^5.0.0" - inherits "^2.0.1" - pbkdf2 "^3.0.3" - public-encrypt "^4.0.0" - randombytes "^2.0.0" - randomfill "^1.0.3" - -css-declaration-sorter@^6.3.1: - version "6.4.1" - resolved "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.1.tgz#28beac7c20bad7f1775be3a7129d7eae409a3a71" - integrity sha512-rtdthzxKuyq6IzqX6jEcIzQF/YqccluefyCYheovBOLhFT/drQA9zj/UbRAa9J7C0o6EG6u3E6g+vKkay7/k3g== + browserify-cipher "^1.0.1" + browserify-sign "^4.2.3" + create-ecdh "^4.0.4" + create-hash "^1.2.0" + create-hmac "^1.1.7" + diffie-hellman "^5.0.3" + hash-base "~3.0.4" + inherits "^2.0.4" + pbkdf2 "^3.1.2" + public-encrypt "^4.0.3" + randombytes "^2.1.0" + randomfill "^1.0.4" css-declaration-sorter@^7.2.0: version "7.2.0" @@ -4179,28 +4215,17 @@ css-loader@^7.1.2: postcss-value-parser "^4.2.0" semver "^7.5.4" -css-minimizer-webpack-plugin@^5.0.0: - version "5.0.1" - resolved "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-5.0.1.tgz#33effe662edb1a0bf08ad633c32fa75d0f7ec565" - integrity sha512-3caImjKFQkS+ws1TGcFn0V1HyDJFq1Euy589JlD6/3rV2kj+w7r5G9WDMgSHvpvXHNZ2calVypZWuEDQd9wfLg== +css-minimizer-webpack-plugin@^7.0.0: + version "7.0.0" + resolved "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-7.0.0.tgz#b77a3d2f7c0fd02d3ac250dcc2f79065363f3cd3" + integrity sha512-niy66jxsQHqO+EYbhPuIhqRQ1mNcNVUHrMnkzzir9kFOERJUaQDDRhh7dKDz33kBpkWMF9M8Vx0QlDbc5AHOsw== dependencies: - "@jridgewell/trace-mapping" "^0.3.18" - cssnano "^6.0.1" - jest-worker "^29.4.3" - postcss "^8.4.24" - schema-utils "^4.0.1" - serialize-javascript "^6.0.1" - -css-select@^4.1.3: - version "4.3.0" - resolved "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz#db7129b2846662fd8628cfc496abb2b59e41529b" - integrity sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ== - dependencies: - boolbase "^1.0.0" - css-what "^6.0.1" - domhandler "^4.3.1" - domutils "^2.8.0" - nth-check "^2.0.1" + "@jridgewell/trace-mapping" "^0.3.25" + cssnano "^7.0.1" + jest-worker "^29.7.0" + postcss "^8.4.38" + schema-utils "^4.2.0" + serialize-javascript "^6.0.2" css-select@^5.1.0: version "5.1.0" @@ -4213,14 +4238,6 @@ css-select@^5.1.0: domutils "^3.0.1" nth-check "^2.0.1" -"css-tree@^1.1.2", "css-tree@^1.1.3": - version "1.1.3" - resolved "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz#eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d" - integrity sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q== - dependencies: - mdn-data "2.0.14" - source-map "^0.6.1" - css-tree@^2.3.1: version "2.3.1" resolved "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz#10264ce1e5442e8572fc82fbe490644ff54b5c20" @@ -4237,7 +4254,7 @@ css-tree@~2.2.0: mdn-data "2.0.28" source-map-js "^1.0.1" -"css-what@^6.0.1", "css-what@^6.1.0": +css-what@^6.1.0: version "6.1.0" resolved "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4" integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw== @@ -4252,110 +4269,54 @@ cssesc@^3.0.0: resolved "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== -cssnano-preset-default@^5.2.14: - version "5.2.14" - resolved "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.14.tgz#309def4f7b7e16d71ab2438052093330d9ab45d8" - integrity sha512-t0SFesj/ZV2OTylqQVOrFgEh5uanxbO6ZAdeCrNsUQ6fVuXwYTxJPNAGvGTxHbD68ldIJNec7PyYZDBrfDQ+6A== +cssnano-preset-default@^7.0.6: + version "7.0.6" + resolved "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-7.0.6.tgz#0220fa7507478369aa2a226bac03e1204cd024c1" + integrity sha512-ZzrgYupYxEvdGGuqL+JKOY70s7+saoNlHSCK/OGn1vB2pQK8KSET8jvenzItcY+kA7NoWvfbb/YhlzuzNKjOhQ== dependencies: - css-declaration-sorter "^6.3.1" - cssnano-utils "^3.1.0" - postcss-calc "^8.2.3" - postcss-colormin "^5.3.1" - postcss-convert-values "^5.1.3" - postcss-discard-comments "^5.1.2" - postcss-discard-duplicates "^5.1.0" - postcss-discard-empty "^5.1.1" - postcss-discard-overridden "^5.1.0" - postcss-merge-longhand "^5.1.7" - postcss-merge-rules "^5.1.4" - postcss-minify-font-values "^5.1.0" - postcss-minify-gradients "^5.1.1" - postcss-minify-params "^5.1.4" - postcss-minify-selectors "^5.2.1" - postcss-normalize-charset "^5.1.0" - postcss-normalize-display-values "^5.1.0" - postcss-normalize-positions "^5.1.1" - postcss-normalize-repeat-style "^5.1.1" - postcss-normalize-string "^5.1.0" - postcss-normalize-timing-functions "^5.1.0" - postcss-normalize-unicode "^5.1.1" - postcss-normalize-url "^5.1.0" - postcss-normalize-whitespace "^5.1.1" - postcss-ordered-values "^5.1.3" - postcss-reduce-initial "^5.1.2" - postcss-reduce-transforms "^5.1.0" - postcss-svgo "^5.1.0" - postcss-unique-selectors "^5.1.1" - -cssnano-preset-default@^6.1.2: - version "6.1.2" - resolved "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-6.1.2.tgz#adf4b89b975aa775f2750c89dbaf199bbd9da35e" - integrity sha512-1C0C+eNaeN8OcHQa193aRgYexyJtU8XwbdieEjClw+J9d94E41LwT6ivKH0WT+fYwYWB0Zp3I3IZ7tI/BbUbrg== - dependencies: - browserslist "^4.23.0" + browserslist "^4.23.3" css-declaration-sorter "^7.2.0" - cssnano-utils "^4.0.2" - postcss-calc "^9.0.1" - postcss-colormin "^6.1.0" - postcss-convert-values "^6.1.0" - postcss-discard-comments "^6.0.2" - postcss-discard-duplicates "^6.0.3" - postcss-discard-empty "^6.0.3" - postcss-discard-overridden "^6.0.2" - postcss-merge-longhand "^6.0.5" - postcss-merge-rules "^6.1.1" - postcss-minify-font-values "^6.1.0" - postcss-minify-gradients "^6.0.3" - postcss-minify-params "^6.1.0" - postcss-minify-selectors "^6.0.4" - postcss-normalize-charset "^6.0.2" - postcss-normalize-display-values "^6.0.2" - postcss-normalize-positions "^6.0.2" - postcss-normalize-repeat-style "^6.0.2" - postcss-normalize-string "^6.0.2" - postcss-normalize-timing-functions "^6.0.2" - postcss-normalize-unicode "^6.1.0" - postcss-normalize-url "^6.0.2" - postcss-normalize-whitespace "^6.0.2" - postcss-ordered-values "^6.0.2" - postcss-reduce-initial "^6.1.0" - postcss-reduce-transforms "^6.0.2" - postcss-svgo "^6.0.3" - postcss-unique-selectors "^6.0.4" + cssnano-utils "^5.0.0" + postcss-calc "^10.0.2" + postcss-colormin "^7.0.2" + postcss-convert-values "^7.0.4" + postcss-discard-comments "^7.0.3" + postcss-discard-duplicates "^7.0.1" + postcss-discard-empty "^7.0.0" + postcss-discard-overridden "^7.0.0" + postcss-merge-longhand "^7.0.4" + postcss-merge-rules "^7.0.4" + postcss-minify-font-values "^7.0.0" + postcss-minify-gradients "^7.0.0" + postcss-minify-params "^7.0.2" + postcss-minify-selectors "^7.0.4" + postcss-normalize-charset "^7.0.0" + postcss-normalize-display-values "^7.0.0" + postcss-normalize-positions "^7.0.0" + postcss-normalize-repeat-style "^7.0.0" + postcss-normalize-string "^7.0.0" + postcss-normalize-timing-functions "^7.0.0" + postcss-normalize-unicode "^7.0.2" + postcss-normalize-url "^7.0.0" + postcss-normalize-whitespace "^7.0.0" + postcss-ordered-values "^7.0.1" + postcss-reduce-initial "^7.0.2" + postcss-reduce-transforms "^7.0.0" + postcss-svgo "^7.0.1" + postcss-unique-selectors "^7.0.3" -cssnano-utils@^3.1.0: - version "3.1.0" - resolved "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz#95684d08c91511edfc70d2636338ca37ef3a6861" - integrity sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA== +cssnano-utils@^5.0.0: + version "5.0.0" + resolved "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-5.0.0.tgz#b53a0343dd5d21012911882db6ae7d2eae0e3687" + integrity sha512-Uij0Xdxc24L6SirFr25MlwC2rCFX6scyUmuKpzI+JQ7cyqDEwD42fJ0xfB3yLfOnRDU5LKGgjQ9FA6LYh76GWQ== -cssnano-utils@^4.0.2: - version "4.0.2" - resolved "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-4.0.2.tgz#56f61c126cd0f11f2eef1596239d730d9fceff3c" - integrity sha512-ZR1jHg+wZ8o4c3zqf1SIUSTIvm/9mU343FMR6Obe/unskbvpGhZOo1J6d/r8D1pzkRQYuwbcH3hToOuoA2G7oQ== - -cssnano@^5.0.2: - version "5.1.15" - resolved "https://registry.npmjs.org/cssnano/-/cssnano-5.1.15.tgz#ded66b5480d5127fcb44dac12ea5a983755136bf" - integrity sha512-j+BKgDcLDQA+eDifLx0EO4XSA56b7uut3BQFH+wbSaSTuGLuiyTa/wbRYthUXX8LC9mLg+WWKe8h+qJuwTAbHw== +cssnano@^7.0.1: + version "7.0.6" + resolved "https://registry.npmjs.org/cssnano/-/cssnano-7.0.6.tgz#63d54fd42bc017f6aaed69e47d9aaef85b7850ec" + integrity sha512-54woqx8SCbp8HwvNZYn68ZFAepuouZW4lTwiMVnBErM3VkO7/Sd4oTOt3Zz3bPx3kxQ36aISppyXj2Md4lg8bw== dependencies: - cssnano-preset-default "^5.2.14" - lilconfig "^2.0.3" - yaml "^1.10.2" - -cssnano@^6.0.1: - version "6.1.2" - resolved "https://registry.npmjs.org/cssnano/-/cssnano-6.1.2.tgz#4bd19e505bd37ee7cf0dc902d3d869f6d79c66b8" - integrity sha512-rYk5UeX7VAM/u0lNqewCdasdtPK81CgX8wJFLEIXHbV2oldWRgJAsZrdhRXkV1NJzA2g850KiFm9mMU2HxNxMA== - dependencies: - cssnano-preset-default "^6.1.2" - lilconfig "^3.1.1" - -csso@^4.2.0: - version "4.2.0" - resolved "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529" - integrity sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA== - dependencies: - css-tree "^1.1.2" + cssnano-preset-default "^7.0.6" + lilconfig "^3.1.2" csso@^5.0.5: version "5.0.5" @@ -4413,49 +4374,56 @@ data-urls@^3.0.2: whatwg-mimetype "^3.0.0" whatwg-url "^11.0.0" -data-view-buffer@^1.0.1: +data-view-buffer@^1.0.2: + version "1.0.2" + resolved "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz#211a03ba95ecaf7798a8c7198d79536211f88570" + integrity sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ== + dependencies: + call-bound "^1.0.3" + es-errors "^1.3.0" + is-data-view "^1.0.2" + +data-view-byte-length@^1.0.2: + version "1.0.2" + resolved "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz#9e80f7ca52453ce3e93d25a35318767ea7704735" + integrity sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ== + dependencies: + call-bound "^1.0.3" + es-errors "^1.3.0" + is-data-view "^1.0.2" + +data-view-byte-offset@^1.0.1: version "1.0.1" - resolved "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz#8ea6326efec17a2e42620696e671d7d5a8bc66b2" - integrity sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA== + resolved "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz#068307f9b71ab76dbbe10291389e020856606191" + integrity sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ== dependencies: - call-bind "^1.0.6" + call-bound "^1.0.2" es-errors "^1.3.0" is-data-view "^1.0.1" -data-view-byte-length@^1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz#90721ca95ff280677eb793749fce1011347669e2" - integrity sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ== - dependencies: - call-bind "^1.0.7" - es-errors "^1.3.0" - is-data-view "^1.0.1" - -data-view-byte-offset@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz#5e0bbfb4828ed2d1b9b400cd8a7d119bca0ff18a" - integrity sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA== - dependencies: - call-bind "^1.0.6" - es-errors "^1.3.0" - is-data-view "^1.0.1" - -date-fns@^3.6.0: - version "3.6.0" - resolved "https://registry.npmjs.org/date-fns/-/date-fns-3.6.0.tgz#f20ca4fe94f8b754951b24240676e8618c0206bf" - integrity sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww== +date-fns@^4.1.0: + version "4.1.0" + resolved "https://registry.npmjs.org/date-fns/-/date-fns-4.1.0.tgz#64b3d83fff5aa80438f5b1a633c2e83b8a1c2d14" + integrity sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg== debounce@^1.2.1: version "1.2.1" resolved "https://registry.npmjs.org/debounce/-/debounce-1.2.1.tgz#38881d8f4166a5c5848020c11827b834bcb3e0a5" integrity sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug== -"debug@4", "debug@^4.1.0", "debug@^4.1.1", "debug@^4.3.1", "debug@^4.3.2", "debug@^4.3.3", "debug@^4.3.4", "debug@~4.3.1", "debug@~4.3.2": - version "4.3.6" - resolved "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz#2ab2c38fbaffebf8aa95fdfe6d88438c7a13c52b" - integrity sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg== +"debug@4", "debug@^4.1.0", "debug@^4.1.1", "debug@^4.3.1", "debug@^4.3.2", "debug@^4.3.3", "debug@^4.3.4": + version "4.4.0" + resolved "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz#2b3f2aea2ffeb776477460267377dc8710faba8a" + integrity sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA== dependencies: - ms "2.1.2" + ms "^2.1.3" + +"debug@~4.3.1", "debug@~4.3.2": + version "4.3.7" + resolved "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52" + integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ== + dependencies: + ms "^2.1.3" decamelize-keys@^1.1.0: version "1.1.1" @@ -4476,9 +4444,9 @@ decamelize@^5.0.0: integrity sha512-VfxadyCECXgQlkoEAjeghAr5gY3Hf+IKjKb+X8tGVDtveCjN+USwprd2q3QXBR9T1+x2DG0XZF5/w+7HAtSaXA== decimal.js@^10.4.2: - version "10.4.3" - resolved "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23" - integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA== + version "10.5.0" + resolved "https://registry.npmjs.org/decimal.js/-/decimal.js-10.5.0.tgz#0f371c7cf6c4898ce0afb09836db73cd82010f22" + integrity sha512-8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw== decode-uri-component@^0.2.0: version "0.2.2" @@ -4574,7 +4542,7 @@ deep-is@^0.1.3: es-errors "^1.3.0" gopd "^1.0.1" -"define-properties@^1.1.3", "define-properties@^1.2.0", "define-properties@^1.2.1": +"define-properties@^1.1.3", "define-properties@^1.2.1": version "1.2.1" resolved "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c" integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg== @@ -4648,7 +4616,7 @@ diff-sequences@^29.6.3: resolved "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz#4deaf894d11407c51efc8418012f9e70b84ea921" integrity sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q== -diffie-hellman@^5.0.0: +diffie-hellman@^5.0.3: version "5.0.3" resolved "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875" integrity sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg== @@ -4717,15 +4685,6 @@ dom-helpers@^5.0.1: "@babel/runtime" "^7.8.7" csstype "^3.0.2" -dom-serializer@^1.0.1: - version "1.4.1" - resolved "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz#de5d41b1aea290215dc45a6dae8adcf1d32e2d30" - integrity sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag== - dependencies: - domelementtype "^2.0.1" - domhandler "^4.2.0" - entities "^2.0.0" - dom-serializer@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz#e41b802e1eedf9f6cae183ce5e622d789d7d8e53" @@ -4740,7 +4699,7 @@ domain-browser@^1.2.0: resolved "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda" integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA== -"domelementtype@^2.0.1", "domelementtype@^2.2.0", "domelementtype@^2.3.0": +domelementtype@^2.3.0: version "2.3.0" resolved "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d" integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw== @@ -4759,26 +4718,10 @@ domexception@^4.0.0: dependencies: domelementtype "^2.3.0" -"domhandler@^4.2.0", "domhandler@^4.3.1": - version "4.3.1" - resolved "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz#8d792033416f59d68bc03a5aa7b018c1ca89279c" - integrity sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ== - dependencies: - domelementtype "^2.2.0" - -domutils@^2.8.0: - version "2.8.0" - resolved "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135" - integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A== - dependencies: - dom-serializer "^1.0.1" - domelementtype "^2.2.0" - domhandler "^4.2.0" - -"domutils@^3.0.1", "domutils@^3.1.0": - version "3.1.0" - resolved "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz#c47f551278d3dc4b0b1ab8cbb42d751a6f0d824e" - integrity sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA== +"domutils@^3.0.1", "domutils@^3.2.1": + version "3.2.2" + resolved "https://registry.npmjs.org/domutils/-/domutils-3.2.2.tgz#edbfe2b668b0c1d97c24baf0f1062b132221bc78" + integrity sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw== dependencies: dom-serializer "^2.0.0" domelementtype "^2.3.0" @@ -4792,6 +4735,13 @@ dot-case@^3.0.4: no-case "^3.0.4" tslib "^2.0.3" +dot-prop@^8.0.2: + version "8.0.2" + resolved "https://registry.npmjs.org/dot-prop/-/dot-prop-8.0.2.tgz#afda6866610684dd155a96538f8efcdf78a27f18" + integrity sha512-xaBe6ZT4DHPkg0k4Ytbvn5xoxgpG0jOS1dYxSOwAHPuNLjP3/OzN0gH55SrLqpx8cBfSaVt91lXYkApjb+nYdQ== + dependencies: + type-fest "^3.8.0" + download@^6.2.2: version "6.2.5" resolved "https://registry.npmjs.org/download/-/download-6.2.5.tgz#acd6a542e4cd0bb42ca70cfc98c9e43b07039714" @@ -4827,6 +4777,15 @@ download@^7.1.0: p-event "^2.1.0" pify "^3.0.0" +"dunder-proto@^1.0.0", "dunder-proto@^1.0.1": + version "1.0.1" + resolved "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz#d7ae667e1dc83482f8b70fd0f6eefc50da30f58a" + integrity sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A== + dependencies: + call-bind-apply-helpers "^1.0.1" + es-errors "^1.3.0" + gopd "^1.2.0" + "duplexer2@^0.1.2", "duplexer2@~0.1.0", "duplexer2@~0.1.2": version "0.1.4" resolved "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1" @@ -4849,22 +4808,22 @@ eastasianwidth@^0.2.0: resolved "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb" integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA== -ejs@~3.1.8: +ejs@^3.1.9: version "3.1.10" resolved "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz#69ab8358b14e896f80cc39e62087b88500c3ac3b" integrity sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA== dependencies: jake "^10.8.5" -electron-to-chromium@^1.5.4: - version "1.5.13" - resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.13.tgz#1abf0410c5344b2b829b7247e031f02810d442e6" - integrity sha512-lbBcvtIJ4J6sS4tb5TLp1b4LyfCdMkwStzXPyAgVgTRAsep4bvrAGaBOP7ZJtQMNJpSQ9SqG4brWOroNaQtm7Q== +electron-to-chromium@^1.5.73: + version "1.5.88" + resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.88.tgz#cdb6e2dda85e6521e8d7d3035ba391c8848e073a" + integrity sha512-K3C2qf1o+bGzbilTDCTBhTQcMS9KW60yTAaTeeXsfvQuTDDwlokLam/AdqlqcSy9u4UainDgsHV23ksXAOgamw== "elliptic@^6.5.3", "elliptic@^6.5.5": - version "6.5.7" - resolved "https://registry.npmjs.org/elliptic/-/elliptic-6.5.7.tgz#8ec4da2cb2939926a1b9a73619d768207e647c8b" - integrity sha512-ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q== + version "6.6.1" + resolved "https://registry.npmjs.org/elliptic/-/elliptic-6.6.1.tgz#3b8ffb02670bf69e382c7f65bf524c97c5405c06" + integrity sha512-RaddvvMatK2LJHqFJ+YA4WysVN5Ita9E35botqIYspQ4TkRAlCicdzKOjlyv/1Za5RyTNn7di//eEV0uTAfe3g== dependencies: bn.js "^4.11.9" brorand "^1.1.0" @@ -4908,16 +4867,16 @@ encoding@^0.1.13: dependencies: once "^1.4.0" -engine.io-client@~6.5.2: - version "6.5.4" - resolved "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.5.4.tgz#b8bc71ed3f25d0d51d587729262486b4b33bd0d0" - integrity sha512-GeZeeRjpD2qf49cZQ0Wvh/8NJNfeXkXXcoGh+F77oEAgo9gUHwT1fCRxSNU+YEEaysOJTnsFHmM5oAcPy4ntvQ== +engine.io-client@~6.6.1: + version "6.6.3" + resolved "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.6.3.tgz#815393fa24f30b8e6afa8f77ccca2f28146be6de" + integrity sha512-T0iLjnyNWahNyv/lcjS2y4oE358tVS/SYQNxYXGAJ9/GLgH4VCvOQ/mhTjqU88mLZCQgiG8RIegFHYCdVC+j5w== dependencies: "@socket.io/component-emitter" "~3.1.0" debug "~4.3.1" engine.io-parser "~5.2.1" ws "~8.17.1" - xmlhttprequest-ssl "~2.0.0" + xmlhttprequest-ssl "~2.1.1" engine.io-parser@~5.2.1: version "5.2.3" @@ -4925,32 +4884,37 @@ engine.io-parser@~5.2.1: integrity sha512-HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q== enhanced-resolve@^5.17.1: - version "5.17.1" - resolved "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz#67bfbbcc2f81d511be77d686a90267ef7f898a15" - integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg== + version "5.18.0" + resolved "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.0.tgz#91eb1db193896b9801251eeff1c6980278b1e404" + integrity sha512-0/r0MySGYG8YqlayBZ6MuCfECmHFdJ5qyPh8s8wa5Hnm6SaFLSK1VYCbj+NKp090Nm1caZhD+QTnmxO7esYGyQ== dependencies: graceful-fs "^4.2.4" tapable "^2.2.0" -entities@^2.0.0: - version "2.2.0" - resolved "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" - integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== - "entities@^4.2.0", "entities@^4.4.0", "entities@^4.5.0": version "4.5.0" resolved "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48" integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw== +entities@^6.0.0: + version "6.0.0" + resolved "https://registry.npmjs.org/entities/-/entities-6.0.0.tgz#09c9e29cb79b0a6459a9b9db9efb418ac5bb8e51" + integrity sha512-aKstq2TDOndCn4diEyp9Uq/Flu2i1GlLkc6XIDQSDMuaFE3OPW5OphLCyQ5SpSJZTb4reN+kTcYru5yIfXoRPw== + "env-paths@^2.2.0", "env-paths@^2.2.1": version "2.2.1" resolved "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== -envinfo@^7.7.3: - version "7.13.0" - resolved "https://registry.npmjs.org/envinfo/-/envinfo-7.13.0.tgz#81fbb81e5da35d74e814941aeab7c325a606fb31" - integrity sha512-cvcaMr7KqXVh4nyzGTVqTum+gAiL265x5jUWQIDLq//zOGbW+gSW/C+OWLleY/rs9Qole6AZLMXPbtIFQbqu+Q== +envinfo@^7.14.0: + version "7.14.0" + resolved "https://registry.npmjs.org/envinfo/-/envinfo-7.14.0.tgz#26dac5db54418f2a4c1159153a0b2ae980838aae" + integrity sha512-CO40UI41xDQzhLB1hWyqUKgFhs250pNcGbyGKe1l/e4FSaI/+YE4IMG76GDt0In67WLPACIITC+sOi08x4wIvg== + +environment@^1.0.0: + version "1.1.0" + resolved "https://registry.npmjs.org/environment/-/environment-1.1.0.tgz#8e86c66b180f363c7ab311787e0259665f45a9f1" + integrity sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q== err-code@^2.0.2: version "2.0.3" @@ -4964,133 +4928,139 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -"es-abstract@^1.17.5", "es-abstract@^1.22.1", "es-abstract@^1.22.3", "es-abstract@^1.23.0", "es-abstract@^1.23.1", "es-abstract@^1.23.2", "es-abstract@^1.23.3": - version "1.23.3" - resolved "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz#8f0c5a35cd215312573c5a27c87dfd6c881a0aa0" - integrity sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A== +"es-abstract@^1.17.5", "es-abstract@^1.23.2", "es-abstract@^1.23.3", "es-abstract@^1.23.5", "es-abstract@^1.23.6", "es-abstract@^1.23.9": + version "1.23.9" + resolved "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.9.tgz#5b45994b7de78dada5c1bebf1379646b32b9d606" + integrity sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA== dependencies: - array-buffer-byte-length "^1.0.1" - arraybuffer.prototype.slice "^1.0.3" + array-buffer-byte-length "^1.0.2" + arraybuffer.prototype.slice "^1.0.4" available-typed-arrays "^1.0.7" - call-bind "^1.0.7" - data-view-buffer "^1.0.1" - data-view-byte-length "^1.0.1" - data-view-byte-offset "^1.0.0" - es-define-property "^1.0.0" + call-bind "^1.0.8" + call-bound "^1.0.3" + data-view-buffer "^1.0.2" + data-view-byte-length "^1.0.2" + data-view-byte-offset "^1.0.1" + es-define-property "^1.0.1" es-errors "^1.3.0" es-object-atoms "^1.0.0" - es-set-tostringtag "^2.0.3" - es-to-primitive "^1.2.1" - function.prototype.name "^1.1.6" - get-intrinsic "^1.2.4" - get-symbol-description "^1.0.2" - globalthis "^1.0.3" - gopd "^1.0.1" + es-set-tostringtag "^2.1.0" + es-to-primitive "^1.3.0" + function.prototype.name "^1.1.8" + get-intrinsic "^1.2.7" + get-proto "^1.0.0" + get-symbol-description "^1.1.0" + globalthis "^1.0.4" + gopd "^1.2.0" has-property-descriptors "^1.0.2" - has-proto "^1.0.3" - has-symbols "^1.0.3" + has-proto "^1.2.0" + has-symbols "^1.1.0" hasown "^2.0.2" - internal-slot "^1.0.7" - is-array-buffer "^3.0.4" + internal-slot "^1.1.0" + is-array-buffer "^3.0.5" is-callable "^1.2.7" - is-data-view "^1.0.1" - is-negative-zero "^2.0.3" - is-regex "^1.1.4" - is-shared-array-buffer "^1.0.3" - is-string "^1.0.7" - is-typed-array "^1.1.13" - is-weakref "^1.0.2" - object-inspect "^1.13.1" + is-data-view "^1.0.2" + is-regex "^1.2.1" + is-shared-array-buffer "^1.0.4" + is-string "^1.1.1" + is-typed-array "^1.1.15" + is-weakref "^1.1.0" + math-intrinsics "^1.1.0" + object-inspect "^1.13.3" object-keys "^1.1.1" - object.assign "^4.1.5" - regexp.prototype.flags "^1.5.2" - safe-array-concat "^1.1.2" - safe-regex-test "^1.0.3" - string.prototype.trim "^1.2.9" - string.prototype.trimend "^1.0.8" + object.assign "^4.1.7" + own-keys "^1.0.1" + regexp.prototype.flags "^1.5.3" + safe-array-concat "^1.1.3" + safe-push-apply "^1.0.0" + safe-regex-test "^1.1.0" + set-proto "^1.0.0" + string.prototype.trim "^1.2.10" + string.prototype.trimend "^1.0.9" string.prototype.trimstart "^1.0.8" - typed-array-buffer "^1.0.2" - typed-array-byte-length "^1.0.1" - typed-array-byte-offset "^1.0.2" - typed-array-length "^1.0.6" - unbox-primitive "^1.0.2" - which-typed-array "^1.1.15" + typed-array-buffer "^1.0.3" + typed-array-byte-length "^1.0.3" + typed-array-byte-offset "^1.0.4" + typed-array-length "^1.0.7" + unbox-primitive "^1.1.0" + which-typed-array "^1.1.18" -es-define-property@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845" - integrity sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ== - dependencies: - get-intrinsic "^1.2.4" +"es-define-property@^1.0.0", "es-define-property@^1.0.1": + version "1.0.1" + resolved "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz#983eb2f9a6724e9303f61addf011c72e09e0b0fa" + integrity sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g== -"es-errors@^1.2.1", "es-errors@^1.3.0": +es-errors@^1.3.0: version "1.3.0" resolved "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f" integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw== -es-iterator-helpers@^1.0.19: - version "1.0.19" - resolved "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.19.tgz#117003d0e5fec237b4b5c08aded722e0c6d50ca8" - integrity sha512-zoMwbCcH5hwUkKJkT8kDIBZSz9I6mVG//+lDCinLCGov4+r7NIy0ld8o03M0cJxl2spVf6ESYVS6/gpIfq1FFw== +es-iterator-helpers@^1.2.1: + version "1.2.1" + resolved "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.2.1.tgz#d1dd0f58129054c0ad922e6a9a1e65eef435fe75" + integrity sha512-uDn+FE1yrDzyC0pCo961B2IHbdM8y/ACZsKD4dG6WqrjV53BADjwa7D+1aom2rsNVfLyDgU/eigvlJGJ08OQ4w== dependencies: - call-bind "^1.0.7" + call-bind "^1.0.8" + call-bound "^1.0.3" define-properties "^1.2.1" - es-abstract "^1.23.3" + es-abstract "^1.23.6" es-errors "^1.3.0" es-set-tostringtag "^2.0.3" function-bind "^1.1.2" - get-intrinsic "^1.2.4" - globalthis "^1.0.3" + get-intrinsic "^1.2.6" + globalthis "^1.0.4" + gopd "^1.2.0" has-property-descriptors "^1.0.2" - has-proto "^1.0.3" - has-symbols "^1.0.3" - internal-slot "^1.0.7" - iterator.prototype "^1.1.2" - safe-array-concat "^1.1.2" + has-proto "^1.2.0" + has-symbols "^1.1.0" + internal-slot "^1.1.0" + iterator.prototype "^1.1.4" + safe-array-concat "^1.1.3" es-module-lexer@^1.2.1: - version "1.5.4" - resolved "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.4.tgz#a8efec3a3da991e60efa6b633a7cad6ab8d26b78" - integrity sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw== + version "1.6.0" + resolved "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.6.0.tgz#da49f587fd9e68ee2404fe4e256c0c7d3a81be21" + integrity sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ== es-object-atoms@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz#ddb55cd47ac2e240701260bc2a8e31ecb643d941" - integrity sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw== + version "1.1.1" + resolved "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz#1c4f2c4837327597ce69d2ca190a7fdd172338c1" + integrity sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA== dependencies: es-errors "^1.3.0" -es-set-tostringtag@^2.0.3: - version "2.0.3" - resolved "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz#8bb60f0a440c2e4281962428438d58545af39777" - integrity sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ== +"es-set-tostringtag@^2.0.3", "es-set-tostringtag@^2.1.0": + version "2.1.0" + resolved "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz#f31dbbe0c183b00a6d26eb6325c810c0fd18bd4d" + integrity sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA== dependencies: - get-intrinsic "^1.2.4" + es-errors "^1.3.0" + get-intrinsic "^1.2.6" has-tostringtag "^1.0.2" - hasown "^2.0.1" + hasown "^2.0.2" -"es-shim-unscopables@^1.0.0", "es-shim-unscopables@^1.0.2": +es-shim-unscopables@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz#1f6942e71ecc7835ed1c8a83006d8771a63a3763" integrity sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw== dependencies: hasown "^2.0.0" -es-to-primitive@^1.2.1: - version "1.2.1" - resolved "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" - integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA== +es-to-primitive@^1.3.0: + version "1.3.0" + resolved "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz#96c89c82cc49fd8794a24835ba3e1ff87f214e18" + integrity sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g== dependencies: - is-callable "^1.1.4" - is-date-object "^1.0.1" - is-symbol "^1.0.2" + is-callable "^1.2.7" + is-date-object "^1.0.5" + is-symbol "^1.0.4" -"escalade@^3.1.1", "escalade@^3.1.2": - version "3.1.2" - resolved "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz#54076e9ab29ea5bf3d8f1ed62acffbb88272df27" - integrity sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA== +"escalade@^3.1.1", "escalade@^3.2.0": + version "3.2.0" + resolved "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5" + integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA== -"escape-string-regexp@^1.0.2", "escape-string-regexp@^1.0.5": +escape-string-regexp@^1.0.2: version "1.0.5" resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== @@ -5115,42 +5085,42 @@ escodegen@^2.0.0: esutils "^2.0.2" source-map "~0.6.1" -eslint-plugin-jest@^28.8.0: - version "28.8.0" - resolved "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-28.8.0.tgz#54f597b5a3295ad04ec946baa245ad02b9b2bca0" - integrity sha512-Tubj1hooFxCl52G4qQu0edzV/+EZzPUeN8p2NnW5uu4fbDs+Yo7+qDVDc4/oG3FbCqEBmu/OC3LSsyiU22oghw== +eslint-plugin-jest@^28.10.0: + version "28.11.0" + resolved "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-28.11.0.tgz#2641ecb4411941bbddb3d7cf8a8ff1163fbb510e" + integrity sha512-QAfipLcNCWLVocVbZW8GimKn5p5iiMcgGbRzz8z/P5q7xw+cNEpYqyzFMtIF/ZgF2HLOyy+dYBut+DoYolvqig== dependencies: "@typescript-eslint/utils" "^6.0.0 || ^7.0.0 || ^8.0.0" -eslint-plugin-react-hooks@^4.3.0: - version "4.6.2" - resolved "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.2.tgz#c829eb06c0e6f484b3fbb85a97e57784f328c596" - integrity sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ== - -eslint-plugin-react@^7.34.3: - version "7.35.0" - resolved "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.35.0.tgz#00b1e4559896710e58af6358898f2ff917ea4c41" - integrity sha512-v501SSMOWv8gerHkk+IIQBkcGRGrO2nfybfj5pLxuJNFTPxxA3PSryhXTK+9pNbtkggheDdsC0E9Q8CuPk6JKA== +eslint-plugin-react@^7.37.3: + version "7.37.4" + resolved "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.4.tgz#1b6c80b6175b6ae4b26055ae4d55d04c414c7181" + integrity sha512-BGP0jRmfYyvOyvMoRX/uoUeW+GqNj9y16bPQzqAHf3AYII/tDs+jMN0dBVkl88/OZwNGwrVFxE7riHsXVfy/LQ== dependencies: array-includes "^3.1.8" array.prototype.findlast "^1.2.5" - array.prototype.flatmap "^1.3.2" + array.prototype.flatmap "^1.3.3" array.prototype.tosorted "^1.1.4" doctrine "^2.1.0" - es-iterator-helpers "^1.0.19" + es-iterator-helpers "^1.2.1" estraverse "^5.3.0" hasown "^2.0.2" jsx-ast-utils "^2.4.1 || ^3.0.0" minimatch "^3.1.2" object.entries "^1.1.8" object.fromentries "^2.0.8" - object.values "^1.2.0" + object.values "^1.2.1" prop-types "^15.8.1" resolve "^2.0.0-next.5" semver "^6.3.1" - string.prototype.matchall "^4.0.11" + string.prototype.matchall "^4.0.12" string.prototype.repeat "^1.0.0" +eslint-plugin-unused-imports@^4.1.4: + version "4.1.4" + resolved "https://registry.npmjs.org/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-4.1.4.tgz#62ddc7446ccbf9aa7b6f1f0b00a980423cda2738" + integrity sha512-YptD6IzQjDardkl0POxnnRBhU1OEePMV0nd6siHaRBbd+lyh6NAhFEobiznKU7kTsSsDeSD62Pe7kAM1b7dAZQ== + eslint-rule-composer@^0.3.0: version "0.3.0" resolved "https://registry.npmjs.org/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz#79320c927b0c5c0d3d3d2b76c8b4a488f25bbaf9" @@ -5164,10 +5134,10 @@ eslint-scope@5.1.1: esrecurse "^4.3.0" estraverse "^4.1.1" -eslint-scope@^8.0.2: - version "8.0.2" - resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.0.2.tgz#5cbb33d4384c9136083a71190d548158fe128f94" - integrity sha512-6E4xmrTw5wtxnLA5wYL3WDfhZ/1bUBGOXV0zQvVRDOtrR8D0p6W7fs3JweNYhwRYeGvd/1CKX2se0/2s7Q/nJA== +eslint-scope@^8.2.0: + version "8.2.0" + resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.2.0.tgz#377aa6f1cb5dc7592cfd0b7f892fd0cf352ce442" + integrity sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A== dependencies: esrecurse "^4.3.0" estraverse "^5.2.0" @@ -5177,37 +5147,41 @@ eslint-visitor-keys@^2.1.0: resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== -"eslint-visitor-keys@^3.3.0", "eslint-visitor-keys@^3.4.3": +eslint-visitor-keys@^3.4.3: version "3.4.3" resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800" integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag== -eslint-visitor-keys@^4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz#e3adc021aa038a2a8e0b2f8b0ce8f66b9483b1fb" - integrity sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw== +eslint-visitor-keys@^4.2.0: + version "4.2.0" + resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz#687bacb2af884fcdda8a6e7d65c606f46a14cd45" + integrity sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw== -eslint@^9.9.0: - version "9.9.1" - resolved "https://registry.npmjs.org/eslint/-/eslint-9.9.1.tgz#147ac9305d56696fb84cf5bdecafd6517ddc77ec" - integrity sha512-dHvhrbfr4xFQ9/dq+jcVneZMyRYLjggWjk6RVsIiHsP8Rz6yZ8LvZ//iU4TrZF+SXWG+JkNF2OyiZRvzgRDqMg== +eslint@^9.19.0: + version "9.19.0" + resolved "https://registry.npmjs.org/eslint/-/eslint-9.19.0.tgz#ffa1d265fc4205e0f8464330d35f09e1d548b1bf" + integrity sha512-ug92j0LepKlbbEv6hD911THhoRHmbdXt2gX+VDABAW/Ir7D3nqKdv5Pf5vtlyY6HQMTEP2skXY43ueqTCWssEA== dependencies: "@eslint-community/eslint-utils" "^4.2.0" - "@eslint-community/regexpp" "^4.11.0" - "@eslint/config-array" "^0.18.0" - "@eslint/eslintrc" "^3.1.0" - "@eslint/js" "9.9.1" + "@eslint-community/regexpp" "^4.12.1" + "@eslint/config-array" "^0.19.0" + "@eslint/core" "^0.10.0" + "@eslint/eslintrc" "^3.2.0" + "@eslint/js" "9.19.0" + "@eslint/plugin-kit" "^0.2.5" + "@humanfs/node" "^0.16.6" "@humanwhocodes/module-importer" "^1.0.1" - "@humanwhocodes/retry" "^0.3.0" - "@nodelib/fs.walk" "^1.2.8" + "@humanwhocodes/retry" "^0.4.1" + "@types/estree" "^1.0.6" + "@types/json-schema" "^7.0.15" ajv "^6.12.4" chalk "^4.0.0" - cross-spawn "^7.0.2" + cross-spawn "^7.0.6" debug "^4.3.2" escape-string-regexp "^4.0.0" - eslint-scope "^8.0.2" - eslint-visitor-keys "^4.0.0" - espree "^10.1.0" + eslint-scope "^8.2.0" + eslint-visitor-keys "^4.2.0" + espree "^10.3.0" esquery "^1.5.0" esutils "^2.0.2" fast-deep-equal "^3.1.3" @@ -5217,24 +5191,20 @@ eslint@^9.9.0: ignore "^5.2.0" imurmurhash "^0.1.4" is-glob "^4.0.0" - is-path-inside "^3.0.3" json-stable-stringify-without-jsonify "^1.0.1" - levn "^0.4.1" lodash.merge "^4.6.2" minimatch "^3.1.2" natural-compare "^1.4.0" optionator "^0.9.3" - strip-ansi "^6.0.1" - text-table "^0.2.0" -"espree@^10.0.1", "espree@^10.1.0": - version "10.1.0" - resolved "https://registry.npmjs.org/espree/-/espree-10.1.0.tgz#8788dae611574c0f070691f522e4116c5a11fc56" - integrity sha512-M1M6CpiE6ffoigIOWYO9UDP8TMUw9kqb21tf+08IgDYjCsOvCuDt4jQcZmoYxx+w7zlKw9/N0KXfto+I8/FrXA== +"espree@^10.0.1", "espree@^10.3.0": + version "10.3.0" + resolved "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz#29267cf5b0cb98735b65e64ba07e0ed49d1eed8a" + integrity sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg== dependencies: - acorn "^8.12.0" + acorn "^8.14.0" acorn-jsx "^5.3.2" - eslint-visitor-keys "^4.0.0" + eslint-visitor-keys "^4.2.0" "esprima@^4.0.0", "esprima@^4.0.1": version "4.0.1" @@ -5384,10 +5354,10 @@ exponential-backoff@^3.1.1: resolved "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz#64ac7526fe341ab18a39016cd22c787d01e00bf6" integrity sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw== -exports-loader@^4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/exports-loader/-/exports-loader-4.0.0.tgz#af34fe80a18f12fb0f42f435edd7df0fe9db49bb" - integrity sha512-4iqFFIAnlVAbkAUMHhWceyxK6N6dMDWpQFbSHLmiayGEPMXl2bgWD4D11GYi1VNuEQwJaHGdATcPYTnXpwzSmw== +exports-loader@^5.0.0: + version "5.0.0" + resolved "https://registry.npmjs.org/exports-loader/-/exports-loader-5.0.0.tgz#0e5c50baf8526237c0a2743116a3e3fa788d194f" + integrity sha512-W15EyyytBwd30yCCieTCqZSCUvU/o3etj2IUItSMjVQEzAf5xOQx8JL9iMo7ERnuAzIA6eapGSFWl7E9F+Wy9g== dependencies: source-map "^0.6.1" @@ -5411,16 +5381,21 @@ ext-name@^5.0.0: resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== +fast-equals@^5.0.1: + version "5.2.2" + resolved "https://registry.npmjs.org/fast-equals/-/fast-equals-5.2.2.tgz#885d7bfb079fac0ce0e8450374bce29e9b742484" + integrity sha512-V7/RktU11J3I36Nwq2JnZEM7tNm17eBJz+u25qdxBZeCKiX6BkVSZQjwWIr+IobgnZy+ag73tTZgZi7tr0LrBw== + "fast-glob@^3.2.7", "fast-glob@^3.3.2": - version "3.3.2" - resolved "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129" - integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow== + version "3.3.3" + resolved "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz#d06d585ce8dba90a16b0505c543c3ccfb3aeb818" + integrity sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg== 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" + micromatch "^4.0.8" "fast-json-stable-stringify@^2.0.0", "fast-json-stable-stringify@^2.1.0": version "2.1.0" @@ -5438,9 +5413,9 @@ fast-safe-stringify@^2.0.7: integrity sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA== fast-uri@^3.0.1: - version "3.0.1" - resolved "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.1.tgz#cddd2eecfc83a71c1be2cc2ef2061331be8a7134" - integrity sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw== + version "3.0.6" + resolved "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz#88f130b77cfaea2378d56bf970dea21257a68748" + integrity sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw== fastest-levenshtein@^1.0.12: version "1.0.16" @@ -5448,9 +5423,9 @@ fastest-levenshtein@^1.0.12: integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg== fastq@^1.6.0: - version "1.17.1" - resolved "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz#2a523f07a4e7b1e81a42b91b8bf2254107753b47" - integrity sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w== + version "1.18.0" + resolved "https://registry.npmjs.org/fastq/-/fastq-1.18.0.tgz#d631d7e25faffea81887fe5ea8c9010e1b36fee0" + integrity sha512-QKHXPW0hD8g4UET03SdOdunzSouc9N4AuHdsX8XNcTsuz+yYFILVNIX4l9yHABMhiEI9Db0JTTIpu0wB+Y1QQw== dependencies: reusify "^1.0.4" @@ -5475,26 +5450,27 @@ file-entry-cache@^8.0.0: dependencies: flat-cache "^4.0.0" -file-selector@^0.6.0: - version "0.6.0" - resolved "https://registry.npmjs.org/file-selector/-/file-selector-0.6.0.tgz#fa0a8d9007b829504db4d07dd4de0310b65287dc" - integrity sha512-QlZ5yJC0VxHxQQsQhXvBaC7VRJ2uaxTf+Tfpu4Z/OcVQJVpZO+DGU0rkoVW5ce2SccxugvpBJoMvUs59iILYdw== +file-selector@^2.1.0: + version "2.1.2" + resolved "https://registry.npmjs.org/file-selector/-/file-selector-2.1.2.tgz#fe7c7ee9e550952dfbc863d73b14dc740d7de8b4" + integrity sha512-QgXo+mXTe8ljeqUFaX3QVHc5osSItJ/Km+xpocx0aSqWGMSCf6qYs/VnzZgS864Pjn5iceMRFigeAV7AfTlaig== dependencies: - tslib "^2.4.0" + tslib "^2.7.0" "file-type@5.2.0", "file-type@^5.2.0": version "5.2.0" resolved "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz#2ddbea7c73ffe36368dfae49dc338c058c2b8ad6" integrity sha512-Iq1nJ6D2+yIO4c8HHg4fyVb8mAJieo1Oloy1mLLaB2PvezNedhBVm+QU7g0qM42aiMbRXTxKKwGD17rjKNJYVQ== -file-type@^16.5.3: - version "16.5.4" - resolved "https://registry.npmjs.org/file-type/-/file-type-16.5.4.tgz#474fb4f704bee427681f98dd390058a172a6c2fd" - integrity sha512-/yFHK0aGjFEgDJjEKP0pWCplsPFPhwyfwevf/pVxiN0tmE4L9LmwWxWukdJSHdoCli4VgQLehjJtwQBnqmsKcw== +file-type@^19.0.0: + version "19.6.0" + resolved "https://registry.npmjs.org/file-type/-/file-type-19.6.0.tgz#b43d8870453363891884cf5e79bb3e4464f2efd3" + integrity sha512-VZR5I7k5wkD0HgFnMsq5hOsSc710MJMu5Nc5QYsbe38NN5iPV/XTObYLc/cpttRTf6lX538+5uO1ZQRhYibiZQ== dependencies: - readable-web-to-node-stream "^3.0.0" - strtok3 "^6.2.4" - token-types "^4.1.1" + get-stream "^9.0.1" + strtok3 "^9.0.1" + token-types "^6.0.0" + uint8array-extras "^1.3.0" file-type@^3.8.0: version "3.9.0" @@ -5533,6 +5509,11 @@ filename-reserved-regex@^2.0.0: resolved "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz#abf73dfab735d045440abfea2d91f389ebbfa229" integrity sha512-lc1bnsSr4L4Bdif8Xb/qrtokGbq5zlsms/CYH8PP+WtCkGNF65DPiQY8vG3SakEdRn8Dlnm+gW/qWKKjS5sZzQ== +filename-reserved-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-3.0.0.tgz#3d5dd6d4e2d73a3fed2ebc4cd0b3448869a081f7" + integrity sha512-hn4cQfU6GOT/7cFHXBqeBg2TbrMBgdD0kcjLhvSQYYwm3s4B6cjvBfb7nBALJLAXqmU5xajSa7X2NnUud/VCdw== + filenamify@^2.0.0: version "2.1.0" resolved "https://registry.npmjs.org/filenamify/-/filenamify-2.1.0.tgz#88faf495fb1b47abfd612300002a16228c677ee9" @@ -5607,21 +5588,21 @@ flat@^5.0.2: integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ== flatted@^3.2.9: - version "3.3.1" - resolved "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz#21db470729a6734d4997002f439cb308987f567a" - integrity sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw== + version "3.3.2" + resolved "https://registry.npmjs.org/flatted/-/flatted-3.3.2.tgz#adba1448a9841bec72b42c532ea23dbbedef1a27" + integrity sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA== follow-redirects@^1.15.6: - version "1.15.6" - resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b" - integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA== + version "1.15.9" + resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz#a604fa10e443bf98ca94228d9eebcc2e8a2c8ee1" + integrity sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ== for-each@^0.3.3: - version "0.3.3" - resolved "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e" - integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw== + version "0.3.4" + resolved "https://registry.npmjs.org/for-each/-/for-each-0.3.4.tgz#814517ffc303d1399b2564d8165318e735d0341c" + integrity sha512-kKaIINnFpzW6ffJNDjjyjrk21BkDx38c0xa/klsT8VzLCaMEefv4ZTacrcVR4DmgTeBra++jMDAfS/tS799YDw== dependencies: - is-callable "^1.1.3" + is-callable "^1.2.7" foreground-child@^3.1.0: version "3.3.0" @@ -5632,9 +5613,9 @@ foreground-child@^3.1.0: signal-exit "^4.0.1" form-data@^4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" - integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww== + version "4.0.1" + resolved "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz#ba1076daaaa5bfd7e99c1a6cb02aa0a5cff90d48" + integrity sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw== dependencies: asynckit "^0.4.0" combined-stream "^1.0.8" @@ -5689,15 +5670,22 @@ function-bind@^1.1.2: resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c" integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA== -function.prototype.name@^1.1.6: - version "1.1.6" - resolved "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz#cdf315b7d90ee77a4c6ee216c3c3362da07533fd" - integrity sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg== +function-timeout@^1.0.1: + version "1.0.2" + resolved "https://registry.npmjs.org/function-timeout/-/function-timeout-1.0.2.tgz#e5a7b6ffa523756ff20e1231bbe37b5f373aadd5" + integrity sha512-939eZS4gJ3htTHAldmyyuzlrD58P03fHG49v2JfFXbV6OhvZKRC9j2yAtdHw/zrp2zXHuv05zMIy40F0ge7spA== + +"function.prototype.name@^1.1.6", "function.prototype.name@^1.1.8": + version "1.1.8" + resolved "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.8.tgz#e68e1df7b259a5c949eeef95cdbde53edffabb78" + integrity sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q== dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" + call-bind "^1.0.8" + call-bound "^1.0.3" + define-properties "^1.2.1" functions-have-names "^1.2.3" + hasown "^2.0.2" + is-callable "^1.2.7" functions-have-names@^1.2.3: version "1.2.3" @@ -5738,22 +5726,35 @@ get-caller-file@^2.0.5: resolved "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== -"get-intrinsic@^1.1.3", "get-intrinsic@^1.2.1", "get-intrinsic@^1.2.3", "get-intrinsic@^1.2.4": - version "1.2.4" - resolved "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd" - integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ== +"get-intrinsic@^1.2.4", "get-intrinsic@^1.2.5", "get-intrinsic@^1.2.6", "get-intrinsic@^1.2.7": + version "1.2.7" + resolved "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.7.tgz#dcfcb33d3272e15f445d15124bc0a216189b9044" + integrity sha512-VW6Pxhsrk0KAOqs3WEd0klDiF/+V7gQOpAvY1jVU/LHmaD/kQO4523aiJuikX/QAKYiW6x8Jh+RJej1almdtCA== dependencies: + call-bind-apply-helpers "^1.0.1" + es-define-property "^1.0.1" es-errors "^1.3.0" + es-object-atoms "^1.0.0" function-bind "^1.1.2" - has-proto "^1.0.1" - has-symbols "^1.0.3" - hasown "^2.0.0" + get-proto "^1.0.0" + gopd "^1.2.0" + has-symbols "^1.1.0" + hasown "^2.0.2" + math-intrinsics "^1.1.0" get-package-type@^0.1.0: version "0.1.0" resolved "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q== +"get-proto@^1.0.0", "get-proto@^1.0.1": + version "1.0.1" + resolved "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz#150b3f2743869ef3e851ec0c49d15b1d14d00ee1" + integrity sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g== + dependencies: + dunder-proto "^1.0.1" + es-object-atoms "^1.0.0" + get-proxy@^2.0.0: version "2.1.0" resolved "https://registry.npmjs.org/get-proxy/-/get-proxy-2.1.0.tgz#349f2b4d91d44c4d4d4e9cba2ad90143fac5ef93" @@ -5791,14 +5792,22 @@ get-stream@^4.0.0: resolved "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== -get-symbol-description@^1.0.2: - version "1.0.2" - resolved "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz#533744d5aa20aca4e079c8e5daf7fd44202821f5" - integrity sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg== +get-stream@^9.0.1: + version "9.0.1" + resolved "https://registry.npmjs.org/get-stream/-/get-stream-9.0.1.tgz#95157d21df8eb90d1647102b63039b1df60ebd27" + integrity sha512-kVCxPF3vQM/N0B1PmoqVUqgHP+EeVjmZSQn+1oCRPxd2P21P2F19lIgbR3HBosbB1PUhOAoctJnfEn2GbN2eZA== dependencies: - call-bind "^1.0.5" + "@sec-ant/readable-stream" "^0.4.1" + is-stream "^4.0.1" + +get-symbol-description@^1.1.0: + version "1.1.0" + resolved "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz#7bdd54e0befe8ffc9f3b4e203220d9f1e881b6ee" + integrity sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg== + dependencies: + call-bound "^1.0.3" es-errors "^1.3.0" - get-intrinsic "^1.2.4" + get-intrinsic "^1.2.6" glob-parent@^5.1.2: version "5.1.2" @@ -5819,7 +5828,7 @@ glob-to-regexp@^0.4.1: resolved "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== -"glob@^10.2.2", "glob@^10.3.10": +"glob@^10.2.2", "glob@^10.3.10", "glob@^10.3.7": version "10.4.5" resolved "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz#f4d9f0b90ffdbab09c9d77f5f29b4262517b0956" integrity sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg== @@ -5864,12 +5873,12 @@ globals@^14.0.0: resolved "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz#898d7413c29babcf6bafe56fcadded858ada724e" integrity sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ== -globals@^15.8.0: - version "15.9.0" - resolved "https://registry.npmjs.org/globals/-/globals-15.9.0.tgz#e9de01771091ffbc37db5714dab484f9f69ff399" - integrity sha512-SmSKyLLKFbSr6rptvP8izbyxJL4ILwqO9Jg23UA0sDlGlu58V59D1//I3vlc0KJphVdUR7vMjHIplYnzBxorQA== +globals@^15.13.0: + version "15.14.0" + resolved "https://registry.npmjs.org/globals/-/globals-15.14.0.tgz#b8fd3a8941ff3b4d38f3319d433b61bbb482e73f" + integrity sha512-OkToC372DtlQeje9/zHIo5CT8lRP/FUgEOKBEhU4e0abL7J7CD24fD9ohiLN5hagG/kWCYj4K5oaxxtj2Z0Dig== -globalthis@^1.0.3: +globalthis@^1.0.4: version "1.0.4" resolved "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz#7430ed3a975d97bfb59bcce41f5cabbafa651236" integrity sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ== @@ -5877,7 +5886,7 @@ globalthis@^1.0.3: define-properties "^1.2.1" gopd "^1.0.1" -"globby@^12.0.0", "globby@^12.0.2": +globby@^12.0.2: version "12.2.0" resolved "https://registry.npmjs.org/globby/-/globby-12.2.0.tgz#2ab8046b4fba4ff6eede835b29f678f90e3d3c22" integrity sha512-wiSuFQLZ+urS9x2gGPl1H5drc5twabmm4m2gTR27XDFyjUHJUNsS8o/2aKyIF6IoBaR630atdher0XJ5g6OMmA== @@ -5889,7 +5898,7 @@ globalthis@^1.0.3: merge2 "^1.4.1" slash "^4.0.0" -globby@^14.0.0: +"globby@^14.0.0", "globby@^14.0.1": version "14.0.2" resolved "https://registry.npmjs.org/globby/-/globby-14.0.2.tgz#06554a54ccfe9264e5a9ff8eded46aa1e306482f" integrity sha512-s3Fq41ZVh7vbbe2PN3nrW7yC7U7MFVc5c98/iTl9c2GawNMKx/J648KQRW6WKkuU8GIbbh2IXfIRQjOZnXcTnw== @@ -5902,16 +5911,14 @@ globby@^14.0.0: unicorn-magic "^0.1.0" goober@^2.0.33: - version "2.1.14" - resolved "https://registry.npmjs.org/goober/-/goober-2.1.14.tgz#4a5c94fc34dc086a8e6035360ae1800005135acd" - integrity sha512-4UpC0NdGyAFqLNPnhCT2iHpza2q+RAY3GV85a/mRPdzyPQMsj0KmMMuetdIkzWRbJ+Hgau1EZztq8ImmiMGhsg== + version "2.1.16" + resolved "https://registry.npmjs.org/goober/-/goober-2.1.16.tgz#7d548eb9b83ff0988d102be71f271ca8f9c82a95" + integrity sha512-erjk19y1U33+XAMe1VTvIONHYoSqE4iS7BYUZfHaqeohLmnC0FdxEh7rQU+6MZ4OajItzjZFSRtVANrQwNq6/g== -gopd@^1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c" - integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA== - dependencies: - get-intrinsic "^1.1.3" +"gopd@^1.0.1", "gopd@^1.2.0": + version "1.2.0" + resolved "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz#89f56b8217bdbc8802bd299df6d7f1081d7e51a1" + integrity sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg== got@^7.0.0: version "7.1.0" @@ -5956,7 +5963,7 @@ got@^8.3.1: url-parse-lax "^3.0.0" url-to-options "^1.0.1" -"graceful-fs@^4.1.10", "graceful-fs@^4.1.2", "graceful-fs@^4.2.11", "graceful-fs@^4.2.4", "graceful-fs@^4.2.6", "graceful-fs@^4.2.8", "graceful-fs@^4.2.9": +"graceful-fs@^4.1.10", "graceful-fs@^4.1.2", "graceful-fs@^4.2.11", "graceful-fs@^4.2.4", "graceful-fs@^4.2.6", "graceful-fs@^4.2.9": version "4.2.11" resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== @@ -6001,15 +6008,10 @@ hard-rejection@^2.1.0: resolved "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883" integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA== -"has-bigints@^1.0.1", "has-bigints@^1.0.2": - version "1.0.2" - resolved "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa" - integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ== - -has-flag@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw== +has-bigints@^1.0.2: + version "1.1.0" + resolved "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz#28607e965ac967e03cd2a2c70a2636a1edad49fe" + integrity sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg== has-flag@^4.0.0: version "4.0.0" @@ -6023,20 +6025,22 @@ has-flag@^4.0.0: dependencies: es-define-property "^1.0.0" -"has-proto@^1.0.1", "has-proto@^1.0.3": - version "1.0.3" - resolved "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz#b31ddfe9b0e6e9914536a6ab286426d0214f77fd" - integrity sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q== +has-proto@^1.2.0: + version "1.2.0" + resolved "https://registry.npmjs.org/has-proto/-/has-proto-1.2.0.tgz#5de5a6eabd95fdffd9818b43055e8065e39fe9d5" + integrity sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ== + dependencies: + dunder-proto "^1.0.0" has-symbol-support-x@^1.4.1: version "1.4.2" resolved "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz#1409f98bc00247da45da67cee0a36f282ff26455" integrity sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw== -"has-symbols@^1.0.2", "has-symbols@^1.0.3": - version "1.0.3" - resolved "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" - integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== +"has-symbols@^1.0.3", "has-symbols@^1.1.0": + version "1.1.0" + resolved "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz#fc9c6a783a084951d0b971fe1018de813707a338" + integrity sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ== has-to-string-tag-x@^1.2.0: version "1.4.1" @@ -6045,7 +6049,7 @@ has-to-string-tag-x@^1.2.0: dependencies: has-symbol-support-x "^1.4.1" -"has-tostringtag@^1.0.0", "has-tostringtag@^1.0.2": +has-tostringtag@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz#2cdc42d40bef2e5b4eeab7c01a73c54ce7ab5abc" integrity sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw== @@ -6057,11 +6061,6 @@ has-unicode@^2.0.1: resolved "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ== -has@^1.0.0: - version "1.0.4" - resolved "https://registry.npmjs.org/has/-/has-1.0.4.tgz#2eb2860e000011dae4f1406a86fe80e530fb2ec6" - integrity sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ== - hash-base@^3.0.0: version "3.1.0" resolved "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz#55c381d9e06e1d2997a883b4a3fddfe7f0d3af33" @@ -6071,13 +6070,13 @@ hash-base@^3.0.0: readable-stream "^3.6.0" safe-buffer "^5.2.0" -hash-base@~3.0: - version "3.0.4" - resolved "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918" - integrity sha512-EeeoJKjTyt868liAlVmcv2ZsUfGHlE3Q+BICOXcZiwN3osr5Q/zFGYmTJpoIzuaSTAwndFy+GqhEwlU4L3j4Ow== +"hash-base@~3.0", "hash-base@~3.0.4": + version "3.0.5" + resolved "https://registry.npmjs.org/hash-base/-/hash-base-3.0.5.tgz#52480e285395cf7fba17dc4c9e47acdc7f248a8a" + integrity sha512-vXm0l45VbcHEVlTCzs8M+s0VeYsB2lnlAaThoLKGXr3bE/VWDOelNUnycUPEhKEaXARL2TEFjBOyUiM6+55KBg== dependencies: - inherits "^2.0.1" - safe-buffer "^5.0.1" + inherits "^2.0.4" + safe-buffer "^5.2.1" "hash.js@^1.0.0", "hash.js@^1.0.3": version "1.1.7" @@ -6087,7 +6086,7 @@ hash-base@~3.0: inherits "^2.0.3" minimalistic-assert "^1.0.1" -"hasown@^2.0.0", "hasown@^2.0.1", "hasown@^2.0.2": +"hasown@^2.0.0", "hasown@^2.0.2": version "2.0.2" resolved "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003" integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ== @@ -6123,17 +6122,17 @@ hosted-git-info@^4.0.1: lru-cache "^6.0.0" hotkeys-js@^3.13.3: - version "3.13.7" - resolved "https://registry.npmjs.org/hotkeys-js/-/hotkeys-js-3.13.7.tgz#0188d8e2fca16a3f1d66541b48de0bb9df613726" - integrity sha512-ygFIdTqqwG4fFP7kkiYlvayZppeIQX2aPpirsngkv1xM1lP0piDY5QEh68nQnIKvz64hfocxhBaD/uK3sSK1yQ== + version "3.13.9" + resolved "https://registry.npmjs.org/hotkeys-js/-/hotkeys-js-3.13.9.tgz#e2f976dddfa695a4a40ee60d7888e3cf7637a77a" + integrity sha512-3TRCj9u9KUH6cKo25w4KIdBfdBfNRjfUwrljCLDC2XhmPDG0SjAZFcFZekpUZFmXzfYoGhFDcdx2gX/vUVtztQ== -html-dom-parser@5.0.10: - version "5.0.10" - resolved "https://registry.npmjs.org/html-dom-parser/-/html-dom-parser-5.0.10.tgz#bf46b05c50f35c2fcadfc8e91566c54d3caf9bd7" - integrity sha512-GwArYL3V3V8yU/mLKoFF7HlLBv80BZ2Ey1BzfVNRpAci0cEKhFHI/Qh8o8oyt3qlAMLlK250wsxLdYX4viedvg== +html-dom-parser@5.0.13: + version "5.0.13" + resolved "https://registry.npmjs.org/html-dom-parser/-/html-dom-parser-5.0.13.tgz#36b25b3ad05dc71741e9cd200ff276cdf8e3831d" + integrity sha512-B7JonBuAfG32I7fDouUQEogBrz3jK9gAuN1r1AaXpED6dIhtg/JwiSRhjGL7aOJwRz3HU4efowCjQBaoXiREqg== dependencies: domhandler "5.0.3" - htmlparser2 "9.1.0" + htmlparser2 "10.0.0" html-encoding-sniffer@^3.0.0: version "3.0.0" @@ -6147,15 +6146,15 @@ html-encoding-sniffer@^3.0.0: resolved "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== -html-react-parser@^5.0.6: - version "5.1.15" - resolved "https://registry.npmjs.org/html-react-parser/-/html-react-parser-5.1.15.tgz#f3121f31434ba5a84d06c8849e2e6fe0f64eed20" - integrity sha512-LRwSTseAZtdtzYbBaN0a+pJ48x4qmwPzQC5tvwAp9IvuNf7afxtTHLpCPYCsVjRKRUqhXvfjTaKJJrhctxkHJA== +html-react-parser@^5.2.0: + version "5.2.2" + resolved "https://registry.npmjs.org/html-react-parser/-/html-react-parser-5.2.2.tgz#a4159c14f08c06280ff793ce35f872c2283227cb" + integrity sha512-yA5012CJGSFWYZsgYzfr6HXJgDap38/AEP4ra8Cw+WHIi2ZRDXRX/QVYdumRf1P8zKyScKd6YOrWYvVEiPfGKg== dependencies: domhandler "5.0.3" - html-dom-parser "5.0.10" + html-dom-parser "5.0.13" react-property "2.0.2" - style-to-js "1.1.13" + style-to-js "1.1.16" html-to-image@^1.11.11: version "1.11.11" @@ -6167,15 +6166,15 @@ htmlescape@^1.1.0: resolved "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.1.tgz#3a03edc2214bca3b66424a3e7959349509cb0351" integrity sha512-eVcrzgbR4tim7c7soKQKtxa/kQM4TzjnlU83rcZ9bHU6t31ehfV7SktN6McWgwPWg+JYMA/O3qpGxBvFq1z2Jg== -htmlparser2@9.1.0: - version "9.1.0" - resolved "https://registry.npmjs.org/htmlparser2/-/htmlparser2-9.1.0.tgz#cdb498d8a75a51f739b61d3f718136c369bc8c23" - integrity sha512-5zfg6mHUoaer/97TxnGpxmbR7zJtPwIYFMZ/H5ucTlPZhKvtum05yiPK3Mgai3a0DyVxv7qYqoweaEd2nrYQzQ== +htmlparser2@10.0.0: + version "10.0.0" + resolved "https://registry.npmjs.org/htmlparser2/-/htmlparser2-10.0.0.tgz#77ad249037b66bf8cc99c6e286ef73b83aeb621d" + integrity sha512-TwAZM+zE5Tq3lrEHvOlvwgj1XLWQCtaaibSN11Q+gGBAS7Y1uZSWwXXRe4iF6OXnaq1riyQAPFOBtYc77Mxq0g== dependencies: domelementtype "^2.3.0" domhandler "^5.0.3" - domutils "^3.1.0" - entities "^4.5.0" + domutils "^3.2.1" + entities "^6.0.0" http-cache-semantics@3.8.1: version "3.8.1" @@ -6218,11 +6217,11 @@ https-browserify@^1.0.0: debug 4 https-proxy-agent@^7.0.1: - version "7.0.5" - resolved "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz#9e8b5013873299e11fab6fd548405da2d6c602b2" - integrity sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw== + version "7.0.6" + resolved "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz#da8dfeac7da130b05c2ba4b59c9b6cd66611a6b9" + integrity sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw== dependencies: - agent-base "^7.0.2" + agent-base "^7.1.2" debug 4 human-signals@^2.1.0: @@ -6254,6 +6253,13 @@ humanize-ms@^1.2.1: resolved "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA== +identifier-regex@^1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/identifier-regex/-/identifier-regex-1.0.0.tgz#b9fc92aecfe3d9f3b427fd5af0d2e663163fcbef" + integrity sha512-Rcy5cjBOM9iTR+Vwy0Llyip9u0cA99T1yiWOhDW/+PDaTQhyski0tMovsipQ/FRNDkudjLWusJ/IMVIlG5WZnQ== + dependencies: + reserved-identifiers "^1.0.0" + "ieee754@^1.1.13", "ieee754@^1.1.4", "ieee754@^1.2.1": version "1.2.1" resolved "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" @@ -6265,9 +6271,9 @@ humanize-ms@^1.2.1: integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g== image-minimizer-webpack-plugin@^4.0.2: - version "4.1.0" - resolved "https://registry.npmjs.org/image-minimizer-webpack-plugin/-/image-minimizer-webpack-plugin-4.1.0.tgz#2add36448c2d5c9de2e13a33221f56156b0fe728" - integrity sha512-HZwGd1CxApD3Vi+/k1Vz+Lksooz2TIkCcfejhCkqUfHPRByIYY0HD5RvsxTAMU8nlom+WeknF6f7+2ZQSKiw2g== + version "4.1.3" + resolved "https://registry.npmjs.org/image-minimizer-webpack-plugin/-/image-minimizer-webpack-plugin-4.1.3.tgz#728e89d153978f49396fe1881aa11fe6cef57f83" + integrity sha512-yJvYlLAZosu2iqlGF81BEUHfUiWRPD05krtoax9Ffst3Yzbn3X7p04VXambwlx3uhbSwH/BeyM5+bJHQksnuyw== dependencies: schema-utils "^4.2.0" serialize-javascript "^6.0.2" @@ -6290,18 +6296,20 @@ imagemin-optipng@^8.0.0: is-png "^2.0.0" optipng-bin "^7.0.0" -imagemin@^8.0.1: - version "8.0.1" - resolved "https://registry.npmjs.org/imagemin/-/imagemin-8.0.1.tgz#8b29ecb78197d8f0eac6a782f2e6b38fb3780d9e" - integrity sha512-Q/QaPi+5HuwbZNtQRqUVk6hKacI6z9iWiCSQBisAv7uBynZwO7t1svkryKl7+iSQbkU/6t9DWnHz04cFs2WY7w== +imagemin@^9.0.0: + version "9.0.0" + resolved "https://registry.npmjs.org/imagemin/-/imagemin-9.0.0.tgz#1a65aba528a9dcb6521bead8a7ae507bf0ddc59d" + integrity sha512-oFlmioXTIrDCNYiKUVPjzUzm8M/7X74WEO6v8NFjn3ZtxjArdVJiRRdbPpq/OG4BdwaHMUz8ej9Fp4AcaDzMnA== dependencies: - file-type "^16.5.3" - globby "^12.0.0" - graceful-fs "^4.2.8" - junk "^3.1.0" + change-file-extension "^0.1.1" + environment "^1.0.0" + file-type "^19.0.0" + globby "^14.0.1" + junk "^4.0.1" + ow "^2.0.0" p-pipe "^4.0.0" - replace-ext "^2.0.0" - slash "^3.0.0" + slash "^5.1.0" + uint8array-extras "^1.1.0" immutability-helper@^3.0.0: version "3.1.1" @@ -6329,12 +6337,12 @@ import-local@^3.0.2: pkg-dir "^4.2.0" resolve-cwd "^3.0.0" -imports-loader@^4.0.1: - version "4.0.1" - resolved "https://registry.npmjs.org/imports-loader/-/imports-loader-4.0.1.tgz#a3d3067d0c369cd621e2b322b6b6bb2593756be5" - integrity sha512-ZiY+1xH5fqAJ1Qu1CFv+zw54rvPCC92DdYRDe0IIUboOhbJPLfOPbF/paA2iipelvMwjQUKWydcFOJ7f1+ZFcA== +imports-loader@^5.0.0: + version "5.0.0" + resolved "https://registry.npmjs.org/imports-loader/-/imports-loader-5.0.0.tgz#b18635fd7fe28001518a1f54f30cd1dfbd3c5f38" + integrity sha512-tXgL8xxZFjOjQLLiE7my00UUQfktg4G8fdpXcZphL0bJWbk9eCxKKFaCwmFRcwyRJQl95GXBL1DoE1rCS/tcPw== dependencies: - source-map "^0.6.1" + source-map-js "^1.0.2" strip-comments "^2.0.1" imurmurhash@^0.1.4: @@ -6387,10 +6395,10 @@ inline-source-map@~0.6.0: dependencies: source-map "~0.5.3" -inline-style-parser@0.2.3: - version "0.2.3" - resolved "https://registry.npmjs.org/inline-style-parser/-/inline-style-parser-0.2.3.tgz#e35c5fb45f3a83ed7849fe487336eb7efa25971c" - integrity sha512-qlD8YNDqyTKTyuITrDOffsl6Tdhv+UC4hcdAVuQsK4IMQ99nSgd1MIA/Q+jQYoh9r3hVUXhYh7urSRmXPkW04g== +inline-style-parser@0.2.4: + version "0.2.4" + resolved "https://registry.npmjs.org/inline-style-parser/-/inline-style-parser-0.2.4.tgz#f4af5fe72e612839fcd453d989a586566d695f22" + integrity sha512-0aO8FkhNZlj/ZIbNi7Lxxr12obT7cL1moPfE4tg1LkX7LlLfC6DeX4l2ZEud1ukP9jNQyNnfzQVqwbwmAATY4Q== insert-if@^1.1.0: version "1.2.0" @@ -6413,14 +6421,14 @@ insert-module-globals@^7.2.1: undeclared-identifiers "^1.1.2" xtend "^4.0.0" -internal-slot@^1.0.7: - version "1.0.7" - resolved "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz#c06dcca3ed874249881007b0a5523b172a190802" - integrity sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g== +internal-slot@^1.1.0: + version "1.1.0" + resolved "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz#1eac91762947d2f7056bc838d93e13b2e9604961" + integrity sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw== dependencies: es-errors "^1.3.0" - hasown "^2.0.0" - side-channel "^1.0.4" + hasown "^2.0.2" + side-channel "^1.1.0" interpret@^3.1.1: version "3.1.1" @@ -6435,6 +6443,11 @@ into-stream@^3.1.0: from2 "^2.1.1" p-is-promise "^1.1.0" +ip-address@^10.0.1: + version "10.0.1" + resolved "https://registry.npmjs.org/ip-address/-/ip-address-10.0.1.tgz#a8180b783ce7788777d796286d61bce4276818ed" + integrity sha512-NWv9YLW4PoW2B7xtzaS3NCot75m6nK7Icdv0o3lfMceJVRfSoQwqD4wEH5rLwoKJwUiZ/rfpiVBhnaF0FK4HoA== + ip-address@^9.0.5: version "9.0.5" resolved "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz#117a960819b08780c3bd1f14ef3c1cc1d3f3ea5a" @@ -6444,20 +6457,21 @@ ip-address@^9.0.5: sprintf-js "^1.1.3" is-arguments@^1.0.4: - version "1.1.1" - resolved "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" - integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA== + version "1.2.0" + resolved "https://registry.npmjs.org/is-arguments/-/is-arguments-1.2.0.tgz#ad58c6aecf563b78ef2bf04df540da8f5d7d8e1b" + integrity sha512-7bVbi0huj/wrIAOzb8U1aszg9kdi3KN/CyU19CTI7tAoZYEZoL9yCDXpbXN+uPsuWnP02cyug1gleqq+TU+YCA== dependencies: - call-bind "^1.0.2" - has-tostringtag "^1.0.0" + call-bound "^1.0.2" + has-tostringtag "^1.0.2" -is-array-buffer@^3.0.4: - version "3.0.4" - resolved "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz#7a1f92b3d61edd2bc65d24f130530ea93d7fae98" - integrity sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw== +"is-array-buffer@^3.0.4", "is-array-buffer@^3.0.5": + version "3.0.5" + resolved "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz#65742e1e687bd2cc666253068fd8707fe4d44280" + integrity sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A== dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.2.1" + call-bind "^1.0.8" + call-bound "^1.0.3" + get-intrinsic "^1.2.6" is-arrayish@^0.2.1: version "0.2.1" @@ -6465,26 +6479,30 @@ is-arrayish@^0.2.1: integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg== is-async-function@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/is-async-function/-/is-async-function-2.0.0.tgz#8e4418efd3e5d3a6ebb0164c05ef5afb69aa9646" - integrity sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA== + version "2.1.1" + resolved "https://registry.npmjs.org/is-async-function/-/is-async-function-2.1.1.tgz#3e69018c8e04e73b738793d020bfe884b9fd3523" + integrity sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ== dependencies: - has-tostringtag "^1.0.0" + async-function "^1.0.0" + call-bound "^1.0.3" + get-proto "^1.0.1" + has-tostringtag "^1.0.2" + safe-regex-test "^1.1.0" -is-bigint@^1.0.1: - version "1.0.4" - resolved "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3" - integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg== +is-bigint@^1.1.0: + version "1.1.0" + resolved "https://registry.npmjs.org/is-bigint/-/is-bigint-1.1.0.tgz#dda7a3445df57a42583db4228682eba7c4170672" + integrity sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ== dependencies: - has-bigints "^1.0.1" + has-bigints "^1.0.2" -is-boolean-object@^1.1.0: - version "1.1.2" - resolved "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" - integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA== +is-boolean-object@^1.2.1: + version "1.2.1" + resolved "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.1.tgz#c20d0c654be05da4fbc23c562635c019e93daf89" + integrity sha512-l9qO6eFlUETHtuihLcYOaLKByJ1f+N4kthcU9YjHy3N+B3hWv0y/2Nd0mu/7lTFnRQHTrSdXF50HQ3bl5fEnng== dependencies: - call-bind "^1.0.2" - has-tostringtag "^1.0.0" + call-bound "^1.0.2" + has-tostringtag "^1.0.2" is-buffer@^1.1.0: version "1.1.6" @@ -6496,43 +6514,46 @@ is-buffer@^2.0.5: resolved "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191" integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ== -"is-callable@^1.1.3", "is-callable@^1.1.4", "is-callable@^1.2.7": +is-callable@^1.2.7: version "1.2.7" resolved "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055" integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA== -"is-core-module@^2.13.0", "is-core-module@^2.5.0": - version "2.15.1" - resolved "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz#a7363a25bee942fefab0de13bf6aa372c82dcc37" - integrity sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ== +"is-core-module@^2.13.0", "is-core-module@^2.16.0", "is-core-module@^2.5.0": + version "2.16.1" + resolved "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz#2a98801a849f43e2add644fbb6bc6229b19a4ef4" + integrity sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w== dependencies: hasown "^2.0.2" -is-data-view@^1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz#4b4d3a511b70f3dc26d42c03ca9ca515d847759f" - integrity sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w== +"is-data-view@^1.0.1", "is-data-view@^1.0.2": + version "1.0.2" + resolved "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.2.tgz#bae0a41b9688986c2188dda6657e56b8f9e63b8e" + integrity sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw== dependencies: + call-bound "^1.0.2" + get-intrinsic "^1.2.6" is-typed-array "^1.1.13" -"is-date-object@^1.0.1", "is-date-object@^1.0.5": - version "1.0.5" - resolved "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" - integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== +"is-date-object@^1.0.5", "is-date-object@^1.1.0": + version "1.1.0" + resolved "https://registry.npmjs.org/is-date-object/-/is-date-object-1.1.0.tgz#ad85541996fc7aa8b2729701d27b7319f95d82f7" + integrity sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg== dependencies: - has-tostringtag "^1.0.0" + call-bound "^1.0.2" + has-tostringtag "^1.0.2" is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== -is-finalizationregistry@^1.0.2: - version "1.0.2" - resolved "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz#c8749b65f17c133313e661b1289b95ad3dbd62e6" - integrity sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw== +is-finalizationregistry@^1.1.0: + version "1.1.1" + resolved "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz#eefdcdc6c94ddd0674d9c85887bf93f944a97c90" + integrity sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg== dependencies: - call-bind "^1.0.2" + call-bound "^1.0.3" is-fullwidth-code-point@^3.0.0: version "3.0.0" @@ -6545,11 +6566,14 @@ is-generator-fn@^2.0.0: integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ== "is-generator-function@^1.0.10", "is-generator-function@^1.0.7": - version "1.0.10" - resolved "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz#f1558baf1ac17e0deea7c0415c438351ff2b3c72" - integrity sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A== + version "1.1.0" + resolved "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.0.tgz#bf3eeda931201394f57b5dba2800f91a238309ca" + integrity sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ== dependencies: - has-tostringtag "^1.0.0" + call-bound "^1.0.3" + get-proto "^1.0.0" + has-tostringtag "^1.0.2" + safe-regex-test "^1.1.0" "is-glob@^4.0.0", "is-glob@^4.0.1", "is-glob@^4.0.3": version "4.0.3" @@ -6558,6 +6582,14 @@ is-generator-fn@^2.0.0: dependencies: is-extglob "^2.1.1" +is-identifier@^1.0.0: + version "1.0.1" + resolved "https://registry.npmjs.org/is-identifier/-/is-identifier-1.0.1.tgz#76d66e7813e37cc85cc8263f04eaa558d1a5d2dc" + integrity sha512-HQ5v4rEJ7REUV54bCd2l5FaD299SGDEn2UPoVXaTHAyGviLq2menVUD2udi3trQ32uvB6LdAh/0ck2EuizrtpA== + dependencies: + identifier-regex "^1.0.0" + super-regex "^1.0.0" + is-jpg@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/is-jpg/-/is-jpg-3.0.0.tgz#f97b4ab6de92401650cb4f54ec0a6ad79c51367f" @@ -6578,17 +6610,13 @@ is-natural-number@^4.0.1: resolved "https://registry.npmjs.org/is-natural-number/-/is-natural-number-4.0.1.tgz#ab9d76e1db4ced51e35de0c72ebecf09f734cde8" integrity sha512-Y4LTamMe0DDQIIAlaer9eKebAlDSV6huy+TWhJVPlzZh2o4tRP5SQWFlLn5N0To4mDD22/qdOq+veo1cSISLgQ== -is-negative-zero@^2.0.3: - version "2.0.3" - resolved "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz#ced903a027aca6381b777a5743069d7376a49747" - integrity sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw== - -is-number-object@^1.0.4: - version "1.0.7" - resolved "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc" - integrity sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ== +is-number-object@^1.1.1: + version "1.1.1" + resolved "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.1.tgz#144b21e95a1bc148205dcc2814a9134ec41b2541" + integrity sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw== dependencies: - has-tostringtag "^1.0.0" + call-bound "^1.0.3" + has-tostringtag "^1.0.2" is-number@^7.0.0: version "7.0.0" @@ -6600,11 +6628,6 @@ is-object@^1.0.1: resolved "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz#a56552e1c665c9e950b4a025461da87e72f86fcf" integrity sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA== -is-path-inside@^3.0.3: - version "3.0.3" - resolved "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" - integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== - "is-plain-obj@^1.0.0", "is-plain-obj@^1.1.0": version "1.1.0" resolved "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" @@ -6627,13 +6650,15 @@ is-potential-custom-element-name@^1.0.1: resolved "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5" integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ== -is-regex@^1.1.4: - version "1.1.4" - resolved "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" - integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== +is-regex@^1.2.1: + version "1.2.1" + resolved "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz#76d70a3ed10ef9be48eb577887d74205bf0cad22" + integrity sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g== dependencies: - call-bind "^1.0.2" - has-tostringtag "^1.0.0" + call-bound "^1.0.2" + gopd "^1.2.0" + has-tostringtag "^1.0.2" + hasown "^2.0.2" is-relative@^1.0.0: version "1.0.0" @@ -6652,12 +6677,12 @@ is-set@^2.0.3: resolved "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz#8ab209ea424608141372ded6e0cb200ef1d9d01d" integrity sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg== -"is-shared-array-buffer@^1.0.2", "is-shared-array-buffer@^1.0.3": - version "1.0.3" - resolved "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz#1237f1cba059cdb62431d378dcc37d9680181688" - integrity sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg== +is-shared-array-buffer@^1.0.4: + version "1.0.4" + resolved "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz#9b67844bd9b7f246ba0708c3a93e34269c774f6f" + integrity sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A== dependencies: - call-bind "^1.0.7" + call-bound "^1.0.3" "is-stream@^1.0.0", "is-stream@^1.1.0": version "1.1.0" @@ -6674,26 +6699,34 @@ is-stream@^3.0.0: resolved "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz#e6bfd7aa6bef69f4f472ce9bb681e3e57b4319ac" integrity sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA== -"is-string@^1.0.5", "is-string@^1.0.7": - version "1.0.7" - resolved "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd" - integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg== - dependencies: - has-tostringtag "^1.0.0" +is-stream@^4.0.1: + version "4.0.1" + resolved "https://registry.npmjs.org/is-stream/-/is-stream-4.0.1.tgz#375cf891e16d2e4baec250b85926cffc14720d9b" + integrity sha512-Dnz92NInDqYckGEUJv689RbRiTSEHCQ7wOVeALbkOz999YpqT46yMRIGtSNl2iCL1waAZSx40+h59NV/EwzV/A== -"is-symbol@^1.0.2", "is-symbol@^1.0.3": - version "1.0.4" - resolved "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" - integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg== +"is-string@^1.0.7", "is-string@^1.1.1": + version "1.1.1" + resolved "https://registry.npmjs.org/is-string/-/is-string-1.1.1.tgz#92ea3f3d5c5b6e039ca8677e5ac8d07ea773cbb9" + integrity sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA== dependencies: - has-symbols "^1.0.2" + call-bound "^1.0.3" + has-tostringtag "^1.0.2" -"is-typed-array@^1.1.13", "is-typed-array@^1.1.3": - version "1.1.13" - resolved "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz#d6c5ca56df62334959322d7d7dd1cca50debe229" - integrity sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw== +"is-symbol@^1.0.4", "is-symbol@^1.1.1": + version "1.1.1" + resolved "https://registry.npmjs.org/is-symbol/-/is-symbol-1.1.1.tgz#f47761279f532e2b05a7024a7506dbbedacd0634" + integrity sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w== dependencies: - which-typed-array "^1.1.14" + call-bound "^1.0.2" + has-symbols "^1.1.0" + safe-regex-test "^1.1.0" + +"is-typed-array@^1.1.13", "is-typed-array@^1.1.14", "is-typed-array@^1.1.15", "is-typed-array@^1.1.3": + version "1.1.15" + resolved "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz#4bfb4a45b61cee83a5a46fba778e4e8d59c0ce0b" + integrity sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ== + dependencies: + which-typed-array "^1.1.16" is-unc-path@^1.0.0: version "1.0.0" @@ -6707,20 +6740,20 @@ is-weakmap@^2.0.2: resolved "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz#bf72615d649dfe5f699079c54b83e47d1ae19cfd" integrity sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w== -is-weakref@^1.0.2: - version "1.0.2" - resolved "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2" - integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ== +"is-weakref@^1.0.2", "is-weakref@^1.1.0": + version "1.1.0" + resolved "https://registry.npmjs.org/is-weakref/-/is-weakref-1.1.0.tgz#47e3472ae95a63fa9cf25660bcf0c181c39770ef" + integrity sha512-SXM8Nwyys6nT5WP6pltOwKytLV7FqQ4UiibxVmW+EIosHcmCqkkjViTb5SNssDlkCiEYRP1/pdWUKVvZBmsR2Q== dependencies: - call-bind "^1.0.2" + call-bound "^1.0.2" is-weakset@^2.0.3: - version "2.0.3" - resolved "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.3.tgz#e801519df8c0c43e12ff2834eead84ec9e624007" - integrity sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ== + version "2.0.4" + resolved "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.4.tgz#c9f5deb0bc1906c6d6f1027f284ddf459249daca" + integrity sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ== dependencies: - call-bind "^1.0.7" - get-intrinsic "^1.2.4" + call-bound "^1.0.3" + get-intrinsic "^1.2.6" isarray@0.0.1: version "0.0.1" @@ -6813,16 +6846,17 @@ isurl@^1.0.0-alpha5: has-to-string-tag-x "^1.2.0" is-object "^1.0.1" -iterator.prototype@^1.1.2: - version "1.1.2" - resolved "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.2.tgz#5e29c8924f01916cb9335f1ff80619dcff22b0c0" - integrity sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w== +iterator.prototype@^1.1.4: + version "1.1.5" + resolved "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.5.tgz#12c959a29de32de0aa3bbbb801f4d777066dae39" + integrity sha512-H0dkQoCa3b2VEeKQBOxFph+JAbcrQdE7KC0UkqwpLmv2EC4P41QXP+rqo9wYodACiG5/WM5s9oDApTU8utwj9g== dependencies: - define-properties "^1.2.1" - get-intrinsic "^1.2.1" - has-symbols "^1.0.3" - reflect.getprototypeof "^1.0.4" - set-function-name "^2.0.1" + define-data-property "^1.1.4" + es-object-atoms "^1.0.0" + get-intrinsic "^1.2.6" + get-proto "^1.0.0" + has-symbols "^1.1.0" + set-function-name "^2.0.2" jackspeak@^3.1.2: version "3.4.3" @@ -7207,7 +7241,7 @@ jest-worker@^27.4.5: merge-stream "^2.0.0" supports-color "^8.0.0" -"jest-worker@^29.4.3", "jest-worker@^29.7.0": +jest-worker@^29.7.0: version "29.7.0" resolved "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz#acad073acbbaeb7262bd5389e1bcf43e10058d4a" integrity sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw== @@ -7228,9 +7262,9 @@ jest@^29.6.4: jest-cli "^29.7.0" jiti@^1.20.0: - version "1.21.6" - resolved "https://registry.npmjs.org/jiti/-/jiti-1.21.6.tgz#6c7f7398dd4b3142767f9a168af2f317a428d268" - integrity sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w== + version "1.21.7" + resolved "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz#9dd81043424a3d28458b193d965f0d18a2300ba9" + integrity sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A== jmespath@^0.16.0: version "0.16.0" @@ -7294,15 +7328,15 @@ jsdom@^20.0.0: ws "^8.11.0" xml-name-validator "^4.0.0" -jsesc@^2.5.1: - version "2.5.2" - resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" - integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== +jsesc@^3.0.2: + version "3.1.0" + resolved "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz#74d335a234f67ed19907fdadfac7ccf9d409825d" + integrity sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA== -jsesc@~0.5.0: - version "0.5.0" - resolved "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" - integrity sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA== +jsesc@~3.0.2: + version "3.0.2" + resolved "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz#bb8b09a6597ba426425f2e4a07245c3d00b9343e" + integrity sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g== json-bignumber@^1.0.1: version "1.1.1" @@ -7358,30 +7392,29 @@ json5@^1.0.1: resolved "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== -jsoneditor@^9.5.4: - version "9.10.5" - resolved "https://registry.npmjs.org/jsoneditor/-/jsoneditor-9.10.5.tgz#9aeb3a1482850299826f8f292cec22b0f71d975c" - integrity sha512-fVZ0NMt+zm4rqTKBv2x7zPdLeaRyKo1EjJkaR1QjK4gEM1rMwICILYSW1OPxSc1qqyAoDaA/eeNrluKoxOocCA== +jsoneditor@^10.1.2: + version "10.1.2" + resolved "https://registry.npmjs.org/jsoneditor/-/jsoneditor-10.1.2.tgz#eb3c843d9597c9bc1b7ad9cb2a5534297f7f87af" + integrity sha512-6yUC6cEPrPGS3wNEuzJUbCE1sziwIITs2vRko0L2LnhKokJtPZErHKU2nOYp6K4N8FxFXXXe1zy9lxh/tGzHwg== dependencies: - ace-builds "^1.31.1" + ace-builds "^1.36.2" ajv "^6.12.6" javascript-natural-sort "^0.7.1" jmespath "^0.16.0" json-source-map "^0.6.1" - jsonrepair "3.1.0" - mobius1-selectr "^2.4.13" + jsonrepair "^3.8.1" picomodal "^3.0.0" - vanilla-picker "^2.12.2" + vanilla-picker "^2.12.3" jsonparse@^1.2.0: version "1.3.1" resolved "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280" integrity sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg== -jsonrepair@3.1.0: - version "3.1.0" - resolved "https://registry.npmjs.org/jsonrepair/-/jsonrepair-3.1.0.tgz#02488882080930e6a37a7b080bc77546f2e12676" - integrity sha512-idqReg23J0PVRAADmZMc5xQM3xeOX5bTB6OTyMnzq33IXJXmn9iJuWIEvGmrN80rQf4d7uLTMEDwpzujNcI0Rg== +jsonrepair@^3.8.1: + version "3.11.2" + resolved "https://registry.npmjs.org/jsonrepair/-/jsonrepair-3.11.2.tgz#46f421cf90661540568fc88b1f1ad9248175a9c6" + integrity sha512-ejydGcTq0qKk1r0NUBwjtvswbPFhs19+QEfwSeGwB8KJZ59W7/AOFmQh04c68mkJ+2hGk+OkOmkr2bKG4tGlLQ== "jsx-ast-utils@^2.4.1 || ^3.0.0": version "3.3.5" @@ -7393,10 +7426,10 @@ jsonrepair@3.1.0: object.assign "^4.1.4" object.values "^1.1.6" -junk@^3.1.0: - version "3.1.0" - resolved "https://registry.npmjs.org/junk/-/junk-3.1.0.tgz#31499098d902b7e98c5d9b9c80f43457a88abfa1" - integrity sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ== +junk@^4.0.1: + version "4.0.1" + resolved "https://registry.npmjs.org/junk/-/junk-4.0.1.tgz#7ee31f876388c05177fe36529ee714b07b50fbed" + integrity sha512-Qush0uP+G8ZScpGMZvHUiRfI0YBWuB3gVBYlI0v0vvOJt5FLicco+IkP0a50LqTTQhmts/m6tP5SWE+USyIvcQ== keyv@3.0.0: version "3.0.0" @@ -7448,15 +7481,10 @@ levn@^0.4.1: prelude-ls "^1.2.1" type-check "~0.4.0" -lilconfig@^2.0.3: - version "2.1.0" - resolved "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz#78e23ac89ebb7e1bfbf25b18043de756548e7f52" - integrity sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ== - -lilconfig@^3.1.1: - version "3.1.2" - resolved "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.2.tgz#e4a7c3cb549e3a606c8dcc32e5ae1005e62c05cb" - integrity sha512-eop+wDAvpItUys0FWkHIKeC9ybYrTGbU41U5K7+bttZZeohvnY7M9dZ5kB21GNWiFT2q1OoPTvncPCgSOVO5ow== +lilconfig@^3.1.2: + version "3.1.3" + resolved "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz#a1bcfd6257f9585bf5ae14ceeebb7b559025e4c4" + integrity sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw== lines-and-columns@^1.1.6: version "1.2.4" @@ -7780,23 +7808,22 @@ make-fetch-happen@^10.0.3: socks-proxy-agent "^7.0.0" ssri "^9.0.0" -make-fetch-happen@^13.0.0: - version "13.0.1" - resolved "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz#273ba2f78f45e1f3a6dca91cede87d9fa4821e36" - integrity sha512-cKTUFc/rbKUd/9meOvgrpJ2WrNzymt6jfRDdwg5UCnVzv9dTpEj9JS5m3wtziXVCjluIXyL8pcaukYqezIzZQA== +make-fetch-happen@^14.0.3: + version "14.0.3" + resolved "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-14.0.3.tgz#d74c3ecb0028f08ab604011e0bc6baed483fcdcd" + integrity sha512-QMjGbFTP0blj97EeidG5hk/QhKQ3T4ICckQGLgz38QF7Vgbk6e6FTARN8KhKxyBbWn8R0HU+bnw8aSoFPD4qtQ== dependencies: - "@npmcli/agent" "^2.0.0" - cacache "^18.0.0" + "@npmcli/agent" "^3.0.0" + cacache "^19.0.1" http-cache-semantics "^4.1.1" - is-lambda "^1.0.1" minipass "^7.0.2" - minipass-fetch "^3.0.0" + minipass-fetch "^4.0.0" minipass-flush "^1.0.5" minipass-pipeline "^1.2.4" - negotiator "^0.6.3" - proc-log "^4.2.0" + negotiator "^1.0.0" + proc-log "^5.0.0" promise-retry "^2.0.1" - ssri "^10.0.0" + ssri "^12.0.0" makeerror@1.0.12: version "1.0.12" @@ -7815,10 +7842,15 @@ map-obj@^4.1.0: resolved "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a" integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ== -marked@^4.0.17: - version "4.3.0" - resolved "https://registry.npmjs.org/marked/-/marked-4.3.0.tgz#796362821b019f734054582038b116481b456cf3" - integrity sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A== +marked@^5.1.2: + version "5.1.2" + resolved "https://registry.npmjs.org/marked/-/marked-5.1.2.tgz#62b5ccfc75adf72ca3b64b2879b551d89e77677f" + integrity sha512-ahRPGXJpjMjwSOlBoTMZAK7ATXkli5qCPxZ21TG44rx1KEo44bii4ekgTDQPNRQ4Kh7JMb9Ub1PVk1NxRSsorg== + +math-intrinsics@^1.1.0: + version "1.1.0" + resolved "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz#a0dd74be81e2aa5c2f27e65ce283605ee4e2b7f9" + integrity sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g== md5.js@^1.3.4: version "1.3.5" @@ -7829,11 +7861,6 @@ md5.js@^1.3.4: inherits "^2.0.1" safe-buffer "^5.1.2" -mdn-data@2.0.14: - version "2.0.14" - resolved "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50" - integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow== - mdn-data@2.0.28: version "2.0.28" resolved "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.28.tgz#5ec48e7bef120654539069e1ae4ddc81ca490eba" @@ -7887,7 +7914,7 @@ microbuffer@^1.0.0: resolved "https://registry.npmjs.org/microbuffer/-/microbuffer-1.0.0.tgz#8b3832ed40c87d51f47bb234913a698a756d19d2" integrity sha512-O/SUXauVN4x6RaEJFqSPcXNtLFL+QzJHKZlyDVYFwcDDRVca3Fa/37QXXC+4zAGGa4YhHrHxKXuuHvLDIQECtA== -micromatch@^4.0.4: +"micromatch@^4.0.4", "micromatch@^4.0.8": version "4.0.8" resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202" integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA== @@ -7940,10 +7967,10 @@ mimic-response@^1.0.0: resolved "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869" integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg== -mini-css-extract-plugin@^2.7.6: - version "2.9.1" - resolved "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.1.tgz#4d184f12ce90582e983ccef0f6f9db637b4be758" - integrity sha512-+Vyi+GCCOHnrJ2VPS+6aPoXN2k2jgUzDRhTFLjjTBn23qyXJXkjUWQgTL+mXpF5/A8ixLdCc6kWsoeOjKGejKQ== +mini-css-extract-plugin@^2.9.2: + version "2.9.2" + resolved "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.2.tgz#966031b468917a5446f4c24a80854b2947503c5b" + integrity sha512-GJuACcS//jtq4kCtd5ii/M0SZf7OZRH+BxdqXZHaJfb8TJiVl+NgQRPwiYt2EuqeSkNydn/7vP+bcE27C5mb9w== dependencies: schema-utils "^4.0.0" tapable "^2.2.1" @@ -8017,15 +8044,15 @@ minipass-fetch@^2.0.3: minipass-sized "^1.0.3" minizlib "^2.1.2" -minipass-fetch@^3.0.0: - version "3.0.5" - resolved "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz#f0f97e40580affc4a35cc4a1349f05ae36cb1e4c" - integrity sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg== +minipass-fetch@^4.0.0: + version "4.0.0" + resolved "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-4.0.0.tgz#b8ea716464747aeafb7edf2e110114c38089a09c" + integrity sha512-2v6aXUXwLP1Epd/gc32HAMIWoczx+fZwEPRHm/VwtrJzRGwR1qGZXEYV3Zp8ZjjbwaZhMrM6uHV4KVkk+XCc2w== dependencies: encoding "^0.1.13" minipass "^7.0.3" minipass-sized "^1.0.3" - minizlib "^2.1.2" + minizlib "^3.0.1" minipass-flush@^1.0.5: version "1.0.5" @@ -8060,7 +8087,7 @@ minipass@^5.0.0: resolved "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d" integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ== -"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", "minipass@^7.0.2", "minipass@^7.0.3", "minipass@^7.1.2": +"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", "minipass@^7.0.2", "minipass@^7.0.3", "minipass@^7.0.4", "minipass@^7.1.2": version "7.1.2" resolved "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707" integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw== @@ -8073,6 +8100,14 @@ minipass@^5.0.0: minipass "^3.0.0" yallist "^4.0.0" +minizlib@^3.0.1: + version "3.0.1" + resolved "https://registry.npmjs.org/minizlib/-/minizlib-3.0.1.tgz#46d5329d1eb3c83924eff1d3b858ca0a31581012" + integrity sha512-umcy022ILvb5/3Djuu8LWeqUa8D68JaBzlttKeMWen48SjabqS3iY5w/vzeMzMUNhLDifyhbOwKDSznB1vvrwg== + dependencies: + minipass "^7.0.4" + rimraf "^5.0.5" + mkdirp-classic@^0.5.2: version "0.5.3" resolved "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" @@ -8083,10 +8118,10 @@ mkdirp-classic@^0.5.2: resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== -mobius1-selectr@^2.4.13: - version "2.4.13" - resolved "https://registry.npmjs.org/mobius1-selectr/-/mobius1-selectr-2.4.13.tgz#0019dfd9f984840d6e40f70683ab3ec78ce3b5df" - integrity sha512-Mk9qDrvU44UUL0EBhbAA1phfQZ7aMZPjwtL7wkpiBzGh8dETGqfsh50mWoX9EkjDlkONlErWXArHCKfoxVg0Bw== +mkdirp@^3.0.1: + version "3.0.1" + resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz#e44e4c5607fb279c168241713cc6e0fea9adcb50" + integrity sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg== module-deps@^6.2.3: version "6.2.3" @@ -8110,9 +8145,9 @@ module-deps@^6.2.3: xtend "^4.0.0" moment-timezone@^0.5.34: - version "0.5.45" - resolved "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.45.tgz#cb685acd56bac10e69d93c536366eb65aa6bcf5c" - integrity sha512-HIWmqA86KcmCAhnMAN0wuDOARV/525R2+lOLotuGFzn4HO+FH+/645z2wx0Dt3iDv6/p61SIvKnDstISainhLQ== + version "0.5.47" + resolved "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.47.tgz#d4d1a21b78372d914d6d69ae285454732a429749" + integrity sha512-UbNt/JAWS0m/NJOebR0QMRHBk0hu03r5dx9GK8Cs0AS3I81yDcOc9k+DytPItgVvBP7J6Mf6U2n3BPAacAV9oA== dependencies: moment "^2.29.4" @@ -8139,27 +8174,22 @@ mrmime@^2.0.0: resolved "https://registry.npmjs.org/mrmime/-/mrmime-2.0.0.tgz#151082a6e06e59a9a39b46b3e14d5cfe92b3abb4" integrity sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw== -ms@2.1.2: - version "2.1.2" - resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" - integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== - -ms@^2.0.0: +"ms@^2.0.0", "ms@^2.1.3": version "2.1.3" resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== nan@^2.14.2: - version "2.20.0" - resolved "https://registry.npmjs.org/nan/-/nan-2.20.0.tgz#08c5ea813dd54ed16e5bd6505bf42af4f7838ca3" - integrity sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw== + version "2.22.0" + resolved "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz#31bc433fc33213c97bad36404bb68063de604de3" + integrity sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw== dependencies: node-gyp latest -"nanoid@^3.0.0", "nanoid@^3.3.7": - version "3.3.7" - resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8" - integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g== +"nanoid@^3.0.0", "nanoid@^3.3.8": + version "3.3.8" + resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz#b1be3030bee36aaff18bacb375e5cce521684baf" + integrity sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w== nanopop@2.4.2: version "2.4.2" @@ -8189,9 +8219,14 @@ neatequal@^1.0.0: varstream "^0.3.2" negotiator@^0.6.3: - version "0.6.3" - resolved "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" - integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== + version "0.6.4" + resolved "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz#777948e2452651c570b712dd01c23e262713fff7" + integrity sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w== + +negotiator@^1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz#b6c91bb47172d69f93cfd7c357bbb529019b5f6a" + integrity sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg== neo-async@^2.6.2: version "2.6.2" @@ -8229,30 +8264,30 @@ node-gyp@^9.0.0: which "^2.0.2" node-gyp@latest: - version "10.2.0" - resolved "https://registry.npmjs.org/node-gyp/-/node-gyp-10.2.0.tgz#80101c4aa4f7ab225f13fcc8daaaac4eb1a8dd86" - integrity sha512-sp3FonBAaFe4aYTcFdZUn2NYkbP7xroPGYvQmP4Nl5PxamznItBnNCgjrVTKrEfQynInMsJvZrdmqUnysCJ8rw== + version "11.0.0" + resolved "https://registry.npmjs.org/node-gyp/-/node-gyp-11.0.0.tgz#1e029056e8c040424ba380e1d5be54ad1757ae3c" + integrity sha512-zQS+9MTTeCMgY0F3cWPyJyRFAkVltQ1uXm+xXu/ES6KFgC6Czo1Seb9vQW2wNxSX2OrDTiqL0ojtkFxBQ0ypIw== dependencies: env-paths "^2.2.0" exponential-backoff "^3.1.1" glob "^10.3.10" graceful-fs "^4.2.6" - make-fetch-happen "^13.0.0" - nopt "^7.0.0" - proc-log "^4.1.0" + make-fetch-happen "^14.0.3" + nopt "^8.0.0" + proc-log "^5.0.0" semver "^7.3.5" - tar "^6.2.1" - which "^4.0.0" + tar "^7.4.3" + which "^5.0.0" node-int64@^0.4.0: version "0.4.0" resolved "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw== -node-releases@^2.0.18: - version "2.0.18" - resolved "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz#f010e8d35e2fe8d6b2944f03f70213ecedc4ca3f" - integrity sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g== +node-releases@^2.0.19: + version "2.0.19" + resolved "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz#9e445a52950951ec4d177d843af370b411caf314" + integrity sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw== nopt@^6.0.0: version "6.0.0" @@ -8261,12 +8296,12 @@ nopt@^6.0.0: dependencies: abbrev "^1.0.0" -nopt@^7.0.0: - version "7.2.1" - resolved "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz#1cac0eab9b8e97c9093338446eddd40b2c8ca1e7" - integrity sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w== +nopt@^8.0.0: + version "8.1.0" + resolved "https://registry.npmjs.org/nopt/-/nopt-8.1.0.tgz#b11d38caf0f8643ce885818518064127f602eae3" + integrity sha512-ieGu42u/Qsa4TFktmaKEwM6MQH0pOWnaB3htzh0JRtx84+Mebc0cbZYN5bC+6WTZ4+77xrL9Pn5m7CV6VIkV7A== dependencies: - abbrev "^2.0.0" + abbrev "^3.0.0" normalize-package-data@^3.0.2: version "3.0.3" @@ -8297,20 +8332,15 @@ normalize-url@2.0.1: query-string "^5.0.1" sort-keys "^2.0.0" -normalize-url@^6.0.1: - version "6.1.0" - resolved "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" - integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A== - notificar@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/notificar/-/notificar-1.0.1.tgz#11ba233c261eee02f5d688ee300ece5f72522887" integrity sha512-jiCay0IY0N+gloyDks+v4WV+OKU4lIXUhQgxw4Iu9bXpw80cNXTezVv46OCK5+E8G8fkt1Bj76DNepULqlQS3Q== notistack@^3.0.1: - version "3.0.1" - resolved "https://registry.npmjs.org/notistack/-/notistack-3.0.1.tgz#daf59888ab7e2c30a1fa8f71f9cba2978773236e" - integrity sha512-ntVZXXgSQH5WYfyU+3HfcXuKaapzAJ8fBLQ/G618rn3yvSzEbnOB8ZSOwhX+dAORy/lw+GC2N061JA0+gYWTVA== + version "3.0.2" + resolved "https://registry.npmjs.org/notistack/-/notistack-3.0.2.tgz#009799c3fccddeffac58565ba1657d27616dfabd" + integrity sha512-0R+/arLYbK5Hh7mEfR2adt0tyXJcCC9KkA2hc56FeWik2QN6Bm/S4uW+BjzDARsJth5u06nTjelSw/VSnB1YEA== dependencies: clsx "^1.1.0" goober "^2.0.33" @@ -8362,33 +8392,35 @@ nth-check@^2.0.1: boolbase "^1.0.0" nwsapi@^2.2.2: - version "2.2.12" - resolved "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.12.tgz#fb6af5c0ec35b27b4581eb3bbad34ec9e5c696f8" - integrity sha512-qXDmcVlZV4XRtKFzddidpfVP4oMSGhga+xdMc25mv8kaLUHtgzCDhUxkrN8exkGdTlLNaXj7CV3GtON7zuGZ+w== + version "2.2.16" + resolved "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.16.tgz#177760bba02c351df1d2644e220c31dfec8cdb43" + integrity sha512-F1I/bimDpj3ncaNDhfyMWuFqmQDBwDB0Fogc2qpL3BWvkQteFD/8BzWuIRl83rq0DXfm8SGt/HFhLXZyljTXcQ== "object-assign@^4.0.1", "object-assign@^4.1.0", "object-assign@^4.1.1": version "4.1.1" resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== -object-inspect@^1.13.1: - version "1.13.2" - resolved "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz#dea0088467fb991e67af4058147a24824a3043ff" - integrity sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g== +object-inspect@^1.13.3: + version "1.13.3" + resolved "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.3.tgz#f14c183de51130243d6d18ae149375ff50ea488a" + integrity sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA== object-keys@^1.1.1: version "1.1.1" resolved "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== -"object.assign@^4.1.4", "object.assign@^4.1.5": - version "4.1.5" - resolved "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz#3a833f9ab7fdb80fc9e8d2300c803d216d8fdbb0" - integrity sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ== +"object.assign@^4.1.4", "object.assign@^4.1.7": + version "4.1.7" + resolved "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz#8c14ca1a424c6a561b0bb2a22f66f5049a945d3d" + integrity sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw== dependencies: - call-bind "^1.0.5" + call-bind "^1.0.8" + call-bound "^1.0.3" define-properties "^1.2.1" - has-symbols "^1.0.3" + es-object-atoms "^1.0.0" + has-symbols "^1.1.0" object-keys "^1.1.1" object.entries@^1.1.8: @@ -8410,12 +8442,13 @@ object.fromentries@^2.0.8: es-abstract "^1.23.2" es-object-atoms "^1.0.0" -"object.values@^1.1.6", "object.values@^1.2.0": - version "1.2.0" - resolved "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz#65405a9d92cee68ac2d303002e0b8470a4d9ab1b" - integrity sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ== +"object.values@^1.1.6", "object.values@^1.2.1": + version "1.2.1" + resolved "https://registry.npmjs.org/object.values/-/object.values-1.2.1.tgz#deed520a50809ff7f75a7cfd4bc64c7a038c6216" + integrity sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA== dependencies: - call-bind "^1.0.7" + call-bind "^1.0.8" + call-bound "^1.0.3" define-properties "^1.2.1" es-object-atoms "^1.0.0" @@ -8477,6 +8510,27 @@ os-filter-obj@^2.0.0: dependencies: arch "^2.1.0" +ow@^2.0.0: + version "2.0.0" + resolved "https://registry.npmjs.org/ow/-/ow-2.0.0.tgz#07690490ac9783b37241c4ebee32dfcab1b20ee1" + integrity sha512-ESUigmGrdhUZ2nQSFNkeKSl6ZRPupXzprMs3yF9DYlNVpJ8XAjM/fI9RUZxA7PI1K9HQDCCvBo1jr/GEIo9joQ== + dependencies: + "@sindresorhus/is" "^6.3.0" + callsites "^4.1.0" + dot-prop "^8.0.2" + environment "^1.0.0" + fast-equals "^5.0.1" + is-identifier "^1.0.0" + +own-keys@^1.0.1: + version "1.0.1" + resolved "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz#e4006910a2bf913585289676eebd6f390cf51358" + integrity sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg== + dependencies: + get-intrinsic "^1.2.6" + object-keys "^1.1.1" + safe-push-apply "^1.0.0" + p-cancelable@^0.3.0: version "0.3.0" resolved "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz#b9e123800bcebb7ac13a479be195b507b98d30fa" @@ -8567,6 +8621,11 @@ p-map@^4.0.0: dependencies: aggregate-error "^3.0.0" +p-map@^7.0.2: + version "7.0.3" + resolved "https://registry.npmjs.org/p-map/-/p-map-7.0.3.tgz#7ac210a2d36f81ec28b736134810f7ba4418cdb6" + integrity sha512-VkndIv2fIB99swvQoA65bm+fsmt6UNdGeIB0oxBs+WhAhdh08QA04JXpI7rbB9r08/nkbysKoya9rtDERYOYMA== + p-pipe@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/p-pipe/-/p-pipe-4.0.0.tgz#7e5424569351b2ab452a47826acb93ce09ad6a2c" @@ -8605,9 +8664,9 @@ p-try@^2.0.0: integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== package-json-from-dist@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz#e501cd3094b278495eb4258d4c9f6d5ac3019f00" - integrity sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw== + version "1.0.1" + resolved "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz#4f1471a010827a86f94cfd9b0727e36d267de505" + integrity sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw== "pako@^1.0.0", "pako@^1.0.4", "pako@~1.0.5": version "1.0.11" @@ -8651,11 +8710,11 @@ parent-module@^1.0.0: lines-and-columns "^1.1.6" "parse5@^7.0.0", "parse5@^7.1.1": - version "7.1.2" - resolved "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz#0736bebbfd77793823240a23b7fc5e010b7f8e32" - integrity sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw== + version "7.2.1" + resolved "https://registry.npmjs.org/parse5/-/parse5-7.2.1.tgz#8928f55915e6125f430cc44309765bf17556a33a" + integrity sha512-BuBYQYlv1ckiPdQi/ohiivi9Sagc9JG+Ozs0r7b/0iK3sKmrb0b9FdWdBbOdx6hBCM/F9Ir82ofnBhtZOjCRPQ== dependencies: - entities "^4.4.0" + entities "^4.5.0" path-browserify@^1.0.0: version "1.0.1" @@ -8739,7 +8798,7 @@ paths-js@^0.4.11: resolved "https://registry.npmjs.org/paths-js/-/paths-js-0.4.11.tgz#b2a9d5f94ee9949aa8fee945f78a12abff44599e" integrity sha512-3mqcLomDBXOo7Fo+UlaenG6f71bk1ZezPQy2JCmYHy2W2k5VKpP+Jbin9H0bjXynelTbglCqdFhSEkeIkKTYUA== -"pbkdf2@^3.0.3", "pbkdf2@^3.1.2": +pbkdf2@^3.1.2: version "3.1.2" resolved "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz#dd822aa0887580e52f1a039dc3eda108efae3075" integrity sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA== @@ -8750,20 +8809,20 @@ paths-js@^0.4.11: safe-buffer "^5.0.1" sha.js "^2.4.8" -peek-readable@^4.1.0: - version "4.1.0" - resolved "https://registry.npmjs.org/peek-readable/-/peek-readable-4.1.0.tgz#4ece1111bf5c2ad8867c314c81356847e8a62e72" - integrity sha512-ZI3LnwUv5nOGbQzD9c2iDG6toheuXSZP5esSHBjopsXH4dg19soufvpUGA3uohi5anFtGb2lhAVdHzH6R/Evvg== +peek-readable@^5.3.1: + version "5.3.1" + resolved "https://registry.npmjs.org/peek-readable/-/peek-readable-5.3.1.tgz#9cc2c275cceda9f3d07a988f4f664c2080387dff" + integrity sha512-GVlENSDW6KHaXcd9zkZltB7tCLosKB/4Hg0fqBJkAoBgYG2Tn1xtMgXtSUuMU9AK/gCm/tTdT8mgAeF4YNeeqw== pend@~1.2.0: version "1.2.0" resolved "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg== -"picocolors@^1.0.0", "picocolors@^1.0.1": - version "1.0.1" - resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz#a8ad579b571952f0e5d25892de5445bcfe25aaa1" - integrity sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew== +"picocolors@^1.0.0", "picocolors@^1.0.1", "picocolors@^1.1.1": + version "1.1.1" + resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b" + integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA== "picomatch@^2.0.4", "picomatch@^2.2.3", "picomatch@^2.3.1": version "2.3.1" @@ -8826,97 +8885,53 @@ possible-typed-array-names@^1.0.0: resolved "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz#89bb63c6fada2c3e90adc4a647beeeb39cc7bf8f" integrity sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q== -postcss-calc@^8.2.3: - version "8.2.4" - resolved "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz#77b9c29bfcbe8a07ff6693dc87050828889739a5" - integrity sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q== +postcss-calc@^10.0.2: + version "10.1.0" + resolved "https://registry.npmjs.org/postcss-calc/-/postcss-calc-10.1.0.tgz#82548b9d52891b87cf6181a445bea4b78e2eedfb" + integrity sha512-uQ/LDGsf3mgsSUEXmAt3VsCSHR3aKqtEIkmB+4PhzYwRYOW5MZs/GhCCFpsOtJJkP6EC6uGipbrnaTjqaJZcJw== dependencies: - postcss-selector-parser "^6.0.9" + postcss-selector-parser "^7.0.0" postcss-value-parser "^4.2.0" -postcss-calc@^9.0.1: - version "9.0.1" - resolved "https://registry.npmjs.org/postcss-calc/-/postcss-calc-9.0.1.tgz#a744fd592438a93d6de0f1434c572670361eb6c6" - integrity sha512-TipgjGyzP5QzEhsOZUaIkeO5mKeMFpebWzRogWG/ysonUlnHcq5aJe0jOjpfzUU8PeSaBQnrE8ehR0QA5vs8PQ== +postcss-colormin@^7.0.2: + version "7.0.2" + resolved "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-7.0.2.tgz#6f3c53c13158168669f45adc3926f35cb240ef8e" + integrity sha512-YntRXNngcvEvDbEjTdRWGU606eZvB5prmHG4BF0yLmVpamXbpsRJzevyy6MZVyuecgzI2AWAlvFi8DAeCqwpvA== dependencies: - postcss-selector-parser "^6.0.11" - postcss-value-parser "^4.2.0" - -postcss-colormin@^5.3.1: - version "5.3.1" - resolved "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.1.tgz#86c27c26ed6ba00d96c79e08f3ffb418d1d1988f" - integrity sha512-UsWQG0AqTFQmpBegeLLc1+c3jIqBNB0zlDGRWR+dQ3pRKJL1oeMzyqmH3o2PIfn9MBdNrVPWhDbT769LxCTLJQ== - dependencies: - browserslist "^4.21.4" - caniuse-api "^3.0.0" - colord "^2.9.1" - postcss-value-parser "^4.2.0" - -postcss-colormin@^6.1.0: - version "6.1.0" - resolved "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-6.1.0.tgz#076e8d3fb291fbff7b10e6b063be9da42ff6488d" - integrity sha512-x9yX7DOxeMAR+BgGVnNSAxmAj98NX/YxEMNFP+SDCEeNLb2r3i6Hh1ksMsnW8Ub5SLCpbescQqn9YEbE9554Sw== - dependencies: - browserslist "^4.23.0" + browserslist "^4.23.3" caniuse-api "^3.0.0" colord "^2.9.3" postcss-value-parser "^4.2.0" -postcss-convert-values@^5.1.3: - version "5.1.3" - resolved "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.3.tgz#04998bb9ba6b65aa31035d669a6af342c5f9d393" - integrity sha512-82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA== +postcss-convert-values@^7.0.4: + version "7.0.4" + resolved "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-7.0.4.tgz#fc13ecedded6365f3c794b502dbcf77d298da12c" + integrity sha512-e2LSXPqEHVW6aoGbjV9RsSSNDO3A0rZLCBxN24zvxF25WknMPpX8Dm9UxxThyEbaytzggRuZxaGXqaOhxQ514Q== dependencies: - browserslist "^4.21.4" + browserslist "^4.23.3" postcss-value-parser "^4.2.0" -postcss-convert-values@^6.1.0: - version "6.1.0" - resolved "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-6.1.0.tgz#3498387f8efedb817cbc63901d45bd1ceaa40f48" - integrity sha512-zx8IwP/ts9WvUM6NkVSkiU902QZL1bwPhaVaLynPtCsOTqp+ZKbNi+s6XJg3rfqpKGA/oc7Oxk5t8pOQJcwl/w== +postcss-discard-comments@^7.0.3: + version "7.0.3" + resolved "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-7.0.3.tgz#9c414e8ee99d3514ad06a3465ccc20ec1dbce780" + integrity sha512-q6fjd4WU4afNhWOA2WltHgCbkRhZPgQe7cXF74fuVB/ge4QbM9HEaOIzGSiMvM+g/cOsNAUGdf2JDzqA2F8iLA== dependencies: - browserslist "^4.23.0" - postcss-value-parser "^4.2.0" + postcss-selector-parser "^6.1.2" -postcss-discard-comments@^5.1.2: - version "5.1.2" - resolved "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz#8df5e81d2925af2780075840c1526f0660e53696" - integrity sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ== +postcss-discard-duplicates@^7.0.1: + version "7.0.1" + resolved "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-7.0.1.tgz#f87f2fe47d8f01afb1e98361c1db3ce1e8afd1a3" + integrity sha512-oZA+v8Jkpu1ct/xbbrntHRsfLGuzoP+cpt0nJe5ED2FQF8n8bJtn7Bo28jSmBYwqgqnqkuSXJfSUEE7if4nClQ== -postcss-discard-comments@^6.0.2: - version "6.0.2" - resolved "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-6.0.2.tgz#e768dcfdc33e0216380623652b0a4f69f4678b6c" - integrity sha512-65w/uIqhSBBfQmYnG92FO1mWZjJ4GL5b8atm5Yw2UgrwD7HiNiSSNwJor1eCFGzUgYnN/iIknhNRVqjrrpuglw== +postcss-discard-empty@^7.0.0: + version "7.0.0" + resolved "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-7.0.0.tgz#218829d1ef0a5d5142dd62f0aa60e00e599d2033" + integrity sha512-e+QzoReTZ8IAwhnSdp/++7gBZ/F+nBq9y6PomfwORfP7q9nBpK5AMP64kOt0bA+lShBFbBDcgpJ3X4etHg4lzA== -postcss-discard-duplicates@^5.1.0: - version "5.1.0" - resolved "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz#9eb4fe8456706a4eebd6d3b7b777d07bad03e848" - integrity sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw== - -postcss-discard-duplicates@^6.0.3: - version "6.0.3" - resolved "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-6.0.3.tgz#d121e893c38dc58a67277f75bb58ba43fce4c3eb" - integrity sha512-+JA0DCvc5XvFAxwx6f/e68gQu/7Z9ud584VLmcgto28eB8FqSFZwtrLwB5Kcp70eIoWP/HXqz4wpo8rD8gpsTw== - -postcss-discard-empty@^5.1.1: - version "5.1.1" - resolved "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz#e57762343ff7f503fe53fca553d18d7f0c369c6c" - integrity sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A== - -postcss-discard-empty@^6.0.3: - version "6.0.3" - resolved "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-6.0.3.tgz#ee39c327219bb70473a066f772621f81435a79d9" - integrity sha512-znyno9cHKQsK6PtxL5D19Fj9uwSzC2mB74cpT66fhgOadEUPyXFkbgwm5tvc3bt3NAy8ltE5MrghxovZRVnOjQ== - -postcss-discard-overridden@^5.1.0: - version "5.1.0" - resolved "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz#7e8c5b53325747e9d90131bb88635282fb4a276e" - integrity sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw== - -postcss-discard-overridden@^6.0.2: - version "6.0.2" - resolved "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-6.0.2.tgz#4e9f9c62ecd2df46e8fdb44dc17e189776572e2d" - integrity sha512-j87xzI4LUggC5zND7KdjsI25APtyMuynXZSujByMaav2roV6OZX+8AaCUcZSWqckZpjAjRyFDdpqybgjFO0HJQ== +postcss-discard-overridden@^7.0.0: + version "7.0.0" + resolved "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-7.0.0.tgz#b123ea51e3d4e1d0a254cf71eaff1201926d319c" + integrity sha512-GmNAzx88u3k2+sBTZrJSDauR0ccpE24omTQCVmaTTZFz1du6AasspjaUPMJ2ud4RslZpoFKyf+6MSPETLojc6w== postcss-loader@^8.1.1: version "8.1.1" @@ -8927,105 +8942,56 @@ postcss-loader@^8.1.1: jiti "^1.20.0" semver "^7.5.4" -postcss-merge-longhand@^5.1.7: - version "5.1.7" - resolved "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.7.tgz#24a1bdf402d9ef0e70f568f39bdc0344d568fb16" - integrity sha512-YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ== +postcss-merge-longhand@^7.0.4: + version "7.0.4" + resolved "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-7.0.4.tgz#a52d0662b4b29420f3b64a8d5b0ac5133d8db776" + integrity sha512-zer1KoZA54Q8RVHKOY5vMke0cCdNxMP3KBfDerjH/BYHh4nCIh+1Yy0t1pAEQF18ac/4z3OFclO+ZVH8azjR4A== dependencies: postcss-value-parser "^4.2.0" - stylehacks "^5.1.1" + stylehacks "^7.0.4" -postcss-merge-longhand@^6.0.5: - version "6.0.5" - resolved "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-6.0.5.tgz#ba8a8d473617c34a36abbea8dda2b215750a065a" - integrity sha512-5LOiordeTfi64QhICp07nzzuTDjNSO8g5Ksdibt44d+uvIIAE1oZdRn8y/W5ZtYgRH/lnLDlvi9F8btZcVzu3w== +postcss-merge-rules@^7.0.4: + version "7.0.4" + resolved "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-7.0.4.tgz#648cc864d3121e6ec72c2a4f08df1cc801e60ce8" + integrity sha512-ZsaamiMVu7uBYsIdGtKJ64PkcQt6Pcpep/uO90EpLS3dxJi6OXamIobTYcImyXGoW0Wpugh7DSD3XzxZS9JCPg== dependencies: - postcss-value-parser "^4.2.0" - stylehacks "^6.1.1" - -postcss-merge-rules@^5.1.4: - version "5.1.4" - resolved "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.4.tgz#2f26fa5cacb75b1402e213789f6766ae5e40313c" - integrity sha512-0R2IuYpgU93y9lhVbO/OylTtKMVcHb67zjWIfCiKR9rWL3GUk1677LAqD/BcHizukdZEjT8Ru3oHRoAYoJy44g== - dependencies: - browserslist "^4.21.4" + browserslist "^4.23.3" caniuse-api "^3.0.0" - cssnano-utils "^3.1.0" - postcss-selector-parser "^6.0.5" + cssnano-utils "^5.0.0" + postcss-selector-parser "^6.1.2" -postcss-merge-rules@^6.1.1: - version "6.1.1" - resolved "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-6.1.1.tgz#7aa539dceddab56019469c0edd7d22b64c3dea9d" - integrity sha512-KOdWF0gju31AQPZiD+2Ar9Qjowz1LTChSjFFbS+e2sFgc4uHOp3ZvVX4sNeTlk0w2O31ecFGgrFzhO0RSWbWwQ== - dependencies: - browserslist "^4.23.0" - caniuse-api "^3.0.0" - cssnano-utils "^4.0.2" - postcss-selector-parser "^6.0.16" - -postcss-minify-font-values@^5.1.0: - version "5.1.0" - resolved "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz#f1df0014a726083d260d3bd85d7385fb89d1f01b" - integrity sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA== +postcss-minify-font-values@^7.0.0: + version "7.0.0" + resolved "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-7.0.0.tgz#d16a75a2548e000779566b3568fc874ee5d0aa17" + integrity sha512-2ckkZtgT0zG8SMc5aoNwtm5234eUx1GGFJKf2b1bSp8UflqaeFzR50lid4PfqVI9NtGqJ2J4Y7fwvnP/u1cQog== dependencies: postcss-value-parser "^4.2.0" -postcss-minify-font-values@^6.1.0: - version "6.1.0" - resolved "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-6.1.0.tgz#a0e574c02ee3f299be2846369211f3b957ea4c59" - integrity sha512-gklfI/n+9rTh8nYaSJXlCo3nOKqMNkxuGpTn/Qm0gstL3ywTr9/WRKznE+oy6fvfolH6dF+QM4nCo8yPLdvGJg== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-minify-gradients@^5.1.1: - version "5.1.1" - resolved "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz#f1fe1b4f498134a5068240c2f25d46fcd236ba2c" - integrity sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw== - dependencies: - colord "^2.9.1" - cssnano-utils "^3.1.0" - postcss-value-parser "^4.2.0" - -postcss-minify-gradients@^6.0.3: - version "6.0.3" - resolved "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-6.0.3.tgz#ca3eb55a7bdb48a1e187a55c6377be918743dbd6" - integrity sha512-4KXAHrYlzF0Rr7uc4VrfwDJ2ajrtNEpNEuLxFgwkhFZ56/7gaE4Nr49nLsQDZyUe+ds+kEhf+YAUolJiYXF8+Q== +postcss-minify-gradients@^7.0.0: + version "7.0.0" + resolved "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-7.0.0.tgz#f6d84456e6d49164a55d0e45bb1b1809c6cf0959" + integrity sha512-pdUIIdj/C93ryCHew0UgBnL2DtUS3hfFa5XtERrs4x+hmpMYGhbzo6l/Ir5de41O0GaKVpK1ZbDNXSY6GkXvtg== dependencies: colord "^2.9.3" - cssnano-utils "^4.0.2" + cssnano-utils "^5.0.0" postcss-value-parser "^4.2.0" -postcss-minify-params@^5.1.4: - version "5.1.4" - resolved "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.4.tgz#c06a6c787128b3208b38c9364cfc40c8aa5d7352" - integrity sha512-+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw== +postcss-minify-params@^7.0.2: + version "7.0.2" + resolved "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-7.0.2.tgz#264a76e25f202d8b5ca5290569c0e8c3ac599dfe" + integrity sha512-nyqVLu4MFl9df32zTsdcLqCFfE/z2+f8GE1KHPxWOAmegSo6lpV2GNy5XQvrzwbLmiU7d+fYay4cwto1oNdAaQ== dependencies: - browserslist "^4.21.4" - cssnano-utils "^3.1.0" + browserslist "^4.23.3" + cssnano-utils "^5.0.0" postcss-value-parser "^4.2.0" -postcss-minify-params@^6.1.0: - version "6.1.0" - resolved "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-6.1.0.tgz#54551dec77b9a45a29c3cb5953bf7325a399ba08" - integrity sha512-bmSKnDtyyE8ujHQK0RQJDIKhQ20Jq1LYiez54WiaOoBtcSuflfK3Nm596LvbtlFcpipMjgClQGyGr7GAs+H1uA== +postcss-minify-selectors@^7.0.4: + version "7.0.4" + resolved "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-7.0.4.tgz#2b69c99ec48a1c223fce4840609d9c53340a11f5" + integrity sha512-JG55VADcNb4xFCf75hXkzc1rNeURhlo7ugf6JjiiKRfMsKlDzN9CXHZDyiG6x/zGchpjQS+UAgb1d4nqXqOpmA== dependencies: - browserslist "^4.23.0" - cssnano-utils "^4.0.2" - postcss-value-parser "^4.2.0" - -postcss-minify-selectors@^5.2.1: - version "5.2.1" - resolved "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz#d4e7e6b46147b8117ea9325a915a801d5fe656c6" - integrity sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg== - dependencies: - postcss-selector-parser "^6.0.5" - -postcss-minify-selectors@^6.0.4: - version "6.0.4" - resolved "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-6.0.4.tgz#197f7d72e6dd19eed47916d575d69dc38b396aff" - integrity sha512-L8dZSwNLgK7pjTto9PzWRoMbnLq5vsZSTu8+j1P/2GB8qdtGQfn+K1uSvFgYvgh83cbyxT5m43ZZhUMTJDSClQ== - dependencies: - postcss-selector-parser "^6.0.16" + cssesc "^3.0.0" + postcss-selector-parser "^6.1.2" postcss-modules-extract-imports@^3.1.0: version "3.1.0" @@ -9033,20 +8999,20 @@ postcss-modules-extract-imports@^3.1.0: integrity sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q== postcss-modules-local-by-default@^4.0.5: - version "4.0.5" - resolved "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.5.tgz#f1b9bd757a8edf4d8556e8d0f4f894260e3df78f" - integrity sha512-6MieY7sIfTK0hYfafw1OMEG+2bg8Q1ocHCpoWLqOKj3JXlKu4G7btkmM/B7lFubYkYWmRSPLZi5chid63ZaZYw== + version "4.2.0" + resolved "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.2.0.tgz#d150f43837831dae25e4085596e84f6f5d6ec368" + integrity sha512-5kcJm/zk+GJDSfw+V/42fJ5fhjL5YbFDl8nVdXkJPLLW+Vf9mTD5Xe0wqIaDnLuL2U6cDNpTr+UQ+v2HWIBhzw== dependencies: icss-utils "^5.0.0" - postcss-selector-parser "^6.0.2" + postcss-selector-parser "^7.0.0" postcss-value-parser "^4.1.0" postcss-modules-scope@^3.2.0: - version "3.2.0" - resolved "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.0.tgz#a43d28289a169ce2c15c00c4e64c0858e43457d5" - integrity sha512-oq+g1ssrsZOsx9M96c5w8laRmvEu9C3adDSjI8oTcbfkrTE8hx/zfyobUoWIxaKPO8bt6S62kxpw5GqypEw1QQ== + version "3.2.1" + resolved "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.1.tgz#1bbccddcb398f1d7a511e0a2d1d047718af4078c" + integrity sha512-m9jZstCVaqGjTAuny8MdgE88scJnCiQSlSrOWcTQgM2t32UBe+MUmFSO5t7VMSfAf/FJKImAxBav8ooCHJXCJA== dependencies: - postcss-selector-parser "^6.0.4" + postcss-selector-parser "^7.0.0" postcss-modules-values@^4.0.0: version "4.0.0" @@ -9055,178 +9021,92 @@ postcss-modules-values@^4.0.0: dependencies: icss-utils "^5.0.0" -postcss-normalize-charset@^5.1.0: - version "5.1.0" - resolved "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz#9302de0b29094b52c259e9b2cf8dc0879879f0ed" - integrity sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg== +postcss-normalize-charset@^7.0.0: + version "7.0.0" + resolved "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-7.0.0.tgz#92244ae73c31bf8f8885d5f16ff69e857ac6c001" + integrity sha512-ABisNUXMeZeDNzCQxPxBCkXexvBrUHV+p7/BXOY+ulxkcjUZO0cp8ekGBwvIh2LbCwnWbyMPNJVtBSdyhM2zYQ== -postcss-normalize-charset@^6.0.2: - version "6.0.2" - resolved "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-6.0.2.tgz#1ec25c435057a8001dac942942a95ffe66f721e1" - integrity sha512-a8N9czmdnrjPHa3DeFlwqst5eaL5W8jYu3EBbTTkI5FHkfMhFZh1EGbku6jhHhIzTA6tquI2P42NtZ59M/H/kQ== - -postcss-normalize-display-values@^5.1.0: - version "5.1.0" - resolved "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz#72abbae58081960e9edd7200fcf21ab8325c3da8" - integrity sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA== +postcss-normalize-display-values@^7.0.0: + version "7.0.0" + resolved "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-7.0.0.tgz#01fb50e5e97ef8935363629bea5a6d3b3aac1342" + integrity sha512-lnFZzNPeDf5uGMPYgGOw7v0BfB45+irSRz9gHQStdkkhiM0gTfvWkWB5BMxpn0OqgOQuZG/mRlZyJxp0EImr2Q== dependencies: postcss-value-parser "^4.2.0" -postcss-normalize-display-values@^6.0.2: - version "6.0.2" - resolved "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-6.0.2.tgz#54f02764fed0b288d5363cbb140d6950dbbdd535" - integrity sha512-8H04Mxsb82ON/aAkPeq8kcBbAtI5Q2a64X/mnRRfPXBq7XeogoQvReqxEfc0B4WPq1KimjezNC8flUtC3Qz6jg== +postcss-normalize-positions@^7.0.0: + version "7.0.0" + resolved "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-7.0.0.tgz#4eebd7c9d3dde40c97b8047cad38124fc844c463" + integrity sha512-I0yt8wX529UKIGs2y/9Ybs2CelSvItfmvg/DBIjTnoUSrPxSV7Z0yZ8ShSVtKNaV/wAY+m7bgtyVQLhB00A1NQ== dependencies: postcss-value-parser "^4.2.0" -postcss-normalize-positions@^5.1.1: - version "5.1.1" - resolved "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz#ef97279d894087b59325b45c47f1e863daefbb92" - integrity sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg== +postcss-normalize-repeat-style@^7.0.0: + version "7.0.0" + resolved "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-7.0.0.tgz#0cb784655d5714d29bd3bda6dee2fb628aa7227b" + integrity sha512-o3uSGYH+2q30ieM3ppu9GTjSXIzOrRdCUn8UOMGNw7Af61bmurHTWI87hRybrP6xDHvOe5WlAj3XzN6vEO8jLw== dependencies: postcss-value-parser "^4.2.0" -postcss-normalize-positions@^6.0.2: - version "6.0.2" - resolved "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-6.0.2.tgz#e982d284ec878b9b819796266f640852dbbb723a" - integrity sha512-/JFzI441OAB9O7VnLA+RtSNZvQ0NCFZDOtp6QPFo1iIyawyXg0YI3CYM9HBy1WvwCRHnPep/BvI1+dGPKoXx/Q== +postcss-normalize-string@^7.0.0: + version "7.0.0" + resolved "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-7.0.0.tgz#a119d3e63a9614570d8413d572fb9fc8c6a64e8c" + integrity sha512-w/qzL212DFVOpMy3UGyxrND+Kb0fvCiBBujiaONIihq7VvtC7bswjWgKQU/w4VcRyDD8gpfqUiBQ4DUOwEJ6Qg== dependencies: postcss-value-parser "^4.2.0" -postcss-normalize-repeat-style@^5.1.1: - version "5.1.1" - resolved "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz#e9eb96805204f4766df66fd09ed2e13545420fb2" - integrity sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g== +postcss-normalize-timing-functions@^7.0.0: + version "7.0.0" + resolved "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-7.0.0.tgz#99d0ee8c4b23b7f4355fafb91385833b9b07108b" + integrity sha512-tNgw3YV0LYoRwg43N3lTe3AEWZ66W7Dh7lVEpJbHoKOuHc1sLrzMLMFjP8SNULHaykzsonUEDbKedv8C+7ej6g== dependencies: postcss-value-parser "^4.2.0" -postcss-normalize-repeat-style@^6.0.2: - version "6.0.2" - resolved "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-6.0.2.tgz#f8006942fd0617c73f049dd8b6201c3a3040ecf3" - integrity sha512-YdCgsfHkJ2jEXwR4RR3Tm/iOxSfdRt7jplS6XRh9Js9PyCR/aka/FCb6TuHT2U8gQubbm/mPmF6L7FY9d79VwQ== +postcss-normalize-unicode@^7.0.2: + version "7.0.2" + resolved "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-7.0.2.tgz#095f8d36ea29adfdf494069c1de101112992a713" + integrity sha512-ztisabK5C/+ZWBdYC+Y9JCkp3M9qBv/XFvDtSw0d/XwfT3UaKeW/YTm/MD/QrPNxuecia46vkfEhewjwcYFjkg== + dependencies: + browserslist "^4.23.3" + postcss-value-parser "^4.2.0" + +postcss-normalize-url@^7.0.0: + version "7.0.0" + resolved "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-7.0.0.tgz#c88cb7cf8952d3ff631e4eba924e7b060ca802f6" + integrity sha512-+d7+PpE+jyPX1hDQZYG+NaFD+Nd2ris6r8fPTBAjE8z/U41n/bib3vze8x7rKs5H1uEw5ppe9IojewouHk0klQ== dependencies: postcss-value-parser "^4.2.0" -postcss-normalize-string@^5.1.0: - version "5.1.0" - resolved "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz#411961169e07308c82c1f8c55f3e8a337757e228" - integrity sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w== +postcss-normalize-whitespace@^7.0.0: + version "7.0.0" + resolved "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-7.0.0.tgz#46b025f0bea72139ddee63015619b0c21cebd845" + integrity sha512-37/toN4wwZErqohedXYqWgvcHUGlT8O/m2jVkAfAe9Bd4MzRqlBmXrJRePH0e9Wgnz2X7KymTgTOaaFizQe3AQ== dependencies: postcss-value-parser "^4.2.0" -postcss-normalize-string@^6.0.2: - version "6.0.2" - resolved "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-6.0.2.tgz#e3cc6ad5c95581acd1fc8774b309dd7c06e5e363" - integrity sha512-vQZIivlxlfqqMp4L9PZsFE4YUkWniziKjQWUtsxUiVsSSPelQydwS8Wwcuw0+83ZjPWNTl02oxlIvXsmmG+CiQ== +postcss-ordered-values@^7.0.1: + version "7.0.1" + resolved "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-7.0.1.tgz#8b4b5b8070ca7756bd49f07d5edf274b8f6782e0" + integrity sha512-irWScWRL6nRzYmBOXReIKch75RRhNS86UPUAxXdmW/l0FcAsg0lvAXQCby/1lymxn/o0gVa6Rv/0f03eJOwHxw== dependencies: + cssnano-utils "^5.0.0" postcss-value-parser "^4.2.0" -postcss-normalize-timing-functions@^5.1.0: - version "5.1.0" - resolved "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz#d5614410f8f0b2388e9f240aa6011ba6f52dafbb" - integrity sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg== +postcss-reduce-initial@^7.0.2: + version "7.0.2" + resolved "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-7.0.2.tgz#3dc085347a5943e18547d4b0aa5bd4ff5a93b2c5" + integrity sha512-pOnu9zqQww7dEKf62Nuju6JgsW2V0KRNBHxeKohU+JkHd/GAH5uvoObqFLqkeB2n20mr6yrlWDvo5UBU5GnkfA== dependencies: - postcss-value-parser "^4.2.0" - -postcss-normalize-timing-functions@^6.0.2: - version "6.0.2" - resolved "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-6.0.2.tgz#40cb8726cef999de984527cbd9d1db1f3e9062c0" - integrity sha512-a+YrtMox4TBtId/AEwbA03VcJgtyW4dGBizPl7e88cTFULYsprgHWTbfyjSLyHeBcK/Q9JhXkt2ZXiwaVHoMzA== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-normalize-unicode@^5.1.1: - version "5.1.1" - resolved "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.1.tgz#f67297fca3fea7f17e0d2caa40769afc487aa030" - integrity sha512-qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA== - dependencies: - browserslist "^4.21.4" - postcss-value-parser "^4.2.0" - -postcss-normalize-unicode@^6.1.0: - version "6.1.0" - resolved "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-6.1.0.tgz#aaf8bbd34c306e230777e80f7f12a4b7d27ce06e" - integrity sha512-QVC5TQHsVj33otj8/JD869Ndr5Xcc/+fwRh4HAsFsAeygQQXm+0PySrKbr/8tkDKzW+EVT3QkqZMfFrGiossDg== - dependencies: - browserslist "^4.23.0" - postcss-value-parser "^4.2.0" - -postcss-normalize-url@^5.1.0: - version "5.1.0" - resolved "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz#ed9d88ca82e21abef99f743457d3729a042adcdc" - integrity sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew== - dependencies: - normalize-url "^6.0.1" - postcss-value-parser "^4.2.0" - -postcss-normalize-url@^6.0.2: - version "6.0.2" - resolved "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-6.0.2.tgz#292792386be51a8de9a454cb7b5c58ae22db0f79" - integrity sha512-kVNcWhCeKAzZ8B4pv/DnrU1wNh458zBNp8dh4y5hhxih5RZQ12QWMuQrDgPRw3LRl8mN9vOVfHl7uhvHYMoXsQ== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-normalize-whitespace@^5.1.1: - version "5.1.1" - resolved "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz#08a1a0d1ffa17a7cc6efe1e6c9da969cc4493cfa" - integrity sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-normalize-whitespace@^6.0.2: - version "6.0.2" - resolved "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-6.0.2.tgz#fbb009e6ebd312f8b2efb225c2fcc7cf32b400cd" - integrity sha512-sXZ2Nj1icbJOKmdjXVT9pnyHQKiSAyuNQHSgRCUgThn2388Y9cGVDR+E9J9iAYbSbLHI+UUwLVl1Wzco/zgv0Q== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-ordered-values@^5.1.3: - version "5.1.3" - resolved "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz#b6fd2bd10f937b23d86bc829c69e7732ce76ea38" - integrity sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ== - dependencies: - cssnano-utils "^3.1.0" - postcss-value-parser "^4.2.0" - -postcss-ordered-values@^6.0.2: - version "6.0.2" - resolved "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-6.0.2.tgz#366bb663919707093451ab70c3f99c05672aaae5" - integrity sha512-VRZSOB+JU32RsEAQrO94QPkClGPKJEL/Z9PCBImXMhIeK5KAYo6slP/hBYlLgrCjFxyqvn5VC81tycFEDBLG1Q== - dependencies: - cssnano-utils "^4.0.2" - postcss-value-parser "^4.2.0" - -postcss-reduce-initial@^5.1.2: - version "5.1.2" - resolved "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.2.tgz#798cd77b3e033eae7105c18c9d371d989e1382d6" - integrity sha512-dE/y2XRaqAi6OvjzD22pjTUQ8eOfc6m/natGHgKFBK9DxFmIm69YmaRVQrGgFlEfc1HePIurY0TmDeROK05rIg== - dependencies: - browserslist "^4.21.4" + browserslist "^4.23.3" caniuse-api "^3.0.0" -postcss-reduce-initial@^6.1.0: - version "6.1.0" - resolved "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-6.1.0.tgz#4401297d8e35cb6e92c8e9586963e267105586ba" - integrity sha512-RarLgBK/CrL1qZags04oKbVbrrVK2wcxhvta3GCxrZO4zveibqbRPmm2VI8sSgCXwoUHEliRSbOfpR0b/VIoiw== - dependencies: - browserslist "^4.23.0" - caniuse-api "^3.0.0" - -postcss-reduce-transforms@^5.1.0: - version "5.1.0" - resolved "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz#333b70e7758b802f3dd0ddfe98bb1ccfef96b6e9" - integrity sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ== +postcss-reduce-transforms@^7.0.0: + version "7.0.0" + resolved "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-7.0.0.tgz#0386080a14e5faad9f8eda33375b79fe7c4f9677" + integrity sha512-pnt1HKKZ07/idH8cpATX/ujMbtOGhUfE+m8gbqwJE05aTaNw8gbo34a2e3if0xc0dlu75sUOiqvwCGY3fzOHew== dependencies: postcss-value-parser "^4.2.0" -postcss-reduce-transforms@^6.0.2: - version "6.0.2" - resolved "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-6.0.2.tgz#6fa2c586bdc091a7373caeee4be75a0f3e12965d" - integrity sha512-sB+Ya++3Xj1WaT9+5LOOdirAxP7dJZms3GRcYheSPi1PiTMigsxHAdkrbItHxwYHr4kt1zL7mmcHstgMYT+aiA== - dependencies: - postcss-value-parser "^4.2.0" - -"postcss-selector-parser@^6.0.11", "postcss-selector-parser@^6.0.16", "postcss-selector-parser@^6.0.2", "postcss-selector-parser@^6.0.4", "postcss-selector-parser@^6.0.5", "postcss-selector-parser@^6.0.9": +postcss-selector-parser@^6.1.2: version "6.1.2" resolved "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz#27ecb41fb0e3b6ba7a1ec84fff347f734c7929de" integrity sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg== @@ -9234,49 +9114,42 @@ postcss-reduce-transforms@^6.0.2: cssesc "^3.0.0" util-deprecate "^1.0.2" -postcss-svgo@^5.1.0: - version "5.1.0" - resolved "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz#0a317400ced789f233a28826e77523f15857d80d" - integrity sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA== +postcss-selector-parser@^7.0.0: + version "7.0.0" + resolved "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.0.0.tgz#41bd8b56f177c093ca49435f65731befe25d6b9c" + integrity sha512-9RbEr1Y7FFfptd/1eEdntyjMwLeghW1bHX9GWjXo19vx4ytPQhANltvVxDggzJl7mnWM+dX28kb6cyS/4iQjlQ== + dependencies: + cssesc "^3.0.0" + util-deprecate "^1.0.2" + +postcss-svgo@^7.0.1: + version "7.0.1" + resolved "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-7.0.1.tgz#2b63571d8e9568384df334bac9917baff4d23f58" + integrity sha512-0WBUlSL4lhD9rA5k1e5D8EN5wCEyZD6HJk0jIvRxl+FDVOMlJ7DePHYWGGVc5QRqrJ3/06FTXM0bxjmJpmTPSA== dependencies: postcss-value-parser "^4.2.0" - svgo "^2.7.0" + svgo "^3.3.2" -postcss-svgo@^6.0.3: - version "6.0.3" - resolved "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-6.0.3.tgz#1d6e180d6df1fa8a3b30b729aaa9161e94f04eaa" - integrity sha512-dlrahRmxP22bX6iKEjOM+c8/1p+81asjKT+V5lrgOH944ryx/OHpclnIbGsKVd3uWOXFLYJwCVf0eEkJGvO96g== +postcss-unique-selectors@^7.0.3: + version "7.0.3" + resolved "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-7.0.3.tgz#483fc11215b23d517d5d9bbe5833d9915619ca33" + integrity sha512-J+58u5Ic5T1QjP/LDV9g3Cx4CNOgB5vz+kM6+OxHHhFACdcDeKhBXjQmB7fnIZM12YSTvsL0Opwco83DmacW2g== dependencies: - postcss-value-parser "^4.2.0" - svgo "^3.2.0" - -postcss-unique-selectors@^5.1.1: - version "5.1.1" - resolved "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz#a9f273d1eacd09e9aa6088f4b0507b18b1b541b6" - integrity sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA== - dependencies: - postcss-selector-parser "^6.0.5" - -postcss-unique-selectors@^6.0.4: - version "6.0.4" - resolved "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-6.0.4.tgz#983ab308896b4bf3f2baaf2336e14e52c11a2088" - integrity sha512-K38OCaIrO8+PzpArzkLKB42dSARtC2tmG6PvD4b1o1Q2E9Os8jzfWFfSy/rixsHwohtsDdFtAWGjFVFUdwYaMg== - dependencies: - postcss-selector-parser "^6.0.16" + postcss-selector-parser "^6.1.2" "postcss-value-parser@^4.1.0", "postcss-value-parser@^4.2.0": version "4.2.0" resolved "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== -"postcss@^8.4.24", "postcss@^8.4.31", "postcss@^8.4.33": - version "8.4.41" - resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.41.tgz#d6104d3ba272d882fe18fc07d15dc2da62fa2681" - integrity sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ== +"postcss@^8.4.31", "postcss@^8.4.33", "postcss@^8.4.38": + version "8.5.1" + resolved "https://registry.npmjs.org/postcss/-/postcss-8.5.1.tgz#e2272a1f8a807fafa413218245630b5db10a3214" + integrity sha512-6oz2beyjc5VMn/KV1pPw8fliQkhBXrVn1Z3TVyqZxU8kZpzEKhBdmCFqI6ZbmGtamQvQGuU1sgPTk8ZrXDD7jQ== dependencies: - nanoid "^3.3.7" - picocolors "^1.0.1" - source-map-js "^1.2.0" + nanoid "^3.3.8" + picocolors "^1.1.1" + source-map-js "^1.2.1" precond@^0.2.3: version "0.2.3" @@ -9316,10 +9189,10 @@ pretty-format@^27.0.2: ansi-styles "^5.0.0" react-is "^18.0.0" -"proc-log@^4.1.0", "proc-log@^4.2.0": - version "4.2.0" - resolved "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz#b6f461e4026e75fdfe228b265e9f7a00779d7034" - integrity sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA== +proc-log@^5.0.0: + version "5.0.0" + resolved "https://registry.npmjs.org/proc-log/-/proc-log-5.0.0.tgz#e6c93cf37aef33f835c53485f314f50ea906a9d8" + integrity sha512-Azwzvl90HaF0aCz1JrDdXQykFakSSNPaPoiZ9fm5qJIMHioDZEi7OAdRwSm6rSoPtY3Qutnm3L7ogmg3dc+wbQ== process-nextick-args@~2.0.0: version "2.0.1" @@ -9377,11 +9250,13 @@ pseudomap@^1.0.2: integrity sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ== psl@^1.1.33: - version "1.9.0" - resolved "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7" - integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag== + version "1.15.0" + resolved "https://registry.npmjs.org/psl/-/psl-1.15.0.tgz#bdace31896f1d97cec6a79e8224898ce93d974c6" + integrity sha512-JZd3gMVBAVQkSs6HdNZo9Sdo0LNcQeMNP3CozBJb3JYC/QUYZTnKxP+f8oWRX4rHP5EurWxqAHTSwUCjlNKa1w== + dependencies: + punycode "^2.3.1" -public-encrypt@^4.0.0: +public-encrypt@^4.0.3: version "4.0.3" resolved "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0" integrity sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q== @@ -9394,9 +9269,9 @@ public-encrypt@^4.0.0: safe-buffer "^5.1.2" pump@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" - integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== + version "3.0.2" + resolved "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz#836f3edd6bc2ee599256c924ffe0d88573ddcbf8" + integrity sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw== dependencies: end-of-stream "^1.1.0" once "^1.3.1" @@ -9406,7 +9281,7 @@ pump@^3.0.0: resolved "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" integrity sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ== -"punycode@^2.1.0", "punycode@^2.1.1": +"punycode@^2.1.0", "punycode@^2.1.1", "punycode@^2.3.1": version "2.3.1" resolved "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5" integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg== @@ -9422,11 +9297,11 @@ q@^1.1.2: integrity sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw== qs@^6.12.3: - version "6.13.0" - resolved "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz#6ca3bd58439f7e245655798997787b0d88a51906" - integrity sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg== + version "6.14.0" + resolved "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz#c63fa40680d2c5c941412a0e899c89af60c0a930" + integrity sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w== dependencies: - side-channel "^1.0.6" + side-channel "^1.1.0" query-string@^5.0.1: version "5.1.1" @@ -9477,7 +9352,7 @@ randexp@0.4.6: dependencies: safe-buffer "^5.1.0" -randomfill@^1.0.3: +randomfill@^1.0.4: version "1.0.4" resolved "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458" integrity sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw== @@ -9544,13 +9419,13 @@ rc-menu@~9.8.4: rc-util "^5.27.0" "rc-motion@^2.0.0", "rc-motion@^2.4.3": - version "2.9.2" - resolved "https://registry.npmjs.org/rc-motion/-/rc-motion-2.9.2.tgz#f7c6d480250df8a512d0cfdce07ff3da906958cf" - integrity sha512-fUAhHKLDdkAXIDLH0GYwof3raS58dtNUmzLF2MeiR8o6n4thNpSDQhOqQzWE4WfFZDCi9VEN8n7tiB7czREcyw== + version "2.9.5" + resolved "https://registry.npmjs.org/rc-motion/-/rc-motion-2.9.5.tgz#12c6ead4fd355f94f00de9bb4f15df576d677e0c" + integrity sha512-w+XTUrfh7ArbYEd2582uDrEhmBHwK1ZENJiSJVb7uRxdE7qJSYjbO2eksRXmndqyKqKoYPc9ClpPh5242mV1vA== dependencies: "@babel/runtime" "^7.11.1" classnames "^2.2.1" - rc-util "^5.43.0" + rc-util "^5.44.0" rc-new-window@^0.1.13: version "0.1.13" @@ -9563,16 +9438,16 @@ rc-new-window@^0.1.13: lodash "^4.17.20" "rc-overflow@^1.2.0", "rc-overflow@^1.2.8": - version "1.3.2" - resolved "https://registry.npmjs.org/rc-overflow/-/rc-overflow-1.3.2.tgz#72ee49e85a1308d8d4e3bd53285dc1f3e0bcce2c" - integrity sha512-nsUm78jkYAoPygDAcGZeC2VwIg/IBGSodtOY3pMof4W3M9qRJgqaDYm03ZayHlde3I6ipliAxbN0RUcGf5KOzw== + version "1.4.1" + resolved "https://registry.npmjs.org/rc-overflow/-/rc-overflow-1.4.1.tgz#e1bcf0375979c24cffa2d87bf83a19ded5fcdf45" + integrity sha512-3MoPQQPV1uKyOMVNd6SZfONi+f3st0r8PksexIdBTeIYbMX0Jr+k7pHEDvsXtR4BpCv90/Pv2MovVNhktKrwvw== dependencies: "@babel/runtime" "^7.11.1" classnames "^2.2.1" rc-resize-observer "^1.0.0" rc-util "^5.37.0" -rc-resize-observer@^1.0.0: +rc-resize-observer@1.4.0: version "1.4.0" resolved "https://registry.npmjs.org/rc-resize-observer/-/rc-resize-observer-1.4.0.tgz#7bba61e6b3c604834980647cce6451914750d0cc" integrity sha512-PnMVyRid9JLxFavTjeDXEXo65HCRqbmLBw9xX9gfC4BZiSzbLXKzW3jPz+J0P71pLbD5tBMTT+mkstV5gD0c9Q== @@ -9605,18 +9480,18 @@ rc-tabs@~11.16.1: rc-motion "^2.0.0" rc-util "^5.19.2" -"rc-util@^5.12.0", "rc-util@^5.17.0", "rc-util@^5.19.2", "rc-util@^5.26.0", "rc-util@^5.27.0", "rc-util@^5.37.0", "rc-util@^5.38.0", "rc-util@^5.43.0", "rc-util@^5.5.0": - version "5.43.0" - resolved "https://registry.npmjs.org/rc-util/-/rc-util-5.43.0.tgz#bba91fbef2c3e30ea2c236893746f3e9b05ecc4c" - integrity sha512-AzC7KKOXFqAdIBqdGWepL9Xn7cm3vnAmjlHqUnoQaTMZYhM4VlXGLkkHHxj/BZ7Td0+SOPKB4RGPboBVKT9htw== +"rc-util@^5.12.0", "rc-util@^5.17.0", "rc-util@^5.19.2", "rc-util@^5.26.0", "rc-util@^5.27.0", "rc-util@^5.37.0", "rc-util@^5.38.0", "rc-util@^5.44.0", "rc-util@^5.5.0": + version "5.44.3" + resolved "https://registry.npmjs.org/rc-util/-/rc-util-5.44.3.tgz#9eca5039906446113c4032859f88c15234547961" + integrity sha512-q6KCcOFk3rv/zD3MckhJteZxb0VjAIFuf622B7ElK4vfrZdAzs16XR5p3VTdy3+U5jfJU5ACz4QnhLSuAGe5dA== dependencies: "@babel/runtime" "^7.18.3" react-is "^18.2.0" -re-resizable@6.9.17: - version "6.9.17" - resolved "https://registry.npmjs.org/re-resizable/-/re-resizable-6.9.17.tgz#78e4349934ff24a8fcb4b6b5a43ff9ed5f319d2a" - integrity sha512-OBqd1BwVXpEJJn/yYROG+CbeqIDBWIp6wathlpB0kzZWWZIY1gPTsgK2yJEui5hOvkCdC2mcexF2V3DZVfLq2g== +re-resizable@6.10.3: + version "6.10.3" + resolved "https://registry.npmjs.org/re-resizable/-/re-resizable-6.10.3.tgz#72c42532ede0cbcaf93308bcbfed782abbf97e79" + integrity sha512-zvWb7X3RJMA4cuSrqoxgs3KR+D+pEXnGrD2FAD6BMYAULnZsSF4b7AOVyG6pC3VVNVOtlagGDCDmZSwWLjjBBw== react-arborist@^3.2.0: version "3.4.0" @@ -9703,12 +9578,12 @@ react-dom@^18.2.0: prop-types "^15.8.1" react-dropzone@^14.2.1: - version "14.2.3" - resolved "https://registry.npmjs.org/react-dropzone/-/react-dropzone-14.2.3.tgz#0acab68308fda2d54d1273a1e626264e13d4e84b" - integrity sha512-O3om8I+PkFKbxCukfIR3QAGftYXDZfOE2N1mr/7qebQJHs7U+/RSL/9xomJNpRg9kM5h9soQSdf0Gc7OHF5Fug== + version "14.3.5" + resolved "https://registry.npmjs.org/react-dropzone/-/react-dropzone-14.3.5.tgz#1a8bd312c8a353ec78ef402842ccb3589c225add" + integrity sha512-9nDUaEEpqZLOz5v5SUcFA0CjM4vq8YbqO0WRls+EYT7+DvxUdzDPKNCPLqGfj3YL9MsniCLCD4RFA6M95V6KMQ== dependencies: - attr-accept "^2.2.2" - file-selector "^0.6.0" + attr-accept "^2.2.4" + file-selector "^2.1.0" prop-types "^15.8.1" react-frame-component@^5.2.6: @@ -9726,11 +9601,16 @@ react-is@^17.0.1: resolved "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== -"react-is@^18.0.0", "react-is@^18.2.0", "react-is@^18.3.1": +"react-is@^18.0.0", "react-is@^18.2.0": version "18.3.1" resolved "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz#e83557dc12eae63a99e003a46388b1dcbb44db7e" integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg== +react-is@^19.0.0: + version "19.0.0" + resolved "https://registry.npmjs.org/react-is/-/react-is-19.0.0.tgz#d6669fd389ff022a9684f708cf6fa4962d1fea7a" + integrity sha512-H91OHcwjZsbq3ClIDHMzBShc1rotbfACdWENsmEf0IFvZ3FgGPtdHMcsv45bQ1hAbgdfiA8SnxTKfDS+x/8m2g== + react-leaflet@^4.2.1: version "4.2.1" resolved "https://registry.npmjs.org/react-leaflet/-/react-leaflet-4.2.1.tgz#c300e9eccaf15cb40757552e181200aa10b94780" @@ -9750,26 +9630,26 @@ react-property@2.0.2: resolved "https://registry.npmjs.org/react-property/-/react-property-2.0.2.tgz#d5ac9e244cef564880a610bc8d868bd6f60fdda6" integrity sha512-+PbtI3VuDV0l6CleQMsx2gtK0JZbZKbpdu5ynr+lbsuvtmgbNcS3VM0tuY2QjFNOcWxvXeHjDpy42RO+4U2rug== -react-resize-detector@^11.0.1: - version "11.0.1" - resolved "https://registry.npmjs.org/react-resize-detector/-/react-resize-detector-11.0.1.tgz#70684958ae82bc0deb240d133a1ee440e0624532" - integrity sha512-1Tdgu6Ou3vI3RQD+o2/kTvDibb4NRe7Oh83hIjNNEXb6WKKCQT99VQlh3Xlbdq2HtkUoFEMrgMMKkYI83YbD7Q== +react-resize-detector@^12.0.2: + version "12.0.2" + resolved "https://registry.npmjs.org/react-resize-detector/-/react-resize-detector-12.0.2.tgz#5e65f906a85835d246de57dbf608bf22ab333cad" + integrity sha512-aAI4WxWAysWLhA8wKDpsS+PnnxQ0lWCkTlk2t+2ijalWvoSa7vPxmcKRLURkH+PU84QE4KP4dO58oVP3ypWkKA== dependencies: lodash "^4.17.21" -react-rnd@^10.4.12: - version "10.4.12" - resolved "https://registry.npmjs.org/react-rnd/-/react-rnd-10.4.12.tgz#f3e0ae736e467c614f46f531f5f62e27aa14f352" - integrity sha512-EZ0ddi+R9JQVqk6jtPzvy11z5kjdw3aZbtiRmA9KP09UNx3LZT8WFrWO3QXbH7dHo1DKO3Rh8usCCwaJgu6Ahg== +react-rnd@^10.4.14: + version "10.4.14" + resolved "https://registry.npmjs.org/react-rnd/-/react-rnd-10.4.14.tgz#c0ce3051cce7da46ccb80be617d818f0dae1e5ec" + integrity sha512-NLGc3IymymumPfHy3DXiHNIMOiTlj6xBNb2boHqrtwCgYDasNarpg8tdUY36JlJbrs0E4BvjYBkfEGqUPBsukg== dependencies: - re-resizable "6.9.17" + re-resizable "6.10.3" react-draggable "4.4.6" tslib "2.6.2" react-select@^5.7.2: - version "5.8.0" - resolved "https://registry.npmjs.org/react-select/-/react-select-5.8.0.tgz#bd5c467a4df223f079dd720be9498076a3f085b5" - integrity sha512-TfjLDo58XrhP6VG5M/Mi56Us0Yt8X7xD6cDybC7yoRMUNm7BGO7qk8J0TLQOua/prb8vUOtsfnXZwfm30HGsAA== + version "5.10.0" + resolved "https://registry.npmjs.org/react-select/-/react-select-5.10.0.tgz#9b5f4544cfecdfc744184b87651468ee0fb6e172" + integrity sha512-k96gw+i6N3ExgDwPIg0lUPmexl1ygPe6u5BdQFNBhkpbwroIgCNXdubtIzHfThYXYYTubwOBafoMnn7ruEP1xA== dependencies: "@babel/runtime" "^7.12.0" "@emotion/cache" "^11.4.0" @@ -9779,12 +9659,12 @@ react-select@^5.7.2: memoize-one "^6.0.0" prop-types "^15.6.0" react-transition-group "^4.3.0" - use-isomorphic-layout-effect "^1.1.2" + use-isomorphic-layout-effect "^1.2.0" react-timer-hook@^3.0.5: - version "3.0.7" - resolved "https://registry.npmjs.org/react-timer-hook/-/react-timer-hook-3.0.7.tgz#ac42c43d0034b873cbf97b44eb34ccb2b11fe5e0" - integrity sha512-ATpNcU+PQRxxfNBPVqce2+REtjGAlwmfoNQfcEBMZFxPj0r3GYdKhyPHdStvqrejejEi0QvqaJZjy2lBlFvAsA== + version "3.0.8" + resolved "https://registry.npmjs.org/react-timer-hook/-/react-timer-hook-3.0.8.tgz#246e3e809aa02094f40116d72464c9b2a5cd27ce" + integrity sha512-bi2e7DhPBU1MRPU4ZHaVqBmgM9e2HK0ae8O2AIqwqjcPo4/qR7lVGQonOQLAKOZPQCJSYfV8F5aBWzOLXElzqQ== "react-transition-group@^4.3.0", "react-transition-group@^4.4.5": version "4.4.5" @@ -9796,20 +9676,20 @@ react-timer-hook@^3.0.5: loose-envify "^1.4.0" prop-types "^15.6.2" -react-transition-state@^1.1.3: - version "1.1.5" - resolved "https://registry.npmjs.org/react-transition-state/-/react-transition-state-1.1.5.tgz#22accee21d0011b1d0245be24b6262ae67f494c3" - integrity sha512-ITY2mZqc2dWG2eitJkYNdcSFW8aKeOlkL2A/vowRrLL8GH3J6Re/SpD/BLvQzrVOTqjsP0b5S9N10vgNNzwMUQ== +react-transition-state@^2.2.0: + version "2.2.0" + resolved "https://registry.npmjs.org/react-transition-state/-/react-transition-state-2.2.0.tgz#3a9f37c0553a865b6110ae8eaf7ed4db22633577" + integrity sha512-D3EyLku1Sdxrxq26Fo4Jh0q1BLEFQfDOxKKiSuyqWH84+hM6y0Guc0hcW2IXMXY5l5gQCgkOQ9y90xx6mNoj5w== react-virtualized-auto-sizer@^1.0.6: - version "1.0.24" - resolved "https://registry.npmjs.org/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.24.tgz#3ebdc92f4b05ad65693b3cc8e7d8dd54924c0227" - integrity sha512-3kCn7N9NEb3FlvJrSHWGQ4iVl+ydQObq2fHMn12i5wbtm74zHOPhz/i64OL3c1S1vi9i2GXtZqNqUJTQ+BnNfg== + version "1.0.25" + resolved "https://registry.npmjs.org/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.25.tgz#b13cbc528ac200be2bd1ffa40c8bb19bcc60ac3f" + integrity sha512-YHsksEGDfsHbHuaBVDYwJmcktblcHGafz4ZVuYPQYuSHMUGjpwmUCrAOcvMSGMwwk1eFWj1M/1GwYpNPuyhaBg== "react-window@^1.3.1", "react-window@^1.8.10": - version "1.8.10" - resolved "https://registry.npmjs.org/react-window/-/react-window-1.8.10.tgz#9e6b08548316814b443f7002b1cf8fd3a1bdde03" - integrity sha512-Y0Cx+dnU6NLa5/EvoHukUD0BklJ8qITCtVEPY1C/nL8wwoZ0b5aEw8Ff1dOVHw7fCzMt55XfJDd8S8W8LCaUCg== + version "1.8.11" + resolved "https://registry.npmjs.org/react-window/-/react-window-1.8.11.tgz#a857b48fa85bd77042d59cc460964ff2e0648525" + integrity sha512-+SRbUVT2scadgFSWx+R1P754xHPEqvcfSfVX10QYg6POOz+WNgkN48pS+BtZNIMGiL1HYrSEiCkwsMS15QogEQ== dependencies: "@babel/runtime" "^7.0.0" memoize-one ">=3.1.1 <6" @@ -9879,13 +9759,6 @@ readable-stream@^1.0.33: string_decoder "^1.1.1" util-deprecate "^1.0.1" -readable-web-to-node-stream@^3.0.0: - version "3.0.2" - resolved "https://registry.npmjs.org/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.2.tgz#5d52bb5df7b54861fd48d015e93a2cb87b3ee0bb" - integrity sha512-ePeK6cc1EcKLEhJFt/AebMCLL+GgSKhuygrZ/GLaKZYEecIgIECf4UaUuaByiGtzckwR4ain9VzUh95T1exYGw== - dependencies: - readable-stream "^3.6.0" - rechoir@^0.8.0: version "0.8.0" resolved "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz#49f866e0d32146142da3ad8f0eff352b3215ff22" @@ -9921,23 +9794,24 @@ redux@^5.0.0: resolved "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz#97fa26881ce5746500125585d5642c77b6e9447b" integrity sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w== -reflect.getprototypeof@^1.0.4: - version "1.0.6" - resolved "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.6.tgz#3ab04c32a8390b770712b7a8633972702d278859" - integrity sha512-fmfw4XgoDke3kdI6h4xcUz1dG8uaiv5q9gcEwLS4Pnth2kxT+GZ7YehS1JTMGBQmtV7Y4GFGbs2re2NqhdozUg== +"reflect.getprototypeof@^1.0.6", "reflect.getprototypeof@^1.0.9": + version "1.0.10" + resolved "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz#c629219e78a3316d8b604c765ef68996964e7bf9" + integrity sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw== dependencies: - call-bind "^1.0.7" + call-bind "^1.0.8" define-properties "^1.2.1" - es-abstract "^1.23.1" + es-abstract "^1.23.9" es-errors "^1.3.0" - get-intrinsic "^1.2.4" - globalthis "^1.0.3" - which-builtin-type "^1.1.3" + es-object-atoms "^1.0.0" + get-intrinsic "^1.2.7" + get-proto "^1.0.1" + which-builtin-type "^1.2.1" -regenerate-unicode-properties@^10.1.0: - version "10.1.1" - resolved "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz#6b0e05489d9076b04c436f318d9b067bba459480" - integrity sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q== +regenerate-unicode-properties@^10.2.0: + version "10.2.0" + resolved "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.0.tgz#626e39df8c372338ea9b8028d1f99dc3fd9c3db0" + integrity sha512-DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA== dependencies: regenerate "^1.4.2" @@ -9958,39 +9832,41 @@ regenerator-transform@^0.15.2: dependencies: "@babel/runtime" "^7.8.4" -regexp.prototype.flags@^1.5.2: - version "1.5.2" - resolved "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz#138f644a3350f981a858c44f6bb1a61ff59be334" - integrity sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw== +regexp.prototype.flags@^1.5.3: + version "1.5.4" + resolved "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz#1ad6c62d44a259007e55b3970e00f746efbcaa19" + integrity sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA== dependencies: - call-bind "^1.0.6" + call-bind "^1.0.8" define-properties "^1.2.1" es-errors "^1.3.0" - set-function-name "^2.0.1" + get-proto "^1.0.1" + gopd "^1.2.0" + set-function-name "^2.0.2" -regexpu-core@^5.3.1: - version "5.3.2" - resolved "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz#11a2b06884f3527aec3e93dbbf4a3b958a95546b" - integrity sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ== +regexpu-core@^6.2.0: + version "6.2.0" + resolved "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.2.0.tgz#0e5190d79e542bf294955dccabae04d3c7d53826" + integrity sha512-H66BPQMrv+V16t8xtmq+UC0CBpiTBA60V8ibS1QVReIp8T1z8hwFxqcGzm9K6lgsN7sB5edVH8a+ze6Fqm4weA== dependencies: - "@babel/regjsgen" "^0.8.0" regenerate "^1.4.2" - regenerate-unicode-properties "^10.1.0" - regjsparser "^0.9.1" + regenerate-unicode-properties "^10.2.0" + regjsgen "^0.8.0" + regjsparser "^0.12.0" unicode-match-property-ecmascript "^2.0.0" unicode-match-property-value-ecmascript "^2.1.0" -regjsparser@^0.9.1: - version "0.9.1" - resolved "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz#272d05aa10c7c1f67095b1ff0addae8442fc5709" - integrity sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ== - dependencies: - jsesc "~0.5.0" +regjsgen@^0.8.0: + version "0.8.0" + resolved "https://registry.npmjs.org/regjsgen/-/regjsgen-0.8.0.tgz#df23ff26e0c5b300a6470cad160a9d090c3a37ab" + integrity sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q== -replace-ext@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/replace-ext/-/replace-ext-2.0.0.tgz#9471c213d22e1bcc26717cd6e50881d88f812b06" - integrity sha512-UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug== +regjsparser@^0.12.0: + version "0.12.0" + resolved "https://registry.npmjs.org/regjsparser/-/regjsparser-0.12.0.tgz#0e846df6c6530586429377de56e0475583b088dc" + integrity sha512-cnE+y8bz4NhMjISKbgeVJtqNbtf5QpjZP+Bslo+UqkIt9QPnX9q095eiRRASJG1/tz6dlNr6Z5NsBiWYokp6EQ== + dependencies: + jsesc "~3.0.2" require-directory@^2.1.1: version "2.1.1" @@ -10007,6 +9883,11 @@ requires-port@^1.0.0: resolved "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ== +reserved-identifiers@^1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/reserved-identifiers/-/reserved-identifiers-1.0.0.tgz#a4878ea2b5130ec2bf5aba40074edcb9704d2623" + integrity sha512-h0bP2Katmvf3hv4Z3WtDl4+6xt/OglQ2Xa6TnhZ/Rm9/7IH1crXQqMwD4J2ngKBonVv+fB55zfGgNDAmsevLVQ== + resize-observer-polyfill@^1.5.1: version "1.5.1" resolved "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464" @@ -10030,16 +9911,16 @@ resolve-from@^5.0.0: integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== resolve.exports@^2.0.0: - version "2.0.2" - resolved "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz#f8c934b8e6a13f539e38b7098e2e36134f01e800" - integrity sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg== + version "2.0.3" + resolved "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.3.tgz#41955e6f1b4013b7586f873749a635dea07ebe3f" + integrity sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A== "resolve@^1.1.4", "resolve@^1.14.2", "resolve@^1.17.0", "resolve@^1.19.0", "resolve@^1.20.0", "resolve@^1.4.0": - version "1.22.8" - resolved "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d" - integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw== + version "1.22.10" + resolved "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz#b663e83ffb09bbf2386944736baae803029b8b39" + integrity sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w== dependencies: - is-core-module "^2.13.0" + is-core-module "^2.16.0" path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" @@ -10088,6 +9969,13 @@ rimraf@^3.0.2: dependencies: glob "^7.1.3" +rimraf@^5.0.5: + version "5.0.10" + resolved "https://registry.npmjs.org/rimraf/-/rimraf-5.0.10.tgz#23b9843d3dc92db71f96e1a2ce92e39fd2a8221c" + integrity sha512-l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ== + dependencies: + glob "^10.3.7" + "ripemd160@^2.0.0", "ripemd160@^2.0.1": version "2.0.2" resolved "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c" @@ -10103,14 +9991,15 @@ run-parallel@^1.1.9: dependencies: queue-microtask "^1.2.2" -safe-array-concat@^1.1.2: - version "1.1.2" - resolved "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz#81d77ee0c4e8b863635227c721278dd524c20edb" - integrity sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q== +safe-array-concat@^1.1.3: + version "1.1.3" + resolved "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz#c9e54ec4f603b0bbb8e7e5007a5ee7aecd1538c3" + integrity sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q== dependencies: - call-bind "^1.0.7" - get-intrinsic "^1.2.4" - has-symbols "^1.0.3" + call-bind "^1.0.8" + call-bound "^1.0.2" + get-intrinsic "^1.2.6" + has-symbols "^1.1.0" isarray "^2.0.5" "safe-buffer@5.2.1", "safe-buffer@^5.0.1", "safe-buffer@^5.1.0", "safe-buffer@^5.1.1", "safe-buffer@^5.1.2", "safe-buffer@^5.2.0", "safe-buffer@^5.2.1", "safe-buffer@~5.2.0": @@ -10123,14 +10012,22 @@ safe-array-concat@^1.1.2: resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== -safe-regex-test@^1.0.3: - version "1.0.3" - resolved "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz#a5b4c0f06e0ab50ea2c395c14d8371232924c377" - integrity sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw== +safe-push-apply@^1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz#01850e981c1602d398c85081f360e4e6d03d27f5" + integrity sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA== dependencies: - call-bind "^1.0.6" es-errors "^1.3.0" - is-regex "^1.1.4" + isarray "^2.0.5" + +safe-regex-test@^1.1.0: + version "1.1.0" + resolved "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz#7f87dfb67a3150782eaaf18583ff5d1711ac10c1" + integrity sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw== + dependencies: + call-bound "^1.0.2" + es-errors "^1.3.0" + is-regex "^1.2.1" "safer-buffer@>= 2.1.2 < 3.0.0": version "2.1.2" @@ -10156,7 +10053,7 @@ scheduler@^0.23.2: dependencies: loose-envify "^1.1.0" -"schema-utils@^3.0.0", "schema-utils@^3.1.1", "schema-utils@^3.2.0": +"schema-utils@^3.0.0", "schema-utils@^3.2.0": version "3.3.0" resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz#f50a88877c3c01652a15b622ae9e9795df7a60fe" integrity sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg== @@ -10165,10 +10062,10 @@ scheduler@^0.23.2: ajv "^6.12.5" ajv-keywords "^3.5.2" -"schema-utils@^4.0.0", "schema-utils@^4.0.1", "schema-utils@^4.2.0": - version "4.2.0" - resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz#70d7c93e153a273a805801882ebd3bff20d89c8b" - integrity sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw== +"schema-utils@^4.0.0", "schema-utils@^4.2.0", "schema-utils@^4.3.0": + version "4.3.0" + resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz#3b669f04f71ff2dfb5aba7ce2d5a9d79b35622c0" + integrity sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g== dependencies: "@types/json-schema" "^7.0.9" ajv "^8.9.0" @@ -10209,7 +10106,7 @@ semver-truncate@^1.1.2: resolved "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143" integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A== -"serialize-javascript@^6.0.1", "serialize-javascript@^6.0.2": +serialize-javascript@^6.0.2: version "6.0.2" resolved "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz#defa1e055c83bf6d59ea805d8da862254eb6a6c2" integrity sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g== @@ -10221,7 +10118,7 @@ set-blocking@^2.0.0: resolved "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw== -set-function-length@^1.2.1: +set-function-length@^1.2.2: version "1.2.2" resolved "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449" integrity sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg== @@ -10233,7 +10130,7 @@ set-function-length@^1.2.1: gopd "^1.0.1" has-property-descriptors "^1.0.2" -"set-function-name@^2.0.1", "set-function-name@^2.0.2": +set-function-name@^2.0.2: version "2.0.2" resolved "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz#16a705c5a0dc2f5e638ca96d8a8cd4e1c2b90985" integrity sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ== @@ -10243,6 +10140,15 @@ set-function-length@^1.2.1: functions-have-names "^1.2.3" has-property-descriptors "^1.0.2" +set-proto@^1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/set-proto/-/set-proto-1.0.0.tgz#0760dbcff30b2d7e801fd6e19983e56da337565e" + integrity sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw== + dependencies: + dunder-proto "^1.0.1" + es-errors "^1.3.0" + es-object-atoms "^1.0.0" + "sha.js@^2.4.0", "sha.js@^2.4.8": version "2.4.11" resolved "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7" @@ -10295,9 +10201,9 @@ shebang-regex@^3.0.0: integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== shell-quote@^1.6.1: - version "1.8.1" - resolved "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680" - integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA== + version "1.8.2" + resolved "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.2.tgz#d2d83e057959d53ec261311e9e9b8f51dcb2934a" + integrity sha512-AzqKpGKjrj7EM6rKVQEPpB288oCfnrEIuyoT9cyF4nmGa7V8Zk6f7RRqYisX8X9m+Q7bd632aZW4ky7EhbQztA== shim-loader@^1.0.1: version "1.0.1" @@ -10309,15 +10215,45 @@ shim-loader@^1.0.1: precond "^0.2.3" webpack-sources "^0.2.3" -"side-channel@^1.0.4", "side-channel@^1.0.6": - version "1.0.6" - resolved "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz#abd25fb7cd24baf45466406b1096b7831c9215f2" - integrity sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA== +side-channel-list@^1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz#10cb5984263115d3b7a0e336591e290a830af8ad" + integrity sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA== dependencies: - call-bind "^1.0.7" es-errors "^1.3.0" - get-intrinsic "^1.2.4" - object-inspect "^1.13.1" + object-inspect "^1.13.3" + +side-channel-map@^1.0.1: + version "1.0.1" + resolved "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz#d6bb6b37902c6fef5174e5f533fab4c732a26f42" + integrity sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA== + dependencies: + call-bound "^1.0.2" + es-errors "^1.3.0" + get-intrinsic "^1.2.5" + object-inspect "^1.13.3" + +side-channel-weakmap@^1.0.2: + version "1.0.2" + resolved "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz#11dda19d5368e40ce9ec2bdc1fb0ecbc0790ecea" + integrity sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A== + dependencies: + call-bound "^1.0.2" + es-errors "^1.3.0" + get-intrinsic "^1.2.5" + object-inspect "^1.13.3" + side-channel-map "^1.0.1" + +side-channel@^1.1.0: + version "1.1.0" + resolved "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz#c3fcff9c4da932784873335ec9765fa94ff66bc9" + integrity sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw== + dependencies: + es-errors "^1.3.0" + object-inspect "^1.13.3" + side-channel-list "^1.0.0" + side-channel-map "^1.0.1" + side-channel-weakmap "^1.0.2" "signal-exit@^3.0.0", "signal-exit@^3.0.3", "signal-exit@^3.0.7": version "3.0.7" @@ -10391,13 +10327,13 @@ snapsvg@0.5.1: eve "~0.5.1" socket.io-client@^4.5.0: - version "4.7.5" - resolved "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.7.5.tgz#919be76916989758bdc20eec63f7ee0ae45c05b7" - integrity sha512-sJ/tqHOCe7Z50JCBCXrsY3I2k03iOiUe+tj1OmKeD2lXPiGH/RUCdTZFoqVyN7l1MnpIzPrGtLcijffmeouNlQ== + version "4.8.1" + resolved "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.8.1.tgz#1941eca135a5490b94281d0323fe2a35f6f291cb" + integrity sha512-hJVXfu3E28NmzGk8o1sHhN3om52tRvwYeidbj7xKy2eIIse5IoKX3USlS6Tqt3BHAtflLIkCQBkzVrEEfWUyYQ== dependencies: "@socket.io/component-emitter" "~3.1.0" debug "~4.3.2" - engine.io-client "~6.5.2" + engine.io-client "~6.6.1" socket.io-parser "~4.2.4" socket.io-parser@~4.2.4: @@ -10418,11 +10354,11 @@ socks-proxy-agent@^7.0.0: socks "^2.6.2" socks-proxy-agent@^8.0.3: - version "8.0.4" - resolved "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz#9071dca17af95f483300316f4b063578fa0db08c" - integrity sha512-GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw== + version "8.0.5" + resolved "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.5.tgz#b9cdb4e7e998509d7659d689ce7697ac21645bee" + integrity sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw== dependencies: - agent-base "^7.1.1" + agent-base "^7.1.2" debug "^4.3.4" socks "^2.8.3" @@ -10460,10 +10396,10 @@ source-list-map@^1.1.1: resolved "https://registry.npmjs.org/source-list-map/-/source-list-map-1.1.2.tgz#9889019d1024cce55cdc069498337ef6186a11a1" integrity sha512-FqR2O+cX+toUD3ULVIgTtiqYIqPnA62ehJD47mf4LG1PZCB+xmIa3gcTEhegGbP22aRPh88dJSdgDIolrvSxBQ== -"source-map-js@^1.0.1", "source-map-js@^1.2.0": - version "1.2.0" - resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af" - integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg== +"source-map-js@^1.0.1", "source-map-js@^1.0.2", "source-map-js@^1.2.1": + version "1.2.1" + resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46" + integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA== source-map-support@0.5.13: version "0.5.13" @@ -10513,9 +10449,9 @@ spdx-expression-parse@^3.0.0: spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.20" - resolved "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.20.tgz#e44ed19ed318dd1e5888f93325cee800f0f51b89" - integrity sha512-jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw== + version "3.0.21" + resolved "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.21.tgz#6d6e980c9df2b6fc905343a3b2d702a6239536c3" + integrity sha512-Bvg/8F5XephndSK3JffaRqdT+gyhfqIPwDHpX80tJrF8QQRYMo8sNMeaZ2Dp5+jhwKnUmIOyFFQfHRkjJm5nXg== split.js@^1.5.10: version "1.6.5" @@ -10533,18 +10469,18 @@ sprintf-js@~1.0.2: integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== sql-formatter@^15.4.0: - version "15.4.1" - resolved "https://registry.npmjs.org/sql-formatter/-/sql-formatter-15.4.1.tgz#2e9078dbf30a0b76eb690865166cdc6617e6e7fd" - integrity sha512-lw/G/emIJ+tVspOtOFzfD2YFFMN3MFPxGnbWl1DlJLB+fsX7X7zMqSRM1SLSn2YuaRJ0lTe7AMknHDqmIW1Y8w== + version "15.4.10" + resolved "https://registry.npmjs.org/sql-formatter/-/sql-formatter-15.4.10.tgz#f7f4745aa1b9fc3c8ce493bf882610ca6200dedf" + integrity sha512-zQfiuxU1F/C7TNu+880BdL+fuvJTd1Kj8R0wv48dfZ27NR3z1PWvQFkH8ai/HrIy+NyvXCaZBkJHp/EeZFXSOA== dependencies: argparse "^2.0.1" get-stdin "=8.0.0" nearley "^2.20.1" -ssri@^10.0.0: - version "10.0.6" - resolved "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz#a8aade2de60ba2bce8688e3fa349bad05c7dc1e5" - integrity sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ== +ssri@^12.0.0: + version "12.0.0" + resolved "https://registry.npmjs.org/ssri/-/ssri-12.0.0.tgz#bcb4258417c702472f8191981d3c8a771fee6832" + integrity sha512-S7iGNosepx9RadX82oimUkvr0Ct7IjJbEbs4mJcTxst8um95J3sDYU1RBEOvdu6oL1Wek2ODI5i4MAw+dZ6cAQ== dependencies: minipass "^7.0.3" @@ -10555,11 +10491,6 @@ ssri@^9.0.0: dependencies: minipass "^3.1.1" -stable@^0.1.8: - version "0.1.8" - resolved "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf" - integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w== - stack-utils@^2.0.3: version "2.0.6" resolved "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f" @@ -10632,23 +10563,24 @@ string-length@^4.0.1: emoji-regex "^9.2.2" strip-ansi "^7.0.1" -string.prototype.matchall@^4.0.11: - version "4.0.11" - resolved "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.11.tgz#1092a72c59268d2abaad76582dccc687c0297e0a" - integrity sha512-NUdh0aDavY2og7IbBPenWqR9exH+E26Sv8e0/eTe1tltDGZL+GtBkDAnnyBtmekfK6/Dq3MkcGtzXFEd1LQrtg== +string.prototype.matchall@^4.0.12: + version "4.0.12" + resolved "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.12.tgz#6c88740e49ad4956b1332a911e949583a275d4c0" + integrity sha512-6CC9uyBL+/48dYizRf7H7VAYCMCNTBeM78x/VTUe9bFEaxBepPJDa1Ow99LqI/1yF7kuy7Q3cQsYMrcjGUcskA== dependencies: - call-bind "^1.0.7" + call-bind "^1.0.8" + call-bound "^1.0.3" define-properties "^1.2.1" - es-abstract "^1.23.2" + es-abstract "^1.23.6" es-errors "^1.3.0" es-object-atoms "^1.0.0" - get-intrinsic "^1.2.4" - gopd "^1.0.1" - has-symbols "^1.0.3" - internal-slot "^1.0.7" - regexp.prototype.flags "^1.5.2" + get-intrinsic "^1.2.6" + gopd "^1.2.0" + has-symbols "^1.1.0" + internal-slot "^1.1.0" + regexp.prototype.flags "^1.5.3" set-function-name "^2.0.2" - side-channel "^1.0.6" + side-channel "^1.1.0" string.prototype.repeat@^1.0.0: version "1.0.0" @@ -10658,22 +10590,26 @@ string.prototype.repeat@^1.0.0: define-properties "^1.1.3" es-abstract "^1.17.5" -string.prototype.trim@^1.2.9: - version "1.2.9" - resolved "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz#b6fa326d72d2c78b6df02f7759c73f8f6274faa4" - integrity sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw== +string.prototype.trim@^1.2.10: + version "1.2.10" + resolved "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz#40b2dd5ee94c959b4dcfb1d65ce72e90da480c81" + integrity sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA== dependencies: - call-bind "^1.0.7" + call-bind "^1.0.8" + call-bound "^1.0.2" + define-data-property "^1.1.4" define-properties "^1.2.1" - es-abstract "^1.23.0" + es-abstract "^1.23.5" es-object-atoms "^1.0.0" + has-property-descriptors "^1.0.2" -string.prototype.trimend@^1.0.8: - version "1.0.8" - resolved "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz#3651b8513719e8a9f48de7f2f77640b26652b229" - integrity sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ== +string.prototype.trimend@^1.0.9: + version "1.0.9" + resolved "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz#62e2731272cd285041b36596054e9f66569b6942" + integrity sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ== dependencies: - call-bind "^1.0.7" + call-bind "^1.0.8" + call-bound "^1.0.2" define-properties "^1.2.1" es-object-atoms "^1.0.0" @@ -10777,53 +10713,45 @@ strip-outer@^1.0.0: dependencies: escape-string-regexp "^1.0.2" -strtok3@^6.2.4: - version "6.3.0" - resolved "https://registry.npmjs.org/strtok3/-/strtok3-6.3.0.tgz#358b80ffe6d5d5620e19a073aa78ce947a90f9a0" - integrity sha512-fZtbhtvI9I48xDSywd/somNqgUHl2L2cstmXCCif0itOf96jeW18MBSyrLuNicYQVkvpOxkZtkzujiTJ9LW5Jw== +strtok3@^9.0.1: + version "9.1.1" + resolved "https://registry.npmjs.org/strtok3/-/strtok3-9.1.1.tgz#f8feb188b3fcdbf9b8819cc9211a824c3731df38" + integrity sha512-FhwotcEqjr241ZbjFzjlIYg6c5/L/s4yBGWSMvJ9UoExiSqL+FnFA/CaeZx17WGaZMS/4SOZp8wH18jSS4R4lw== dependencies: "@tokenizer/token" "^0.3.0" - peek-readable "^4.1.0" + peek-readable "^5.3.1" -style-loader@^3.3.2: - version "3.3.4" - resolved "https://registry.npmjs.org/style-loader/-/style-loader-3.3.4.tgz#f30f786c36db03a45cbd55b6a70d930c479090e7" - integrity sha512-0WqXzrsMTyb8yjZJHDqwmnwRJvhALK9LfRtRc6B4UTWe8AijYLZYZ9thuJTZc2VfQWINADW/j+LiJnfy2RoC1w== +style-loader@^4.0.0: + version "4.0.0" + resolved "https://registry.npmjs.org/style-loader/-/style-loader-4.0.0.tgz#0ea96e468f43c69600011e0589cb05c44f3b17a5" + integrity sha512-1V4WqhhZZgjVAVJyt7TdDPZoPBPNHbekX4fWnCJL1yQukhCeZhJySUL+gL9y6sNdN95uEOS83Y55SqHcP7MzLA== "style-mod@^4.0.0", "style-mod@^4.1.0": version "4.1.2" resolved "https://registry.npmjs.org/style-mod/-/style-mod-4.1.2.tgz#ca238a1ad4786520f7515a8539d5a63691d7bf67" integrity sha512-wnD1HyVqpJUI2+eKZ+eo1UwghftP6yuFheBqqe+bWCotBjC2K1YnteJILRMs3SM4V/0dLEW1SC27MWP5y+mwmw== -style-to-js@1.1.13: - version "1.1.13" - resolved "https://registry.npmjs.org/style-to-js/-/style-to-js-1.1.13.tgz#8d17f2560a9cc9515b94834aaeb2305887d7ced5" - integrity sha512-+43kvxwjrW9n5gFR40Rv98A0/Mcjew7Lt+p5Nnw1KGR9SZf/ZaKqmMwl9Enj9EnYNcJ5VzuCjejC5KZzvH2lOA== +style-to-js@1.1.16: + version "1.1.16" + resolved "https://registry.npmjs.org/style-to-js/-/style-to-js-1.1.16.tgz#e6bd6cd29e250bcf8fa5e6591d07ced7575dbe7a" + integrity sha512-/Q6ld50hKYPH3d/r6nr117TZkHR0w0kGGIVfpG9N6D8NymRPM9RqCUv4pRpJ62E5DqOYx2AFpbZMyCPnjQCnOw== dependencies: - style-to-object "1.0.6" + style-to-object "1.0.8" -style-to-object@1.0.6: - version "1.0.6" - resolved "https://registry.npmjs.org/style-to-object/-/style-to-object-1.0.6.tgz#0c28aed8be1813d166c60d962719b2907c26547b" - integrity sha512-khxq+Qm3xEyZfKd/y9L3oIWQimxuc4STrQKtQn8aSDRHb8mFgpukgX1hdzfrMEW6JCjyJ8p89x+IUMVnCBI1PA== +style-to-object@1.0.8: + version "1.0.8" + resolved "https://registry.npmjs.org/style-to-object/-/style-to-object-1.0.8.tgz#67a29bca47eaa587db18118d68f9d95955e81292" + integrity sha512-xT47I/Eo0rwJmaXC4oilDGDWLohVhR6o/xAQcPQN8q6QBuZVL8qMYL85kLmST5cPjAorwvqIA4qXTRQoYHaL6g== dependencies: - inline-style-parser "0.2.3" + inline-style-parser "0.2.4" -stylehacks@^5.1.1: - version "5.1.1" - resolved "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.1.tgz#7934a34eb59d7152149fa69d6e9e56f2fc34bcc9" - integrity sha512-sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw== +stylehacks@^7.0.4: + version "7.0.4" + resolved "https://registry.npmjs.org/stylehacks/-/stylehacks-7.0.4.tgz#9c21f7374f4bccc0082412b859b3c89d77d3277c" + integrity sha512-i4zfNrGMt9SB4xRK9L83rlsFCgdGANfeDAYacO1pkqcE7cRHPdWHwnKZVz7WY17Veq/FvyYsRAU++Ga+qDFIww== dependencies: - browserslist "^4.21.4" - postcss-selector-parser "^6.0.4" - -stylehacks@^6.1.1: - version "6.1.1" - resolved "https://registry.npmjs.org/stylehacks/-/stylehacks-6.1.1.tgz#543f91c10d17d00a440430362d419f79c25545a6" - integrity sha512-gSTTEQ670cJNoaeIp9KX6lZmm8LJ3jPB5yJmX8Zq/wQxOsAFXV3qjWzHas3YYk1qesuVIyYWWUpZ0vSE/dTSGg== - dependencies: - browserslist "^4.23.0" - postcss-selector-parser "^6.0.16" + browserslist "^4.23.3" + postcss-selector-parser "^6.1.2" stylis@4.2.0: version "4.2.0" @@ -10831,9 +10759,9 @@ stylis@4.2.0: integrity sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw== stylis@^4.3.4: - version "4.3.4" - resolved "https://registry.npmjs.org/stylis/-/stylis-4.3.4.tgz#ca5c6c4a35c4784e4e93a2a24dc4e9fa075250a4" - integrity sha512-osIBl6BGUmSfDkyH2mB7EFvCJntXDrLhKjHTRj/rK6xLH0yuPrHULDRQzKokSOD4VoorhtKpfcfW1GAntu8now== + version "4.3.5" + resolved "https://registry.npmjs.org/stylis/-/stylis-4.3.5.tgz#432cc99c81e28d7062c88d979d2163891e860489" + integrity sha512-K7npNOKGRYuhAFFzkzMGfxFDpN6gDwf8hcMiE+uveTVbBgm93HrNP3ZDUpKqzZ4pG7TP6fmb+EMAQPjq9FqqvA== subarg@^1.0.0: version "1.0.0" @@ -10842,12 +10770,13 @@ subarg@^1.0.0: dependencies: minimist "^1.1.0" -supports-color@^5.3.0: - version "5.5.0" - resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" - integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== +super-regex@^1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/super-regex/-/super-regex-1.0.0.tgz#dd90d944a925a1083e7d8570919b21cb76e3d925" + integrity sha512-CY8u7DtbvucKuquCmOFEKhr9Besln7n9uN8eFbwcoGYWXOMW07u2o8njWaiXt11ylS3qoGF55pILjRmPlbodyg== dependencies: - has-flag "^3.0.0" + function-timeout "^1.0.1" + time-span "^5.1.0" supports-color@^7.1.0: version "7.2.0" @@ -10910,20 +10839,7 @@ svgo-loader@^4.0.0: dependencies: svgo "^3.0.0" -svgo@^2.7.0: - version "2.8.0" - resolved "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz#4ff80cce6710dc2795f0c7c74101e6764cfccd24" - integrity sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg== - dependencies: - "@trysound/sax" "0.2.0" - commander "^7.2.0" - css-select "^4.1.3" - css-tree "^1.1.3" - csso "^4.2.0" - picocolors "^1.0.0" - stable "^0.1.8" - -"svgo@^3.0.0", "svgo@^3.0.2", "svgo@^3.2.0", "svgo@^3.3.2": +"svgo@^3.0.0", "svgo@^3.0.2", "svgo@^3.3.2": version "3.3.2" resolved "https://registry.npmjs.org/svgo/-/svgo-3.3.2.tgz#ad58002652dffbb5986fc9716afe52d869ecbda8" integrity sha512-OoohrmuUlBs8B8o6MB2Aevn+pRIH9zDALSR+6hhqVfa6fRwG/Qw9VUMSMW9VNg2CFc/MTIfabtdOVl9ODIJjpw== @@ -10971,7 +10887,7 @@ tar-stream@^1.5.2: to-buffer "^1.1.1" xtend "^4.0.0" -"tar@^6.1.11", "tar@^6.1.2", "tar@^6.2.1": +"tar@^6.1.11", "tar@^6.1.2": version "6.2.1" resolved "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a" integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A== @@ -10983,6 +10899,18 @@ tar-stream@^1.5.2: mkdirp "^1.0.3" yallist "^4.0.0" +tar@^7.4.3: + version "7.4.3" + resolved "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz#88bbe9286a3fcd900e94592cda7a22b192e80571" + integrity sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw== + dependencies: + "@isaacs/fs-minipass" "^4.0.0" + chownr "^3.0.0" + minipass "^7.1.2" + minizlib "^3.0.1" + mkdirp "^3.0.1" + yallist "^5.0.0" + temp-dir@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d" @@ -10997,20 +10925,20 @@ tempfile@^2.0.0: uuid "^3.0.1" "terser-webpack-plugin@^5.1.1", "terser-webpack-plugin@^5.3.10": - version "5.3.10" - resolved "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz#904f4c9193c6fd2a03f693a2150c62a92f40d199" - integrity sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w== + version "5.3.11" + resolved "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.11.tgz#93c21f44ca86634257cac176f884f942b7ba3832" + integrity sha512-RVCsMfuD0+cTt3EwX8hSl2Ks56EbFHWmhluwcqoPKtBnfjiT6olaq7PRIRfhyU8nnC2MrnDrBLfrD/RGE+cVXQ== dependencies: - "@jridgewell/trace-mapping" "^0.3.20" + "@jridgewell/trace-mapping" "^0.3.25" jest-worker "^27.4.5" - schema-utils "^3.1.1" - serialize-javascript "^6.0.1" - terser "^5.26.0" + schema-utils "^4.3.0" + serialize-javascript "^6.0.2" + terser "^5.31.1" -terser@^5.26.0: - version "5.31.6" - resolved "https://registry.npmjs.org/terser/-/terser-5.31.6.tgz#c63858a0f0703988d0266a82fcbf2d7ba76422b1" - integrity sha512-PQ4DAriWzKj+qgehQ7LK5bQqCFNMmlhjR2PFFLuqGCpuCAauxemVBWwWOxo3UIwWQx8+Pr61Df++r76wDmkQBg== +terser@^5.31.1: + version "5.37.0" + resolved "https://registry.npmjs.org/terser/-/terser-5.37.0.tgz#38aa66d1cfc43d0638fab54e43ff8a4f72a21ba3" + integrity sha512-B8wRRkmre4ERucLM/uXx4MOV5cbnOlVAqUst+1+iLKPI0dOgFO28f84ptoQt9HEI537PMzfYa/d+GEPKTRXmYA== dependencies: "@jridgewell/source-map" "^0.3.3" acorn "^8.8.2" @@ -11026,11 +10954,6 @@ test-exclude@^6.0.0: glob "^7.1.4" minimatch "^3.0.4" -text-table@^0.2.0: - version "0.2.0" - resolved "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" - integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw== - through2@^2.0.0: version "2.0.5" resolved "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" @@ -11044,6 +10967,13 @@ through2@^2.0.0: resolved "https://registry.npmjs.org/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg== +time-span@^5.1.0: + version "5.1.0" + resolved "https://registry.npmjs.org/time-span/-/time-span-5.1.0.tgz#80c76cf5a0ca28e0842d3f10a4e99034ce94b90d" + integrity sha512-75voc/9G4rDIJleOo4jPvN4/YC4GRZrY8yy1uU4lwrB3XEQbWve8zXoO5No4eFrGcTAMYyoY67p8jRQdtA1HbA== + dependencies: + convert-hrtime "^5.0.0" + "timed-out@^4.0.0", "timed-out@^4.0.1": version "4.0.1" resolved "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f" @@ -11066,11 +10996,6 @@ to-buffer@^1.1.1: resolved "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80" integrity sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg== -to-fast-properties@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" - integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog== - to-regex-range@^5.0.1: version "5.0.1" resolved "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" @@ -11078,10 +11003,10 @@ to-regex-range@^5.0.1: dependencies: is-number "^7.0.0" -token-types@^4.1.1: - version "4.2.1" - resolved "https://registry.npmjs.org/token-types/-/token-types-4.2.1.tgz#0f897f03665846982806e138977dbe72d44df753" - integrity sha512-6udB24Q737UD/SDsKAHI9FCRP7Bqc9D/MQUV02ORQg5iskjtLJlZJNdN4kKtcdtwCeWIwIHDGaUsTsCCAa8sFQ== +token-types@^6.0.0: + version "6.0.0" + resolved "https://registry.npmjs.org/token-types/-/token-types-6.0.0.tgz#1ab26be1ef9c434853500c071acfe5c8dd6544a3" + integrity sha512-lbDrTLVsHhOMljPscd0yitpozq7Ga2M5Cvez5AjGg8GASBjtt6iERCAJ93yommPmz62fb45oFIXHEZ3u9bfJEA== dependencies: "@tokenizer/token" "^0.3.0" ieee754 "^1.2.1" @@ -11120,20 +11045,20 @@ trim-repeated@^1.0.0: dependencies: escape-string-regexp "^1.0.2" -ts-api-utils@^1.3.0: - version "1.3.0" - resolved "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz#4b490e27129f1e8e686b45cc4ab63714dc60eea1" - integrity sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ== +ts-api-utils@^2.0.0: + version "2.0.0" + resolved "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.0.0.tgz#b9d7d5f7ec9f736f4d0f09758b8607979044a900" + integrity sha512-xCt/TOAc+EOHS1XPnijD3/yzpH6qg2xppZO1YDqGoVsNXfQfzHpOdNuXwrwOU8u4ITXJyDCTyt8w5g1sZv9ynQ== tslib@2.6.2: version "2.6.2" resolved "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q== -"tslib@^2.0.3", "tslib@^2.4.0": - version "2.7.0" - resolved "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz#d9b40c5c40ab59e8738f297df3087bf1a2690c01" - integrity sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA== +"tslib@^2.0.3", "tslib@^2.7.0": + version "2.8.1" + resolved "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f" + integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w== ttf2eot@^3.0.0: version "3.1.0" @@ -11194,88 +11119,99 @@ type-fest@^0.21.3: resolved "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz#e9fb813fe3bf1744ec359d55d1affefa76f14be1" integrity sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA== -typed-array-buffer@^1.0.2: - version "1.0.2" - resolved "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz#1867c5d83b20fcb5ccf32649e5e2fc7424474ff3" - integrity sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ== +type-fest@^3.8.0: + version "3.13.1" + resolved "https://registry.npmjs.org/type-fest/-/type-fest-3.13.1.tgz#bb744c1f0678bea7543a2d1ec24e83e68e8c8706" + integrity sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g== + +typed-array-buffer@^1.0.3: + version "1.0.3" + resolved "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz#a72395450a4869ec033fd549371b47af3a2ee536" + integrity sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw== dependencies: - call-bind "^1.0.7" + call-bound "^1.0.3" es-errors "^1.3.0" - is-typed-array "^1.1.13" + is-typed-array "^1.1.14" -typed-array-byte-length@^1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz#d92972d3cff99a3fa2e765a28fcdc0f1d89dec67" - integrity sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw== +typed-array-byte-length@^1.0.3: + version "1.0.3" + resolved "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz#8407a04f7d78684f3d252aa1a143d2b77b4160ce" + integrity sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg== dependencies: - call-bind "^1.0.7" + call-bind "^1.0.8" for-each "^0.3.3" - gopd "^1.0.1" - has-proto "^1.0.3" - is-typed-array "^1.1.13" + gopd "^1.2.0" + has-proto "^1.2.0" + is-typed-array "^1.1.14" -typed-array-byte-offset@^1.0.2: - version "1.0.2" - resolved "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz#f9ec1acb9259f395093e4567eb3c28a580d02063" - integrity sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA== +typed-array-byte-offset@^1.0.4: + version "1.0.4" + resolved "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz#ae3698b8ec91a8ab945016108aef00d5bff12355" + integrity sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ== dependencies: available-typed-arrays "^1.0.7" - call-bind "^1.0.7" + call-bind "^1.0.8" for-each "^0.3.3" - gopd "^1.0.1" - has-proto "^1.0.3" - is-typed-array "^1.1.13" + gopd "^1.2.0" + has-proto "^1.2.0" + is-typed-array "^1.1.15" + reflect.getprototypeof "^1.0.9" -typed-array-length@^1.0.6: - version "1.0.6" - resolved "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz#57155207c76e64a3457482dfdc1c9d1d3c4c73a3" - integrity sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g== +typed-array-length@^1.0.7: + version "1.0.7" + resolved "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz#ee4deff984b64be1e118b0de8c9c877d5ce73d3d" + integrity sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg== dependencies: call-bind "^1.0.7" for-each "^0.3.3" gopd "^1.0.1" - has-proto "^1.0.3" is-typed-array "^1.1.13" possible-typed-array-names "^1.0.0" + reflect.getprototypeof "^1.0.6" typedarray@^0.0.6: version "0.0.6" resolved "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA== -typescript-eslint@^8.3.0: - version "8.3.0" - resolved "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.3.0.tgz#f4d9c5ba71f6bead03ec41ecb2bece1de511e49f" - integrity sha512-EvWjwWLwwKDIJuBjk2I6UkV8KEQcwZ0VM10nR1rIunRDIP67QJTZAHBXTX0HW/oI1H10YESF8yWie8fRQxjvFA== +typescript-eslint@^8.8.0: + version "8.22.0" + resolved "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.22.0.tgz#1d4becf1d65385e57e9271fbd557ccc22f6c0f53" + integrity sha512-Y2rj210FW1Wb6TWXzQc5+P+EWI9/zdS57hLEc0gnyuvdzWo8+Y8brKlbj0muejonhMI/xAZCnZZwjbIfv1CkOw== dependencies: - "@typescript-eslint/eslint-plugin" "8.3.0" - "@typescript-eslint/parser" "8.3.0" - "@typescript-eslint/utils" "8.3.0" + "@typescript-eslint/eslint-plugin" "8.22.0" + "@typescript-eslint/parser" "8.22.0" + "@typescript-eslint/utils" "8.22.0" typescript@^5.4.5: - version "5.5.4" - resolved "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz#d9852d6c82bad2d2eda4fd74a5762a8f5909e9ba" - integrity sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q== + version "5.7.3" + resolved "https://registry.npmjs.org/typescript/-/typescript-5.7.3.tgz#919b44a7dbb8583a9b856d162be24a54bf80073e" + integrity sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw== uglify-js@^3.1.4: version "3.19.3" resolved "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz#82315e9bbc6f2b25888858acd1fff8441035b77f" integrity sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ== +"uint8array-extras@^1.1.0", "uint8array-extras@^1.3.0": + version "1.4.0" + resolved "https://registry.npmjs.org/uint8array-extras/-/uint8array-extras-1.4.0.tgz#e42a678a6dd335ec2d21661333ed42f44ae7cc74" + integrity sha512-ZPtzy0hu4cZjv3z5NW9gfKnNLjoz4y6uv4HlelAjDK7sY/xOkKZv9xK/WQpcsBB3jEybChz9DPC2U/+cusjJVQ== + umd@^3.0.0: version "3.0.3" resolved "https://registry.npmjs.org/umd/-/umd-3.0.3.tgz#aa9fe653c42b9097678489c01000acb69f0b26cf" integrity sha512-4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow== -unbox-primitive@^1.0.2: - version "1.0.2" - resolved "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e" - integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw== +unbox-primitive@^1.1.0: + version "1.1.0" + resolved "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz#8d9d2c9edeea8460c7f35033a88867944934d1e2" + integrity sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw== dependencies: - call-bind "^1.0.2" + call-bound "^1.0.3" has-bigints "^1.0.2" - has-symbols "^1.0.3" - which-boxed-primitive "^1.0.2" + has-symbols "^1.1.0" + which-boxed-primitive "^1.1.1" unbzip2-stream@^1.0.9: version "1.4.3" @@ -11306,15 +11242,15 @@ underscore@^1.9.1: resolved "https://registry.npmjs.org/underscore/-/underscore-1.13.7.tgz#970e33963af9a7dda228f17ebe8399e5fbe63a10" integrity sha512-GMXzWtsc57XAtguZgaQViUOzs0KTkk8ojr3/xAxXLITqf/3EMwxC0inyETfDFjH/Krbhuep0HNbbjI9i/q3F3g== -undici-types@~6.19.2: - version "6.19.8" - resolved "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02" - integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw== +undici-types@~6.20.0: + version "6.20.0" + resolved "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz#8171bf22c1f588d1554d55bf204bc624af388433" + integrity sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg== unicode-canonical-property-names-ecmascript@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc" - integrity sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ== + version "2.0.1" + resolved "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.1.tgz#cb3173fe47ca743e228216e4a3ddc4c84d628cc2" + integrity sha512-dA8WbNeb2a6oQzAQ55YlT5vQAWGV9WXOsi3SskE3bcCdM0P4SDd+24zS/OCacdRq5BkdsRj9q3Pg6YyQoxIGqg== unicode-match-property-ecmascript@^2.0.0: version "2.0.0" @@ -11325,9 +11261,9 @@ unicode-match-property-ecmascript@^2.0.0: unicode-property-aliases-ecmascript "^2.0.0" unicode-match-property-value-ecmascript@^2.1.0: - version "2.1.0" - resolved "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz#cb5fffdcd16a05124f5a4b0bf7c3770208acbbe0" - integrity sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA== + version "2.2.0" + resolved "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.2.0.tgz#a0401aee72714598f739b68b104e4fe3a0cb3c71" + integrity sha512-4IehN3V/+kkr5YeSSDDQG8QLqO26XpL2XP3GQtqwlT/QYSECAwFztxVHjlbh0+gjJ3XmNLS0zDsbgs9jWKExLg== unicode-property-aliases-ecmascript@^2.0.0: version "2.1.0" @@ -11346,12 +11282,12 @@ unique-filename@^2.0.0: dependencies: unique-slug "^3.0.0" -unique-filename@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz#48ba7a5a16849f5080d26c760c86cf5cf05770ea" - integrity sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g== +unique-filename@^4.0.0: + version "4.0.0" + resolved "https://registry.npmjs.org/unique-filename/-/unique-filename-4.0.0.tgz#a06534d370e7c977a939cd1d11f7f0ab8f1fed13" + integrity sha512-XSnEewXmQ+veP7xX2dS5Q4yZAvO40cBN2MWkJ7D/6sW4Dg6wYBNwM1Vrnz1FhH5AdeLIlUXRI9e28z1YZi71NQ== dependencies: - unique-slug "^4.0.0" + unique-slug "^5.0.0" unique-slug@^3.0.0: version "3.0.0" @@ -11360,10 +11296,10 @@ unique-slug@^3.0.0: dependencies: imurmurhash "^0.1.4" -unique-slug@^4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz#6bae6bb16be91351badd24cdce741f892a6532e3" - integrity sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ== +unique-slug@^5.0.0: + version "5.0.0" + resolved "https://registry.npmjs.org/unique-slug/-/unique-slug-5.0.0.tgz#ca72af03ad0dbab4dad8aa683f633878b1accda8" + integrity sha512-9OdaqO5kwqR+1kVgHAhsp5vPNU0hnxRa26rBFNfNgM7M6pNtgzeBn3s/xbyCQL3dcjzOatcef6UUHpB/6MaETg== dependencies: imurmurhash "^0.1.4" @@ -11372,13 +11308,13 @@ universalify@^0.2.0: resolved "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0" integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg== -update-browserslist-db@^1.1.0: - version "1.1.0" - resolved "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz#7ca61c0d8650766090728046e416a8cde682859e" - integrity sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ== +update-browserslist-db@^1.1.1: + version "1.1.2" + resolved "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.2.tgz#97e9c96ab0ae7bcac08e9ae5151d26e6bc6b5580" + integrity sha512-PPypAm5qvlD7XMZC3BujecnaOxwhrtoFR+Dqkk5Aa/6DssiH0ibKoketaj9w8LP7Bont1rYeoV5plxD7RTEPRg== dependencies: - escalade "^3.1.2" - picocolors "^1.0.1" + escalade "^3.2.0" + picocolors "^1.1.1" uplot-react@^1.1.4: version "1.2.2" @@ -11386,9 +11322,9 @@ uplot-react@^1.1.4: integrity sha512-fCe48HsE0sJmHVUs4TC49roTK3FYNXfCxA44g8pe20TMZ8GD3OT/mtXN/S0gJ8bYVOUcheOZ5u7f1Vw09JbTrw== uplot@^1.6.24: - version "1.6.30" - resolved "https://registry.npmjs.org/uplot/-/uplot-1.6.30.tgz#1622a96b7cb2e50622c74330823c321847cbc147" - integrity sha512-48oVVRALM/128ttW19F2a2xobc2WfGdJ0VJFX00099CfqbCTuML7L2OrTKxNzeFP34eo1+yJbqFSoFAp2u28/Q== + version "1.6.31" + resolved "https://registry.npmjs.org/uplot/-/uplot-1.6.31.tgz#092a4b586590e9794b679e1df885a15584b03698" + integrity sha512-sQZqSwVCbJGnFB4IQjQYopzj5CoTZJ4Br1fG/xdONimqgHmsacvCjNesdGDypNKFbrhLGIeshYhy89FxPF+H+w== uri-js@^4.2.2: version "4.4.1" @@ -11446,15 +11382,15 @@ url@~0.11.0: punycode "^1.4.1" qs "^6.12.3" -use-isomorphic-layout-effect@^1.1.2: - version "1.1.2" - resolved "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz#497cefb13d863d687b08477d9e5a164ad8c1a6fb" - integrity sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA== +use-isomorphic-layout-effect@^1.2.0: + version "1.2.0" + resolved "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.2.0.tgz#afb292eb284c39219e8cb8d3d62d71999361a21d" + integrity sha512-q6ayo8DWoPZT0VdG4u3D3uxcgONP3Mevx2i2b0434cwWBoL+aelL1DzkXI6w3PhTZzUeR2kaVlZn70iCiseP6w== -"use-sync-external-store@1.2.2", "use-sync-external-store@^1.2.0": - version "1.2.2" - resolved "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.2.tgz#c3b6390f3a30eba13200d2302dcdf1e7b57b2ef9" - integrity sha512-PElTlVMwpblvbNqQ82d2n6RjStvdSoNe9FG28kNfz3WiXilJm4DdNkEzRhCZuIDwY8U08WVihhGR5iRqAwfDiw== +use-sync-external-store@^1.2.0: + version "1.4.0" + resolved "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.4.0.tgz#adbc795d8eeb47029963016cefdf89dc799fcebc" + integrity sha512-9WXSPC5fMv61vaupRkCKCxsPxBocVnwakBEkMIHHpkTTg6icbJtg6jzgtLDm4bl3cSHAca52rYWih0k4K3PfHw== "util-deprecate@^1.0.1", "util-deprecate@^1.0.2", "util-deprecate@~1.0.1": version "1.0.2" @@ -11493,12 +11429,12 @@ v8-to-istanbul@^9.0.1: "@types/istanbul-lib-coverage" "^2.0.1" convert-source-map "^2.0.0" -valid-filename@^2.0.1: - version "2.0.1" - resolved "https://registry.npmjs.org/valid-filename/-/valid-filename-2.0.1.tgz#0768d6f364b1ed3bdf68f0d15abffb0d9d6cecaf" - integrity sha512-7eF/iUZ5SPd3FighoKgatSjXDJ25Vopo/6yvEKGyX4FIeZVHcLjHmyvbQ1WdFD9RQZ9PoBA7nrSxxAz/oC64SQ== +valid-filename@^4.0.0: + version "4.0.0" + resolved "https://registry.npmjs.org/valid-filename/-/valid-filename-4.0.0.tgz#64f1528cffa0725491de84bf1a65733c6125ab06" + integrity sha512-VEYTpTVPMgO799f2wI7zWf0x2C54bPX6NAfbZ2Z8kZn76p+3rEYCTYVYzMUcVSMvakxMQTriBf24s3+WeXJtEg== dependencies: - filename-reserved-regex "^2.0.0" + filename-reserved-regex "^3.0.0" validate-npm-package-license@^3.0.1: version "3.0.4" @@ -11508,7 +11444,7 @@ validate-npm-package-license@^3.0.1: spdx-correct "^3.0.0" spdx-expression-parse "^3.0.0" -vanilla-picker@^2.12.2: +vanilla-picker@^2.12.3: version "2.12.3" resolved "https://registry.npmjs.org/vanilla-picker/-/vanilla-picker-2.12.3.tgz#1cc47b641a2b9c9afc5ac3a9a02febace0f1b17a" integrity sha512-qVkT1E7yMbUsB2mmJNFmaXMWE2hF8ffqzMMwe9zdAikd8u2VfnsVY2HQcOUi2F38bgbxzlJBEdS1UUhOXdF9GQ== @@ -11586,33 +11522,33 @@ webpack-bundle-analyzer@^4.8.0: sirv "^2.0.3" ws "^7.3.1" -webpack-cli@^5.1.4: - version "5.1.4" - resolved "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.1.4.tgz#c8e046ba7eaae4911d7e71e2b25b776fcc35759b" - integrity sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg== +webpack-cli@^6.0.1: + version "6.0.1" + resolved "https://registry.npmjs.org/webpack-cli/-/webpack-cli-6.0.1.tgz#a1ce25da5ba077151afd73adfa12e208e5089207" + integrity sha512-MfwFQ6SfwinsUVi0rNJm7rHZ31GyTcpVE5pgVA3hwFRb7COD4TzjUUwhGWKfO50+xdc2MQPuEBBJoqIMGt3JDw== dependencies: - "@discoveryjs/json-ext" "^0.5.0" - "@webpack-cli/configtest" "^2.1.1" - "@webpack-cli/info" "^2.0.2" - "@webpack-cli/serve" "^2.0.5" + "@discoveryjs/json-ext" "^0.6.1" + "@webpack-cli/configtest" "^3.0.1" + "@webpack-cli/info" "^3.0.1" + "@webpack-cli/serve" "^3.0.1" colorette "^2.0.14" - commander "^10.0.1" + commander "^12.1.0" cross-spawn "^7.0.3" - envinfo "^7.7.3" + envinfo "^7.14.0" fastest-levenshtein "^1.0.12" import-local "^3.0.2" interpret "^3.1.1" rechoir "^0.8.0" - webpack-merge "^5.7.3" + webpack-merge "^6.0.1" -webpack-merge@^5.7.3: - version "5.10.0" - resolved "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.10.0.tgz#a3ad5d773241e9c682803abf628d4cd62b8a4177" - integrity sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA== +webpack-merge@^6.0.1: + version "6.0.1" + resolved "https://registry.npmjs.org/webpack-merge/-/webpack-merge-6.0.1.tgz#50c776868e080574725abc5869bd6e4ef0a16c6a" + integrity sha512-hXXvrjtx2PLYx4qruKl+kyRSLc52V+cCvMxRjmKwoA+CBbbF5GfIBtR6kCvl0fYGqTUPKB+1ktVmTHqMOzgCBg== dependencies: clone-deep "^4.0.1" flat "^5.0.2" - wildcard "^2.0.0" + wildcard "^2.0.1" webpack-sources@^0.2.3: version "0.2.3" @@ -11628,17 +11564,17 @@ webpack-sources@^3.2.3: integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== webpack@^5.88.2: - version "5.94.0" - resolved "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz#77a6089c716e7ab90c1c67574a28da518a20970f" - integrity sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg== + version "5.97.1" + resolved "https://registry.npmjs.org/webpack/-/webpack-5.97.1.tgz#972a8320a438b56ff0f1d94ade9e82eac155fa58" + integrity sha512-EksG6gFY3L1eFMROS/7Wzgrii5mBAFe4rIr3r2BTfo7bcc+DWwFZ4OJ/miOuHJO/A85HwyI4eQ0F6IKXesO7Fg== dependencies: - "@types/estree" "^1.0.5" - "@webassemblyjs/ast" "^1.12.1" - "@webassemblyjs/wasm-edit" "^1.12.1" - "@webassemblyjs/wasm-parser" "^1.12.1" - acorn "^8.7.1" - acorn-import-attributes "^1.9.5" - browserslist "^4.21.10" + "@types/eslint-scope" "^3.7.7" + "@types/estree" "^1.0.6" + "@webassemblyjs/ast" "^1.14.1" + "@webassemblyjs/wasm-edit" "^1.14.1" + "@webassemblyjs/wasm-parser" "^1.14.1" + acorn "^8.14.0" + browserslist "^4.24.0" chrome-trace-event "^1.0.2" enhanced-resolve "^5.17.1" es-module-lexer "^1.2.1" @@ -11676,34 +11612,35 @@ whatwg-url@^11.0.0: tr46 "^3.0.0" webidl-conversions "^7.0.0" -which-boxed-primitive@^1.0.2: - version "1.0.2" - resolved "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" - integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg== +"which-boxed-primitive@^1.1.0", "which-boxed-primitive@^1.1.1": + version "1.1.1" + resolved "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz#d76ec27df7fa165f18d5808374a5fe23c29b176e" + integrity sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA== dependencies: - is-bigint "^1.0.1" - is-boolean-object "^1.1.0" - is-number-object "^1.0.4" - is-string "^1.0.5" - is-symbol "^1.0.3" + is-bigint "^1.1.0" + is-boolean-object "^1.2.1" + is-number-object "^1.1.1" + is-string "^1.1.1" + is-symbol "^1.1.1" -which-builtin-type@^1.1.3: - version "1.1.4" - resolved "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.1.4.tgz#592796260602fc3514a1b5ee7fa29319b72380c3" - integrity sha512-bppkmBSsHFmIMSl8BO9TbsyzsvGjVoppt8xUiGzwiu/bhDCGxnpOKCxgqj6GuyHE0mINMDecBFPlOm2hzY084w== +which-builtin-type@^1.2.1: + version "1.2.1" + resolved "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.1.tgz#89183da1b4907ab089a6b02029cc5d8d6574270e" + integrity sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q== dependencies: + call-bound "^1.0.2" function.prototype.name "^1.1.6" has-tostringtag "^1.0.2" is-async-function "^2.0.0" - is-date-object "^1.0.5" - is-finalizationregistry "^1.0.2" + is-date-object "^1.1.0" + is-finalizationregistry "^1.1.0" is-generator-function "^1.0.10" - is-regex "^1.1.4" + is-regex "^1.2.1" is-weakref "^1.0.2" isarray "^2.0.5" - which-boxed-primitive "^1.0.2" + which-boxed-primitive "^1.1.0" which-collection "^1.0.2" - which-typed-array "^1.1.15" + which-typed-array "^1.1.16" which-collection@^1.0.2: version "1.0.2" @@ -11715,15 +11652,16 @@ which-collection@^1.0.2: is-weakmap "^2.0.2" is-weakset "^2.0.3" -"which-typed-array@^1.1.14", "which-typed-array@^1.1.15", "which-typed-array@^1.1.2": - version "1.1.15" - resolved "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz#264859e9b11a649b388bfaaf4f767df1f779b38d" - integrity sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA== +"which-typed-array@^1.1.16", "which-typed-array@^1.1.18", "which-typed-array@^1.1.2": + version "1.1.18" + resolved "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.18.tgz#df2389ebf3fbb246a71390e90730a9edb6ce17ad" + integrity sha512-qEcY+KJYlWyLH9vNbsr6/5j59AXk5ni5aakf8ldzBvGde6Iz4sxZGkJyWSAueTG7QhOvNRYb1lDdFmL5Td0QKA== dependencies: available-typed-arrays "^1.0.7" - call-bind "^1.0.7" + call-bind "^1.0.8" + call-bound "^1.0.3" for-each "^0.3.3" - gopd "^1.0.1" + gopd "^1.2.0" has-tostringtag "^1.0.2" which@^1.2.9: @@ -11740,10 +11678,10 @@ which@^1.2.9: dependencies: isexe "^2.0.0" -which@^4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/which/-/which-4.0.0.tgz#cd60b5e74503a3fbcfbf6cd6b4138a8bae644c1a" - integrity sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg== +which@^5.0.0: + version "5.0.0" + resolved "https://registry.npmjs.org/which/-/which-5.0.0.tgz#d93f2d93f79834d4363c7d0c23e00d07c466c8d6" + integrity sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ== dependencies: isexe "^3.1.1" @@ -11754,7 +11692,7 @@ wide-align@^1.1.5: dependencies: string-width "^1.0.2 || 2 || 3 || 4" -wildcard@^2.0.0: +wildcard@^2.0.1: version "2.0.1" resolved "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz#5ab10d02487198954836b6349f74fff961e10f67" integrity sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ== @@ -11832,10 +11770,10 @@ xmlchars@^2.2.0: resolved "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== -xmlhttprequest-ssl@~2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz#91360c86b914e67f44dce769180027c0da618c67" - integrity sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A== +xmlhttprequest-ssl@~2.1.1: + version "2.1.2" + resolved "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.1.2.tgz#e9e8023b3f29ef34b97a859f584c5e6c61418e23" + integrity sha512-TEU+nJVUUnA4CYJFLvK5X9AOeH4KvDvhIfm0vV1GaQRtchnG0hgK5p8hw/xjv8cunWYCsiPCSDzObPyhEwq3KQ== "xtend@^4.0.0", "xtend@^4.0.1", "xtend@^4.0.2", "xtend@~4.0.1": version "4.0.2" @@ -11862,7 +11800,12 @@ yallist@^4.0.0: resolved "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== -"yaml@^1.10.0", "yaml@^1.10.2": +yallist@^5.0.0: + version "5.0.0" + resolved "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz#00e2de443639ed0d78fd87de0d27469fbcffb533" + integrity sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw== + +yaml@^1.10.0: version "1.10.2" resolved "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== @@ -11890,14 +11833,15 @@ yargs@^17.3.1: y18n "^5.0.5" yargs-parser "^21.1.1" -yarn-audit-html@4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/yarn-audit-html/-/yarn-audit-html-4.0.0.tgz#dc04c9cf83e758fd6d9efad8c96df1fc8c4bf30c" - integrity sha512-PZW+M6b6BW4hBU6AuUnxFSOVOq6Gnrh+krBdzcX3OjWNqiDh8ovhiB6pTYEeR13jL8J9VXk/1POn2XljicWZNA== +yarn-audit-html@7.3.2: + version "7.3.2" + resolved "https://registry.npmjs.org/yarn-audit-html/-/yarn-audit-html-7.3.2.tgz#376aa13b77aae5fcb1d4ca3d43ed5a1b942454e7" + integrity sha512-DWj7TGdnYGmHAroCVSlHK2XHntDjCRTiLgSMand67B6UsoodZse2dz3/hiKa8XshzRCnylFlrD4ytG/xGroISw== dependencies: - commander "^9.3.0" - ejs "~3.1.8" - marked "^4.0.17" + "@types/ejs" "^3.1.2" + commander "^11.0.0" + ejs "^3.1.9" + marked "^5.1.2" yauzl@^2.4.2: version "2.10.0" @@ -11917,15 +11861,13 @@ yocto-queue@^1.0.0: resolved "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.1.1.tgz#fef65ce3ac9f8a32ceac5a634f74e17e5b232110" integrity sha512-b4JR1PFR10y1mKjhHY9LaGo6tmrgjit7hxVIeAmyMw3jegXR4dhYqLaQF5zMXZxY7tLpMyJeLjr1C4rLmkVe8g== -zustand@^4.5.4: - version "4.5.5" - resolved "https://registry.npmjs.org/zustand/-/zustand-4.5.5.tgz#f8c713041543715ec81a2adda0610e1dc82d4ad1" - integrity sha512-+0PALYNJNgK6hldkgDq2vLrw5f6g/jCInz52n9RTpropGgeAf/ioFUCdtsjCqu4gNhW9D01rUQBROoRjdzyn2Q== - dependencies: - use-sync-external-store "1.2.2" +zustand@^5.0.3: + version "5.0.3" + resolved "https://registry.npmjs.org/zustand/-/zustand-5.0.3.tgz#b323435b73d06b2512e93c77239634374b0e407f" + integrity sha512-14fwWQtU3pH4dE0dOpdMiWjddcH+QzKIgk1cl8epwSE7yag43k/AD/m4L6+K7DytAOr9gGBe3/EXj9g7cdostg== -"react-data-grid@https://github.com/pgadmin-org/react-data-grid.git#4e10a5a327ff58198ac83c7b0c62549b20b78ae5": - version "7.0.0-beta.44" - resolved "https://github.com/pgadmin-org/react-data-grid.git#4e10a5a327ff58198ac83c7b0c62549b20b78ae5" +"react-data-grid@https://github.com/pgadmin-org/react-data-grid.git#3dfc2ca01a046d55c1c7a45392dcec104815dc76": + version "7.0.0-beta.47" + resolved "https://github.com/pgadmin-org/react-data-grid.git#3dfc2ca01a046d55c1c7a45392dcec104815dc76" dependencies: "clsx" "^2.0.0" From 61018ca62ef5d8e79a60ad227fd66a7614192379 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sat, 8 Feb 2025 07:40:54 +0800 Subject: [PATCH 0483/2168] turn-rs:3.2.0 -> 3.3.3 --- pkgs/by-name/tu/turn-rs/package.nix | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/tu/turn-rs/package.nix b/pkgs/by-name/tu/turn-rs/package.nix index 62d57d898168..c7fb7d040085 100644 --- a/pkgs/by-name/tu/turn-rs/package.nix +++ b/pkgs/by-name/tu/turn-rs/package.nix @@ -1,24 +1,36 @@ { - rustPlatform, lib, + rustPlatform, fetchFromGitHub, + versionCheckHook, nix-update-script, nixosTests, }: rustPlatform.buildRustPackage rec { pname = "turn-rs"; - version = "3.2.0"; + version = "3.3.3"; src = fetchFromGitHub { owner = "mycrl"; repo = "turn-rs"; tag = "v${version}"; - hash = "sha256-4I4mjG/euBL08v4xZdnrI8aTGVo5z2F2FDYtxKW1Qt8="; + hash = "sha256-kNE6FbHAFVWH04uTJBCRkrB0yzIjuXX3rxi2h5WmKWo="; }; useFetchCargoVendor = true; - cargoHash = "sha256-qSYGcZdMn7uelufs6z1UQtLxrRbBGNf3o1a1jR+qiqo="; + cargoHash = "sha256-VHfWVEYla7iHOATC4Rv7k560O2VUqAe4ZMo/hLiSOi4="; + + # By default, no features are enabled + # https://github.com/mycrl/turn-rs?tab=readme-ov-file#features-1 + cargoBuildFlags = [ "--all-features" ]; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgram = "${placeholder "out"}/bin/turn-server"; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; passthru = { updateScript = nix-update-script { }; From ff705b9dd566b0a7668c13dc271aa091b458bc2a Mon Sep 17 00:00:00 2001 From: ZHAO Jin-Xiang Date: Sat, 8 Feb 2025 15:18:48 +0800 Subject: [PATCH 0484/2168] windsurf: init at 1.2.6 --- pkgs/applications/editors/vscode/generic.nix | 3 +- pkgs/by-name/wi/windsurf/info.json | 20 +++++ pkgs/by-name/wi/windsurf/package.nix | 57 +++++++++++++ pkgs/by-name/wi/windsurf/update/.gitignore | 2 + pkgs/by-name/wi/windsurf/update/package.json | 12 +++ pkgs/by-name/wi/windsurf/update/tsconfig.json | 9 ++ pkgs/by-name/wi/windsurf/update/update.mts | 82 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 + 8 files changed, 188 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/wi/windsurf/info.json create mode 100644 pkgs/by-name/wi/windsurf/package.nix create mode 100644 pkgs/by-name/wi/windsurf/update/.gitignore create mode 100644 pkgs/by-name/wi/windsurf/update/package.json create mode 100644 pkgs/by-name/wi/windsurf/update/tsconfig.json create mode 100755 pkgs/by-name/wi/windsurf/update/update.mts diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 0b5f20efd165..c5f0c0b51673 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -33,6 +33,7 @@ # Attributes inherit from specific versions version, + vscodeVersion ? version, src, meta, sourceRoot, @@ -303,7 +304,7 @@ stdenv.mkDerivation ( let vscodeRipgrep = if stdenv.hostPlatform.isDarwin then - if lib.versionAtLeast version "1.94.0" then + if lib.versionAtLeast vscodeVersion "1.94.0" then "Contents/Resources/app/node_modules/@vscode/ripgrep/bin/rg" else "Contents/Resources/app/node_modules.asar.unpacked/@vscode/ripgrep/bin/rg" diff --git a/pkgs/by-name/wi/windsurf/info.json b/pkgs/by-name/wi/windsurf/info.json new file mode 100644 index 000000000000..83356b1e12a7 --- /dev/null +++ b/pkgs/by-name/wi/windsurf/info.json @@ -0,0 +1,20 @@ +{ + "aarch64-darwin": { + "version": "1.2.6", + "vscodeVersion": "1.94.0", + "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/d08b8ea13d580d24be204c76e5dd1651d7234cd2/Windsurf-darwin-arm64-1.2.6.zip", + "sha256": "b9a63785454003f7ccb3b6adebe232e24618247244b556ef61e9e974a4b77f65" + }, + "x86_64-darwin": { + "version": "1.2.6", + "vscodeVersion": "1.94.0", + "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/d08b8ea13d580d24be204c76e5dd1651d7234cd2/Windsurf-darwin-x64-1.2.6.zip", + "sha256": "4a4beae35117162b484521a64fc67cac044ced17a971553ab75ba8823b3cbb75" + }, + "x86_64-linux": { + "version": "1.2.6", + "vscodeVersion": "1.94.0", + "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/d08b8ea13d580d24be204c76e5dd1651d7234cd2/Windsurf-linux-x64-1.2.6.tar.gz", + "sha256": "ad71eb02b9302d4cf1413c0a83763f45fe455e5be74ee9e1477bea2e85a02caa" + } +} diff --git a/pkgs/by-name/wi/windsurf/package.nix b/pkgs/by-name/wi/windsurf/package.nix new file mode 100644 index 000000000000..92cb26bffc61 --- /dev/null +++ b/pkgs/by-name/wi/windsurf/package.nix @@ -0,0 +1,57 @@ +{ + lib, + stdenv, + callPackage, + vscode-generic, + fetchurl, + nixosTests, + commandLineArgs ? "", + useVSCodeRipgrep ? stdenv.hostPlatform.isDarwin, +}: +let + info = + (lib.importJSON ./info.json)."${stdenv.hostPlatform.system}" + or (throw "windsurf: unsupported system ${stdenv.hostPlatform.system}"); +in +callPackage vscode-generic rec { + inherit commandLineArgs useVSCodeRipgrep; + + inherit (info) version vscodeVersion; + pname = "windsurf"; + + executableName = "windsurf"; + longName = "Windsurf"; + shortName = "windsurf"; + + sourceRoot = if stdenv.hostPlatform.isDarwin then "Windsurf.app" else "Windsurf"; + + src = fetchurl { inherit (info) url sha256; }; + + tests = nixosTests.vscodium; + + updateScript = ./update/update.mts; + + # Editing the `codium` binary (and shell scripts) within the app bundle causes the bundle's signature + # to be invalidated, which prevents launching starting with macOS Ventura, because VSCodium is notarized. + # See https://eclecticlight.co/2022/06/17/app-security-changes-coming-in-ventura/ for more information. + dontFixup = stdenv.hostPlatform.isDarwin; + + meta = { + description = "Agentic IDE powered by AI Flow paradigm"; + longDescription = '' + The first agentic IDE, and then some. + The Windsurf Editor is where the work of developers and AI truly flow together, allowing for a coding experience that feels like literal magic. + ''; + homepage = "https://codeium.com/windsurf"; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ + xiaoxiangmoe + ]; + platforms = [ + "aarch64-darwin" + "x86_64-darwin" + "x86_64-linux" + ]; + sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; + }; +} diff --git a/pkgs/by-name/wi/windsurf/update/.gitignore b/pkgs/by-name/wi/windsurf/update/.gitignore new file mode 100644 index 000000000000..d5f19d89b308 --- /dev/null +++ b/pkgs/by-name/wi/windsurf/update/.gitignore @@ -0,0 +1,2 @@ +node_modules +package-lock.json diff --git a/pkgs/by-name/wi/windsurf/update/package.json b/pkgs/by-name/wi/windsurf/update/package.json new file mode 100644 index 000000000000..d61a0d4ec9f5 --- /dev/null +++ b/pkgs/by-name/wi/windsurf/update/package.json @@ -0,0 +1,12 @@ +{ + "name": "windsurf-scripts", + "version": "1.0.0", + "scripts": { + "update": "node update.mts" + }, + "dependencies": { + "@types/node": "^22.13.1", + "prettier": "^3.4.2", + "typescript": "^5.7.3" + } +} diff --git a/pkgs/by-name/wi/windsurf/update/tsconfig.json b/pkgs/by-name/wi/windsurf/update/tsconfig.json new file mode 100644 index 000000000000..347a07fb3e23 --- /dev/null +++ b/pkgs/by-name/wi/windsurf/update/tsconfig.json @@ -0,0 +1,9 @@ +{ + "compilerOptions": { + "allowJs": true, + "checkJs": true, + "module": "NodeNext", + "noEmit": true, + "strict": true + } +} diff --git a/pkgs/by-name/wi/windsurf/update/update.mts b/pkgs/by-name/wi/windsurf/update/update.mts new file mode 100755 index 000000000000..5db74e3b5346 --- /dev/null +++ b/pkgs/by-name/wi/windsurf/update/update.mts @@ -0,0 +1,82 @@ +#!/usr/bin/env nix-shell +/* +#!nix-shell -i node --pure --packages cacert nodejs_23 +*/ +import * as assert from "node:assert/strict"; +import * as fsPromises from "node:fs/promises"; +import * as path from "node:path"; +import * as process from "node:process"; + +const __dirname = import.meta.dirname; +const __filename = import.meta.filename; + +interface LatestInfo { + readonly url: string; + readonly sha256hash: string; + readonly windsurfVersion: string; + readonly productVersion: string; +} + +const platforms = ["aarch64-darwin", "x86_64-darwin", "x86_64-linux"] as const; +type Platform = (typeof platforms)[number]; +type InfoMap = Record< + Platform, + { + readonly version: string; + readonly vscodeVersion: string; + readonly url: string; + readonly sha256: string; + } +>; + +async function getInfo(targetSystem: "darwin-arm64" | "darwin-x64" | "linux-x64") { + const url = + `https://windsurf-stable.codeium.com/api/update/${targetSystem}/stable/latest` as const; + + const response = await fetch(url); + assert.ok(response.ok, `Failed to fetch ${url}`); + + const latestInfo: LatestInfo = JSON.parse(await response.text()); + assert.ok(latestInfo.sha256hash, "sha256hash is required"); + assert.ok(latestInfo.url, "url is required"); + assert.ok(latestInfo.windsurfVersion, "windsurfVersion is required"); + assert.ok(latestInfo.productVersion, "productVersion is required"); + return { + version: latestInfo.windsurfVersion, + vscodeVersion: latestInfo.productVersion, + url: latestInfo.url, + sha256: latestInfo.sha256hash, + }; +} + +async function main() { + const filePath = path.join(__dirname, "../info.json"); + const oldInfo = JSON.parse( + await fsPromises.readFile(filePath, { encoding: "utf-8" }), + ); + + const info: InfoMap = { + "aarch64-darwin": await getInfo("darwin-arm64"), + "x86_64-darwin": await getInfo("darwin-x64"), + "x86_64-linux": await getInfo("linux-x64"), + }; + if (JSON.stringify(oldInfo) === JSON.stringify(info)) { + console.log("[update] No updates found"); + return; + } + for (const platform of platforms) { + console.log( + `[update] Updating Windsurf ${platform} ${oldInfo[platform].version} -> ${info[platform].version}`, + ); + } + await fsPromises.writeFile( + filePath, + JSON.stringify(info, null, 2) + "\n", + "utf-8", + ); + console.log("[update] Updating Windsurf complete"); +} + +if (process.argv[1] === __filename) { + main(); +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 900b41006d34..dcacf936d9c1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15594,6 +15594,10 @@ with pkgs; vscodium-fhs = vscodium.fhs; vscodium-fhsWithPackages = vscodium.fhsWithPackages; + windsurf = callPackage ../by-name/wi/windsurf/package.nix { + vscode-generic = ../applications/editors/vscode/generic.nix; + }; + openvscode-server = callPackage ../servers/openvscode-server { nodejs = nodejs_18; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Security; From 064c9430f377bf566562c8825b96cfc3c3c4952b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sat, 8 Feb 2025 07:08:33 -0300 Subject: [PATCH 0485/2168] lxqt.lxqt-config: 2.1.0 -> 2.1.1 Diff: https://github.com/lxqt/lxqt-config/compare/2.1.0...2.1.1 --- pkgs/desktops/lxqt/lxqt-config/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix index 4215ce43fde5..6977648d4e06 100644 --- a/pkgs/desktops/lxqt/lxqt-config/default.nix +++ b/pkgs/desktops/lxqt/lxqt-config/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "lxqt-config"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-zAJD1p0iJUEN+pOW1nyVKrCBfew/uqVNqw9aCFq+JY4="; + hash = "sha256-Vzf+Olaxl6tn3ETEQseFIPstjo+pfdzZUgyVFqk6p3c="; }; nativeBuildInputs = [ From 44114d2703e050d4488068db68d79c3705ddf062 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 8 Feb 2025 04:27:56 +0100 Subject: [PATCH 0486/2168] python3Packages.pulsectl-asyncio: fix build --- pkgs/development/python-modules/pulsectl-asyncio/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/pulsectl-asyncio/default.nix b/pkgs/development/python-modules/pulsectl-asyncio/default.nix index b89dad1023a2..59974681cf1b 100644 --- a/pkgs/development/python-modules/pulsectl-asyncio/default.nix +++ b/pkgs/development/python-modules/pulsectl-asyncio/default.nix @@ -21,6 +21,10 @@ buildPythonPackage rec { hash = "sha256-lHVLrkFdNM8Y4t6TcXYnX8sQ4COrW3vV2sTDWeI4xZU="; }; + postPatch = '' + substituteInPlace setup.cfg --replace-fail "pulsectl >=23.5.0,<=24.11.0" "pulsectl >=23.5.0" + ''; + build-system = [ setuptools ]; dependencies = [ pulsectl ]; From 37d78ecb1169d9692a4ab33fc1ad7f9117e3df34 Mon Sep 17 00:00:00 2001 From: PerchunPak Date: Fri, 24 Jan 2025 14:26:31 +0100 Subject: [PATCH 0487/2168] python3Packages.nonbloat-db: init at 0.1.4 --- .../python-modules/nonbloat-db/default.nix | 71 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 73 insertions(+) create mode 100644 pkgs/development/python-modules/nonbloat-db/default.nix diff --git a/pkgs/development/python-modules/nonbloat-db/default.nix b/pkgs/development/python-modules/nonbloat-db/default.nix new file mode 100644 index 000000000000..7e3d3f9a70d2 --- /dev/null +++ b/pkgs/development/python-modules/nonbloat-db/default.nix @@ -0,0 +1,71 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + poetry-core, + poetry-dynamic-versioning, + + # dependencies + aiofile, + typing-extensions, + + # tests + pytestCheckHook, + pytest-asyncio, + pytest-cov, + pytest-mock, + pytest-randomly, + faker, +}: + +buildPythonPackage rec { + pname = "nonbloat-db"; + version = "0.1.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "PerchunPak"; + repo = "nonbloat-db"; + tag = "v${version}"; + hash = "sha256-x6QFOZ+RYdophuRXMKE4RNi1xDnsa3naUMDbn1vG7hM="; + }; + + build-system = [ + poetry-core + poetry-dynamic-versioning + ]; + + dependencies = [ + aiofile + typing-extensions + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + pytest-cov + pytest-mock + pytest-randomly + faker + ]; + + pythonImportsCheck = [ + "nbdb" + "nbdb.storage" + ]; + + disabledTests = [ + # flaky + "test_write_in_background" + ]; + + meta = { + description = "Simple key-value database for my small projects"; + homepage = "https://github.com/PerchunPak/nonbloat-db"; + changelog = "https://github.com/PerchunPak/nonbloat-db/blob/v${version}/CHANGES.md"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ perchun ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7c3c4089b8c3..667a32a00945 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9125,6 +9125,8 @@ self: super: with self; { nomadnet = callPackage ../development/python-modules/nomadnet { }; + nonbloat-db = callPackage ../development/python-modules/nonbloat-db { }; + noneprompt = callPackage ../development/python-modules/noneprompt { }; nox = callPackage ../development/python-modules/nox { }; From 33a769c951edf6acf646380a3e8f2f3fcd5cc89f Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 8 Feb 2025 11:50:30 +0100 Subject: [PATCH 0488/2168] python3Packages.qtile: dbus-next -> dbus-fast It seems the StatusNotifier widget uses dbus-fast now instead of dbus-next --- pkgs/development/python-modules/qtile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qtile/default.nix b/pkgs/development/python-modules/qtile/default.nix index 570fdbd61eab..d74d8209786d 100644 --- a/pkgs/development/python-modules/qtile/default.nix +++ b/pkgs/development/python-modules/qtile/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchFromGitHub, cairocffi, - dbus-next, + dbus-fast, glib, iwlib, libcst, @@ -69,7 +69,7 @@ buildPythonPackage rec { dependencies = extraPackages ++ [ (cairocffi.override { withXcffib = true; }) - dbus-next + dbus-fast iwlib libcst mpd2 From 97dfe7ae298ccfbaa8550ac27c72d8a5c9c586ed Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Wed, 5 Feb 2025 08:50:41 +0100 Subject: [PATCH 0489/2168] aporetic: init at 1.0.0 https://github.com/protesilaos/aporetic/ --- pkgs/by-name/ap/aporetic/package.nix | 65 ++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 pkgs/by-name/ap/aporetic/package.nix diff --git a/pkgs/by-name/ap/aporetic/package.nix b/pkgs/by-name/ap/aporetic/package.nix new file mode 100644 index 000000000000..58614af2320f --- /dev/null +++ b/pkgs/by-name/ap/aporetic/package.nix @@ -0,0 +1,65 @@ +{ + lib, + iosevka, + fetchFromGitHub, + buildNpmPackage, + symlinkJoin, +}: + +let + sets = [ + "sans-mono" + "sans" + "serif-mono" + "serif" + ]; + pname = "aporetic"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "protesilaos"; + repo = pname; + rev = version; + sha256 = "sha256-5m4iT77FFsJf6N1FIsCtk5Z0IEOVUGCceXiT2n5dZUg="; + }; + privateBuildPlan = src.outPath + "/private-build-plans.toml"; + makeIosevkaFont = + set: + let + superBuildNpmPackage = buildNpmPackage; + in + (iosevka.override { + inherit set privateBuildPlan; + buildNpmPackage = + args: + superBuildNpmPackage ( + args + // { + pname = "aporetic-${set}"; + inherit version; + + src = fetchFromGitHub { + owner = "be5invis"; + repo = "iosevka"; + rev = "v32.5.0"; + hash = "sha256-MzsAkq5l4TP19UJNPW/8hvIqsJd94pADrrv8wLG6NMQ="; + }; + + npmDepsHash = "sha256-HeqwpZyHLHdMhd/UfXVBonMu+PhStrLCxAMuP/KuTT8="; + + meta = with lib; { + inherit (src.meta) homepage; + description = '' + Customised build of the Iosevka typeface, with a consistent rounded style and overrides for almost all individual glyphs in both roman (upright) and italic (slanted) variants. + ''; + license = licenses.ofl; + platforms = iosevka.meta.platforms; + maintainers = [ maintainers.DamienCassou ]; + }; + } + ); + }); +in +symlinkJoin { + inherit pname version; + paths = (builtins.map makeIosevkaFont sets); +} From 217d1f4de52b96fdc28e6b48c4559ec7d19c9d75 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 8 Feb 2025 12:00:28 +0100 Subject: [PATCH 0490/2168] vscode-extensions.github.copilot: 1.251.0 -> 1.266.1363 --- pkgs/applications/editors/vscode/extensions/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 771be7809f06..a3af0288b47d 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2117,8 +2117,9 @@ let mktplcRef = { publisher = "github"; name = "copilot"; - version = "1.251.0"; # compatible with vscode ^1.96 - hash = "sha256-nv6lTPTPcggwMgO8a4KAF0W7gpou1399f/axnH0sS4s="; + # Verify which version is available with nix run nixpkgs#vsce -- show github.copilot --json + version = "1.266.1363"; # compatible with vscode ^1.96 + hash = "sha256-paT/fZMIjSh7Bp4bBg4ZT/c1wVc0ecQLJxulSQZjRdg="; }; meta = { From d9151c8ae1b87cc3766dcd2ca467f86bc7993e8b Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 8 Feb 2025 12:02:48 +0100 Subject: [PATCH 0491/2168] vscode-extensions.github.copilot-chat: 0.24.2024121201 -> 0.24.2025020602 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index a3af0288b47d..25f5c087ecc5 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2136,8 +2136,8 @@ let publisher = "github"; name = "copilot-chat"; # Verify which version is available with nix run nixpkgs#vsce -- show github.copilot-chat --json - version = "0.24.2024121201"; # compatible with vscode ^1.96 - hash = "sha256-v3wdodDzYalz927KqqpL4IqEqLRmx1CLWdGBvZgNmpE="; + version = "0.24.2025020602"; # latest compatible with vscode ^1.97 + hash = "sha256-smeBJ+yEIdbBs1eiKlPFCpYrb/nAkpnGlT9pTNnCnBI="; }; meta = { description = "GitHub Copilot Chat is a companion extension to GitHub Copilot that houses experimental chat features"; From 0b57b99c00a488a20ec83591580cde5ee7e8877a Mon Sep 17 00:00:00 2001 From: BirdeeHub Date: Fri, 7 Feb 2025 19:29:46 -0800 Subject: [PATCH 0492/2168] vimPlugins.lze: 0.7.5 -> 0.7.9 --- pkgs/development/lua-modules/generated-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 4dfca48839bd..391fed541767 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -2565,14 +2565,14 @@ buildLuarocksPackage { lze = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "lze"; - version = "0.7.5-1"; + version = "0.7.9-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lze-0.7.5-1.rockspec"; - sha256 = "1j5f2hs6pvlgpp9r42qlp6b1cbm4sagv373bf40xjgshzxhjf48j"; + url = "mirror://luarocks/lze-0.7.9-1.rockspec"; + sha256 = "010xp1142d7rl29hbbzl8dyf8cy77dzy266kmxa16099zm245kfd"; }).outPath; src = fetchzip { - url = "https://github.com/BirdeeHub/lze/archive/v0.7.5.zip"; - sha256 = "1f1vmv2j3g1f54071yzgxk3np5zxsm9hmckimfs348x873bbr967"; + url = "https://github.com/BirdeeHub/lze/archive/v0.7.9.zip"; + sha256 = "02klg4hl9q9wx3rdx0d92qiiyjw8agvanbicxdcsdavl9kaci8fl"; }; disabled = luaOlder "5.1"; From cf51b774f7c51af233c1009b47e637795f2b6348 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Feb 2025 12:12:42 +0100 Subject: [PATCH 0493/2168] dep-scan: 5.4.8 -> 5.5.0 Diff: https://github.com/owasp-dep-scan/dep-scan/compare/refs/tags/v5.4.8...v5.5.0 Changelog: https://github.com/owasp-dep-scan/dep-scan/releases/tag/v5.5.0 --- pkgs/by-name/de/dep-scan/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/de/dep-scan/package.nix b/pkgs/by-name/de/dep-scan/package.nix index bb69f4cb0f87..71c36fda3ddc 100644 --- a/pkgs/by-name/de/dep-scan/package.nix +++ b/pkgs/by-name/de/dep-scan/package.nix @@ -7,10 +7,10 @@ let appthreat-vulnerability-db = ( python3.pkgs.appthreat-vulnerability-db.overrideAttrs (oldAttrs: rec { - version = "5.7.8"; + version = "5.8.1"; src = oldAttrs.src.override { tag = "v${version}"; - hash = "sha256-R00/a9+1NctVPi+EL7K65w/e88c9oSW5xXGgno+MCXo="; + hash = "sha256-/Yo0yyDp2vd9KJhy3LGRml55eqTiaHSSuSoe2h2bSw0="; }; }) ); @@ -18,14 +18,14 @@ let in python3.pkgs.buildPythonApplication rec { pname = "dep-scan"; - version = "5.4.8"; + version = "5.5.0"; pyproject = true; src = fetchFromGitHub { owner = "owasp-dep-scan"; repo = "dep-scan"; tag = "v${version}"; - hash = "sha256-QTvxKoqBxTb/xFaIHsYe3N+7ABJ6sDd2vVcjkMbm3xI="; + hash = "sha256-lgqS8GY5JuHL3strNcb0B3mGieFkQTzGuRyV4dBp5e4="; }; pythonRelaxDeps = [ "oras" ]; From 6e49c0a89d9f4123adb83f9f0ed1e4372e42f138 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Feb 2025 12:20:11 +0100 Subject: [PATCH 0494/2168] python313Packages.python-overseerr: 0.6.0 -> 0.7.0 Diff: https://github.com/joostlek/python-overseerr/compare/refs/tags/v0.6.0...v0.7.0 Changelog: https://github.com/joostlek/python-overseerr/releases/tag/v0.7.0 --- pkgs/development/python-modules/python-overseerr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-overseerr/default.nix b/pkgs/development/python-modules/python-overseerr/default.nix index c9e9a109a977..d120dd62d571 100644 --- a/pkgs/development/python-modules/python-overseerr/default.nix +++ b/pkgs/development/python-modules/python-overseerr/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "python-overseerr"; - version = "0.6.0"; + version = "0.7.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "joostlek"; repo = "python-overseerr"; tag = "v${version}"; - hash = "sha256-XkuHy8gF8z5t1AcdVdBYWHBgOpAM9jpO41IM7DB3Wt0="; + hash = "sha256-91h8ooWzCdH2iO1PoInnlHwR6h1m1hZkdNoJE+D4NWQ="; }; build-system = [ poetry-core ]; From 980fedf92272b332738be0dac9fe29284c449b0b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Feb 2025 12:22:56 +0100 Subject: [PATCH 0495/2168] python313Packages.pytenable: 1.6.0 -> 1.7.1 Changelog: https://github.com/tenable/pyTenable/releases/tag/1.7.1 --- .../python-modules/pytenable/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pytenable/default.nix b/pkgs/development/python-modules/pytenable/default.nix index 67fcce798720..8cc45c14286d 100644 --- a/pkgs/development/python-modules/pytenable/default.nix +++ b/pkgs/development/python-modules/pytenable/default.nix @@ -7,6 +7,8 @@ gql, graphql-core, marshmallow, + pydantic-extra-types, + pydantic, pytest-cov-stub, pytest-datafiles, pytest-vcr, @@ -26,16 +28,16 @@ buildPythonPackage rec { pname = "pytenable"; - version = "1.6.0"; + version = "1.7.1"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "tenable"; repo = "pyTenable"; tag = version; - hash = "sha256-I6GlYPQI8qF9eyq8p4Wtkz8UEGth51ZALwA+Mu3TqhQ="; + hash = "sha256-IPhuxjUmj4g5UxuCZsthZytgDsFiplPt+dIsCHgfMdg="; }; pythonRelaxDeps = [ @@ -46,12 +48,14 @@ buildPythonPackage rec { build-system = [ setuptools ]; dependencies = [ - defusedxml - marshmallow - python-box cryptography + defusedxml gql graphql-core + marshmallow + pydantic + pydantic-extra-types + python-box python-dateutil requests requests-toolbelt From ecad688a1e681a5f6dca793d28f4cfc4169c8111 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Feb 2025 12:24:16 +0100 Subject: [PATCH 0496/2168] python313Packages.pyrisco: 0.6.5 -> 0.6.6 Diff: https://github.com/OnFreund/pyrisco/compare/refs/tags/v0.6.5...v0.6.6 Changelog: https://github.com/OnFreund/pyrisco/releases/tag/v0.6.6 --- pkgs/development/python-modules/pyrisco/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyrisco/default.nix b/pkgs/development/python-modules/pyrisco/default.nix index bc2fa44446bb..885c5edb35c6 100644 --- a/pkgs/development/python-modules/pyrisco/default.nix +++ b/pkgs/development/python-modules/pyrisco/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyrisco"; - version = "0.6.5"; + version = "0.6.6"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "OnFreund"; repo = "pyrisco"; tag = "v${version}"; - hash = "sha256-V+Wez9r/AoyNkR77yJTV3/9Kl0PHGw9kbQbzGauWEfc="; + hash = "sha256-iPtrpxssDEZTlxGtZ0xa1pfzN7wQu1gcQUl4zXPBhm8="; }; build-system = [ setuptools ]; From 3896639b27d81da3c5cb0a6fff5bfc8a42649bc5 Mon Sep 17 00:00:00 2001 From: AveryanAlex Date: Sat, 8 Feb 2025 14:28:31 +0300 Subject: [PATCH 0497/2168] nixos/wireguard-networkd: add assertion for type == "wireguard" --- nixos/modules/services/networking/wireguard-networkd.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/services/networking/wireguard-networkd.nix b/nixos/modules/services/networking/wireguard-networkd.nix index ad7de97f1e5a..1cea1e0acdd2 100644 --- a/nixos/modules/services/networking/wireguard-networkd.nix +++ b/nixos/modules/services/networking/wireguard-networkd.nix @@ -186,6 +186,10 @@ in assertion = interface.interfaceNamespace == null; message = "networking.wireguard.interfaces.${name}.interfaceNamespace cannot be used with networkd."; } + { + assertion = interface.type == "wireguard"; + message = "networking.wireguard.interfaces.${name}.type value must be \"wireguard\" when used with networkd."; + } ] ++ flip concatMap interface.ips (ip: [ # IP assertions From a79982af609fea2140fb7e310be59870240568ef Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Mon, 27 Jan 2025 11:49:18 -0800 Subject: [PATCH 0498/2168] python312Packages.openai: 1.59.9 -> 1.61.1 Diff: https://github.com/openai/openai-python/compare/refs/tags/v1.59.9...1.61.1 --- pkgs/development/python-modules/openai/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index 1514a6c7eefe..5b4e5410604c 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -32,12 +32,11 @@ pytest-asyncio, pytest-mock, respx, - }: buildPythonPackage rec { pname = "openai"; - version = "1.59.9"; + version = "1.61.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -46,7 +45,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; tag = "v${version}"; - hash = "sha256-khdrpiurp/PigM5+0LJpXfSbG22e2I+2Jwsxo6MJKhQ="; + hash = "sha256-7dDsfEHHYJv6hbDPryhzZwCtdIzYUOABLOSXXQ1vau8="; }; build-system = [ From 974db0c4f84c1e94e71689ca135a3896714fdf44 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Feb 2025 12:37:09 +0100 Subject: [PATCH 0499/2168] python312Packages.certbot-dns-cloudflare: refactor --- .../python-modules/certbot-dns-cloudflare/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix b/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix index 2a115f7590c8..1b9e10ae7113 100644 --- a/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix +++ b/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix @@ -5,18 +5,21 @@ cloudflare, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "certbot-dns-cloudflare"; - format = "setuptools"; + pyproject = true; inherit (certbot) src version; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.9"; sourceRoot = "${src.name}/certbot-dns-cloudflare"; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ acme certbot cloudflare From 7e4759039d1ad13c45ebbfefb56dbee203e8a4ef Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Feb 2025 12:37:35 +0100 Subject: [PATCH 0500/2168] python312Packages.certbot-dns-cloudflare: mark as broken See https://github.com/certbot/certbot/pull/10182 --- .../python-modules/certbot-dns-cloudflare/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix b/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix index 1b9e10ae7113..257ed1daa9a6 100644 --- a/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix +++ b/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix @@ -37,5 +37,7 @@ buildPythonPackage rec { meta = certbot.meta // { description = "Cloudflare DNS Authenticator plugin for Certbot"; + # https://github.com/certbot/certbot/pull/10182 + broken = true; }; } From 04670cfe227af20dd57537ea57722c0aca38a82b Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 8 Feb 2025 12:06:48 +0100 Subject: [PATCH 0501/2168] vscode-extensions.ms-python.mypy-type-checker: init at 2025.1.10381011 --- .../editors/vscode/extensions/default.nix | 2 ++ .../ms-python.mypy-type-checker/default.nix | 36 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/applications/editors/vscode/extensions/ms-python.mypy-type-checker/default.nix diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 25f5c087ecc5..4ca91ebe85bf 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3507,6 +3507,8 @@ let }; }; + ms-python.mypy-type-checker = callPackage ./ms-python.mypy-type-checker { }; + ms-python.python = callPackage ./ms-python.python { }; ms-python.debugpy = buildVscodeMarketplaceExtension { diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.mypy-type-checker/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.mypy-type-checker/default.nix new file mode 100644 index 000000000000..6119ebca6c6e --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/ms-python.mypy-type-checker/default.nix @@ -0,0 +1,36 @@ +{ + lib, + vscode-utils, + mypy, + jq, + moreutils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "mypy-type-checker"; + publisher = "ms-python"; + version = "2025.1.10381011"; + hash = "sha256-boKUxLOAgQJP13zX/NMhg1MtcrPVQJt5gLbxI7gVSu4="; + }; + + buildInputs = [ mypy ]; + + nativeBuildInputs = [ + jq + moreutils + ]; + + postInstall = '' + jq '.contributes.configuration.properties."mypy-type-checker.path".default = "${lib.getExe mypy}"' $out/$installPrefix/package.json | sponge $out/$installPrefix/package.json + ''; + + meta = { + changelog = "https://github.com/microsoft/vscode-mypy/releases"; + description = "VSCode extension for type checking support for Python files using Mypy"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-python.mypy-type-checker"; + homepage = "https://github.com/microsoft/vscode-mypy"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ drupol ]; + }; +} From df923a97a49936a1c637302b82a5936707d34659 Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Sat, 8 Feb 2025 12:41:35 +0100 Subject: [PATCH 0502/2168] floorp: 11.22.0 -> 11.23.0 Release notes: https://blog.ablaze.one/4674/2025-02-19/ Git changelog: https://github.com/Floorp-Projects/Floorp/compare/v11.22.0...v11.23.0 Signed-off-by: Christoph Heiss --- pkgs/applications/networking/browsers/floorp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/floorp/default.nix b/pkgs/applications/networking/browsers/floorp/default.nix index 90ee49000ba6..0d09dc95738c 100644 --- a/pkgs/applications/networking/browsers/floorp/default.nix +++ b/pkgs/applications/networking/browsers/floorp/default.nix @@ -9,7 +9,7 @@ ( (buildMozillaMach rec { pname = "floorp"; - packageVersion = "11.22.0"; + packageVersion = "11.23.0"; applicationName = "Floorp"; binaryName = "floorp"; branding = "browser/branding/official"; @@ -17,14 +17,14 @@ allowAddonSideload = true; # Must match the contents of `browser/config/version.txt` in the source tree - version = "128.7.0"; + version = "128.8.0"; src = fetchFromGitHub { owner = "Floorp-Projects"; repo = "Floorp"; fetchSubmodules = true; rev = "v${packageVersion}"; - hash = "sha256-gPFWSCACWUk7QE85I6alT6hsjMengjiiSE4J9px0Z58="; + hash = "sha256-wH1u64Ldj9Ghzw8cXRu43mhUBmqjAH7k3MiknjW+xcw="; }; extraConfigureFlags = [ From ecd9d98879729b38bc3c347b9f2d2708f7027f5b Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Sat, 8 Feb 2025 21:25:15 +1100 Subject: [PATCH 0503/2168] llvmPackages.openmp: Make OMPD customisable, add missing Python dependency --- .../compilers/llvm/common/openmp/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/common/openmp/default.nix b/pkgs/development/compilers/llvm/common/openmp/default.nix index 68c50e06abd3..8b1218c1ba67 100644 --- a/pkgs/development/compilers/llvm/common/openmp/default.nix +++ b/pkgs/development/compilers/llvm/common/openmp/default.nix @@ -14,9 +14,15 @@ , clang-unwrapped , perl , pkg-config +, python3 , version , devExtraCmakeFlags ? [] +, ompdSupport ? true +, ompdGdbSupport ? ompdSupport }: + +assert lib.assertMsg (ompdGdbSupport -> ompdSupport) "OMPD GDB support requires OMPD support!"; + let pname = "openmp"; src' = @@ -53,9 +59,14 @@ stdenv.mkDerivation (rec { buildInputs = [ (if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm) + ] ++ lib.optionals (ompdSupport && ompdGdbSupport) [ + python3 ]; - cmakeFlags = lib.optionals (lib.versions.major release_version == "13") [ + cmakeFlags = [ + (lib.cmakeBool "LIBOMP_OMPD_SUPPORT" ompdSupport) + (lib.cmakeBool "LIBOMP_OMPD_GDB_SUPPORT" ompdGdbSupport) + ] ++ lib.optionals (lib.versions.major release_version == "13") [ "-DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF" # Building the AMDGCN device RTL fails ] ++ lib.optionals (lib.versionAtLeast release_version "14") [ "-DCLANG_TOOL=${clang-unwrapped}/bin/clang" From 21a8b8d45ef459b0984e95d135ab38aa3619e352 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Sat, 8 Feb 2025 21:25:19 +1100 Subject: [PATCH 0504/2168] llvmPackages.openmp: Build static libraries when appropriate --- pkgs/development/compilers/llvm/common/openmp/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/llvm/common/openmp/default.nix b/pkgs/development/compilers/llvm/common/openmp/default.nix index 8b1218c1ba67..d6e176192b95 100644 --- a/pkgs/development/compilers/llvm/common/openmp/default.nix +++ b/pkgs/development/compilers/llvm/common/openmp/default.nix @@ -64,6 +64,7 @@ stdenv.mkDerivation (rec { ]; cmakeFlags = [ + (lib.cmakeBool "LIBOMP_ENABLE_SHARED" (!stdenv.hostPlatform.isStatic && stdenv.hostPlatform.hasSharedLibraries)) (lib.cmakeBool "LIBOMP_OMPD_SUPPORT" ompdSupport) (lib.cmakeBool "LIBOMP_OMPD_GDB_SUPPORT" ompdGdbSupport) ] ++ lib.optionals (lib.versions.major release_version == "13") [ From c006d5f0637d9a98d990e80e80b1fd932bb6025e Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 8 Feb 2025 12:47:46 +0100 Subject: [PATCH 0505/2168] Revert "llvmPackages.openmp: Build static libraries when appropriate" This reverts commit 21a8b8d45ef459b0984e95d135ab38aa3619e352. Mass rebuild accidentally merged to master. --- pkgs/development/compilers/llvm/common/openmp/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/common/openmp/default.nix b/pkgs/development/compilers/llvm/common/openmp/default.nix index d6e176192b95..8b1218c1ba67 100644 --- a/pkgs/development/compilers/llvm/common/openmp/default.nix +++ b/pkgs/development/compilers/llvm/common/openmp/default.nix @@ -64,7 +64,6 @@ stdenv.mkDerivation (rec { ]; cmakeFlags = [ - (lib.cmakeBool "LIBOMP_ENABLE_SHARED" (!stdenv.hostPlatform.isStatic && stdenv.hostPlatform.hasSharedLibraries)) (lib.cmakeBool "LIBOMP_OMPD_SUPPORT" ompdSupport) (lib.cmakeBool "LIBOMP_OMPD_GDB_SUPPORT" ompdGdbSupport) ] ++ lib.optionals (lib.versions.major release_version == "13") [ From fa648b2835f6cc0e77bd3b246cf8c80f126f0139 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 8 Feb 2025 12:48:22 +0100 Subject: [PATCH 0506/2168] Revert "llvmPackages.openmp: Make OMPD customisable, add missing Python dependency" This reverts commit ecd9d98879729b38bc3c347b9f2d2708f7027f5b. Mass rebuild accidentally merged to master. --- .../compilers/llvm/common/openmp/default.nix | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/pkgs/development/compilers/llvm/common/openmp/default.nix b/pkgs/development/compilers/llvm/common/openmp/default.nix index 8b1218c1ba67..68c50e06abd3 100644 --- a/pkgs/development/compilers/llvm/common/openmp/default.nix +++ b/pkgs/development/compilers/llvm/common/openmp/default.nix @@ -14,15 +14,9 @@ , clang-unwrapped , perl , pkg-config -, python3 , version , devExtraCmakeFlags ? [] -, ompdSupport ? true -, ompdGdbSupport ? ompdSupport }: - -assert lib.assertMsg (ompdGdbSupport -> ompdSupport) "OMPD GDB support requires OMPD support!"; - let pname = "openmp"; src' = @@ -59,14 +53,9 @@ stdenv.mkDerivation (rec { buildInputs = [ (if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm) - ] ++ lib.optionals (ompdSupport && ompdGdbSupport) [ - python3 ]; - cmakeFlags = [ - (lib.cmakeBool "LIBOMP_OMPD_SUPPORT" ompdSupport) - (lib.cmakeBool "LIBOMP_OMPD_GDB_SUPPORT" ompdGdbSupport) - ] ++ lib.optionals (lib.versions.major release_version == "13") [ + cmakeFlags = lib.optionals (lib.versions.major release_version == "13") [ "-DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF" # Building the AMDGCN device RTL fails ] ++ lib.optionals (lib.versionAtLeast release_version "14") [ "-DCLANG_TOOL=${clang-unwrapped}/bin/clang" From 6348fa21ef46342dbe3382e1735a1f34f551cfc1 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 8 Feb 2025 14:51:42 +0300 Subject: [PATCH 0507/2168] linux_6_13: 6.13.1 -> 6.13.2 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 5488bb52e1d7..c7040d796226 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -32,7 +32,7 @@ "hash": "sha256:1zwfw3lci3ihandx2cpq3h12x7l94jzr4xkd5lzkn1ppgv8l52g9" }, "6.13": { - "version": "6.13.1", - "hash": "sha256:0smnalhyrgh5s3mw60q56r1jxj993ckfpldxvfrz27a7xb4gc4gh" + "version": "6.13.2", + "hash": "sha256:01g73bnif9ynccb772628sca01y8zkww8wzb39qfkfvbj20jkxnd" } } From 45120b4a483a8197b5ef660c85d00831bee72382 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 8 Feb 2025 14:51:49 +0300 Subject: [PATCH 0508/2168] linux_6_12: 6.12.12 -> 6.12.13 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index c7040d796226..34a66883ab1b 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -28,8 +28,8 @@ "hash": "sha256:1z2913y38clnlmhvwj49h7p4pic24s4d8np7nmd4lk7m2xz8w532" }, "6.12": { - "version": "6.12.12", - "hash": "sha256:1zwfw3lci3ihandx2cpq3h12x7l94jzr4xkd5lzkn1ppgv8l52g9" + "version": "6.12.13", + "hash": "sha256:1fpvfj4q2v3przxj5lkb3ra28h3g0mq9dqj4rvx4qnsmkvmdxszk" }, "6.13": { "version": "6.13.2", From 990d22ea79baed856ae50581296c15ad86efed27 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 8 Feb 2025 14:51:56 +0300 Subject: [PATCH 0509/2168] linux_6_6: 6.6.75 -> 6.6.76 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 34a66883ab1b..0b92473ba772 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -20,8 +20,8 @@ "hash": "sha256:0mm4q8f6kbqddy4zaxjf5xyqpnla5qprvsf7v3vq01gmlzr3rivc" }, "6.6": { - "version": "6.6.75", - "hash": "sha256:1402g6qjk1242gsl6n8xlbg01m0nb19n30ac1ffi7fhnjzxb3pzp" + "version": "6.6.76", + "hash": "sha256:180kxgacwx7kr76gls8gw4zrrdrqb9xf6fjmmfi38h66y0aqn5l1" }, "6.11": { "version": "6.11.11", From d12c4194c22a78bc9d2edcf84bad6c625de9997e Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com> Date: Sat, 8 Feb 2025 12:53:50 +0100 Subject: [PATCH 0510/2168] librenms: switch to buildComposerProject2 --- pkgs/by-name/li/librenms/package.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/li/librenms/package.nix b/pkgs/by-name/li/librenms/package.nix index 2e24cc56a5c3..d6821216c3b1 100644 --- a/pkgs/by-name/li/librenms/package.nix +++ b/pkgs/by-name/li/librenms/package.nix @@ -25,7 +25,7 @@ let phpPackage = php82.withExtensions ({ enabled, all }: enabled ++ [ all.memcached ]); in -phpPackage.buildComposerProject rec { +phpPackage.buildComposerProject2 rec { pname = "librenms"; version = "25.1.0"; @@ -36,7 +36,7 @@ phpPackage.buildComposerProject rec { sha256 = "sha256-Uo+JOgb1KSZkludoupIIGnuK88ER3LthGnGmShpkrNU="; }; - vendorHash = "sha256-QBZnsURxLf3vmeh9qxEOJtSVAi1Ipr0jEbC/EmhL4q8="; + vendorHash = "sha256-9cywwX0vWrvbi3HGARxrjsObckGiGbJPRILe0ASgrGU="; php = phpPackage; @@ -68,9 +68,8 @@ phpPackage.buildComposerProject rec { nativeBuildInputs = [ makeWrapper ]; - installPhase = '' - runHook preInstall - + postInstall = '' + chmod -R u+w $out/share mv $out/share/php/librenms/* $out rm -r $out/share @@ -117,8 +116,6 @@ phpPackage.buildComposerProject rec { ln -s ${dataDir}/rrd $out/rrd ln -s ${dataDir}/storage $out/storage ln -s ${dataDir}/cache $out/bootstrap/cache - - runHook postInstall ''; passthru = { From cfba4763e500efa446c28e49c72715cb29ea1c26 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sat, 8 Feb 2025 06:55:54 -0500 Subject: [PATCH 0511/2168] python3Packages.docling-core : 2.16.1 -> 2.17.2 --- pkgs/development/python-modules/docling-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/docling-core/default.nix b/pkgs/development/python-modules/docling-core/default.nix index 89ca308e3299..0d44b51b7634 100644 --- a/pkgs/development/python-modules/docling-core/default.nix +++ b/pkgs/development/python-modules/docling-core/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "docling-core"; - version = "2.16.1"; + version = "2.17.2"; pyproject = true; src = fetchFromGitHub { owner = "DS4SD"; repo = "docling-core"; tag = "v${version}"; - hash = "sha256-oW/jX9IHCpztc0FDm8/3OzDmOxM92jrkFq/JeAcI9ZA="; + hash = "sha256-JO6WI2juehO825QOO0FkD58OigEoLGOZAnPBOD4b1tI="; }; build-system = [ From a109bc749757489e88bf7e1a67b568159b7df098 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sat, 8 Feb 2025 06:56:30 -0500 Subject: [PATCH 0512/2168] python3Packages.docling-parse: 3.1.2 -> 3.3.0 --- pkgs/development/python-modules/docling-parse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/docling-parse/default.nix b/pkgs/development/python-modules/docling-parse/default.nix index f6cd8a403f34..b112249bd77c 100644 --- a/pkgs/development/python-modules/docling-parse/default.nix +++ b/pkgs/development/python-modules/docling-parse/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "docling-parse"; - version = "3.1.2"; + version = "3.3.0"; pyproject = true; src = fetchFromGitHub { owner = "DS4SD"; repo = "docling-parse"; tag = "v${version}"; - hash = "sha256-SgVLk1kruUSjtzuo/5YFY4Keha8zMzovm/UeCtfGaNY="; + hash = "sha256-huJOH/5SQoJiJp1wmJV5n07KHDZseM9XI26bfPQAxrA="; }; dontUseCmakeConfigure = true; From 2e27e8ded0bfe40285f58b02742b14cf5e0e6b8c Mon Sep 17 00:00:00 2001 From: happysalada Date: Sat, 8 Feb 2025 06:58:19 -0500 Subject: [PATCH 0513/2168] python3Packages.docling: 2.17.0 -> 2.20.0 --- pkgs/development/python-modules/docling/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/docling/default.nix b/pkgs/development/python-modules/docling/default.nix index fee19768aedf..7dc476f7edf1 100644 --- a/pkgs/development/python-modules/docling/default.nix +++ b/pkgs/development/python-modules/docling/default.nix @@ -44,14 +44,14 @@ buildPythonPackage rec { pname = "docling"; - version = "2.17.0"; + version = "2.20.0"; pyproject = true; src = fetchFromGitHub { owner = "DS4SD"; repo = "docling"; tag = "v${version}"; - hash = "sha256-OtUFQRNqyTGT1Z41tHziwM5hqbk+tg/97bxhtPVtmN0="; + hash = "sha256-6p6/UwbI4ZB6ro1O5ELg8fENEnpH4ycpCyOk7QPX7cY="; }; build-system = [ From a84634546e02b0949ad10fd1467157b85690f216 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Feb 2025 12:59:11 +0100 Subject: [PATCH 0514/2168] python313Packages.types-beautifulsoup4: 4.12.0.20241020 -> 4.12.0.20250204 --- .../python-modules/types-beautifulsoup4/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/types-beautifulsoup4/default.nix b/pkgs/development/python-modules/types-beautifulsoup4/default.nix index 17cc87e26b01..bc14576f7a57 100644 --- a/pkgs/development/python-modules/types-beautifulsoup4/default.nix +++ b/pkgs/development/python-modules/types-beautifulsoup4/default.nix @@ -8,12 +8,13 @@ buildPythonPackage rec { pname = "types-beautifulsoup4"; - version = "4.12.0.20241020"; + version = "4.12.0.20250204"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-FYNw0I0M1Ei9EbEypQ/1J5I3pdS1g3vroHTeFSpRMFk="; + pname = "types_beautifulsoup4"; + inherit version; + hash = "sha256-8IPY7cvQEnn4w5lbVs//LQHxu4lMO1AroRjTb7vElb8="; }; build-system = [ setuptools ]; @@ -28,7 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "Typing stubs for beautifulsoup4"; homepage = "https://pypi.org/project/types-beautifulsoup4/"; - license = with licenses; [ asl20 ]; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; } From 86a9d3dabe21e9e04616672dc25bd72bec6db915 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Feb 2025 13:00:13 +0100 Subject: [PATCH 0515/2168] python313Packages.aioelectricitymaps: 1.0.0 -> 1.1.0 Diff: https://github.com/jpbede/aioelectricitymaps/compare/refs/tags/v1.0.0...v1.1.0 Changelog: https://github.com/jpbede/aioelectricitymaps/releases/tag/v1.1.0 --- .../development/python-modules/aioelectricitymaps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioelectricitymaps/default.nix b/pkgs/development/python-modules/aioelectricitymaps/default.nix index 322867677dda..ca8b267c2f0f 100644 --- a/pkgs/development/python-modules/aioelectricitymaps/default.nix +++ b/pkgs/development/python-modules/aioelectricitymaps/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aioelectricitymaps"; - version = "1.0.0"; + version = "1.1.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "jpbede"; repo = "aioelectricitymaps"; tag = "v${version}"; - hash = "sha256-l6D5Cr2d89n+Ac5V5geBUY0sOiEO3sci9244K0MI+dc="; + hash = "sha256-YYoWdI+m+WiBCC7lPBm0x0jYL/+02iT/4Z5sdxBPvHY="; }; postPatch = '' From 7eba5949724b15a982b197b4b2dd316330d887ae Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com> Date: Sat, 8 Feb 2025 13:01:28 +0100 Subject: [PATCH 0516/2168] librenms: switch from --replace to --replace-fail --- pkgs/by-name/li/librenms/package.nix | 40 ++++++++++++++-------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/li/librenms/package.nix b/pkgs/by-name/li/librenms/package.nix index d6821216c3b1..596d40d1705c 100644 --- a/pkgs/by-name/li/librenms/package.nix +++ b/pkgs/by-name/li/librenms/package.nix @@ -78,26 +78,26 @@ phpPackage.buildComposerProject2 rec { substituteInPlace \ $out/misc/config_definitions.json \ - --replace '"default": "/bin/ping",' '"default": "/run/wrappers/bin/ping",' \ - --replace '"default": "fping",' '"default": "/run/wrappers/bin/fping",' \ - --replace '"default": "fping6",' '"default": "/run/wrappers/bin/fping6",' \ - --replace '"default": "rrdtool",' '"default": "${rrdtool}/bin/rrdtool",' \ - --replace '"default": "snmpgetnext",' '"default": "${net-snmp}/bin/snmpgetnext",' \ - --replace '"default": "traceroute",' '"default": "/run/wrappers/bin/traceroute",' \ - --replace '"default": "/usr/bin/dot",' '"default": "${graphviz}/bin/dot",' \ - --replace '"default": "/usr/bin/ipmitool",' '"default": "${ipmitool}/bin/ipmitool",' \ - --replace '"default": "/usr/bin/mtr",' '"default": "${mtr}/bin/mtr",' \ - --replace '"default": "/usr/bin/nfdump",' '"default": "${nfdump}/bin/nfdump",' \ - --replace '"default": "/usr/bin/nmap",' '"default": "${nmap}/bin/nmap",' \ - --replace '"default": "/usr/bin/sfdp",' '"default": "${graphviz}/bin/sfdp",' \ - --replace '"default": "/usr/bin/snmpbulkwalk",' '"default": "${net-snmp}/bin/snmpbulkwalk",' \ - --replace '"default": "/usr/bin/snmpget",' '"default": "${net-snmp}/bin/snmpget",' \ - --replace '"default": "/usr/bin/snmptranslate",' '"default": "${net-snmp}/bin/snmptranslate",' \ - --replace '"default": "/usr/bin/snmpwalk",' '"default": "${net-snmp}/bin/snmpwalk",' \ - --replace '"default": "/usr/bin/virsh",' '"default": "${libvirt}/bin/virsh",' \ - --replace '"default": "/usr/bin/whois",' '"default": "${whois}/bin/whois",' \ - --replace '"default": "/usr/lib/nagios/plugins",' '"default": "${monitoring-plugins}/bin",' \ - --replace '"default": "/usr/sbin/sendmail",' '"default": "${system-sendmail}/bin/sendmail",' + --replace-fail '"default": "/bin/ping",' '"default": "/run/wrappers/bin/ping",' \ + --replace-fail '"default": "fping",' '"default": "/run/wrappers/bin/fping",' \ + --replace-fail '"default": "fping6",' '"default": "/run/wrappers/bin/fping6",' \ + --replace-fail '"default": "rrdtool",' '"default": "${rrdtool}/bin/rrdtool",' \ + --replace-fail '"default": "snmpgetnext",' '"default": "${net-snmp}/bin/snmpgetnext",' \ + --replace-fail '"default": "traceroute",' '"default": "/run/wrappers/bin/traceroute",' \ + --replace-fail '"default": "/usr/bin/dot",' '"default": "${graphviz}/bin/dot",' \ + --replace-fail '"default": "/usr/bin/ipmitool",' '"default": "${ipmitool}/bin/ipmitool",' \ + --replace-fail '"default": "/usr/bin/mtr",' '"default": "${mtr}/bin/mtr",' \ + --replace-fail '"default": "/usr/bin/nfdump",' '"default": "${nfdump}/bin/nfdump",' \ + --replace-fail '"default": "/usr/bin/nmap",' '"default": "${nmap}/bin/nmap",' \ + --replace-fail '"default": "/usr/bin/sfdp",' '"default": "${graphviz}/bin/sfdp",' \ + --replace-fail '"default": "/usr/bin/snmpbulkwalk",' '"default": "${net-snmp}/bin/snmpbulkwalk",' \ + --replace-fail '"default": "/usr/bin/snmpget",' '"default": "${net-snmp}/bin/snmpget",' \ + --replace-fail '"default": "/usr/bin/snmptranslate",' '"default": "${net-snmp}/bin/snmptranslate",' \ + --replace-fail '"default": "/usr/bin/snmpwalk",' '"default": "${net-snmp}/bin/snmpwalk",' \ + --replace-fail '"default": "/usr/bin/virsh",' '"default": "${libvirt}/bin/virsh",' \ + --replace-fail '"default": "/usr/bin/whois",' '"default": "${whois}/bin/whois",' \ + --replace-fail '"default": "/usr/lib/nagios/plugins",' '"default": "${monitoring-plugins}/bin",' \ + --replace-fail '"default": "/usr/sbin/sendmail",' '"default": "${system-sendmail}/bin/sendmail",' substituteInPlace $out/LibreNMS/wrapper.py --replace-fail '/usr/bin/env php' '${phpPackage}/bin/php' substituteInPlace $out/LibreNMS/__init__.py --replace-fail '"/usr/bin/env", "php"' '"${phpPackage}/bin/php"' From 40c525168c8d6057eedb8004881d1ce6a0aa1656 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Feb 2025 13:02:11 +0100 Subject: [PATCH 0517/2168] python313Packages.boto3-stubs: 1.36.15 -> 1.36.16 --- 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 08626fed8ca8..933ab16cc294 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -359,7 +359,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.36.15"; + version = "1.36.16"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-VXViNY9tYbL/NjhPbTkezIIRtpsvURDu0/aJRJ36gCQ="; + hash = "sha256-n+i23D1rM8zEJBvX4oHxFSWkV0OmsL9NqTVUuaR/B9E="; }; build-system = [ setuptools ]; From f1a63700aff1934d52ca011d97a545d521ea3705 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Feb 2025 13:02:14 +0100 Subject: [PATCH 0518/2168] python313Packages.botocore-stubs: 1.36.15 -> 1.36.16 --- pkgs/development/python-modules/botocore-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 9062830e75f3..e734e7faa4bf 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.36.15"; + version = "1.36.16"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-1IUrr98fV3xYjwEzT7q0u/Q+Ye6AZRwhi0gv3GU00ac="; + hash = "sha256-rLSAuo5GlQ1nYLi/Lzj35zwTW9gznAt9nytcYx08rxc="; }; nativeBuildInputs = [ setuptools ]; From 4977d1de6bb16acc7fdc9e86c277ca58d10c409b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Feb 2025 13:02:40 +0100 Subject: [PATCH 0519/2168] python312Packages.mypy-boto3-cloudformation: 1.36.0 -> 1.36.15 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 4eae2aa62b7d..804da09b728b 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -226,8 +226,8 @@ rec { "sha256-NQnrx4nzScaOBOYsiN8UjOT3LXYrgC/MW4AIPBr1l0I="; mypy-boto3-cloudformation = - buildMypyBoto3Package "cloudformation" "1.36.0" - "sha256-rMLHrokg8RZ74Jf2FRaF/lrumb4viQB17fk+BdKY6LA="; + buildMypyBoto3Package "cloudformation" "1.36.15" + "sha256-g8YpVNduF0EAsCwheQCS2xX2yoIKuYTQ1DY/DRdwkt8="; mypy-boto3-cloudfront = buildMypyBoto3Package "cloudfront" "1.36.0" From 93416bd664bdc55aeb443c9ba880b9d4ce16ebae Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Feb 2025 13:02:49 +0100 Subject: [PATCH 0520/2168] python312Packages.mypy-boto3-connectcases: 1.36.0 -> 1.36.15 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 804da09b728b..a8f3aa1069e4 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -350,8 +350,8 @@ rec { "sha256-2wNQJFcUo9VO5387QSE1kGyTA8oHkFAPgdEIMdQqSo0="; mypy-boto3-connectcases = - buildMypyBoto3Package "connectcases" "1.36.0" - "sha256-QzmNIYpg/lCCxRMU8cuEM2TZEX7ZYLZPTI7pCHtyjXw="; + buildMypyBoto3Package "connectcases" "1.36.15" + "sha256-M0TsvGiiw66MBc3LCThjho+1c094x8JbUyEtWN00pyc="; mypy-boto3-connectparticipant = buildMypyBoto3Package "connectparticipant" "1.36.0" From 3ccd6f93139a4edd7075b664e167526168c83d90 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Feb 2025 13:02:58 +0100 Subject: [PATCH 0521/2168] python312Packages.mypy-boto3-ecr: 1.36.10 -> 1.36.16 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index a8f3aa1069e4..af5289e80bfc 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -454,8 +454,8 @@ rec { "sha256-q6u1MssNxk38vE2Gy/508A5bhdUrqxH/Mq3DeBFVfqA="; mypy-boto3-ecr = - buildMypyBoto3Package "ecr" "1.36.10" - "sha256-CRPZzCV+iTXSR/7aiqLe1+r+gAjE4kN+YhXy53iTKmg="; + buildMypyBoto3Package "ecr" "1.36.16" + "sha256-Fph1HYTByDH/zepZRzRh2l90s/EsFO2fNpEHpUCzuQY="; mypy-boto3-ecr-public = buildMypyBoto3Package "ecr-public" "1.36.10" From 8c80e941adbc53a568ae45dea5822871170e43a7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Feb 2025 13:03:00 +0100 Subject: [PATCH 0522/2168] python312Packages.mypy-boto3-eks: 1.36.6 -> 1.36.16 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index af5289e80bfc..53a769ed7861 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -470,8 +470,8 @@ rec { "sha256-5xK6JX8tM+3EDHC5Ma4G6fGYSf/9Q1V7O2YS+E20HOo="; mypy-boto3-eks = - buildMypyBoto3Package "eks" "1.36.6" - "sha256-XmOg80pQ9TTSBbpIEABm/fST0yGyLYZCm4XO+1CwLcw="; + buildMypyBoto3Package "eks" "1.36.16" + "sha256-9ZSeS+cRrNWdlZBVIqBU7HQ87+B0Oyel6qWQsZAVyd4="; mypy-boto3-elastic-inference = buildMypyBoto3Package "elastic-inference" "1.36.0" From 4a761d86ed3d0c70e8e335804e12378f46797447 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Feb 2025 13:03:27 +0100 Subject: [PATCH 0523/2168] python312Packages.mypy-boto3-mediaconvert: 1.36.7 -> 1.36.16 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 53a769ed7861..818257bfe853 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -862,8 +862,8 @@ rec { "sha256-kNE9LvLz9ltNM6UcMhXeyGWm+uHMAK3E5V/t30QYo+0="; mypy-boto3-mediaconvert = - buildMypyBoto3Package "mediaconvert" "1.36.7" - "sha256-SuIB0cn2magEfWAeNIxCa2AiEgklovL2PO8fWdRm26A="; + buildMypyBoto3Package "mediaconvert" "1.36.16" + "sha256-Zs7r18i4H2k2XnqvRN/d+b5W+0bjfNonNL1EI1rK7aw="; mypy-boto3-medialive = buildMypyBoto3Package "medialive" "1.36.4" From cb4d0ab07ec97faa2feee76123a37e32e2ac8a0e Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com> Date: Sat, 8 Feb 2025 13:03:33 +0100 Subject: [PATCH 0524/2168] librenms: switch to tag --- pkgs/by-name/li/librenms/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/li/librenms/package.nix b/pkgs/by-name/li/librenms/package.nix index 596d40d1705c..608cde4c8ab5 100644 --- a/pkgs/by-name/li/librenms/package.nix +++ b/pkgs/by-name/li/librenms/package.nix @@ -32,7 +32,7 @@ phpPackage.buildComposerProject2 rec { src = fetchFromGitHub { owner = "librenms"; repo = pname; - rev = "${version}"; + tag = version; sha256 = "sha256-Uo+JOgb1KSZkludoupIIGnuK88ER3LthGnGmShpkrNU="; }; From 3025d40f2589b6c31a113ff484e39249eddc57db Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Feb 2025 13:03:38 +0100 Subject: [PATCH 0525/2168] python312Packages.mypy-boto3-pi: 1.36.0 -> 1.36.16 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 818257bfe853..511905d58d82 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1026,8 +1026,8 @@ rec { "sha256-4/9lvIlwuiXlkPXYcjKdC+Ewzhglg+cEgswJaYMDBWU="; mypy-boto3-pi = - buildMypyBoto3Package "pi" "1.36.0" - "sha256-adgipK2ns7/L9g5qcWussonN/SewTsNiJeIp9lJplTQ="; + buildMypyBoto3Package "pi" "1.36.16" + "sha256-Xx9QinfGubDOAV3qr2jKip3n+1vdpDSboXXJM0XWFnY="; mypy-boto3-pinpoint = buildMypyBoto3Package "pinpoint" "1.36.0" From 8cae0ef0a260015fe2d77f60d8941f339ff4a1be Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Feb 2025 13:03:43 +0100 Subject: [PATCH 0526/2168] python312Packages.mypy-boto3-rds: 1.36.11 -> 1.36.14 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 511905d58d82..fb7a0255d315 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1086,8 +1086,8 @@ rec { "sha256-afWYZZR8qCp3f19RodsHltXxAfSwFmTYaoGSHMV5MvI="; mypy-boto3-rds = - buildMypyBoto3Package "rds" "1.36.11" - "sha256-b5Yd6uUChgJFf4cZEtaVnmCL0gPKIDX6EWY4qa8WPLU="; + buildMypyBoto3Package "rds" "1.36.14" + "sha256-acb3d88SnyS0lbbUOly0uiOWC7LuLsOxx3jLMxQVxRs="; mypy-boto3-rds-data = buildMypyBoto3Package "rds-data" "1.36.0" From 4fba3650e67d25aea5581f5bc1558a851996da9b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Feb 2025 13:03:48 +0100 Subject: [PATCH 0527/2168] python312Packages.mypy-boto3-s3: 1.36.9 -> 1.36.15 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index fb7a0255d315..91aa7f19e30a 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1162,8 +1162,8 @@ rec { "sha256-DLbt+8tSmmMHfjifzFJGKezEmbiTxiA5KfCfcL+I/V8="; mypy-boto3-s3 = - buildMypyBoto3Package "s3" "1.36.9" - "sha256-NoyWOWntpluzqd9h6HUQ3YsyR8zln1WcLsbEPVeWvvU="; + buildMypyBoto3Package "s3" "1.36.15" + "sha256-5UAPagCPdGxCu752frSSzslqIRzrNLYDJnOu3Nh7PWI="; mypy-boto3-s3control = buildMypyBoto3Package "s3control" "1.36.7" From 0aac4266dc33fa08a5ad7d00a96e564e10697edb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Feb 2025 13:04:03 +0100 Subject: [PATCH 0528/2168] python312Packages.mypy-boto3-transcribe: 1.36.0 -> 1.36.16 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 91aa7f19e30a..5c45bd8e3923 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1366,8 +1366,8 @@ rec { "sha256-4esWqRpxC9Q1AfpNY5mwZ+upTjZTQ+HqdRVwoU7Lhas="; mypy-boto3-transcribe = - buildMypyBoto3Package "transcribe" "1.36.0" - "sha256-LOMhyKiJ5K1AHzGmcV+GXLUsKyc8mX6zYguh3UZgzNM="; + buildMypyBoto3Package "transcribe" "1.36.16" + "sha256-qPrG06bvFqloggeixei6kBq1jcq/MjXN2N+95oMDqs8="; mypy-boto3-transfer = buildMypyBoto3Package "transfer" "1.36.6" From 2dd7a8ec1ba1116edbc0bf9c85bed201751835a9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Feb 2025 13:05:01 +0100 Subject: [PATCH 0529/2168] python313Packages.cyclopts: 3.5.0 -> 3.6.0 Diff: https://github.com/BrianPugh/cyclopts/compare/refs/tags/v3.5.0...v3.6.0 Changelog: https://github.com/BrianPugh/cyclopts/releases/tag/v3.6.0 --- pkgs/development/python-modules/cyclopts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix index 3b3ad81d3d24..bbe83e8c789f 100644 --- a/pkgs/development/python-modules/cyclopts/default.nix +++ b/pkgs/development/python-modules/cyclopts/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "cyclopts"; - version = "3.5.0"; + version = "3.6.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "BrianPugh"; repo = "cyclopts"; tag = "v${version}"; - hash = "sha256-otMKT7GQbI1ORqVRIf9gVzC28nwx8uWYjZcfth5PS/E="; + hash = "sha256-ASIPCSGD3YY0XXUISMvEOVWXh3aEoL2mZSDnbYjFMo0="; }; build-system = [ From b17594c18a9db13a92b9129788cca5a22f818b4a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Feb 2025 13:06:06 +0100 Subject: [PATCH 0530/2168] python313Packages.gehomesdk: 0.5.41 -> 2025.2.2 Changelog: https://github.com/simbaja/gehome/blob/master/CHANGELOG.md --- pkgs/development/python-modules/gehomesdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gehomesdk/default.nix b/pkgs/development/python-modules/gehomesdk/default.nix index 19709bf85961..1d735c1088e5 100644 --- a/pkgs/development/python-modules/gehomesdk/default.nix +++ b/pkgs/development/python-modules/gehomesdk/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "gehomesdk"; - version = "0.5.41"; + version = "2025.2.2"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-/IIkKkxH74E1YUwZzClvFqrEhNMYiLFQquzaT6LVDQU="; + hash = "sha256-c2WrY/Db2D0x+jDszDkojBKAZmwGNQnXXfSrkoSjs3w="; }; build-system = [ setuptools ]; From 1004b767a493b32b439401d207075eb88e3baca1 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 8 Feb 2025 13:05:30 +0100 Subject: [PATCH 0531/2168] vscode-extensions.ms-python.mypy-type-checker: do not set default `mypy` path --- .../ms-python.mypy-type-checker/default.nix | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.mypy-type-checker/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.mypy-type-checker/default.nix index 6119ebca6c6e..67f045c70787 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-python.mypy-type-checker/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-python.mypy-type-checker/default.nix @@ -1,9 +1,6 @@ { lib, vscode-utils, - mypy, - jq, - moreutils, }: vscode-utils.buildVscodeMarketplaceExtension { @@ -14,17 +11,6 @@ vscode-utils.buildVscodeMarketplaceExtension { hash = "sha256-boKUxLOAgQJP13zX/NMhg1MtcrPVQJt5gLbxI7gVSu4="; }; - buildInputs = [ mypy ]; - - nativeBuildInputs = [ - jq - moreutils - ]; - - postInstall = '' - jq '.contributes.configuration.properties."mypy-type-checker.path".default = "${lib.getExe mypy}"' $out/$installPrefix/package.json | sponge $out/$installPrefix/package.json - ''; - meta = { changelog = "https://github.com/microsoft/vscode-mypy/releases"; description = "VSCode extension for type checking support for Python files using Mypy"; From 727a9e8a620781baa458e10178f05d67e5b1aa5d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Feb 2025 13:19:21 +0100 Subject: [PATCH 0532/2168] python313Packages.aiosql: 13.0 -> 13.2 Diff: https://github.com/nackjicholson/aiosql/compare/refs/tags/13.0...13.2 Changelog: https://github.com/nackjicholson/aiosql/releases/tag/13.2 --- pkgs/development/python-modules/aiosql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiosql/default.nix b/pkgs/development/python-modules/aiosql/default.nix index 99f55bb586ae..8ed71cdc4825 100644 --- a/pkgs/development/python-modules/aiosql/default.nix +++ b/pkgs/development/python-modules/aiosql/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aiosql"; - version = "13.0"; + version = "13.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "nackjicholson"; repo = "aiosql"; tag = version; - hash = "sha256-WvYCMImLrQjaTrMgDrkF1fOUv/pxbwFHT+SwOZkTMl0="; + hash = "sha256-GJeYh3xPKrfm2oPsNTrQXnYW75Bx8PN5/brJFslOcTw="; }; sphinxRoot = "docs/source"; From 6b342141465e2d6b949f785852282a800f2a924f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Feb 2025 13:32:38 +0100 Subject: [PATCH 0533/2168] python313Packages.bring-api: 1.0.0 -> 1.0.1 Diff: https://github.com/miaucl/bring-api/compare/refs/tags/1.0.0...1.0.1 Changelog: https://github.com/miaucl/bring-api/blob/1.0.1/CHANGELOG.md --- pkgs/development/python-modules/bring-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bring-api/default.nix b/pkgs/development/python-modules/bring-api/default.nix index 35fbe563032a..ef749574df9e 100644 --- a/pkgs/development/python-modules/bring-api/default.nix +++ b/pkgs/development/python-modules/bring-api/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "bring-api"; - version = "1.0.0"; + version = "1.0.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "miaucl"; repo = "bring-api"; tag = version; - hash = "sha256-1K8CijA2cSyofH/qanOsDRLqnQZyBTqsnrUtvZYBS2c="; + hash = "sha256-ohWemgZhnUUz5O40nIlrTN1jEUDQvGGLNvqXNbYYAaM="; }; build-system = [ setuptools ]; From be1904195a9dedab27d3a3df44d7cbfe7733b2df Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 8 Feb 2025 13:34:49 +0100 Subject: [PATCH 0534/2168] python312Packages.transformers: 4.48.2 -> 4.48.3 Diff: https://github.com/huggingface/transformers/compare/refs/tags/v4.48.2...v4.48.3 Changelog: https://github.com/huggingface/transformers/releases/tag/v4.48.3 --- pkgs/development/python-modules/transformers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index 2711b55448bc..92027cd34943 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -59,14 +59,14 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.48.2"; + version = "4.48.3"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "transformers"; tag = "v${version}"; - hash = "sha256-jW/yhzmxQd/5BgbDImUaJSF0oMKIpIGhFoJuMZu0tv0="; + hash = "sha256-gDPJx/kgFa8KCoX8XCMtFrSY/z2as22yDSNEW3UDm/0="; }; patches = [ From 16e832cd7913fa7a6b03211cfb5196e809ef59f9 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Sat, 8 Feb 2025 13:36:29 +0100 Subject: [PATCH 0535/2168] azure-cli: pin azure-mgmt-redhatopenshift Signed-off-by: Paul Meyer --- pkgs/by-name/az/azure-cli/python-packages.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/az/azure-cli/python-packages.nix b/pkgs/by-name/az/azure-cli/python-packages.nix index 86039d680d3f..6f3aeeb3aa56 100644 --- a/pkgs/by-name/az/azure-cli/python-packages.nix +++ b/pkgs/by-name/az/azure-cli/python-packages.nix @@ -195,6 +195,11 @@ let overrideAzureMgmtPackage super.azure-mgmt-rdbms "10.2.0b17" "tar.gz" "sha256-1nnRkyr4Im79B7DDqGz/FOrPAToFaGhE+a7r5bZMuOQ="; + # ModuleNotFoundError: No module named 'azure.mgmt.redhatopenshift.v2023_11_22' + azure-mgmt-redhatopenshift = + overrideAzureMgmtPackage super.azure-mgmt-redhatopenshift "1.5.0" "tar.gz" + "sha256-Uft0KcOciKzJ+ic9n4nxkwNSBmKZam19jhEiqY9fJSc="; + # ImportError: cannot import name 'IPRule' from 'azure.mgmt.signalr.models' azure-mgmt-signalr = overrideAzureMgmtPackage super.azure-mgmt-signalr "2.0.0b2" "tar.gz" From c1e78b38524c045e22103428c5cb46864da24550 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sat, 8 Feb 2025 13:43:19 +0100 Subject: [PATCH 0536/2168] lomiri.lomiri-thumbnailer: Add nixosTests.lomiri-gallery-app as test --- .../lomiri/services/lomiri-thumbnailer/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix index 3f00b43fcbfc..925f5592c34d 100644 --- a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix @@ -3,6 +3,7 @@ lib, fetchFromGitLab, gitUpdater, + nixosTests, testers, boost, cmake, @@ -173,7 +174,11 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + tests = { + # gallery app delegates to thumbnailer, tests various formats + vm = nixosTests.lomiri-gallery-app; + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; updateScript = gitUpdater { }; }; From abe25771cd20bacd173fdb31d172d896d2081cc8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Feb 2025 12:57:27 +0000 Subject: [PATCH 0537/2168] scid-vs-pc: 4.25 -> 4.26 --- pkgs/by-name/sc/scid-vs-pc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sc/scid-vs-pc/package.nix b/pkgs/by-name/sc/scid-vs-pc/package.nix index e1cf8503ae68..13853d0f09a6 100644 --- a/pkgs/by-name/sc/scid-vs-pc/package.nix +++ b/pkgs/by-name/sc/scid-vs-pc/package.nix @@ -12,11 +12,11 @@ tcl.mkTclDerivation rec { pname = "scid-vs-pc"; - version = "4.25"; + version = "4.26"; src = fetchurl { url = "mirror://sourceforge/scidvspc/scid_vs_pc-${version}.tgz"; - hash = "sha256-YZsBwIp5ouGk75wsAywuYyNSeNjCAx0iWgiA7YmUmnk="; + hash = "sha256-iK4h7YS8+W2nr3Bbmai4Ervt0YWYKgkQaZ5IH7Q9HkE="; }; postPatch = '' From cd243f58741708f9499e63a0820f24e4d8cb9b0f Mon Sep 17 00:00:00 2001 From: Ole Mussmann Date: Wed, 22 Jan 2025 19:37:13 +0100 Subject: [PATCH 0538/2168] nps: init at 0.2.9 --- pkgs/by-name/np/nps/package.nix | 45 +++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 pkgs/by-name/np/nps/package.nix diff --git a/pkgs/by-name/np/nps/package.nix b/pkgs/by-name/np/nps/package.nix new file mode 100644 index 000000000000..4f167d1ac4f0 --- /dev/null +++ b/pkgs/by-name/np/nps/package.nix @@ -0,0 +1,45 @@ +{ + lib, + nix, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "nps"; + version = "0.2.9"; + + src = fetchFromGitHub { + owner = "OleMussmann"; + repo = "nps"; + tag = "v${version}"; + hash = "sha256-q/PkigsNAI7MCmeDFBMGuZJFXVL95pQCNOVhNvBH9dc="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-MThyvhzZXRM4l0K8csLDldMVKiDxKZ5EIFATGVpGpVc="; + + nativeCheckInputs = [ nix ]; + + meta = { + description = "Cache the nix package list, query and sort results by relevance"; + longDescription = '' + Find SEARCH_TERM in available nix packages and sort results by relevance. + + List up to three columns, the latter two being optional: + PACKAGE_NAME + + Matches are sorted by type. Show 'indirect' matches first, then 'direct' matches, and finally 'exact' matches. + + indirect fooSEARCH_TERMbar (SEARCH_TERM appears in any column) + direct SEARCH_TERMbar (PACKAGE_NAME starts with SEARCH_TERM) + exact SEARCH_TERM (PACKAGE_NAME is exactly SEARCH_TERM) + ''; + changelog = "https://github.com/OleMussmann/nps/releases/tag/v${version}"; + homepage = "https://github.com/OleMussmann/nps"; + license = lib.licenses.mit; + mainProgram = "nps"; + maintainers = with lib.maintainers; [ olemussmann ]; + platforms = lib.platforms.all; + }; +} From d968ef32364c0f2c7098b8ab880182fe13da0460 Mon Sep 17 00:00:00 2001 From: PerchunPak Date: Fri, 24 Jan 2025 14:27:25 +0100 Subject: [PATCH 0539/2168] python3Packages.nixpkgs-updaters-library: init at 1.0.2 --- .../nixpkgs-updaters-library/default.nix | 81 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 83 insertions(+) create mode 100644 pkgs/development/python-modules/nixpkgs-updaters-library/default.nix diff --git a/pkgs/development/python-modules/nixpkgs-updaters-library/default.nix b/pkgs/development/python-modules/nixpkgs-updaters-library/default.nix new file mode 100644 index 000000000000..358c69181139 --- /dev/null +++ b/pkgs/development/python-modules/nixpkgs-updaters-library/default.nix @@ -0,0 +1,81 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + fetchFromGitHub, + + # build-system + hatchling, + + # dependencies + aiohttp, + attrs, + frozendict, + inject, + loguru, + nix, + nix-prefetch-git, + nonbloat-db, + nurl, + platformdirs, + typer, + + # tests + pytestCheckHook, + aioresponses, + pytest-asyncio, + pytest-cov-stub, + pytest-mock, +}: +buildPythonPackage rec { + pname = "nixpkgs-updaters-library"; + version = "1.0.2"; + pyproject = true; + + disabled = pythonOlder "3.12"; + + src = fetchFromGitHub { + owner = "PerchunPak"; + repo = "nixpkgs-updaters-library"; + tag = "v${version}"; + hash = "sha256-SzGbsHy3Pwpr92512y/R3JLtC01jAveFavRGOYyr81U="; + }; + + postPatch = '' + substituteInPlace nupd/executables.py \ + --replace-fail '"nurl"' '"${lib.getExe nurl}"' \ + --replace-fail '"nix-prefetch-url"' '"${lib.getExe' nix "nix-prefetch-git"}"' \ + --replace-fail '"nix-prefetch-git"' '"${lib.getExe' nix-prefetch-git "nix-prefetch-git"}"' + ''; + + build-system = [ hatchling ]; + + dependencies = [ + aiohttp + attrs + frozendict + inject + loguru + nonbloat-db + platformdirs + typer + nix-prefetch-git + nurl + ]; + + nativeCheckInputs = [ + aioresponses + pytest-asyncio + pytest-cov-stub + pytest-mock + pytestCheckHook + ]; + + meta = { + description = "Boilerplate-less updater library for Nixpkgs ecosystems"; + homepage = "https://github.com/PerchunPak/nixpkgs-updaters-library"; + changelog = "https://github.com/PerchunPak/nixpkgs-updaters-library/blob/v${version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ perchun ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 667a32a00945..556a1dacc485 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9385,6 +9385,8 @@ self: super: with self; { nixpkgs-pytools = callPackage ../development/python-modules/nixpkgs-pytools { }; + nixpkgs-updaters-library = callPackage ../development/python-modules/nixpkgs-updaters-library { }; + nix-prefetch-github = callPackage ../development/python-modules/nix-prefetch-github { }; nkdfu = callPackage ../development/python-modules/nkdfu { }; From d9fb579a17aae3bb53c18630cb9d4a096b0598eb Mon Sep 17 00:00:00 2001 From: misilelab Date: Sat, 8 Feb 2025 22:16:17 +0900 Subject: [PATCH 0540/2168] basedpyright: 1.23.1 -> 1.26.0 Signed-off-by: misilelab --- pkgs/by-name/ba/basedpyright/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ba/basedpyright/package.nix b/pkgs/by-name/ba/basedpyright/package.nix index 14a33ba23daf..c3c2f6e43be7 100644 --- a/pkgs/by-name/ba/basedpyright/package.nix +++ b/pkgs/by-name/ba/basedpyright/package.nix @@ -16,16 +16,16 @@ buildNpmPackage rec { pname = "basedpyright"; - version = "1.23.1"; + version = "1.26.0"; src = fetchFromGitHub { owner = "detachhead"; repo = "basedpyright"; tag = "v${version}"; - hash = "sha256-w3QcvAHwEM1kdRY/780yr2kQQ2tCEvNeLHBm9bgAjMI="; + hash = "sha256-USGndOqosE6+gkCow7UeqEd37R4gYo5om1QEV7iz77g="; }; - npmDepsHash = "sha256-cEpBeEjOdArnLekS5uUk9OrsACZrvY63i8pYYvDSnbI="; + npmDepsHash = "sha256-lpAsDMa3yRtbORmycDh3nGpozmzHej4WORvEml/+buE="; npmWorkspace = "packages/pyright"; preBuild = '' @@ -44,6 +44,8 @@ buildNpmPackage rec { postInstall = '' mv "$out/bin/pyright" "$out/bin/basedpyright" mv "$out/bin/pyright-langserver" "$out/bin/basedpyright-langserver" + # Remove dangling symlinks created during installation (remove -delete to just see the files, or -print '%l\n' to see the target + find -L $out -type l -print -delete ''; nativeInstallCheckInputs = [ versionCheckHook ]; From 96a2377553b0649509e632dd6684681853d40e9e Mon Sep 17 00:00:00 2001 From: misilelab Date: Sat, 8 Feb 2025 22:16:37 +0900 Subject: [PATCH 0541/2168] basedpyright: add misilelab to maintainers Signed-off-by: misilelab --- pkgs/by-name/ba/basedpyright/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ba/basedpyright/package.nix b/pkgs/by-name/ba/basedpyright/package.nix index c3c2f6e43be7..a7e46c9c54c0 100644 --- a/pkgs/by-name/ba/basedpyright/package.nix +++ b/pkgs/by-name/ba/basedpyright/package.nix @@ -101,6 +101,9 @@ buildNpmPackage rec { homepage = "https://github.com/detachhead/basedpyright"; license = lib.licenses.mit; mainProgram = "basedpyright"; - maintainers = with lib.maintainers; [ kiike ]; + maintainers = with lib.maintainers; [ + kiike + misilelab + ]; }; } From 4952640fce85326fd2f0aee91f1155f9fef8331a Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 8 Feb 2025 14:17:01 +0100 Subject: [PATCH 0542/2168] php84Packages.psalm: 6.0.0 -> 6.5.0 --- pkgs/development/php-packages/psalm/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/psalm/default.nix b/pkgs/development/php-packages/psalm/default.nix index fe9669bd44d9..5ebc7414fece 100644 --- a/pkgs/development/php-packages/psalm/default.nix +++ b/pkgs/development/php-packages/psalm/default.nix @@ -2,11 +2,12 @@ lib, fetchFromGitHub, php, + versionCheckHook, }: php.buildComposerProject2 (finalAttrs: { pname = "psalm"; - version = "6.0.0"; + version = "6.5.0"; src = fetchFromGitHub { owner = "vimeo"; @@ -18,7 +19,13 @@ php.buildComposerProject2 (finalAttrs: { # Missing `composer.lock` from the repository. # Issue open at https://github.com/vimeo/psalm/issues/10446 composerLock = ./composer.lock; - vendorHash = "sha256-WdWlG4tX/wLB2nj4iiqkIhEe2coYfG3q+0JoXescWbM="; + vendorHash = "sha256-6eGj0gTXktm1zGHjHKKsMnudb9RfmAFgwcmDV/QMV5Y="; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; meta = { changelog = "https://github.com/vimeo/psalm/releases/tag/${finalAttrs.version}"; From 5a7485e1f92f0c0f5d57c68fd1be79fb3b864f84 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 8 Feb 2025 14:26:17 +0100 Subject: [PATCH 0543/2168] glib-networking: remove obsolete p11-kit input glib-networking hasn't had a direct dependency on p11-kit since upstream commit 4d6caa0 ("Remove the PKCS#11 backend"), first included in glib-networking 2.59.1. --- pkgs/by-name/gl/glib-networking/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/gl/glib-networking/package.nix b/pkgs/by-name/gl/glib-networking/package.nix index 3a05bbc47a20..dd5b234d3dbe 100644 --- a/pkgs/by-name/gl/glib-networking/package.nix +++ b/pkgs/by-name/gl/glib-networking/package.nix @@ -11,7 +11,6 @@ gettext, makeWrapper, gnutls, - p11-kit, libproxy, gnome, gsettings-desktop-schemas, @@ -60,7 +59,6 @@ stdenv.mkDerivation rec { buildInputs = [ glib gnutls - p11-kit libproxy gsettings-desktop-schemas bash # installed-tests shebangs From 4251d056b4c9e9a616ba817db4715d2275be720c Mon Sep 17 00:00:00 2001 From: Lena <126529524+acuteenvy@users.noreply.github.com> Date: Sat, 8 Feb 2025 14:27:32 +0100 Subject: [PATCH 0544/2168] tlrc: 1.9.3 -> 1.10.0 --- pkgs/by-name/tl/tlrc/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tl/tlrc/package.nix b/pkgs/by-name/tl/tlrc/package.nix index bd9416d01e95..a91102cafe1d 100644 --- a/pkgs/by-name/tl/tlrc/package.nix +++ b/pkgs/by-name/tl/tlrc/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "tlrc"; - version = "1.9.3"; + version = "1.10.0"; src = fetchFromGitHub { owner = "tldr-pages"; repo = "tlrc"; rev = "v${version}"; - hash = "sha256-3KS/KN6/RO+PxoxbCVryymnTyWcmfXuCoc9E+asdU/E="; + hash = "sha256-th7igqDnLB+Lib2NxYNIGtUTK6IfSQo+72ohO5Ki7Ok="; }; useFetchCargoVendor = true; - cargoHash = "sha256-104ulV8YNdGu23/49sQQf1zroT1ceFZc+ERTECG4K6U="; + cargoHash = "sha256-+EWF21hag2kQ+YT8e+2NtdtOgyGrJL0BR2YMOxQfoDE="; nativeBuildInputs = [ installShellFiles ]; From b757a40d91f6f877891fa3b75117bf86d15d4562 Mon Sep 17 00:00:00 2001 From: emilylange Date: Sat, 8 Feb 2025 14:25:15 +0100 Subject: [PATCH 0545/2168] forgejo-lts: 7.0.12 -> 7.0.13 This is a security release. https://codeberg.org/forgejo/forgejo/releases/tag/v7.0.13 https://codeberg.org/forgejo/forgejo/src/commit/97f743a89e6e918f66d6297d298d0a44a21aceaa/release-notes-published/7.0.13.md diff: https://codeberg.org/forgejo/forgejo/compare/v7.0.12...v7.0.13 --- pkgs/by-name/fo/forgejo/lts.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fo/forgejo/lts.nix b/pkgs/by-name/fo/forgejo/lts.nix index 366417bc52e6..f3fcd44fbb28 100644 --- a/pkgs/by-name/fo/forgejo/lts.nix +++ b/pkgs/by-name/fo/forgejo/lts.nix @@ -1,8 +1,8 @@ import ./generic.nix { - version = "7.0.12"; - hash = "sha256-8rX/w4EqZwbs1xaHEkwN02+PQQD7e9VAXVrCqYwm3o0="; - npmDepsHash = "sha256-suPR7qcxXuK8AJfk47EcQRWtSo5V3jad4Ci122lbBR0="; - vendorHash = "sha256-seC8HzndQ10LecU+ii3kCO3ZZeCc3lqAujWbMKwNbpI="; + version = "7.0.13"; + hash = "sha256-mqpqxr5HE0CoDZkTIdZQEcWFywVw4HVwvPfrdXKp8tk="; + npmDepsHash = "sha256-R78/L6HS8pUNccrctBJ2E8ndS/RBHd+mTvl0JPoxr8Q="; + vendorHash = "sha256-FyFmuJQqe+MUjhXEoB5VlSmTLSsCVbigz4H3jaQhKrE="; lts = true; nixUpdateExtraArgs = [ "--override-filename" From 523ef8a9d30170f382eb0ef1e93baa9d7a94ff42 Mon Sep 17 00:00:00 2001 From: emilylange Date: Sat, 8 Feb 2025 14:27:19 +0100 Subject: [PATCH 0546/2168] forgejo: 10.0.0 -> 10.0.1 This is a security release. https://codeberg.org/forgejo/forgejo/releases/tag/v10.0.1 https://codeberg.org/forgejo/forgejo/src/commit/97f743a89e6e918f66d6297d298d0a44a21aceaa/release-notes-published/10.0.1.md diff: https://codeberg.org/forgejo/forgejo/compare/v10.0.0...v10.0.1 --- pkgs/by-name/fo/forgejo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix index 3d09cde6934a..bfc56b506978 100644 --- a/pkgs/by-name/fo/forgejo/package.nix +++ b/pkgs/by-name/fo/forgejo/package.nix @@ -1,7 +1,7 @@ import ./generic.nix { - version = "10.0.0"; - hash = "sha256-FcXL+lF2B+EUUEbdD31b1pV7GWbYxk6ewljAXuiV8QY="; - npmDepsHash = "sha256-YQDTw5CccnR7zJpvvEcmHZ2pLLNGYEg/mvncNYzcYY8="; + version = "10.0.1"; + hash = "sha256-JLy/edAkbsOqQTQqqoyxc0UX9fPnP8HD54IUzcsyGe4="; + npmDepsHash = "sha256-e3SE6cu1xCBdoMRqp2Gcjcay/EwjF+bTdPOlpL1STvw="; vendorHash = "sha256-fqHwqpIetX2jTAWAonRWqF1tArL7Ik/XXURY51jGOn0="; lts = false; nixUpdateExtraArgs = [ From 27cf4a4e23d6e5345251c332eebe158ee7134307 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 8 Feb 2025 21:22:55 +0800 Subject: [PATCH 0547/2168] cinnamon-common: Patch {cancel-print-dialog,lpstat-a}.py For issue 380117. Note that lpstat-a.py does not need to be wrapped. --- pkgs/by-name/ci/cinnamon-common/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/ci/cinnamon-common/package.nix b/pkgs/by-name/ci/cinnamon-common/package.nix index 09ddfca9743a..2071383b3d72 100644 --- a/pkgs/by-name/ci/cinnamon-common/package.nix +++ b/pkgs/by-name/ci/cinnamon-common/package.nix @@ -171,6 +171,10 @@ stdenv.mkDerivation rec { substituteInPlace ./modules/cs_user.py --replace-fail "/usr/bin/passwd" "/run/wrappers/bin/passwd" popd + # In preFixup we make these executable. + substituteInPlace ./files/usr/share/cinnamon/applets/printers@cinnamon.org/applet.js \ + --replace-fail "Util.spawn_async(['python3'," "Util.spawn_async([" + substituteInPlace ./files/usr/bin/cinnamon-session-{cinnamon,cinnamon2d} \ --replace-fail "exec cinnamon-session" "exec ${cinnamon-session}/bin/cinnamon-session" @@ -198,6 +202,10 @@ stdenv.mkDerivation rec { # Called as `pkexec cinnamon-settings-users.py`. wrapGApp $out/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py + + # postPatch touches both but we mainly want to wrap cancel-print-dialog. + chmod +x $out/share/cinnamon/applets/printers@cinnamon.org/{cancel-print-dialog,lpstat-a}.py + wrapGApp $out/share/cinnamon/applets/printers@cinnamon.org/cancel-print-dialog.py ''; passthru = { From ce5d31e5106fa2e84b7f9493e1cbf2d3dece574d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Feb 2025 15:08:37 +0100 Subject: [PATCH 0548/2168] uncover: 1.0.9 -> 1.0.10 Diff: https://github.com/projectdiscovery/uncover/compare/refs/tags/v1.0.9...v1.0.10 Changelog: https://github.com/projectdiscovery/uncover/releases/tag/v1.0.10 --- pkgs/by-name/un/uncover/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/un/uncover/package.nix b/pkgs/by-name/un/uncover/package.nix index 1b16fc3c8334..d672e02ee93f 100644 --- a/pkgs/by-name/un/uncover/package.nix +++ b/pkgs/by-name/un/uncover/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "uncover"; - version = "1.0.9"; + version = "1.0.10"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "uncover"; tag = "v${version}"; - hash = "sha256-avGbawIeh7ZUtacRLo/tLz4D6U7JAlu9BXDYu/xvoa0="; + hash = "sha256-q8ecgTY2uDo4O+/CqK9aYnYb4oArDIvga9C/tG9IooE="; }; - vendorHash = "sha256-93iXho+WCQyhw9DoLgo9ZKiPrd88D2ibgp1M9uP7bUU="; + vendorHash = "sha256-Pm3CFHdp0VHZ5tRrjnpXXaIwQFu7EXyVgo/K9OOqHBI="; subPackages = [ "cmd/uncover" ]; From 41b359e77c9ca8f8da950e72cb2efaebcb614ef0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Feb 2025 14:10:48 +0000 Subject: [PATCH 0549/2168] mihomo-party: 1.5.12 -> 1.7.1 --- pkgs/by-name/mi/mihomo-party/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/mihomo-party/package.nix b/pkgs/by-name/mi/mihomo-party/package.nix index 99f22ca8d42b..9dcf3279ca42 100644 --- a/pkgs/by-name/mi/mihomo-party/package.nix +++ b/pkgs/by-name/mi/mihomo-party/package.nix @@ -15,7 +15,7 @@ libGL, }: let - version = "1.5.12"; + version = "1.7.1"; src = let inherit (stdenv.hostPlatform) system; @@ -25,8 +25,8 @@ let aarch64-linux = "arm64"; }; hash = selectSystem { - x86_64-linux = "sha256-1vJ2FcJOcpNyfSm5HyLkexsULBBPlI0AW2jXuhK8khA="; - aarch64-linux = "sha256-P+zCO6HxcQJAGIVxOSRga+1Bqtn31mw2v+/EyEDpgF8="; + x86_64-linux = "sha256-fVPW4lk+1uY+zTPk0wNeHz7ILKB+7p9hunHrqnuPI6w="; + aarch64-linux = "sha256-wEOOP5ha7R0z0DCTCsmn5lfwJdzEWtNGdWNjVB5cI6k="; }; in fetchurl { From ed1ddbac51be75943275819c7df8141f3da7b810 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 8 Feb 2025 11:23:41 +0100 Subject: [PATCH 0550/2168] ciscoPacketTracer8: fix build with noBrokenSymlinks --- pkgs/by-name/ci/ciscoPacketTracer8/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix index 4f0801c984b5..f07f943cbf20 100644 --- a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix +++ b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix @@ -136,7 +136,6 @@ stdenvNoCC.mkDerivation { mkdir -p $out/bin ln -s ${fhs-env}/bin/${fhs-env.name} $out/bin/packettracer8 - ln -s ${fhs-env}/usr $out/usr runHook postInstall ''; From 4e2e89e516a06cae10513569d3a544b45bebac5a Mon Sep 17 00:00:00 2001 From: emaryn Date: Sat, 8 Feb 2025 22:22:32 +0800 Subject: [PATCH 0551/2168] pcloud: fix build --- pkgs/by-name/pc/pcloud/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/pc/pcloud/package.nix b/pkgs/by-name/pc/pcloud/package.nix index d185ade66a48..a418ac534d51 100644 --- a/pkgs/by-name/pc/pcloud/package.nix +++ b/pkgs/by-name/pc/pcloud/package.nix @@ -114,6 +114,8 @@ stdenv.mkDerivation { EOF chmod +x bin/pcloud + + ln -snf $out/share/icons/hicolor/512x512/apps/pcloud.png $out/app/pcloud.png ''; meta = with lib; { From 278f8ed65dcbe93083d653d6c9b624da229e5ad2 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 25 Nov 2024 17:04:59 +0100 Subject: [PATCH 0552/2168] python312Packages.pylance: 0.22.0 -> 0.23.0 Diff: https://github.com/lancedb/lance/compare/v0.22.0...v0.23.0 Changelog: https://github.com/lancedb/lance/releases/tag/v0.23.0 --- .../python-modules/pylance/default.nix | 48 ++++++++----------- pkgs/top-level/python-packages.nix | 4 +- 2 files changed, 20 insertions(+), 32 deletions(-) diff --git a/pkgs/development/python-modules/pylance/default.nix b/pkgs/development/python-modules/pylance/default.nix index 625757052c61..babde8453466 100644 --- a/pkgs/development/python-modules/pylance/default.nix +++ b/pkgs/development/python-modules/pylance/default.nix @@ -9,10 +9,8 @@ pkg-config, # buildInputs - libiconv, openssl, protobuf, - darwin, # dependencies numpy, @@ -36,14 +34,14 @@ buildPythonPackage rec { pname = "pylance"; - version = "0.22.0"; + version = "0.23.0"; pyproject = true; src = fetchFromGitHub { owner = "lancedb"; repo = "lance"; tag = "v${version}"; - hash = "sha256-UOrkVHgTX1JK6chYJ6I+VJUquwsKLnOI5solS9W21HY="; + hash = "sha256-I8v690MTEYWy3NjbElD3bzhBR4RcvzRKoJoKbL2f/JE="; }; sourceRoot = "${src.name}/python"; @@ -55,7 +53,7 @@ buildPythonPackage rec { src sourceRoot ; - hash = "sha256-D9+rKV4rF5AVMxFfEohHufHC2mO75M80TuZaHDI0XMU="; + hash = "sha256-vNVS+ps+lTQ4M5hl+0TWItVO3U2SN64jDHhblODmIT0="; }; nativeBuildInputs = [ @@ -69,19 +67,10 @@ buildPythonPackage rec { rustPlatform.maturinBuildHook ]; - buildInputs = - [ - libiconv - openssl - protobuf - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - SystemConfiguration - ] - ); + buildInputs = [ + openssl + protobuf + ]; pythonRelaxDeps = [ "pyarrow" ]; @@ -111,22 +100,26 @@ buildPythonPackage rec { ''; disabledTests = - lib.optionals stdenv.hostPlatform.isDarwin [ + [ + # Writes to read-only build directory + "test_add_data_storage_version" + "test_fix_data_storage_version" + ] + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ + # OSError: LanceError(IO): Resources exhausted: Failed to allocate additional 1245184 bytes for ExternalSorter[0]... + "test_merge_insert_large" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # AttributeError: module 'torch.distributed' has no attribute 'is_initialized' + "test_blob_api" "test_convert_int_tensors" + "test_filtered_sampling_odd_batch_size" "test_ground_truth" "test_index_cast_centroids" "test_index_with_no_centroid_movement" "test_iter_filter" "test_iter_over_dataset_fixed_shape_tensor" "test_iter_over_dataset_fixed_size_lists" - ] - ++ [ - # incompatible with duckdb 1.1.1 - "test_duckdb_pushdown_extension_types" - # Writes to read-only build directory - "test_add_data_storage_version" - "test_fix_data_storage_version" ]; passthru.updateScript = nix-update-script { }; @@ -137,8 +130,5 @@ buildPythonPackage rec { changelog = "https://github.com/lancedb/lance/releases/tag/v${version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ natsukium ]; - # test_indices.py ...sss.Fatal Python error: Fatal Python error: Illegal instructionIllegal instruction - # File "/nix/store/wiiccrs0vd1qbh4j6ki9p40xmamsjix3-python3.12-pylance-0.17.0/lib/python3.12/site-packages/lance/indices.py", line 237 in train_ivf - broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7c3c4089b8c3..07a4673b2f37 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10729,9 +10729,7 @@ self: super: with self; { pykrakenapi = callPackage ../development/python-modules/pykrakenapi { }; - pylance = callPackage ../development/python-modules/pylance { - inherit (pkgs) protobuf; - }; + pylance = callPackage ../development/python-modules/pylance { }; pyldavis = callPackage ../development/python-modules/pyldavis { }; From b8a51ba9ed2632143dccd108d9c9f1d5718223fb Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Thu, 6 Feb 2025 11:12:40 -0500 Subject: [PATCH 0553/2168] duckdb: 1.1.3 -> 1.2.0 --- pkgs/development/libraries/duckdb/versions.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/duckdb/versions.json b/pkgs/development/libraries/duckdb/versions.json index 2ed38b48db51..bfe1c0f12964 100644 --- a/pkgs/development/libraries/duckdb/versions.json +++ b/pkgs/development/libraries/duckdb/versions.json @@ -1,5 +1,5 @@ { - "version": "1.1.3", - "rev": "19864453f7d0ed095256d848b46e7b8630989bac", - "hash": "sha256-Inaawm6mAy1CPCPfGO5LNBgaF/QcZOTAjm1aGjrJp6w=" + "version": "1.2.0", + "rev": "5f5512b827df6397afd31daedb4bbdee76520019", + "hash": "sha256-93iBUsNKXRGdnN1ZRSWJfnSNM23U/M0sudgHk6HGIhM=" } From fb4fe16cc7ac5fd57b4436c647f4b62b77c45bda Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Fri, 7 Feb 2025 10:55:40 -0500 Subject: [PATCH 0554/2168] duckdb: avoid building httpfs --- pkgs/development/python-modules/duckdb/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/duckdb/default.nix b/pkgs/development/python-modules/duckdb/default.nix index 77b348e271f0..c714eb03ab04 100644 --- a/pkgs/development/python-modules/duckdb/default.nix +++ b/pkgs/development/python-modules/duckdb/default.nix @@ -38,7 +38,6 @@ buildPythonPackage rec { ''; env = { - BUILD_HTTPFS = 1; DUCKDB_BUILD_UNITY = 1; OVERRIDE_GIT_DESCRIBE = "v${version}-0-g${rev}"; }; From e4f4ce39849370c4fe1045b681d5cdcf6b0ebd6b Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Fri, 7 Feb 2025 10:56:01 -0500 Subject: [PATCH 0555/2168] harlequin: relax the syrupy constraint --- pkgs/by-name/ha/harlequin/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ha/harlequin/package.nix b/pkgs/by-name/ha/harlequin/package.nix index c4bbad05fdcf..2d811b9825b2 100644 --- a/pkgs/by-name/ha/harlequin/package.nix +++ b/pkgs/by-name/ha/harlequin/package.nix @@ -25,6 +25,7 @@ python3Packages.buildPythonApplication rec { "numpy" "pyarrow" "textual" + "syrupy" ]; build-system = with python3Packages; [ poetry-core ]; From 067d6926e6edd8a41b22912fd21da53383e41305 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Fri, 7 Feb 2025 10:56:22 -0500 Subject: [PATCH 0556/2168] python3.pkgs.pytest-textual-snapshot: relax the syrupy constraint --- .../python-modules/pytest-textual-snapshot/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/pytest-textual-snapshot/default.nix b/pkgs/development/python-modules/pytest-textual-snapshot/default.nix index b0ab480685fd..30ffa1b09144 100644 --- a/pkgs/development/python-modules/pytest-textual-snapshot/default.nix +++ b/pkgs/development/python-modules/pytest-textual-snapshot/default.nix @@ -36,6 +36,10 @@ buildPythonPackage rec { textual ]; + pythonRelaxDeps = [ + "syrupy" + ]; + # Module has no tests doCheck = false; From af5286ec36b2a97166358ebee15850106f8c2ec3 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Sat, 8 Feb 2025 06:39:41 -0500 Subject: [PATCH 0557/2168] python3.pkg.dask-expr: remove incompatible `distributed` check dependency --- pkgs/development/python-modules/dask-expr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dask-expr/default.nix b/pkgs/development/python-modules/dask-expr/default.nix index 2e06ececffb3..c7bb6c734ee9 100644 --- a/pkgs/development/python-modules/dask-expr/default.nix +++ b/pkgs/development/python-modules/dask-expr/default.nix @@ -13,7 +13,7 @@ pyarrow, # checks - distributed, + jinja2, pytestCheckHook, xarray, }: @@ -49,7 +49,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "dask_expr" ]; nativeCheckInputs = [ - distributed + jinja2 pytestCheckHook xarray ]; From 63f8b4269b6958d5b7871f2d951a469d3a452317 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Sat, 8 Feb 2025 09:05:43 -0500 Subject: [PATCH 0558/2168] duckdb: format `update.sh` --- pkgs/development/libraries/duckdb/update.sh | 27 ++++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/duckdb/update.sh b/pkgs/development/libraries/duckdb/update.sh index f3acd176ee86..925d7f6be1a8 100755 --- a/pkgs/development/libraries/duckdb/update.sh +++ b/pkgs/development/libraries/duckdb/update.sh @@ -5,37 +5,46 @@ set -euo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" -nixpkgs=$(while [[ ! -e .git ]]; do [[ ${PWD} != / ]] || exit 1; cd ..; done; echo "${PWD}") +nixpkgs=$( + while [[ ! -e .git ]]; do + [[ ${PWD} != / ]] || exit 1 + cd .. + done + echo "${PWD}" +) repo=duckdb owner=duckdb msg() { - echo "$*" >&2 + echo "$*" >&2 } json_get() { - jq -r "$1" < 'versions.json' + jq -r "$1" < 'versions.json' } json_set() { - jq --arg x "$2" "$1 = \$x" < 'versions.json' | sponge 'versions.json' + jq --arg x "$2" "$1 = \$x" < 'versions.json' | sponge 'versions.json' } get_latest() { - curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s \ - "https://api.github.com/repos/${owner}/${repo}/releases/latest" | jq -r .tag_name + curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s \ + "https://api.github.com/repos/${owner}/${repo}/releases/latest" | jq -r .tag_name } get_sha() { - curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s \ - "https://api.github.com/repos/${owner}/${repo}/git/ref/tags/$1" | jq -r .object.sha + curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s \ + "https://api.github.com/repos/${owner}/${repo}/git/ref/tags/$1" | jq -r .object.sha } tag=$(get_latest) version=${tag/v/} -[[ ${version} = $(json_get .version) ]] && { msg "${version} is up to date"; exit 0; } +[[ ${version} == $(json_get .version) ]] && { + msg "${version} is up to date" + exit 0 +} sha=$(get_sha "${tag}") sri=$(nix-prefetch -I nixpkgs="${nixpkgs}" -E "duckdb.overrideAttrs { version = \"${version}\"; }") From 6c3565c909c87dab3ed68484335a4fc3f25c69f2 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Sat, 8 Feb 2025 09:27:12 -0500 Subject: [PATCH 0559/2168] duckdb: fix update script to use nix-prefetch-github --- pkgs/development/libraries/duckdb/update.sh | 43 +++++++-------------- 1 file changed, 13 insertions(+), 30 deletions(-) diff --git a/pkgs/development/libraries/duckdb/update.sh b/pkgs/development/libraries/duckdb/update.sh index 925d7f6be1a8..c440e2d5b1e2 100755 --- a/pkgs/development/libraries/duckdb/update.sh +++ b/pkgs/development/libraries/duckdb/update.sh @@ -1,18 +1,10 @@ #!/usr/bin/env nix-shell -#!nix-shell --pure -i bash -p cacert curl jq moreutils nix-prefetch +#!nix-shell -i bash -p cacert jq git moreutils nix nix-prefetch-github # shellcheck shell=bash set -euo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" -nixpkgs=$( - while [[ ! -e .git ]]; do - [[ ${PWD} != / ]] || exit 1 - cd .. - done - echo "${PWD}" -) - repo=duckdb owner=duckdb @@ -21,34 +13,25 @@ msg() { } json_get() { - jq -r "$1" < 'versions.json' + jq -r "$1" < ./versions.json } json_set() { - jq --arg x "$2" "$1 = \$x" < 'versions.json' | sponge 'versions.json' + jq --arg x "$2" "$1 = \$x" < ./versions.json | sponge 'versions.json' } get_latest() { - curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s \ - "https://api.github.com/repos/${owner}/${repo}/releases/latest" | jq -r .tag_name + gh release --repo "${owner}/${repo}" list \ + --exclude-pre-releases \ + --limit 1 \ + --json tagName \ + --jq '.[].tagName' } -get_sha() { - curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s \ - "https://api.github.com/repos/${owner}/${repo}/git/ref/tags/$1" | jq -r .object.sha -} +tag="$(get_latest | sed 's/^v//g')" -tag=$(get_latest) -version=${tag/v/} +json=$(nix-prefetch-github "${owner}" "${repo}" --rev "v${tag}") -[[ ${version} == $(json_get .version) ]] && { - msg "${version} is up to date" - exit 0 -} - -sha=$(get_sha "${tag}") -sri=$(nix-prefetch -I nixpkgs="${nixpkgs}" -E "duckdb.overrideAttrs { version = \"${version}\"; }") - -json_set ".version" "${version}" -json_set ".rev" "${sha}" -json_set ".hash" "${sri}" +json_set ".version" "${tag}" +json_set ".rev" "$(jq -r '.rev' <<< "${json}")" +json_set ".hash" "$(jq -r '.hash' <<< "${json}")" From 3265b02a305ae98ee5c4a2d67a58ea55739962a5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Feb 2025 14:45:45 +0000 Subject: [PATCH 0560/2168] aws-nuke: 3.44.0 -> 3.47.1 --- pkgs/by-name/aw/aws-nuke/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/aw/aws-nuke/package.nix b/pkgs/by-name/aw/aws-nuke/package.nix index dc5c5c87949a..ec8566d9f54f 100644 --- a/pkgs/by-name/aw/aws-nuke/package.nix +++ b/pkgs/by-name/aw/aws-nuke/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "aws-nuke"; - version = "3.44.0"; + version = "3.47.1"; src = fetchFromGitHub { owner = "ekristen"; repo = "aws-nuke"; tag = "v${version}"; - hash = "sha256-cYKVKJWIX3MqjN4LzNjBuvdsUSxF63L5MaFxW9gzyQQ="; + hash = "sha256-5vOCfLHW2TLx9t1hado3+JqvRaPqJOR5ZaQP2x1Xcl8="; }; - vendorHash = "sha256-NPp6ivngNX0cQCUx4ZEP29t3+uuy5o1z0KcA65YUZ9k="; + vendorHash = "sha256-811gUe7L/1Y5HTRgywjzBe7b9VjWt6GjbuyBOORaOCI="; overrideModAttrs = _: { preBuild = '' From e96f4b9428ba6bb77d784d7bb6dad171f42b248a Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 25 Nov 2024 17:09:57 +0100 Subject: [PATCH 0561/2168] python312Packages.lancedb: 0.18.0 -> 0.19.0 Diff: https://github.com/lancedb/lancedb/compare/refs/tags/python-v0.18.0...python-v0.19.0 Changelog: https://github.com/lancedb/lancedb/releases/tag/python-v0.19.0 --- .../python-modules/lancedb/Cargo.lock | 8445 ----------------- .../python-modules/lancedb/default.nix | 80 +- 2 files changed, 35 insertions(+), 8490 deletions(-) delete mode 100644 pkgs/development/python-modules/lancedb/Cargo.lock diff --git a/pkgs/development/python-modules/lancedb/Cargo.lock b/pkgs/development/python-modules/lancedb/Cargo.lock deleted file mode 100644 index d9e7e0fd0d05..000000000000 --- a/pkgs/development/python-modules/lancedb/Cargo.lock +++ /dev/null @@ -1,8445 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler2" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" - -[[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if", - "const-random", - "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 = "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.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" - -[[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 = "anstream" -version = "0.6.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "is_terminal_polyfill", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" - -[[package]] -name = "anstyle-parse" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" -dependencies = [ - "windows-sys 0.59.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e" -dependencies = [ - "anstyle", - "once_cell", - "windows-sys 0.59.0", -] - -[[package]] -name = "anyhow" -version = "1.0.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" - -[[package]] -name = "arbitrary" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223" -dependencies = [ - "derive_arbitrary", -] - -[[package]] -name = "arc-swap" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" - -[[package]] -name = "argminmax" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52424b59d69d69d5056d508b260553afd91c57e21849579cd1f50ee8b8b88eaa" -dependencies = [ - "num-traits", -] - -[[package]] -name = "array-init-cursor" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7d0a018de4f6aa429b9d33d69edf69072b1c5b1cb8d3e4a5f7ef898fc3eb76" - -[[package]] -name = "arrayref" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" - -[[package]] -name = "arrow" -version = "53.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c91839b07e474b3995035fd8ac33ee54f9c9ccbbb1ea33d9909c71bffdf1259d" -dependencies = [ - "arrow-arith", - "arrow-array", - "arrow-buffer", - "arrow-cast", - "arrow-csv", - "arrow-data", - "arrow-ipc", - "arrow-json", - "arrow-ord", - "arrow-row", - "arrow-schema", - "arrow-select", - "arrow-string", - "pyo3", -] - -[[package]] -name = "arrow-arith" -version = "53.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "855c57c4efd26722b044dcd3e348252560e3e0333087fb9f6479dc0bf744054f" -dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-data", - "arrow-schema", - "chrono", - "half", - "num", -] - -[[package]] -name = "arrow-array" -version = "53.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd03279cea46569acf9295f6224fbc370c5df184b4d2ecfe97ccb131d5615a7f" -dependencies = [ - "ahash", - "arrow-buffer", - "arrow-data", - "arrow-schema", - "chrono", - "chrono-tz 0.10.0", - "half", - "hashbrown 0.15.2", - "num", -] - -[[package]] -name = "arrow-buffer" -version = "53.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e4a9b9b1d6d7117f6138e13bc4dd5daa7f94e671b70e8c9c4dc37b4f5ecfc16" -dependencies = [ - "bytes", - "half", - "num", -] - -[[package]] -name = "arrow-cast" -version = "53.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc70e39916e60c5b7af7a8e2719e3ae589326039e1e863675a008bee5ffe90fd" -dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-data", - "arrow-schema", - "arrow-select", - "atoi", - "base64 0.22.1", - "chrono", - "comfy-table", - "half", - "lexical-core", - "num", - "ryu", -] - -[[package]] -name = "arrow-csv" -version = "53.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "789b2af43c1049b03a8d088ff6b2257cdcea1756cd76b174b1f2600356771b97" -dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-cast", - "arrow-data", - "arrow-schema", - "chrono", - "csv", - "csv-core", - "lazy_static", - "lexical-core", - "regex", -] - -[[package]] -name = "arrow-data" -version = "53.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4e75edf21ffd53744a9b8e3ed11101f610e7ceb1a29860432824f1834a1f623" -dependencies = [ - "arrow-buffer", - "arrow-schema", - "half", - "num", -] - -[[package]] -name = "arrow-ipc" -version = "53.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d186a909dece9160bf8312f5124d797884f608ef5435a36d9d608e0b2a9bcbf8" -dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-cast", - "arrow-data", - "arrow-schema", - "flatbuffers", - "lz4_flex", - "zstd", -] - -[[package]] -name = "arrow-json" -version = "53.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b66ff2fedc1222942d0bd2fd391cb14a85baa3857be95c9373179bd616753b85" -dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-cast", - "arrow-data", - "arrow-schema", - "chrono", - "half", - "indexmap 2.7.0", - "lexical-core", - "num", - "serde", - "serde_json", -] - -[[package]] -name = "arrow-ord" -version = "53.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ece7b5bc1180e6d82d1a60e1688c199829e8842e38497563c3ab6ea813e527fd" -dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-data", - "arrow-schema", - "arrow-select", - "half", - "num", -] - -[[package]] -name = "arrow-row" -version = "53.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "745c114c8f0e8ce211c83389270de6fbe96a9088a7b32c2a041258a443fe83ff" -dependencies = [ - "ahash", - "arrow-array", - "arrow-buffer", - "arrow-data", - "arrow-schema", - "half", -] - -[[package]] -name = "arrow-schema" -version = "53.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b95513080e728e4cec37f1ff5af4f12c9688d47795d17cda80b6ec2cf74d4678" -dependencies = [ - "bitflags 2.7.0", -] - -[[package]] -name = "arrow-select" -version = "53.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e415279094ea70323c032c6e739c48ad8d80e78a09bef7117b8718ad5bf3722" -dependencies = [ - "ahash", - "arrow-array", - "arrow-buffer", - "arrow-data", - "arrow-schema", - "num", -] - -[[package]] -name = "arrow-string" -version = "53.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11d956cae7002eb8d83a27dbd34daaea1cf5b75852f0b84deb4d93a276e92bbf" -dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-data", - "arrow-schema", - "arrow-select", - "memchr", - "num", - "regex", - "regex-syntax 0.8.5", -] - -[[package]] -name = "async-compression" -version = "0.4.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df895a515f70646414f4b45c0b79082783b80552b373a68283012928df56f522" -dependencies = [ - "flate2", - "futures-core", - "memchr", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "async-convert" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d416feee97712e43152cd42874de162b8f9b77295b1c85e5d92725cc8310bae" -dependencies = [ - "async-trait", -] - -[[package]] -name = "async-io" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" -dependencies = [ - "async-lock 2.8.0", - "autocfg", - "cfg-if", - "concurrent-queue", - "futures-lite", - "log", - "parking", - "polling", - "rustix 0.37.28", - "slab", - "socket2 0.4.10", - "waker-fn", -] - -[[package]] -name = "async-lock" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" -dependencies = [ - "event-listener 2.5.3", -] - -[[package]] -name = "async-lock" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" -dependencies = [ - "event-listener 5.4.0", - "event-listener-strategy", - "pin-project-lite", -] - -[[package]] -name = "async-openai" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11e97f9c5e0ee3260caee9700ba1bb61a6fdc34d2b6786a31e018c5de5198491" -dependencies = [ - "async-convert", - "backoff", - "base64 0.22.1", - "bytes", - "derive_builder", - "futures", - "rand", - "reqwest", - "reqwest-eventsource", - "secrecy", - "serde", - "serde_json", - "thiserror 1.0.69", - "tokio", - "tokio-stream", - "tokio-util", - "tracing", -] - -[[package]] -name = "async-priority-channel" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acde96f444d31031f760c5c43dc786b97d3e1cb2ee49dd06898383fe9a999758" -dependencies = [ - "event-listener 4.0.3", -] - -[[package]] -name = "async-recursion" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.96", -] - -[[package]] -name = "async-trait" -version = "0.1.85" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f934833b4b7233644e5848f235df3f57ed8c80f1528a26c3dfa13d2147fa056" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.96", -] - -[[package]] -name = "async_cell" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "834eee9ce518130a3b4d5af09ecc43e9d6b57ee76613f227a1ddd6b77c7a62bc" - -[[package]] -name = "atoi" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" -dependencies = [ - "num-traits", -] - -[[package]] -name = "atoi_simd" -version = "0.15.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ae037714f313c1353189ead58ef9eec30a8e8dc101b2622d461418fd59e28a9" - -[[package]] -name = "atomic-waker" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" - -[[package]] -name = "autocfg" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" - -[[package]] -name = "aws-config" -version = "1.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c03a50b30228d3af8865ce83376b4e99e1ffa34728220fe2860e4df0bb5278d6" -dependencies = [ - "aws-credential-types", - "aws-runtime", - "aws-sdk-sso", - "aws-sdk-ssooidc", - "aws-sdk-sts", - "aws-smithy-async", - "aws-smithy-http", - "aws-smithy-json", - "aws-smithy-runtime", - "aws-smithy-runtime-api", - "aws-smithy-types", - "aws-types", - "bytes", - "fastrand 2.3.0", - "hex", - "http 0.2.12", - "ring", - "time", - "tokio", - "tracing", - "url", - "zeroize", -] - -[[package]] -name = "aws-credential-types" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60e8f6b615cb5fc60a98132268508ad104310f0cfb25a1c22eee76efdf9154da" -dependencies = [ - "aws-smithy-async", - "aws-smithy-runtime-api", - "aws-smithy-types", - "zeroize", -] - -[[package]] -name = "aws-runtime" -version = "1.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16d1aa50accc11a4b4d5c50f7fb81cc0cf60328259c587d0e6b0f11385bde46" -dependencies = [ - "aws-credential-types", - "aws-sigv4", - "aws-smithy-async", - "aws-smithy-eventstream", - "aws-smithy-http", - "aws-smithy-runtime", - "aws-smithy-runtime-api", - "aws-smithy-types", - "aws-types", - "bytes", - "fastrand 2.3.0", - "http 0.2.12", - "http-body 0.4.6", - "once_cell", - "percent-encoding", - "pin-project-lite", - "tracing", - "uuid", -] - -[[package]] -name = "aws-sdk-bedrockruntime" -version = "1.67.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45b1eba5f7928b332df907ad9800dac0f53248156b65bd428f07df8a827e47f7" -dependencies = [ - "aws-credential-types", - "aws-runtime", - "aws-smithy-async", - "aws-smithy-eventstream", - "aws-smithy-http", - "aws-smithy-json", - "aws-smithy-runtime", - "aws-smithy-runtime-api", - "aws-smithy-types", - "aws-types", - "bytes", - "fastrand 2.3.0", - "http 0.2.12", - "once_cell", - "regex-lite", - "tracing", -] - -[[package]] -name = "aws-sdk-dynamodb" -version = "1.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1663eca3983d46e6e6dba3296db31c66f3e2031dc38f0ac2101f8b0f5bb99c5a" -dependencies = [ - "aws-credential-types", - "aws-runtime", - "aws-smithy-async", - "aws-smithy-http", - "aws-smithy-json", - "aws-smithy-runtime", - "aws-smithy-runtime-api", - "aws-smithy-types", - "aws-types", - "bytes", - "fastrand 2.3.0", - "http 0.2.12", - "once_cell", - "regex-lite", - "tracing", -] - -[[package]] -name = "aws-sdk-kms" -version = "1.54.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6cf16c0e5853312995505557b876dd3f9fb9941e96d031383528ccef14ace57" -dependencies = [ - "aws-credential-types", - "aws-runtime", - "aws-smithy-async", - "aws-smithy-http", - "aws-smithy-json", - "aws-smithy-runtime", - "aws-smithy-runtime-api", - "aws-smithy-types", - "aws-types", - "bytes", - "http 0.2.12", - "once_cell", - "regex-lite", - "tracing", -] - -[[package]] -name = "aws-sdk-s3" -version = "1.68.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5ddf1dc70287dc9a2f953766a1fe15e3e74aef02fd1335f2afa475c9b4f4fc" -dependencies = [ - "aws-credential-types", - "aws-runtime", - "aws-sigv4", - "aws-smithy-async", - "aws-smithy-checksums", - "aws-smithy-eventstream", - "aws-smithy-http", - "aws-smithy-json", - "aws-smithy-runtime", - "aws-smithy-runtime-api", - "aws-smithy-types", - "aws-smithy-xml", - "aws-types", - "bytes", - "fastrand 2.3.0", - "hex", - "hmac", - "http 0.2.12", - "http-body 0.4.6", - "lru", - "once_cell", - "percent-encoding", - "regex-lite", - "sha2", - "tracing", - "url", -] - -[[package]] -name = "aws-sdk-sso" -version = "1.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1605dc0bf9f0a4b05b451441a17fcb0bda229db384f23bf5cead3adbab0664ac" -dependencies = [ - "aws-credential-types", - "aws-runtime", - "aws-smithy-async", - "aws-smithy-http", - "aws-smithy-json", - "aws-smithy-runtime", - "aws-smithy-runtime-api", - "aws-smithy-types", - "aws-types", - "bytes", - "http 0.2.12", - "once_cell", - "regex-lite", - "tracing", -] - -[[package]] -name = "aws-sdk-ssooidc" -version = "1.54.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59f3f73466ff24f6ad109095e0f3f2c830bfb4cd6c8b12f744c8e61ebf4d3ba1" -dependencies = [ - "aws-credential-types", - "aws-runtime", - "aws-smithy-async", - "aws-smithy-http", - "aws-smithy-json", - "aws-smithy-runtime", - "aws-smithy-runtime-api", - "aws-smithy-types", - "aws-types", - "bytes", - "http 0.2.12", - "once_cell", - "regex-lite", - "tracing", -] - -[[package]] -name = "aws-sdk-sts" -version = "1.54.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "861d324ef69247c6f3c6823755f408a68877ffb1a9afaff6dd8b0057c760de60" -dependencies = [ - "aws-credential-types", - "aws-runtime", - "aws-smithy-async", - "aws-smithy-http", - "aws-smithy-json", - "aws-smithy-query", - "aws-smithy-runtime", - "aws-smithy-runtime-api", - "aws-smithy-types", - "aws-smithy-xml", - "aws-types", - "http 0.2.12", - "once_cell", - "regex-lite", - "tracing", -] - -[[package]] -name = "aws-sigv4" -version = "1.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d3820e0c08d0737872ff3c7c1f21ebbb6693d832312d6152bf18ef50a5471c2" -dependencies = [ - "aws-credential-types", - "aws-smithy-eventstream", - "aws-smithy-http", - "aws-smithy-runtime-api", - "aws-smithy-types", - "bytes", - "crypto-bigint 0.5.5", - "form_urlencoded", - "hex", - "hmac", - "http 0.2.12", - "http 1.2.0", - "once_cell", - "p256", - "percent-encoding", - "ring", - "sha2", - "subtle", - "time", - "tracing", - "zeroize", -] - -[[package]] -name = "aws-smithy-async" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427cb637d15d63d6f9aae26358e1c9a9c09d5aa490d64b09354c8217cfef0f28" -dependencies = [ - "futures-util", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "aws-smithy-checksums" -version = "0.60.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba1a71073fca26775c8b5189175ea8863afb1c9ea2cceb02a5de5ad9dfbaa795" -dependencies = [ - "aws-smithy-http", - "aws-smithy-types", - "bytes", - "crc32c", - "crc32fast", - "hex", - "http 0.2.12", - "http-body 0.4.6", - "md-5", - "pin-project-lite", - "sha1", - "sha2", - "tracing", -] - -[[package]] -name = "aws-smithy-eventstream" -version = "0.60.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cef7d0a272725f87e51ba2bf89f8c21e4df61b9e49ae1ac367a6d69916ef7c90" -dependencies = [ - "aws-smithy-types", - "bytes", - "crc32fast", -] - -[[package]] -name = "aws-smithy-http" -version = "0.60.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c8bc3e8fdc6b8d07d976e301c02fe553f72a39b7a9fea820e023268467d7ab6" -dependencies = [ - "aws-smithy-eventstream", - "aws-smithy-runtime-api", - "aws-smithy-types", - "bytes", - "bytes-utils", - "futures-core", - "http 0.2.12", - "http-body 0.4.6", - "once_cell", - "percent-encoding", - "pin-project-lite", - "pin-utils", - "tracing", -] - -[[package]] -name = "aws-smithy-json" -version = "0.61.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee4e69cc50921eb913c6b662f8d909131bb3e6ad6cb6090d3a39b66fc5c52095" -dependencies = [ - "aws-smithy-types", -] - -[[package]] -name = "aws-smithy-query" -version = "0.60.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2fbd61ceb3fe8a1cb7352e42689cec5335833cd9f94103a61e98f9bb61c64bb" -dependencies = [ - "aws-smithy-types", - "urlencoding", -] - -[[package]] -name = "aws-smithy-runtime" -version = "1.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a05dd41a70fc74051758ee75b5c4db2c0ca070ed9229c3df50e9475cda1cb985" -dependencies = [ - "aws-smithy-async", - "aws-smithy-http", - "aws-smithy-runtime-api", - "aws-smithy-types", - "bytes", - "fastrand 2.3.0", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.6", - "http-body 1.0.1", - "httparse", - "hyper 0.14.32", - "hyper-rustls 0.24.2", - "once_cell", - "pin-project-lite", - "pin-utils", - "rustls 0.21.12", - "tokio", - "tracing", -] - -[[package]] -name = "aws-smithy-runtime-api" -version = "1.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92165296a47a812b267b4f41032ff8069ab7ff783696d217f0994a0d7ab585cd" -dependencies = [ - "aws-smithy-async", - "aws-smithy-types", - "bytes", - "http 0.2.12", - "http 1.2.0", - "pin-project-lite", - "tokio", - "tracing", - "zeroize", -] - -[[package]] -name = "aws-smithy-types" -version = "1.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38ddc9bd6c28aeb303477170ddd183760a956a03e083b3902a990238a7e3792d" -dependencies = [ - "base64-simd", - "bytes", - "bytes-utils", - "futures-core", - "http 0.2.12", - "http 1.2.0", - "http-body 0.4.6", - "http-body 1.0.1", - "http-body-util", - "itoa", - "num-integer", - "pin-project-lite", - "pin-utils", - "ryu", - "serde", - "time", - "tokio", - "tokio-util", -] - -[[package]] -name = "aws-smithy-xml" -version = "0.60.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab0b0166827aa700d3dc519f72f8b3a91c35d0b8d042dc5d643a91e6f80648fc" -dependencies = [ - "xmlparser", -] - -[[package]] -name = "aws-types" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5221b91b3e441e6675310829fd8984801b772cb1546ef6c0e54dec9f1ac13fef" -dependencies = [ - "aws-credential-types", - "aws-smithy-async", - "aws-smithy-runtime-api", - "aws-smithy-types", - "rustc_version", - "tracing", -] - -[[package]] -name = "backoff" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" -dependencies = [ - "futures-core", - "getrandom", - "instant", - "pin-project-lite", - "rand", - "tokio", -] - -[[package]] -name = "backtrace" -version = "0.3.74" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" -dependencies = [ - "addr2line", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", - "windows-targets 0.52.6", -] - -[[package]] -name = "base16ct" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" - -[[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" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" - -[[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 = "bigdecimal" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f31f3af01c5c65a07985c804d3366560e6fa7883d640a122819b14ec327482c" -dependencies = [ - "autocfg", - "libm", - "num-bigint", - "num-integer", - "num-traits", -] - -[[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.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1be3f42a67d6d345ecd59f675f3f012d6974981560836e938c22b424b85ce1be" - -[[package]] -name = "bitpacking" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c1d3e2bfd8d06048a179f7b17afc3188effa10385e7b00dc65af6aae732ea92" -dependencies = [ - "crunchy", -] - -[[package]] -name = "bitvec" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] - -[[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 = "brotli" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391" -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.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" - -[[package]] -name = "bytecount" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce" - -[[package]] -name = "bytemuck" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" -dependencies = [ - "bytemuck_derive", -] - -[[package]] -name = "bytemuck_derive" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fa76293b4f7bb636ab88fd78228235b5248b4d05cc589aed610f954af5d7c7a" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.96", -] - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "bytes" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" - -[[package]] -name = "bytes-utils" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dafe3a8757b027e2be6e4e5601ed563c55989fcf1546e933c66c8eb3a058d35" -dependencies = [ - "bytes", - "either", -] - -[[package]] -name = "camino" -version = "1.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" -dependencies = [ - "serde", -] - -[[package]] -name = "candle-core" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5b18de020c2729dbf7ac390325312644808b6ba9b7962f1f724e9185b1d53c7" -dependencies = [ - "byteorder", - "gemm", - "half", - "memmap2 0.9.5", - "num-traits", - "num_cpus", - "rand", - "rand_distr", - "rayon", - "safetensors", - "thiserror 1.0.69", - "yoke", - "zip", -] - -[[package]] -name = "candle-nn" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b006b30f66a0d94fc9cef0ac4de6ce510565f35ae2c6c35ce5d4aacfb0fc8eeb" -dependencies = [ - "candle-core", - "half", - "num-traits", - "rayon", - "safetensors", - "serde", - "thiserror 1.0.69", -] - -[[package]] -name = "candle-transformers" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f0d4eb6a0d9279d5829b06b2bf3caa117904eefd6dcf879d16e687c4a84034c" -dependencies = [ - "byteorder", - "candle-core", - "candle-nn", - "fancy-regex", - "num-traits", - "rand", - "rayon", - "serde", - "serde_json", - "serde_plain", - "tracing", -] - -[[package]] -name = "cargo-platform" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e35af189006b9c0f00a064685c727031e3ed2d8020f7ba284d78cc2671bd36ea" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo_metadata" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" -dependencies = [ - "camino", - "cargo-platform", - "semver 1.0.24", - "serde", - "serde_json", -] - -[[package]] -name = "cc" -version = "1.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8293772165d9345bdaaa39b45b2109591e63fe5e6fbc23c6ff930a048aa310b" -dependencies = [ - "jobserver", - "libc", - "shlex", -] - -[[package]] -name = "census" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f4c707c6a209cbe82d10abd08e1ea8995e9ea937d2550646e02798948992be0" - -[[package]] -name = "cesu8" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" - -[[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.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" - -[[package]] -name = "chrono" -version = "0.4.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "serde", - "wasm-bindgen", - "windows-targets 0.52.6", -] - -[[package]] -name = "chrono-tz" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59ae0466b83e838b81a54256c39d5d7c20b9d7daa10510a242d9b75abd5936e" -dependencies = [ - "chrono", - "chrono-tz-build 0.2.1", - "phf", -] - -[[package]] -name = "chrono-tz" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd6dd8046d00723a59a2f8c5f295c515b9bb9a331ee4f8f3d4dd49e428acd3b6" -dependencies = [ - "chrono", - "chrono-tz-build 0.4.0", - "phf", -] - -[[package]] -name = "chrono-tz-build" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433e39f13c9a060046954e0592a8d0a4bcb1040125cbf91cb8ee58964cfb350f" -dependencies = [ - "parse-zoneinfo", - "phf", - "phf_codegen", -] - -[[package]] -name = "chrono-tz-build" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94fea34d77a245229e7746bd2beb786cd2a896f306ff491fb8cecb3074b10a7" -dependencies = [ - "parse-zoneinfo", - "phf_codegen", -] - -[[package]] -name = "colorchoice" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" - -[[package]] -name = "combine" -version = "4.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" -dependencies = [ - "bytes", - "memchr", -] - -[[package]] -name = "comfy-table" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24f165e7b643266ea80cb858aed492ad9280e3e05ce24d4a99d7d7b889b6a4d9" -dependencies = [ - "crossterm", - "strum", - "strum_macros 0.26.4", - "unicode-width", -] - -[[package]] -name = "concurrent-queue" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "console" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea3c6ecd8059b57859df5c69830340ed3c41d30e3da0c1cbed90a96ac853041b" -dependencies = [ - "encode_unicode", - "libc", - "once_cell", - "unicode-width", - "windows-sys 0.59.0", -] - -[[package]] -name = "const-oid" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" - -[[package]] -name = "const-random" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" -dependencies = [ - "const-random-macro", -] - -[[package]] -name = "const-random-macro" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" -dependencies = [ - "getrandom", - "once_cell", - "tiny-keccak", -] - -[[package]] -name = "conv" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ff10625fd0ac447827aa30ea8b861fead473bb60aeb73af6c1c58caf0d1299" -dependencies = [ - "custom_derive", -] - -[[package]] -name = "convert_case" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" -dependencies = [ - "unicode-segmentation", -] - -[[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" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" - -[[package]] -name = "cpufeatures" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" -dependencies = [ - "libc", -] - -[[package]] -name = "crc32c" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a47af21622d091a8f0fb295b88bc886ac74efcc613efc19f5d0b21de5c89e47" -dependencies = [ - "rustc_version", -] - -[[package]] -name = "crc32fast" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" -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.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" - -[[package]] -name = "crossterm" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6" -dependencies = [ - "bitflags 2.7.0", - "crossterm_winapi", - "parking_lot", - "rustix 0.38.43", - "winapi", -] - -[[package]] -name = "crossterm_winapi" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" -dependencies = [ - "winapi", -] - -[[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.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" -dependencies = [ - "generic-array", - "rand_core", - "subtle", - "zeroize", -] - -[[package]] -name = "crypto-bigint" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" -dependencies = [ - "rand_core", - "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 = "csv" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acdc4883a9c96732e4733212c01447ebd805833b7275a73ca3ee080fd77afdaf" -dependencies = [ - "csv-core", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "csv-core" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" -dependencies = [ - "memchr", -] - -[[package]] -name = "ctor" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a2785755761f3ddc1492979ce1e48d2c00d09311c39e4466429188f3dd6501" -dependencies = [ - "quote", - "syn 2.0.96", -] - -[[package]] -name = "custom_derive" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef8ae57c4978a2acd8b869ce6b9ca1dfe817bff704c220209fdef2c0b75a01b9" - -[[package]] -name = "darling" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn 2.0.96", -] - -[[package]] -name = "darling_macro" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" -dependencies = [ - "darling_core", - "quote", - "syn 2.0.96", -] - -[[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 = "dashmap" -version = "6.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" -dependencies = [ - "cfg-if", - "crossbeam-utils", - "hashbrown 0.14.5", - "lock_api", - "once_cell", - "parking_lot_core", -] - -[[package]] -name = "datafusion" -version = "44.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "014fc8c384ecacedaabb3bc8359c2a6c6e9d8f7bea65be3434eccacfc37f52d9" -dependencies = [ - "arrow", - "arrow-array", - "arrow-ipc", - "arrow-schema", - "async-trait", - "bytes", - "chrono", - "dashmap 6.1.0", - "datafusion-catalog", - "datafusion-common", - "datafusion-common-runtime", - "datafusion-execution", - "datafusion-expr", - "datafusion-functions", - "datafusion-functions-aggregate", - "datafusion-functions-nested", - "datafusion-functions-table", - "datafusion-functions-window", - "datafusion-optimizer", - "datafusion-physical-expr", - "datafusion-physical-expr-common", - "datafusion-physical-optimizer", - "datafusion-physical-plan", - "datafusion-sql", - "futures", - "glob", - "itertools 0.13.0", - "log", - "object_store 0.11.2", - "parking_lot", - "rand", - "regex", - "sqlparser 0.53.0", - "tempfile", - "tokio", - "url", - "uuid", -] - -[[package]] -name = "datafusion-catalog" -version = "44.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee60d33e210ef96070377ae667ece7caa0e959c8387496773d4a1a72f1a5012e" -dependencies = [ - "arrow-schema", - "async-trait", - "datafusion-common", - "datafusion-execution", - "datafusion-expr", - "datafusion-physical-plan", - "parking_lot", -] - -[[package]] -name = "datafusion-common" -version = "44.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b42b7d720fe21ed9cca2ebb635f3f13a12cfab786b41e0fba184fb2e620525b" -dependencies = [ - "ahash", - "arrow", - "arrow-array", - "arrow-buffer", - "arrow-schema", - "half", - "hashbrown 0.14.5", - "indexmap 2.7.0", - "libc", - "log", - "object_store 0.11.2", - "paste", - "sqlparser 0.53.0", - "tokio", - "web-time", -] - -[[package]] -name = "datafusion-common-runtime" -version = "44.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72fbf14d4079f7ce5306393084fe5057dddfdc2113577e0049310afa12e94281" -dependencies = [ - "log", - "tokio", -] - -[[package]] -name = "datafusion-doc" -version = "44.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c278dbd64860ed0bb5240fc1f4cb6aeea437153910aea69bcf7d5a8d6d0454f3" - -[[package]] -name = "datafusion-execution" -version = "44.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e22cb02af47e756468b3cbfee7a83e3d4f2278d452deb4b033ba933c75169486" -dependencies = [ - "arrow", - "dashmap 6.1.0", - "datafusion-common", - "datafusion-expr", - "futures", - "log", - "object_store 0.11.2", - "parking_lot", - "rand", - "tempfile", - "url", -] - -[[package]] -name = "datafusion-expr" -version = "44.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62298eadb1d15b525df1315e61a71519ffc563d41d5c3b2a30fda2d70f77b93c" -dependencies = [ - "arrow", - "chrono", - "datafusion-common", - "datafusion-doc", - "datafusion-expr-common", - "datafusion-functions-aggregate-common", - "datafusion-functions-window-common", - "datafusion-physical-expr-common", - "indexmap 2.7.0", - "paste", - "serde_json", - "sqlparser 0.53.0", -] - -[[package]] -name = "datafusion-expr-common" -version = "44.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dda7f73c5fc349251cd3dcb05773c5bf55d2505a698ef9d38dfc712161ea2f55" -dependencies = [ - "arrow", - "datafusion-common", - "itertools 0.13.0", -] - -[[package]] -name = "datafusion-functions" -version = "44.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd197f3b2975424d3a4898ea46651be855a46721a56727515dbd5c9e2fb597da" -dependencies = [ - "arrow", - "arrow-buffer", - "base64 0.22.1", - "chrono", - "datafusion-common", - "datafusion-doc", - "datafusion-execution", - "datafusion-expr", - "datafusion-expr-common", - "datafusion-macros", - "hashbrown 0.14.5", - "hex", - "itertools 0.13.0", - "log", - "rand", - "regex", - "unicode-segmentation", - "uuid", -] - -[[package]] -name = "datafusion-functions-aggregate" -version = "44.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aabbe48fba18f9981b134124381bee9e46f93518b8ad2f9721ee296cef5affb9" -dependencies = [ - "ahash", - "arrow", - "arrow-schema", - "datafusion-common", - "datafusion-doc", - "datafusion-execution", - "datafusion-expr", - "datafusion-functions-aggregate-common", - "datafusion-macros", - "datafusion-physical-expr", - "datafusion-physical-expr-common", - "half", - "log", - "paste", -] - -[[package]] -name = "datafusion-functions-aggregate-common" -version = "44.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7a3fefed9c8c11268d446d924baca8cabf52fe32f73fdaa20854bac6473590c" -dependencies = [ - "ahash", - "arrow", - "datafusion-common", - "datafusion-expr-common", - "datafusion-physical-expr-common", -] - -[[package]] -name = "datafusion-functions-nested" -version = "44.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6360f27464fab857bec698af39b2ae331dc07c8bf008fb4de387a19cdc6815a5" -dependencies = [ - "arrow", - "arrow-array", - "arrow-buffer", - "arrow-ord", - "arrow-schema", - "datafusion-common", - "datafusion-execution", - "datafusion-expr", - "datafusion-functions", - "datafusion-functions-aggregate", - "datafusion-physical-expr-common", - "itertools 0.13.0", - "log", - "paste", -] - -[[package]] -name = "datafusion-functions-table" -version = "44.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c35c070eb705c12795dab399c3809f4dfbc290678c624d3989490ca9b8449c1" -dependencies = [ - "arrow", - "async-trait", - "datafusion-catalog", - "datafusion-common", - "datafusion-expr", - "datafusion-physical-plan", - "parking_lot", - "paste", -] - -[[package]] -name = "datafusion-functions-window" -version = "44.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52229bca26b590b140900752226c829f15fc1a99840e1ca3ce1a9534690b82a8" -dependencies = [ - "datafusion-common", - "datafusion-doc", - "datafusion-expr", - "datafusion-functions-window-common", - "datafusion-macros", - "datafusion-physical-expr", - "datafusion-physical-expr-common", - "log", - "paste", -] - -[[package]] -name = "datafusion-functions-window-common" -version = "44.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "367befc303b64a668a10ae6988a064a9289e1999e71a7f8e526b6e14d6bdd9d6" -dependencies = [ - "datafusion-common", - "datafusion-physical-expr-common", -] - -[[package]] -name = "datafusion-macros" -version = "44.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5de3c8f386ea991696553afe241a326ecbc3c98a12c562867e4be754d3a060c" -dependencies = [ - "quote", - "syn 2.0.96", -] - -[[package]] -name = "datafusion-optimizer" -version = "44.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b520413906f755910422b016fb73884ae6e9e1b376de4f9584b6c0e031da75" -dependencies = [ - "arrow", - "chrono", - "datafusion-common", - "datafusion-expr", - "datafusion-physical-expr", - "indexmap 2.7.0", - "itertools 0.13.0", - "log", - "regex", - "regex-syntax 0.8.5", -] - -[[package]] -name = "datafusion-physical-expr" -version = "44.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acd6ddc378f6ad19af95ccd6790dec8f8e1264bc4c70e99ddc1830c1a1c78ccd" -dependencies = [ - "ahash", - "arrow", - "arrow-array", - "arrow-buffer", - "arrow-schema", - "datafusion-common", - "datafusion-expr", - "datafusion-expr-common", - "datafusion-functions-aggregate-common", - "datafusion-physical-expr-common", - "half", - "hashbrown 0.14.5", - "indexmap 2.7.0", - "itertools 0.13.0", - "log", - "paste", - "petgraph", -] - -[[package]] -name = "datafusion-physical-expr-common" -version = "44.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e6c05458eccd74b4c77ed6a1fe63d52434240711de7f6960034794dad1caf5" -dependencies = [ - "ahash", - "arrow", - "datafusion-common", - "datafusion-expr-common", - "hashbrown 0.14.5", - "itertools 0.13.0", -] - -[[package]] -name = "datafusion-physical-optimizer" -version = "44.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dc3a82190f49c37d377f31317e07ab5d7588b837adadba8ac367baad5dc2351" -dependencies = [ - "arrow", - "datafusion-common", - "datafusion-execution", - "datafusion-expr-common", - "datafusion-physical-expr", - "datafusion-physical-plan", - "itertools 0.13.0", - "log", -] - -[[package]] -name = "datafusion-physical-plan" -version = "44.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6608bc9844b4ddb5ed4e687d173e6c88700b1d0482f43894617d18a1fe75da" -dependencies = [ - "ahash", - "arrow", - "arrow-array", - "arrow-buffer", - "arrow-ord", - "arrow-schema", - "async-trait", - "chrono", - "datafusion-common", - "datafusion-common-runtime", - "datafusion-execution", - "datafusion-expr", - "datafusion-functions-window-common", - "datafusion-physical-expr", - "datafusion-physical-expr-common", - "futures", - "half", - "hashbrown 0.14.5", - "indexmap 2.7.0", - "itertools 0.13.0", - "log", - "parking_lot", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "datafusion-sql" -version = "44.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a884061c79b33d0c8e84a6f4f4be8bdc12c0f53f5af28ddf5d6d95ac0b15fdc" -dependencies = [ - "arrow", - "arrow-array", - "arrow-schema", - "bigdecimal", - "datafusion-common", - "datafusion-expr", - "indexmap 2.7.0", - "log", - "regex", - "sqlparser 0.53.0", -] - -[[package]] -name = "deepsize" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cdb987ec36f6bf7bfbea3f928b75590b736fc42af8e54d97592481351b2b96c" -dependencies = [ - "deepsize_derive", -] - -[[package]] -name = "deepsize_derive" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "990101d41f3bc8c1a45641024377ee284ecc338e5ecf3ea0f0e236d897c72796" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "der" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" -dependencies = [ - "const-oid", - "zeroize", -] - -[[package]] -name = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", - "serde", -] - -[[package]] -name = "derive_arbitrary" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.96", -] - -[[package]] -name = "derive_builder" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947" -dependencies = [ - "derive_builder_macro", -] - -[[package]] -name = "derive_builder_core" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 2.0.96", -] - -[[package]] -name = "derive_builder_macro" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" -dependencies = [ - "derive_builder_core", - "syn 2.0.96", -] - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "crypto-common", - "subtle", -] - -[[package]] -name = "dirs" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users", - "windows-sys 0.48.0", -] - -[[package]] -name = "displaydoc" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.96", -] - -[[package]] -name = "doc-comment" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" - -[[package]] -name = "downcast-rs" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" - -[[package]] -name = "dyn-clone" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" - -[[package]] -name = "dyn-stack" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56e53799688f5632f364f8fb387488dd05db9fe45db7011be066fc20e7027f8b" -dependencies = [ - "bytemuck", - "reborrow", -] - -[[package]] -name = "ecdsa" -version = "0.14.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" -dependencies = [ - "der", - "elliptic-curve", - "rfc6979", - "signature", -] - -[[package]] -name = "either" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" - -[[package]] -name = "elliptic-curve" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" -dependencies = [ - "base16ct", - "crypto-bigint 0.4.9", - "der", - "digest", - "ff", - "generic-array", - "group", - "pkcs8", - "rand_core", - "sec1", - "subtle", - "zeroize", -] - -[[package]] -name = "encode_unicode" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" - -[[package]] -name = "encoding_rs" -version = "0.8.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "enum-as-inner" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc" -dependencies = [ - "heck 0.5.0", - "proc-macro2", - "quote", - "syn 2.0.96", -] - -[[package]] -name = "enum_dispatch" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa18ce2bc66555b3218614519ac839ddb759a7d6720732f979ef8d13be147ecd" -dependencies = [ - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.96", -] - -[[package]] -name = "env_filter" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0" -dependencies = [ - "log", - "regex", -] - -[[package]] -name = "env_logger" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" -dependencies = [ - "humantime", - "is-terminal", - "log", - "regex", - "termcolor", -] - -[[package]] -name = "env_logger" -version = "0.11.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcaee3d8e3cfc3fd92428d477bc97fc29ec8716d180c0d74c643bb26166660e0" -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.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" -dependencies = [ - "libc", - "windows-sys 0.59.0", -] - -[[package]] -name = "error-chain" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" -dependencies = [ - "version_check", -] - -[[package]] -name = "esaxx-rs" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d817e038c30374a4bcb22f94d0a8a0e216958d4c3dcde369b1439fec4bdda6e6" -dependencies = [ - "cc", -] - -[[package]] -name = "ethnum" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b90ca2580b73ab6a1f724b76ca11ab632df820fd6040c336200d2c1df7b3c82c" - -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[package]] -name = "event-listener" -version = "4.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener" -version = "5.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener-strategy" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3e4e0dd3673c1139bf041f3008816d9cf2946bbfac2945c09e523b8d7b05b2" -dependencies = [ - "event-listener 5.4.0", - "pin-project-lite", -] - -[[package]] -name = "eventsource-stream" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74fef4569247a5f429d9156b9d0a2599914385dd189c539334c625d8099d90ab" -dependencies = [ - "futures-core", - "nom", - "pin-project-lite", -] - -[[package]] -name = "fallible-streaming-iterator" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" - -[[package]] -name = "fancy-regex" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "531e46835a22af56d1e3b66f04844bed63158bc094a628bec1d321d9b4c44bf2" -dependencies = [ - "bit-set", - "regex-automata 0.4.9", - "regex-syntax 0.8.5", -] - -[[package]] -name = "fast-float" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95765f67b4b18863968b4a1bd5bb576f732b29a4a28c7cd84c09fa3e2875f33c" - -[[package]] -name = "fastdivide" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9afc2bd4d5a73106dd53d10d73d3401c2f32730ba2c0b93ddb888a8983680471" - -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "fastrand" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" - -[[package]] -name = "ff" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" -dependencies = [ - "rand_core", - "subtle", -] - -[[package]] -name = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - -[[package]] -name = "flatbuffers" -version = "24.12.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f1baf0dbf96932ec9a3038d57900329c015b0bfb7b63d904f3bc27e2b02a096" -dependencies = [ - "bitflags 1.3.2", - "rustc_version", -] - -[[package]] -name = "flate2" -version = "1.0.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" -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 = "foldhash" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "foreign_vec" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee1b05cbd864bcaecbd3455d6d967862d446e4ebfc3c2e5e5b9841e53cba6673" - -[[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 = "fs4" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7e180ac76c23b45e767bd7ae9579bc0bb458618c4bc71835926e098e61d15f8" -dependencies = [ - "rustix 0.38.43", - "windows-sys 0.52.0", -] - -[[package]] -name = "fsst" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9de098cff2db523a8c066b07f818a3e5495067304f0d7298010f54e9d6acf7d" -dependencies = [ - "rand", -] - -[[package]] -name = "funty" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" - -[[package]] -name = "futures" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" - -[[package]] -name = "futures-executor" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" - -[[package]] -name = "futures-lite" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" -dependencies = [ - "fastrand 1.9.0", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] - -[[package]] -name = "futures-macro" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.96", -] - -[[package]] -name = "futures-sink" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" - -[[package]] -name = "futures-task" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" - -[[package]] -name = "futures-timer" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" - -[[package]] -name = "futures-util" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "gemm" -version = "0.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ab24cc62135b40090e31a76a9b2766a501979f3070fa27f689c27ec04377d32" -dependencies = [ - "dyn-stack", - "gemm-c32", - "gemm-c64", - "gemm-common", - "gemm-f16", - "gemm-f32", - "gemm-f64", - "num-complex", - "num-traits", - "paste", - "raw-cpuid 10.7.0", - "seq-macro", -] - -[[package]] -name = "gemm-c32" -version = "0.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9c030d0b983d1e34a546b86e08f600c11696fde16199f971cd46c12e67512c0" -dependencies = [ - "dyn-stack", - "gemm-common", - "num-complex", - "num-traits", - "paste", - "raw-cpuid 10.7.0", - "seq-macro", -] - -[[package]] -name = "gemm-c64" -version = "0.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbb5f2e79fefb9693d18e1066a557b4546cd334b226beadc68b11a8f9431852a" -dependencies = [ - "dyn-stack", - "gemm-common", - "num-complex", - "num-traits", - "paste", - "raw-cpuid 10.7.0", - "seq-macro", -] - -[[package]] -name = "gemm-common" -version = "0.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2e7ea062c987abcd8db95db917b4ffb4ecdfd0668471d8dc54734fdff2354e8" -dependencies = [ - "bytemuck", - "dyn-stack", - "half", - "num-complex", - "num-traits", - "once_cell", - "paste", - "pulp", - "raw-cpuid 10.7.0", - "rayon", - "seq-macro", - "sysctl", -] - -[[package]] -name = "gemm-f16" -version = "0.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ca4c06b9b11952071d317604acb332e924e817bd891bec8dfb494168c7cedd4" -dependencies = [ - "dyn-stack", - "gemm-common", - "gemm-f32", - "half", - "num-complex", - "num-traits", - "paste", - "raw-cpuid 10.7.0", - "rayon", - "seq-macro", -] - -[[package]] -name = "gemm-f32" -version = "0.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9a69f51aaefbd9cf12d18faf273d3e982d9d711f60775645ed5c8047b4ae113" -dependencies = [ - "dyn-stack", - "gemm-common", - "num-complex", - "num-traits", - "paste", - "raw-cpuid 10.7.0", - "seq-macro", -] - -[[package]] -name = "gemm-f64" -version = "0.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa397a48544fadf0b81ec8741e5c0fba0043008113f71f2034def1935645d2b0" -dependencies = [ - "dyn-stack", - "gemm-common", - "num-complex", - "num-traits", - "paste", - "raw-cpuid 10.7.0", - "seq-macro", -] - -[[package]] -name = "generator" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc6bd114ceda131d3b1d665eba35788690ad37f5916457286b32ab6fd3c438dd" -dependencies = [ - "cfg-if", - "libc", - "log", - "rustversion", - "windows 0.58.0", -] - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "getrandom" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "wasi", - "wasm-bindgen", -] - -[[package]] -name = "gimli" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" - -[[package]] -name = "glob" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" - -[[package]] -name = "group" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" -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.12", - "indexmap 2.7.0", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "h2" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e" -dependencies = [ - "atomic-waker", - "bytes", - "fnv", - "futures-core", - "futures-sink", - "http 1.2.0", - "indexmap 2.7.0", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "half" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" -dependencies = [ - "bytemuck", - "cfg-if", - "crunchy", - "num-traits", - "rand", - "rand_distr", -] - -[[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", - "rayon", -] - -[[package]] -name = "hashbrown" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" -dependencies = [ - "allocator-api2", - "equivalent", - "foldhash", -] - -[[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 = "hermit-abi" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "hf-hub" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b780635574b3d92f036890d8373433d6f9fc7abb320ee42a5c25897fc8ed732" -dependencies = [ - "dirs", - "indicatif", - "log", - "native-tls", - "rand", - "serde", - "serde_json", - "thiserror 1.0.69", - "ureq", -] - -[[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.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf" -dependencies = [ - "windows-sys 0.59.0", -] - -[[package]] -name = "htmlescape" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9025058dae765dee5070ec375f591e2ba14638c63feff74f13805a72e523163" - -[[package]] -name = "http" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" -dependencies = [ - "bytes", - "http 0.2.12", - "pin-project-lite", -] - -[[package]] -name = "http-body" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" -dependencies = [ - "bytes", - "http 1.2.0", -] - -[[package]] -name = "http-body-util" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" -dependencies = [ - "bytes", - "futures-util", - "http 1.2.0", - "http-body 1.0.1", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" - -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - -[[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.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.6", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2 0.5.8", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper" -version = "1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "256fb8d4bd6413123cc9d91832d78325c48ff41677595be797d90f42969beae0" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "h2 0.4.7", - "http 1.2.0", - "http-body 1.0.1", - "httparse", - "itoa", - "pin-project-lite", - "smallvec", - "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.12", - "hyper 0.14.32", - "log", - "rustls 0.21.12", - "rustls-native-certs 0.6.3", - "tokio", - "tokio-rustls 0.24.1", -] - -[[package]] -name = "hyper-rustls" -version = "0.27.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2" -dependencies = [ - "futures-util", - "http 1.2.0", - "hyper 1.5.2", - "hyper-util", - "rustls 0.23.21", - "rustls-native-certs 0.8.1", - "rustls-pki-types", - "tokio", - "tokio-rustls 0.26.1", - "tower-service", - "webpki-roots", -] - -[[package]] -name = "hyper-tls" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" -dependencies = [ - "bytes", - "http-body-util", - "hyper 1.5.2", - "hyper-util", - "native-tls", - "tokio", - "tokio-native-tls", - "tower-service", -] - -[[package]] -name = "hyper-util" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "http 1.2.0", - "http-body 1.0.1", - "hyper 1.5.2", - "pin-project-lite", - "socket2 0.5.8", - "tokio", - "tower-service", - "tracing", -] - -[[package]] -name = "hyperloglogplus" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "621debdf94dcac33e50475fdd76d34d5ea9c0362a834b9db08c3024696c1fbe3" -dependencies = [ - "serde", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" -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 = "icu_collections" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" -dependencies = [ - "displaydoc", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_locid" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" -dependencies = [ - "displaydoc", - "litemap", - "tinystr", - "writeable", - "zerovec", -] - -[[package]] -name = "icu_locid_transform" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_locid_transform_data", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_locid_transform_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" - -[[package]] -name = "icu_normalizer" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" -dependencies = [ - "displaydoc", - "icu_collections", - "icu_normalizer_data", - "icu_properties", - "icu_provider", - "smallvec", - "utf16_iter", - "utf8_iter", - "write16", - "zerovec", -] - -[[package]] -name = "icu_normalizer_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" - -[[package]] -name = "icu_properties" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" -dependencies = [ - "displaydoc", - "icu_collections", - "icu_locid_transform", - "icu_properties_data", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_properties_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" - -[[package]] -name = "icu_provider" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_provider_macros", - "stable_deref_trait", - "tinystr", - "writeable", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_provider_macros" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.96", -] - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "idna" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" -dependencies = [ - "idna_adapter", - "smallvec", - "utf8_iter", -] - -[[package]] -name = "idna_adapter" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" -dependencies = [ - "icu_normalizer", - "icu_properties", -] - -[[package]] -name = "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.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" -dependencies = [ - "equivalent", - "hashbrown 0.15.2", - "serde", -] - -[[package]] -name = "indicatif" -version = "0.17.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf675b85ed934d3c67b5c5469701eec7db22689d0a2139d856e0925fa28b281" -dependencies = [ - "console", - "number_prefix", - "portable-atomic", - "unicode-width", - "web-time", -] - -[[package]] -name = "indoc" -version = "2.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" - -[[package]] -name = "instant" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.9", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "ipnet" -version = "2.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" - -[[package]] -name = "is-terminal" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" -dependencies = [ - "hermit-abi 0.4.0", - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "is_terminal_polyfill" -version = "1.70.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" - -[[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 = "itertools" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" - -[[package]] -name = "itoap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9028f49264629065d057f340a86acb84867925865f73bbf8d47b4d149a7e88b8" - -[[package]] -name = "jni" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" -dependencies = [ - "cesu8", - "cfg-if", - "combine", - "jni-sys", - "log", - "thiserror 1.0.69", - "walkdir", - "windows-sys 0.45.0", -] - -[[package]] -name = "jni-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" - -[[package]] -name = "jobserver" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" -dependencies = [ - "libc", -] - -[[package]] -name = "js-sys" -version = "0.3.77" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" -dependencies = [ - "once_cell", - "wasm-bindgen", -] - -[[package]] -name = "lance" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e40ecb7cce0650475882e7664b4f71e4b9b98dd774dde79c10c63dea8a6b572" -dependencies = [ - "arrow", - "arrow-arith", - "arrow-array", - "arrow-buffer", - "arrow-ord", - "arrow-row", - "arrow-schema", - "arrow-select", - "async-recursion", - "async-trait", - "async_cell", - "aws-credential-types", - "aws-sdk-dynamodb", - "byteorder", - "bytes", - "chrono", - "dashmap 5.5.3", - "datafusion", - "datafusion-expr", - "datafusion-functions", - "datafusion-physical-expr", - "deepsize", - "futures", - "half", - "itertools 0.13.0", - "lance-arrow", - "lance-core", - "lance-datafusion", - "lance-encoding", - "lance-file", - "lance-index", - "lance-io", - "lance-linalg", - "lance-table", - "lazy_static", - "log", - "moka 0.12.10", - "object_store 0.10.2", - "permutation", - "pin-project", - "prost", - "prost-types", - "rand", - "roaring", - "serde", - "serde_json", - "snafu 0.7.5", - "tantivy", - "tempfile", - "tokio", - "tracing", - "url", - "uuid", -] - -[[package]] -name = "lance-arrow" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb03fcc2c113b11ade471cbc9668b04b47e91b870f4037938e08a1f329845728" -dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-cast", - "arrow-data", - "arrow-schema", - "arrow-select", - "bytes", - "getrandom", - "half", - "num-traits", - "rand", -] - -[[package]] -name = "lance-core" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17576fbec975bb5790d15a68d5ec2d25fee490bef1c769a16353f7c2b9080976" -dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-schema", - "async-trait", - "byteorder", - "bytes", - "chrono", - "datafusion-common", - "datafusion-sql", - "deepsize", - "futures", - "lance-arrow", - "lazy_static", - "libc", - "log", - "mock_instant", - "moka 0.12.10", - "num_cpus", - "object_store 0.10.2", - "pin-project", - "prost", - "rand", - "roaring", - "serde_json", - "snafu 0.7.5", - "tokio", - "tokio-stream", - "tokio-util", - "tracing", - "url", -] - -[[package]] -name = "lance-datafusion" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c29c3b1ff51057181407f4924cc1117e633c4485a83ae6b2cb4d2252cf2bdba" -dependencies = [ - "arrow", - "arrow-array", - "arrow-buffer", - "arrow-ord", - "arrow-schema", - "arrow-select", - "async-trait", - "datafusion", - "datafusion-common", - "datafusion-functions", - "datafusion-physical-expr", - "futures", - "lance-arrow", - "lance-core", - "lazy_static", - "log", - "prost", - "snafu 0.7.5", - "tokio", -] - -[[package]] -name = "lance-encoding" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d884be9fb234f7fcd105f7f26232b8fa6d1c3037f893033846bb7a2a89d3a870" -dependencies = [ - "arrayref", - "arrow", - "arrow-arith", - "arrow-array", - "arrow-buffer", - "arrow-cast", - "arrow-data", - "arrow-schema", - "arrow-select", - "bytemuck", - "byteorder", - "bytes", - "fsst", - "futures", - "hex", - "hyperloglogplus", - "itertools 0.13.0", - "lance-arrow", - "lance-core", - "lazy_static", - "log", - "num-traits", - "paste", - "prost", - "prost-build", - "prost-types", - "rand", - "seq-macro", - "snafu 0.7.5", - "tokio", - "tracing", - "zstd", -] - -[[package]] -name = "lance-file" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a440ab6b2b5d9da1b15794e0025a27fb8aa95e56adf80da27dacbf7597a57cea" -dependencies = [ - "arrow-arith", - "arrow-array", - "arrow-buffer", - "arrow-data", - "arrow-schema", - "arrow-select", - "async-recursion", - "async-trait", - "byteorder", - "bytes", - "datafusion-common", - "deepsize", - "futures", - "lance-arrow", - "lance-core", - "lance-encoding", - "lance-io", - "log", - "num-traits", - "object_store 0.10.2", - "prost", - "prost-build", - "prost-types", - "roaring", - "snafu 0.7.5", - "tempfile", - "tokio", - "tracing", -] - -[[package]] -name = "lance-index" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95f7fdf4c3edbc058a209626d89c0cdbed1d1a39fe6751ad4a4755800e5ab111" -dependencies = [ - "arrow", - "arrow-array", - "arrow-ord", - "arrow-schema", - "arrow-select", - "async-recursion", - "async-trait", - "bitvec", - "bytes", - "crossbeam-queue", - "datafusion", - "datafusion-common", - "datafusion-expr", - "datafusion-physical-expr", - "datafusion-sql", - "deepsize", - "dirs", - "futures", - "half", - "itertools 0.13.0", - "lance-arrow", - "lance-core", - "lance-datafusion", - "lance-encoding", - "lance-file", - "lance-io", - "lance-linalg", - "lance-table", - "lazy_static", - "log", - "moka 0.12.10", - "num-traits", - "object_store 0.10.2", - "prost", - "prost-build", - "rand", - "rayon", - "roaring", - "serde", - "serde_json", - "snafu 0.7.5", - "tantivy", - "tempfile", - "tokio", - "tracing", - "uuid", -] - -[[package]] -name = "lance-io" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53cb1e5b74dc397950a6414737bffbf24f7aaf750ad2acb51c29d9fc0ea659e4" -dependencies = [ - "arrow", - "arrow-arith", - "arrow-array", - "arrow-buffer", - "arrow-cast", - "arrow-data", - "arrow-schema", - "arrow-select", - "async-priority-channel", - "async-recursion", - "async-trait", - "aws-config", - "aws-credential-types", - "byteorder", - "bytes", - "chrono", - "deepsize", - "futures", - "lance-arrow", - "lance-core", - "lazy_static", - "log", - "object_store 0.10.2", - "path_abs", - "pin-project", - "prost", - "rand", - "shellexpand", - "snafu 0.7.5", - "tokio", - "tracing", - "url", -] - -[[package]] -name = "lance-linalg" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4552b323849ec600443b2364df58ee259cbf615a4d451b90526723275930c58d" -dependencies = [ - "arrow-array", - "arrow-ord", - "arrow-schema", - "bitvec", - "cc", - "deepsize", - "futures", - "half", - "lance-arrow", - "lance-core", - "lazy_static", - "log", - "num-traits", - "rand", - "rayon", - "tokio", - "tracing", -] - -[[package]] -name = "lance-table" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c0e89bad7547eecf4fe4446bbbba6c5389832c59ecb3e388f661aaac8eb8104" -dependencies = [ - "arrow", - "arrow-array", - "arrow-buffer", - "arrow-ipc", - "arrow-schema", - "async-trait", - "aws-credential-types", - "aws-sdk-dynamodb", - "byteorder", - "bytes", - "chrono", - "deepsize", - "futures", - "lance-arrow", - "lance-core", - "lance-file", - "lance-io", - "lazy_static", - "log", - "object_store 0.10.2", - "prost", - "prost-build", - "prost-types", - "rand", - "rangemap", - "roaring", - "serde", - "serde_json", - "snafu 0.7.5", - "tokio", - "tracing", - "url", - "uuid", -] - -[[package]] -name = "lance-testing" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4dff14ccab4356ec8020da2dfd65f588a9e4226c26de680e7dd26b2f49871b9" -dependencies = [ - "arrow-array", - "arrow-schema", - "lance-arrow", - "num-traits", - "rand", -] - -[[package]] -name = "lancedb" -version = "0.15.0-beta.0" -dependencies = [ - "arrow", - "arrow-array", - "arrow-cast", - "arrow-data", - "arrow-ipc", - "arrow-ord", - "arrow-schema", - "async-openai", - "async-trait", - "aws-config", - "aws-sdk-bedrockruntime", - "aws-sdk-dynamodb", - "aws-sdk-kms", - "aws-sdk-s3", - "aws-smithy-runtime", - "bytes", - "candle-core", - "candle-nn", - "candle-transformers", - "chrono", - "datafusion-common", - "datafusion-physical-plan", - "futures", - "half", - "hf-hub", - "http 1.2.0", - "http-body 1.0.1", - "lance", - "lance-datafusion", - "lance-encoding", - "lance-index", - "lance-io", - "lance-linalg", - "lance-table", - "lance-testing", - "lazy_static", - "log", - "moka 0.11.3", - "num-traits", - "object_store 0.10.2", - "pin-project", - "polars", - "polars-arrow", - "rand", - "random_word", - "regex", - "reqwest", - "serde", - "serde_json", - "serde_with", - "snafu 0.7.5", - "tempfile", - "tokenizers", - "tokio", - "url", - "uuid", - "walkdir", -] - -[[package]] -name = "lancedb-jni" -version = "0.10.0" -dependencies = [ - "arrow", - "arrow-schema", - "jni", - "lance", - "lancedb", - "lazy_static", - "serde", - "serde_json", - "snafu 0.7.5", - "tokio", -] - -[[package]] -name = "lancedb-node" -version = "0.15.0-beta.0" -dependencies = [ - "arrow-array", - "arrow-ipc", - "arrow-schema", - "async-trait", - "chrono", - "conv", - "env_logger 0.11.6", - "futures", - "half", - "lance", - "lance-index", - "lance-linalg", - "lancedb", - "lzma-sys", - "neon", - "object_store 0.10.2", - "once_cell", - "snafu 0.7.5", - "tokio", -] - -[[package]] -name = "lancedb-nodejs" -version = "0.15.0-beta.0" -dependencies = [ - "arrow-array", - "arrow-ipc", - "arrow-schema", - "async-trait", - "env_logger 0.10.2", - "futures", - "lancedb", - "log", - "lzma-sys", - "napi", - "napi-build", - "napi-derive", -] - -[[package]] -name = "lancedb-python" -version = "0.18.0" -dependencies = [ - "arrow", - "env_logger 0.10.2", - "futures", - "lancedb", - "pin-project", - "pyo3", - "pyo3-async-runtimes", - "pyo3-build-config 0.20.3", - "tokio", -] - -[[package]] -name = "lazy_static" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" - -[[package]] -name = "levenshtein_automata" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2cdeb66e45e9f36bfad5bbdb4d2384e70936afbee843c6f6543f0c551ebb25" - -[[package]] -name = "lexical-core" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b765c31809609075565a70b4b71402281283aeda7ecaf4818ac14a7b2ade8958" -dependencies = [ - "lexical-parse-float", - "lexical-parse-integer", - "lexical-util", - "lexical-write-float", - "lexical-write-integer", -] - -[[package]] -name = "lexical-parse-float" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de6f9cb01fb0b08060209a057c048fcbab8717b4c1ecd2eac66ebfe39a65b0f2" -dependencies = [ - "lexical-parse-integer", - "lexical-util", - "static_assertions", -] - -[[package]] -name = "lexical-parse-integer" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72207aae22fc0a121ba7b6d479e42cbfea549af1479c3f3a4f12c70dd66df12e" -dependencies = [ - "lexical-util", - "static_assertions", -] - -[[package]] -name = "lexical-util" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a82e24bf537fd24c177ffbbdc6ebcc8d54732c35b50a3f28cc3f4e4c949a0b3" -dependencies = [ - "static_assertions", -] - -[[package]] -name = "lexical-write-float" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5afc668a27f460fb45a81a757b6bf2f43c2d7e30cb5a2dcd3abf294c78d62bd" -dependencies = [ - "lexical-util", - "lexical-write-integer", - "static_assertions", -] - -[[package]] -name = "lexical-write-integer" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "629ddff1a914a836fb245616a7888b62903aae58fa771e1d83943035efa0f978" -dependencies = [ - "lexical-util", - "static_assertions", -] - -[[package]] -name = "libc" -version = "0.2.169" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" - -[[package]] -name = "libloading" -version = "0.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "351a32417a12d5f7e82c368a66781e307834dae04c6ce0cd4456d52989229883" -dependencies = [ - "cfg-if", - "winapi", -] - -[[package]] -name = "libloading" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" -dependencies = [ - "cfg-if", - "windows-targets 0.52.6", -] - -[[package]] -name = "libm" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" - -[[package]] -name = "libredox" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" -dependencies = [ - "bitflags 2.7.0", - "libc", -] - -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "linux-raw-sys" -version = "0.4.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" - -[[package]] -name = "litemap" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" - -[[package]] -name = "lock_api" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f" - -[[package]] -name = "loom" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "419e0dc8046cb947daa77eb95ae174acfbddb7673b4151f56d1eed8e93fbfaca" -dependencies = [ - "cfg-if", - "generator", - "scoped-tls", - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "lru" -version = "0.12.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" -dependencies = [ - "hashbrown 0.15.2", -] - -[[package]] -name = "lz4" -version = "1.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a20b523e860d03443e98350ceaac5e71c6ba89aea7d960769ec3ce37f4de5af4" -dependencies = [ - "lz4-sys", -] - -[[package]] -name = "lz4-sys" -version = "1.11.1+lz4-1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bd8c0d6c6ed0cd30b3652886bb8711dc4bb01d637a68105a3d5158039b418e6" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "lz4_flex" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75761162ae2b0e580d7e7c390558127e5f01b4194debd6221fd8c207fc80e3f5" -dependencies = [ - "twox-hash", -] - -[[package]] -name = "lzma-sys" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - -[[package]] -name = "mach2" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" -dependencies = [ - "libc", -] - -[[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 = "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 = "md-5" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" -dependencies = [ - "cfg-if", - "digest", -] - -[[package]] -name = "measure_time" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbefd235b0aadd181626f281e1d684e116972988c14c264e42069d5e8a5775cc" -dependencies = [ - "instant", - "log", -] - -[[package]] -name = "memchr" -version = "2.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" - -[[package]] -name = "memmap2" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" -dependencies = [ - "libc", -] - -[[package]] -name = "memmap2" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" -dependencies = [ - "libc", - "stable_deref_trait", -] - -[[package]] -name = "memoffset" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" -dependencies = [ - "autocfg", -] - -[[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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" -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.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924" -dependencies = [ - "adler2", -] - -[[package]] -name = "mio" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" -dependencies = [ - "libc", - "wasi", - "windows-sys 0.52.0", -] - -[[package]] -name = "mock_instant" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9366861eb2a2c436c20b12c8dbec5f798cea6b47ad99216be0282942e2c81ea0" -dependencies = [ - "once_cell", -] - -[[package]] -name = "moka" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa6e72583bf6830c956235bff0d5afec8cf2952f579ebad18ae7821a917d950f" -dependencies = [ - "async-io", - "async-lock 2.8.0", - "crossbeam-channel", - "crossbeam-epoch", - "crossbeam-utils", - "futures-util", - "once_cell", - "parking_lot", - "quanta", - "rustc_version", - "scheduled-thread-pool", - "skeptic", - "smallvec", - "tagptr", - "thiserror 1.0.69", - "triomphe", - "uuid", -] - -[[package]] -name = "moka" -version = "0.12.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9321642ca94a4282428e6ea4af8cc2ca4eac48ac7a6a4ea8f33f76d0ce70926" -dependencies = [ - "async-lock 3.4.0", - "crossbeam-channel", - "crossbeam-epoch", - "crossbeam-utils", - "event-listener 5.4.0", - "futures-util", - "loom", - "parking_lot", - "portable-atomic", - "rustc_version", - "smallvec", - "tagptr", - "thiserror 1.0.69", - "uuid", -] - -[[package]] -name = "monostate" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d208407d7552cd041d8cdb69a1bc3303e029c598738177a3d87082004dc0e1e" -dependencies = [ - "monostate-impl", - "serde", -] - -[[package]] -name = "monostate-impl" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7ce64b975ed4f123575d11afd9491f2e37bbd5813fbfbc0f09ae1fbddea74e0" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.96", -] - -[[package]] -name = "multimap" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03" - -[[package]] -name = "multiversion" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4851161a11d3ad0bf9402d90ffc3967bf231768bfd7aeb61755ad06dbf1a142" -dependencies = [ - "multiversion-macros", - "target-features", -] - -[[package]] -name = "multiversion-macros" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79a74ddee9e0c27d2578323c13905793e91622148f138ba29738f9dddb835e90" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "target-features", -] - -[[package]] -name = "murmurhash32" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2195bf6aa996a481483b29d62a7663eed3fe39600c460e323f8ff41e90bdd89b" - -[[package]] -name = "napi" -version = "2.16.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "214f07a80874bb96a8433b3cdfc84980d56c7b02e1a0d7ba4ba0db5cef785e2b" -dependencies = [ - "bitflags 2.7.0", - "ctor", - "napi-derive", - "napi-sys", - "once_cell", - "tokio", -] - -[[package]] -name = "napi-build" -version = "2.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db836caddef23662b94e16bf1f26c40eceb09d6aee5d5b06a7ac199320b69b19" - -[[package]] -name = "napi-derive" -version = "2.16.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cbe2585d8ac223f7d34f13701434b9d5f4eb9c332cccce8dee57ea18ab8ab0c" -dependencies = [ - "cfg-if", - "convert_case", - "napi-derive-backend", - "proc-macro2", - "quote", - "syn 2.0.96", -] - -[[package]] -name = "napi-derive-backend" -version = "1.0.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1639aaa9eeb76e91c6ae66da8ce3e89e921cd3885e99ec85f4abacae72fc91bf" -dependencies = [ - "convert_case", - "once_cell", - "proc-macro2", - "quote", - "regex", - "semver 1.0.24", - "syn 2.0.96", -] - -[[package]] -name = "napi-sys" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427802e8ec3a734331fec1035594a210ce1ff4dc5bc1950530920ab717964ea3" -dependencies = [ - "libloading 0.8.6", -] - -[[package]] -name = "native-tls" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" -dependencies = [ - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework 2.11.1", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "neon" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28e15415261d880aed48122e917a45e87bb82cf0260bb6db48bbab44b7464373" -dependencies = [ - "neon-build", - "neon-macros", - "neon-runtime", - "semver 0.9.0", - "smallvec", -] - -[[package]] -name = "neon-build" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bac98a702e71804af3dacfde41edde4a16076a7bbe889ae61e56e18c5b1c811" - -[[package]] -name = "neon-macros" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7288eac8b54af7913c60e0eb0e2a7683020dffa342ab3fd15e28f035ba897cf" -dependencies = [ - "quote", - "syn 1.0.109", - "syn-mid", -] - -[[package]] -name = "neon-runtime" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4676720fa8bb32c64c3d9f49c47a47289239ec46b4bdb66d0913cc512cb0daca" -dependencies = [ - "cfg-if", - "libloading 0.6.7", - "smallvec", -] - -[[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 = "now" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d89e9874397a1f0a52fc1f197a8effd9735223cb2390e9dcc83ac6cd02923d0" -dependencies = [ - "chrono", -] - -[[package]] -name = "ntapi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" -dependencies = [ - "winapi", -] - -[[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" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" -dependencies = [ - "num-bigint", - "num-complex", - "num-integer", - "num-iter", - "num-rational", - "num-traits", -] - -[[package]] -name = "num-bigint" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" -dependencies = [ - "num-integer", - "num-traits", -] - -[[package]] -name = "num-complex" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" -dependencies = [ - "bytemuck", - "num-traits", -] - -[[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.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" -dependencies = [ - "num-bigint", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -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.9", - "libc", -] - -[[package]] -name = "num_enum" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" -dependencies = [ - "num_enum_derive", -] - -[[package]] -name = "num_enum_derive" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 2.0.96", -] - -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - -[[package]] -name = "object" -version = "0.36.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" -dependencies = [ - "memchr", -] - -[[package]] -name = "object_store" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6da452820c715ce78221e8202ccc599b4a52f3e1eb3eedb487b680c81a8e3f3" -dependencies = [ - "async-trait", - "base64 0.22.1", - "bytes", - "chrono", - "futures", - "humantime", - "hyper 1.5.2", - "itertools 0.13.0", - "md-5", - "parking_lot", - "percent-encoding", - "quick-xml", - "rand", - "reqwest", - "ring", - "rustls-pemfile 2.2.0", - "serde", - "serde_json", - "snafu 0.7.5", - "tokio", - "tracing", - "url", - "walkdir", -] - -[[package]] -name = "object_store" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cfccb68961a56facde1163f9319e0d15743352344e7808a11795fb99698dcaf" -dependencies = [ - "async-trait", - "bytes", - "chrono", - "futures", - "humantime", - "itertools 0.13.0", - "parking_lot", - "percent-encoding", - "snafu 0.8.5", - "tokio", - "tracing", - "url", - "walkdir", -] - -[[package]] -name = "once_cell" -version = "1.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" - -[[package]] -name = "oneshot" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e296cf87e61c9cfc1a61c3c63a0f7f286ed4554e0e22be84e8a38e1d264a2a29" - -[[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 = "openssl" -version = "0.10.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" -dependencies = [ - "bitflags 2.7.0", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.96", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-sys" -version = "0.9.104" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - -[[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 = "ownedbytes" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3a059efb063b8f425b948e042e6b9bd85edfe60e913630ed727b23e2dfcc558" -dependencies = [ - "stable_deref_trait", -] - -[[package]] -name = "p256" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" -dependencies = [ - "ecdsa", - "elliptic-curve", - "sha2", -] - -[[package]] -name = "parking" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" - -[[package]] -name = "parking_lot" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets 0.52.6", -] - -[[package]] -name = "parquet-format-safe" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1131c54b167dd4e4799ce762e1ab01549ebb94d5bdd13e6ec1b467491c378e1f" - -[[package]] -name = "parse-zoneinfo" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f2a05b18d44e2957b88f96ba460715e295bc1d7510468a2f3d3b44535d26c24" -dependencies = [ - "regex", -] - -[[package]] -name = "paste" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" - -[[package]] -name = "path_abs" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ef02f6342ac01d8a93b65f96db53fe68a92a15f41144f97fb00a9e669633c3" -dependencies = [ - "serde", - "serde_derive", - "std_prelude", - "stfu8", -] - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "permutation" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df202b0b0f5b8e389955afd5f27b007b00fb948162953f1db9c70d2c7e3157d7" - -[[package]] -name = "petgraph" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" -dependencies = [ - "fixedbitset", - "indexmap 2.7.0", -] - -[[package]] -name = "phf" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078" -dependencies = [ - "phf_shared", -] - -[[package]] -name = "phf_codegen" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a" -dependencies = [ - "phf_generator", - "phf_shared", -] - -[[package]] -name = "phf_generator" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" -dependencies = [ - "phf_shared", - "rand", -] - -[[package]] -name = "phf_shared" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pin-project" -version = "1.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e2ec53ad785f4d35dac0adea7f7dc6f1bb277ad84a680c7afefeae05d1f5916" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d56a66c0c55993aa927429d0f8a0abfd74f084e4d9c192cffed01e418d83eefb" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.96", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkcs8" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" -dependencies = [ - "der", - "spki", -] - -[[package]] -name = "pkg-config" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" - -[[package]] -name = "planus" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc1691dd09e82f428ce8d6310bd6d5da2557c82ff17694d2a32cad7242aea89f" -dependencies = [ - "array-init-cursor", -] - -[[package]] -name = "polars" -version = "0.39.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea21b858b16b9c0e17a12db2800d11aa5b4bd182be6b3022eb537bbfc1f2db5" -dependencies = [ - "getrandom", - "polars-arrow", - "polars-core", - "polars-error", - "polars-io", - "polars-lazy", - "polars-ops", - "polars-parquet", - "polars-sql", - "polars-time", - "polars-utils", - "version_check", -] - -[[package]] -name = "polars-arrow" -version = "0.39.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "725b09f2b5ef31279b66e27bbab63c58d49d8f6696b66b1f46c7eaab95e80f75" -dependencies = [ - "ahash", - "atoi", - "atoi_simd", - "bytemuck", - "chrono", - "chrono-tz 0.8.6", - "dyn-clone", - "either", - "ethnum", - "fast-float", - "foreign_vec", - "getrandom", - "hashbrown 0.14.5", - "itoa", - "itoap", - "lz4", - "multiversion", - "num-traits", - "polars-arrow-format", - "polars-error", - "polars-utils", - "ryu", - "simdutf8", - "streaming-iterator", - "strength_reduce", - "version_check", - "zstd", -] - -[[package]] -name = "polars-arrow-format" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b0ef2474af9396b19025b189d96e992311e6a47f90c53cd998b36c4c64b84c" -dependencies = [ - "planus", - "serde", -] - -[[package]] -name = "polars-compute" -version = "0.39.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a796945b14b14fbb79b91ef0406e6fddca2be636e889f81ea5d6ee7d36efb4fe" -dependencies = [ - "bytemuck", - "either", - "num-traits", - "polars-arrow", - "polars-error", - "polars-utils", - "strength_reduce", - "version_check", -] - -[[package]] -name = "polars-core" -version = "0.39.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "465f70d3e96b6d0b1a43c358ba451286b8c8bd56696feff020d65702aa33e35c" -dependencies = [ - "ahash", - "bitflags 2.7.0", - "bytemuck", - "chrono", - "chrono-tz 0.8.6", - "comfy-table", - "either", - "hashbrown 0.14.5", - "indexmap 2.7.0", - "num-traits", - "once_cell", - "polars-arrow", - "polars-compute", - "polars-error", - "polars-row", - "polars-utils", - "rand", - "rand_distr", - "rayon", - "regex", - "smartstring", - "thiserror 1.0.69", - "version_check", - "xxhash-rust", -] - -[[package]] -name = "polars-error" -version = "0.39.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5224d5d05e6b8a6f78b75951ae1b5f82c8ab1979e11ffaf5fd41941e3d5b0757" -dependencies = [ - "polars-arrow-format", - "regex", - "simdutf8", - "thiserror 1.0.69", -] - -[[package]] -name = "polars-io" -version = "0.39.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2c8589e418cbe4a48228d64b2a8a40284a82ec3c98817c0c2bcc0267701338b" -dependencies = [ - "ahash", - "atoi_simd", - "bytes", - "chrono", - "fast-float", - "home", - "itoa", - "memchr", - "memmap2 0.7.1", - "num-traits", - "once_cell", - "percent-encoding", - "polars-arrow", - "polars-core", - "polars-error", - "polars-time", - "polars-utils", - "rayon", - "regex", - "ryu", - "simdutf8", - "smartstring", -] - -[[package]] -name = "polars-lazy" -version = "0.39.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2632b1af668e2058d5f8f916d8fbde3cac63d03ae29a705f598e41dcfeb7f" -dependencies = [ - "ahash", - "bitflags 2.7.0", - "glob", - "once_cell", - "polars-arrow", - "polars-core", - "polars-io", - "polars-ops", - "polars-pipe", - "polars-plan", - "polars-time", - "polars-utils", - "rayon", - "smartstring", - "version_check", -] - -[[package]] -name = "polars-ops" -version = "0.39.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efdbdb4d9a92109bc2e0ce8e17af5ae8ab643bb5b7ee9d1d74f0aeffd1fbc95f" -dependencies = [ - "ahash", - "argminmax", - "base64 0.21.7", - "bytemuck", - "chrono", - "chrono-tz 0.8.6", - "either", - "hashbrown 0.14.5", - "hex", - "indexmap 2.7.0", - "memchr", - "num-traits", - "polars-arrow", - "polars-compute", - "polars-core", - "polars-error", - "polars-utils", - "rayon", - "regex", - "smartstring", - "unicode-reverse", - "version_check", -] - -[[package]] -name = "polars-parquet" -version = "0.39.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b421d2196f786fdfe162db614c8485f8308fe41575d4de634a39bbe460d1eb6a" -dependencies = [ - "ahash", - "base64 0.21.7", - "ethnum", - "num-traits", - "parquet-format-safe", - "polars-arrow", - "polars-error", - "polars-utils", - "seq-macro", - "simdutf8", - "streaming-decompression", -] - -[[package]] -name = "polars-pipe" -version = "0.39.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48700f1d5bd56a15451e581f465c09541492750360f18637b196f995470a015c" -dependencies = [ - "crossbeam-channel", - "crossbeam-queue", - "enum_dispatch", - "hashbrown 0.14.5", - "num-traits", - "polars-arrow", - "polars-compute", - "polars-core", - "polars-io", - "polars-ops", - "polars-plan", - "polars-row", - "polars-utils", - "rayon", - "smartstring", - "uuid", - "version_check", -] - -[[package]] -name = "polars-plan" -version = "0.39.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fb8e2302e20c44defd5be8cad9c96e75face63c3a5f609aced8c4ec3b3ac97d" -dependencies = [ - "ahash", - "bytemuck", - "chrono-tz 0.8.6", - "hashbrown 0.14.5", - "once_cell", - "percent-encoding", - "polars-arrow", - "polars-core", - "polars-io", - "polars-ops", - "polars-time", - "polars-utils", - "rayon", - "recursive", - "regex", - "smartstring", - "strum_macros 0.25.3", - "version_check", -] - -[[package]] -name = "polars-row" -version = "0.39.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a515bdc68c2ae3702e3de70d89601f3b71ca8137e282a226dddb53ee4bacfa2e" -dependencies = [ - "bytemuck", - "polars-arrow", - "polars-error", - "polars-utils", -] - -[[package]] -name = "polars-sql" -version = "0.39.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4bb7cc1c04c3023d1953b2f1dec50515e8fd8169a5a2bf4967b3b082232db7" -dependencies = [ - "hex", - "polars-arrow", - "polars-core", - "polars-error", - "polars-lazy", - "polars-plan", - "rand", - "serde", - "serde_json", - "sqlparser 0.39.0", -] - -[[package]] -name = "polars-time" -version = "0.39.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efc18e3ad92eec55db89d88f16c22d436559ba7030cf76f86f6ed7a754b673f1" -dependencies = [ - "atoi", - "chrono", - "chrono-tz 0.8.6", - "now", - "once_cell", - "polars-arrow", - "polars-core", - "polars-error", - "polars-ops", - "polars-utils", - "regex", - "smartstring", -] - -[[package]] -name = "polars-utils" -version = "0.39.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c760b6c698cfe2fbbbd93d6cfb408db14ececfe1d92445dae2229ce1b5b21ae8" -dependencies = [ - "ahash", - "bytemuck", - "hashbrown 0.14.5", - "indexmap 2.7.0", - "num-traits", - "once_cell", - "polars-error", - "raw-cpuid 11.3.0", - "rayon", - "smartstring", - "stacker", - "sysinfo", - "version_check", -] - -[[package]] -name = "polling" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" -dependencies = [ - "autocfg", - "bitflags 1.3.2", - "cfg-if", - "concurrent-queue", - "libc", - "log", - "pin-project-lite", - "windows-sys 0.48.0", -] - -[[package]] -name = "portable-atomic" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6" - -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - -[[package]] -name = "ppv-lite86" -version = "0.2.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" -dependencies = [ - "zerocopy", -] - -[[package]] -name = "prettyplease" -version = "0.2.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6924ced06e1f7dfe3fa48d57b9f74f55d8915f5036121bef647ef4b204895fac" -dependencies = [ - "proc-macro2", - "syn 2.0.96", -] - -[[package]] -name = "proc-macro-crate" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" -dependencies = [ - "toml_edit", -] - -[[package]] -name = "proc-macro2" -version = "1.0.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "prost" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c0fef6c4230e4ccf618a35c59d7ede15dea37de8427500f50aff708806e42ec" -dependencies = [ - "bytes", - "prost-derive", -] - -[[package]] -name = "prost-build" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f3e5beed80eb580c68e2c600937ac2c4eedabdfd5ef1e5b7ea4f3fba84497b" -dependencies = [ - "heck 0.5.0", - "itertools 0.13.0", - "log", - "multimap", - "once_cell", - "petgraph", - "prettyplease", - "prost", - "prost-types", - "regex", - "syn 2.0.96", - "tempfile", -] - -[[package]] -name = "prost-derive" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "157c5a9d7ea5c2ed2d9fb8f495b64759f7816c7eaea54ba3978f0d63000162e3" -dependencies = [ - "anyhow", - "itertools 0.13.0", - "proc-macro2", - "quote", - "syn 2.0.96", -] - -[[package]] -name = "prost-types" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2f1e56baa61e93533aebc21af4d2134b70f66275e0fcdf3cbe43d77ff7e8fc" -dependencies = [ - "prost", -] - -[[package]] -name = "psm" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "200b9ff220857e53e184257720a14553b2f4aa02577d2ed9842d45d4b9654810" -dependencies = [ - "cc", -] - -[[package]] -name = "pulldown-cmark" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b" -dependencies = [ - "bitflags 2.7.0", - "memchr", - "unicase", -] - -[[package]] -name = "pulp" -version = "0.18.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0a01a0dc67cf4558d279f0c25b0962bd08fc6dec0137699eae304103e882fe6" -dependencies = [ - "bytemuck", - "libm", - "num-complex", - "reborrow", -] - -[[package]] -name = "pyo3" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f402062616ab18202ae8319da13fa4279883a2b8a9d9f83f20dbade813ce1884" -dependencies = [ - "cfg-if", - "indoc", - "libc", - "memoffset", - "once_cell", - "portable-atomic", - "pyo3-build-config 0.22.6", - "pyo3-ffi", - "pyo3-macros", - "unindent", -] - -[[package]] -name = "pyo3-async-runtimes" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2529f0be73ffd2be0cc43c013a640796558aa12d7ca0aab5cc14f375b4733031" -dependencies = [ - "futures", - "once_cell", - "pin-project-lite", - "pyo3", - "pyo3-async-runtimes-macros", - "tokio", -] - -[[package]] -name = "pyo3-async-runtimes-macros" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22c26fd8e9fc19f53f0c1e00bf61471de6789f7eb263056f7f944a9cceb5823e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.96", -] - -[[package]] -name = "pyo3-build-config" -version = "0.20.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7" -dependencies = [ - "once_cell", - "target-lexicon", -] - -[[package]] -name = "pyo3-build-config" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b14b5775b5ff446dd1056212d778012cbe8a0fbffd368029fd9e25b514479c38" -dependencies = [ - "once_cell", - "target-lexicon", -] - -[[package]] -name = "pyo3-ffi" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ab5bcf04a2cdcbb50c7d6105de943f543f9ed92af55818fd17b660390fc8636" -dependencies = [ - "libc", - "pyo3-build-config 0.22.6", -] - -[[package]] -name = "pyo3-macros" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fd24d897903a9e6d80b968368a34e1525aeb719d568dba8b3d4bfa5dc67d453" -dependencies = [ - "proc-macro2", - "pyo3-macros-backend", - "quote", - "syn 2.0.96", -] - -[[package]] -name = "pyo3-macros-backend" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36c011a03ba1e50152b4b394b479826cad97e7a21eb52df179cd91ac411cbfbe" -dependencies = [ - "heck 0.5.0", - "proc-macro2", - "pyo3-build-config 0.22.6", - "quote", - "syn 2.0.96", -] - -[[package]] -name = "quanta" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17e662a7a8291a865152364c20c7abc5e60486ab2001e8ec10b24862de0b9ab" -dependencies = [ - "crossbeam-utils", - "libc", - "mach2", - "once_cell", - "raw-cpuid 10.7.0", - "wasi", - "web-sys", - "winapi", -] - -[[package]] -name = "quick-xml" -version = "0.36.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe" -dependencies = [ - "memchr", - "serde", -] - -[[package]] -name = "quinn" -version = "0.11.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef" -dependencies = [ - "bytes", - "pin-project-lite", - "quinn-proto", - "quinn-udp", - "rustc-hash 2.1.0", - "rustls 0.23.21", - "socket2 0.5.8", - "thiserror 2.0.11", - "tokio", - "tracing", -] - -[[package]] -name = "quinn-proto" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d" -dependencies = [ - "bytes", - "getrandom", - "rand", - "ring", - "rustc-hash 2.1.0", - "rustls 0.23.21", - "rustls-pki-types", - "slab", - "thiserror 2.0.11", - "tinyvec", - "tracing", - "web-time", -] - -[[package]] -name = "quinn-udp" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c40286217b4ba3a71d644d752e6a0b71f13f1b6a2c5311acfcbe0c2418ed904" -dependencies = [ - "cfg_aliases", - "libc", - "once_cell", - "socket2 0.5.8", - "tracing", - "windows-sys 0.59.0", -] - -[[package]] -name = "quote" -version = "1.0.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "radium" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rand_distr" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" -dependencies = [ - "num-traits", - "rand", -] - -[[package]] -name = "random_word" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07eed67a16dde2cc3c7f65c072acd8d5b2e53d4aab95067c320db851c7651f29" -dependencies = [ - "ahash", - "brotli", - "once_cell", - "paste", - "rand", - "unicase", -] - -[[package]] -name = "rangemap" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684" - -[[package]] -name = "raw-cpuid" -version = "10.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "raw-cpuid" -version = "11.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6928fa44c097620b706542d428957635951bade7143269085389d42c8a4927e" -dependencies = [ - "bitflags 2.7.0", -] - -[[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-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 = "reborrow" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03251193000f4bd3b042892be858ee50e8b3719f2b08e5833ac4353724632430" - -[[package]] -name = "recursive" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0786a43debb760f491b1bc0269fe5e84155353c67482b9e60d0cfb596054b43e" -dependencies = [ - "recursive-proc-macro-impl", - "stacker", -] - -[[package]] -name = "recursive-proc-macro-impl" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76009fbe0614077fc1a2ce255e3a1881a2e3a3527097d5dc6d8212c585e7e38b" -dependencies = [ - "quote", - "syn 2.0.96", -] - -[[package]] -name = "redox_syscall" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" -dependencies = [ - "bitflags 2.7.0", -] - -[[package]] -name = "redox_users" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" -dependencies = [ - "getrandom", - "libredox", - "thiserror 1.0.69", -] - -[[package]] -name = "regex" -version = "1.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata 0.4.9", - "regex-syntax 0.8.5", -] - -[[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.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.8.5", -] - -[[package]] -name = "regex-lite" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a" - -[[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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" - -[[package]] -name = "reqwest" -version = "0.12.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da" -dependencies = [ - "async-compression", - "base64 0.22.1", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2 0.4.7", - "http 1.2.0", - "http-body 1.0.1", - "http-body-util", - "hyper 1.5.2", - "hyper-rustls 0.27.5", - "hyper-tls", - "hyper-util", - "ipnet", - "js-sys", - "log", - "mime", - "mime_guess", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "quinn", - "rustls 0.23.21", - "rustls-native-certs 0.8.1", - "rustls-pemfile 2.2.0", - "rustls-pki-types", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "system-configuration", - "tokio", - "tokio-native-tls", - "tokio-rustls 0.26.1", - "tokio-util", - "tower", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-streams", - "web-sys", - "webpki-roots", - "windows-registry", -] - -[[package]] -name = "reqwest-eventsource" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "632c55746dbb44275691640e7b40c907c16a2dc1a5842aa98aaec90da6ec6bde" -dependencies = [ - "eventsource-stream", - "futures-core", - "futures-timer", - "mime", - "nom", - "pin-project-lite", - "reqwest", - "thiserror 1.0.69", -] - -[[package]] -name = "rfc6979" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" -dependencies = [ - "crypto-bigint 0.4.9", - "hmac", - "zeroize", -] - -[[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 = "roaring" -version = "0.10.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41589aba99537475bf697f2118357cad1c31590c5a1b9f6d9fc4ad6d07503661" -dependencies = [ - "bytemuck", - "byteorder", -] - -[[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-demangle" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustc-hash" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497" - -[[package]] -name = "rustc_version" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" -dependencies = [ - "semver 1.0.24", -] - -[[package]] -name = "rustix" -version = "0.37.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "519165d378b97752ca44bbe15047d5d3409e875f39327546b42ac81d7e18c1b6" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustix" -version = "0.38.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a78891ee6bf2340288408954ac787aa063d8e8817e9f53abb37c695c6d834ef6" -dependencies = [ - "bitflags 2.7.0", - "errno", - "libc", - "linux-raw-sys 0.4.15", - "windows-sys 0.59.0", -] - -[[package]] -name = "rustls" -version = "0.21.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" -dependencies = [ - "log", - "ring", - "rustls-webpki 0.101.7", - "sct", -] - -[[package]] -name = "rustls" -version = "0.23.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f287924602bf649d949c63dc8ac8b235fa5387d394020705b80c4eb597ce5b8" -dependencies = [ - "log", - "once_cell", - "ring", - "rustls-pki-types", - "rustls-webpki 0.102.8", - "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 2.11.1", -] - -[[package]] -name = "rustls-native-certs" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcff2dd52b58a8d98a70243663a0d234c4e2b79235637849d15913394a247d3" -dependencies = [ - "openssl-probe", - "rustls-pki-types", - "schannel", - "security-framework 3.2.0", -] - -[[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.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" -dependencies = [ - "rustls-pki-types", -] - -[[package]] -name = "rustls-pki-types" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37" -dependencies = [ - "web-time", -] - -[[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.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" -dependencies = [ - "ring", - "rustls-pki-types", - "untrusted", -] - -[[package]] -name = "rustversion" -version = "1.0.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4" - -[[package]] -name = "ryu" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" - -[[package]] -name = "safetensors" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44560c11236a6130a46ce36c836a62936dc81ebf8c36a37947423571be0e55b6" -dependencies = [ - "serde", - "serde_json", -] - -[[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 = "schannel" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" -dependencies = [ - "windows-sys 0.59.0", -] - -[[package]] -name = "scheduled-thread-pool" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cbc66816425a074528352f5789333ecff06ca41b36b0b0efdfbb29edc391a19" -dependencies = [ - "parking_lot", -] - -[[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 = "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.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" -dependencies = [ - "base16ct", - "der", - "generic-array", - "pkcs8", - "subtle", - "zeroize", -] - -[[package]] -name = "secrecy" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bd1c54ea06cfd2f6b63219704de0b9b4f72dcc2b8fdef820be6cd799780e91e" -dependencies = [ - "serde", - "zeroize", -] - -[[package]] -name = "security-framework" -version = "2.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" -dependencies = [ - "bitflags 2.7.0", - "core-foundation 0.9.4", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316" -dependencies = [ - "bitflags 2.7.0", - "core-foundation 0.10.0", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32" -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.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba" -dependencies = [ - "serde", -] - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - -[[package]] -name = "seq-macro" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" - -[[package]] -name = "serde" -version = "1.0.217" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.217" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.96", -] - -[[package]] -name = "serde_json" -version = "1.0.135" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9" -dependencies = [ - "itoa", - "memchr", - "ryu", - "serde", -] - -[[package]] -name = "serde_plain" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1fc6db65a611022b23a0dec6975d63fb80a302cb3388835ff02c097258d50" -dependencies = [ - "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_with" -version = "3.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa" -dependencies = [ - "base64 0.22.1", - "chrono", - "hex", - "indexmap 1.9.3", - "indexmap 2.7.0", - "serde", - "serde_derive", - "serde_json", - "serde_with_macros", - "time", -] - -[[package]] -name = "serde_with_macros" -version = "3.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 2.0.96", -] - -[[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "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 = "shellexpand" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da03fa3b94cc19e3ebfc88c4229c49d8f08cdbd1228870a45f0ffdf84988e14b" -dependencies = [ - "dirs", -] - -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[package]] -name = "signal-hook-registry" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" -dependencies = [ - "libc", -] - -[[package]] -name = "signature" -version = "1.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" -dependencies = [ - "digest", - "rand_core", -] - -[[package]] -name = "simdutf8" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" - -[[package]] -name = "siphasher" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" - -[[package]] -name = "skeptic" -version = "0.13.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16d23b015676c90a0f01c197bfdc786c20342c73a0afdda9025adb0bc42940a8" -dependencies = [ - "bytecount", - "cargo_metadata", - "error-chain", - "glob", - "pulldown-cmark", - "tempfile", - "walkdir", -] - -[[package]] -name = "sketches-ddsketch" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85636c14b73d81f541e525f585c0a2109e6744e1565b5c1668e31c70c10ed65c" -dependencies = [ - "serde", -] - -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - -[[package]] -name = "smartstring" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29" -dependencies = [ - "autocfg", - "static_assertions", - "version_check", -] - -[[package]] -name = "snafu" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4de37ad025c587a29e8f3f5605c00f70b98715ef90b9061a815b9e59e9042d6" -dependencies = [ - "doc-comment", - "snafu-derive 0.7.5", -] - -[[package]] -name = "snafu" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "223891c85e2a29c3fe8fb900c1fae5e69c2e42415e3177752e8718475efa5019" -dependencies = [ - "snafu-derive 0.8.5", -] - -[[package]] -name = "snafu-derive" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "snafu-derive" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c3c6b7927ffe7ecaa769ee0e3994da3b8cafc8f444578982c83ecb161af917" -dependencies = [ - "heck 0.5.0", - "proc-macro2", - "quote", - "syn 2.0.96", -] - -[[package]] -name = "socket2" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "socket2" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" - -[[package]] -name = "spki" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" -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", - "serde", - "unicode-segmentation", -] - -[[package]] -name = "sqlparser" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "743b4dc2cbde11890ccb254a8fc9d537fa41b36da00de2a1c5e9848c9bc42bd7" -dependencies = [ - "log", -] - -[[package]] -name = "sqlparser" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05a528114c392209b3264855ad491fcce534b94a38771b0a0b97a79379275ce8" -dependencies = [ - "log", - "sqlparser_derive", -] - -[[package]] -name = "sqlparser_derive" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da5fc6819faabb412da764b99d3b713bb55083c11e7e0c00144d386cd6a1939c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.96", -] - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "stacker" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "799c883d55abdb5e98af1a7b3f23b9b6de8ecada0ecac058672d7635eb48ca7b" -dependencies = [ - "cc", - "cfg-if", - "libc", - "psm", - "windows-sys 0.59.0", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "std_prelude" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8207e78455ffdf55661170876f88daf85356e4edd54e0a3dbc79586ca1e50cbe" - -[[package]] -name = "stfu8" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51f1e89f093f99e7432c491c382b88a6860a5adbe6bf02574bf0a08efff1978" - -[[package]] -name = "streaming-decompression" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf6cc3b19bfb128a8ad11026086e31d3ce9ad23f8ea37354b31383a187c44cf3" -dependencies = [ - "fallible-streaming-iterator", -] - -[[package]] -name = "streaming-iterator" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2231b7c3057d5e4ad0156fb3dc807d900806020c5ffa3ee6ff2c8c76fb8520" - -[[package]] -name = "strength_reduce" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe895eb47f22e2ddd4dabc02bce419d2e643c8e3b585c78158b349195bc24d82" - -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - -[[package]] -name = "strum" -version = "0.26.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" - -[[package]] -name = "strum_macros" -version = "0.25.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "rustversion", - "syn 2.0.96", -] - -[[package]] -name = "strum_macros" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" -dependencies = [ - "heck 0.5.0", - "proc-macro2", - "quote", - "rustversion", - "syn 2.0.96", -] - -[[package]] -name = "subtle" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.96" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn-mid" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea305d57546cc8cd04feb14b62ec84bf17f50e3f7b12560d7bfa9265f39d9ed" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "sync_wrapper" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" -dependencies = [ - "futures-core", -] - -[[package]] -name = "synstructure" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.96", -] - -[[package]] -name = "sysctl" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7dddc5f0fee506baf8b9fdb989e242f17e4b11c61dfbb0635b705217199eea" -dependencies = [ - "bitflags 2.7.0", - "byteorder", - "enum-as-inner", - "libc", - "thiserror 1.0.69", - "walkdir", -] - -[[package]] -name = "sysinfo" -version = "0.30.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a5b4ddaee55fb2bea2bf0e5000747e5f5c0de765e5a5ff87f4cd106439f4bb3" -dependencies = [ - "cfg-if", - "core-foundation-sys", - "libc", - "ntapi", - "once_cell", - "windows 0.52.0", -] - -[[package]] -name = "system-configuration" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" -dependencies = [ - "bitflags 2.7.0", - "core-foundation 0.9.4", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "tagptr" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417" - -[[package]] -name = "tantivy" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8d0582f186c0a6d55655d24543f15e43607299425c5ad8352c242b914b31856" -dependencies = [ - "aho-corasick", - "arc-swap", - "base64 0.22.1", - "bitpacking", - "byteorder", - "census", - "crc32fast", - "crossbeam-channel", - "downcast-rs", - "fastdivide", - "fnv", - "fs4", - "htmlescape", - "itertools 0.12.1", - "levenshtein_automata", - "log", - "lru", - "lz4_flex", - "measure_time", - "memmap2 0.9.5", - "num_cpus", - "once_cell", - "oneshot", - "rayon", - "regex", - "rust-stemmers", - "rustc-hash 1.1.0", - "serde", - "serde_json", - "sketches-ddsketch", - "smallvec", - "tantivy-bitpacker", - "tantivy-columnar", - "tantivy-common", - "tantivy-fst", - "tantivy-query-grammar", - "tantivy-stacker", - "tantivy-tokenizer-api", - "tempfile", - "thiserror 1.0.69", - "time", - "uuid", - "winapi", -] - -[[package]] -name = "tantivy-bitpacker" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284899c2325d6832203ac6ff5891b297fc5239c3dc754c5bc1977855b23c10df" -dependencies = [ - "bitpacking", -] - -[[package]] -name = "tantivy-columnar" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12722224ffbe346c7fec3275c699e508fd0d4710e629e933d5736ec524a1f44e" -dependencies = [ - "downcast-rs", - "fastdivide", - "itertools 0.12.1", - "serde", - "tantivy-bitpacker", - "tantivy-common", - "tantivy-sstable", - "tantivy-stacker", -] - -[[package]] -name = "tantivy-common" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8019e3cabcfd20a1380b491e13ff42f57bb38bf97c3d5fa5c07e50816e0621f4" -dependencies = [ - "async-trait", - "byteorder", - "ownedbytes", - "serde", - "time", -] - -[[package]] -name = "tantivy-fst" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d60769b80ad7953d8a7b2c70cdfe722bbcdcac6bccc8ac934c40c034d866fc18" -dependencies = [ - "byteorder", - "regex-syntax 0.8.5", - "utf8-ranges", -] - -[[package]] -name = "tantivy-query-grammar" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "847434d4af57b32e309f4ab1b4f1707a6c566656264caa427ff4285c4d9d0b82" -dependencies = [ - "nom", -] - -[[package]] -name = "tantivy-sstable" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c69578242e8e9fc989119f522ba5b49a38ac20f576fc778035b96cc94f41f98e" -dependencies = [ - "tantivy-bitpacker", - "tantivy-common", - "tantivy-fst", - "zstd", -] - -[[package]] -name = "tantivy-stacker" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c56d6ff5591fc332739b3ce7035b57995a3ce29a93ffd6012660e0949c956ea8" -dependencies = [ - "murmurhash32", - "rand_distr", - "tantivy-common", -] - -[[package]] -name = "tantivy-tokenizer-api" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0dcade25819a89cfe6f17d932c9cedff11989936bf6dd4f336d50392053b04" -dependencies = [ - "serde", -] - -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - -[[package]] -name = "target-features" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1bbb9f3c5c463a01705937a24fdabc5047929ac764b2d5b9cf681c1f5041ed5" - -[[package]] -name = "target-lexicon" -version = "0.12.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" - -[[package]] -name = "tempfile" -version = "3.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a8a559c81686f576e8cd0290cd2a24a2a9ad80c98b3478856500fcbd7acd704" -dependencies = [ - "cfg-if", - "fastrand 2.3.0", - "getrandom", - "once_cell", - "rustix 0.38.43", - "windows-sys 0.59.0", -] - -[[package]] -name = "termcolor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "thiserror" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" -dependencies = [ - "thiserror-impl 1.0.69", -] - -[[package]] -name = "thiserror" -version = "2.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc" -dependencies = [ - "thiserror-impl 2.0.11", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.96", -] - -[[package]] -name = "thiserror-impl" -version = "2.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.96", -] - -[[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 = "time" -version = "0.3.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" -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.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" -dependencies = [ - "num-conv", - "time-core", -] - -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - -[[package]] -name = "tinystr" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" -dependencies = [ - "displaydoc", - "zerovec", -] - -[[package]] -name = "tinyvec" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "022db8904dfa342efe721985167e9fcd16c29b226db4397ed752a761cfce81e8" -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 = "tokenizers" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e500fad1dd3af3d626327e6a3fe5050e664a6eaa4708b8ca92f1794aaf73e6fd" -dependencies = [ - "aho-corasick", - "derive_builder", - "esaxx-rs", - "getrandom", - "indicatif", - "itertools 0.12.1", - "lazy_static", - "log", - "macro_rules_attribute", - "monostate", - "onig", - "paste", - "rand", - "rayon", - "rayon-cond", - "regex", - "regex-syntax 0.8.5", - "serde", - "serde_json", - "spm_precompiled", - "thiserror 1.0.69", - "unicode-normalization-alignments", - "unicode-segmentation", - "unicode_categories", -] - -[[package]] -name = "tokio" -version = "1.43.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "pin-project-lite", - "signal-hook-registry", - "socket2 0.5.8", - "tokio-macros", - "windows-sys 0.52.0", -] - -[[package]] -name = "tokio-macros" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.96", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-rustls" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" -dependencies = [ - "rustls 0.21.12", - "tokio", -] - -[[package]] -name = "tokio-rustls" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37" -dependencies = [ - "rustls 0.23.21", - "tokio", -] - -[[package]] -name = "tokio-stream" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.7.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "toml_datetime" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" - -[[package]] -name = "toml_edit" -version = "0.22.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" -dependencies = [ - "indexmap 2.7.0", - "toml_datetime", - "winnow", -] - -[[package]] -name = "tower" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" -dependencies = [ - "futures-core", - "futures-util", - "pin-project-lite", - "sync_wrapper", - "tokio", - "tower-layer", - "tower-service", -] - -[[package]] -name = "tower-layer" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" - -[[package]] -name = "tower-service" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" - -[[package]] -name = "tracing" -version = "0.1.41" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" -dependencies = [ - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.96", -] - -[[package]] -name = "tracing-core" -version = "0.1.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" -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.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" -dependencies = [ - "matchers", - "nu-ansi-term", - "once_cell", - "regex", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log", -] - -[[package]] -name = "triomphe" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef8f7726da4807b58ea5c96fdc122f80702030edc33b35aff9190a51148ccc85" - -[[package]] -name = "try-lock" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" - -[[package]] -name = "twox-hash" -version = "1.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" -dependencies = [ - "cfg-if", - "static_assertions", -] - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "unicase" -version = "2.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539" - -[[package]] -name = "unicode-ident" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" - -[[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-reverse" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6f4888ebc23094adfb574fdca9fdc891826287a6397d2cd28802ffd6f20c76" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "unicode-segmentation" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" - -[[package]] -name = "unicode-width" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" - -[[package]] -name = "unicode_categories" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" - -[[package]] -name = "unindent" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" - -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - -[[package]] -name = "ureq" -version = "2.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02d1a66277ed75f640d608235660df48c8e3c19f3b4edb6a263315626cc3c01d" -dependencies = [ - "base64 0.22.1", - "flate2", - "log", - "native-tls", - "once_cell", - "rustls 0.23.21", - "rustls-pki-types", - "serde", - "serde_json", - "url", - "webpki-roots", -] - -[[package]] -name = "url" -version = "2.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "urlencoding" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" - -[[package]] -name = "utf16_iter" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" - -[[package]] -name = "utf8-ranges" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcfc827f90e53a02eaef5e535ee14266c1d569214c6aa70133a624d8a3164ba" - -[[package]] -name = "utf8_iter" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" - -[[package]] -name = "utf8parse" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" - -[[package]] -name = "uuid" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "744018581f9a3454a9e15beb8a33b017183f1e7c0cd170232a2d1453b23a51c4" -dependencies = [ - "getrandom", - "serde", -] - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "version_check" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" - -[[package]] -name = "vsimd" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" - -[[package]] -name = "waker-fn" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" - -[[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 = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" -dependencies = [ - "cfg-if", - "once_cell", - "rustversion", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" -dependencies = [ - "bumpalo", - "log", - "proc-macro2", - "quote", - "syn 2.0.96", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61" -dependencies = [ - "cfg-if", - "js-sys", - "once_cell", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.96", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "wasm-streams" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65" -dependencies = [ - "futures-util", - "js-sys", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "web-sys" -version = "0.3.77" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "web-time" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki-roots" -version = "0.26.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d642ff16b7e79272ae451b7322067cdc17cadf68c23264be9d94a32319efe7e" -dependencies = [ - "rustls-pki-types", -] - -[[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.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" -dependencies = [ - "windows-sys 0.59.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" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" -dependencies = [ - "windows-core 0.52.0", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" -dependencies = [ - "windows-core 0.58.0", - "windows-targets 0.52.6", -] - -[[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.6", -] - -[[package]] -name = "windows-core" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" -dependencies = [ - "windows-implement", - "windows-interface", - "windows-result", - "windows-strings", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-implement" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.96", -] - -[[package]] -name = "windows-interface" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.96", -] - -[[package]] -name = "windows-registry" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" -dependencies = [ - "windows-result", - "windows-strings", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-result" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-strings" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" -dependencies = [ - "windows-result", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "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-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.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.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[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.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[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.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_msvc" -version = "0.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.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[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.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[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.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[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.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" - -[[package]] -name = "winnow" -version = "0.6.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8d71a593cc5c42ad7876e2c1fda56f314f3754c084128833e64f1345ff8a03a" -dependencies = [ - "memchr", -] - -[[package]] -name = "write16" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" - -[[package]] -name = "writeable" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" - -[[package]] -name = "wyz" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" -dependencies = [ - "tap", -] - -[[package]] -name = "xmlparser" -version = "0.13.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" - -[[package]] -name = "xxhash-rust" -version = "0.8.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdd20c5420375476fbd4394763288da7eb0cc0b8c11deed431a91562af7335d3" - -[[package]] -name = "yoke" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" -dependencies = [ - "serde", - "stable_deref_trait", - "yoke-derive", - "zerofrom", -] - -[[package]] -name = "yoke-derive" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.96", - "synstructure", -] - -[[package]] -name = "zerocopy" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" -dependencies = [ - "byteorder", - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.96", -] - -[[package]] -name = "zerofrom" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" -dependencies = [ - "zerofrom-derive", -] - -[[package]] -name = "zerofrom-derive" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.96", - "synstructure", -] - -[[package]] -name = "zeroize" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" - -[[package]] -name = "zerovec" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" -dependencies = [ - "yoke", - "zerofrom", - "zerovec-derive", -] - -[[package]] -name = "zerovec-derive" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.96", -] - -[[package]] -name = "zip" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cc23c04387f4da0374be4533ad1208cbb091d5c11d070dfef13676ad6497164" -dependencies = [ - "arbitrary", - "crc32fast", - "crossbeam-utils", - "displaydoc", - "indexmap 2.7.0", - "num_enum", - "thiserror 1.0.69", -] - -[[package]] -name = "zstd" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" -dependencies = [ - "zstd-safe", -] - -[[package]] -name = "zstd-safe" -version = "7.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" -dependencies = [ - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "2.0.13+zstd.1.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" -dependencies = [ - "cc", - "pkg-config", -] diff --git a/pkgs/development/python-modules/lancedb/default.nix b/pkgs/development/python-modules/lancedb/default.nix index 7017ff080dbd..929fc5843bd1 100644 --- a/pkgs/development/python-modules/lancedb/default.nix +++ b/pkgs/development/python-modules/lancedb/default.nix @@ -2,16 +2,21 @@ lib, stdenv, buildPythonPackage, - rustPlatform, fetchFromGitHub, - darwin, - libiconv, + rustPlatform, + + # buildInputs openssl, + + # nativeBuildInputs pkg-config, protobuf, + + # dependencies attrs, cachetools, deprecation, + nest-asyncio, overrides, packaging, pydantic, @@ -19,6 +24,8 @@ requests, retry, tqdm, + + # tests aiohttp, pandas, polars, @@ -30,23 +37,22 @@ buildPythonPackage rec { pname = "lancedb"; - version = "0.18.0"; + version = "0.19.0"; pyproject = true; src = fetchFromGitHub { owner = "lancedb"; repo = "lancedb"; tag = "python-v${version}"; - hash = "sha256-URgJFSrCccp9DBdW2VQgft1GZHu48pb8RrLHmBBow5Q="; + hash = "sha256-AvISt9YpnHFrxRQYkkycXmsHSRs9QcBUe0DLXMYGrEI="; }; buildAndTestSubdir = "python"; - cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; }; - - postPatch = '' - ln -s ${./Cargo.lock} Cargo.lock - ''; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit pname version src; + hash = "sha256-0mBCBQTv9nsHiQDUrZfm5+ZUGp3A2k8+DH/T85Vq2KA="; + }; build-system = [ rustPlatform.maturinBuildHook ]; @@ -56,24 +62,15 @@ buildPythonPackage rec { rustPlatform.cargoSetupHook ]; - buildInputs = - [ - libiconv - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - IOKit - Security - SystemConfiguration - ] - ); + buildInputs = [ + openssl + ]; dependencies = [ attrs cachetools deprecation + nest-asyncio overrides packaging pydantic @@ -100,37 +97,30 @@ buildPythonPackage rec { pytestFlagsArray = [ "-m 'not slow'" ]; - disabledTests = + disabledTests = [ + # require tantivy which is not packaged in nixpkgs + "test_basic" + "test_fts_native" + + # polars.exceptions.ComputeError: TypeError: _scan_pyarrow_dataset_impl() got multiple values for argument 'batch_size' + # https://github.com/lancedb/lancedb/issues/1539 + "test_polars" + ]; + + disabledTestPaths = [ - # require tantivy which is not packaged in nixpkgs - "test_basic" - - # polars.exceptions.ComputeError: TypeError: _scan_pyarrow_dataset_impl() got multiple values for argument 'batch_size' - # https://github.com/lancedb/lancedb/issues/1539 - "test_polars" - - # Requires tantivy which is not packaged in nixpkgs - "test_fts_native" + # touch the network + "test_s3.py" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # fail with darwin sandbox - "test_async_remote_db" - "test_http_error" - "test_retry_error" + # socket.gaierror: [Errno 8] nodename nor servname provided, or not known + "test_remote_db.py" ]; - disabledTestPaths = [ - # touch the network - "test_s3.py" - ]; - passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex" "python-v(.*)" - "--generate-lockfile" - "--lockfile-metadata-path" - "python" ]; }; From 21382d8a87c459b4a2f4715db186f855f75d840c Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Sat, 8 Feb 2025 15:48:24 +0100 Subject: [PATCH 0562/2168] fplll: 5.4.5 -> 5.5.0 --- pkgs/development/libraries/fplll/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/fplll/default.nix b/pkgs/development/libraries/fplll/default.nix index aa27ad68e4f2..b00ba47bbe29 100644 --- a/pkgs/development/libraries/fplll/default.nix +++ b/pkgs/development/libraries/fplll/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, pkg-config, gettext, autoreconfHook, @@ -12,22 +11,15 @@ stdenv.mkDerivation rec { pname = "fplll"; - version = "5.4.5"; + version = "5.5.0"; src = fetchFromGitHub { owner = "fplll"; repo = "fplll"; rev = version; - sha256 = "sha256-taSS7jpVyjVfNe6kSuUDXMD2PgKmtG64V5MjZyQzorI="; + sha256 = "sha256-WvjXaCnUMioSmLlWmLV673mhRjnF+8DU9MqgUmBgaFQ="; }; - patches = [ - (fetchpatch { - url = "https://github.com/fplll/fplll/commit/317cf70893eebfb2625da12e5377189908c36240.diff"; - sha256 = "sha256-GbYSolBgv/he4QzjuRFdg93wHJABVHvA9x3PjpJTSRE="; - }) - ]; - nativeBuildInputs = [ pkg-config gettext From e686fefbe05a951b068ccbe11c56416e2b487a87 Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Sat, 8 Feb 2025 15:48:37 +0100 Subject: [PATCH 0563/2168] python312Packages.fpylll: remove obsolete patches --- pkgs/development/python-modules/fpylll/default.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pkgs/development/python-modules/fpylll/default.nix b/pkgs/development/python-modules/fpylll/default.nix index b23a1ce96c2f..30c8db5b0ebc 100644 --- a/pkgs/development/python-modules/fpylll/default.nix +++ b/pkgs/development/python-modules/fpylll/default.nix @@ -2,7 +2,6 @@ lib, fetchFromGitHub, buildPythonPackage, - fetchpatch, # build-system cysignals, @@ -35,17 +34,6 @@ buildPythonPackage rec { hash = "sha256-3+DXfCUuHQG+VSzJGEPa8qP6oxC+nngMa44XyFCJAVY="; }; - patches = [ - (fetchpatch { - url = "https://github.com/fplll/fpylll/commit/fc432b21fa7e4b9891f5b761b3539989eb958f2b.diff"; - hash = "sha256-+UidQ5xnlmjeVeVvR4J2zDzAuXP5LUPXCh4RP4o9oGA="; - }) - (fetchpatch { - url = "https://github.com/fplll/fpylll/commit/cece9c9b182dc3ac2c9121549cb427ccf4c4a9fe.diff"; - hash = "sha256-epJb8gorQ7gEEylZ2yZFdM9+EZ4ys9mUUUPiJ2D0VOM="; - }) - ]; - nativeBuildInputs = [ cython cysignals From 9e77b9f227097a584e6b63edd1eb445c595c6c04 Mon Sep 17 00:00:00 2001 From: emaryn Date: Sat, 8 Feb 2025 23:02:01 +0800 Subject: [PATCH 0564/2168] webcamoid: 9.1.1 -> 9.2.3 --- pkgs/applications/video/webcamoid/default.nix | 38 ++++++++----------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/video/webcamoid/default.nix b/pkgs/applications/video/webcamoid/default.nix index 3ee2f0db92e9..615881abbe88 100644 --- a/pkgs/applications/video/webcamoid/default.nix +++ b/pkgs/applications/video/webcamoid/default.nix @@ -1,15 +1,14 @@ { lib, + stdenv, fetchFromGitHub, - fetchpatch2, pkg-config, libxcb, - mkDerivation, cmake, qtbase, qtdeclarative, - qtquickcontrols, - qtquickcontrols2, + wrapQtAppsHook, + qtsvg, ffmpeg, gst_all_1, libpulseaudio, @@ -17,31 +16,23 @@ jack2, v4l-utils, }: -mkDerivation rec { + +stdenv.mkDerivation rec { pname = "webcamoid"; - version = "9.1.1"; + version = "9.2.3"; src = fetchFromGitHub { - sha256 = "sha256-E2hHFrksJtdDLWiX7wL1z9LBbBKT04a853V8u+WiwbA="; - rev = version; - repo = "webcamoid"; owner = "webcamoid"; + repo = "webcamoid"; + tag = version; + hash = "sha256-j4FiRQeFsrZD48P1CUESFytz9l/64Lz1EuOZp0ZSEmI="; }; - patches = [ - # Update mediawriterffmpeg.cpp for ffmpeg-7.0 - (fetchpatch2 { - url = "https://github.com/webcamoid/webcamoid/commit/b4864f13ec8c2ec93ebb5c13d9293cf9c02c93fd.patch?full_index=1"; - hash = "sha256-QasfVocxAzRMME03JFRfz7QQYXQGq4TSFiBsKL1g/wU="; - }) - ]; - buildInputs = [ libxcb qtbase qtdeclarative - qtquickcontrols - qtquickcontrols2 + qtsvg ffmpeg gst_all_1.gstreamer gst_all_1.gst-plugins-base @@ -54,15 +45,16 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config cmake + wrapQtAppsHook ]; - meta = with lib; { + meta = { description = "Webcam Capture Software"; longDescription = "Webcamoid is a full featured and multiplatform webcam suite."; homepage = "https://github.com/webcamoid/webcamoid/"; - license = [ licenses.gpl3Plus ]; - platforms = platforms.linux; - maintainers = with maintainers; [ robaca ]; + license = with lib.licenses; [ gpl3Plus ]; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ robaca ]; mainProgram = "webcamoid"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f625b4590645..63e76d7b041c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15639,7 +15639,7 @@ with pkgs; plugins = with wayfirePlugins; [ wcm wf-shell ]; }; - webcamoid = libsForQt5.callPackage ../applications/video/webcamoid { }; + webcamoid = qt6Packages.callPackage ../applications/video/webcamoid { }; webcord = callPackage ../by-name/we/webcord/package.nix { electron = electron_33; }; From 7aa159d169c7238a072b85b95d0b053ff8648996 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 8 Feb 2025 19:03:28 +0400 Subject: [PATCH 0565/2168] =?UTF-8?q?h3:=204.1.0=20=E2=86=92=204.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/misc/h3/default.nix | 30 ++++++++++++++-------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/development/misc/h3/default.nix b/pkgs/development/misc/h3/default.nix index 4f3b2041d666..8f73097b3085 100644 --- a/pkgs/development/misc/h3/default.nix +++ b/pkgs/development/misc/h3/default.nix @@ -9,14 +9,14 @@ let generic = { version, hash }: - stdenv.mkDerivation rec { + stdenv.mkDerivation { inherit version; pname = "h3"; src = fetchFromGitHub { owner = "uber"; repo = "h3"; - rev = "v${version}"; + tag = "v${version}"; inherit hash; }; @@ -28,23 +28,23 @@ let nativeBuildInputs = [ cmake ]; cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - "-DBUILD_BENCHMARKS=OFF" - "-DBUILD_FUZZERS=OFF" - "-DBUILD_GENERATORS=OFF" - "-DENABLE_COVERAGE=OFF" - "-DENABLE_FORMAT=OFF" - "-DENABLE_LINTING=OFF" + (lib.cmakeBool "BUILD_SHARED_LIBS" true) + (lib.cmakeBool "BUILD_BENCHMARKS" false) + (lib.cmakeBool "BUILD_FUZZERS" false) + (lib.cmakeBool "BUILD_GENERATORS" false) + (lib.cmakeBool "ENABLE_COVERAGE" false) + (lib.cmakeBool "ENABLE_FORMAT" false) + (lib.cmakeBool "ENABLE_LINTING" false) (lib.cmakeBool "BUILD_FILTERS" withFilters) ]; - meta = with lib; { + meta = { homepage = "https://h3geo.org/"; description = "Hexagonal hierarchical geospatial indexing system"; - license = licenses.asl20; + license = lib.licenses.asl20; changelog = "https://github.com/uber/h3/raw/v${version}/CHANGELOG.md"; - platforms = platforms.all; - maintainers = with maintainers; [ kalbasit ]; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ kalbasit ]; }; }; in @@ -55,7 +55,7 @@ in }; h3_4 = generic { - version = "4.1.0"; - hash = "sha256-7qyN73T8XDwZLgMZld7wwShUwoLEi/2gN2oiZX8n5nQ="; + version = "4.2.0"; + hash = "sha256-SzuxoYjsXCLhlAhQS7JoKvH8C3vquXttf58d4LnkeVM="; }; } From 4fea9b89ed2445cff4107def8980f008bf287713 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 8 Feb 2025 18:56:22 +0400 Subject: [PATCH 0566/2168] =?UTF-8?q?python312Packages.h3:=204.1.2=20?= =?UTF-8?q?=E2=86=92=204.2.1,=20fix=20build?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../development/python-modules/h3/default.nix | 32 ++++++++++++------- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/h3/default.nix b/pkgs/development/python-modules/h3/default.nix index 4db7e9dda9e6..078c2ee8c55d 100644 --- a/pkgs/development/python-modules/h3/default.nix +++ b/pkgs/development/python-modules/h3/default.nix @@ -6,34 +6,40 @@ fetchFromGitHub, h3, lib, + ninja, numpy, pytestCheckHook, - scikit-build, + pytest-cov-stub, + scikit-build-core, stdenv, }: buildPythonPackage rec { pname = "h3"; - version = "4.1.2"; - format = "setuptools"; + version = "4.2.1"; + pyproject = true; # pypi version does not include tests src = fetchFromGitHub { owner = "uber"; repo = "h3-py"; tag = "v${version}"; - hash = "sha256-dsF6VJwwIDapHtLiNEWbKW6A28zEOWqEPDRznf0eOcA="; + hash = "sha256-YFGKF/WV0nlmtR7MacOBoor6PQwPPFqdK1C1eIciXwI="; }; dontConfigure = true; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; - nativeBuildInputs = + build-system = [ - scikit-build + scikit-build-core cmake cython + ninja ] ++ lib.optionals stdenv.hostPlatform.isLinux [ # On Linux the .so files ends up referring to libh3.so instead of the full @@ -46,7 +52,7 @@ buildPythonPackage rec { # correctly. See the note above ^^ buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ h3 ]; - propagatedBuildInputs = [ numpy ]; + dependencies = [ numpy ]; # The following prePatch replaces the h3lib compilation with using the h3 packaged in nixpkgs. # @@ -61,16 +67,18 @@ buildPythonPackage rec { in '' rm -r src/h3lib - substituteInPlace CMakeLists.txt --replace "add_subdirectory(src/h3lib)" "${cmakeCommands}" + substituteInPlace CMakeLists.txt \ + --replace-fail "add_subdirectory(src/h3lib)" "${cmakeCommands}" \ + --replace-fail "\''${CMAKE_CURRENT_BINARY_DIR}/src/h3lib/src/h3lib/include/h3api.h" "${lib.getDev h3}/include/h3/h3api.h" ''; # Extra check to make sure we can import it from Python pythonImportsCheck = [ "h3" ]; - meta = with lib; { + meta = { homepage = "https://github.com/uber/h3-py"; description = "Hierarchical hexagonal geospatial indexing system"; - license = licenses.asl20; - maintainers = [ maintainers.kalbasit ]; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.kalbasit ]; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7c3c4089b8c3..8fa9970c21b2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5791,7 +5791,7 @@ self: super: with self; { h2 = callPackage ../development/python-modules/h2 { }; h3 = callPackage ../development/python-modules/h3 { - inherit (pkgs) h3; + h3 = pkgs.h3_4; }; h5io = callPackage ../development/python-modules/h5io { }; From 9e92a2c8eb85401df037d53cce3ad2a81005829a Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 8 Feb 2025 23:26:29 +0800 Subject: [PATCH 0567/2168] =?UTF-8?q?webkitgtk:=202.46.5=20=E2=86=92=202.4?= =?UTF-8?q?6.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/WebKit/WebKit/compare/webkitgtk-2.46.5...webkitgtk-2.46.6 https://webkitgtk.org/2025/02/07/webkitgtk2.46.6-released.html --- pkgs/development/libraries/webkitgtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 38578bd65d2d..1469dd6d6429 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -79,7 +79,7 @@ # https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html recommends building with clang. clangStdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; - version = "2.46.5"; + version = "2.46.6"; name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${ if lib.versionAtLeast gtk3.version "4.0" then "6.0" @@ -99,7 +99,7 @@ clangStdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; - hash = "sha256-utQCC7DPs+dA3zCCwtnL9nz0CVWWWIpWrs3eZwITeAU="; + hash = "sha256-8rMd5pMiC6m6t2zm3f5bC/qyUVyysKcPPFTUBQdmwys="; }; patches = lib.optionals clangStdenv.hostPlatform.isLinux [ From 0d82bb3adab8152f671f6d54f917266adcf16535 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Feb 2025 15:58:21 +0000 Subject: [PATCH 0568/2168] nb: 7.15.1 -> 7.16.0 --- pkgs/by-name/nb/nb/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nb/nb/package.nix b/pkgs/by-name/nb/nb/package.nix index 7880a96faa4d..ecac60b2f592 100644 --- a/pkgs/by-name/nb/nb/package.nix +++ b/pkgs/by-name/nb/nb/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "nb"; - version = "7.15.1"; + version = "7.16.0"; src = fetchFromGitHub { owner = "xwmx"; repo = "nb"; rev = version; - hash = "sha256-ep3EHqYz4xkTQSTSr0gnPqu8f04j2xAVbSpa1VUZJB4="; + hash = "sha256-flUPQ2LioWA3/HtQ6lpCWRTvWlsJ1/aCO+xbseduJTE="; }; nativeBuildInputs = [ installShellFiles ]; From d2727261279215e0967fe6f86480b97fcfc029d2 Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Sat, 8 Feb 2025 08:01:56 -0800 Subject: [PATCH 0569/2168] openscad-unstable: 2025-01-05 -> 2025-02-07 --- pkgs/by-name/op/openscad-unstable/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/openscad-unstable/package.nix b/pkgs/by-name/op/openscad-unstable/package.nix index ef118a1554a9..5eb1fd7c6ac3 100644 --- a/pkgs/by-name/op/openscad-unstable/package.nix +++ b/pkgs/by-name/op/openscad-unstable/package.nix @@ -44,12 +44,12 @@ # clang consume much less RAM than GCC clangStdenv.mkDerivation rec { pname = "openscad-unstable"; - version = "2025-01-05"; + version = "2025-02-07"; src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "92a13b4f06221ef26c901130c0c52658976cdfb2"; - hash = "sha256-803pDT/yq7eBk4J3E1JwKdhurnupPdB4A9xroLRg3+0="; + rev = "1308a7d476facb466bf9fae1e77666c35c8e3c8f"; + hash = "sha256-+0cQ5mgRzOPfP6nl/rfC/hnw3V7yvGJCyLU8hOmlGOc="; # Unfortunately, we can't selectively fetch submodules. It would be good # to see that we don't accidentally depend on it. fetchSubmodules = true; # Only really need sanitizers-cmake and MCAD From b3b41389f1f82054377c3d7b9f39e8ab09def001 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Feb 2025 16:11:07 +0000 Subject: [PATCH 0570/2168] clementine: 1.4.1 -> 1.4.1-31-g69ba3e85f --- pkgs/applications/audio/clementine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index f175071aa40d..2422511f1275 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -49,13 +49,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "clementine"; - version = "1.4.1"; + version = "1.4.1-31-g69ba3e85f"; src = fetchFromGitHub { owner = "clementine-player"; repo = "Clementine"; tag = finalAttrs.version; - hash = "sha256-ges7PHsv/J0R5dqmKvS5BpYxOgy9YB8hZMXOIe16M6A="; + hash = "sha256-r6x3/Kr8XdFP4sXERjWWMEAxY4M/vIS0QQfneTUWGuc="; }; nativeBuildInputs = [ From 715fe98f0e520c9787c2e8a190e4656f05562a56 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Sat, 8 Feb 2025 23:20:24 +0700 Subject: [PATCH 0571/2168] scanservjs: fix build --- pkgs/by-name/sc/scanservjs/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/sc/scanservjs/package.nix b/pkgs/by-name/sc/scanservjs/package.nix index e320392d2f7f..5b80e075398d 100644 --- a/pkgs/by-name/sc/scanservjs/package.nix +++ b/pkgs/by-name/sc/scanservjs/package.nix @@ -3,11 +3,14 @@ fetchFromGitHub, buildNpmPackage, fetchNpmDeps, - nodejs, + nodejs_20, replaceVars, }: let + # Build fails on node 22, presumably because of esm. + # https://github.com/NixOS/nixpkgs/issues/371649 + nodejs = nodejs_20; version = "2.27.1"; src = fetchFromGitHub { owner = "sbs20"; From f83f6c13f4845184d14d035791f7b58a1be390c1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Feb 2025 16:20:32 +0000 Subject: [PATCH 0572/2168] gswatcher: 1.7.1 -> 1.7.2 --- pkgs/by-name/gs/gswatcher/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gs/gswatcher/package.nix b/pkgs/by-name/gs/gswatcher/package.nix index b12a1bfc4a02..02a5c17a29d0 100644 --- a/pkgs/by-name/gs/gswatcher/package.nix +++ b/pkgs/by-name/gs/gswatcher/package.nix @@ -23,13 +23,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "gswatcher"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "lxndr"; repo = "gswatcher"; tag = "v${finalAttrs.version}"; - hash = "sha256-U09vovOanYmDl5ymFC3bXU8pi8aUq2tPUE5AEoqmfpc="; + hash = "sha256-qohd18bXr7gDSW51tCyslFX54Caux+YrsuJtoLs9Ofk="; }; nativeBuildInputs = [ From 31382adf95f88502f0ceddd88dab56a98dbd887c Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Fri, 7 Feb 2025 10:01:55 +0100 Subject: [PATCH 0573/2168] sonarr: upgrade to dotnet 8 --- pkgs/by-name/so/sonarr/deps.json | 354 +++++++++++++---------------- pkgs/by-name/so/sonarr/package.nix | 49 ++-- pkgs/by-name/so/sonarr/update.py | 48 ++-- 3 files changed, 222 insertions(+), 229 deletions(-) diff --git a/pkgs/by-name/so/sonarr/deps.json b/pkgs/by-name/so/sonarr/deps.json index 1391182c91d4..e732b9a5c68a 100644 --- a/pkgs/by-name/so/sonarr/deps.json +++ b/pkgs/by-name/so/sonarr/deps.json @@ -1,8 +1,8 @@ [ { "pname": "BouncyCastle.Cryptography", - "version": "2.4.0", - "hash": "sha256-DoDZNWtYM+0OLIclOEZ+tjcGXymGlXvdvq2ZMPmiAJA=" + "version": "2.5.0", + "hash": "sha256-4JTx7QKSu3BE7kPuspN1KK2LtA9BWKLHZRLfOBEzWHY=" }, { "pname": "Castle.Core", @@ -23,8 +23,8 @@ }, { "pname": "Dapper", - "version": "2.0.123", - "hash": "sha256-Ic3pMHtq5jF94tPi8l5MFDGyLnEZYofcqxbH5yDLHZY=" + "version": "2.1.35", + "hash": "sha256-zeroySx7lO1yLtbhKhFQ87diWXOq9gPnv3qFcmNcs9M=" }, { "pname": "Diacritical.Net", @@ -43,8 +43,8 @@ }, { "pname": "Dynamitey", - "version": "2.0.9.136", - "hash": "sha256-wRvKTW4WisziZmglLOqbUXVv9pPh9MmF7HS/hcoj7fM=" + "version": "3.0.3", + "hash": "sha256-69DyYSGu1sjpr8DupZWEiwcVmW9vT197c00vQ7H9k1s=" }, { "pname": "Equ", @@ -53,8 +53,8 @@ }, { "pname": "FluentAssertions", - "version": "6.10.0", - "hash": "sha256-+IRWEaSkEmL9Eab0P2hpHQgf/TKS04t80x+mcq1O/Ck=" + "version": "6.12.0", + "hash": "sha256-LGlPe+G7lBwj5u3ttQZiKX2+C195ddRAHPuDkY6x0BE=" }, { "pname": "FluentValidation", @@ -63,8 +63,8 @@ }, { "pname": "GitHubActionsTestLogger", - "version": "2.3.3", - "hash": "sha256-/TxZ7f3AvArXXe6isyom6ZHLFZR2hi1ejaQuY/6KN4s=" + "version": "2.4.1", + "hash": "sha256-bY8RXB3fIsgYIrlLeEuq8dsOfIn8zcbZ0dj2Ra1sFZg=" }, { "pname": "Ical.Net", @@ -73,8 +73,8 @@ }, { "pname": "ImpromptuInterface", - "version": "7.0.1", - "hash": "sha256-61KY5H3W/sGX12y0oREPX7W22VJokL9U3VJpOHW50s8=" + "version": "8.0.6", + "hash": "sha256-u0J8n7ShZX+lk5aX9copjwgym5TtglRGT7QtPdZeHeA=" }, { "pname": "Instances", @@ -93,43 +93,23 @@ }, { "pname": "MailKit", - "version": "4.8.0", - "hash": "sha256-ONvrVOwjxyNrIQM8FMzT5mLzlU56Kc8oOwkzegNAiXM=" + "version": "4.9.0", + "hash": "sha256-7M+Qf0e/J50ua6ieBHDPHQ19CPjlNv1S4DRRFlHHrOQ=" }, { "pname": "Microsoft.AspNetCore.Cryptography.Internal", - "version": "6.0.21", - "hash": "sha256-YMveWdyikWEfczNSMSh0LlBS87gsMxMto1RW8Unjnro=" + "version": "8.0.12", + "hash": "sha256-IuTJ5+i8lJJI8IhtqlM259LusDDIkSbsFEEDPawDwek=" }, { "pname": "Microsoft.AspNetCore.Cryptography.KeyDerivation", - "version": "6.0.21", - "hash": "sha256-oc4Vfo6XUJRp3qDVrcknXNmQWgrCsqWMHZdMVZuYaD8=" - }, - { - "pname": "Microsoft.AspNetCore.Owin", - "version": "6.0.21", - "hash": "sha256-F+plTVM6HblPFWetEX3M+AxQ8oNqqc3sRqrB1FmKcpU=" - }, - { - "pname": "Microsoft.Bcl.AsyncInterfaces", - "version": "6.0.0", - "hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU=" - }, - { - "pname": "Microsoft.Bcl.TimeProvider", - "version": "8.0.0", - "hash": "sha256-fBvDSXDSIYMzTa8+A+98KqhEXYP6E17wLo+UNwlyf4U=" - }, - { - "pname": "Microsoft.Build.Tasks.Git", - "version": "1.1.1", - "hash": "sha256-PHxHmsCty8Si5dCUQSizeHkJrHa9+j2nRsg6Sz+5Za0=" + "version": "8.0.12", + "hash": "sha256-CYDhD+SkwKHjrBirfloJ2aqdGLz3ZOi5ULFEeAti3z4=" }, { "pname": "Microsoft.CodeCoverage", - "version": "17.5.0", - "hash": "sha256-RBFO0YLp1//Li2a9s1oAhR+C4TMXgD7TTH+V9QDgMS8=" + "version": "17.10.0", + "hash": "sha256-yQFwqVChRtIRpbtkJr92JH2i+O7xn91NGbYgnKs8G2g=" }, { "pname": "Microsoft.CSharp", @@ -138,13 +118,13 @@ }, { "pname": "Microsoft.CSharp", - "version": "4.4.1", - "hash": "sha256-7/gsQHWAuFWrcVpVharASTNL+Mvl6Gw+AAw41k0MzXw=" + "version": "4.5.0", + "hash": "sha256-dAhj/CgXG5VIy2dop1xplUsLje7uBPFjxasz9rdFIgY=" }, { "pname": "Microsoft.CSharp", - "version": "4.5.0", - "hash": "sha256-dAhj/CgXG5VIy2dop1xplUsLje7uBPFjxasz9rdFIgY=" + "version": "4.7.0", + "hash": "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0=" }, { "pname": "Microsoft.Data.SqlClient", @@ -168,13 +148,8 @@ }, { "pname": "Microsoft.Extensions.Configuration", - "version": "6.0.0", - "hash": "sha256-SIO/Q+OD2bG+Q0EoOXRgJYzZMhahGXDG1fXZn0VUvv0=" - }, - { - "pname": "Microsoft.Extensions.Configuration", - "version": "6.0.1", - "hash": "sha256-v55PAURxnSGYgbv9x+4/pMeI51H27ikRfHBuUB+N5nE=" + "version": "8.0.0", + "hash": "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA=" }, { "pname": "Microsoft.Extensions.Configuration.Abstractions", @@ -183,38 +158,38 @@ }, { "pname": "Microsoft.Extensions.Configuration.Abstractions", - "version": "6.0.0", - "hash": "sha256-Evg+Ynj2QUa6Gz+zqF+bUyfGD0HI5A2fHmxZEXbn3HA=" + "version": "8.0.0", + "hash": "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o=" }, { "pname": "Microsoft.Extensions.Configuration.Binder", - "version": "6.0.0", - "hash": "sha256-7NZcKkiXWSuhhVcA/fXHPY/62aGUyMsRdiHm91cWC5Y=" + "version": "8.0.2", + "hash": "sha256-aGB0VuoC34YadAEqrwoaXLc5qla55pswDV2xLSmR7SE=" }, { "pname": "Microsoft.Extensions.Configuration.CommandLine", - "version": "6.0.0", - "hash": "sha256-jFACPqLvGo14eg4G3hV/UYY/d9i3hNKvgL+3nnDGZME=" + "version": "8.0.0", + "hash": "sha256-fmPC/o8S+weTtQJWykpnGHm6AKVU21xYE/CaHYU7zgg=" }, { "pname": "Microsoft.Extensions.Configuration.EnvironmentVariables", - "version": "6.0.1", - "hash": "sha256-h0Q7CJ/xrtaaVs3gAdW9+TgMZ8bilQfOq2NKdr/Dt5s=" + "version": "8.0.0", + "hash": "sha256-+bjFZvqCsMf2FRM2olqx/fub+QwfM1kBhjGVOT5HC48=" }, { "pname": "Microsoft.Extensions.Configuration.FileExtensions", - "version": "6.0.0", - "hash": "sha256-PLnSa0JMfDC62OTv8sL0QFJbANE7QSnJ997ySFBS1go=" + "version": "8.0.1", + "hash": "sha256-iRA8L7BX/fe5LHCVOhzBSk30GfshP7V2Qj2nxpEvStA=" }, { "pname": "Microsoft.Extensions.Configuration.Json", - "version": "6.0.0", - "hash": "sha256-owzLlamhIWWEoV2oumAxv4G3IlYzYGaDse0GVb8u1LA=" + "version": "8.0.1", + "hash": "sha256-J8EK/yhsfTpeSUY8F81ZTBV9APHiPUliN7d+n2OX9Ig=" }, { "pname": "Microsoft.Extensions.Configuration.UserSecrets", - "version": "6.0.1", - "hash": "sha256-YTbqJElzPCfph1Nxyq2PUGV5lSY5GXFdshpKOPdvTTk=" + "version": "8.0.1", + "hash": "sha256-yGvWfwBhyFudcIv96pKWaQ1MIMOiv5LHSCn+9J7Doz0=" }, { "pname": "Microsoft.Extensions.DependencyInjection", @@ -223,13 +198,13 @@ }, { "pname": "Microsoft.Extensions.DependencyInjection", - "version": "6.0.0", - "hash": "sha256-gZuMaunMJVyvvepuzNodGPRc6eqKH//bks3957dYkPI=" + "version": "8.0.0", + "hash": "sha256-+qIDR8hRzreCHNEDtUcPfVHQdurzWPo/mqviCH78+EQ=" }, { "pname": "Microsoft.Extensions.DependencyInjection", - "version": "6.0.1", - "hash": "sha256-V+CulDoU3NXWn5EjH64JhDVQ0h+ev5BW95T+2uL1hU4=" + "version": "8.0.1", + "hash": "sha256-O9g0jWS+jfGoT3yqKwZYJGL+jGSIeSbwmvomKDC3hTU=" }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", @@ -243,28 +218,43 @@ }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "6.0.0", - "hash": "sha256-SZke0jNKIqJvvukdta+MgIlGsrP2EdPkkS8lfLg7Ju4=" + "version": "7.0.0", + "hash": "sha256-55lsa2QdX1CJn1TpW1vTnkvbGXKCeE9P0O6AkW49LaA=" }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "7.0.0", - "hash": "sha256-55lsa2QdX1CJn1TpW1vTnkvbGXKCeE9P0O6AkW49LaA=" + "version": "8.0.0", + "hash": "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8=" + }, + { + "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", + "version": "8.0.2", + "hash": "sha256-UfLfEQAkXxDaVPC7foE/J3FVEXd31Pu6uQIhTic3JgY=" }, { "pname": "Microsoft.Extensions.DependencyModel", "version": "2.1.0", "hash": "sha256-7dFo5itkB2OgSgS7dN87h0Xf2p5/f6fl2Ka6+CTEhDY=" }, + { + "pname": "Microsoft.Extensions.Diagnostics", + "version": "8.0.1", + "hash": "sha256-CraHNCaVlMiYx6ff9afT6U7RC/MoOCXM3pn2KrXkiLc=" + }, + { + "pname": "Microsoft.Extensions.Diagnostics.Abstractions", + "version": "8.0.1", + "hash": "sha256-d5DVXhA8qJFY9YbhZjsTqs5w5kDuxF5v+GD/WZR1QL0=" + }, { "pname": "Microsoft.Extensions.FileProviders.Abstractions", - "version": "6.0.0", - "hash": "sha256-uBjWjHKEXjZ9fDfFxMjOou3lhfTNhs1yO+e3fpWreLk=" + "version": "8.0.0", + "hash": "sha256-uQSXmt47X2HGoVniavjLICbPtD2ReQOYQMgy3l0xuMU=" }, { "pname": "Microsoft.Extensions.FileProviders.Physical", - "version": "6.0.0", - "hash": "sha256-5BAQOqnaEXM2YjdrmrCinXBeZ5FKxCWtebEXMdwcbMY=" + "version": "8.0.0", + "hash": "sha256-29y5ZRQ1ZgzVOxHktYxyiH40kVgm5un2yTGdvuSWnRc=" }, { "pname": "Microsoft.Extensions.FileSystemGlobbing", @@ -273,28 +263,33 @@ }, { "pname": "Microsoft.Extensions.FileSystemGlobbing", - "version": "6.0.0", - "hash": "sha256-RAWHjkkfvGpjc49Q0kJbZyXgU6UEq/EJ0j557sj2/iU=" + "version": "8.0.0", + "hash": "sha256-+Oz41JR5jdcJlCJOSpQIL5OMBNi+1Hl2d0JUHfES7sU=" }, { "pname": "Microsoft.Extensions.Hosting", - "version": "6.0.1", - "hash": "sha256-L57B/mAxkzK7QEipV0KtHzxMtsxEZ+a4FdFkn/3/XIY=" + "version": "8.0.1", + "hash": "sha256-FFLo6em0N2vaWg6//vaQhxoOgT9LLH5Y2KWkCeX5xQ4=" }, { "pname": "Microsoft.Extensions.Hosting.Abstractions", - "version": "6.0.0", - "hash": "sha256-ksIPO6RhfbYx/i3su4J3sDhoL+TDnITKsgIpEqnpktc=" + "version": "8.0.1", + "hash": "sha256-/bIVL9uvBQhV/KQmjA1ZjR74sMfaAlBb15sVXsGDEVA=" }, { "pname": "Microsoft.Extensions.Hosting.WindowsServices", - "version": "6.0.2", - "hash": "sha256-hgLydinnGforEzR2SCq6568IWhjnIoX8vyR3Z8xRIxg=" + "version": "8.0.1", + "hash": "sha256-JBrZuv1RxpJf5wR81g91bE1/JQgBeOtnJDvA98rlYKE=" }, { "pname": "Microsoft.Extensions.Logging", - "version": "6.0.0", - "hash": "sha256-8WsZKRGfXW5MsXkMmNVf6slrkw+cR005czkOP2KUqTk=" + "version": "8.0.0", + "hash": "sha256-Meh0Z0X7KyOEG4l0RWBcuHHihcABcvCyfUXgasmQ91o=" + }, + { + "pname": "Microsoft.Extensions.Logging", + "version": "8.0.1", + "hash": "sha256-vkfVw4tQEg86Xg18v6QO0Qb4Ysz0Njx57d1XcNuj6IU=" }, { "pname": "Microsoft.Extensions.Logging.Abstractions", @@ -303,33 +298,38 @@ }, { "pname": "Microsoft.Extensions.Logging.Abstractions", - "version": "6.0.0", - "hash": "sha256-QNqcQ3x+MOK7lXbWkCzSOWa/2QyYNbdM/OEEbWN15Sw=" + "version": "8.0.0", + "hash": "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4=" + }, + { + "pname": "Microsoft.Extensions.Logging.Abstractions", + "version": "8.0.2", + "hash": "sha256-cHpe8X2BgYa5DzulZfq24rg8O2K5Lmq2OiLhoyAVgJc=" }, { "pname": "Microsoft.Extensions.Logging.Configuration", - "version": "6.0.0", - "hash": "sha256-IeMOza71UDzsEIVIlYuI0RYKk+d+VOC6zCqYCQs6nV4=" + "version": "8.0.1", + "hash": "sha256-E2JbJG2EXlv2HUWLi17kIkAL6RC9rC2E18C3gAyOuaE=" }, { "pname": "Microsoft.Extensions.Logging.Console", - "version": "6.0.0", - "hash": "sha256-LQw/najhYDdvtrsogHEQue+U+/+YJcgyBP+3MTJYA40=" + "version": "8.0.1", + "hash": "sha256-2thhF1JbDNj3Bx2fcH7O26uHGNeMd9MYah6N60lIpIU=" }, { "pname": "Microsoft.Extensions.Logging.Debug", - "version": "6.0.0", - "hash": "sha256-kweko71W7/hIAUO3ZYYbNXksVLgj8wrDN028QthMFCs=" + "version": "8.0.1", + "hash": "sha256-gKFqBg5lbjy5VBEcAuoQ/SsXAxvrYdBYOu9dV60eJKg=" }, { "pname": "Microsoft.Extensions.Logging.EventLog", - "version": "6.0.0", - "hash": "sha256-1BXQjw/ySWmddAZ79bv3OhmC4SPTG8PHyTOlrNEUb0g=" + "version": "8.0.1", + "hash": "sha256-1UkEOwl3Op2b3jTvpI10hHxIe9FqeVVy+VB1tZp6Lc8=" }, { "pname": "Microsoft.Extensions.Logging.EventSource", - "version": "6.0.0", - "hash": "sha256-j2Begn1+Xoa+9yPoQC6b6aPmUIpBrjkTGQhRhYfJaDI=" + "version": "8.0.1", + "hash": "sha256-EINT/PgfB4Dvf+1JBzL1plPT35ezT7kyS8y/XMMgYxA=" }, { "pname": "Microsoft.Extensions.Options", @@ -338,13 +338,18 @@ }, { "pname": "Microsoft.Extensions.Options", - "version": "6.0.0", - "hash": "sha256-DxnEgGiCXpkrxFkxXtOXqwaiAtoIjA8VSSWCcsW0FwE=" + "version": "8.0.0", + "hash": "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw=" + }, + { + "pname": "Microsoft.Extensions.Options", + "version": "8.0.2", + "hash": "sha256-AjcldddddtN/9aH9pg7ClEZycWtFHLi9IPe1GGhNQys=" }, { "pname": "Microsoft.Extensions.Options.ConfigurationExtensions", - "version": "6.0.0", - "hash": "sha256-au0Y13cGk/dQFKuvSA5NnP/++bErTk0oOTlgmHdI2Mw=" + "version": "8.0.0", + "hash": "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI=" }, { "pname": "Microsoft.Extensions.Primitives", @@ -353,8 +358,8 @@ }, { "pname": "Microsoft.Extensions.Primitives", - "version": "6.0.0", - "hash": "sha256-AgvysszpQ11AiTBJFkvSy8JnwIWTj15Pfek7T7ThUc4=" + "version": "8.0.0", + "hash": "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo=" }, { "pname": "Microsoft.Identity.Client", @@ -388,8 +393,8 @@ }, { "pname": "Microsoft.NET.Test.Sdk", - "version": "17.5.0", - "hash": "sha256-XgahgoL+VfAN4NB6qxeAHxvGj9s1Dsl9wLSSPlEU/wE=" + "version": "17.10.0", + "hash": "sha256-rkHIqB2mquNXF89XBTFpUL2z5msjTBsOcyjSBCh36I0=" }, { "pname": "Microsoft.NETCore.Platforms", @@ -426,16 +431,6 @@ "version": "1.6.14", "hash": "sha256-dSJUic2orPGfYVgto9DieRckbtLpPyxHtf+RJ2tmKPM=" }, - { - "pname": "Microsoft.SourceLink.Common", - "version": "1.1.1", - "hash": "sha256-b4FaNFneDVDbvJVX1iNyhhLTrnxUfnmyypeJr47GbXY=" - }, - { - "pname": "Microsoft.SourceLink.GitHub", - "version": "1.1.1", - "hash": "sha256-3hc9ym5ReONp00ruCKio/Ka1gYXo/jDlUHtfK1wZPiU=" - }, { "pname": "Microsoft.TestPlatform.ObjectModel", "version": "16.9.1", @@ -443,18 +438,13 @@ }, { "pname": "Microsoft.TestPlatform.ObjectModel", - "version": "17.5.0", - "hash": "sha256-mj5UH+aqVk7f3Uu0+L47aqZUudJNCx3Lk7cbP4fzcmI=" - }, - { - "pname": "Microsoft.TestPlatform.ObjectModel", - "version": "17.7.1", - "hash": "sha256-KfqM1E0jhAg07QfpjfEcjQ+HX13XZfdvveT5qxm89Sk=" + "version": "17.10.0", + "hash": "sha256-3YjVGK2zEObksBGYg8b/CqoJgLQ1jUv4GCWNjDhLRh4=" }, { "pname": "Microsoft.TestPlatform.TestHost", - "version": "17.5.0", - "hash": "sha256-A/LU0UTQ7ee9n1Yww8FGPGELvYTPkjeRWvkhW/KY4J0=" + "version": "17.10.0", + "hash": "sha256-+yzP3FY6WoOosSpYnB7duZLhOPUZMQYy8zJ1d3Q4hK4=" }, { "pname": "Microsoft.Win32.Primitives", @@ -481,15 +471,10 @@ "version": "5.0.0", "hash": "sha256-mGUKg+bmB5sE/DCwsTwCsbe00MCwpgxsVW3nCtQiSmo=" }, - { - "pname": "Microsoft.Win32.SystemEvents", - "version": "6.0.0", - "hash": "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA=" - }, { "pname": "MimeKit", - "version": "4.8.0", - "hash": "sha256-4EB54ktBXuq5QRID9i8E7FzU7YZTE4wwH+2yr7ivi/Q=" + "version": "4.9.0", + "hash": "sha256-V7M7ejLKzE/RZZPtnUVaPlFq4xo8xViBIlDZ7FWBKAA=" }, { "pname": "Mono.Cecil", @@ -574,28 +559,18 @@ }, { "pname": "Npgsql", - "version": "7.0.9", - "hash": "sha256-4W/YbZtDUcnrPLlyLA+GRZam5AWR1b7LGGDl46FAbDk=" + "version": "9.0.2", + "hash": "sha256-T1IEIWCYqTchgGO37x8v80oeuLA+FU3m7ureXdi2RwA=" }, { "pname": "NuGet.Frameworks", "version": "5.0.0", "hash": "sha256-WWLh+v9Y9as+WURW8tUPowQB8HWIiVJzbpKzEWTdMqI=" }, - { - "pname": "NuGet.Frameworks", - "version": "5.11.0", - "hash": "sha256-n+hxcrf+sXM80Tv9YH9x4+hwTslVidFq4tjBNPAzYnM=" - }, - { - "pname": "NuGet.Frameworks", - "version": "6.5.0", - "hash": "sha256-ElqfN4CcKxT3hP2qvxxObb4mnBlYG89IMxO0Sm5oZ2g=" - }, { "pname": "NUnit", - "version": "3.13.3", - "hash": "sha256-Zn+sJIF7ieNqu/t2RwJx6WPFb1jl9UuNHidb/Px0v3E=" + "version": "3.14.0", + "hash": "sha256-CuP/q5HovPWfAW3Cty/QxRi7VpjykJ3TDLq5TENI6KY=" }, { "pname": "NUnit3TestAdapter", @@ -609,8 +584,8 @@ }, { "pname": "Polly", - "version": "8.5.0", - "hash": "sha256-oXIqYMkFXoF/9y704LJSX5Non9mry19OSKA7JFviu5Q=" + "version": "8.5.1", + "hash": "sha256-fAeM5Th1OtfB0iqKFxdPE8sDz1Pfl2YnMweh58/lqJI=" }, { "pname": "Polly.Contrib.WaitAndRetry", @@ -619,8 +594,8 @@ }, { "pname": "Polly.Core", - "version": "8.5.0", - "hash": "sha256-vN/OoQi5F8+oKNO46FwjPcKrgfhGMGjAQ2yCQUlHtOc=" + "version": "8.5.1", + "hash": "sha256-XP9nIeYSnZISHW8JMTi8zFFV3zRFGvDZTPbE2bBgG6k=" }, { "pname": "RestSharp", @@ -1075,8 +1050,8 @@ }, { "pname": "System.Configuration.ConfigurationManager", - "version": "6.0.1", - "hash": "sha256-U/0HyekAZK5ya2VNfGA1HeuQyJChoaqcoIv57xLpzLQ=" + "version": "8.0.1", + "hash": "sha256-2vgU/BBFDOO2506UX6mtuBQ9c2bCShLLhoy67l7418E=" }, { "pname": "System.Console", @@ -1109,16 +1084,16 @@ "version": "4.7.0", "hash": "sha256-wSJTNjJGcEa0tOrXXHGNVkjPpBPnLLP7ZKpQ9FvZIDM=" }, - { - "pname": "System.Diagnostics.DiagnosticSource", - "version": "6.0.0", - "hash": "sha256-RY9uWSPdK2fgSwlj1OHBGBVo3ZvGQgBJNzAsS5OGMWc=" - }, { "pname": "System.Diagnostics.EventLog", "version": "6.0.0", "hash": "sha256-zUXIQtAFKbiUMKCrXzO4mOTD5EUphZzghBYKXprowSM=" }, + { + "pname": "System.Diagnostics.EventLog", + "version": "8.0.1", + "hash": "sha256-zvqd72pwgcGoa1nH3ZT1C0mP9k53vFLJ69r5MCQ1saA=" + }, { "pname": "System.Diagnostics.Process", "version": "4.3.0", @@ -1149,11 +1124,6 @@ "version": "5.0.2", "hash": "sha256-+g0aHEpoLVNfmFY3/CaFiM6aMLiZQt0B4hDy8riPbyI=" }, - { - "pname": "System.Drawing.Common", - "version": "6.0.0", - "hash": "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo=" - }, { "pname": "System.Dynamic.Runtime", "version": "4.0.11", @@ -1314,6 +1284,11 @@ "version": "4.3.0", "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU=" }, + { + "pname": "System.Reflection.Emit", + "version": "4.7.0", + "hash": "sha256-Fw/CSRD+wajH1MqfKS3Q/sIrUH7GN4K+F+Dx68UPNIg=" + }, { "pname": "System.Reflection.Emit.ILGeneration", "version": "4.0.1", @@ -1404,11 +1379,6 @@ "version": "4.4.0", "hash": "sha256-SeTI4+yVRO2SmAKgOrMni4070OD+Oo8L1YiEVeKDyig=" }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "6.0.0", - "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I=" - }, { "pname": "System.Runtime.Extensions", "version": "4.1.0", @@ -1469,11 +1439,6 @@ "version": "4.7.0", "hash": "sha256-/9ZCPIHLdhzq7OW4UKqTsR0O93jjHd6BRG1SRwgHE1g=" }, - { - "pname": "System.Security.AccessControl", - "version": "6.0.0", - "hash": "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg=" - }, { "pname": "System.Security.AccessControl", "version": "6.0.0-preview.5.21301.5", @@ -1516,8 +1481,8 @@ }, { "pname": "System.Security.Cryptography.Pkcs", - "version": "8.0.0", - "hash": "sha256-yqfIIeZchsII2KdcxJyApZNzxM/VKknjs25gDWlweBI=" + "version": "8.0.1", + "hash": "sha256-KMNIkJ3yQ/5O6WIhPjyAIarsvIMhkp26A6aby5KkneU=" }, { "pname": "System.Security.Cryptography.Primitives", @@ -1536,8 +1501,8 @@ }, { "pname": "System.Security.Cryptography.ProtectedData", - "version": "6.0.0", - "hash": "sha256-Wi9I9NbZlpQDXgS7Kl06RIFxY/9674S7hKiYw5EabRY=" + "version": "8.0.0", + "hash": "sha256-fb0pa9sQxN+mr0vnXg1Igbx49CaOqS+GDkTfWNboUvs=" }, { "pname": "System.Security.Cryptography.X509Certificates", @@ -1549,11 +1514,6 @@ "version": "4.7.0", "hash": "sha256-BGgXMLUi5rxVmmChjIhcXUxisJjvlNToXlyaIbUxw40=" }, - { - "pname": "System.Security.Permissions", - "version": "6.0.0", - "hash": "sha256-/MMvtFWGN/vOQfjXdOhet1gsnMgh6lh5DCHimVsnVEs=" - }, { "pname": "System.Security.Principal", "version": "4.3.0", @@ -1576,8 +1536,8 @@ }, { "pname": "System.ServiceProcess.ServiceController", - "version": "6.0.1", - "hash": "sha256-ZYf+7ln6IlrSZHnoFvZyootRMsLqcUaZduJnh6mz25Y=" + "version": "8.0.1", + "hash": "sha256-2cXTzNOyXqJinFPzdVJ9Gu6qrFtycfivu7RHDzBJic8=" }, { "pname": "System.Text.Encoding", @@ -1596,8 +1556,8 @@ }, { "pname": "System.Text.Encoding.CodePages", - "version": "6.0.0", - "hash": "sha256-nGc2A6XYnwqGcq8rfgTRjGr+voISxNe/76k2K36coj4=" + "version": "8.0.0", + "hash": "sha256-fjCLQc1PRW0Ix5IZldg0XKv+J1DqPSfu9pjMyNBp7dE=" }, { "pname": "System.Text.Encoding.Extensions", @@ -1611,23 +1571,18 @@ }, { "pname": "System.Text.Encodings.Web", - "version": "6.0.0", - "hash": "sha256-UemDHGFoQIG7ObQwRluhVf6AgtQikfHEoPLC6gbFyRo=" + "version": "8.0.0", + "hash": "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE=" }, { "pname": "System.Text.Json", - "version": "6.0.0", - "hash": "sha256-9AE/5ds4DqEfb0l+27fCBTSeYCdRWhxh2Bhg8IKvIuo=" + "version": "8.0.1", + "hash": "sha256-Y0ba+eTXdrJZgET0xaurt1nkKbQRNBhod+KMcg9IdR4=" }, { "pname": "System.Text.Json", - "version": "6.0.10", - "hash": "sha256-UijYh0dxFjFinMPSTJob96oaRkNm+Wsa+7Ffg6mRnsc=" - }, - { - "pname": "System.Text.Json", - "version": "6.0.9", - "hash": "sha256-5jjvxV8ubGYjkydDhLsGZXB6ml3O/7CGauQcu1ikeLs=" + "version": "8.0.5", + "hash": "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68=" }, { "pname": "System.Text.RegularExpressions", @@ -1699,11 +1654,6 @@ "version": "4.7.0", "hash": "sha256-yW+GvQranReaqPw5ZFv+mSjByQ5y1pRLl05JIEf3tYU=" }, - { - "pname": "System.Windows.Extensions", - "version": "6.0.0", - "hash": "sha256-N+qg1E6FDJ9A9L50wmVt3xPQV8ZxlG1xeXgFuxO+yfM=" - }, { "pname": "System.Xml.ReaderWriter", "version": "4.0.11", diff --git a/pkgs/by-name/so/sonarr/package.nix b/pkgs/by-name/so/sonarr/package.nix index 1eed555f67eb..870c4412aec2 100644 --- a/pkgs/by-name/so/sonarr/package.nix +++ b/pkgs/by-name/so/sonarr/package.nix @@ -17,14 +17,41 @@ python3Packages, nix, prefetch-yarn-deps, + fetchpatch, + applyPatches, }: let version = "4.0.12.2823"; - src = fetchFromGitHub { - owner = "Sonarr"; - repo = "Sonarr"; - tag = "v${version}"; - hash = "sha256-gAvbA3Idx73QEDthLwrM8Jbt6YhXxK8LzEJI6eF2k20="; + # The dotnet8 compatibility patches also change `yarn.lock`, so we must pass + # the already patched lockfile to `fetchYarnDeps`. + src = applyPatches { + src = fetchFromGitHub { + owner = "Sonarr"; + repo = "Sonarr"; + tag = "v${version}"; + hash = "sha256-gAvbA3Idx73QEDthLwrM8Jbt6YhXxK8LzEJI6eF2k20="; + }; + patches = + [ + ./nuget-config.patch + ] + ++ lib.optionals (lib.versionOlder version "5.0") [ + # See https://github.com/Sonarr/Sonarr/issues/7442 and + # https://github.com/Sonarr/Sonarr/pull/7443. + # Unfortunately, the .NET 8 upgrade was only merged into the v5 branch, + # and it may take some time for that to become stable. + # However, the patches cleanly apply to v4 as well. + (fetchpatch { + name = "dotnet8-compatibility"; + url = "https://github.com/Sonarr/Sonarr/commit/518f1799dca96a7481004ceefe39be465de3d72d.patch"; + hash = "sha256-e+/rKZrTf6lWq9bmCAwnZrbEPRkqVmI7qNavpLjfpUE="; + }) + (fetchpatch { + name = "dotnet8-darwin-compatibility"; + url = "https://github.com/Sonarr/Sonarr/commit/1a5fa185d11d2548f45fefb8a0facd3731a946d0.patch"; + hash = "sha256-6Lzo4ph1StA05+B1xYhWH+BBegLd6DxHiEiaRxGXn7k="; + }) + ]; }; rid = dotnetCorePackages.systemToDotnetRid stdenvNoCC.hostPlatform.system; in @@ -32,10 +59,6 @@ buildDotnetModule { pname = "sonarr"; inherit version src; - patches = [ - ./nuget-config.patch - ]; - strictDeps = true; nativeBuildInputs = [ nodejs @@ -46,7 +69,7 @@ buildDotnetModule { yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-ejAf8/zWX9TbC645vbpyLwa6mrnitU7ByImrJ1d/uX0="; + hash = "sha256-YkBFvv+g4p22HdM/GQAHVGGW1yLYGWpNtRq7+QJiLIw="; }; ffprobe = lib.optionalDrvAttr withFFmpeg (lib.getExe' ffmpeg "ffprobe"); @@ -77,8 +100,8 @@ buildDotnetModule { runtimeDeps = [ sqlite ]; - dotnet-sdk = dotnetCorePackages.sdk_6_0-bin; - dotnet-runtime = dotnetCorePackages.aspnetcore_6_0-bin; + dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-runtime = dotnetCorePackages.aspnetcore_8_0; doCheck = true; @@ -104,7 +127,7 @@ buildDotnetModule { ]; dotnetFlags = [ - "--property:TargetFramework=net6.0" + "--property:TargetFramework=net8.0" "--property:EnableAnalyzers=false" # Override defaults in src/Directory.Build.props that use current time. "--property:Copyright=Copyright 2014-2025 sonarr.tv (GNU General Public v3)" diff --git a/pkgs/by-name/so/sonarr/update.py b/pkgs/by-name/so/sonarr/update.py index 80dc8e5f7552..62ac18f48ac7 100644 --- a/pkgs/by-name/so/sonarr/update.py +++ b/pkgs/by-name/so/sonarr/update.py @@ -55,7 +55,7 @@ package_attrs = json.loads(subprocess.run( "--apply", """p: { dir = builtins.dirOf p.meta.position; version = p.version; - sourceHash = p.src.outputHash; + sourceHash = p.src.src.outputHash; yarnHash = p.yarnOfflineCache.outputHash; }""", "--", @@ -97,19 +97,6 @@ source_nix_hash, source_store_path = subprocess.run( old_source_hash = package_attrs["sourceHash"] new_source_hash = nix_hash_to_sri(source_nix_hash) -old_yarn_hash = package_attrs["yarnHash"] -new_yarn_hash = nix_hash_to_sri(subprocess.run( - [ - "prefetch-yarn-deps", - # does not support "--" separator :( - # Also --verbose writes to stdout, yikes. - os.path.join(source_store_path, "yarn.lock"), - ], - stdout=subprocess.PIPE, - text=True, - check=True, -).stdout.rstrip()) - package_dir = package_attrs["dir"] package_file_name = "package.nix" deps_file_name = "deps.json" @@ -127,6 +114,39 @@ with tempfile.TemporaryDirectory() as work_dir: # Try to be more specific to avoid false positive matches. f"version = \"{old_version}\"": f"version = \"{new_version}\"", old_source_hash: new_source_hash, + }) + + # We need access to the patched and updated src to get the patched `yarn.lock`. + patched_src = os.path.join(work_dir, "patched-src") + subprocess.run( + [ + "nix", + "--extra-experimental-features", "nix-command", + "build", + "--impure", + "--nix-path", "", + "--include", f"nixpkgs={nixpkgs_path}", + "--include", f"package={package_file}", + "--expr", "(import { }).callPackage { }", + "--out-link", patched_src, + "src", + ], + check=True, + ) + old_yarn_hash = package_attrs["yarnHash"] + new_yarn_hash = nix_hash_to_sri(subprocess.run( + [ + "prefetch-yarn-deps", + # does not support "--" separator :( + # Also --verbose writes to stdout, yikes. + os.path.join(patched_src, "yarn.lock"), + ], + stdout=subprocess.PIPE, + text=True, + check=True, + ).stdout.rstrip()) + + replace_in_file(package_file, { old_yarn_hash: new_yarn_hash, }) From e93c5752112cfba450faa683c8c73942fbccc008 Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Fri, 7 Feb 2025 11:54:55 +0100 Subject: [PATCH 0574/2168] sonarr: disable failing darwin tests --- pkgs/by-name/so/sonarr/package.nix | 46 ++++++++++++++++-------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/pkgs/by-name/so/sonarr/package.nix b/pkgs/by-name/so/sonarr/package.nix index 870c4412aec2..da731ccd7626 100644 --- a/pkgs/by-name/so/sonarr/package.nix +++ b/pkgs/by-name/so/sonarr/package.nix @@ -139,32 +139,36 @@ buildDotnetModule { # Skip manual, integration, automation and platform-dependent tests. dotnetTestFlags = [ "--filter:${ - lib.concatStringsSep "&" [ - "TestCategory!=ManualTest" - "TestCategory!=IntegrationTest" - "TestCategory!=AutomationTest" + lib.concatStringsSep "&" ( + [ + "TestCategory!=ManualTest" + "TestCategory!=IntegrationTest" + "TestCategory!=AutomationTest" - # setgid tests - "FullyQualifiedName!=NzbDrone.Mono.Test.DiskProviderTests.DiskProviderFixture.should_preserve_setgid_on_set_folder_permissions" - "FullyQualifiedName!=NzbDrone.Mono.Test.DiskProviderTests.DiskProviderFixture.should_clear_setgid_on_set_folder_permissions" + # setgid tests + "FullyQualifiedName!=NzbDrone.Mono.Test.DiskProviderTests.DiskProviderFixture.should_preserve_setgid_on_set_folder_permissions" + "FullyQualifiedName!=NzbDrone.Mono.Test.DiskProviderTests.DiskProviderFixture.should_clear_setgid_on_set_folder_permissions" - # we do not set application data directory during tests (i.e. XDG data directory) - "FullyQualifiedName!=NzbDrone.Mono.Test.DiskProviderTests.FreeSpaceFixture.should_return_free_disk_space" + # we do not set application data directory during tests (i.e. XDG data directory) + "FullyQualifiedName!=NzbDrone.Mono.Test.DiskProviderTests.FreeSpaceFixture.should_return_free_disk_space" - # attempts to read /etc/*release and fails since it does not exist - "FullyQualifiedName!=NzbDrone.Mono.Test.EnvironmentInfo.ReleaseFileVersionAdapterFixture.should_get_version_info" + # attempts to read /etc/*release and fails since it does not exist + "FullyQualifiedName!=NzbDrone.Mono.Test.EnvironmentInfo.ReleaseFileVersionAdapterFixture.should_get_version_info" - # fails to start test dummy because it cannot locate .NET runtime for some reason - "FullyQualifiedName!=NzbDrone.Common.Test.ProcessProviderFixture.Should_be_able_to_start_process" - "FullyQualifiedName!=NzbDrone.Common.Test.ProcessProviderFixture.kill_all_should_kill_all_process_with_name" + # fails to start test dummy because it cannot locate .NET runtime for some reason + "FullyQualifiedName!=NzbDrone.Common.Test.ProcessProviderFixture.Should_be_able_to_start_process" + "FullyQualifiedName!=NzbDrone.Common.Test.ProcessProviderFixture.kill_all_should_kill_all_process_with_name" - # makes real HTTP requests - "FullyQualifiedName!~NzbDrone.Core.Test.TvTests.RefreshEpisodeServiceFixture" - "FullyQualifiedName!~NzbDrone.Core.Test.UpdateTests.UpdatePackageProviderFixture" - - # fails on macOS - "FullyQualifiedName!~NzbDrone.Core.Test.Http.HttpProxySettingsProviderFixture" - ] + # makes real HTTP requests + "FullyQualifiedName!~NzbDrone.Core.Test.TvTests.RefreshEpisodeServiceFixture" + "FullyQualifiedName!~NzbDrone.Core.Test.UpdateTests.UpdatePackageProviderFixture" + ] + ++ lib.optionals stdenvNoCC.buildPlatform.isDarwin [ + # fails on macOS + "FullyQualifiedName!~NzbDrone.Core.Test.Http.HttpProxySettingsProviderFixture" + "FullyQualifiedName!=NzbDrone.Common.Test.ServiceFactoryFixture.event_handlers_should_be_unique" + ] + ) }" ]; From e16a609fa71d4c8a5263e9d34f952b48b347fa69 Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Fri, 7 Feb 2025 20:46:02 +0100 Subject: [PATCH 0575/2168] sonarr: add niklaskorz to maintainers --- pkgs/by-name/so/sonarr/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/so/sonarr/package.nix b/pkgs/by-name/so/sonarr/package.nix index da731ccd7626..d0b3293a494f 100644 --- a/pkgs/by-name/so/sonarr/package.nix +++ b/pkgs/by-name/so/sonarr/package.nix @@ -199,6 +199,7 @@ buildDotnetModule { fadenb purcell tie + niklaskorz ]; mainProgram = "Sonarr"; # platforms inherited from dotnet-sdk. From 2a05faf883bb71af11a0c52e648b4ee8af6a2567 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Feb 2025 16:40:45 +0000 Subject: [PATCH 0576/2168] tutanota-desktop: 259.250108.1 -> 266.250202.0 --- pkgs/by-name/tu/tutanota-desktop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tu/tutanota-desktop/package.nix b/pkgs/by-name/tu/tutanota-desktop/package.nix index 235b2dd424c2..2911cffa1879 100644 --- a/pkgs/by-name/tu/tutanota-desktop/package.nix +++ b/pkgs/by-name/tu/tutanota-desktop/package.nix @@ -7,11 +7,11 @@ appimageTools.wrapType2 rec { pname = "tutanota-desktop"; - version = "259.250108.1"; + version = "266.250202.0"; src = fetchurl { url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage"; - hash = "sha256-VXHhN+6k1Jd/4tPxxLwXNYYPjpl+yBn8gRDLlfvCS4g="; + hash = "sha256-N1Jl4t2oGQKcA3ChBfSHsKRFdJYg2cns5MCVob7yY+c="; }; extraPkgs = pkgs: [ pkgs.libsecret ]; From aa45632cfe9b008479d80b8cd171da38f5029c66 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Feb 2025 16:54:59 +0000 Subject: [PATCH 0577/2168] gitxray: 1.0.17 -> 1.0.17.1 --- pkgs/by-name/gi/gitxray/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/gitxray/package.nix b/pkgs/by-name/gi/gitxray/package.nix index 565edc247fed..3898b3aaf1c7 100644 --- a/pkgs/by-name/gi/gitxray/package.nix +++ b/pkgs/by-name/gi/gitxray/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "gitxray"; - version = "1.0.17"; + version = "1.0.17.1"; pyproject = true; src = fetchFromGitHub { owner = "kulkansecurity"; repo = "gitxray"; tag = version; - hash = "sha256-wPqjCIHYvU1QuQIXCrbzr8+JtwQmFNHzAjxr8AXkxrc="; + hash = "sha256-T4s7mgfZs2RIq/iLXT0WBbVhdY8JhEyTJ2CmUycifRc="; }; build-system = with python3.pkgs; [ setuptools ]; @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { meta = { description = "Tool which leverages Public GitHub REST APIs for various tasks"; homepage = "https://github.com/kulkansecurity/gitxray"; - changelog = "https://github.com/kulkansecurity/gitxray/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/kulkansecurity/gitxray/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ fab ]; mainProgram = "gitxray"; From f19d42e742147b3b38433cfc969c552d56ae5d24 Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Sat, 8 Feb 2025 18:01:34 +0100 Subject: [PATCH 0578/2168] maxima: don't create dangling symlink --- pkgs/applications/science/math/maxima/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index cf6f2f3bb25b..632bc9e4d1b3 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -58,9 +58,8 @@ stdenv.mkDerivation (finalAttrs: { for prog in "$out/bin/"*; do wrapProgram "$prog" --prefix PATH ":" "$out/bin:${searchPath}" done - # Move emacs modules and documentation into the right place. - mkdir -p $out/share/emacs $out/share/doc - ln -s ../maxima/${finalAttrs.version}/emacs $out/share/emacs/site-lisp + # Move documentation into the right place. + mkdir -p $out/share/doc ln -s ../maxima/${finalAttrs.version}/doc $out/share/doc/maxima '' + (lib.optionalString (lisp-compiler.pname == "ecl") '' From 598a79d58b2ea0d7d080c4eadeded981e32ffdad Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sat, 8 Feb 2025 17:40:57 +0100 Subject: [PATCH 0579/2168] palemoon-bin: 33.5.1 -> 33.6.0 --- pkgs/applications/networking/browsers/palemoon/bin.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix index a6f5ef942fa0..3f736802f614 100644 --- a/pkgs/applications/networking/browsers/palemoon/bin.nix +++ b/pkgs/applications/networking/browsers/palemoon/bin.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "palemoon-bin"; - version = "33.5.1"; + version = "33.6.0"; src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}"; @@ -172,11 +172,11 @@ stdenv.mkDerivation (finalAttrs: { { gtk3 = fetchzip { urls = urlRegionVariants "gtk3"; - hash = "sha256-N3z03c4DsEG/L3T4BjOSx7XOGT988ZDshYhgl9TuOQM="; + hash = "sha256-fOha0D8drFbKtfl/UA4MqzBhhBrvS3T81XP09RZQc9c="; }; gtk2 = fetchzip { urls = urlRegionVariants "gtk2"; - hash = "sha256-L+SgmjzilFFK8FcutINVac4MCAPvgJ3OqpwBaQqNlCI="; + hash = "sha256-r8sAkQ7XiYs39VZjvegVgx7KrfB8WyZfcl/XgGV/kwA="; }; }; From aa5b1e6ac3ae5fe9ba2c26a4af637a04f1222c4c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Feb 2025 17:12:30 +0000 Subject: [PATCH 0580/2168] plasma-panel-colorizer: 2.1.0 -> 2.3.0 --- pkgs/by-name/pl/plasma-panel-colorizer/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pl/plasma-panel-colorizer/package.nix b/pkgs/by-name/pl/plasma-panel-colorizer/package.nix index 97410aeaa8e1..98278cbe8e60 100644 --- a/pkgs/by-name/pl/plasma-panel-colorizer/package.nix +++ b/pkgs/by-name/pl/plasma-panel-colorizer/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "plasma-panel-colorizer"; - version = "2.1.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "luisbocanegra"; repo = "plasma-panel-colorizer"; tag = "v${finalAttrs.version}"; - hash = "sha256-Xv1yGIGIWqfxukJub0X2sH0XwtRTr13p+vDi+Wdgnkg="; + hash = "sha256-Q7qSky/wY5l72EVhTGnwQ8lI3Uu3TnZpgqXaClCxWZQ="; }; nativeBuildInputs = [ From 06ef4c9f6002afdcc26825c630a045d0683cec3b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Feb 2025 17:14:38 +0000 Subject: [PATCH 0581/2168] coroot: 1.6.8 -> 1.8.2 --- pkgs/by-name/co/coroot/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/coroot/package.nix b/pkgs/by-name/co/coroot/package.nix index a59b65ff6101..4116fc302b90 100644 --- a/pkgs/by-name/co/coroot/package.nix +++ b/pkgs/by-name/co/coroot/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "coroot"; - version = "1.6.8"; + version = "1.8.2"; src = fetchFromGitHub { owner = "coroot"; repo = "coroot"; rev = "v${version}"; - hash = "sha256-ndzn0ZcuzdmCXnijUr6jq3KSFqSdF2FYd/2qi5Huk5Y="; + hash = "sha256-jPsaZID9H2zDPUCUSmwTkLEs+mZ+6esyHNyyW5gwQc0="; }; vendorHash = "sha256-wyxNT8g5TUCjlxauL7NmCf4HZ91V2nD64L1L/rYH864="; From bfca25fb068fe79c0581b5213883dbd848def93d Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Sat, 8 Feb 2025 18:42:31 +0100 Subject: [PATCH 0582/2168] proton-ge-bin: GE-Proton9-23 -> GE-Proton9-24 --- pkgs/by-name/pr/proton-ge-bin/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/proton-ge-bin/package.nix b/pkgs/by-name/pr/proton-ge-bin/package.nix index b4f108966d7a..ab00ecc360b3 100644 --- a/pkgs/by-name/pr/proton-ge-bin/package.nix +++ b/pkgs/by-name/pr/proton-ge-bin/package.nix @@ -6,11 +6,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "proton-ge-bin"; - version = "GE-Proton9-23"; + version = "GE-Proton9-24"; src = fetchzip { url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz"; - hash = "sha256-eC1vYUfSsESPSaQK6wnOgXMf6fzn+NZ7SU/al5kY6CY="; + hash = "sha256-L0GkzpSn4f6dLDOm2iDJr8D1DINTHNW9Kkn1xFTuqfo="; }; outputs = [ From 655af7647ce008e52480919ecf3322632ee99e99 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Sun, 2 Feb 2025 21:34:10 -0800 Subject: [PATCH 0583/2168] python312Packages.langchain-groq: init at 0.2.4 --- .../python-modules/langchain-groq/default.nix | 64 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 66 insertions(+) create mode 100644 pkgs/development/python-modules/langchain-groq/default.nix diff --git a/pkgs/development/python-modules/langchain-groq/default.nix b/pkgs/development/python-modules/langchain-groq/default.nix new file mode 100644 index 000000000000..8f4bdf609c6c --- /dev/null +++ b/pkgs/development/python-modules/langchain-groq/default.nix @@ -0,0 +1,64 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + poetry-core, + + # dependencies + langchain-core, + groq, + + # tests + langchain-tests, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "langchain-groq"; + version = "0.2.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "langchain-ai"; + repo = "langchain"; + tag = "langchain-groq==${version}"; + hash = "sha256-hXY0xmt0rvV/AhMZTR+UxMz0ba7pJjRzBRVn6XvX6cA="; + }; + + sourceRoot = "${src.name}/libs/partners/groq"; + + build-system = [ poetry-core ]; + + pythonRelaxDeps = [ "langchain-core" ]; + + dependencies = [ + langchain-core + groq + ]; + + nativeCheckInputs = [ + langchain-tests + pytestCheckHook + ]; + + pytestFlagsArray = [ "tests/unit_tests" ]; + + pythonImportsCheck = [ "langchain_groq" ]; + + passthru = { + inherit (langchain-core) updateScript; + skipBulkUpdate = true; # Broken, see https://github.com/NixOS/nixpkgs/issues/379898 + }; + + meta = { + changelog = "https://github.com/langchain-ai/langchain/releases/tag/langchain-groq==${version}"; + description = "Integration package connecting Groq and LangChain"; + homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/partners/groq"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + sarahec + ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d366c45cd051..1df6d26b04af 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7117,6 +7117,8 @@ self: super: with self; { langchain-core = callPackage ../development/python-modules/langchain-core { }; + langchain-groq = callPackage ../development/python-modules/langchain-groq { }; + langchain-huggingface = callPackage ../development/python-modules/langchain-huggingface { }; langchain-mongodb = callPackage ../development/python-modules/langchain-mongodb { }; From f7dc963db71068436d43f06a28db6f69c61d80fa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Feb 2025 17:57:53 +0000 Subject: [PATCH 0584/2168] gum: 0.15.1 -> 0.15.2 --- pkgs/by-name/gu/gum/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gu/gum/package.nix b/pkgs/by-name/gu/gum/package.nix index 72e95817a892..7a51afe56b03 100644 --- a/pkgs/by-name/gu/gum/package.nix +++ b/pkgs/by-name/gu/gum/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "gum"; - version = "0.15.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "charmbracelet"; repo = pname; rev = "v${version}"; - hash = "sha256-5/ifKAKKl4adhTsrfIzViLuYpHyf1W6L0KQXk9EObow="; + hash = "sha256-kQDCgQXI9jTUHM8UEfDSLXMoUUMOt0Iccv3P3RtPOIg="; }; - vendorHash = "sha256-H29cyhgC+ZI7CjFTfYb4ekvHfkMfUUzgCDtWXYW6iYM="; + vendorHash = "sha256-WxM1gCIsxRWNq9IdBux4BJi6r87wY2/6vtMjEDSQnv0="; nativeBuildInputs = [ installShellFiles From bbc378d20ee380d7e6b19222e47b578561f94245 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Sat, 8 Feb 2025 17:59:17 +0000 Subject: [PATCH 0585/2168] python313Packages.zodb: refactor, add missing zope-testing zope-testing is no longer propagated from zope-testrunner since #369331 --- .../python-modules/zodb/default.nix | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix index 704bbabebfc0..82c7423e02ba 100644 --- a/pkgs/development/python-modules/zodb/default.nix +++ b/pkgs/development/python-modules/zodb/default.nix @@ -1,11 +1,12 @@ { lib, - fetchPypi, + fetchFromGitHub, buildPythonPackage, python, + setuptools, + zope-testing, zope-testrunner, transaction, - six, zope-interface, zodbpickle, zconfig, @@ -18,11 +19,13 @@ buildPythonPackage rec { pname = "zodb"; version = "6.0"; + pyproject = true; - src = fetchPypi { - pname = "ZODB"; - inherit version; - hash = "sha256-5Rx5IRXF2q1OgGdXuvovdUwADCPmurw75eQHdf5Jtdw="; + src = fetchFromGitHub { + owner = "zopefoundation"; + repo = "zodb"; + tag = version; + hash = "sha256-AFlRDci/OnRDGVNHAMAssefZshaGT0XlkhaO/Aee2Ao="; }; # remove broken test @@ -30,9 +33,10 @@ buildPythonPackage rec { rm -vf src/ZODB/tests/testdocumentation.py ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ transaction - six zope-interface zodbpickle zconfig @@ -43,6 +47,7 @@ buildPythonPackage rec { nativeCheckInputs = [ manuel + zope-testing zope-testrunner ]; @@ -50,11 +55,11 @@ buildPythonPackage rec { ${python.interpreter} -m zope.testrunner --test-path=src [] ''; - meta = with lib; { + meta = { description = "Zope Object Database: object database and persistence"; homepage = "https://zodb-docs.readthedocs.io/"; changelog = "https://github.com/zopefoundation/ZODB/blob/${version}/CHANGES.rst"; - license = licenses.zpl21; + license = lib.licenses.zpl21; maintainers = [ ]; }; } From 92fd0de1c49ac837d66986390aadca0b00c044ec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Feb 2025 18:02:26 +0000 Subject: [PATCH 0586/2168] cargo-leptos: 0.2.26 -> 0.2.27 --- pkgs/by-name/ca/cargo-leptos/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-leptos/package.nix b/pkgs/by-name/ca/cargo-leptos/package.nix index 5f6fcb14e5f8..e7f64d08921b 100644 --- a/pkgs/by-name/ca/cargo-leptos/package.nix +++ b/pkgs/by-name/ca/cargo-leptos/package.nix @@ -16,17 +16,17 @@ let in rustPlatform.buildRustPackage rec { pname = "cargo-leptos"; - version = "0.2.26"; + version = "0.2.27"; src = fetchFromGitHub { owner = "leptos-rs"; repo = pname; rev = "v${version}"; - hash = "sha256-v1gNH3pq5db/swsk79nEzgtR4jy3f/xHs4QaLnVcVYU="; + hash = "sha256-1aknYwxHpMJmieg0HGu6E+uAUH01l6qZvbZsVK+cP34="; }; useFetchCargoVendor = true; - cargoHash = "sha256-fyOlMagXrpfMsaLffeXolTgMldN9u6RQ08Zak9MdC4U="; + cargoHash = "sha256-dTyPY0kUXh7PZ4kEPGX/DilN9tAV8RT2luRG3xiJK+o="; buildInputs = optionals isDarwin [ SystemConfiguration From a902b13ea02cb370763687f4e935bd63a52075ee Mon Sep 17 00:00:00 2001 From: Uwe Schlifkowitz Date: Sat, 8 Feb 2025 19:05:45 +0100 Subject: [PATCH 0587/2168] tera-cli: 0.4.0 -> 0.5.0 --- pkgs/by-name/te/tera-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/tera-cli/package.nix b/pkgs/by-name/te/tera-cli/package.nix index 2b9f6077c088..66429fa08504 100644 --- a/pkgs/by-name/te/tera-cli/package.nix +++ b/pkgs/by-name/te/tera-cli/package.nix @@ -5,17 +5,17 @@ }: rustPlatform.buildRustPackage rec { pname = "tera-cli"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "chevdor"; repo = "tera-cli"; rev = "v${version}"; - hash = "sha256-mYFvqzSnTljzRbb9W4/hY7fOO35UF31P5M49JkM58R8="; + hash = "sha256-TN3zkxZC0Y9lev2wmvzwyLU+t4rNwut/dQILIA7+qbw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-7UKdnq5xmkO95Sf9YR3LqS2RoUYGbvWqRYUXNQXfkf0="; + cargoHash = "sha256-+qf/MlifpVXzDpADJoTqxU40wDntcPu+bW7eq6/iubk="; meta = with lib; { description = "Command line utility to render templates from json|toml|yaml and ENV, using the tera templating engine"; From bb4281dcaa318e63b0315dd2122fd60522c682a9 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Sat, 8 Feb 2025 19:21:35 +0100 Subject: [PATCH 0588/2168] Revert "python3Packages.materialx: 1.38.10 -> 1.39.1" This reverts commit e4d1e54749df0eaed81325315cb381578d9d07ed. This is necessary, because 1.39 introduces breaking changes and downstream software (e.g. openUSD) needs to adapt, first. See https://github.com/NixOS/nixpkgs/pull/326466#issuecomment-2293029160 and https://github.com/NixOS/nixpkgs/issues/380230 --- pkgs/development/python-modules/materialx/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/materialx/default.nix b/pkgs/development/python-modules/materialx/default.nix index e6adc281de8e..b3ad7bbe0804 100644 --- a/pkgs/development/python-modules/materialx/default.nix +++ b/pkgs/development/python-modules/materialx/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "materialx"; - version = "1.39.1"; + version = "1.38.10"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "MaterialX"; - tag = "v${version}"; - hash = "sha256-WzzsY1hOWwJEqT/ZRLIoZDfKNvx1Yf6aFhA3ZcSPx+s="; + rev = "v${version}"; + hash = "sha256-/kMHmW2dptZNtjuhE5s+jvPRIdtY+FRiVtMU+tiBgQo="; }; format = "other"; @@ -65,7 +65,7 @@ buildPythonPackage rec { ''; meta = { - changelog = "https://github.com/AcademySoftwareFoundation/MaterialX/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/AcademySoftwareFoundation/MaterialX/blob/${src.rev}/CHANGELOG.md"; description = "Open standard for representing rich material and look-development content in computer graphics"; homepage = "https://materialx.org"; maintainers = [ lib.maintainers.gador ]; From 00c386ebc854ea4299b8aa6504a18552130a7652 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Sat, 8 Feb 2025 19:26:14 +0100 Subject: [PATCH 0589/2168] python312Packages.materialx: do not auto-update Signed-off-by: Florian Brandes --- pkgs/development/python-modules/materialx/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/materialx/default.nix b/pkgs/development/python-modules/materialx/default.nix index b3ad7bbe0804..5d2c09dfef7f 100644 --- a/pkgs/development/python-modules/materialx/default.nix +++ b/pkgs/development/python-modules/materialx/default.nix @@ -64,6 +64,12 @@ buildPythonPackage rec { ln -s $out/python $target_dir ''; + # Update to 1.39 has major API changes and downstream software + # needs to adapt, first. So, do not include in mass updates. For reference, see + # https://github.com/NixOS/nixpkgs/pull/326466#issuecomment-2293029160 + # and https://github.com/NixOS/nixpkgs/issues/380230 + passthru.skipBulkUpdate = true; + meta = { changelog = "https://github.com/AcademySoftwareFoundation/MaterialX/blob/${src.rev}/CHANGELOG.md"; description = "Open standard for representing rich material and look-development content in computer graphics"; From 8a6a0300dc51cd8dd802c5178ceb8a5a2f8ec40d Mon Sep 17 00:00:00 2001 From: emaryn Date: Sun, 9 Feb 2025 02:35:20 +0800 Subject: [PATCH 0590/2168] navicat-premium: 17.1.7 -> 17.1.8 --- pkgs/by-name/na/navicat-premium/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/na/navicat-premium/package.nix b/pkgs/by-name/na/navicat-premium/package.nix index 1b774964ea09..24804512b2fd 100644 --- a/pkgs/by-name/na/navicat-premium/package.nix +++ b/pkgs/by-name/na/navicat-premium/package.nix @@ -6,20 +6,20 @@ }: let pname = "navicat-premium"; - version = "17.1.7"; + version = "17.1.8"; src = { x86_64-linux = fetchurl { - url = "https://web.archive.org/web/20241217004300/https://dn.navicat.com/download/navicat17-premium-en-x86_64.AppImage"; - hash = "sha256-5dzZh06Ld8t4tgE3tWGPAaBuKcT9iSxi8KpSdO4Un64="; + url = "https://web.archive.org/web/20250208181645/https://dn.navicat.com/download/navicat17-premium-en-x86_64.AppImage"; + hash = "sha256-dPZIgq0vuBF4K2U12EKdGnDpfS67Afxmw+G7eLyYdpg="; }; aarch64-linux = fetchurl { - url = "https://web.archive.org/web/20241217005701/https://dn.navicat.com/download/navicat17-premium-en-aarch64.AppImage"; - hash = "sha256-4NvjdNTo/WUlZIRAzA2D39NupqMjlCvjHSWk06spqRc="; + url = "https://web.archive.org/web/20250208182611/https://dn.navicat.com/download/navicat17-premium-en-aarch64.AppImage"; + hash = "sha256-IDcL4uqhTd20UOX3Zt8lpeTj8FhcbT+7RtsEzcP5dGI="; }; } - .${stdenv.hostPlatform.system}; + .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); appimageContents = appimageTools.extractType2 { inherit pname version src; From 7e0adfaceafaa6ed2ee00b9f158ccf7137babb69 Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Sat, 8 Feb 2025 19:36:52 +0100 Subject: [PATCH 0591/2168] giac: fix broken symlink from doc to out --- pkgs/by-name/gi/giac/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/gi/giac/package.nix b/pkgs/by-name/gi/giac/package.nix index 454c85eb418c..cf218da403a0 100644 --- a/pkgs/by-name/gi/giac/package.nix +++ b/pkgs/by-name/gi/giac/package.nix @@ -209,7 +209,9 @@ stdenv.mkDerivation rec { if [ -n "$doc" ]; then mkdir -p "$doc/share/giac" + # $out/share/giac/doc/aide_cas is a symlink to ../aide_cas mv "$out/share/giac/doc" "$doc/share/giac" + ln -sf "$out/share/giac/aide_cas" "$doc/share/giac/doc/aide_cas" mv "$out/share/giac/examples" "$doc/share/giac" fi '' From 7bfe1d3a396811ffa2dd65102fd561b74a9cce14 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Feb 2025 19:05:39 +0000 Subject: [PATCH 0592/2168] pyflyby: 1.9.10 -> 1.9.11 --- pkgs/by-name/py/pyflyby/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/py/pyflyby/package.nix b/pkgs/by-name/py/pyflyby/package.nix index ee3957c3248a..366ca2316fcb 100644 --- a/pkgs/by-name/py/pyflyby/package.nix +++ b/pkgs/by-name/py/pyflyby/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: let - version = "1.9.10"; + version = "1.9.11"; in python3.pkgs.buildPythonApplication rec { inherit version; @@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec { owner = "deshaw"; repo = "pyflyby"; tag = version; - hash = "sha256-Q0Z429DUB0PpPNGajuMQBi4K6cotAC8hXP1bo69O7y8="; + hash = "sha256-BBFLkojG0MeJ8Bj8cc10x/rUITqb4/UbLB+FQIVpYrw="; }; build-system = with python3.pkgs; [ From 64195abc27536fbdbf87c3451ad9f8ffca27e3b0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Feb 2025 19:07:07 +0000 Subject: [PATCH 0593/2168] turnon: 2.0.0 -> 2.3.1 --- pkgs/by-name/tu/turnon/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tu/turnon/package.nix b/pkgs/by-name/tu/turnon/package.nix index d9c5a345fedb..37c4a04ed449 100644 --- a/pkgs/by-name/tu/turnon/package.nix +++ b/pkgs/by-name/tu/turnon/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage rec { pname = "turnon"; - version = "2.0.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "swsnr"; repo = "turnon"; rev = "v${version}"; - hash = "sha256-HCeK0aOGxeiZD7Am+kUf3z4rT7JENQxyrAufBStrSms="; + hash = "sha256-Dl0uTPXy57W18WBxHpytL6Nq9tTrzYOdC3u1O4Dnm3w="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Ya4HiYGotRjl6HTIQGcBgqsJRoj6wl56MC1UAmw+qNA="; + cargoHash = "sha256-EL7xLXtOzvitVMsDeMUcLR9hdvM2wjBZBEgJPJLanUE="; nativeBuildInputs = [ cairo From 4b2f23fb1fd2e9842a510043cbc58c839d90c4d8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Feb 2025 20:29:29 +0100 Subject: [PATCH 0594/2168] python313Packages.heatzypy: 2.5.6 -> 2.5.7 Diff: https://github.com/Cyr-ius/heatzypy/compare/refs/tags/2.5.6...2.5.7 Changelog: https://github.com/cyr-ius/heatzypy/releases/tag/2.5.7 --- pkgs/development/python-modules/heatzypy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/heatzypy/default.nix b/pkgs/development/python-modules/heatzypy/default.nix index b734951c15c0..3b250e4d32e5 100644 --- a/pkgs/development/python-modules/heatzypy/default.nix +++ b/pkgs/development/python-modules/heatzypy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "heatzypy"; - version = "2.5.6"; + version = "2.5.7"; pyproject = true; disabled = pythonOlder "3.11"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Cyr-ius"; repo = "heatzypy"; tag = version; - hash = "sha256-+iT3lE54xt7usz9v9JZqwQa0Xf1eLlN5VuQrjzmWo6Y="; + hash = "sha256-MPieUg5p8j1OTWDwV/IY3dKz8bKcPrRy9tK2iKleEoM="; }; build-system = [ From 35bd3570a4081befc366686450801c259d5354a2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Feb 2025 20:32:04 +0100 Subject: [PATCH 0595/2168] python313Packages.itemadapter: 0.10.0 -> 0.11.0 Changelog: https://github.com/scrapy/itemadapter/raw/v0.11.0/Changelog.md --- pkgs/development/python-modules/itemadapter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/itemadapter/default.nix b/pkgs/development/python-modules/itemadapter/default.nix index 94191dd86a07..bf4825f704f4 100644 --- a/pkgs/development/python-modules/itemadapter/default.nix +++ b/pkgs/development/python-modules/itemadapter/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "itemadapter"; - version = "0.10.0"; + version = "0.11.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-JlXIxQ8ahAXJ+nS4zcTaf+xUHKIXvIIbkKzIRRyYqdI="; + hash = "sha256-Ow8n9MXi6K5BXYPj1g0zrbe6CbmMMGOLxgb7Hf8uzdI="; }; build-system = [ setuptools ]; From 47a24f95ccb34bd535c2518b2291d4ae979b843e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Feb 2025 20:34:10 +0100 Subject: [PATCH 0596/2168] python313Packages.itemadapter: add optional-dependencies --- pkgs/development/python-modules/itemadapter/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/itemadapter/default.nix b/pkgs/development/python-modules/itemadapter/default.nix index bf4825f704f4..459c6b9a76fc 100644 --- a/pkgs/development/python-modules/itemadapter/default.nix +++ b/pkgs/development/python-modules/itemadapter/default.nix @@ -1,8 +1,11 @@ { lib, + attrs, buildPythonPackage, fetchPypi, + pydantic, pythonOlder, + scrapy, setuptools, }: @@ -20,6 +23,12 @@ buildPythonPackage rec { build-system = [ setuptools ]; + optional-dependencies = { + attrs = [ attrs ]; + pydantic = [ pydantic ]; + scrapy = [ scrapy ]; + }; + # Infinite recursion with Scrapy doCheck = false; From fa3ebc5a7d2cc6eb67bd4882b0443fbddf81c0fc Mon Sep 17 00:00:00 2001 From: Rhys-T <108157737+Rhys-T@users.noreply.github.com> Date: Sat, 8 Feb 2025 14:37:17 -0500 Subject: [PATCH 0597/2168] timidity: fix symlink permissions for Darwin build All but one of the symlinks in the instruments.tar.gz tarball have their permissions set to 0000. This causes noBrokenSymlinks to fail silently at readlink on systems like Darwin/macOS that actually care about symlink permissions. It also seems to be the reason that turning on `dontRewriteSymlinks` on Darwin was necessary. Resolves #380436. --- pkgs/tools/misc/timidity/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix index a624efc23759..c139d741fab2 100644 --- a/pkgs/tools/misc/timidity/default.nix +++ b/pkgs/tools/misc/timidity/default.nix @@ -114,9 +114,10 @@ stdenv.mkDerivation rec { cp ${./timidity.cfg} $out/share/timidity/timidity.cfg substituteAllInPlace $out/share/timidity/timidity.cfg tar --strip-components=1 -xf $instruments -C $out/share/timidity/ + # All but one of the symlinks in the instruments tarball have their permissions set to 0000. + # This causes problems on systems like Darwin that actually use symlink permissions. + chmod -Rh u+rwX $out/share/timidity/ ''; - # This fixup step is unnecessary and fails on Darwin - dontRewriteSymlinks = stdenv.hostPlatform.isDarwin; passthru.tests = nixosTests.timidity; From bf359677d1c0bb8cf5d115e3dfac3fc88582c299 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Feb 2025 19:41:53 +0000 Subject: [PATCH 0598/2168] python312Packages.pyinstaller-hooks-contrib: 2025.0 -> 2025.1 --- .../python-modules/pyinstaller-hooks-contrib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix b/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix index 1c5b304fa6f5..cc45401a6e68 100644 --- a/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix +++ b/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pyinstaller-hooks-contrib"; - version = "2025.0"; + version = "2025.1"; pyproject = true; src = fetchPypi { pname = "pyinstaller_hooks_contrib"; inherit version; - hash = "sha256-bcC1WhrKqy/+427UoFsHOqCiLkbyX7XGajHiF0VBNe0="; + hash = "sha256-EwgY+emgp/ImHx/WYFSWajpQyZ0ACYHF0dsR060MarI="; }; build-system = [ setuptools ]; From 83205e2b558edc77d7830ceacbb08aa9623260da Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Sat, 8 Feb 2025 19:57:29 +0100 Subject: [PATCH 0599/2168] gap: ship Makefile.gappkg for future gap package use --- pkgs/by-name/ga/gap/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ga/gap/package.nix b/pkgs/by-name/ga/gap/package.nix index 04137db888ea..9db7447db1bb 100644 --- a/pkgs/by-name/ga/gap/package.nix +++ b/pkgs/by-name/ga/gap/package.nix @@ -134,6 +134,7 @@ stdenv.mkDerivation rec { # https://github.com/NixOS/nixpkgs/pull/192548#discussion_r992824942 rm -r "$out/share/gap/pkg" cp -ar pkg tst "$out/share/gap" + cp -a etc/Makefile.gappkg "$out/share/gap/etc" ''; preFixup = '' From b003be32a43c2b08f4858d612b7ea874765f9cd4 Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Sat, 8 Feb 2025 21:09:22 +0100 Subject: [PATCH 0600/2168] sage: fix relevant broken symlinks, ignore others --- pkgs/by-name/sa/sage/package.nix | 4 ++-- pkgs/by-name/sa/sage/sage-src.nix | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sa/sage/package.nix b/pkgs/by-name/sa/sage/package.nix index a3f06f4a9e45..b8888c50e8af 100644 --- a/pkgs/by-name/sa/sage/package.nix +++ b/pkgs/by-name/sa/sage/package.nix @@ -48,8 +48,8 @@ let ]; language = "sage"; # just one 16x16 logo is available - logo32 = "${sage-src}/src/doc/common/themes/sage/static/sageicon.png"; - logo64 = "${sage-src}/src/doc/common/themes/sage/static/sageicon.png"; + logo32 = "${sage-src}/src/doc/common/static/sageicon.png"; + logo64 = "${sage-src}/src/doc/common/static/sageicon.png"; }; jupyter-kernel-specs = pkgs.jupyter-kernel.create { diff --git a/pkgs/by-name/sa/sage/sage-src.nix b/pkgs/by-name/sa/sage/sage-src.nix index 16ff02bcafa5..749999e2ce2a 100644 --- a/pkgs/by-name/sa/sage/sage-src.nix +++ b/pkgs/by-name/sa/sage/sage-src.nix @@ -99,6 +99,9 @@ stdenv.mkDerivation rec { "-p1" ]; + # harmless broken symlinks to (not) generated files used by sage-the-distro + dontCheckForBrokenSymlinks = true; + postPatch = '' # Make sure sage can at least be imported without setting any environment # variables. It won't be close to feature complete though. From b9b3987e260f62782760857c89907aa3f0191843 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sat, 8 Feb 2025 17:12:56 -0300 Subject: [PATCH 0601/2168] marwaita-icons: temporarily set dontCheckForBrokenSymlinks --- pkgs/by-name/ma/marwaita-icons/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ma/marwaita-icons/package.nix b/pkgs/by-name/ma/marwaita-icons/package.nix index b8cd39c7150f..7debe1ed1568 100644 --- a/pkgs/by-name/ma/marwaita-icons/package.nix +++ b/pkgs/by-name/ma/marwaita-icons/package.nix @@ -31,6 +31,9 @@ stdenvNoCC.mkDerivation rec { dontDropIconThemeCache = true; + # FIXME: https://github.com/darkomarko42/Marwaita-Icons/issues/3 + dontCheckForBrokenSymlinks = true; + installPhase = '' runHook preInstall From fcb50b7659701aeb2cacfb708a0a096b1b992cc9 Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Sat, 8 Feb 2025 18:22:52 +0000 Subject: [PATCH 0602/2168] nexusmods-app: add release-note for resetting before upgrading 24.11 has nexusmods-app 0.6.3, while 25.05 currently has 0.7.3. Unfortunately, nexusmods-app is unable to run when any state from a version older than 0.7.0 is still present. Therefore users must be instructed to reset all state before upgrading. --- doc/redirects.json | 3 +++ doc/release-notes/rl-2505.section.md | 10 ++++++++++ nixos/doc/manual/redirects.json | 3 +++ 3 files changed, 16 insertions(+) diff --git a/doc/redirects.json b/doc/redirects.json index e29cb93697f9..ddf3626bbd34 100644 --- a/doc/redirects.json +++ b/doc/redirects.json @@ -86,6 +86,9 @@ "index.html#building-a-titanium-app", "index.html#emulating-or-simulating-the-app" ], + "sec-nixpkgs-release-25.05-incompatibilities-nexusmods-app-upgraded": [ + "release-notes.html#sec-nixpkgs-release-25.05-incompatibilities-nexusmods-app-upgraded" + ], "sec-nixpkgs-release-25.05-lib": [ "release-notes.html#sec-nixpkgs-release-25.05-lib" ], diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md index 9c3a264db53e..6e5ad92b4240 100644 --- a/doc/release-notes/rl-2505.section.md +++ b/doc/release-notes/rl-2505.section.md @@ -18,6 +18,16 @@ - `titaniumenv`, `titanium`, and `titanium-alloy` have been removed due to lack of maintenance in Nixpkgs. +### NexusMods.App upgraded {#sec-nixpkgs-release-25.05-incompatibilities-nexusmods-app-upgraded} + +- `nexusmods-app` has been upgraded from version 0.6.3 to 0.7.3. + + - Before upgrading, you **must reset all app state** (mods, games, settings, etc). NexusMods.App will crash if any state from a version older than 0.7.0 is still present. + + - Typically, you can can reset to a clean state by running `NexusMods.App uninstall-app`. See Nexus Mod's [how to uninstall the app](https://nexus-mods.github.io/NexusMods.App/users/Uninstall) documentation for more detail and alternative methods. + + - This should not be necessary going forward, because loading app state from 0.7.0 or newer is now supported. This is documented in the [0.7.1 changelog](https://github.com/Nexus-Mods/NexusMods.App/releases/tag/v0.7.1). + ## Nixpkgs Library {#sec-nixpkgs-release-25.05-lib} ### Breaking changes {#sec-nixpkgs-release-25.05-lib-breaking} diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json index a103e8bd5cff..e8eb5a3058f7 100644 --- a/nixos/doc/manual/redirects.json +++ b/nixos/doc/manual/redirects.json @@ -1922,6 +1922,9 @@ "index.html#building-a-titanium-app", "index.html#emulating-or-simulating-the-app" ], + "sec-nixpkgs-release-25.05-incompatibilities-nexusmods-app-upgraded": [ + "release-notes.html#sec-nixpkgs-release-25.05-incompatibilities-nexusmods-app-upgraded" + ], "sec-nixpkgs-release-25.05-lib": [ "release-notes.html#sec-nixpkgs-release-25.05-lib" ], From 965f0461d6083f48f07251bf4226febb08dc0e84 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Feb 2025 20:42:54 +0000 Subject: [PATCH 0603/2168] simdutf: 6.1.1 -> 6.2.0 --- pkgs/by-name/si/simdutf/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/simdutf/package.nix b/pkgs/by-name/si/simdutf/package.nix index 2cbe99cf9db1..0a09fe7c6753 100644 --- a/pkgs/by-name/si/simdutf/package.nix +++ b/pkgs/by-name/si/simdutf/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "simdutf"; - version = "6.1.1"; + version = "6.2.0"; src = fetchFromGitHub { owner = "simdutf"; repo = "simdutf"; rev = "v${finalAttrs.version}"; - hash = "sha256-VAIxoTXOcWA2V+vx+AsCArkjprFiZun5BJoP1l3FGk0="; + hash = "sha256-kjKwJKAmzHwna5T/8tYp3kddHa4r1y+0wVJmotvg0OQ="; }; # Fix build on darwin From c6582035714a846ef8d4904525719f2ee049cd78 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 8 Feb 2025 10:42:29 +0100 Subject: [PATCH 0604/2168] python312Packages.evosax: cleanup --- pkgs/development/python-modules/evosax/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/evosax/default.nix b/pkgs/development/python-modules/evosax/default.nix index aff474455aa9..143ece34b4ab 100644 --- a/pkgs/development/python-modules/evosax/default.nix +++ b/pkgs/development/python-modules/evosax/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -17,12 +16,13 @@ numpy, pyyaml, - # checks + # tests # brax, (unpackaged) # gymnax, (unpackaged) pytestCheckHook, torch, torchvision, + writableTmpDirAsHomeHook, }: buildPythonPackage rec { @@ -30,8 +30,6 @@ buildPythonPackage rec { version = "0.1.6"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "RobertTLange"; repo = "evosax"; @@ -54,16 +52,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "evosax" ]; - preCheck = '' - export HOME=$(mktemp -d) - ''; - nativeCheckInputs = [ # brax # gymnax pytestCheckHook torch torchvision + writableTmpDirAsHomeHook ]; disabledTests = [ @@ -77,7 +72,7 @@ buildPythonPackage rec { meta = { description = "Evolution Strategies in JAX"; homepage = "https://github.com/RobertTLange/evosax"; - changelog = "https://github.com/RobertTLange/evosax/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/RobertTLange/evosax/releases/tag/v.${version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ GaetanLepage ]; }; From f74883a69121015d6a5106fa9057a83b647be7df Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 17 Jan 2025 10:36:40 +0200 Subject: [PATCH 0605/2168] nixos/tzupdate: report timezone being set in journal Also, no need for set -uo pipefail as there are no pipes there at the moment. --- nixos/modules/services/misc/tzupdate.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/tzupdate.nix b/nixos/modules/services/misc/tzupdate.nix index d100e620337b..85b1b3647ef7 100644 --- a/nixos/modules/services/misc/tzupdate.nix +++ b/nixos/modules/services/misc/tzupdate.nix @@ -28,8 +28,11 @@ in { wants = [ "network-online.target" ]; after = [ "network-online.target" ]; script = '' - set -uo pipefail - timedatectl set-timezone "$(${lib.getExe pkgs.tzupdate} --print-only)" + timezone="$(${lib.getExe pkgs.tzupdate} --print-only)" + if [[ -n "$timezone" ]]; then + echo "Setting timezone to '$timezone'" + timedatectl set-timezone "$timezone" + fi ''; serviceConfig = { From 593dab93a2d474bdb53b2f07fc2e16bcb923c731 Mon Sep 17 00:00:00 2001 From: "Braian A. Diez" Date: Thu, 30 Jan 2025 15:58:09 -0300 Subject: [PATCH 0606/2168] fum: 0.6.4 -> 0.9.17 --- pkgs/by-name/fu/fum/package.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fu/fum/package.nix b/pkgs/by-name/fu/fum/package.nix index 96d24f662394..5cc46efe20fc 100644 --- a/pkgs/by-name/fu/fum/package.nix +++ b/pkgs/by-name/fu/fum/package.nix @@ -3,25 +3,25 @@ rustPlatform, fetchFromGitHub, autoPatchelfHook, - stdenv, openssl, dbus, pkg-config, libgcc, + nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "fum"; - version = "0.6.4"; + version = "0.9.17"; src = fetchFromGitHub { owner = "qxb3"; repo = "fum"; tag = "v${version}"; - hash = "sha256-vBn76s2ewLVVYhyXviQUmq+AzH6FSVdJaTEJQ2EPlM0="; + hash = "sha256-E9Z8bs5bdNcXHRJIkzcISIz8R1wnZu8sO6tXQp+5bpQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-7h/KIAIxldXPXUo0lzuBqs6Uf5S5p39yV+kTfLe/LBo="; + cargoHash = "sha256-yrDukkbbXqS2iAdtY4WZS6VkqSbyeBXWkn2Od4+mWLw="; nativeBuildInputs = [ autoPatchelfHook @@ -36,9 +36,12 @@ rustPlatform.buildRustPackage rec { doCheck = false; + passthru.updateScript = nix-update-script { }; + meta = { description = "Fully ricable tui-based music client"; homepage = "https://github.com/qxb3/fum"; + changelog = "https://github.com/qxb3/fum/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ linuxmobile ]; platforms = lib.platforms.linux; From 33e8007dc1f2a3ba5c8340965bc8543414aac665 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 9 Feb 2025 01:08:48 +0400 Subject: [PATCH 0607/2168] =?UTF-8?q?python312Packages.stravalib:=202.1=20?= =?UTF-8?q?=E2=86=92=202.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/python-modules/stravalib/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/stravalib/default.nix b/pkgs/development/python-modules/stravalib/default.nix index d7939a45b415..abcf77d21f14 100644 --- a/pkgs/development/python-modules/stravalib/default.nix +++ b/pkgs/development/python-modules/stravalib/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "stravalib"; - version = "2.1"; + version = "2.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "stravalib"; repo = "stravalib"; tag = "v${version}"; - hash = "sha256-VEVy9BAAoLsBCwMNFpsCjhacFbsgNswYoJ5tTcOQccw="; + hash = "sha256-4T5/Sqni9DCE/sIyNCZA8FzFo7lRAsrF+2JP8ydSGqw="; }; build-system = [ @@ -46,11 +46,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "stravalib" ]; - meta = with lib; { + meta = { description = "Python library for interacting with Strava v3 REST API"; homepage = "https://github.com/stravalib/stravalib"; changelog = "https://github.com/stravalib/stravalib/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ sikmir ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ sikmir ]; }; } From 498e5b3c14e2a496ae50a7d536cc855a737410f5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 8 Feb 2025 20:28:15 +0100 Subject: [PATCH 0608/2168] python312Packages.kaleido: don't create broken libgl symlink on darwin --- .../python-modules/kaleido/default.nix | 58 ++++++++++--------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/pkgs/development/python-modules/kaleido/default.nix b/pkgs/development/python-modules/kaleido/default.nix index bfe516b8f886..5932fd4a8172 100644 --- a/pkgs/development/python-modules/kaleido/default.nix +++ b/pkgs/development/python-modules/kaleido/default.nix @@ -65,37 +65,39 @@ buildPythonPackage rec { pythonImportsCheck = [ "kaleido" ]; - postInstall = '' - # Expose kaleido binary - mkdir -p $out/bin - ln -s $out/${python.sitePackages}/kaleido/executable/bin/kaleido $out/bin/kaleido + postInstall = + '' + # Expose kaleido binary + mkdir -p $out/bin + ln -s $out/${python.sitePackages}/kaleido/executable/bin/kaleido $out/bin/kaleido - # Replace bundled swiftshader with libGL - rm -rf $out/${python.sitePackages}/kaleido/executable/bin/swiftshader - ln -s ${libGL}/lib $out/${python.sitePackages}/kaleido/executable/bin/swiftshader + # Relace bundled libraries with nixpkgs-packaged libraries + rm -rf $out/${python.sitePackages}/kaleido/executable/lib + mkdir -p $out/${python.sitePackages}/kaleido/executable/lib + ln -s ${expat}/lib/* $out/${python.sitePackages}/kaleido/executable/lib/ + ln -s ${nspr}/lib/* $out/${python.sitePackages}/kaleido/executable/lib/ + ln -s ${nss}/lib/* $out/${python.sitePackages}/kaleido/executable/lib/ + ln -s ${sqlite}/lib/* $out/${python.sitePackages}/kaleido/executable/lib/ - # Relace bundled libraries with nixpkgs-packaged libraries - rm -rf $out/${python.sitePackages}/kaleido/executable/lib - mkdir -p $out/${python.sitePackages}/kaleido/executable/lib - ln -s ${expat}/lib/* $out/${python.sitePackages}/kaleido/executable/lib/ - ln -s ${nspr}/lib/* $out/${python.sitePackages}/kaleido/executable/lib/ - ln -s ${nss}/lib/* $out/${python.sitePackages}/kaleido/executable/lib/ - ln -s ${sqlite}/lib/* $out/${python.sitePackages}/kaleido/executable/lib/ + # Replace bundled font configuration with nixpkgs-packaged font configuration + rm -rf $out/${python.sitePackages}/kaleido/executable/etc/fonts + mkdir -p $out/${python.sitePackages}/kaleido/executable/etc/fonts/conf.d + ln -s ${fontconfig.out}/etc/fonts/fonts.conf $out/${python.sitePackages}/kaleido/executable/etc/fonts/ + ls -s ${fontconfig.out}/etc/fonts/conf.d/* $out/${python.sitePackages}/kaleido/executable/etc/fonts/conf.d/ + ln -s ${sbclPackages.cl-dejavu}/dejavu-fonts-ttf-2.37/fontconfig/* $out/${python.sitePackages}/kaleido/executable/etc/fonts/conf.d/ - # Replace bundled font configuration with nixpkgs-packaged font configuration - rm -rf $out/${python.sitePackages}/kaleido/executable/etc/fonts - mkdir -p $out/${python.sitePackages}/kaleido/executable/etc/fonts/conf.d - ln -s ${fontconfig.out}/etc/fonts/fonts.conf $out/${python.sitePackages}/kaleido/executable/etc/fonts/ - ls -s ${fontconfig.out}/etc/fonts/conf.d/* $out/${python.sitePackages}/kaleido/executable/etc/fonts/conf.d/ - ln -s ${sbclPackages.cl-dejavu}/dejavu-fonts-ttf-2.37/fontconfig/* $out/${python.sitePackages}/kaleido/executable/etc/fonts/conf.d/ - - # Replace bundled fonts with nixpkgs-packaged fonts - # Currently this causes an issue where the fonts aren't found. I'm not sure why, so I'm leaving this commented out for now. - #rm -rf $out/${python.sitePackages}/kaleido/executable/xdg/fonts - #mkdir -p $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/dejavu $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/lato - #ln -s ${dejavu_fonts}/share/fonts/truetype/* $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/dejavu/ - #ln -s ${lato}/share/fonts/lato/* $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/lato/ - ''; + # Replace bundled fonts with nixpkgs-packaged fonts + # Currently this causes an issue where the fonts aren't found. I'm not sure why, so I'm leaving this commented out for now. + #rm -rf $out/${python.sitePackages}/kaleido/executable/xdg/fonts + #mkdir -p $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/dejavu $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/lato + #ln -s ${dejavu_fonts}/share/fonts/truetype/* $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/dejavu/ + #ln -s ${lato}/share/fonts/lato/* $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/lato/ + '' + + lib.optionalString (!stdenv.isDarwin) '' + # Replace bundled swiftshader with libGL + rm -rf $out/${python.sitePackages}/kaleido/executable/bin/swiftshader + ln -s ${libGL}/lib $out/${python.sitePackages}/kaleido/executable/bin/swiftshader + ''; passthru.tests = lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) { kaleido = callPackage ./tests.nix { }; From 7f172099e048fd3cb0f25338f68f17fa8d5701de Mon Sep 17 00:00:00 2001 From: melvyn Date: Sat, 8 Feb 2025 16:12:02 -0500 Subject: [PATCH 0609/2168] python3Packages.xdis: remove backport patches after update to 6.1.3 --- .../python-modules/xdis/default.nix | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix index f8bf186bd6a4..7b34f191fd60 100644 --- a/pkgs/development/python-modules/xdis/default.nix +++ b/pkgs/development/python-modules/xdis/default.nix @@ -24,30 +24,6 @@ buildPythonPackage rec { hash = "sha256-fdLZg3MFMS9EIPC5EPE8DAT6K5a6l780msCfzTiZwoo="; }; - # Backport magics for newer newer python versions - patches = [ - (fetchpatch { - url = "https://github.com/rocky/python-xdis/commit/fcba74a7f64c5e2879ca0779ff10f38f9229e7da.patch"; - hash = "sha256-D7eJ97g4G6pmYL/guq0Ndf8yKTVBD2gAuUCAKwvlYbE="; - }) - (fetchpatch { - url = "https://github.com/rocky/python-xdis/commit/b66976ff53a2c6e17a73fb7652ddd6c8054df8db.patch"; - hash = "sha256-KO1y0nDTPmEZ+0/3Pjh+CvTdpr/p4AYZ8XdH5J+XzXo="; - }) - (fetchpatch { - url = "https://github.com/rocky/python-xdis/commit/a9f50c0ba77cdbf4693388404c13a02796a4221a.patch"; - hash = "sha256-gwMagKBY7d/+ohESTSl6M2IEjzABxfrddpdr58VJAk8="; - }) - (fetchpatch { - url = "https://github.com/rocky/python-xdis/commit/d9e15acae76a413667912a10fbf8259711ed9c65.patch"; - hash = "sha256-hpmKg+K1RiLSnmUIS8KtZRVBfvTO9bWbpsNhBFUM38o="; - }) - (fetchpatch { - url = "https://github.com/rocky/python-xdis/commit/b412c878d0bc1b516bd01612d46d8830c36a14ad.patch"; - hash = "sha256-W1JuIXYLO6iyjWiSnzCoXzFsedZjesq31gEPgrtjxas="; - }) - ]; - build-system = [ setuptools ]; From 24d89f3c1094932df5d5fb0d36a57330547ab7a3 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 8 Feb 2025 22:22:51 +0100 Subject: [PATCH 0610/2168] nushellPlugins.formats: fix hash With the version update of nushell the version of this plugin also changed, warranting a new hash value. See https://github.com/NixOS/nixpkgs/pull/379627 --- pkgs/shells/nushell/plugins/formats.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/shells/nushell/plugins/formats.nix b/pkgs/shells/nushell/plugins/formats.nix index 6e1cb241bd90..f42180d27437 100644 --- a/pkgs/shells/nushell/plugins/formats.nix +++ b/pkgs/shells/nushell/plugins/formats.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_formats"; inherit (nushell) version src; useFetchCargoVendor = true; - cargoHash = "sha256-88qcDlIukhpaUJ1vl1v8KMzj4XaYvATxlU+BOMZu6tk="; + cargoHash = "sha256-3cmNlCTawMUpr6kSyT/YZzC717FoXkF0uTeE/D8BSFM="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ From 1a3298ace6080669c7f50ecfb893ba6d4e168d3b Mon Sep 17 00:00:00 2001 From: Dionysis Grigoropoulos Date: Sat, 8 Feb 2025 23:37:05 +0200 Subject: [PATCH 0611/2168] files-to-prompt: init at 0.4 (#379689) python3Packages.files-to-prompt: Init at 0.4 --- pkgs/by-name/fi/files-to-prompt/package.nix | 43 +++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 pkgs/by-name/fi/files-to-prompt/package.nix diff --git a/pkgs/by-name/fi/files-to-prompt/package.nix b/pkgs/by-name/fi/files-to-prompt/package.nix new file mode 100644 index 000000000000..efe36136e2d8 --- /dev/null +++ b/pkgs/by-name/fi/files-to-prompt/package.nix @@ -0,0 +1,43 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + versionCheckHook, +}: + +python3Packages.buildPythonApplication rec { + pname = "files-to-prompt"; + version = "0.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "simonw"; + repo = "files-to-prompt"; + tag = version; + hash = "sha256-gl3j0ok/hlFfIF3HhhzYrUZuNlAtU7y+Ej29sQv9tP4="; + }; + + build-system = with python3Packages; [ + setuptools + ]; + + dependencies = with python3Packages; [ + click + ]; + + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + versionCheckHook + ]; + + versionCheckProgramArg = [ "--version" ]; + + meta = { + description = "Concatenate a directory full of files into a single prompt for use with LLMs"; + homepage = "https://github.com/simonw/files-to-prompt/"; + changelog = "https://github.com/simonw/files-to-prompt/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ erethon ]; + mainProgram = "files-to-prompt"; + }; +} From 33bd961bdfeda2d78743d1d8e2fffe050f7895a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Feb 2025 21:48:46 +0000 Subject: [PATCH 0612/2168] mailpit: 1.22.0 -> 1.22.1 --- pkgs/servers/mail/mailpit/source.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/mail/mailpit/source.nix b/pkgs/servers/mail/mailpit/source.nix index 083abca3744e..540272746512 100644 --- a/pkgs/servers/mail/mailpit/source.nix +++ b/pkgs/servers/mail/mailpit/source.nix @@ -1,6 +1,6 @@ { - version = "1.22.0"; - hash = "sha256-cQgBHiUV9Wy9T1FSuaiM26hp/F44JvBmH4NvsEKwD1U="; - npmDepsHash = "sha256-McC7IDIJ6ZOOEFC8fCancAjp8BReJ6tfYN1FfPnaV8I="; - vendorHash = "sha256-WhTYG1Bza5RglhApOqVDZMkPC3K3hVk4l2GdLvstOIc="; + version = "1.22.1"; + hash = "sha256-1A3gQZ4kdVmKYe8LP0IYJJnYksXSH0OAIlGWAU2gPhA="; + npmDepsHash = "sha256-5Y3qLwK8v7pkDyW3PXfedhmduaplNh0G4jNJo+aaWZY="; + vendorHash = "sha256-YKl3Wvm0WYvyL7Sm5OZ1XiWhF/xf5ZHGg+F0LnaEY/U="; } From 56560b393eddc7afa116fb62cd33903f006c5cea Mon Sep 17 00:00:00 2001 From: Gurjaka Date: Sun, 9 Feb 2025 01:14:07 +0400 Subject: [PATCH 0613/2168] nordic: fix ERROR: noBrokenSymlink --- pkgs/data/themes/nordic/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/data/themes/nordic/default.nix b/pkgs/data/themes/nordic/default.nix index 5281f455ca11..39579b3a150f 100644 --- a/pkgs/data/themes/nordic/default.nix +++ b/pkgs/data/themes/nordic/default.nix @@ -8,7 +8,6 @@ plasma-framework, plasma-workspace, }: - stdenvNoCC.mkDerivation rec { pname = "nordic"; version = "2.2.0-unstable-2024-06-25"; @@ -92,6 +91,9 @@ stdenvNoCC.mkDerivation rec { dontWrapQtApps = true; + # FIXME: https://github.com/EliverLara/Nordic/issues/331 + dontCheckForBrokenSymlinks = true; + installPhase = '' runHook preInstall From add22c861fdc2f5856b2d8de334d36a1b3d74dfa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Feb 2025 22:05:23 +0000 Subject: [PATCH 0614/2168] teip: 2.3.0 -> 2.3.2 --- pkgs/by-name/te/teip/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/teip/package.nix b/pkgs/by-name/te/teip/package.nix index 64dae6231fd3..fb976e3e531f 100644 --- a/pkgs/by-name/te/teip/package.nix +++ b/pkgs/by-name/te/teip/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "teip"; - version = "2.3.0"; + version = "2.3.2"; src = fetchFromGitHub { owner = "greymd"; repo = "teip"; rev = "v${version}"; - hash = "sha256-09IKAM1ha40CvF5hdQIlUab7EBBFourC70LAagrs5+4="; + hash = "sha256-Lr4nlAM2mEKwF3HXso/6FQEKoQK43xxLMgOU7j7orYg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-EMdwjdgrSNGTbhnjwyt6KZ6U6wRRKwXGynfr397AGbg="; + cargoHash = "sha256-FFv/Msx6fXRJuRH8hjhBgc7XCg5EKWantNKQHwXpa4o="; nativeBuildInputs = [ installShellFiles ]; From 5c3a9acd716cd71cebcd017ed288dea6439f7ba9 Mon Sep 17 00:00:00 2001 From: nikolaizombie1 Date: Sat, 8 Feb 2025 17:29:50 -0500 Subject: [PATCH 0615/2168] waytrogen: 0.6.7 -> 0.6.8 --- pkgs/by-name/wa/waytrogen/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wa/waytrogen/package.nix b/pkgs/by-name/wa/waytrogen/package.nix index 9d364711b59f..95d3746a7820 100644 --- a/pkgs/by-name/wa/waytrogen/package.nix +++ b/pkgs/by-name/wa/waytrogen/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "waytrogen"; - version = "0.6.7"; + version = "0.6.8"; src = fetchFromGitHub { owner = "nikolaizombie1"; repo = "waytrogen"; tag = version; - hash = "sha256-JlqRlB/iMeFp229bF4u7M+Z9m9zlizHgqbfmszNwd9k="; + hash = "sha256-/NvLgC1IB3YrilnuuZFMuDYaUDQ4fDrtYNf1xL8H+Ng="; }; useFetchCargoVendor = true; - cargoHash = "sha256-S4DPvQ2unFt13eLFS91z7TyfFz7uwMMIgsEQ/JPe0e8="; + cargoHash = "sha256-cdomE3K8T1urvRK1TAm+IvnKC8ZuPgEVnN3TzlJVtBQ="; nativeBuildInputs = [ pkg-config From 16a10d8c4a56c24bc16e1b6acb00586448610c23 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Feb 2025 23:46:00 +0000 Subject: [PATCH 0616/2168] home-manager: 0-unstable-2025-01-27 -> 0-unstable-2025-02-08 --- pkgs/by-name/ho/home-manager/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ho/home-manager/package.nix b/pkgs/by-name/ho/home-manager/package.nix index 94160846668f..c85ab42e6701 100644 --- a/pkgs/by-name/ho/home-manager/package.nix +++ b/pkgs/by-name/ho/home-manager/package.nix @@ -19,14 +19,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "home-manager"; - version = "0-unstable-2025-01-27"; + version = "0-unstable-2025-02-08"; src = fetchFromGitHub { name = "home-manager-source"; owner = "nix-community"; repo = "home-manager"; - rev = "e1ae908bcc30af792b0bb0a52e53b03d2577255e"; - hash = "sha256-xiPARGKwocaMtv+U/rgi+h2g56CZZEmrcl7ldRaslq8="; + rev = "5af1b9a0f193ab6138b89a8e0af8763c21bbf491"; + hash = "sha256-p1QSLO8DJnANY+ppK7fjD8GqfCrEIDjso1CSRHsXL7Y="; }; nativeBuildInputs = [ From 08d8b5b4db2473c90e609773839ed3f1985e589d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=B9=82=E0=B8=97=E0=B8=AA=E0=B8=BA=E0=B8=95=E0=B8=B1?= =?UTF-8?q?=E0=B8=A5?= Date: Sat, 8 Feb 2025 15:38:28 +0700 Subject: [PATCH 0617/2168] h2o: remove rec in favor of finalAttrs --- pkgs/by-name/h2/h2o/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix index 3fafadb333f8..77575c525afe 100644 --- a/pkgs/by-name/h2/h2o/package.nix +++ b/pkgs/by-name/h2/h2o/package.nix @@ -10,14 +10,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "h2o"; version = "2.3.0-beta2"; src = fetchFromGitHub { owner = "h2o"; repo = "h2o"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "0lwg5sfsr7fw7cfy0hrhadgixm35b5cgcvlhwhbk89j72y1bqi6n"; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ thoughtpolice ]; platforms = platforms.linux; }; -} +}) From 2c7df085644000eb5eff1ad3bf77497050961bde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=B9=82=E0=B8=97=E0=B8=AA=E0=B8=BA=E0=B8=95=E0=B8=B1?= =?UTF-8?q?=E0=B8=A5?= Date: Sat, 8 Feb 2025 15:39:13 +0700 Subject: [PATCH 0618/2168] h2o: update description to match upstream with HTTP/3 support --- pkgs/by-name/h2/h2o/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix index 77575c525afe..8dc95aa0d938 100644 --- a/pkgs/by-name/h2/h2o/package.nix +++ b/pkgs/by-name/h2/h2o/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = with lib; { - description = "Optimized HTTP/1 and HTTP/2 server"; + description = "Optimized HTTP/1.x, HTTP/2, HTTP/3 server"; homepage = "https://h2o.examp1e.net"; license = licenses.mit; maintainers = with maintainers; [ thoughtpolice ]; From bd3373275c25231f31bd55079eb39b5ce13e41d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=B9=82=E0=B8=97=E0=B8=AA=E0=B8=BA=E0=B8=95=E0=B8=B1?= =?UTF-8?q?=E0=B8=A5?= Date: Sat, 8 Feb 2025 16:31:02 +0700 Subject: [PATCH 0619/2168] =?UTF-8?q?h20:=202.3.0-beta1=20=E2=86=92=202.3.?= =?UTF-8?q?0.20250130?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit > Release Policy > > As of April 2023, we have ceased to release versions. Rather, the each > commit to master branch is considered stable and ready for general use > except for the features marked as experimental. > > — https://h2o.examp1e.net/install.html Seems trunk-based version now :) --- pkgs/by-name/h2/h2o/package.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix index 8dc95aa0d938..276b376e7a67 100644 --- a/pkgs/by-name/h2/h2o/package.nix +++ b/pkgs/by-name/h2/h2o/package.nix @@ -5,20 +5,24 @@ pkg-config, cmake, ninja, + perl, + brotli, openssl, + libcap, libuv, + wslay, zlib, }: stdenv.mkDerivation (finalAttrs: { pname = "h2o"; - version = "2.3.0-beta2"; + version = "2.3.0.20250130"; src = fetchFromGitHub { owner = "h2o"; repo = "h2o"; - tag = "v${finalAttrs.version}"; - sha256 = "0lwg5sfsr7fw7cfy0hrhadgixm35b5cgcvlhwhbk89j72y1bqi6n"; + rev = "26b116e9536be8cf07036185e3edf9d721c9bac2"; + sha256 = "sha256-WjsUUnSs3kXjAmh+V/lzL1QlxxXNCph99UsC29YAirQ="; }; outputs = [ @@ -32,11 +36,15 @@ stdenv.mkDerivation (finalAttrs: { pkg-config cmake ninja + perl ]; buildInputs = [ + brotli openssl + libcap libuv zlib + wslay ]; meta = with lib; { From 5f9c18f8494c98e1eea779e9b7e4a3af93654f61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=B9=82=E0=B8=97=E0=B8=AA=E0=B8=BA=E0=B8=95=E0=B8=B1?= =?UTF-8?q?=E0=B8=A5?= Date: Sat, 8 Feb 2025 16:34:43 +0700 Subject: [PATCH 0620/2168] h2o: add toastal to maintainers --- pkgs/by-name/h2/h2o/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix index 276b376e7a67..b5b838945881 100644 --- a/pkgs/by-name/h2/h2o/package.nix +++ b/pkgs/by-name/h2/h2o/package.nix @@ -51,7 +51,10 @@ stdenv.mkDerivation (finalAttrs: { description = "Optimized HTTP/1.x, HTTP/2, HTTP/3 server"; homepage = "https://h2o.examp1e.net"; license = licenses.mit; - maintainers = with maintainers; [ thoughtpolice ]; + maintainers = with maintainers; [ + toastal + thoughtpolice + ]; platforms = platforms.linux; }; }) From 76e87ff2198e012a31e439f83863c98b7d5c3208 Mon Sep 17 00:00:00 2001 From: emaryn Date: Sun, 9 Feb 2025 07:53:48 +0800 Subject: [PATCH 0621/2168] plex-desktop: fix noBrokenSymlinks --- pkgs/by-name/pl/plex-desktop/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/pl/plex-desktop/package.nix b/pkgs/by-name/pl/plex-desktop/package.nix index 49231cee5ac2..60f7a6c5bf51 100644 --- a/pkgs/by-name/pl/plex-desktop/package.nix +++ b/pkgs/by-name/pl/plex-desktop/package.nix @@ -119,6 +119,11 @@ let rm $out/usr/lib/x86_64-linux-gnu/libasound.so.2.0.0 ln -s ${alsa-lib}/lib/libasound.so.2.0.0 $out/usr/lib/x86_64-linux-gnu/libasound.so.2.0.0 + ln -snf ${glib.dev}/bin/gio-querymodules $out/usr/bin/gio-querymodules + ln -snf ${glib.dev}/bin/glib-compile-schemas $out/usr/bin/glib-compile-schemas + rm $out/usr/share/doc/libglib2.0-bin/changelog.Debian.gz + rm $out/usr/share/doc/libxml2/NEWS.gz + runHook postInstall ''; }; From 99f966f511e16510538700b05561bed611cf8ed0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Sat, 8 Feb 2025 22:41:06 +0100 Subject: [PATCH 0622/2168] mullvad-browser: 14.0.4 -> 14.0.5 https://github.com/mullvad/mullvad-browser/releases/tag/14.0.5 --- pkgs/by-name/mu/mullvad-browser/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mu/mullvad-browser/package.nix b/pkgs/by-name/mu/mullvad-browser/package.nix index b005b693561c..c1fa3e332fce 100644 --- a/pkgs/by-name/mu/mullvad-browser/package.nix +++ b/pkgs/by-name/mu/mullvad-browser/package.nix @@ -97,7 +97,7 @@ let ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "14.0.4"; + version = "14.0.5"; sources = { x86_64-linux = fetchurl { @@ -109,7 +109,7 @@ let "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-Y1miKLvVagEVyMeDyGMuk2iYqT3d6f9nxm39RGPPzDM="; + hash = "sha256-y98IzCnojbBDDj6PcbxtTPwfHA4wZpw6g1qtmSgkpFA="; }; }; @@ -262,7 +262,7 @@ stdenv.mkDerivation rec { # Easier access to docs mkdir -p $out/share/doc - ln -s $MB_IN_STORE/Data/Docs $out/share/doc/mullvad-browser + ln -s $MB_IN_STORE/MullvadBrowser/Docs $out/share/doc/mullvad-browser # Install icons for i in 16 32 48 64 128; do From 78aff31c2c04530a554c56a4e6f796536e47f4dc Mon Sep 17 00:00:00 2001 From: Defelo Date: Sun, 9 Feb 2025 00:55:56 +0100 Subject: [PATCH 0623/2168] clorinde: 0.11.3 -> 0.11.4 --- pkgs/by-name/cl/clorinde/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cl/clorinde/package.nix b/pkgs/by-name/cl/clorinde/package.nix index 869875916794..70c8e341b92a 100644 --- a/pkgs/by-name/cl/clorinde/package.nix +++ b/pkgs/by-name/cl/clorinde/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "clorinde"; - version = "0.11.3"; + version = "0.11.4"; src = fetchFromGitHub { owner = "halcyonnouveau"; repo = "clorinde"; tag = "clorinde-v${version}"; - hash = "sha256-03lKEAPJTxIXLNF2jVuD6DHJDqTkqCt1Vc+A1/E1CP4="; + hash = "sha256-p91LgbRj2+acOrmNuupIR92Z5aOJnTobVDd7A6ezrHk="; }; useFetchCargoVendor = true; - cargoHash = "sha256-a/MH1jG3w7zgUQnlLRtZyn+MM7vdlydq/u4XSGPGgSA="; + cargoHash = "sha256-Vo7Ho+48QJEeAm+eLTCvB/4Q6/YoE0KbbfvdC2WictY="; cargoBuildFlags = [ "--package=clorinde" ]; From 487f454131d09ff6bfe8d7b657bbfe2a9aeff757 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 00:05:21 +0000 Subject: [PATCH 0624/2168] couchbase-shell: 1.0.0 -> 1.1.0 --- pkgs/by-name/co/couchbase-shell/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/couchbase-shell/package.nix b/pkgs/by-name/co/couchbase-shell/package.nix index 72b5cd448b85..d765aeeea45c 100644 --- a/pkgs/by-name/co/couchbase-shell/package.nix +++ b/pkgs/by-name/co/couchbase-shell/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage rec { pname = "couchbase-shell"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "couchbaselabs"; repo = "couchbase-shell"; rev = "v${version}"; - hash = "sha256-ksAyi7yMz56de1lA2LYVNdsn02GNrcJVoRLcK1zFppE="; + hash = "sha256-wqOU94rPqIO128uL9iyVzWcAgqnDUPUy1+Qq1hSkvHA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-8AnnZNXp/D8lUCohgrLzqJ+7gwucC3OBh1TK3dYKp4Y="; + cargoHash = "sha256-tlVOro9u4ypgJ5yqjEzjfvrGXVCYe6DN6bg/3NhipR4="; nativeBuildInputs = [ pkg-config From 7bf55a1a383ab2db1497bee8f932e335831dfe99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 8 Feb 2025 16:13:03 -0800 Subject: [PATCH 0625/2168] python313Packages.sdjson: init at 0.5.0 --- .../python-modules/sdjson/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/sdjson/default.nix diff --git a/pkgs/development/python-modules/sdjson/default.nix b/pkgs/development/python-modules/sdjson/default.nix new file mode 100644 index 000000000000..9df8b10dc5c1 --- /dev/null +++ b/pkgs/development/python-modules/sdjson/default.nix @@ -0,0 +1,40 @@ +{ + buildPythonPackage, + domdf-python-tools, + fetchFromGitHub, + lib, + typing-extensions, + whey, +}: + +buildPythonPackage rec { + pname = "sdjson"; + version = "0.5.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "domdfcoding"; + repo = "singledispatch-json"; + tag = "v${version}"; + hash = "sha256-7qwmPhij2X2GLtjeaoMCoOyT0qzYt9oFccWrQOq6LXw="; + }; + + build-system = [ whey ]; + + dependencies = [ + domdf-python-tools + typing-extensions + ]; + + pythonImportsCheck = [ "sdjson" ]; + + # missing dependency coincidence + doCheck = false; + + meta = { + description = "Custom JSON Encoder for Python utilising functools.singledispatch"; + homepage = "https://github.com/domdfcoding/singledispatch-json"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8f7554dd90ff..0ce682680942 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14711,6 +14711,8 @@ self: super: with self; { sdds = callPackage ../development/python-modules/sdds { }; + sdjson = callPackage ../development/python-modules/sdjson { }; + sdkmanager = callPackage ../development/python-modules/sdkmanager { }; sdnotify = callPackage ../development/python-modules/sdnotify { }; From 1f2234d6c8684c6a57e146807a1cf4bc49365ef5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 8 Feb 2025 15:58:22 -0800 Subject: [PATCH 0626/2168] python313Packages.pyproject-parser: specify optional-dependencies --- .../pyproject-parser/default.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/development/python-modules/pyproject-parser/default.nix b/pkgs/development/python-modules/pyproject-parser/default.nix index a3b6ca4b0319..4e8b54aa045a 100644 --- a/pkgs/development/python-modules/pyproject-parser/default.nix +++ b/pkgs/development/python-modules/pyproject-parser/default.nix @@ -5,10 +5,15 @@ setuptools, apeye-core, attrs, + click, + consolekit, + docutils, dom-toml, domdf-python-tools, natsort, packaging, + readme-renderer, + sdjson, shippinglabel, typing-extensions, }: @@ -34,6 +39,20 @@ buildPythonPackage rec { shippinglabel typing-extensions ]; + + optional-dependencies = { + all = lib.flatten (lib.attrValues (lib.filterAttrs (n: v: n != "all") optional-dependencies)); + cli = [ + click + consolekit + sdjson + ]; + readme = [ + docutils + readme-renderer + ] ++ readme-renderer.optional-dependencies.md; + }; + postPatch = '' substituteInPlace pyproject.toml \ --replace-fail '"setuptools!=61.*,<=67.1.0,>=40.6.0"' '"setuptools"' From c10ad6ec5a2f706ce64274742f7802a76f038f34 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 00:17:26 +0000 Subject: [PATCH 0627/2168] python312Packages.plyara: 2.2.7 -> 2.2.8 --- pkgs/development/python-modules/plyara/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plyara/default.nix b/pkgs/development/python-modules/plyara/default.nix index f6e6e62c20c4..3b03163a52dd 100644 --- a/pkgs/development/python-modules/plyara/default.nix +++ b/pkgs/development/python-modules/plyara/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "plyara"; - version = "2.2.7"; + version = "2.2.8"; pyproject = true; disabled = pythonOlder "3.10"; # https://github.com/plyara/plyara: "Plyara requires Python 3.10+" src = fetchPypi { inherit pname version; - hash = "sha256-6gYD9BePlxGvSUg9ENa7a9uzU0pOl+IJs8ZVRekDVHY="; + hash = "sha256-zmpb5r3BcveLsQ0uIgQJx2vUaz2p/0PlO76E0e7elwA="; }; build-system = [ From 2f4fb407cf51d59a942ed535de79e1157d2e78a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 00:30:11 +0000 Subject: [PATCH 0628/2168] gcsfuse: 2.6.0 -> 2.9.0 --- pkgs/by-name/gc/gcsfuse/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gc/gcsfuse/package.nix b/pkgs/by-name/gc/gcsfuse/package.nix index 16de9a16ac92..63a505112752 100644 --- a/pkgs/by-name/gc/gcsfuse/package.nix +++ b/pkgs/by-name/gc/gcsfuse/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gcsfuse"; - version = "2.6.0"; + version = "2.9.0"; src = fetchFromGitHub { owner = "googlecloudplatform"; repo = "gcsfuse"; rev = "v${version}"; - hash = "sha256-+dzArLWP6mZ0m/pS64AYPckpf4SDu0Rt84x00Q4QC7I="; + hash = "sha256-/Jy8vaCblHqHq0m5bEfYoZhYJOHm+FjMAbbOh6uks+E="; }; - vendorHash = "sha256-FIPIEIa14oOIgHonXXYwQS9XkuCJjABgq6I8B7V1jQI="; + vendorHash = "sha256-/9LhIZ/KThuTI1OYfdZHfV9Ad70gw4Yii3MsE5ZVLSI="; subPackages = [ "." From 0426ae1df716bfb811eabacd00677d666b3e134c Mon Sep 17 00:00:00 2001 From: Rhys-T <108157737+Rhys-T@users.noreply.github.com> Date: Sat, 8 Feb 2025 19:30:29 -0500 Subject: [PATCH 0629/2168] python3Packages.pygame-ce: relax meson-python version requirement Needed since python3Packages.meson-python has been updated to 0.17.1. Resolves #380501. --- pkgs/development/python-modules/pygame-ce/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/pygame-ce/default.nix b/pkgs/development/python-modules/pygame-ce/default.nix index 134aec2cb952..470ece383353 100644 --- a/pkgs/development/python-modules/pygame-ce/default.nix +++ b/pkgs/development/python-modules/pygame-ce/default.nix @@ -70,6 +70,7 @@ buildPythonPackage rec { # cython was pinned to fix windows build hangs (pygame-community/pygame-ce/pull/3015) substituteInPlace pyproject.toml \ --replace-fail '"meson<=1.5.1",' '"meson",' \ + --replace-fail '"meson-python<=0.16.0",' '"meson-python",' \ --replace-fail '"ninja<=1.11.1.1",' "" \ --replace-fail '"cython<=3.0.11",' '"cython",' \ --replace-fail '"sphinx<=7.2.6",' "" From db4ef6701d9beee0b69d20c084d46bc98acd1fb5 Mon Sep 17 00:00:00 2001 From: Ivan Trubach Date: Mon, 25 Sep 2023 23:41:21 +0300 Subject: [PATCH 0630/2168] pulumiPackages.pulumi-hcloud: init at 1.20.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This also reverts python3Packages.pulumi-hcloud from version 1.21.2 back to 1.20.4. That is, newer versions require pulumi ≥ 3.142.0 and we have 3.122.0 in Nixpkgs. --- .../python-modules/pulumi-hcloud/default.nix | 48 ------------------- pkgs/tools/admin/pulumi-packages/default.nix | 1 + .../admin/pulumi-packages/pulumi-hcloud.nix | 25 ++++++++++ pkgs/top-level/python-packages.nix | 2 +- 4 files changed, 27 insertions(+), 49 deletions(-) delete mode 100644 pkgs/development/python-modules/pulumi-hcloud/default.nix create mode 100644 pkgs/tools/admin/pulumi-packages/pulumi-hcloud.nix diff --git a/pkgs/development/python-modules/pulumi-hcloud/default.nix b/pkgs/development/python-modules/pulumi-hcloud/default.nix deleted file mode 100644 index fa27194d0ab5..000000000000 --- a/pkgs/development/python-modules/pulumi-hcloud/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - buildPythonPackage, - fetchFromGitHub, - lib, - parver, - pulumi, - pythonOlder, - semver, - setuptools, -}: - -buildPythonPackage rec { - pname = "pulumi-hcloud"; - version = "1.21.1"; - - pyproject = true; - build-system = [ setuptools ]; - - disabled = pythonOlder "3.8"; - - src = fetchFromGitHub { - owner = "pulumi"; - repo = "pulumi-hcloud"; - tag = "v${version}"; - hash = "sha256-waeA+qYLj4WFUgNK5/54gfRQivNiIvIp6FoxgpeRjlM="; - }; - - sourceRoot = "${src.name}/sdk/python"; - - # The upstream repository does not contain tests - doCheck = false; - - dependencies = [ - parver - pulumi - semver - ]; - - pythonImportsCheck = [ "pulumi_hcloud" ]; - - meta = with lib; { - description = "Pulumi python hetzner web services provider"; - homepage = "https://github.com/pulumi/pulumi-hcloud"; - changelog = "https://github.com/pulumi/pulumi-hcloud/releases/tag/${src.tag}"; - license = licenses.asl20; - maintainers = with maintainers; [ albertodvp ]; - }; -} diff --git a/pkgs/tools/admin/pulumi-packages/default.nix b/pkgs/tools/admin/pulumi-packages/default.nix index 9e232a1f45bf..f46dffbfdfe8 100644 --- a/pkgs/tools/admin/pulumi-packages/default.nix +++ b/pkgs/tools/admin/pulumi-packages/default.nix @@ -7,6 +7,7 @@ in pulumi-aws-native = callPackage' ./pulumi-aws-native.nix { }; pulumi-azure-native = callPackage' ./pulumi-azure-native.nix { }; pulumi-command = callPackage' ./pulumi-command.nix { }; + pulumi-hcloud = callPackage' ./pulumi-hcloud.nix { }; pulumi-language-go = callPackage ./pulumi-language-go.nix { }; pulumi-language-nodejs = callPackage ./pulumi-language-nodejs.nix { }; pulumi-language-python = callPackage ./pulumi-language-python.nix { }; diff --git a/pkgs/tools/admin/pulumi-packages/pulumi-hcloud.nix b/pkgs/tools/admin/pulumi-packages/pulumi-hcloud.nix new file mode 100644 index 000000000000..c55187240826 --- /dev/null +++ b/pkgs/tools/admin/pulumi-packages/pulumi-hcloud.nix @@ -0,0 +1,25 @@ +{ + lib, + mkPulumiPackage, +}: +mkPulumiPackage rec { + owner = "pulumi"; + repo = "pulumi-hcloud"; + version = "1.20.4"; + rev = "v${version}"; + hash = "sha256-m9MRXDTSC0K1raoH9gKPuxdwvUEnZ/ulp32xlY1Hsdo="; + vendorHash = "sha256-u3mxaOEXQod1MDFxo85YdOb6Bx/9G5uaa3ykhnmcqCg="; + cmdGen = "pulumi-tfgen-hcloud"; + cmdRes = "pulumi-resource-hcloud"; + extraLdflags = [ + "-X=github.com/pulumi/${repo}/provider/pkg/version.Version=v${version}" + ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { + description = "Hetzner Cloud Pulumi resource package, providing multi-language access to Hetzner Cloud"; + mainProgram = "pulumi-resource-hcloud"; + homepage = "https://github.com/pulumi/pulumi-hcloud"; + license = licenses.asl20; + maintainers = with maintainers; [ tie ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8f7554dd90ff..131547aef0ea 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1470,7 +1470,7 @@ self: super: with self; { pulumi-command = pkgs.pulumiPackages.pulumi-command.sdks.python; - pulumi-hcloud = callPackage ../development/python-modules/pulumi-hcloud { }; + pulumi-hcloud = pkgs.pulumiPackages.pulumi-hcloud.sdks.python; pulumi-random = pkgs.pulumiPackages.pulumi-random.sdks.python; From e9c528925fad6554a93c227b39e80f98e25bfff4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 00:39:27 +0000 Subject: [PATCH 0631/2168] vnstat: 2.12 -> 2.13 --- pkgs/by-name/vn/vnstat/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vn/vnstat/package.nix b/pkgs/by-name/vn/vnstat/package.nix index 77635f2fd991..d81056f50bd5 100644 --- a/pkgs/by-name/vn/vnstat/package.nix +++ b/pkgs/by-name/vn/vnstat/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "vnstat"; - version = "2.12"; + version = "2.13"; src = fetchFromGitHub { owner = "vergoh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JwVYhmCscEdbwNGa+aKdOt8cIclpvjl4tmWFU3zhcwc="; + sha256 = "sha256-Xd3s4Wrtfwis0dxRijeWhfloHcXPUNAj0P91uWi1C3M="; }; postPatch = '' From 0d1f3a2c834df2993270024a0c9083b0752ab2ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 00:42:56 +0000 Subject: [PATCH 0632/2168] sheldon: 0.8.0 -> 0.8.1 --- pkgs/tools/misc/sheldon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/sheldon/default.nix b/pkgs/tools/misc/sheldon/default.nix index 770f04f8ac30..fec1bdb3e5b0 100644 --- a/pkgs/tools/misc/sheldon/default.nix +++ b/pkgs/tools/misc/sheldon/default.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage rec { pname = "sheldon"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "rossmacarthur"; repo = pname; rev = version; - hash = "sha256-eyfIPO1yXvb+0SeAx+F6/z5iDUA2GfWOiElfjn6abJM="; + hash = "sha256-C4rGE+tKlpEJabyGAexIoPmUiLvl87GkL6XH5aJHCrU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-HINEhJ6xpiRAPopJDhbXlSCn4K4aPFErgIYwDOBmRX8="; + cargoHash = "sha256-5Ho41WU/DzAdBOGDPmJYipcJMAji6J+Jg8lNQYionng="; buildInputs = [ openssl ] From 21e5c1788795f3367db161ad5151d0d4dfb5c267 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 00:56:59 +0000 Subject: [PATCH 0633/2168] fq: 0.13.0 -> 0.14.0 --- pkgs/by-name/fq/fq/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fq/fq/package.nix b/pkgs/by-name/fq/fq/package.nix index b870fe1f41d4..b388edd34a3f 100644 --- a/pkgs/by-name/fq/fq/package.nix +++ b/pkgs/by-name/fq/fq/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "fq"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "wader"; repo = "fq"; rev = "v${version}"; - hash = "sha256-bHyLEJiSM42arZiM1VVKga6wp3Q3EAMgUrFnh3hbk9M="; + hash = "sha256-I3mVAPNWjRHG0td1ulzGOthiNybfWLx1HgwPjFfBHCo="; }; - vendorHash = "sha256-in+c8Wl7ffXAqMvs+3K6dzAd5ePqBpRaxU2iM81moQM="; + vendorHash = "sha256-p2cvv983gYTvyLPYIGVsk6N7yUzBpiPzgJ3sMRNWPTo="; ldflags = [ "-s" From af7a8cdaef62a52ea76d8f0bccaeeb5acd8fbc4f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 00:58:12 +0000 Subject: [PATCH 0634/2168] rsgain: 3.5.3 -> 3.6 --- pkgs/by-name/rs/rsgain/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/rs/rsgain/package.nix b/pkgs/by-name/rs/rsgain/package.nix index caa5271fbe78..be16f7d71467 100644 --- a/pkgs/by-name/rs/rsgain/package.nix +++ b/pkgs/by-name/rs/rsgain/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "rsgain"; - version = "3.5.3"; + version = "3.6"; src = fetchFromGitHub { owner = "complexlogic"; repo = "rsgain"; rev = "v${version}"; - hash = "sha256-4LEvcuP2Eyco3iQvT6rZhbfY02Y70rW2n5PaS+rGDkQ="; + hash = "sha256-dqvaPLVpNnbN2W0TOphS7QU6MDh5pxFJoUDGvkat164="; }; nativeBuildInputs = [ From aa2fb254dfb0da9ce519fdaa6360bceef5ef955c Mon Sep 17 00:00:00 2001 From: cor Date: Sun, 9 Feb 2025 01:16:15 +0000 Subject: [PATCH 0635/2168] python3Packages.aider-chat: 0.73.0 -> 0.74.1 --- pkgs/development/python-modules/aider-chat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aider-chat/default.nix b/pkgs/development/python-modules/aider-chat/default.nix index 00ea70dec736..518bc74638ac 100644 --- a/pkgs/development/python-modules/aider-chat/default.nix +++ b/pkgs/development/python-modules/aider-chat/default.nix @@ -12,7 +12,7 @@ let self = python3; packageOverrides = _: super: { tree-sitter = super.tree-sitter_0_21; }; }; - version = "0.73.0"; + version = "0.74.1"; aider-chat = python3.pkgs.buildPythonPackage { pname = "aider-chat"; inherit version; @@ -22,7 +22,7 @@ let owner = "Aider-AI"; repo = "aider"; tag = "v${version}"; - hash = "sha256-wcrwm4mn4D6pYgoCa5iKcKmt4QmhOXOfObUl7Gevukg="; + hash = "sha256-JXzkvuSOOEUxNqF6l5USzIPftpnIW+CptEv/0yp0eGM="; }; pythonRelaxDeps = true; From e222872f996f1a96e9c9f427fc641b0628c1b736 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 01:22:55 +0000 Subject: [PATCH 0636/2168] nemo: 6.4.3 -> 6.4.4 --- pkgs/by-name/ne/nemo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/nemo/package.nix b/pkgs/by-name/ne/nemo/package.nix index a17f28145e6c..839a8074ad5c 100644 --- a/pkgs/by-name/ne/nemo/package.nix +++ b/pkgs/by-name/ne/nemo/package.nix @@ -35,13 +35,13 @@ let in stdenv.mkDerivation rec { pname = "nemo"; - version = "6.4.3"; + version = "6.4.4"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-3FALXfW0PzWuirX7bxP8BFkIRyQzvg3xBQCdddSpmOg="; + hash = "sha256-6U7SeqgWKFb6l5u/fHqv+gzIh+MsJurKuWpHDNGRTsg="; }; patches = [ From 12f20d009415d077769d9c8fe87cadc9fdba41cb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 01:46:17 +0000 Subject: [PATCH 0637/2168] jsoncons: 1.1.0 -> 1.2.0 --- pkgs/by-name/js/jsoncons/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/js/jsoncons/package.nix b/pkgs/by-name/js/jsoncons/package.nix index 03ac7a6163f6..9f613f8af09d 100644 --- a/pkgs/by-name/js/jsoncons/package.nix +++ b/pkgs/by-name/js/jsoncons/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "jsoncons"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "danielaparker"; repo = "jsoncons"; tag = "v${finalAttrs.version}"; - hash = "sha256-3NG9Jal3+BdcFeWAIq3eFoV+1ywUCsWafe/WNu2VJU8="; + hash = "sha256-JGA3mQToTflm+1rLtKLzbX4x84S+6JoEQAQgx5+E278="; }; nativeBuildInputs = [ cmake ]; From 1295b8a78b656cad93d673a344fbdffb9811c2de Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 02:09:19 +0000 Subject: [PATCH 0638/2168] glamoroustoolkit: 1.1.11 -> 1.1.13 --- pkgs/by-name/gl/glamoroustoolkit/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gl/glamoroustoolkit/package.nix b/pkgs/by-name/gl/glamoroustoolkit/package.nix index 09262b7db87a..6401cabf738f 100644 --- a/pkgs/by-name/gl/glamoroustoolkit/package.nix +++ b/pkgs/by-name/gl/glamoroustoolkit/package.nix @@ -29,12 +29,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "glamoroustoolkit"; - version = "1.1.11"; + version = "1.1.13"; src = fetchzip { url = "https://github.com/feenkcom/gtoolkit-vm/releases/download/v${finalAttrs.version}/GlamorousToolkit-x86_64-unknown-linux-gnu.zip"; stripRoot = false; - hash = "sha256-bb5tU4UtqdWcSqgl28V8IoATWx4TADxNFXkn9ljmw6Y="; + hash = "sha256-2Rr5x7gVwyksJ19t6Ho8UQGbTmv0yvZuZou1FTfHUbE="; }; nativeBuildInputs = [ From db36e8092730f8a1ce50684942469715fd31f133 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 02:34:27 +0000 Subject: [PATCH 0639/2168] srm-cuarzo: 0.11.0-1 -> 0.12.0-1 --- pkgs/by-name/sr/srm-cuarzo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sr/srm-cuarzo/package.nix b/pkgs/by-name/sr/srm-cuarzo/package.nix index 5d2b6fe12a78..30e65deb2168 100644 --- a/pkgs/by-name/sr/srm-cuarzo/package.nix +++ b/pkgs/by-name/sr/srm-cuarzo/package.nix @@ -14,9 +14,9 @@ }: stdenv.mkDerivation (self: { pname = "srm-cuarzo"; - version = "0.11.0-1"; + version = "0.12.0-1"; rev = "v${self.version}"; - hash = "sha256-9fs29Us2/Z6d4u0XHKaFUrjxuSDcp9zj+cyIlhAn0Eg="; + hash = "sha256-baLi0Upv8VMfeusy9EfeAXVxMo0KuKNC+EYg/c+tzRY="; src = fetchFromGitHub { inherit (self) rev hash; From 81d9f8e16659fa54580e5018acc07fd45b099990 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 9 Feb 2025 03:58:13 +0100 Subject: [PATCH 0640/2168] Revert "python3Packages.qtile: dbus-next -> dbus-fast" This reverts commit 33a769c951edf6acf646380a3e8f2f3fcd5cc89f. --- pkgs/development/python-modules/qtile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qtile/default.nix b/pkgs/development/python-modules/qtile/default.nix index d74d8209786d..570fdbd61eab 100644 --- a/pkgs/development/python-modules/qtile/default.nix +++ b/pkgs/development/python-modules/qtile/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchFromGitHub, cairocffi, - dbus-fast, + dbus-next, glib, iwlib, libcst, @@ -69,7 +69,7 @@ buildPythonPackage rec { dependencies = extraPackages ++ [ (cairocffi.override { withXcffib = true; }) - dbus-fast + dbus-next iwlib libcst mpd2 From aa68ccc708ecb8ba325d972bda125a9bff6a4505 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 9 Feb 2025 03:58:30 +0100 Subject: [PATCH 0641/2168] Revert "python3Packages.qtile: 0.29.0 -> 0.30.0" This reverts commit 522b9810c61c28760e4073cbabf60ca7413afef0. --- pkgs/development/python-modules/qtile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qtile/default.nix b/pkgs/development/python-modules/qtile/default.nix index 570fdbd61eab..160109e18238 100644 --- a/pkgs/development/python-modules/qtile/default.nix +++ b/pkgs/development/python-modules/qtile/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pname = "qtile"; - version = "0.30.0"; + version = "0.29.0"; pyproject = true; src = fetchFromGitHub { owner = "qtile"; repo = "qtile"; tag = "v${version}"; - hash = "sha256-mZq8aaXxnjaEuAHbdIWTRQ2bP9ugJrXBB5pYOl1qBrA="; + hash = "sha256-EqrvBXigMjevPERTcz3EXSRaZP2xSEsOxjuiJ/5QOz0="; }; patches = [ From 815bb7f3c6eceb8405656f2941ffd35bb0a5050a Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 9 Feb 2025 03:58:39 +0100 Subject: [PATCH 0642/2168] Revert "python3Packages.qtile-extras: 0.29.0 -> 0.30.0" This reverts commit 225f58916925b5a0ecac63914971e0bbcc46b822. --- pkgs/development/python-modules/qtile-extras/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/qtile-extras/default.nix b/pkgs/development/python-modules/qtile-extras/default.nix index abd5a1a5b625..a7ac00187a39 100644 --- a/pkgs/development/python-modules/qtile-extras/default.nix +++ b/pkgs/development/python-modules/qtile-extras/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "qtile-extras"; - version = "0.30.0"; + version = "0.29.0"; pyproject = true; src = fetchFromGitHub { owner = "elParaguayo"; repo = "qtile-extras"; tag = "v${version}"; - hash = "sha256-qoSg9+Lld0YyyC8a6Fs/OSnJ9rbXk5Jkvi4jboiM+Bo="; + hash = "sha256-QkcLts2cqhA49/L9nuekf0n+ZRBxKdGL9Ql1sgtyTiw="; }; build-system = [ setuptools-scm ]; @@ -87,7 +87,7 @@ buildPythonPackage rec { meta = with lib; { description = "Extra modules and widgets for the Qtile tiling window manager"; homepage = "https://github.com/elParaguayo/qtile-extras"; - changelog = "https://github.com/elParaguayo/qtile-extras/blob/${src.tag}/CHANGELOG"; + changelog = "https://github.com/elParaguayo/qtile-extras/blob/${src.rev}/CHANGELOG"; license = licenses.mit; maintainers = with maintainers; [ arjan-s ]; }; From 689d3f16d303287aaf323a2c1d5eee96cba8bc43 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 03:06:17 +0000 Subject: [PATCH 0643/2168] ejson2env: 2.0.6 -> 2.0.7 --- pkgs/by-name/ej/ejson2env/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ej/ejson2env/package.nix b/pkgs/by-name/ej/ejson2env/package.nix index 2d1a57df40fe..9e34d3ea335c 100644 --- a/pkgs/by-name/ej/ejson2env/package.nix +++ b/pkgs/by-name/ej/ejson2env/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "ejson2env"; - version = "2.0.6"; + version = "2.0.7"; src = fetchFromGitHub { owner = "Shopify"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VXkWmmX+4D+j9ODSEeJJbIx+Bfni9d2X22BFQIe4kwk="; + sha256 = "sha256-9i84nHIuAR7PG6/v8O5GEi6xToJk0c+knpVPOPx+1b8="; }; - vendorHash = "sha256-7oy8bCegsvv35zyo2aTFMSGZMFkArmxy0rOpK6WlubI="; + vendorHash = "sha256-NirIAwmrUH7ny1H7d63bIrFQ8EWuxjh6Qp66Sw8eMO8="; ldflags = [ "-s" From 0304b73bbf1d56936aefbe7916722eda0435706c Mon Sep 17 00:00:00 2001 From: Defelo Date: Sun, 9 Feb 2025 04:21:01 +0100 Subject: [PATCH 0644/2168] python3Packages.manim: fix build --- pkgs/development/python-modules/manim/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/manim/default.nix b/pkgs/development/python-modules/manim/default.nix index 0fb223a910ca..d4f476145303 100644 --- a/pkgs/development/python-modules/manim/default.nix +++ b/pkgs/development/python-modules/manim/default.nix @@ -6,6 +6,7 @@ # build-system poetry-core, + setuptools, # buildInputs cairo, @@ -197,6 +198,7 @@ buildPythonPackage rec { build-system = [ poetry-core + setuptools ]; patches = [ ./pytest-report-header.patch ]; From 01179bc1ff07df6505cd5d04563adccf3afb4573 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 03:29:55 +0000 Subject: [PATCH 0645/2168] numix-icon-theme-square: 24.12.12 -> 25.01.31 --- pkgs/by-name/nu/numix-icon-theme-square/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nu/numix-icon-theme-square/package.nix b/pkgs/by-name/nu/numix-icon-theme-square/package.nix index 0b03d2254e3c..d59d7a8f3755 100644 --- a/pkgs/by-name/nu/numix-icon-theme-square/package.nix +++ b/pkgs/by-name/nu/numix-icon-theme-square/package.nix @@ -10,13 +10,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-square"; - version = "24.12.12"; + version = "25.01.31"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-PxnMMznrSIbI+Vnx2cIPUZ0PxQVZsFn6E/0N2pPAZ6Q="; + sha256 = "sha256-ivYuY9qcJsMqIpYSVPeu067fYWE6iFGYamU9riQBF4A="; }; nativeBuildInputs = [ gtk3 ]; From f4288c287800e96b08730d1d92875fe33209eee7 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sun, 9 Feb 2025 11:34:46 +0800 Subject: [PATCH 0646/2168] python313Packages.traits: 6.4.3 -> 7.0.2 --- pkgs/development/python-modules/traits/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/traits/default.nix b/pkgs/development/python-modules/traits/default.nix index aea469d1523f..e2932c101665 100644 --- a/pkgs/development/python-modules/traits/default.nix +++ b/pkgs/development/python-modules/traits/default.nix @@ -9,24 +9,16 @@ buildPythonPackage rec { pname = "traits"; - version = "6.4.3"; + version = "7.0.2"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-qbv9ngwIt94H6G72TmnLlqKcIQWkO/gyzYsWL6HiL0Q="; + hash = "sha256-pWNRWAnLORGXXeWlQgmFXwtv23ymkSpegd4mUp9wQow="; }; - patches = [ - (fetchpatch2 { - url = "https://github.com/enthought/traits/commit/a20f2154b2c79eb8550ea9228d1a4415ff51b72a.patch"; - hash = "sha256-ycStcpxlvmobL3ZXaSbGrXAzk/Tkjs3BJ67lnwZpeVA="; - excludes = [ ".github/*" ]; - }) - ]; - build-system = [ setuptools ]; pythonImportsCheck = [ "traits" ]; From dc922834528434d84680e43712199d3ac1e2467f Mon Sep 17 00:00:00 2001 From: Defelo Date: Sun, 9 Feb 2025 04:41:26 +0100 Subject: [PATCH 0647/2168] git-sim: fix build --- pkgs/by-name/gi/git-sim/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/gi/git-sim/package.nix b/pkgs/by-name/gi/git-sim/package.nix index 2cae12371b63..bf9bc52b782b 100644 --- a/pkgs/by-name/gi/git-sim/package.nix +++ b/pkgs/by-name/gi/git-sim/package.nix @@ -8,6 +8,7 @@ let inherit (python3Packages) buildPythonApplication + setuptools gitpython manim opencv4 @@ -35,7 +36,7 @@ buildPythonApplication { patches = [ ./tests.patch ]; - build-system = [ ]; + build-system = [ setuptools ]; pythonRemoveDeps = [ "opencv-python-headless" ]; From 51ff8aea5296f3410815e7a4a479273f69a36334 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Feb 2025 21:11:37 +0000 Subject: [PATCH 0648/2168] warp-terminal: 0.2025.01.22.08.02.stable_05 -> 0.2025.02.05.08.02.stable_03 --- pkgs/by-name/wa/warp-terminal/versions.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json index bbad3c0b8d7d..eaba5a2558ed 100644 --- a/pkgs/by-name/wa/warp-terminal/versions.json +++ b/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,14 +1,14 @@ { "darwin": { - "hash": "sha256-OxBFw18XHLbR7HoJHYxVQVwkO14HvJjpjrWt8nQ+FDQ=", - "version": "0.2025.01.22.08.02.stable_05" + "hash": "sha256-Z5NCTgOs49Pld1jRyUngbSgkxuH4LPROx06bf7H0cuE=", + "version": "0.2025.02.05.08.02.stable_03" }, "linux_x86_64": { - "hash": "sha256-5Ro7nLGzmAWQGG0e2797LvvBW5nkB+OHSiw5hXw75wM=", - "version": "0.2025.01.22.08.02.stable_05" + "hash": "sha256-xvckfFXl/ECP5YS/+NZv1UJFkVpIMQ7qnbzM3ffVrmw=", + "version": "0.2025.02.05.08.02.stable_03" }, "linux_aarch64": { - "hash": "sha256-C00/LQc4AmB+8UcNENrt1Qrk6nZmPwQtHHa7SEvQ+GY=", - "version": "0.2025.01.22.08.02.stable_05" + "hash": "sha256-x1U8EyZ+AoLdmF1LdXHEWz28+El/aBhD7JOG/XNaBJY=", + "version": "0.2025.02.05.08.02.stable_03" } } From 0149ffd51189c9459e391a8c588ef7514681e97e Mon Sep 17 00:00:00 2001 From: andle Date: Sat, 8 Feb 2025 23:07:10 -0500 Subject: [PATCH 0649/2168] fix(utils): remove unnecessary `$` from variable in arithmetic --- nixos/lib/utils.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/utils.nix b/nixos/lib/utils.nix index d0279083bcd7..251e0460dd03 100644 --- a/nixos/lib/utils.nix +++ b/nixos/lib/utils.nix @@ -377,7 +377,7 @@ let <<'EOF' ${toJSON set} EOF - (( ! $inherit_errexit_enabled )) && shopt -u inherit_errexit + (( ! inherit_errexit_enabled )) && shopt -u inherit_errexit ''; /* From fdc24b93d18daed9d6f029da1e3fc6f566c767b0 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Sat, 8 Feb 2025 23:16:47 -0500 Subject: [PATCH 0650/2168] hyprlandPlugins.hyprspace: 0-unstable-2025-01-18 -> 0-unstable-2025-02-08 --- .../window-managers/hyprwm/hyprland-plugins/hyprspace.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprspace.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprspace.nix index 0aeced6c76bb..2e2d2e06d819 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprspace.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprspace.nix @@ -8,13 +8,13 @@ mkHyprlandPlugin hyprland { pluginName = "hyprspace"; - version = "0-unstable-2025-01-18"; + version = "0-unstable-2025-02-08"; src = fetchFromGitHub { owner = "KZDKM"; repo = "hyprspace"; - rev = "1b5865f4ac9a04ba614df50de7acfaa40dcb852f"; - hash = "sha256-YQgW4QifYIcNaFF4nMw0LpllXn0rhk/Yb6cwyH3PB9o="; + rev = "ac55bbdb6cee760af9315899b5b187a40ce43e46"; + hash = "sha256-t/KaeHEgzh225HUdAiHXRsgDeyDrBCMTg0LjR73v3Nw="; }; dontUseCmakeConfigure = true; @@ -36,6 +36,5 @@ mkHyprlandPlugin hyprland { license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ donovanglover ]; - broken = true; # Doesn't work on Hyprland v0.47.0+ }; } From 2bc2373cd0c4ad37a8afff89ea98946ba71c536c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 04:41:05 +0000 Subject: [PATCH 0651/2168] netlify-cli: 18.0.2 -> 18.0.4 --- pkgs/by-name/ne/netlify-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ne/netlify-cli/package.nix b/pkgs/by-name/ne/netlify-cli/package.nix index a785718790e9..796cd43f4d03 100644 --- a/pkgs/by-name/ne/netlify-cli/package.nix +++ b/pkgs/by-name/ne/netlify-cli/package.nix @@ -11,16 +11,16 @@ buildNpmPackage rec { pname = "netlify-cli"; - version = "18.0.2"; + version = "18.0.4"; src = fetchFromGitHub { owner = "netlify"; repo = "cli"; tag = "v${version}"; - hash = "sha256-GykzaVJyiAH7L9afK+PdwkqImo80ldcx420pM8V4WBg="; + hash = "sha256-UMGSb2CA7BaHRWgRoH4XR9XboDzkl5/JYYjKK5+ChjY="; }; - npmDepsHash = "sha256-n6JUInqI4ioMTebYcJXJ1ff8MjUW/+Y3b2lS7zhuSdI="; + npmDepsHash = "sha256-cI5FBnjAWyj1VAm+GOQx6kj2bpmEQpsdMomZ4JpPohQ="; inherit nodejs; From 65f3e6c9b368ea1754fdcb925b9bb102e90639a7 Mon Sep 17 00:00:00 2001 From: Nadia Holmquist Pedersen Date: Sun, 9 Feb 2025 03:37:18 +0100 Subject: [PATCH 0652/2168] sdl2-compat: init at 2.30.52 --- pkgs/by-name/sd/sdl2-compat/package.nix | 98 +++++++++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 pkgs/by-name/sd/sdl2-compat/package.nix diff --git a/pkgs/by-name/sd/sdl2-compat/package.nix b/pkgs/by-name/sd/sdl2-compat/package.nix new file mode 100644 index 000000000000..d64f5435a65d --- /dev/null +++ b/pkgs/by-name/sd/sdl2-compat/package.nix @@ -0,0 +1,98 @@ +{ + cmake, + lib, + fetchFromGitHub, + monado, + ninja, + nix-update-script, + SDL2_ttf, + SDL2_net, + SDL2_gfx, + SDL2_sound, + SDL2_mixer, + SDL2_image, + sdl3, + stdenv, + testers, + testSupport ? true, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "sdl2-compat"; + version = "2.30.52"; + + src = fetchFromGitHub { + owner = "libsdl-org"; + repo = "sdl2-compat"; + tag = "release-${finalAttrs.version}"; + hash = "sha256-pdY+yrLWIjMTjmKdYvX4DjzXy2cKaw6P90BPu8K163k"; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + sdl3 + ]; + + outputs = [ + "out" + "dev" + ]; + + outputBin = "dev"; + + cmakeFlags = [ + (lib.cmakeBool "SDL2COMPAT_TESTS" finalAttrs.finalPackage.doCheck) + ]; + + doCheck = testSupport && stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + postFixup = + if stdenv.hostPlatform.isDarwin then + '' + install_name_tool -add_rpath ${lib.makeLibraryPath [ sdl3 ]} $out/lib/libSDL2.dylib + '' + else + '' + patchelf --add-rpath ${lib.makeLibraryPath [ sdl3 ]} $out/lib/libSDL2.so + ''; + + passthru = { + tests = + let + replaceSDL2 = drv: drv.override { SDL2 = finalAttrs.finalPackage; }; + in + { + pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; + SDL2_ttf = replaceSDL2 SDL2_ttf; + SDL2_net = replaceSDL2 SDL2_net; + SDL2_gfx = replaceSDL2 SDL2_gfx; + SDL2_sound = replaceSDL2 SDL2_sound; + SDL2_mixer = replaceSDL2 SDL2_mixer; + SDL2_image = replaceSDL2 SDL2_image; + } + // lib.optionalAttrs stdenv.hostPlatform.isLinux { + monado = replaceSDL2 monado; + }; + + updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "release-(.*)" + ]; + }; + }; + + meta = { + description = "SDL2 compatibility layer that uses SDL3 behind the scenes"; + homepage = "https://libsdl.org"; + changelog = "https://github.com/libsdl-org/sdl2-compat/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.zlib; + maintainers = with lib.maintainers; [ nadiaholmquist ]; + platforms = lib.platforms.unix; + pkgConfigModules = [ "sdl2_compat" ]; + }; +}) From 7fbfb28efdaa2cdfe8658524e22bb34013b43212 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 05:06:06 +0000 Subject: [PATCH 0653/2168] oscavmgr: 0.4.3 -> 0.4.4 --- pkgs/by-name/os/oscavmgr/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/os/oscavmgr/package.nix b/pkgs/by-name/os/oscavmgr/package.nix index cbc7238b58f9..d282055ef5dc 100644 --- a/pkgs/by-name/os/oscavmgr/package.nix +++ b/pkgs/by-name/os/oscavmgr/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage rec { pname = "oscavmgr"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = "galister"; repo = "oscavmgr"; tag = "v${version}"; - hash = "sha256-05dNBzf1f92bVNLbRaUB6KUae+wY3V8mUxDgAb+g1T4="; + hash = "sha256-Tx4FuKKorQLkuhBUbQXtfsm8sFdLgQCgXiGQsfX+MQg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-fw26EbdCnz7KtDmCDpvfy4fjYORL2KcnhzQBJDdNEuI="; + cargoHash = "sha256-91gYGDZyk6qyAF+WVxlQV18kCf3ADgRB2tw9OatvGbY="; nativeBuildInputs = [ pkg-config From a03bfc66d9202293e541c9da7508c4f2d3652307 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 05:25:00 +0000 Subject: [PATCH 0654/2168] mercure: 0.18.1 -> 0.18.2 --- pkgs/by-name/me/mercure/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/me/mercure/package.nix b/pkgs/by-name/me/mercure/package.nix index 822613780e9c..69a63c7355c9 100644 --- a/pkgs/by-name/me/mercure/package.nix +++ b/pkgs/by-name/me/mercure/package.nix @@ -9,18 +9,18 @@ buildGoModule rec { pname = "mercure"; - version = "0.18.1"; + version = "0.18.2"; src = fetchFromGitHub { owner = "dunglas"; repo = "mercure"; rev = "v${version}"; - hash = "sha256-BJVCVvz8AdkQwLD37oQc7YPaZ7l74o9Dik9u/ZBSRro="; + hash = "sha256-HAqzd/gOcyEARDvt/GV4ai3NQGriRPPM1Y+QL6C90O8="; }; sourceRoot = "${src.name}/caddy"; - vendorHash = "sha256-QqG8rxGQW+Lmd2L+wKiKUV+GXcxoO04yhJhDvMqwTVc="; + vendorHash = "sha256-CpN/5m8L+rbtVSOBIJi1gwcglaKRO+iUPGVs0lPT7Yc="; subPackages = [ "mercure" ]; excludedPackages = [ "../cmd/mercure" ]; From ec1f1e1b319eb34816e7636bef8add723a7e58f9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 8 Feb 2025 16:32:54 +0100 Subject: [PATCH 0655/2168] python312Packages.gpytorch: 1.13 -> 1.14 https://github.com/cornellius-gp/gpytorch/compare/refs/tags/v1.13...v1.14 --- pkgs/development/python-modules/gpytorch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gpytorch/default.nix b/pkgs/development/python-modules/gpytorch/default.nix index fd81ffcf897b..275dda93c06a 100644 --- a/pkgs/development/python-modules/gpytorch/default.nix +++ b/pkgs/development/python-modules/gpytorch/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "gpytorch"; - version = "1.13"; + version = "1.14"; pyproject = true; src = fetchFromGitHub { owner = "cornellius-gp"; repo = pname; tag = "v${version}"; - hash = "sha256-jdEJdUFIyM7TTKUHY8epjyZCGolH8nrr7FCyfw+x56s="; + hash = "sha256-whZjqAs3nyjKMzAGi+OnyBtboq0UuV8m11A4IzkWtec="; }; build-system = [ From 216003af31308b4601386aaec169b5261eba5d02 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 8 Feb 2025 16:43:00 +0100 Subject: [PATCH 0656/2168] python312Packages.botorch: 0.12.0 -> 0.13.0 https://github.com/pytorch/botorch/blob/refs/tags/v0.13.0/CHANGELOG.md --- .../python-modules/botorch/default.nix | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/botorch/default.nix b/pkgs/development/python-modules/botorch/default.nix index 65db0322ba9d..a36e88faa5d0 100644 --- a/pkgs/development/python-modules/botorch/default.nix +++ b/pkgs/development/python-modules/botorch/default.nix @@ -6,24 +6,26 @@ gpytorch, linear-operator, multipledispatch, + pyre-extensions, pyro-ppl, setuptools, setuptools-scm, torch, scipy, pytestCheckHook, + pythonAtLeast, }: buildPythonPackage rec { pname = "botorch"; - version = "0.12.0"; + version = "0.13.0"; pyproject = true; src = fetchFromGitHub { owner = "pytorch"; repo = "botorch"; tag = "v${version}"; - hash = "sha256-CKlerCUadObpPq4jQAiFDBOZMHZ4QccAKQz30OFe64E="; + hash = "sha256-Hik0HPHFoN1+uIeVxG7UPKc1ADBoTTBkL2+LhHDrr+s="; }; build-system = [ @@ -35,16 +37,12 @@ buildPythonPackage rec { gpytorch linear-operator multipledispatch + pyre-extensions pyro-ppl scipy torch ]; - pythonRelaxDeps = [ - "gpytorch" - "linear-operator" - ]; - nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ @@ -55,10 +53,18 @@ buildPythonPackage rec { disabledTests = [ "test_all_cases_covered" ] + ++ lib.optionals (pythonAtLeast "3.13") [ + # RuntimeError: Boolean value of Tensor with more than one value is ambiguous + "test_optimize_acqf_mixed_binary_only" + ] ++ lib.optionals (stdenv.buildPlatform.system == "x86_64-linux") [ # stuck tests on hydra "test_moo_predictive_entropy_search" ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ + # RuntimeError: required keyword attribute 'value' has the wrong type + "test_posterior_in_trace_mode" + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # Numerical error slightly above threshold # AssertionError: Tensor-likes are not close! From 8c493c32a1498bc777905c79fe10b69697304aed Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 8 Feb 2025 18:18:12 +0100 Subject: [PATCH 0657/2168] python312Packages.optuna: 4.1.0 -> 4.2.0 https://github.com/optuna/optuna/releases/tag/4.2.0 --- .../python-modules/optuna/default.nix | 63 ++++++------------- 1 file changed, 20 insertions(+), 43 deletions(-) diff --git a/pkgs/development/python-modules/optuna/default.nix b/pkgs/development/python-modules/optuna/default.nix index 0c9b03f4a0e9..aff26527574f 100644 --- a/pkgs/development/python-modules/optuna/default.nix +++ b/pkgs/development/python-modules/optuna/default.nix @@ -6,43 +6,34 @@ pythonOlder, alembic, boto3, - botorch, - catboost, - cma, cmaes, colorlog, - distributed, fakeredis, + fvcore, google-cloud-storage, - lightgbm, + grpcio, + kaleido, matplotlib, - mlflow, moto, numpy, packaging, pandas, plotly, + protobuf, pytest-xdist, - pytorch-lightning, pyyaml, redis, scikit-learn, scipy, setuptools, - shap, sqlalchemy, - tensorflow, torch, - torchaudio, - torchvision, tqdm, - wandb, - xgboost, }: buildPythonPackage rec { pname = "optuna"; - version = "4.1.0"; + version = "4.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -51,7 +42,7 @@ buildPythonPackage rec { owner = "optuna"; repo = "optuna"; tag = "v${version}"; - hash = "sha256-wIgYExxJEWFxEadBuCsxEIcW2/J6EVybW1jp83gIMjY="; + hash = "sha256-NNlwrVrGg2WvkC42nmW7K/mRktE3B97GaL8GaSOKF1Y="; }; build-system = [ @@ -69,60 +60,46 @@ buildPythonPackage rec { ]; optional-dependencies = { - integration = [ - botorch - catboost - cma - distributed - lightgbm - mlflow - pandas - # pytorch-ignite - pytorch-lightning - scikit-learn - shap - tensorflow - torch - torchaudio - torchvision - wandb - xgboost - ]; optional = [ boto3 - botorch cmaes + fvcore google-cloud-storage + grpcio matplotlib pandas plotly + protobuf redis scikit-learn + scipy ]; }; preCheck = '' export PATH=$out/bin:$PATH + + # grpc tests are racy + sed -i '/"grpc",/d' optuna/testing/storages.py ''; nativeCheckInputs = [ fakeredis + kaleido moto pytest-xdist pytestCheckHook - scipy + torch ] ++ fakeredis.optional-dependencies.lua ++ optional-dependencies.optional; - pytestFlagsArray = [ "-m 'not integration'" ]; - - disabledTestPaths = [ - # require unpackaged kaleido and building it is a bit difficult - "tests/visualization_tests" - # ImportError: cannot import name 'mock_s3' from 'moto' - "tests/artifacts_tests/test_boto3.py" + disabledTests = [ + # ValueError: Transform failed with error code 525: error creating static canvas/context for image server + "test_get_pareto_front_plot" + # too narrow time limit + "test_get_timeline_plot_with_killed_running_trials" ]; pythonImportsCheck = [ "optuna" ]; From 228d4def8a0f1ed52c6a3c3d113cfd9e0d35bf65 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 8 Feb 2025 18:19:17 +0100 Subject: [PATCH 0658/2168] python312Packages.pyannote-audio: 3.3.1 -> 3.3.2 https://github.com/pyannote/pyannote-audio/blob/refs/tags/3.3.2/CHANGELOG.md --- pkgs/development/python-modules/pyannote-audio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyannote-audio/default.nix b/pkgs/development/python-modules/pyannote-audio/default.nix index 80998ea1f1d7..9e239ec88fdc 100644 --- a/pkgs/development/python-modules/pyannote-audio/default.nix +++ b/pkgs/development/python-modules/pyannote-audio/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "pyannote-audio"; - version = "3.3.1"; + version = "3.3.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "pyannote"; repo = "pyannote-audio"; tag = version; - hash = "sha256-85whRoc3JoDSE4DqivY/3hfvLHcvgsubR/DLCPtLEP0="; + hash = "sha256-Qx7NDXkT3eQr9PZXlYuoJD01dzsVCvfq6HNPnyLzyAQ="; fetchSubmodules = true; }; From 648f16acccab363aa6a41e750107365bfccd5866 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 8 Feb 2025 18:53:20 +0100 Subject: [PATCH 0659/2168] python312Packages.ax-platform: 0.4.3 -> 0.5.0 https://github.com/facebook/Ax/releases/tag/0.5.0 --- .../python-modules/ax-platform/default.nix | 47 ++++++++++++------- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/ax-platform/default.nix b/pkgs/development/python-modules/ax-platform/default.nix index 513e6ec00184..80b8990474e6 100644 --- a/pkgs/development/python-modules/ax-platform/default.nix +++ b/pkgs/development/python-modules/ax-platform/default.nix @@ -13,17 +13,19 @@ pyfakefs, pyre-extensions, pytestCheckHook, + pythonAtLeast, pythonOlder, setuptools-scm, setuptools, sqlalchemy, + tabulate, typeguard, yappi, }: buildPythonPackage rec { pname = "ax-platform"; - version = "0.4.3"; + version = "0.5.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -32,7 +34,7 @@ buildPythonPackage rec { owner = "facebook"; repo = "ax"; tag = version; - hash = "sha256-jmBjrtxqg4Iu3Qr0HRqjVfwURXzbJaGm+DBFNHYk/vA="; + hash = "sha256-CMKdnPvzQ9tvU9/01mRaWi/Beuyo19CtaXNJCoiwLOw="; }; env.ALLOW_BOTORCH_LATEST = "1"; @@ -62,16 +64,13 @@ buildPythonPackage rec { mercurial pyfakefs pytestCheckHook + tabulate yappi - ] ++ lib.flatten (builtins.attrValues optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); disabledTestPaths = [ "ax/benchmark" "ax/runners/tests/test_torchx.py" - # requires pyre_extensions - "ax/telemetry/tests" - "ax/core/tests/test_utils.py" - "ax/early_stopping/tests/test_strategies.py" # broken with sqlalchemy 2 "ax/core/tests/test_experiment.py" "ax/service/tests/test_ax_client.py" @@ -80,16 +79,30 @@ buildPythonPackage rec { "ax/storage" ]; - disabledTests = [ - # exact comparison of floating points - "test_optimize_l0_homotopy" - # AssertionError: 5 != 2 - "test_get_standard_plots_moo" - # AssertionError: Expected 'warning' to be called once. Called 3 times - "test_validate_kwarg_typing" - # uses torch.equal - "test_convert_observations" - ]; + disabledTests = + [ + # exact comparison of floating points + "test_optimize_l0_homotopy" + # AssertionError: 5 != 2 + "test_get_standard_plots_moo" + # AssertionError: Expected 'warning' to be called once. Called 3 times + "test_validate_kwarg_typing" + # uses torch.equal + "test_convert_observations" + # broken with sqlalchemy 2 + "test_sql_storage" + ] + ++ lib.optionals (pythonAtLeast "3.13") [ + # Both `metric_aggregation` and `criterion` must be `ReductionCriterion` + "test_SingleDiagnosticBestModelSelector_max_mean" + "test_SingleDiagnosticBestModelSelector_min_mean" + "test_SingleDiagnosticBestModelSelector_min_min" + "test_SingleDiagnosticBestModelSelector_model_cv_kwargs" + "test_init" + "test_gen" + # "use MIN or MAX" does not match "Both `metric_aggregation` and `criterion` must be `ReductionCriterion` + "test_user_input_error" + ]; pythonImportsCheck = [ "ax" ]; From d8d8124b5e16ef021a582aef09440a35bf2ca7ea Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 8 Feb 2025 21:36:23 +0100 Subject: [PATCH 0660/2168] python312Packages.synergy: fix build --- .../python-modules/synergy/default.nix | 35 +++++++++++++++---- 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/synergy/default.nix b/pkgs/development/python-modules/synergy/default.nix index 8d958862b675..2a60f4b23e5c 100644 --- a/pkgs/development/python-modules/synergy/default.nix +++ b/pkgs/development/python-modules/synergy/default.nix @@ -1,31 +1,36 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, pythonOlder, + setuptools, numpy, scipy, matplotlib, plotly, pandas, + hypothesis, + pytestCheckHook, }: buildPythonPackage rec { pname = "synergy"; version = "1.0.0"; - format = "setuptools"; + pyproject = true; + disabled = pythonOlder "3.5"; - # Pypi does not contain unit tests src = fetchFromGitHub { owner = "djwooten"; repo = "synergy"; tag = "v${version}"; - sha256 = "sha256-df5CBEcRx55/rSMc6ygMVrHbbEcnU1ISJheO+WoBSCI="; + hash = "sha256-df5CBEcRx55/rSMc6ygMVrHbbEcnU1ISJheO+WoBSCI="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ numpy scipy matplotlib @@ -33,7 +38,25 @@ buildPythonPackage rec { pandas ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + hypothesis + pytestCheckHook + ]; + + disabledTests = + [ + # flaky: hypothesis.errors.FailedHealthCheck + "test_asymptotic_limits" + "test_inverse" + # AssertionError: synthetic_BRAID_reference_1.csv + # E3=0 not in (0.10639582639915163, 1.6900177333904622) + "test_BRAID_fit_bootstrap" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # AssertionError: np.False_ is not true + "test_fit_loewe_antagonism" + ]; + pythonImportsCheck = [ "synergy" ]; meta = with lib; { From f09da94afd265dd6d5fe7ec0de60bbb08b812245 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Feb 2025 02:03:42 +0100 Subject: [PATCH 0661/2168] python312Packages.resampy: refactor and fix build on aarch64-linux --- .../python-modules/resampy/default.nix | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/resampy/default.nix b/pkgs/development/python-modules/resampy/default.nix index 7a4c3cf0dacd..f6ac5014be4a 100644 --- a/pkgs/development/python-modules/resampy/default.nix +++ b/pkgs/development/python-modules/resampy/default.nix @@ -1,19 +1,22 @@ { lib, + stdenv, buildPythonPackage, - cython, fetchFromGitHub, numba, numpy, + optuna, + pytest-cov-stub, pytestCheckHook, pythonOlder, + setuptools, scipy, }: buildPythonPackage rec { pname = "resampy"; version = "0.4.3"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -24,21 +27,26 @@ buildPythonPackage rec { hash = "sha256-LOWpOPAEK+ga7c3bR15QvnHmON6ARS1Qee/7U/VMlTY="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ numpy - cython numba ]; + optional-dependencies.design = [ optuna ]; + nativeCheckInputs = [ + pytest-cov-stub pytestCheckHook scipy - ]; + ] ++ optional-dependencies.design; - postPatch = '' - substituteInPlace setup.cfg \ - --replace " --cov-report term-missing --cov resampy --cov-report=xml" "" - ''; + disabledTests = lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [ + # crashing the interpreter + "test_quality_sine_parallel" + "test_resample_nu_quality_sine_parallel" + ]; pythonImportsCheck = [ "resampy" ]; From 8b07f82b1c648514c8a59428e743f8ed798c1698 Mon Sep 17 00:00:00 2001 From: Savyasachee Jha Date: Sun, 9 Feb 2025 11:49:08 +0530 Subject: [PATCH 0662/2168] firefly-iii: 6.2.4 -> 6.2.5 --- pkgs/by-name/fi/firefly-iii/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fi/firefly-iii/package.nix b/pkgs/by-name/fi/firefly-iii/package.nix index 274e250b1540..44c3313fc93f 100644 --- a/pkgs/by-name/fi/firefly-iii/package.nix +++ b/pkgs/by-name/fi/firefly-iii/package.nix @@ -13,13 +13,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "firefly-iii"; - version = "6.2.4"; + version = "6.2.5"; src = fetchFromGitHub { owner = "firefly-iii"; repo = "firefly-iii"; tag = "v${finalAttrs.version}"; - hash = "sha256-IBf34RPpQUH3U0tl8ljJpL9of6QNDOTyBg7Hc1ae+W8="; + hash = "sha256-EHxvp5L2/erFgXC9YkecWdMLP4KnTDbXzduFnED/6f0="; }; buildInputs = [ php84 ]; @@ -38,12 +38,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { composerStrictValidation = true; strictDeps = true; - vendorHash = "sha256-LRcgWQPDLNCMbaJhaySDrcw95fXF4yVUc03SFnrteeM="; + vendorHash = "sha256-rhN5YMlzoGFZNYCNhG3OXFnGEPpGrbVAxCg4maF5/+c="; npmDeps = fetchNpmDeps { inherit (finalAttrs) src; name = "${finalAttrs.pname}-npm-deps"; - hash = "sha256-K8zoX4UsD/hOpMZ5JCH3G9WBTUpJcXAertEaXaUGcys="; + hash = "sha256-PAAauxUJDDinGa2yQJmunyLMbDO2a3Whi2N7mEXyJ1s="; }; composerRepository = php84.mkComposerRepository { From 07ff38f9674b3398c566b0f28e566a88e2dafce6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 06:20:39 +0000 Subject: [PATCH 0663/2168] justbuild: 1.4.2 -> 1.4.3 --- pkgs/by-name/ju/justbuild/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ju/justbuild/package.nix b/pkgs/by-name/ju/justbuild/package.nix index fdd98efcd674..4c912509619c 100644 --- a/pkgs/by-name/ju/justbuild/package.nix +++ b/pkgs/by-name/ju/justbuild/package.nix @@ -33,13 +33,13 @@ let in stdenv.mkDerivation rec { pname = "justbuild"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "just-buildsystem"; repo = "justbuild"; rev = "refs/tags/v${version}"; - hash = "sha256-oMl+hY7E4vYB4J/5LXq6sw9bafYwhXY8lkEWwU6j0Fk="; + hash = "sha256-Hx+MU1W/vwN+hlAAbIieBAmHUw65AGZ10ItBdIG+IEM="; }; bazelapi = fetchurl { From d6d48cf51ac223071db994eefd998312922879d0 Mon Sep 17 00:00:00 2001 From: Rvfg Date: Sun, 9 Feb 2025 14:44:17 +0800 Subject: [PATCH 0664/2168] llama-cpp: fix rocmSupport --- pkgs/by-name/ll/llama-cpp/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index 634c0e9dcd8f..172d0f30c6ab 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -144,7 +144,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { (cmakeBool "GGML_BLAS" blasSupport) (cmakeBool "GGML_CLBLAST" openclSupport) (cmakeBool "GGML_CUDA" cudaSupport) - (cmakeBool "GGML_HIPBLAS" rocmSupport) + (cmakeBool "GGML_HIP" rocmSupport) (cmakeBool "GGML_METAL" metalSupport) (cmakeBool "GGML_RPC" rpcSupport) (cmakeBool "GGML_VULKAN" vulkanSupport) From af3f975c5508f7cb2d008e90a219976190bfaef2 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 9 Feb 2025 07:50:48 +0100 Subject: [PATCH 0665/2168] net-cpp: Fix FTBFS - Pin to boost 1.86 - Fetch Debian patch to fix compat with newer flask --- pkgs/by-name/ne/net-cpp/package.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/net-cpp/package.nix b/pkgs/by-name/ne/net-cpp/package.nix index 16fe04ccd5c2..fedb695fc245 100644 --- a/pkgs/by-name/ne/net-cpp/package.nix +++ b/pkgs/by-name/ne/net-cpp/package.nix @@ -5,7 +5,8 @@ fetchpatch, gitUpdater, testers, - boost, + # https://gitlab.com/ubports/development/core/lib-cpp/net-cpp/-/issues/5 + boost186, cmake, curl, doxygen, @@ -50,11 +51,18 @@ stdenv.mkDerivation (finalAttrs: { url = "https://salsa.debian.org/ubports-team/net-cpp/-/raw/941d9eceaa66a06eabb1eb79554548b47d4a60ab/debian/patches/1007_wait-for-flask.patch"; hash = "sha256-nsGkZBuqahsg70PLUxn5EluDjmfZ0/wSnOYimfAI4ag="; }) + # Bump std version to 14 for gtest 1.13+ (fetchpatch { url = "https://salsa.debian.org/ubports-team/net-cpp/-/raw/f3a031eb7e4ce7df00781100f16de58a4709afcb/debian/patches/0001-Bump-std-version-to-14-needed-for-googletest-1.13.0.patch"; hash = "sha256-3ykqCfZjtTx7zWQ5rkMhVp7D5fkpoCjl0CVFwwEd4U4="; }) + + # Fix newer flask rejecting large chunks by default + (fetchpatch { + url = "https://salsa.debian.org/ubports-team/net-cpp/-/raw/f2050b5318cba3860fa1042e9b81e1b792b972c4/debian/patches/1008_set-MAX-CONTENT-LENGTH-for-flask-server-to-let-it-accept-big-chunks-of-data.patch"; + hash = "sha256-lfMRjpmysrhzdG6OOSpBGvYJCi1hrERI/SRf+rAakbA="; + }) ]; postPatch = lib.optionalString finalAttrs.finalPackage.doCheck '' @@ -73,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - boost + boost186 curl ]; From fa9d3e6a1c0ec401291bb431c33a19a385889e7d Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 9 Feb 2025 07:52:26 +0100 Subject: [PATCH 0666/2168] lomiri.biometryd: Link upstream issue about boost compat --- pkgs/desktops/lomiri/services/biometryd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/lomiri/services/biometryd/default.nix b/pkgs/desktops/lomiri/services/biometryd/default.nix index 3c590f7d2bf5..0636f116e452 100644 --- a/pkgs/desktops/lomiri/services/biometryd/default.nix +++ b/pkgs/desktops/lomiri/services/biometryd/default.nix @@ -4,7 +4,7 @@ fetchFromGitLab, gitUpdater, testers, - # Pin Boost 1.86 due to use of boost::asio::io_service. + # https://gitlab.com/ubports/development/core/biometryd/-/issues/8 boost186, cmake, cmake-extras, From ad9887f54b6da995356c06c02fc7a7b1514faec0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 06:54:57 +0000 Subject: [PATCH 0667/2168] jawiki-all-titles-in-ns0: 0-unstable-2025-01-01 -> 0-unstable-2025-02-01 --- pkgs/by-name/ja/jawiki-all-titles-in-ns0/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ja/jawiki-all-titles-in-ns0/package.nix b/pkgs/by-name/ja/jawiki-all-titles-in-ns0/package.nix index 5e5c3a132245..5b397213e61a 100644 --- a/pkgs/by-name/ja/jawiki-all-titles-in-ns0/package.nix +++ b/pkgs/by-name/ja/jawiki-all-titles-in-ns0/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "jawiki-all-titles-in-ns0"; - version = "0-unstable-2025-01-01"; + version = "0-unstable-2025-02-01"; src = fetchFromGitHub { owner = "musjj"; repo = "jawiki-archive"; - rev = "dbd1e032f8685387c0dbeb1a472ab9215250d11f"; - hash = "sha256-2GjbXjsf8OV/9EuX675hBXTWQsf+KhKhh1IiAxbzqfU="; + rev = "6cc3e7af84f3809f95bd4340847de3fabccb0a8c"; + hash = "sha256-nd329TNBABpRb+Z2eMUzNwTToMIDM/2Zt47NYfKyXe0="; }; installPhase = '' From 58c40e5a5b80fbbfda4a3449458f709aeb68b33a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 06:56:00 +0000 Subject: [PATCH 0668/2168] jp-zip-codes: 0-unstable-2025-01-01 -> 0-unstable-2025-02-01 --- pkgs/by-name/jp/jp-zip-codes/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/jp/jp-zip-codes/package.nix b/pkgs/by-name/jp/jp-zip-codes/package.nix index 297f49edece1..ec43031235eb 100644 --- a/pkgs/by-name/jp/jp-zip-codes/package.nix +++ b/pkgs/by-name/jp/jp-zip-codes/package.nix @@ -7,15 +7,15 @@ stdenvNoCC.mkDerivation { pname = "jp-zip-code"; - version = "0-unstable-2025-01-01"; + version = "0-unstable-2025-02-01"; # This package uses a mirror as the source because the # original provider uses the same URL for updated content. src = fetchFromGitHub { owner = "musjj"; repo = "jp-zip-codes"; - rev = "45aa11f1f60515893b0eb8f533f540632b394564"; - hash = "sha256-qcP1lc5E1RS+n7e3hmZwaHtnf9ErOYprW+/w0r65ZuI="; + rev = "2fdcd4f4c00a90de1dacfe16644bbaadbfd377aa"; + hash = "sha256-i81TzPrhHE3wZdq/HJGnTsvmo/clWCYO74hJf9hMxs4="; }; installPhase = '' From 93a263b6e024a9d35727c76069b03c1b5c9afd50 Mon Sep 17 00:00:00 2001 From: Patrick Date: Sun, 5 Jan 2025 18:10:21 +0100 Subject: [PATCH 0669/2168] homebox: 0.16.0 -> 0.17.0 --- pkgs/by-name/ho/homebox/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ho/homebox/package.nix b/pkgs/by-name/ho/homebox/package.nix index 3139f8f8f5d5..5c938806ec76 100644 --- a/pkgs/by-name/ho/homebox/package.nix +++ b/pkgs/by-name/ho/homebox/package.nix @@ -11,18 +11,18 @@ }: let pname = "homebox"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "sysadminsmedia"; repo = "homebox"; rev = "v${version}"; - hash = "sha256-d8SQWj7S6G1ZemMH6QL9QZuPQfxNRcfCurPaTnS0Iyo="; + hash = "sha256-XzO/aJcLGu+ZHt9fDUhUzBbUS9VpChFVOH0cgvYK6kc="; }; in buildGo123Module { inherit pname version src; - vendorHash = "sha256-Ftm5tR3w8S3mjYLJG0+17nYP5kDbaAd8QkbZpNt7WuE="; + vendorHash = "sha256-Zo/yI1mNeN0O9gZsHux6aOzBlv72h17s7QNO+MaG2/g="; modRoot = "backend"; # the goModules derivation inherits our buildInputs and buildPhases # Since we do pnpm thing in those it fails if we don't explicitely remove them @@ -38,7 +38,7 @@ buildGo123Module { pnpmDeps = pnpm_9.fetchDeps { inherit pname version; src = "${src}/frontend"; - hash = "sha256-x7sWSH84UJEXNRLCgEgXc4NrTRsn6OplANi+XGtIN9Y="; + hash = "sha256-nbZxCUXgXoaxIiJsB57OZ7YUkD7Njccj6nFkaHBbctw="; }; pnpmRoot = "../frontend"; From 31f561c0cc1b24b32b6370ec26493dec25daafa0 Mon Sep 17 00:00:00 2001 From: Rhys-T <108157737+Rhys-T@users.noreply.github.com> Date: Sun, 9 Feb 2025 02:45:34 -0500 Subject: [PATCH 0670/2168] timidity: update URL of Midia instruments tarball --- pkgs/tools/misc/timidity/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix index c139d741fab2..a6c2349bef13 100644 --- a/pkgs/tools/misc/timidity/default.nix +++ b/pkgs/tools/misc/timidity/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { ]; instruments = fetchurl { - url = "http://www.csee.umbc.edu/pub/midia/instruments.tar.gz"; + url = "https://courses.cs.umbc.edu/pub/midia/instruments.tar.gz"; sha256 = "0lsh9l8l5h46z0y8ybsjd4pf6c22n33jsjvapfv3rjlfnasnqw67"; }; From 0ff910e9c714418b90b4d68f2a31701803691519 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 07:57:33 +0000 Subject: [PATCH 0671/2168] equibop: 2.1.1 -> 2.1.2 --- pkgs/by-name/eq/equibop/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/eq/equibop/package.nix b/pkgs/by-name/eq/equibop/package.nix index d3587cc7e78d..54e006c2c2ff 100644 --- a/pkgs/by-name/eq/equibop/package.nix +++ b/pkgs/by-name/eq/equibop/package.nix @@ -23,13 +23,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "equibop"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "Equicord"; repo = "Equibop"; tag = "v${finalAttrs.version}"; - hash = "sha256-LGgmWaC7iYj0Mx5wPKmLkYV2ozyhkiwrE4v4uFB0erg="; + hash = "sha256-lDDGZUpW9LU5S/gzNJFIuVIk08pQlQLK07RwuzcYyjg="; }; pnpmDeps = pnpm_9.fetchDeps { @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { src patches ; - hash = "sha256-dIz/HyhzFU86QqQEQ9qWSthKB9HfoRJbmpc3raWNbcA="; + hash = "sha256-MuCQJgUHyAKpKWM7lYE49zur+G+KtIVBVXCspWImnY8="; }; nativeBuildInputs = [ From 3d5472c8bf3624564991f6285c26bd8c5d95eb78 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 07:59:25 +0000 Subject: [PATCH 0672/2168] mame: 0.273 -> 0.274 --- pkgs/applications/emulators/mame/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix index b5b760caa955..ebf1b83c7e67 100644 --- a/pkgs/applications/emulators/mame/default.nix +++ b/pkgs/applications/emulators/mame/default.nix @@ -40,14 +40,14 @@ let in stdenv.mkDerivation rec { pname = "mame"; - version = "0.273"; + version = "0.274"; srcVersion = builtins.replaceStrings [ "." ] [ "" ] version; src = fetchFromGitHub { owner = "mamedev"; repo = "mame"; rev = "mame${srcVersion}"; - hash = "sha256-aOBYnkdcFKDkw/KFiv0IRgpOChn8NRKD2xmbfExYGKY="; + hash = "sha256-fZ2mjwP45qpFB0VaIHBccjkDPKyDmxqaXcZg3TFSAlY="; }; outputs = [ From 63e2fb78322ae53a81be727bbb26a6c6541dbb55 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Sun, 9 Feb 2025 09:01:22 +0100 Subject: [PATCH 0673/2168] python312Packages.icontract: relax deps Signed-off-by: Florian Brandes --- pkgs/development/python-modules/icontract/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/icontract/default.nix b/pkgs/development/python-modules/icontract/default.nix index 9ae20a1943d2..d5584869bc69 100644 --- a/pkgs/development/python-modules/icontract/default.nix +++ b/pkgs/development/python-modules/icontract/default.nix @@ -41,6 +41,9 @@ buildPythonPackage rec { asttokens typing-extensions ]; + pythonRelaxDeps = [ + "asttokens" + ]; nativeCheckInputs = [ astor From 2aa1904f346a66d9047bb624c0be96be0c6328d1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 08:05:28 +0000 Subject: [PATCH 0674/2168] python312Packages.neo: 0.13.4 -> 0.14.0 --- pkgs/development/python-modules/neo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/neo/default.nix b/pkgs/development/python-modules/neo/default.nix index f47bb14bf457..27e9c1b5e8d4 100644 --- a/pkgs/development/python-modules/neo/default.nix +++ b/pkgs/development/python-modules/neo/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "neo"; - version = "0.13.4"; + version = "0.14.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "NeuralEnsemble"; repo = "python-neo"; tag = version; - hash = "sha256-iBrZXJ4I0PWMwkLBSbtfImNPqupr4GyXNvGqwqEp6Qs="; + hash = "sha256-lLs70BsbFxTmd/qR0EqsceG+fAKI1P+em5Ix2kM9w/w="; }; build-system = [ setuptools ]; From cc1de63fd1bf028b1e5804d6f27f078a83907f65 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 9 Feb 2025 07:46:29 +0000 Subject: [PATCH 0675/2168] vifm: 0.13 -> 0.14 Note that handling of `vifmrc` changed quite a bit. Changes: https://github.com/vifm/vifm/releases/tag/v0.14 --- pkgs/by-name/vi/vifm/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vi/vifm/package.nix b/pkgs/by-name/vi/vifm/package.nix index 01c841050cad..0a2e023a46d5 100644 --- a/pkgs/by-name/vi/vifm/package.nix +++ b/pkgs/by-name/vi/vifm/package.nix @@ -23,11 +23,11 @@ let in stdenv.mkDerivation rec { pname = if isFullPackage then "vifm-full" else "vifm"; - version = "0.13"; + version = "0.14"; src = fetchurl { url = "https://github.com/vifm/vifm/releases/download/v${version}/vifm-${version}.tar.bz2"; - hash = "sha256-DZKTdJp5QHat6Wfs3EfRQdheRQNwWUdlORvfGpvUUHU="; + hash = "sha256-JxTdTO9OU+eomAroRF6IJ5EE+BXUf0F/oLit/i89G+0="; }; nativeBuildInputs = [ From 9714d4fec2c96d6ff4fd93b899e2710e3c66144b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 9 Feb 2025 08:33:21 +0000 Subject: [PATCH 0676/2168] vifm: set mainProgram = vifm Without the change `vifm-full` can't be ran as: $ nix run -f. vifm-full error: unable to execute '...-vifm-full-0.14/bin/vifm-full': No such file or directory With the change both of the above run fine: $ nix run -f. vifm $ nix run -f. vifm-full --- pkgs/by-name/vi/vifm/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/vi/vifm/package.nix b/pkgs/by-name/vi/vifm/package.nix index 0a2e023a46d5..2110a038fd3d 100644 --- a/pkgs/by-name/vi/vifm/package.nix +++ b/pkgs/by-name/vi/vifm/package.nix @@ -69,6 +69,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Vi-like file manager${lib.optionalString isFullPackage "; Includes support for optional features"}"; + mainProgram = "vifm"; maintainers = with maintainers; [ raskin ]; platforms = if mediaSupport then platforms.linux else platforms.unix; license = licenses.gpl2; From 3f4656749ee0f3c8440d454a9ab3678f9e7b1cd6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 08:49:22 +0000 Subject: [PATCH 0677/2168] aerospike: 8.0.0.1 -> 8.0.0.2 --- pkgs/by-name/ae/aerospike/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ae/aerospike/package.nix b/pkgs/by-name/ae/aerospike/package.nix index 5ea24c9cf1c8..79bfd9f1be8e 100644 --- a/pkgs/by-name/ae/aerospike/package.nix +++ b/pkgs/by-name/ae/aerospike/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "aerospike-server"; - version = "8.0.0.1"; + version = "8.0.0.2"; src = fetchFromGitHub { owner = "aerospike"; repo = "aerospike-server"; rev = version; - hash = "sha256-uVHi1/cT/3Rr/r3JudA09d3TMaTPYjc0ZpvTlz4m8aU="; + hash = "sha256-Wto0C4q/x0VD9kHSOFuquh/vXC7pSEBFqpZJxRAa2Cg="; fetchSubmodules = true; }; From c0160473c00f5533db79cc127a8dfb9c1a68e867 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 09:05:17 +0000 Subject: [PATCH 0678/2168] mediamtx: 1.11.2 -> 1.11.3 --- pkgs/by-name/me/mediamtx/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/me/mediamtx/package.nix b/pkgs/by-name/me/mediamtx/package.nix index 68f344c35841..6d6ebbe587a0 100644 --- a/pkgs/by-name/me/mediamtx/package.nix +++ b/pkgs/by-name/me/mediamtx/package.nix @@ -15,16 +15,16 @@ in buildGoModule rec { pname = "mediamtx"; # check for hls.js version updates in internal/servers/hls/hlsjsdownloader/VERSION - version = "1.11.2"; + version = "1.11.3"; src = fetchFromGitHub { owner = "bluenviron"; repo = pname; rev = "v${version}"; - hash = "sha256-+NT3YheDdlTPnyGLUl9mpyYx2kvN1lw2jDRdAboTSdc="; + hash = "sha256-LPyyPHTdV9cUDRKSlP+XaMyb+yhSj4Jq0tnT7AnTRqw="; }; - vendorHash = "sha256-aDBjxt3f7z/9LwYJ5KyteODGFO5u+7m/rovOd9363Fg="; + vendorHash = "sha256-lR2GH/oEdzdnel7wUAVDUQIpKuI4WUsa75Nn44SWloY="; postPatch = '' cp ${hlsJs} internal/servers/hls/hls.min.js From d3b9bb1ea0207fc68ee38f320338eb9ca2e92d5b Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 9 Feb 2025 01:04:40 +0200 Subject: [PATCH 0679/2168] vim-language-server: no with lib; in meta --- pkgs/by-name/vi/vim-language-server/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vi/vim-language-server/package.nix b/pkgs/by-name/vi/vim-language-server/package.nix index 7e192164ffa4..f09921ec890f 100644 --- a/pkgs/by-name/vi/vim-language-server/package.nix +++ b/pkgs/by-name/vi/vim-language-server/package.nix @@ -37,11 +37,11 @@ stdenv.mkDerivation (finalAttrs: { export NODE_OPTIONS=--openssl-legacy-provider ''; - meta = with lib; { + meta = { description = "VImScript language server, LSP for vim script"; homepage = "https://github.com/iamcco/vim-language-server"; - license = licenses.mit; - maintainers = with maintainers; [ doronbehar ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ doronbehar ]; mainProgram = "vim-language-server"; }; }) From 2161adcf527ff56b3bd614485e59893fd58094f4 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 9 Feb 2025 01:04:21 +0200 Subject: [PATCH 0680/2168] vim-language-server: fix noBrokenSymlinks complaint Fixes #380470 . --- pkgs/by-name/vi/vim-language-server/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/vi/vim-language-server/package.nix b/pkgs/by-name/vi/vim-language-server/package.nix index f09921ec890f..5854dd6923eb 100644 --- a/pkgs/by-name/vi/vim-language-server/package.nix +++ b/pkgs/by-name/vi/vim-language-server/package.nix @@ -36,6 +36,10 @@ stdenv.mkDerivation (finalAttrs: { preBuild = '' export NODE_OPTIONS=--openssl-legacy-provider ''; + # Needed ever since noBrokenSymlinks was introduced + postInstall = '' + rm $out/lib/node_modules/vim-language-server/node_modules/.bin/node-which + ''; meta = { description = "VImScript language server, LSP for vim script"; From f8d2621893b8b6fe42ca84579165e021b3269efe Mon Sep 17 00:00:00 2001 From: arminius-smh Date: Sun, 9 Feb 2025 10:08:50 +0100 Subject: [PATCH 0681/2168] nwg-displays: update to python3Packages --- pkgs/by-name/nw/nwg-displays/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/nw/nwg-displays/package.nix b/pkgs/by-name/nw/nwg-displays/package.nix index a59d24afe44f..a79a98919b75 100644 --- a/pkgs/by-name/nw/nwg-displays/package.nix +++ b/pkgs/by-name/nw/nwg-displays/package.nix @@ -7,13 +7,13 @@ gtk-layer-shell, gtk3, pango, - python310Packages, + python3Packages, wrapGAppsHook3, hyprlandSupport ? true, wlr-randr, }: -python310Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "nwg-displays"; version = "0.3.22"; @@ -39,9 +39,9 @@ python310Packages.buildPythonApplication rec { gdk-pixbuf gtk-layer-shell pango - python310Packages.gst-python - python310Packages.i3ipc - python310Packages.pygobject3 + python3Packages.gst-python + python3Packages.i3ipc + python3Packages.pygobject3 ] ++ lib.optionals hyprlandSupport [ wlr-randr From 3787e47852f187266b09845735a92f76deef56bd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 08:49:55 +0000 Subject: [PATCH 0682/2168] fswatch: 1.18.2 -> 1.18.3 --- pkgs/development/tools/misc/fswatch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix index bf6fcf41cef1..eb13e9d9b738 100644 --- a/pkgs/development/tools/misc/fswatch/default.nix +++ b/pkgs/development/tools/misc/fswatch/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "fswatch"; - version = "1.18.2"; + version = "1.18.3"; src = fetchFromGitHub { owner = "emcrisostomo"; repo = "fswatch"; rev = version; - sha256 = "sha256-u9+sayp0U6TudffGP2Bb2PbbSMjUHCb6gGBq3jKQ3EQ="; + sha256 = "sha256-C/NHDhhRTQppu8xRWe9fy1+KIutyoRbkkabUtGlJ1fE="; }; nativeBuildInputs = [ From 76ce1f6395aa33ce8f4214433cd2375060792e9b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 09:20:25 +0000 Subject: [PATCH 0683/2168] basedpyright: 1.26.0 -> 1.27.0 --- pkgs/by-name/ba/basedpyright/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ba/basedpyright/package.nix b/pkgs/by-name/ba/basedpyright/package.nix index a7e46c9c54c0..9102a2efab1a 100644 --- a/pkgs/by-name/ba/basedpyright/package.nix +++ b/pkgs/by-name/ba/basedpyright/package.nix @@ -16,16 +16,16 @@ buildNpmPackage rec { pname = "basedpyright"; - version = "1.26.0"; + version = "1.27.0"; src = fetchFromGitHub { owner = "detachhead"; repo = "basedpyright"; tag = "v${version}"; - hash = "sha256-USGndOqosE6+gkCow7UeqEd37R4gYo5om1QEV7iz77g="; + hash = "sha256-2lQ/uOojY/u43Yf/rqLdzTn4fs8/HHxztH5ua7fOXsk="; }; - npmDepsHash = "sha256-lpAsDMa3yRtbORmycDh3nGpozmzHej4WORvEml/+buE="; + npmDepsHash = "sha256-4EFl0hOI6DcpzcSedanQBOrNbHTxR0G7C8L4+7EnESE="; npmWorkspace = "packages/pyright"; preBuild = '' From a6c5f307e04333c7fa371740e2b2f552f7b94c02 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 09:56:23 +0000 Subject: [PATCH 0684/2168] discordo: 0-unstable-2025-01-27 -> 0-unstable-2025-02-08 --- pkgs/applications/networking/discordo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/discordo/default.nix b/pkgs/applications/networking/discordo/default.nix index 6a2eeac25958..7c2ff3342650 100644 --- a/pkgs/applications/networking/discordo/default.nix +++ b/pkgs/applications/networking/discordo/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "discordo"; - version = "0-unstable-2025-01-27"; + version = "0-unstable-2025-02-08"; src = fetchFromGitHub { owner = "ayn2op"; repo = pname; - rev = "1783361d5fb839e54f4562a9c42eb478d9cc8f57"; - hash = "sha256-AU7gT+q1vF4WWn5o2OCiAjHjub0ig1O7/CjFnuQaN6I="; + rev = "ea51fac7d6ea0fcb48decac8600d82e39a6879dd"; + hash = "sha256-pQjukqycdiMG9aCk37+LKZXlJPxgi8ZrI0G5Tsnv9xg="; }; vendorHash = "sha256-FsZRh4k9ucmAruJa1MZ4kVVryrEuHy9StgXHvgBiWSg="; From 8b45e02fc97e203ad229db9c0dd176c73529a98e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 10:00:55 +0000 Subject: [PATCH 0685/2168] terraform-providers.spotinst: 1.208.0 -> 1.209.1 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 2d0f95f79488..1525dc175501 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1192,11 +1192,11 @@ "vendorHash": "sha256-c3R/7k7y7XS2Qli00nSj7gh/3Mj88PY4WybBTq/+pPs=" }, "spotinst": { - "hash": "sha256-zP71u5xaWcb+LBKGU3yFAQcZnK6MlO5WRQwc8Fz9ZJY=", + "hash": "sha256-ThGr8oY7SevU05S7g4r8Il4mr02zzg53YzaYztkY7M4=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.208.0", + "rev": "v1.209.1", "spdx": "MPL-2.0", "vendorHash": "sha256-HNKdEwG+7IJ2YpX97qkvXZbsoJWx+u+rZXRoZzvB1XA=" }, From 7525b1f4200046942ddf86c10f58e48ef44de186 Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Sun, 9 Feb 2025 12:11:04 +0200 Subject: [PATCH 0686/2168] watchman: remove unused `fetchpatch` argument --- pkgs/by-name/wa/watchman/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/wa/watchman/package.nix b/pkgs/by-name/wa/watchman/package.nix index 50d155809a40..2dc0949a9b3c 100644 --- a/pkgs/by-name/wa/watchman/package.nix +++ b/pkgs/by-name/wa/watchman/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, - fetchpatch, cmake, ninja, From 02a192ceabf4b50de3613d79c6624197d0866fbd Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Sun, 9 Feb 2025 12:11:26 +0200 Subject: [PATCH 0687/2168] watchman: add `meta.mainProgram` To get rid of the complaint from `lib.getExe`. --- pkgs/by-name/wa/watchman/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/wa/watchman/package.nix b/pkgs/by-name/wa/watchman/package.nix index 2dc0949a9b3c..7e662f24b40e 100644 --- a/pkgs/by-name/wa/watchman/package.nix +++ b/pkgs/by-name/wa/watchman/package.nix @@ -113,6 +113,7 @@ stdenv.mkDerivation (finalAttrs: { emily techknowlogick ]; + mainProgram = "watchman"; platforms = lib.platforms.unix; license = lib.licenses.mit; }; From fe998d0080488bbc1e0ba97afc947a776dd3860f Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 9 Feb 2025 11:19:57 +0100 Subject: [PATCH 0688/2168] p11-kit: mark unsupported on static --- pkgs/by-name/p1/p11-kit/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/p1/p11-kit/package.nix b/pkgs/by-name/p1/p11-kit/package.nix index ecef4be12433..72051381239a 100644 --- a/pkgs/by-name/p1/p11-kit/package.nix +++ b/pkgs/by-name/p1/p11-kit/package.nix @@ -95,6 +95,10 @@ stdenv.mkDerivation rec { "https://github.com/p11-glue/p11-kit/releases/tag/${version}" ]; platforms = platforms.all; + badPlatforms = [ + # https://github.com/p11-glue/p11-kit/issues/355#issuecomment-778777141 + lib.systems.inspect.platformPatterns.isStatic + ]; license = licenses.bsd3; mainProgram = "p11-kit"; }; From 4ca5e4ed5c83d422cd938860e2b03a20aa88c939 Mon Sep 17 00:00:00 2001 From: Eric Roberts Date: Sat, 8 Feb 2025 15:01:23 +0000 Subject: [PATCH 0689/2168] hoarder: 0.21.0 -> 0.22.0 --- pkgs/by-name/ho/hoarder/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ho/hoarder/package.nix b/pkgs/by-name/ho/hoarder/package.nix index 9635eceec1e2..b3072efb31c7 100644 --- a/pkgs/by-name/ho/hoarder/package.nix +++ b/pkgs/by-name/ho/hoarder/package.nix @@ -15,13 +15,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "hoarder"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "hoarder-app"; repo = "hoarder"; tag = "v${finalAttrs.version}"; - hash = "sha256-3xgpiqq+BV0a/OlcQiGDt59fYNF+zP0+HPeBCRiZj48="; + hash = "sha256-SYcJfobuDl2iPXy5qGGG8ukBX/CSboSo/hF2e/8ixVw="; }; patches = [ @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { installPhase = "cp -pr --reflink=auto -- . $out"; }; - hash = "sha256-U2wrjBhklP7c8S3QQoUtOPTYyJr7MBOwm0R/76FjhqE="; + hash = "sha256-4MSNh2lyl0PFUoG29Tmk3WOZSRnW8NBE3xoppJr8ZNY="; }; buildPhase = '' runHook preBuild From e342803c2204bd5c7ca29bee30d53f26312565ac Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Fri, 31 Jan 2025 16:33:39 +0100 Subject: [PATCH 0690/2168] cups-filters: Fix cross compilation --- pkgs/misc/cups/filters.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index 86792c456244..ec10c8af68c6 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -29,6 +29,7 @@ stdenv, which, withAvahi ? true, + glib, }: ( @@ -61,10 +62,14 @@ hash = "sha256-bLOl64bdeZ10JLcQ7GbU+VffJu3Lzo0ves7O7GQIOWY="; }; + strictDeps = true; + nativeBuildInputs = [ - pkg-config - makeWrapper autoreconfHook + cups + glib + makeWrapper + pkg-config ]; buildInputs = [ From 9a0b855695c31ea653181b742c65e026bada3881 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Feb 2025 11:44:08 +0100 Subject: [PATCH 0691/2168] python312Packages.sonarr: drop (#373330) --- .../python-modules/sonarr/default.nix | 43 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 pkgs/development/python-modules/sonarr/default.nix diff --git a/pkgs/development/python-modules/sonarr/default.nix b/pkgs/development/python-modules/sonarr/default.nix deleted file mode 100644 index 479ae69e96b9..000000000000 --- a/pkgs/development/python-modules/sonarr/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - aiohttp, - yarl, - aresponses, - pytest-asyncio, - pytestCheckHook, -}: - -buildPythonPackage rec { - pname = "sonarr"; - version = "0.3.0"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "ctalkington"; - repo = "python-sonarr"; - rev = version; - sha256 = "0gi34951qhzzrq59hj93mnkid8cvvknlamkhir6ya9mb23fr7bya"; - }; - - propagatedBuildInputs = [ - aiohttp - yarl - ]; - - nativeCheckInputs = [ - aresponses - pytest-asyncio - pytestCheckHook - ]; - - pythonImportsCheck = [ "sonarr" ]; - - meta = with lib; { - description = "Asynchronous Python client for the Sonarr API"; - homepage = "https://github.com/ctalkington/python-sonarr"; - license = licenses.mit; - maintainers = with maintainers; [ dotlambda ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index bc57e73bc424..434e1b6f3cd9 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -657,6 +657,7 @@ mapAliases ({ smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 smpp_pdu = smpp-pdu; # added 2024-03-05 somecomfort = throw "somecomfort was removed because Home Assistant switched to aiosomecomfort"; # added 2023-02-01 + sonarr = throw "sonarr has been deprecated and removed"; # added 2025-01-13 solaredge = throw "solaredge was removed because Home Assistant switched to aiosolaredge"; # added 2024-07-15 sorl_thumbnail = sorl-thumbnail; # added 2023-11-12 spacy_models = spacy-models; # added 2024-04-21 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8f7554dd90ff..81197ab34f04 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15258,8 +15258,6 @@ self: super: with self; { somweb = callPackage ../development/python-modules/somweb { }; - sonarr = callPackage ../development/python-modules/sonarr { }; - sonos-websocket = callPackage ../development/python-modules/sonos-websocket { }; sopel = callPackage ../development/python-modules/sopel { }; From 9a39290329b885158485dbd1a3d76b24d53ee588 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 12:08:15 +0100 Subject: [PATCH 0692/2168] lomiri.cmake-extras: 1.7 -> 1.8 Co-authored-by: OPNA2608 --- .../development/cmake-extras/default.nix | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/lomiri/development/cmake-extras/default.nix b/pkgs/desktops/lomiri/development/cmake-extras/default.nix index 21dc05dd12f4..97f36af0f924 100644 --- a/pkgs/desktops/lomiri/development/cmake-extras/default.nix +++ b/pkgs/desktops/lomiri/development/cmake-extras/default.nix @@ -8,23 +8,23 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "cmake-extras"; - version = "1.7"; + version = "1.8"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/cmake-extras"; - rev = finalAttrs.version; - hash = "sha256-5bLMk21pSZkuU3jAGTnjPc9ZrvVZqMUWSfFgkTtkYLw="; + tag = finalAttrs.version; + hash = "sha256-4KPk8GrpmrrwN6epmzGVh0fCBgP765xR3Im5mMmE9vw="; }; postPatch = '' # We have nothing to build here, no need to depend on a C compiler substituteInPlace CMakeLists.txt \ - --replace 'project(cmake-extras' 'project(cmake-extras LANGUAGES NONE' + --replace-fail 'project(cmake-extras' 'project(cmake-extras LANGUAGES NONE' # This is in a function that reverse dependencies use to determine where to install their files to substituteInPlace src/QmlPlugins/QmlPluginsConfig.cmake \ - --replace "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" + --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt\''${QT_VERSION_MAJOR}/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" ''; strictDeps = true; @@ -40,11 +40,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { qtbase ]; - meta = with lib; { + meta = { description = "Collection of add-ons for the CMake build tool"; - homepage = "https://gitlab.com/ubports/development/core/cmake-extras/"; - license = licenses.gpl3Only; - maintainers = teams.lomiri.members; - platforms = platforms.all; + homepage = "https://gitlab.com/ubports/development/core/cmake-extras"; + changelog = "https://gitlab.com/ubports/development/core/cmake-extras/-/blob/${finalAttrs.version}/ChangeLog"; + license = lib.licenses.gpl3Only; + maintainers = lib.teams.lomiri.members; + platforms = lib.platforms.all; }; }) From 1a7523b963a3e60a3637746b3efe985ab6a96386 Mon Sep 17 00:00:00 2001 From: Marie Ramlow Date: Sat, 8 Feb 2025 15:28:48 +0100 Subject: [PATCH 0693/2168] renovate: fix build pnpm leaves behind dangling symlinks when pruning, so we just delete and reinstall instead. --- pkgs/by-name/re/renovate/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/re/renovate/package.nix b/pkgs/by-name/re/renovate/package.nix index 5b4ce545d1f4..5dfaea6a6df0 100644 --- a/pkgs/by-name/re/renovate/package.nix +++ b/pkgs/by-name/re/renovate/package.nix @@ -53,7 +53,8 @@ stdenv.mkDerivation (finalAttrs: { yq '.engines.node = "${nodejs.version}"' -i package.json pnpm build - pnpm prune --prod --ignore-scripts + find -name 'node_modules' -type d -exec rm -rf {} \; || true + pnpm install --offline --prod --ignore-scripts '' # The optional dependency re2 is not built by pnpm and needs to be built manually. # If re2 is not built, you will get an annoying warning when you run renovate. From faf4d8919ca2016dff309d70c1ea3b7f9a02c090 Mon Sep 17 00:00:00 2001 From: rein Date: Sun, 9 Feb 2025 16:59:05 +0530 Subject: [PATCH 0694/2168] nakama: init at 3.26.0 (#378552) --- pkgs/by-name/na/nakama/package.nix | 39 ++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 pkgs/by-name/na/nakama/package.nix diff --git a/pkgs/by-name/na/nakama/package.nix b/pkgs/by-name/na/nakama/package.nix new file mode 100644 index 000000000000..13eca0e5b416 --- /dev/null +++ b/pkgs/by-name/na/nakama/package.nix @@ -0,0 +1,39 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "nakama"; + version = "3.26.0"; + + src = fetchFromGitHub { + owner = "heroiclabs"; + repo = "nakama"; + tag = "v${version}"; + hash = "sha256-so8N2gk4TfeJy30XxiXH7utXs8InvnXm68ZoSvFykQk="; + }; + + vendorHash = null; + + subPackages = [ "." ]; + + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + ]; + + doCheck = false; + + meta = { + description = "Distributed server for social and realtime games and apps"; + homepage = "https://heroiclabs.com/nakama/"; + changelog = "https://github.com/heroiclabs/nakama/releases/tag/v${version}"; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.qxrein ]; + mainProgram = "nakama"; + }; +} From fa6c468a5d64781d44929e76cafcef509106c504 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 11:30:06 +0000 Subject: [PATCH 0695/2168] mpvScripts.thumbfast: 0-unstable-2024-08-02 -> 0-unstable-2025-02-04 --- pkgs/applications/video/mpv/scripts/thumbfast.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/thumbfast.nix b/pkgs/applications/video/mpv/scripts/thumbfast.nix index 249b7b896201..5dd0fc8c673c 100644 --- a/pkgs/applications/video/mpv/scripts/thumbfast.nix +++ b/pkgs/applications/video/mpv/scripts/thumbfast.nix @@ -8,13 +8,13 @@ buildLua { pname = "mpv-thumbfast"; - version = "0-unstable-2024-08-02"; + version = "0-unstable-2025-02-04"; src = fetchFromGitHub { owner = "po5"; repo = "thumbfast"; - rev = "f1fdf10b17f394f2d42520d0e9bf22feaa20a9f4"; - hash = "sha256-cygLf+0PMH7cVXBcY12PdcxBHmy38DNoXQubKAlerHM="; + rev = "9deb0733c4e36938cf90e42ddfb7a19a8b2f4641"; + hash = "sha256-avG1CRBrs0UM4HcFMUVAQyOtcIFkZ/H+PbjZJKU7o2A="; }; passthru.updateScript = unstableGitUpdater { }; From 89494e6a635e3e72fa658f1799e607aeb2737ac9 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 9 Feb 2025 19:34:23 +0800 Subject: [PATCH 0696/2168] cinnamon-common: 6.4.6 -> 6.4.7 https://github.com/linuxmint/cinnamon/compare/6.4.6...6.4.7 --- pkgs/by-name/ci/cinnamon-common/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ci/cinnamon-common/package.nix b/pkgs/by-name/ci/cinnamon-common/package.nix index 09ddfca9743a..7b250b7ed65f 100644 --- a/pkgs/by-name/ci/cinnamon-common/package.nix +++ b/pkgs/by-name/ci/cinnamon-common/package.nix @@ -76,13 +76,13 @@ in # TODO (after 25.05 branch-off): Rename to pkgs.cinnamon stdenv.mkDerivation rec { pname = "cinnamon-common"; - version = "6.4.6"; + version = "6.4.7"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon"; rev = version; - hash = "sha256-hvQINRvEqTDWV0ja1tHzkpJMexc0htL0IlCHuy8QCQk="; + hash = "sha256-WBdzlourYf2oEXUMbzNcNNsc8lBo6ujAy/K1Y6nGOjU="; }; patches = [ From 839c2c3960e7efdf69d5388a374381597af99bab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 11:42:57 +0000 Subject: [PATCH 0697/2168] ospd-openvas: 22.7.1 -> 22.8.0 --- pkgs/by-name/os/ospd-openvas/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/os/ospd-openvas/package.nix b/pkgs/by-name/os/ospd-openvas/package.nix index 7e6c8d8a3585..8ceeecef117a 100644 --- a/pkgs/by-name/os/ospd-openvas/package.nix +++ b/pkgs/by-name/os/ospd-openvas/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ospd-openvas"; - version = "22.7.1"; + version = "22.8.0"; pyproject = true; src = fetchFromGitHub { owner = "greenbone"; repo = "ospd-openvas"; tag = "v${version}"; - hash = "sha256-bFZTwNITDG5OpoWD7F1Ad6BQFpY4Q5CGUGbYy7rTuc0="; + hash = "sha256-bjX+20/fOHA+GUBHSGuQeCiwDaeRTRiQlZw0ILq8rmA="; }; pythonRelaxDeps = [ @@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "OSP server implementation to allow GVM to remotely control an OpenVAS Scanner"; homepage = "https://github.com/greenbone/ospd-openvas"; - changelog = "https://github.com/greenbone/ospd-openvas/releases/tag/v${version}"; + changelog = "https://github.com/greenbone/ospd-openvas/releases/tag/${src.tag}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; platforms = platforms.linux; From ce9995c88d940119e6685c97ac90f7d72996809f Mon Sep 17 00:00:00 2001 From: JuliusFreudenberger Date: Sun, 9 Feb 2025 13:50:19 +0200 Subject: [PATCH 0698/2168] teleport_15, teleport_16: Use fetchCargoVendor --- pkgs/servers/teleport/15/Cargo.lock | 3375 ---------------------- pkgs/servers/teleport/15/default.nix | 9 +- pkgs/servers/teleport/16/Cargo.lock | 3919 -------------------------- pkgs/servers/teleport/16/default.nix | 8 +- pkgs/servers/teleport/generic.nix | 9 +- 5 files changed, 8 insertions(+), 7312 deletions(-) delete mode 100644 pkgs/servers/teleport/15/Cargo.lock delete mode 100644 pkgs/servers/teleport/16/Cargo.lock diff --git a/pkgs/servers/teleport/15/Cargo.lock b/pkgs/servers/teleport/15/Cargo.lock deleted file mode 100644 index 7dfdc2015edc..000000000000 --- a/pkgs/servers/teleport/15/Cargo.lock +++ /dev/null @@ -1,3375 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "aes" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" -dependencies = [ - "cfg-if", - "cipher", - "cpufeatures", -] - -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - -[[package]] -name = "asn1-rs" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ad1373757efa0f70ec53939aabc7152e1591cb485208052993070ac8d2429d" -dependencies = [ - "asn1-rs-derive", - "asn1-rs-impl", - "displaydoc", - "nom", - "num-traits", - "rusticata-macros", - "thiserror", -] - -[[package]] -name = "asn1-rs-derive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7378575ff571966e99a744addeff0bff98b8ada0dedf1956d59e634db95eaac1" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", - "synstructure", -] - -[[package]] -name = "asn1-rs-impl" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "async-dnssd" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98efc05996cc8d660e88841fcffb75aa71be5339c9ae559a8c8016c048420b82" -dependencies = [ - "bitflags 1.3.2", - "futures-channel", - "futures-core", - "futures-executor", - "futures-util", - "libc", - "log", - "pin-utils", - "pkg-config", - "tokio", - "winapi", -] - -[[package]] -name = "async-recursion" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "atomic-polyfill" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cf2bce30dfe09ef0bfaef228b9d414faaf7e563035494d7fe092dba54b300f4" -dependencies = [ - "critical-section", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" - -[[package]] -name = "backtrace" -version = "0.3.73" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base16ct" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" - -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - -[[package]] -name = "base64ct" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" - -[[package]] -name = "bindgen" -version = "0.68.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" -dependencies = [ - "bitflags 2.6.0", - "cexpr", - "clang-sys", - "lazy_static", - "lazycell", - "peeking_take_while", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn 2.0.68", -] - -[[package]] -name = "bit_field" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" - -[[package]] -name = "bitvec" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] - -[[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 = "boring" -version = "4.4.0" -source = "git+https://github.com/gravitational/boring?rev=605253d99d5e363e178bcf97e1d4622e33844cd5#605253d99d5e363e178bcf97e1d4622e33844cd5" -dependencies = [ - "bitflags 2.6.0", - "boring-sys", - "foreign-types", - "libc", - "once_cell", -] - -[[package]] -name = "boring-sys" -version = "4.4.0" -source = "git+https://github.com/gravitational/boring?rev=605253d99d5e363e178bcf97e1d4622e33844cd5#605253d99d5e363e178bcf97e1d4622e33844cd5" -dependencies = [ - "bindgen", - "cmake", - "fs_extra", - "fslock", -] - -[[package]] -name = "bumpalo" -version = "3.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "bytes" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" - -[[package]] -name = "cbc" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" -dependencies = [ - "cipher", -] - -[[package]] -name = "cbindgen" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da6bc11b07529f16944307272d5bd9b22530bc7d05751717c9d416586cedab49" -dependencies = [ - "clap", - "heck", - "indexmap 1.9.3", - "log", - "proc-macro2", - "quote", - "serde", - "serde_json", - "syn 1.0.109", - "tempfile", - "toml", -] - -[[package]] -name = "cc" -version = "1.0.102" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "779e6b7d17797c0b42023d417228c02889300190e700cb074c3438d9c541d332" - -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "cfg_aliases" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" - -[[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 = "clang-sys" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" -dependencies = [ - "glob", - "libc", - "libloading", -] - -[[package]] -name = "clap" -version = "3.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" -dependencies = [ - "atty", - "bitflags 1.3.2", - "clap_lex", - "indexmap 1.9.3", - "strsim", - "termcolor", - "textwrap", -] - -[[package]] -name = "clap_lex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] - -[[package]] -name = "cmake" -version = "0.1.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" -dependencies = [ - "cc", -] - -[[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 = "const-oid" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" - -[[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 = "cpufeatures" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" -dependencies = [ - "libc", -] - -[[package]] -name = "critical-section" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" - -[[package]] -name = "crypto" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf1e6e5492f8f0830c37f301f6349e0dac8b2466e4fe89eef90e9eef906cd046" -dependencies = [ - "crypto-common", -] - -[[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", - "typenum", -] - -[[package]] -name = "crypto-mac" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" -dependencies = [ - "generic-array", - "subtle", -] - -[[package]] -name = "curve25519-dalek" -version = "4.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" -dependencies = [ - "cfg-if", - "cpufeatures", - "curve25519-dalek-derive", - "digest", - "fiat-crypto", - "rustc_version", - "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", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "delog" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af2b93368262340c9d4441251b824500d1b641a50957ecf4219a2cc41b9eac8f" -dependencies = [ - "log", -] - -[[package]] -name = "der" -version = "0.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" -dependencies = [ - "const-oid", - "der_derive", - "flagset", - "pem-rfc7468", - "zeroize", -] - -[[package]] -name = "der-parser" -version = "9.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cd0a5c643689626bec213c4d8bd4d96acc8ffdb4ad4bb6bc16abf27d5f4b553" -dependencies = [ - "asn1-rs", - "displaydoc", - "nom", - "num-traits", - "rusticata-macros", -] - -[[package]] -name = "der_derive" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fe87ce4529967e0ba1dcf8450bab64d97dfd5010a6256187ffe2e43e6f0e049" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", -] - -[[package]] -name = "des" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffdd80ce8ce993de27e9f063a444a4d53ce8e8db4c1f00cc03af5ad5a9867a1e" -dependencies = [ - "cipher", -] - -[[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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[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 = "ed25519" -version = "2.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" -dependencies = [ - "pkcs8", - "signature", -] - -[[package]] -name = "ed25519-dalek" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" -dependencies = [ - "curve25519-dalek", - "ed25519", - "rand_core", - "serde", - "sha2", - "subtle", - "zeroize", -] - -[[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.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "env_logger" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" -dependencies = [ - "humantime", - "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.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "fastrand" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" - -[[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.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" - -[[package]] -name = "flagset" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdeb3aa5e95cf9aabc17f060cfa0ced7b83f042390760ca53bf09df9968acaa1" - -[[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", - "quote", - "syn 2.0.68", -] - -[[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 = "fs_extra" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" - -[[package]] -name = "fslock" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04412b8935272e3a9bae6f48c7bfff74c2911f60525404edfdd28e49884c3bfb" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "funty" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" - -[[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", - "quote", - "syn 2.0.68", -] - -[[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 = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", - "zeroize", -] - -[[package]] -name = "getrandom" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "wasi", - "wasm-bindgen", -] - -[[package]] -name = "gimli" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[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", - "indexmap 2.2.6", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "hash32" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" -dependencies = [ - "byteorder", -] - -[[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" - -[[package]] -name = "heapless" -version = "0.7.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdc6457c0eb62c71aac4bc17216026d8410337c4126773b9c5daba343f17964f" -dependencies = [ - "atomic-polyfill", - "hash32", - "rustc_version", - "spin", - "stable_deref_trait", -] - -[[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.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - -[[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 = "http" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" -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", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" - -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - -[[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.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper-rustls" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" -dependencies = [ - "futures-util", - "http", - "hyper", - "rustls", - "tokio", - "tokio-rustls", -] - -[[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 = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - -[[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", -] - -[[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 = "instant" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "ipnet" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" - -[[package]] -name = "ironrdp" -version = "0.1.0" -dependencies = [ - "console_error_panic_hook", - "getrandom", - "ironrdp-graphics", - "ironrdp-pdu", - "ironrdp-session", - "js-sys", - "log", - "time", - "tracing", - "tracing-subscriber", - "tracing-web", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "ironrdp-async" -version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" -dependencies = [ - "bytes", - "ironrdp-connector", - "ironrdp-pdu", - "tracing", -] - -[[package]] -name = "ironrdp-cliprdr" -version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" -dependencies = [ - "bitflags 2.6.0", - "ironrdp-pdu", - "ironrdp-svc", - "thiserror", - "tracing", -] - -[[package]] -name = "ironrdp-connector" -version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" -dependencies = [ - "ironrdp-error", - "ironrdp-pdu", - "ironrdp-svc", - "rand_core", - "sspi 0.11.1", - "tracing", - "url", - "winapi", -] - -[[package]] -name = "ironrdp-displaycontrol" -version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" -dependencies = [ - "ironrdp-dvc", - "ironrdp-pdu", - "ironrdp-svc", - "tracing", -] - -[[package]] -name = "ironrdp-dvc" -version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" -dependencies = [ - "ironrdp-pdu", - "ironrdp-svc", - "slab", - "tracing", -] - -[[package]] -name = "ironrdp-error" -version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" - -[[package]] -name = "ironrdp-graphics" -version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" -dependencies = [ - "bit_field", - "bitflags 2.6.0", - "bitvec", - "byteorder", - "ironrdp-error", - "ironrdp-pdu", - "lazy_static", - "num-derive", - "num-traits", - "thiserror", -] - -[[package]] -name = "ironrdp-pdu" -version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" -dependencies = [ - "bit_field", - "bitflags 2.6.0", - "byteorder", - "der-parser", - "ironrdp-error", - "md-5", - "num-bigint", - "num-derive", - "num-integer", - "num-traits", - "pkcs1", - "sha1", - "tap", - "thiserror", - "x509-cert", -] - -[[package]] -name = "ironrdp-rdpdr" -version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" -dependencies = [ - "bitflags 2.6.0", - "ironrdp-error", - "ironrdp-pdu", - "ironrdp-svc", - "tracing", -] - -[[package]] -name = "ironrdp-rdpsnd" -version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" -dependencies = [ - "ironrdp-pdu", - "ironrdp-svc", -] - -[[package]] -name = "ironrdp-session" -version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" -dependencies = [ - "ironrdp-connector", - "ironrdp-displaycontrol", - "ironrdp-dvc", - "ironrdp-error", - "ironrdp-graphics", - "ironrdp-pdu", - "ironrdp-svc", - "tracing", -] - -[[package]] -name = "ironrdp-svc" -version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" -dependencies = [ - "bitflags 2.6.0", - "ironrdp-pdu", -] - -[[package]] -name = "ironrdp-tls" -version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" -dependencies = [ - "tokio", - "tokio-rustls", - "x509-cert", -] - -[[package]] -name = "ironrdp-tokio" -version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" -dependencies = [ - "bytes", - "ironrdp-async", - "tokio", -] - -[[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.9", - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "iso7816" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3af73ac9c821e7aea3280532118e15cdf9e7bb45c923cbf0e319ae25b27d20c" -dependencies = [ - "delog", - "heapless", -] - -[[package]] -name = "iso7816-tlv" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7660d28d24a831d690228a275d544654a30f3b167a8e491cf31af5fe5058b546" -dependencies = [ - "untrusted", -] - -[[package]] -name = "itoa" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - -[[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 = "keccak" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654" -dependencies = [ - "cpufeatures", -] - -[[package]] -name = "lazy_static" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" -dependencies = [ - "spin", -] - -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] -name = "libc" -version = "0.2.155" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" - -[[package]] -name = "libloading" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" -dependencies = [ - "cfg-if", - "windows-targets 0.52.5", -] - -[[package]] -name = "libm" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" - -[[package]] -name = "linux-raw-sys" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" - -[[package]] -name = "lock_api" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" - -[[package]] -name = "md-5" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" -dependencies = [ - "cfg-if", - "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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" -dependencies = [ - "libc", - "wasi", - "windows-sys 0.48.0", -] - -[[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 = "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.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" -dependencies = [ - "num-integer", - "num-traits", -] - -[[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-conv" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" - -[[package]] -name = "num-derive" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[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.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -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.9", - "libc", -] - -[[package]] -name = "object" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" -dependencies = [ - "memchr", -] - -[[package]] -name = "oid" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c19903c598813dba001b53beeae59bb77ad4892c5c1b9b3500ce4293a0d06c2" -dependencies = [ - "serde", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "os_str_bytes" -version = "6.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[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 = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - -[[package]] -name = "parking_lot" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" -dependencies = [ - "lock_api", - "parking_lot_core 0.9.10", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.5.2", - "smallvec", - "windows-targets 0.52.5", -] - -[[package]] -name = "pbkdf2" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" -dependencies = [ - "digest", - "hmac", - "sha1", -] - -[[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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "picky" -version = "7.0.0-rc.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52cccdaffd2f361b4b4eb70b4249bd71d89bb66cb84b7f76483ecd1640c543ce" -dependencies = [ - "base64", - "digest", - "ed25519-dalek", - "md-5", - "num-bigint-dig", - "p256", - "p384", - "picky-asn1", - "picky-asn1-der", - "picky-asn1-x509", - "rand", - "rand_core", - "rsa", - "serde", - "sha1", - "sha2", - "sha3", - "thiserror", - "x25519-dalek", - "zeroize", -] - -[[package]] -name = "picky-asn1" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "295eea0f33c16be21e2a98b908fdd4d73c04dd48c8480991b76dbcf0cb58b212" -dependencies = [ - "oid", - "serde", - "serde_bytes", - "time", - "zeroize", -] - -[[package]] -name = "picky-asn1-der" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5df7873a9e36d42dadb393bea5e211fe83d793c172afad5fb4ec846ec582793f" -dependencies = [ - "picky-asn1", - "serde", - "serde_bytes", -] - -[[package]] -name = "picky-asn1-x509" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c5f20f71a68499ff32310f418a6fad8816eac1a2859ed3f0c5c741389dd6208" -dependencies = [ - "base64", - "num-bigint-dig", - "oid", - "picky-asn1", - "picky-asn1-der", - "serde", - "widestring", - "zeroize", -] - -[[package]] -name = "picky-krb" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f71cf61ebe6e657a81bcac31f9d61d52c23a1fd517b0dad77b915a7d3d15d2e8" -dependencies = [ - "aes", - "byteorder", - "cbc", - "crypto", - "des", - "hmac", - "num-bigint-dig", - "oid", - "pbkdf2", - "picky-asn1", - "picky-asn1-der", - "picky-asn1-x509", - "rand", - "serde", - "sha1", - "thiserror", - "uuid", -] - -[[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" -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 = "portpicker" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be97d76faf1bfab666e1375477b23fde79eccf0276e9b63b92a39d676a889ba9" -dependencies = [ - "rand", -] - -[[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 = "primeorder" -version = "0.13.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6" -dependencies = [ - "elliptic-curve", -] - -[[package]] -name = "proc-macro2" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "radium" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rdp-client" -version = "0.1.0" -dependencies = [ - "bitflags 2.6.0", - "boring", - "byteorder", - "bytes", - "cbindgen", - "env_logger", - "ironrdp-cliprdr", - "ironrdp-connector", - "ironrdp-displaycontrol", - "ironrdp-dvc", - "ironrdp-pdu", - "ironrdp-rdpdr", - "ironrdp-rdpsnd", - "ironrdp-session", - "ironrdp-svc", - "ironrdp-tls", - "ironrdp-tokio", - "iso7816", - "iso7816-tlv", - "log", - "parking_lot 0.12.3", - "rand", - "rand_chacha", - "rsa", - "sspi 0.10.1", - "static_init", - "tempfile", - "tokio", - "tokio-boring", - "utf16string", - "uuid", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" -dependencies = [ - "bitflags 2.6.0", -] - -[[package]] -name = "regex" -version = "1.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" - -[[package]] -name = "reqwest" -version = "0.11.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" -dependencies = [ - "base64", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-rustls", - "ipnet", - "js-sys", - "log", - "mime", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls", - "rustls-native-certs", - "rustls-pemfile", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "system-configuration", - "tokio", - "tokio-rustls", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "webpki-roots", - "winreg 0.50.0", -] - -[[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.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 = "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 = "rustc-demangle" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" - -[[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.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] -name = "rusticata-macros" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" -dependencies = [ - "nom", -] - -[[package]] -name = "rustix" -version = "0.38.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" -dependencies = [ - "bitflags 2.6.0", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustls" -version = "0.21.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" -dependencies = [ - "log", - "ring", - "rustls-webpki", - "sct", -] - -[[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", - "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", -] - -[[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 = "ryu" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" - -[[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 = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[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.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" -dependencies = [ - "bitflags 2.6.0", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "semver" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" - -[[package]] -name = "serde" -version = "1.0.203" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_bytes" -version = "0.11.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_derive" -version = "1.0.203" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "serde_json" -version = "1.0.118" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d947f6b3163d8857ea16c4fa0dd4840d52f3041039a85decd46867eb1abef2e4" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sha3" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" -dependencies = [ - "digest", - "keccak", -] - -[[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 = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[package]] -name = "signal-hook-registry" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" -dependencies = [ - "libc", -] - -[[package]] -name = "signature" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" -dependencies = [ - "digest", - "rand_core", -] - -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - -[[package]] -name = "socket2" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] - -[[package]] -name = "spki" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" -dependencies = [ - "base64ct", - "der", -] - -[[package]] -name = "sspi" -version = "0.10.1" -source = "git+https://github.com/Devolutions/sspi-rs?rev=d54bdfcafa0e10d9d78224ebacc4f2a0992a6b79#d54bdfcafa0e10d9d78224ebacc4f2a0992a6b79" -dependencies = [ - "async-dnssd", - "async-recursion", - "bitflags 2.6.0", - "byteorder", - "cfg-if", - "crypto-mac", - "futures", - "hmac", - "lazy_static", - "md-5", - "md4", - "num-bigint-dig", - "num-derive", - "num-traits", - "oid", - "picky", - "picky-asn1", - "picky-asn1-der", - "picky-asn1-x509", - "picky-krb", - "portpicker", - "rand", - "reqwest", - "serde", - "serde_derive", - "sha1", - "sha2", - "time", - "tokio", - "tracing", - "url", - "uuid", - "winapi", - "windows", - "windows-sys 0.48.0", - "winreg 0.51.0", - "zeroize", -] - -[[package]] -name = "sspi" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18d31fab47d9290be28a8d027c8428756826f1d4fe1e5ba0f51d24f52c568e21" -dependencies = [ - "async-dnssd", - "async-recursion", - "bitflags 2.6.0", - "byteorder", - "cfg-if", - "crypto-mac", - "futures", - "hmac", - "lazy_static", - "md-5", - "md4", - "num-bigint-dig", - "num-derive", - "num-traits", - "oid", - "picky", - "picky-asn1", - "picky-asn1-der", - "picky-asn1-x509", - "picky-krb", - "rand", - "serde", - "serde_derive", - "sha1", - "sha2", - "time", - "tokio", - "tracing", - "url", - "uuid", - "winapi", - "windows", - "windows-sys 0.48.0", - "winreg 0.51.0", - "zeroize", -] - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "static_init" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a2a1c578e98c1c16fc3b8ec1328f7659a500737d7a0c6d625e73e830ff9c1f6" -dependencies = [ - "bitflags 1.3.2", - "cfg_aliases", - "libc", - "parking_lot 0.11.2", - "parking_lot_core 0.8.6", - "static_init_macro", - "winapi", -] - -[[package]] -name = "static_init_macro" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70a2595fc3aa78f2d0e45dd425b22282dd863273761cc77780914b2cf3003acf" -dependencies = [ - "cfg_aliases", - "memchr", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "subtle" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - -[[package]] -name = "synstructure" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - -[[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 = "termcolor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "textwrap" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" - -[[package]] -name = "thiserror" -version = "1.0.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[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 = "time" -version = "0.3.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" -dependencies = [ - "deranged", - "itoa", - "js-sys", - "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.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" -dependencies = [ - "num-conv", - "time-core", -] - -[[package]] -name = "tinyvec" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82" -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_codec" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e78c9c330f8c85b2bae7c8368f2739157db9991235123aa1b15ef9502bfb6a" -dependencies = [ - "tls_codec_derive", - "zeroize", -] - -[[package]] -name = "tls_codec_derive" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d9ef545650e79f30233c0003bcc2504d7efac6dad25fca40744de773fe2049c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "tokio" -version = "1.38.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "num_cpus", - "parking_lot 0.12.3", - "pin-project-lite", - "signal-hook-registry", - "socket2", - "tokio-macros", - "windows-sys 0.48.0", -] - -[[package]] -name = "tokio-boring" -version = "4.4.0" -source = "git+https://github.com/gravitational/boring?rev=605253d99d5e363e178bcf97e1d4622e33844cd5#605253d99d5e363e178bcf97e1d4622e33844cd5" -dependencies = [ - "boring", - "boring-sys", - "once_cell", - "tokio", -] - -[[package]] -name = "tokio-macros" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "tokio-rustls" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" -dependencies = [ - "rustls", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.7.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - -[[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 = [ - "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 2.0.68", -] - -[[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 = [ - "nu-ansi-term", - "sharded-slab", - "smallvec", - "thread_local", - "time", - "tracing-core", - "tracing-log", -] - -[[package]] -name = "tracing-web" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e6a141feebd51f8d91ebfd785af50fca223c570b86852166caa3b141defe7c" -dependencies = [ - "js-sys", - "tracing-core", - "tracing-subscriber", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "try-lock" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[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-normalization" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - -[[package]] -name = "url" -version = "2.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "utf16string" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b62a1e85e12d5d712bf47a85f426b73d303e2d00a90de5f3004df3596e9d216" -dependencies = [ - "byteorder", -] - -[[package]] -name = "uuid" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" -dependencies = [ - "getrandom", - "serde", -] - -[[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 = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.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 2.0.68", - "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 2.0.68", - "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 = "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.25.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" - -[[package]] -name = "widestring" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" - -[[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" -version = "0.51.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" -dependencies = [ - "windows-core", - "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-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 = "winreg" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "winreg" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "937f3df7948156640f46aacef17a70db0de5917bda9c92b0f751f3a955b588fc" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "wyz" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" -dependencies = [ - "tap", -] - -[[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-cert" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1301e935010a701ae5f8655edc0ad17c44bad3ac5ce8c39185f75453b720ae94" -dependencies = [ - "const-oid", - "der", - "spki", - "tls_codec", -] - -[[package]] -name = "zeroize" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" -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", - "quote", - "syn 2.0.68", -] diff --git a/pkgs/servers/teleport/15/default.nix b/pkgs/servers/teleport/15/default.nix index 6eb714ae1892..ee8ca7e8494b 100644 --- a/pkgs/servers/teleport/15/default.nix +++ b/pkgs/servers/teleport/15/default.nix @@ -6,13 +6,6 @@ import ../generic.nix ( hash = "sha256-LxMwCI/8otH32bRJvz9p1zWw4QzF/wrqeboZ6B3aw9o="; vendorHash = "sha256-VG9b1M3zdtRXY3eCFC7izejSSs4nTjtR9/wOc36PFnA="; yarnHash = "sha256-kmjY7KQfSzmlNS7ZK25YItZct/Tg7CWKfoRfubFBGlY="; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "boring-4.4.0" = "sha256-4wdl2kIA5oHQ0H6IddKQ+B5kRwrTeMbKe1+tAYZt2uw="; - "ironrdp-async-0.1.0" = "sha256-nE5O/wRJ3vJqJG5zdYmpVkhx6JC6Yb92pR4EKSWSdkA="; - "sspi-0.10.1" = "sha256-fkclC/plTh2d8zcmqthYmr5yXqbPTeFxI1VuaPX5vxk="; - }; - }; + cargoHash = "sha256-IQi11Hpavj4pImwjxU6uoHQ+vjwc/++NuWXREcIKH3s="; } ) diff --git a/pkgs/servers/teleport/16/Cargo.lock b/pkgs/servers/teleport/16/Cargo.lock deleted file mode 100644 index d489f1b01796..000000000000 --- a/pkgs/servers/teleport/16/Cargo.lock +++ /dev/null @@ -1,3919 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" -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 = "aes" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" -dependencies = [ - "cfg-if", - "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 = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - -[[package]] -name = "anstream" -version = "0.6.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "is_terminal_polyfill", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" - -[[package]] -name = "anstyle-parse" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" -dependencies = [ - "anstyle", - "windows-sys 0.52.0", -] - -[[package]] -name = "asn1-rs" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ad1373757efa0f70ec53939aabc7152e1591cb485208052993070ac8d2429d" -dependencies = [ - "asn1-rs-derive", - "asn1-rs-impl", - "displaydoc", - "nom", - "num-traits", - "rusticata-macros", - "thiserror", -] - -[[package]] -name = "asn1-rs-derive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7378575ff571966e99a744addeff0bff98b8ada0dedf1956d59e634db95eaac1" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", - "synstructure", -] - -[[package]] -name = "asn1-rs-impl" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "async-dnssd" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98efc05996cc8d660e88841fcffb75aa71be5339c9ae559a8c8016c048420b82" -dependencies = [ - "bitflags 1.3.2", - "futures-channel", - "futures-core", - "futures-executor", - "futures-util", - "libc", - "log", - "pin-utils", - "pkg-config", - "tokio", - "winapi", -] - -[[package]] -name = "async-recursion" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "atomic-polyfill" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cf2bce30dfe09ef0bfaef228b9d414faaf7e563035494d7fe092dba54b300f4" -dependencies = [ - "critical-section", -] - -[[package]] -name = "autocfg" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" - -[[package]] -name = "aws-lc-rs" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f95446d919226d587817a7d21379e6eb099b97b45110a7f272a444ca5c54070" -dependencies = [ - "aws-lc-sys", - "mirai-annotations", - "paste", - "zeroize", -] - -[[package]] -name = "aws-lc-sys" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3ddc4a5b231dd6958b140ff3151b6412b3f4321fab354f399eec8f14b06df62" -dependencies = [ - "bindgen 0.69.4", - "cc", - "cmake", - "dunce", - "fs_extra", - "libc", - "paste", -] - -[[package]] -name = "backtrace" -version = "0.3.73" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base16ct" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" - -[[package]] -name = "base64" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" - -[[package]] -name = "base64ct" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" - -[[package]] -name = "bindgen" -version = "0.68.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" -dependencies = [ - "bitflags 2.6.0", - "cexpr", - "clang-sys", - "lazy_static", - "lazycell", - "peeking_take_while", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn 2.0.68", -] - -[[package]] -name = "bindgen" -version = "0.69.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" -dependencies = [ - "bitflags 2.6.0", - "cexpr", - "clang-sys", - "itertools", - "lazy_static", - "lazycell", - "log", - "prettyplease", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn 2.0.68", - "which", -] - -[[package]] -name = "bit_field" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" - -[[package]] -name = "bitvec" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] - -[[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 = "boring" -version = "4.7.0" -source = "git+https://github.com/gravitational/boring?rev=99897308abb5976ea05625b8314c24b16eebb01b#99897308abb5976ea05625b8314c24b16eebb01b" -dependencies = [ - "bitflags 2.6.0", - "boring-sys", - "foreign-types", - "libc", - "once_cell", -] - -[[package]] -name = "boring-sys" -version = "4.7.0" -source = "git+https://github.com/gravitational/boring?rev=99897308abb5976ea05625b8314c24b16eebb01b#99897308abb5976ea05625b8314c24b16eebb01b" -dependencies = [ - "bindgen 0.68.1", - "cmake", - "fs_extra", - "fslock", -] - -[[package]] -name = "bumpalo" -version = "3.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "bytes" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" - -[[package]] -name = "cbc" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" -dependencies = [ - "cipher", -] - -[[package]] -name = "cbindgen" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fce8dd7fcfcbf3a0a87d8f515194b49d6135acab73e18bd380d1d93bb1a15eb" -dependencies = [ - "clap", - "heck", - "indexmap", - "log", - "proc-macro2", - "quote", - "serde", - "serde_json", - "syn 2.0.68", - "tempfile", - "toml", -] - -[[package]] -name = "cc" -version = "1.0.101" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac367972e516d45567c7eafc73d24e1c193dcf200a8d94e9db7b3d38b349572d" -dependencies = [ - "jobserver", - "libc", - "once_cell", -] - -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "cfg_aliases" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" - -[[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 = "clang-sys" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" -dependencies = [ - "glob", - "libc", - "libloading", -] - -[[package]] -name = "clap" -version = "4.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fbb260a053428790f3de475e304ff84cdbc4face759ea7a3e64c1edd938a7fc" -dependencies = [ - "clap_builder", -] - -[[package]] -name = "clap_builder" -version = "4.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64b17d7ea74e9f833c7dbf2cbe4fb12ff26783eda4782a8975b72f895c9b4d99" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_lex" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" - -[[package]] -name = "cmake" -version = "0.1.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" -dependencies = [ - "cc", -] - -[[package]] -name = "colorchoice" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" - -[[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 = "const-oid" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" - -[[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 = "cpufeatures" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" -dependencies = [ - "libc", -] - -[[package]] -name = "critical-section" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" - -[[package]] -name = "crypto" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf1e6e5492f8f0830c37f301f6349e0dac8b2466e4fe89eef90e9eef906cd046" -dependencies = [ - "crypto-common", -] - -[[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 = "crypto-mac" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25fab6889090c8133f3deb8f73ba3c65a7f456f66436fc012a1b1e272b1e103e" -dependencies = [ - "generic-array", - "subtle", -] - -[[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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" -dependencies = [ - "cfg-if", - "cpufeatures", - "curve25519-dalek-derive", - "digest", - "fiat-crypto", - "rustc_version", - "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", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "delog" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af2b93368262340c9d4441251b824500d1b641a50957ecf4219a2cc41b9eac8f" -dependencies = [ - "log", -] - -[[package]] -name = "der" -version = "0.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" -dependencies = [ - "const-oid", - "der_derive", - "flagset", - "pem-rfc7468", - "zeroize", -] - -[[package]] -name = "der-parser" -version = "9.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cd0a5c643689626bec213c4d8bd4d96acc8ffdb4ad4bb6bc16abf27d5f4b553" -dependencies = [ - "asn1-rs", - "displaydoc", - "nom", - "num-traits", - "rusticata-macros", -] - -[[package]] -name = "der_derive" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fe87ce4529967e0ba1dcf8450bab64d97dfd5010a6256187ffe2e43e6f0e049" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", -] - -[[package]] -name = "des" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffdd80ce8ce993de27e9f063a444a4d53ce8e8db4c1f00cc03af5ad5a9867a1e" -dependencies = [ - "cipher", -] - -[[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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "dunce" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" - -[[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 = "ed25519" -version = "2.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" -dependencies = [ - "pkcs8", - "signature", -] - -[[package]] -name = "ed25519-dalek" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" -dependencies = [ - "curve25519-dalek", - "ed25519", - "rand_core", - "serde", - "sha2", - "subtle", - "zeroize", -] - -[[package]] -name = "either" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" - -[[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 = "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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" -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.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" -dependencies = [ - "libc", - "windows-sys 0.59.0", -] - -[[package]] -name = "fastrand" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" - -[[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.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" - -[[package]] -name = "flagset" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdeb3aa5e95cf9aabc17f060cfa0ced7b83f042390760ca53bf09df9968acaa1" - -[[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", - "quote", - "syn 2.0.68", -] - -[[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 = "fs_extra" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" - -[[package]] -name = "fslock" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04412b8935272e3a9bae6f48c7bfff74c2911f60525404edfdd28e49884c3bfb" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "funty" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" - -[[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", - "quote", - "syn 2.0.68", -] - -[[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 = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", - "zeroize", -] - -[[package]] -name = "getrandom" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "wasi", - "wasm-bindgen", -] - -[[package]] -name = "ghash" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1" -dependencies = [ - "opaque-debug", - "polyval", -] - -[[package]] -name = "gimli" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[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 = "hash32" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" -dependencies = [ - "byteorder", -] - -[[package]] -name = "hashbrown" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" - -[[package]] -name = "heapless" -version = "0.7.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdc6457c0eb62c71aac4bc17216026d8410337c4126773b9c5daba343f17964f" -dependencies = [ - "atomic-polyfill", - "hash32", - "rustc_version", - "spin", - "stable_deref_trait", -] - -[[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.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - -[[package]] -name = "hex" -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.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 = "http" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" -dependencies = [ - "bytes", - "http", -] - -[[package]] -name = "http-body-util" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" -dependencies = [ - "bytes", - "futures-util", - "http", - "http-body", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "hyper" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "http", - "http-body", - "httparse", - "itoa", - "pin-project-lite", - "smallvec", - "tokio", - "want", -] - -[[package]] -name = "hyper-rustls" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" -dependencies = [ - "futures-util", - "http", - "hyper", - "hyper-util", - "rustls", - "rustls-pki-types", - "tokio", - "tokio-rustls", - "tower-service", -] - -[[package]] -name = "hyper-util" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "http", - "http-body", - "hyper", - "pin-project-lite", - "socket2", - "tokio", - "tower", - "tower-service", - "tracing", -] - -[[package]] -name = "icu_collections" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" -dependencies = [ - "displaydoc", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_locid" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" -dependencies = [ - "displaydoc", - "litemap", - "tinystr", - "writeable", - "zerovec", -] - -[[package]] -name = "icu_locid_transform" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_locid_transform_data", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_locid_transform_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" - -[[package]] -name = "icu_normalizer" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" -dependencies = [ - "displaydoc", - "icu_collections", - "icu_normalizer_data", - "icu_properties", - "icu_provider", - "smallvec", - "utf16_iter", - "utf8_iter", - "write16", - "zerovec", -] - -[[package]] -name = "icu_normalizer_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" - -[[package]] -name = "icu_properties" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" -dependencies = [ - "displaydoc", - "icu_collections", - "icu_locid_transform", - "icu_properties_data", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_properties_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" - -[[package]] -name = "icu_provider" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_provider_macros", - "stable_deref_trait", - "tinystr", - "writeable", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_provider_macros" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "idna" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" -dependencies = [ - "idna_adapter", - "smallvec", - "utf8_iter", -] - -[[package]] -name = "idna_adapter" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" -dependencies = [ - "icu_normalizer", - "icu_properties", -] - -[[package]] -name = "indexmap" -version = "2.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" -dependencies = [ - "equivalent", - "hashbrown", -] - -[[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 = "instant" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "ipnet" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" - -[[package]] -name = "ironrdp" -version = "0.1.0" -dependencies = [ - "console_error_panic_hook", - "getrandom", - "ironrdp-core", - "ironrdp-graphics", - "ironrdp-pdu", - "ironrdp-session", - "js-sys", - "log", - "time", - "tracing", - "tracing-subscriber", - "tracing-web", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "ironrdp-async" -version = "0.2.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=2f57fd2de320f58fe240d88a83519255ba94cb73#2f57fd2de320f58fe240d88a83519255ba94cb73" -dependencies = [ - "bytes", - "ironrdp-connector", - "ironrdp-core", - "ironrdp-pdu", - "tracing", -] - -[[package]] -name = "ironrdp-cliprdr" -version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=2f57fd2de320f58fe240d88a83519255ba94cb73#2f57fd2de320f58fe240d88a83519255ba94cb73" -dependencies = [ - "bitflags 2.6.0", - "ironrdp-core", - "ironrdp-pdu", - "ironrdp-svc", - "thiserror", - "tracing", -] - -[[package]] -name = "ironrdp-connector" -version = "0.2.1" -source = "git+https://github.com/Devolutions/IronRDP?rev=2f57fd2de320f58fe240d88a83519255ba94cb73#2f57fd2de320f58fe240d88a83519255ba94cb73" -dependencies = [ - "ironrdp-core", - "ironrdp-error", - "ironrdp-pdu", - "ironrdp-svc", - "picky", - "picky-asn1-der", - "picky-asn1-x509", - "rand_core", - "sspi", - "tracing", - "url", -] - -[[package]] -name = "ironrdp-core" -version = "0.1.1" -source = "git+https://github.com/Devolutions/IronRDP?rev=2f57fd2de320f58fe240d88a83519255ba94cb73#2f57fd2de320f58fe240d88a83519255ba94cb73" -dependencies = [ - "ironrdp-error", -] - -[[package]] -name = "ironrdp-displaycontrol" -version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=2f57fd2de320f58fe240d88a83519255ba94cb73#2f57fd2de320f58fe240d88a83519255ba94cb73" -dependencies = [ - "ironrdp-core", - "ironrdp-dvc", - "ironrdp-pdu", - "ironrdp-svc", - "tracing", -] - -[[package]] -name = "ironrdp-dvc" -version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=2f57fd2de320f58fe240d88a83519255ba94cb73#2f57fd2de320f58fe240d88a83519255ba94cb73" -dependencies = [ - "ironrdp-core", - "ironrdp-pdu", - "ironrdp-svc", - "slab", - "tracing", -] - -[[package]] -name = "ironrdp-error" -version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=2f57fd2de320f58fe240d88a83519255ba94cb73#2f57fd2de320f58fe240d88a83519255ba94cb73" - -[[package]] -name = "ironrdp-graphics" -version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=2f57fd2de320f58fe240d88a83519255ba94cb73#2f57fd2de320f58fe240d88a83519255ba94cb73" -dependencies = [ - "bit_field", - "bitflags 2.6.0", - "bitvec", - "byteorder", - "ironrdp-core", - "ironrdp-pdu", - "lazy_static", - "num-derive", - "num-traits", - "thiserror", -] - -[[package]] -name = "ironrdp-pdu" -version = "0.1.1" -source = "git+https://github.com/Devolutions/IronRDP?rev=2f57fd2de320f58fe240d88a83519255ba94cb73#2f57fd2de320f58fe240d88a83519255ba94cb73" -dependencies = [ - "bit_field", - "bitflags 2.6.0", - "byteorder", - "der-parser", - "ironrdp-core", - "ironrdp-error", - "md-5", - "num-bigint", - "num-derive", - "num-integer", - "num-traits", - "pkcs1", - "sha1", - "tap", - "thiserror", - "x509-cert", -] - -[[package]] -name = "ironrdp-rdpdr" -version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=2f57fd2de320f58fe240d88a83519255ba94cb73#2f57fd2de320f58fe240d88a83519255ba94cb73" -dependencies = [ - "bitflags 2.6.0", - "ironrdp-core", - "ironrdp-error", - "ironrdp-pdu", - "ironrdp-svc", - "tracing", -] - -[[package]] -name = "ironrdp-rdpsnd" -version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=2f57fd2de320f58fe240d88a83519255ba94cb73#2f57fd2de320f58fe240d88a83519255ba94cb73" -dependencies = [ - "bitflags 2.6.0", - "ironrdp-core", - "ironrdp-pdu", - "ironrdp-svc", - "tracing", -] - -[[package]] -name = "ironrdp-session" -version = "0.2.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=2f57fd2de320f58fe240d88a83519255ba94cb73#2f57fd2de320f58fe240d88a83519255ba94cb73" -dependencies = [ - "ironrdp-connector", - "ironrdp-core", - "ironrdp-displaycontrol", - "ironrdp-dvc", - "ironrdp-error", - "ironrdp-graphics", - "ironrdp-pdu", - "ironrdp-svc", - "tracing", -] - -[[package]] -name = "ironrdp-svc" -version = "0.1.1" -source = "git+https://github.com/Devolutions/IronRDP?rev=2f57fd2de320f58fe240d88a83519255ba94cb73#2f57fd2de320f58fe240d88a83519255ba94cb73" -dependencies = [ - "bitflags 2.6.0", - "ironrdp-core", - "ironrdp-pdu", -] - -[[package]] -name = "ironrdp-tls" -version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=2f57fd2de320f58fe240d88a83519255ba94cb73#2f57fd2de320f58fe240d88a83519255ba94cb73" -dependencies = [ - "tokio", - "tokio-rustls", - "x509-cert", -] - -[[package]] -name = "ironrdp-tokio" -version = "0.2.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=2f57fd2de320f58fe240d88a83519255ba94cb73#2f57fd2de320f58fe240d88a83519255ba94cb73" -dependencies = [ - "bytes", - "ironrdp-async", - "tokio", -] - -[[package]] -name = "is_terminal_polyfill" -version = "1.70.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" - -[[package]] -name = "iso7816" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75f5d3f2d959c5d37b382ed9b5a32d0a0e6112ab6ac9eb8fce82359db6f2367" -dependencies = [ - "delog", - "heapless", -] - -[[package]] -name = "iso7816-tlv" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7660d28d24a831d690228a275d544654a30f3b167a8e491cf31af5fe5058b546" -dependencies = [ - "untrusted", -] - -[[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 = "jobserver" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" -dependencies = [ - "libc", -] - -[[package]] -name = "js-sys" -version = "0.3.72" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "keccak" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654" -dependencies = [ - "cpufeatures", -] - -[[package]] -name = "lazy_static" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" -dependencies = [ - "spin", -] - -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] -name = "libc" -version = "0.2.168" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d" - -[[package]] -name = "libloading" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" -dependencies = [ - "cfg-if", - "windows-targets 0.52.6", -] - -[[package]] -name = "libm" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" - -[[package]] -name = "linux-raw-sys" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" - -[[package]] -name = "litemap" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" - -[[package]] -name = "lock_api" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" - -[[package]] -name = "md-5" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" -dependencies = [ - "cfg-if", - "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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" -dependencies = [ - "hermit-abi", - "libc", - "wasi", - "windows-sys 0.52.0", -] - -[[package]] -name = "mirai-annotations" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9be0862c1b3f26a88803c4a49de6889c10e608b3ee9344e6ef5b45fb37ad3d1" - -[[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 = "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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" -dependencies = [ - "num-integer", - "num-traits", -] - -[[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-conv" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" - -[[package]] -name = "num-derive" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[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.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -dependencies = [ - "autocfg", - "libm", -] - -[[package]] -name = "object" -version = "0.36.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434" -dependencies = [ - "memchr", -] - -[[package]] -name = "oid" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c19903c598813dba001b53beeae59bb77ad4892c5c1b9b3500ce4293a0d06c2" -dependencies = [ - "serde", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "opaque-debug" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[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.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - -[[package]] -name = "parking_lot" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" -dependencies = [ - "lock_api", - "parking_lot_core 0.9.10", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.5.2", - "smallvec", - "windows-targets 0.52.6", -] - -[[package]] -name = "paste" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" - -[[package]] -name = "pbkdf2" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" -dependencies = [ - "digest", - "hmac", - "sha1", -] - -[[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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "picky" -version = "7.0.0-rc.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f62f11977ee3ab76e48f7465f035a607e61b7421b154384b71607cb85a26d5dd" -dependencies = [ - "aes", - "aes-gcm", - "aes-kw", - "base64", - "cbc", - "des", - "digest", - "ed25519-dalek", - "hex", - "hmac", - "http", - "md-5", - "num-bigint-dig", - "p256", - "p384", - "p521", - "pbkdf2", - "picky-asn1", - "picky-asn1-der", - "picky-asn1-x509", - "rand", - "rand_core", - "rc2", - "rsa", - "serde", - "serde_json", - "sha1", - "sha2", - "sha3", - "thiserror", - "x25519-dalek", - "zeroize", -] - -[[package]] -name = "picky-asn1" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d061c9f67e256511d8d69b86730a506bed100db520c8812e789cf91d9c6a16cc" -dependencies = [ - "oid", - "serde", - "serde_bytes", - "time", - "zeroize", -] - -[[package]] -name = "picky-asn1-der" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e15b90fb132c46ded79c39277afa93151691d9df6e7ff369c071890b36478392" -dependencies = [ - "picky-asn1", - "serde", - "serde_bytes", -] - -[[package]] -name = "picky-asn1-x509" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f702973074c654cef724d7430e2852acdb8b0e897ed9c4120727446a1bda1464" -dependencies = [ - "base64", - "num-bigint-dig", - "oid", - "picky-asn1", - "picky-asn1-der", - "serde", - "widestring", - "zeroize", -] - -[[package]] -name = "picky-krb" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5f3c62393fbe5538020af4f8b07d1647f99748becd207476417f8d2aa8900cd" -dependencies = [ - "aes", - "byteorder", - "cbc", - "crypto", - "des", - "hmac", - "num-bigint-dig", - "oid", - "pbkdf2", - "picky-asn1", - "picky-asn1-der", - "picky-asn1-x509", - "rand", - "serde", - "sha1", - "thiserror", - "uuid", -] - -[[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.68", -] - -[[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" -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 = "polyval" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" -dependencies = [ - "cfg-if", - "cpufeatures", - "opaque-debug", - "universal-hash", -] - -[[package]] -name = "portpicker" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be97d76faf1bfab666e1375477b23fde79eccf0276e9b63b92a39d676a889ba9" -dependencies = [ - "rand", -] - -[[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 = "prettyplease" -version = "0.2.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" -dependencies = [ - "proc-macro2", - "syn 2.0.68", -] - -[[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-macro2" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "radium" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rc2" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62c64daa8e9438b84aaae55010a93f396f8e60e3911590fcba770d04643fc1dd" -dependencies = [ - "cipher", -] - -[[package]] -name = "rdp-client" -version = "0.1.0" -dependencies = [ - "bitflags 2.6.0", - "boring", - "byteorder", - "bytes", - "cbindgen", - "env_logger", - "ironrdp-cliprdr", - "ironrdp-connector", - "ironrdp-core", - "ironrdp-displaycontrol", - "ironrdp-dvc", - "ironrdp-pdu", - "ironrdp-rdpdr", - "ironrdp-rdpsnd", - "ironrdp-session", - "ironrdp-svc", - "ironrdp-tls", - "ironrdp-tokio", - "iso7816", - "iso7816-tlv", - "log", - "parking_lot 0.12.3", - "picky", - "picky-asn1-der", - "picky-asn1-x509", - "picky-krb", - "rand", - "rand_chacha", - "reqwest", - "rsa", - "rustls", - "sspi", - "static_init", - "tempfile", - "tokio", - "tokio-boring", - "url", - "utf16string", - "uuid", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" -dependencies = [ - "bitflags 2.6.0", -] - -[[package]] -name = "regex" -version = "1.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" - -[[package]] -name = "reqwest" -version = "0.12.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f" -dependencies = [ - "base64", - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "http", - "http-body", - "http-body-util", - "hyper", - "hyper-rustls", - "hyper-util", - "ipnet", - "js-sys", - "log", - "mime", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls", - "rustls-pemfile", - "rustls-pki-types", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "tokio", - "tokio-rustls", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "windows-registry", -] - -[[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.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 = "rsa" -version = "0.9.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47c75d7c5c6b673e58bf54d8544a9f432e3a925b0e80f7cd3602ab5c50c55519" -dependencies = [ - "const-oid", - "digest", - "num-bigint-dig", - "num-integer", - "num-traits", - "pkcs1", - "pkcs8", - "rand_core", - "sha1", - "signature", - "spki", - "subtle", - "zeroize", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" - -[[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.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] -name = "rusticata-macros" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" -dependencies = [ - "nom", -] - -[[package]] -name = "rustix" -version = "0.38.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" -dependencies = [ - "bitflags 2.6.0", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.59.0", -] - -[[package]] -name = "rustls" -version = "0.23.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "934b404430bb06b3fae2cba809eb45a1ab1aecd64491213d7c3301b88393f8d1" -dependencies = [ - "aws-lc-rs", - "log", - "once_cell", - "rustls-pki-types", - "rustls-webpki", - "subtle", - "zeroize", -] - -[[package]] -name = "rustls-native-certs" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a" -dependencies = [ - "openssl-probe", - "rustls-pemfile", - "rustls-pki-types", - "schannel", - "security-framework", -] - -[[package]] -name = "rustls-pemfile" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" -dependencies = [ - "base64", - "rustls-pki-types", -] - -[[package]] -name = "rustls-pki-types" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" - -[[package]] -name = "rustls-webpki" -version = "0.102.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" -dependencies = [ - "aws-lc-rs", - "ring", - "rustls-pki-types", - "untrusted", -] - -[[package]] -name = "ryu" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" - -[[package]] -name = "schannel" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[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.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" -dependencies = [ - "bitflags 2.6.0", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "semver" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" - -[[package]] -name = "serde" -version = "1.0.203" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_bytes" -version = "0.11.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_derive" -version = "1.0.203" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "serde_json" -version = "1.0.118" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d947f6b3163d8857ea16c4fa0dd4840d52f3041039a85decd46867eb1abef2e4" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_spanned" -version = "0.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" -dependencies = [ - "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 = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sha3" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" -dependencies = [ - "digest", - "keccak", -] - -[[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 = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[package]] -name = "signal-hook-registry" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" -dependencies = [ - "libc", -] - -[[package]] -name = "signature" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" -dependencies = [ - "digest", - "rand_core", -] - -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - -[[package]] -name = "socket2" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] - -[[package]] -name = "spki" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" -dependencies = [ - "base64ct", - "der", -] - -[[package]] -name = "sspi" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b94e3c7aa94f5b440eedeab677686629bddcb43edf52ef3703038cce98e2bf70" -dependencies = [ - "async-dnssd", - "async-recursion", - "bitflags 2.6.0", - "byteorder", - "cfg-if", - "crypto-mac", - "futures", - "hmac", - "lazy_static", - "md-5", - "md4", - "num-bigint-dig", - "num-derive", - "num-traits", - "oid", - "picky", - "picky-asn1", - "picky-asn1-der", - "picky-asn1-x509", - "picky-krb", - "portpicker", - "rand", - "reqwest", - "rsa", - "rustls", - "rustls-native-certs", - "serde", - "serde_derive", - "sha1", - "sha2", - "time", - "tokio", - "tracing", - "url", - "uuid", - "windows", - "windows-sys 0.59.0", - "winreg", - "zeroize", -] - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "static_init" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a2a1c578e98c1c16fc3b8ec1328f7659a500737d7a0c6d625e73e830ff9c1f6" -dependencies = [ - "bitflags 1.3.2", - "cfg_aliases", - "libc", - "parking_lot 0.11.2", - "parking_lot_core 0.8.6", - "static_init_macro", - "winapi", -] - -[[package]] -name = "static_init_macro" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70a2595fc3aa78f2d0e45dd425b22282dd863273761cc77780914b2cf3003acf" -dependencies = [ - "cfg_aliases", - "memchr", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - -[[package]] -name = "subtle" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "sync_wrapper" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" -dependencies = [ - "futures-core", -] - -[[package]] -name = "synstructure" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - -[[package]] -name = "tempfile" -version = "3.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" -dependencies = [ - "cfg-if", - "fastrand", - "once_cell", - "rustix", - "windows-sys 0.59.0", -] - -[[package]] -name = "thiserror" -version = "1.0.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[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 = "time" -version = "0.3.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" -dependencies = [ - "deranged", - "itoa", - "js-sys", - "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.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" -dependencies = [ - "num-conv", - "time-core", -] - -[[package]] -name = "tinystr" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" -dependencies = [ - "displaydoc", - "zerovec", -] - -[[package]] -name = "tls_codec" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e78c9c330f8c85b2bae7c8368f2739157db9991235123aa1b15ef9502bfb6a" -dependencies = [ - "tls_codec_derive", - "zeroize", -] - -[[package]] -name = "tls_codec_derive" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d9ef545650e79f30233c0003bcc2504d7efac6dad25fca40744de773fe2049c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "tokio" -version = "1.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "parking_lot 0.12.3", - "pin-project-lite", - "signal-hook-registry", - "socket2", - "tokio-macros", - "windows-sys 0.52.0", -] - -[[package]] -name = "tokio-boring" -version = "4.7.0" -source = "git+https://github.com/gravitational/boring?rev=99897308abb5976ea05625b8314c24b16eebb01b#99897308abb5976ea05625b8314c24b16eebb01b" -dependencies = [ - "boring", - "boring-sys", - "once_cell", - "tokio", -] - -[[package]] -name = "tokio-macros" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "tokio-rustls" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" -dependencies = [ - "rustls", - "rustls-pki-types", - "tokio", -] - -[[package]] -name = "toml" -version = "0.8.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.22.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "pin-project", - "pin-project-lite", - "tokio", - "tower-layer", - "tower-service", -] - -[[package]] -name = "tower-layer" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" - -[[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 = [ - "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 2.0.68", -] - -[[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 = [ - "nu-ansi-term", - "sharded-slab", - "smallvec", - "thread_local", - "time", - "tracing-core", - "tracing-log", -] - -[[package]] -name = "tracing-web" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e6a141feebd51f8d91ebfd785af50fca223c570b86852166caa3b141defe7c" -dependencies = [ - "js-sys", - "tracing-core", - "tracing-subscriber", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "try-lock" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[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.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "utf16_iter" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" - -[[package]] -name = "utf16string" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b62a1e85e12d5d712bf47a85f426b73d303e2d00a90de5f3004df3596e9d216" -dependencies = [ - "byteorder", -] - -[[package]] -name = "utf8_iter" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" - -[[package]] -name = "utf8parse" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" - -[[package]] -name = "uuid" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" -dependencies = [ - "getrandom", - "serde", -] - -[[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 = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" -dependencies = [ - "cfg-if", - "once_cell", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.68", - "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.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" - -[[package]] -name = "web-sys" -version = "0.3.72" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "which" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" -dependencies = [ - "either", - "home", - "once_cell", - "rustix", -] - -[[package]] -name = "widestring" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" -dependencies = [ - "windows-core", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-core" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" -dependencies = [ - "windows-implement", - "windows-interface", - "windows-result", - "windows-strings", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-implement" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "windows-interface" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "windows-registry" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" -dependencies = [ - "windows-result", - "windows-strings", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-result" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-strings" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" -dependencies = [ - "windows-result", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" - -[[package]] -name = "winnow" -version = "0.6.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" -dependencies = [ - "memchr", -] - -[[package]] -name = "winreg" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "write16" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" - -[[package]] -name = "writeable" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" - -[[package]] -name = "wyz" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" -dependencies = [ - "tap", -] - -[[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-cert" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1301e935010a701ae5f8655edc0ad17c44bad3ac5ce8c39185f75453b720ae94" -dependencies = [ - "const-oid", - "der", - "spki", - "tls_codec", -] - -[[package]] -name = "yoke" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" -dependencies = [ - "serde", - "stable_deref_trait", - "yoke-derive", - "zerofrom", -] - -[[package]] -name = "yoke-derive" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", - "synstructure", -] - -[[package]] -name = "zerofrom" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" -dependencies = [ - "zerofrom-derive", -] - -[[package]] -name = "zerofrom-derive" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", - "synstructure", -] - -[[package]] -name = "zeroize" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" -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", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "zerovec" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" -dependencies = [ - "yoke", - "zerofrom", - "zerovec-derive", -] - -[[package]] -name = "zerovec-derive" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] diff --git a/pkgs/servers/teleport/16/default.nix b/pkgs/servers/teleport/16/default.nix index ac6564030e3f..962f08efe150 100644 --- a/pkgs/servers/teleport/16/default.nix +++ b/pkgs/servers/teleport/16/default.nix @@ -6,12 +6,6 @@ import ../generic.nix ( hash = "sha256-9X4PLN5y1pJMNGL7o+NR/b3yUYch/VVEMmGmWbEO1CA="; vendorHash = "sha256-nJdtllxjem+EA77Sb1XKmrAaWh/8WrL3AuvVxgBRkxI="; pnpmHash = "sha256-+eOfGS9m3c9i7ccOS8q6KM0IrBIJZKlxx7h3qqxTJHE="; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "boring-4.7.0" = "sha256-ACzw4Bfo6OUrwvi3h21tvx5CpdQaWCEIDkslzjzy9o8="; - "ironrdp-async-0.2.0" = "sha256-s0WdaEd3J2r/UmSVBktxtspIytlfw6eWUW3A4kOsTP0="; - }; - }; + cargoHash = "sha256-6JYSW65ou8iC4/7AJVZ9+vpItxpJtaGFA4Nm3fgyHIs="; } ) diff --git a/pkgs/servers/teleport/generic.nix b/pkgs/servers/teleport/generic.nix index e98e32143842..f8d7c6bda924 100644 --- a/pkgs/servers/teleport/generic.nix +++ b/pkgs/servers/teleport/generic.nix @@ -32,7 +32,6 @@ vendorHash, extPatches ? [ ], cargoHash ? null, - cargoLock ? null, yarnHash ? null, pnpmHash ? null, }: @@ -50,7 +49,8 @@ let rdpClient = rustPlatform.buildRustPackage rec { pname = "teleport-rdpclient"; - inherit cargoHash cargoLock; + useFetchCargoVendor = true; + inherit cargoHash; inherit version src; buildAndTestSubdir = "lib/srv/desktop/rdp/rdpclient"; @@ -84,7 +84,10 @@ let pname = "teleport-webassets"; inherit src version; - cargoDeps = rustPlatform.importCargoLock cargoLock; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit src; + hash = cargoHash; + }; pnpmDeps = if pnpmHash != null then From 62313ff35fb34d08cf4b5f2cf6823989b28ba715 Mon Sep 17 00:00:00 2001 From: SEKUN Date: Fri, 1 Nov 2024 16:54:20 +0800 Subject: [PATCH 0699/2168] sqitchSqlite: init at 1.5.0 --- pkgs/development/tools/misc/sqitch/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/pkgs/development/tools/misc/sqitch/default.nix b/pkgs/development/tools/misc/sqitch/default.nix index ee88ee76415e..7e23adee7bfd 100644 --- a/pkgs/development/tools/misc/sqitch/default.nix +++ b/pkgs/development/tools/misc/sqitch/default.nix @@ -6,6 +6,7 @@ shortenPerlShebang, mysqlSupport ? false, postgresqlSupport ? false, + sqliteSupport ? false, templateToolkitSupport ? false, }: @@ -16,6 +17,7 @@ let [ AlgorithmBackoff ] ++ lib.optional mysqlSupport DBDmysql ++ lib.optional postgresqlSupport DBDPg + ++ lib.optional sqliteSupport DBDSQLite ++ lib.optional templateToolkitSupport TemplateToolkit; in diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f625b4590645..413cc3d3cbc4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11097,6 +11097,10 @@ with pkgs; postgresqlSupport = true; }).overrideAttrs { pname = "sqitch-pg"; }; + sqitchSqlite = (callPackage ../development/tools/misc/sqitch { + sqliteSupport = true; + }).overrideAttrs { pname = "sqitch-sqlite"; }; + ### DEVELOPMENT / R MODULES R = darwin.apple_sdk_11_0.callPackage ../applications/science/math/R { From c6fe1cdbaeeabc2c960ce8207f22254bcefe0044 Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Sun, 9 Feb 2025 00:37:38 +0100 Subject: [PATCH 0700/2168] sage: import scipy 1.15 update patch --- pkgs/by-name/sa/sage/sage-src.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/sa/sage/sage-src.nix b/pkgs/by-name/sa/sage/sage-src.nix index 749999e2ce2a..94bbf2c4deb0 100644 --- a/pkgs/by-name/sa/sage/sage-src.nix +++ b/pkgs/by-name/sa/sage/sage-src.nix @@ -83,6 +83,13 @@ stdenv.mkDerivation rec { hash = "sha256-xB0xg8dGLnSMdFK3/B5hkI9yzI5N3lUMhPZ89lDsp3s="; }) + # https://github.com/sagemath/sage/pull/39261, landed in 10.6.beta4 + (fetchpatch { + name = "scipy-1.15-update.patch"; + url = "https://github.com/sagemath/sage/commit/545f5bf75084a7467aae0c0b34bc000ca996df78.diff"; + hash = "sha256-CMwwZLPalU4jWyRf4jnYncEQbw980gt+7xtAtqypDG4="; + }) + # https://github.com/sagemath/sage/pull/38749, to land in 10.6.beta6 (fetchpatch { name = "pari-2.17.1-update.patch"; From 3500c9f71454e5dfbaa05fd29b334a0175b22c1d Mon Sep 17 00:00:00 2001 From: Alexander Sieg Date: Thu, 6 Feb 2025 18:15:07 +0100 Subject: [PATCH 0701/2168] coturn: don't install examples due to broken symlinks Co-authored-by: Franz Pletz --- pkgs/by-name/co/coturn/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/co/coturn/package.nix b/pkgs/by-name/co/coturn/package.nix index 351796f237c1..d0eca5422fa1 100644 --- a/pkgs/by-name/co/coturn/package.nix +++ b/pkgs/by-name/co/coturn/package.nix @@ -42,6 +42,11 @@ stdenv.mkDerivation rec { ./dont-call-setgroups-unconditionally.patch ]; + configureFlags = [ + # don't install examples due to broken symlinks + "--examplesdir=.." + ]; + # Workaround build failure on -fno-common toolchains like upstream # gcc-10. Otherwise build fails as: # ld: ...-libprom-0.1.1/include/prom_collector_registry.h:37: multiple definition of From 36ded22526695c7d88acd2af065358b5034fb708 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 12:04:58 +0000 Subject: [PATCH 0702/2168] terraform-providers.sumologic: 3.0.1 -> 3.0.4 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 2d0f95f79488..b6c412d67399 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1228,11 +1228,11 @@ "vendorHash": "sha256-9M1DsE/FPQK8TG7xCJWbU3HAJCK3p/7lxdzjO1oAfWs=" }, "sumologic": { - "hash": "sha256-T+DQ2uTkbwzTShKx1FOavOc/V/DxwBOxKPE639+mhXg=", + "hash": "sha256-jGfBRem860KZfu0HjgAPm8Qwp3nM6993px7Gkt1BUGA=", "homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic", "owner": "SumoLogic", "repo": "terraform-provider-sumologic", - "rev": "v3.0.1", + "rev": "v3.0.4", "spdx": "MPL-2.0", "vendorHash": "sha256-YdWs2orKhbwAZSQYC73t4e/vvVxk8LrBPG9ZC38VcZE=" }, From 5b79942d6b9a3bb0d13907b95a63afc201bedcc9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 12:07:42 +0000 Subject: [PATCH 0703/2168] python312Packages.pydrawise: 2025.1.0 -> 2025.2.0 --- pkgs/development/python-modules/pydrawise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydrawise/default.nix b/pkgs/development/python-modules/pydrawise/default.nix index 56ad08288ed9..ab5cc475e35c 100644 --- a/pkgs/development/python-modules/pydrawise/default.nix +++ b/pkgs/development/python-modules/pydrawise/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pydrawise"; - version = "2025.1.0"; + version = "2025.2.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "dknowles2"; repo = "pydrawise"; tag = version; - hash = "sha256-LF7y8d2OqEJIy+FTj8J/OOQkgkaqYNv5oD8jLUwEPlE="; + hash = "sha256-eyAhEIUUqDURzp/6/MX51W0efYCeY75M6LTaoNVwkw4="; }; build-system = [ From f69ae5339de7d0438fdfcae6d2bd49fc1faf38fc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Feb 2025 13:34:56 +0100 Subject: [PATCH 0704/2168] python313Packages.dateparser: 1.2.0 -> 1.2.1 Diff: https://github.com/scrapinghub/dateparser/compare/refs/tags/v1.2.0...v1.2.1 Changelog: https://github.com/scrapinghub/dateparser/blob/refs/tags/v1.2.1/HISTORY.rst --- pkgs/development/python-modules/dateparser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix index 2ee14891dbda..87f08f29a55f 100644 --- a/pkgs/development/python-modules/dateparser/default.nix +++ b/pkgs/development/python-modules/dateparser/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "dateparser"; - version = "1.2.0"; + version = "1.2.1"; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "scrapinghub"; repo = "dateparser"; tag = "v${version}"; - hash = "sha256-mnL44hojebOwP6qtEBHs5QM4uRmLuGlVNr+sM3jZEKE="; + hash = "sha256-O0FsLWbH0kGjwGCTklBMVVqosxXlXRyS9aAcggtBLsA="; }; nativeBuildInputs = [ setuptools ]; From 179571d830f3461121212982cb83fdbce5acf82b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Feb 2025 15:20:23 +0100 Subject: [PATCH 0705/2168] python312Packages.secure: refactor - enable tests - update disabled - update build-system - add changelog to meta --- .../python-modules/secure/default.nix | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/secure/default.nix b/pkgs/development/python-modules/secure/default.nix index 1e4cd09e58b1..982e53783f92 100644 --- a/pkgs/development/python-modules/secure/default.nix +++ b/pkgs/development/python-modules/secure/default.nix @@ -2,37 +2,42 @@ lib, buildPythonPackage, fetchFromGitHub, - isPy27, maya, + pythonOlder, requests, + pytestCheckHook, + setuptools, }: buildPythonPackage rec { - version = "1.0.1"; - format = "setuptools"; pname = "secure"; - disabled = isPy27; + version = "1.0.1"; + pyproject = true; + + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "typeerror"; repo = "secure.py"; tag = "v${version}"; - sha256 = "sha256-lyosOejztFEINGKO0wAYv3PWBL7vpmAq+eQunwP9h5I="; + hash = "sha256-lyosOejztFEINGKO0wAYv3PWBL7vpmAq+eQunwP9h5I="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ maya requests ]; - # no tests in release - doCheck = false; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "secure" ]; meta = with lib; { description = "Adds optional security headers and cookie attributes for Python web frameworks"; homepage = "https://github.com/TypeError/secure.py"; + changelog = "https://github.com/TypeError/secure/releases/tag/v${version}"; license = licenses.mit; maintainers = [ ]; }; From 52dbf8edffd2c3af7fea998402cf5c0a089f612e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Feb 2025 15:28:25 +0100 Subject: [PATCH 0706/2168] python312Packages.trafilatura: disable failing test - update postPatch section --- pkgs/development/python-modules/trafilatura/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/trafilatura/default.nix b/pkgs/development/python-modules/trafilatura/default.nix index ed68972ac89d..ecbad785b0f1 100644 --- a/pkgs/development/python-modules/trafilatura/default.nix +++ b/pkgs/development/python-modules/trafilatura/default.nix @@ -26,11 +26,8 @@ buildPythonPackage rec { hash = "sha256-zrcJSm7Ml+cv6nPH26NnFMXFtXe2Rw5FINyok3BtYkc="; }; - # Patch out gui cli because it is not supported in this packaging and - # nixify path to the trafilatura binary in the test suite postPatch = '' - substituteInPlace setup.py \ - --replace-fail '"trafilatura_gui=trafilatura.gui:main",' "" + # nixify path to the trafilatura binary in the test suite substituteInPlace tests/cli_tests.py \ --replace-fail 'trafilatura_bin = "trafilatura"' \ 'trafilatura_bin = "${placeholder "out"}/bin/trafilatura"' @@ -57,6 +54,7 @@ buildPythonPackage rec { "test_download" "test_feeds_helpers" "test_fetch" + "test_input_type" "test_is_live_page" "test_meta_redirections" "test_probing" From 3c463d5d94d8df10413a4bb9dfbf5a8b25a689fc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Feb 2025 17:47:45 +0100 Subject: [PATCH 0707/2168] python313Packages.python-binance: disable failing tests --- .../python-modules/python-binance/default.nix | 40 ++++++++++++++----- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/python-binance/default.nix b/pkgs/development/python-modules/python-binance/default.nix index 9d7f575ebd0f..4785b79d2195 100644 --- a/pkgs/development/python-modules/python-binance/default.nix +++ b/pkgs/development/python-modules/python-binance/default.nix @@ -1,15 +1,16 @@ { lib, aiohttp, + aioresponses, buildPythonPackage, dateparser, fetchFromGitHub, - fetchpatch, pycryptodome, + pytest-asyncio, pytestCheckHook, pythonOlder, - requests, requests-mock, + requests, six, ujson, websockets, @@ -29,14 +30,6 @@ buildPythonPackage rec { hash = "sha256-nsJuHxPXhMBRY4BUDDLj5sHK/GuJA0pBU3RGUDxVm50="; }; - patches = [ - (fetchpatch { - name = "fix-unable-to-determine-version-error.patch"; - url = "https://github.com/sammchardy/python-binance/commit/1b9dd4853cafccf6cdacc13bb64a18632a79a6f1.patch"; - hash = "sha256-6KRHm2cZRcdD6qMdRAwlea4qLZ1/1YFzZAQ7Ph4XMCs="; - }) - ]; - propagatedBuildInputs = [ aiohttp dateparser @@ -48,6 +41,8 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + aioresponses + pytest-asyncio pytestCheckHook requests-mock ]; @@ -55,7 +50,30 @@ buildPythonPackage rec { disabledTestPaths = [ # Tests require network access "tests/test_api_request.py" - "tests/test_historical_klines.py" + "tests/test_async_client.py" + "tests/test_async_client_futures.py" + "tests/test_async_client_margin.py" + "tests/test_async_client_options.py" + "tests/test_async_client_portfolio.py" + "tests/test_async_client_ws_api.py" + "tests/test_async_client_ws_futures_requests.py" + "tests/test_client.py" + "tests/test_client_futures.py" + "tests/test_client_gift_card.py" + "tests/test_client_margin.py" + "tests/test_client_options.py" + "tests/test_client_portfolio.py" + "tests/test_client_ws_api.py" + "tests/test_client_ws_futures_requests.py" + "tests/test_depth_cache.py" + "tests/test_get_order_book.py" + "tests/test_ping.py" + "tests/test_reconnecting_websocket.py" + "tests/test_socket_manager.py" + "tests/test_streams.py" + "tests/test_threaded_socket_manager.py" + "tests/test_threaded_stream.py" + "tests/test_ws_api.py" ]; pythonImportsCheck = [ "binance" ]; From 52b40d9a9767ce964b7cc47e1492db82f799f66d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Feb 2025 17:49:56 +0100 Subject: [PATCH 0708/2168] python313Packages.python-binance: refactor --- .../python-modules/python-binance/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/python-binance/default.nix b/pkgs/development/python-modules/python-binance/default.nix index 4785b79d2195..77db7394f7e1 100644 --- a/pkgs/development/python-modules/python-binance/default.nix +++ b/pkgs/development/python-modules/python-binance/default.nix @@ -13,24 +13,27 @@ requests, six, ujson, + setuptools, websockets, }: buildPythonPackage rec { pname = "python-binance"; version = "1.0.27"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "sammchardy"; - repo = pname; + repo = "python-binance"; tag = "v${version}"; hash = "sha256-nsJuHxPXhMBRY4BUDDLj5sHK/GuJA0pBU3RGUDxVm50="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ aiohttp dateparser requests From 78c4b63c859cc46890ed6610d8617bb998a158db Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Feb 2025 11:27:46 +0100 Subject: [PATCH 0709/2168] python312Packages.w3lib: 2.2.1 -> 2.3.1 Changelog: https://github.com/scrapy/w3lib/blob/v2.3.1/NEWS --- pkgs/development/python-modules/w3lib/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/w3lib/default.nix b/pkgs/development/python-modules/w3lib/default.nix index 99a336319abc..e0cfe29155a0 100644 --- a/pkgs/development/python-modules/w3lib/default.nix +++ b/pkgs/development/python-modules/w3lib/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - fetchpatch, fetchPypi, pytestCheckHook, pythonOlder, @@ -10,23 +9,16 @@ buildPythonPackage rec { pname = "w3lib"; - version = "2.2.1"; + version = "2.3.1"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-dW/y2Uxk5ByNfAxZ/qEqXQvFXjOlMceYi0oWPeubB90="; + hash = "sha256-XIrAKjAnV2F0wrYeuaIXC6Gxl8rnZwgHcbbx/r2iSaQ="; }; - patches = [ - (fetchpatch { - url = "https://github.com/scrapy/w3lib/commit/44dcf9160c3f207658d6ce808307c80c9ca835a2.patch"; - hash = "sha256-fUQ2oWpAJeslgemt+EUxKLH3Ywpg441FCOBLFJCZ+Ac="; - }) - ]; - build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; From 9c9f5b10faefac1d6b1bca3df5f2dff8a2da57d0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Feb 2025 11:28:20 +0100 Subject: [PATCH 0710/2168] python312Packages.playwrightcapture: 1.27.6 -> 1.27.7 Diff: https://github.com/Lookyloo/PlaywrightCapture/compare/refs/tags/v1.27.6...v1.27.7 Changelog: https://github.com/Lookyloo/PlaywrightCapture/releases/tag/v1.27.7 --- pkgs/development/python-modules/playwrightcapture/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix index d86427837f0e..c1f4dee4c766 100644 --- a/pkgs/development/python-modules/playwrightcapture/default.nix +++ b/pkgs/development/python-modules/playwrightcapture/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "playwrightcapture"; - version = "1.27.6"; + version = "1.27.7"; pyproject = true; disabled = pythonOlder "3.9"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "Lookyloo"; repo = "PlaywrightCapture"; tag = "v${version}"; - hash = "sha256-Kh4F5dicbVvM9k8T4iMERMuze3Ztawi9LXH7+udtZFU="; + hash = "sha256-tu1QvurhJBW6tygdteQYAWWk9nuEHT7p8LlkmTwW+Dw="; }; pythonRelaxDeps = [ From ec5e69d9d5de78deea083c2676525e53e8864816 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Feb 2025 11:29:02 +0100 Subject: [PATCH 0711/2168] python312Packages.lacuscore: 1.12.8 -> 1.12.9 Diff: https://github.com/ail-project/LacusCore/compare/refs/tags/v1.12.8...v1.12.9 Changelog: https://github.com/ail-project/LacusCore/releases/tag/v1.12.9 --- pkgs/development/python-modules/lacuscore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lacuscore/default.nix b/pkgs/development/python-modules/lacuscore/default.nix index 46bdab1780c3..44e57f8f4267 100644 --- a/pkgs/development/python-modules/lacuscore/default.nix +++ b/pkgs/development/python-modules/lacuscore/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "lacuscore"; - version = "1.12.8"; + version = "1.12.9"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "ail-project"; repo = "LacusCore"; tag = "v${version}"; - hash = "sha256-blQhnQoNMXQhNQJ7EXawoYHxbPEgPmLltoLQTzsKwtA="; + hash = "sha256-kh/INvFeSDvvhzryhkSzgtTsIIh4YF6FjDxjUG0hz6E="; }; pythonRelaxDeps = [ From ac99f9ef91413ebc7d788128cc4a5363fb18b4f1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Feb 2025 20:39:01 +0100 Subject: [PATCH 0712/2168] python312Packages.playwrightcapture: 1.27.7 -> 1.27.8 Diff: https://github.com/Lookyloo/PlaywrightCapture/compare/refs/tags/v1.27.7...v1.27.8 Changelog: https://github.com/Lookyloo/PlaywrightCapture/releases/tag/v1.27.8 --- pkgs/development/python-modules/playwrightcapture/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix index c1f4dee4c766..10495f4898c4 100644 --- a/pkgs/development/python-modules/playwrightcapture/default.nix +++ b/pkgs/development/python-modules/playwrightcapture/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "playwrightcapture"; - version = "1.27.7"; + version = "1.27.8"; pyproject = true; disabled = pythonOlder "3.9"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "Lookyloo"; repo = "PlaywrightCapture"; tag = "v${version}"; - hash = "sha256-tu1QvurhJBW6tygdteQYAWWk9nuEHT7p8LlkmTwW+Dw="; + hash = "sha256-iIUwBX3MQHeEmYwesW2Dm45tr9FYyq9GtLGbyV784RA="; }; pythonRelaxDeps = [ From b600aa2823098ff7096e21c31583b12d85cdc5b0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Feb 2025 20:53:27 +0100 Subject: [PATCH 0713/2168] python312Packages.lacuscore: 1.12.9 -> 1.12.10 Diff: https://github.com/ail-project/LacusCore/compare/refs/tags/v1.12.9...v1.12.10 Changelog: https://github.com/ail-project/LacusCore/releases/tag/v1.12.10 --- pkgs/development/python-modules/lacuscore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lacuscore/default.nix b/pkgs/development/python-modules/lacuscore/default.nix index 44e57f8f4267..1fd803cbbd99 100644 --- a/pkgs/development/python-modules/lacuscore/default.nix +++ b/pkgs/development/python-modules/lacuscore/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "lacuscore"; - version = "1.12.9"; + version = "1.12.10"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "ail-project"; repo = "LacusCore"; tag = "v${version}"; - hash = "sha256-kh/INvFeSDvvhzryhkSzgtTsIIh4YF6FjDxjUG0hz6E="; + hash = "sha256-IKH7c1/MgjlfJ9tKVeTXW8MdLIc7P+jitvQkZn9f75Y="; }; pythonRelaxDeps = [ From 6f0ce6a2af64c162661b0d5af631d2ee299bfa9b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 12:27:18 +0000 Subject: [PATCH 0714/2168] shairport-sync: 4.3.6 -> 4.3.7 --- pkgs/by-name/sh/shairport-sync/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sh/shairport-sync/package.nix b/pkgs/by-name/sh/shairport-sync/package.nix index 55e8b094f8bd..7f2e8349f9b1 100644 --- a/pkgs/by-name/sh/shairport-sync/package.nix +++ b/pkgs/by-name/sh/shairport-sync/package.nix @@ -53,13 +53,13 @@ in stdenv.mkDerivation rec { pname = "shairport-sync"; - version = "4.3.6"; + version = "4.3.7"; src = fetchFromGitHub { repo = "shairport-sync"; owner = "mikebrady"; tag = version; - hash = "sha256-Pbg2yFa524OFOfvwZPS1/K+Vvn+bwtmo7Fbr919Smwc="; + hash = "sha256-bfOgUeUCxQeCmKKBlvIXptM5lJxgZiH4lOhLJSNih8g="; }; nativeBuildInputs = From 0529942d1f6043345606b5afe657edad227c2b52 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 9 Feb 2025 13:29:22 +0100 Subject: [PATCH 0715/2168] python313Packages.pytubefix: 8.12.0 -> 8.12.1 Diff: https://github.com/JuanBindez/pytubefix/compare/refs/tags/v8.12.0...v8.12.1 Changelog: https://github.com/JuanBindez/pytubefix/releases/tag/v8.12.1 --- .../python-modules/pytubefix/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pytubefix/default.nix b/pkgs/development/python-modules/pytubefix/default.nix index db6bd6f1471d..c6c654a30c37 100644 --- a/pkgs/development/python-modules/pytubefix/default.nix +++ b/pkgs/development/python-modules/pytubefix/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pytubefix"; - version = "8.12.0"; + version = "8.12.1"; pyproject = true; src = fetchFromGitHub { owner = "JuanBindez"; repo = "pytubefix"; tag = "v${version}"; - hash = "sha256-m27iuiQDk70yHHhmayp9558S8ZYLM0/sWyCfC4VvLsQ="; + hash = "sha256-PZxwF8rAPHmPpw6MKI8OVrl7CRNn9ldPnsPmHlAYahM="; }; build-system = [ setuptools ]; @@ -23,7 +23,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; disabledTestPaths = [ - # require network access + # Tests require network access "tests/test_captions.py" "tests/test_cli.py" "tests/test_exceptions.py" @@ -33,11 +33,18 @@ buildPythonPackage rec { "tests/test_streams.py" ]; + disabledTests = [ + "test_playlist_failed_pagination" + "test_playlist_pagination" + "test_create_mock_html_json" + ]; + pythonImportsCheck = [ "pytubefix" ]; meta = { - homepage = "https://github.com/JuanBindez/pytubefix"; description = "Pytube fork with additional features and fixes"; + homepage = "https://github.com/JuanBindez/pytubefix"; + changelog = "https://github.com/JuanBindez/pytubefix/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ youhaveme9 ]; }; From 2b0f35b3ea05cafe6ecbb9b532de7473c919633a Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 9 Feb 2025 11:22:38 +0100 Subject: [PATCH 0716/2168] libproxy: mark unsupported on static --- pkgs/development/libraries/libproxy/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index bb9d490b6fc7..fe65c9d3bc1e 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -135,6 +135,10 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://libproxy.github.io/libproxy/"; license = licenses.lgpl21Plus; platforms = platforms.linux ++ platforms.darwin; + badPlatforms = [ + # Mandatory libpxbackend-1.0 shared library. + lib.systems.inspect.platformPatterns.isStatic + ]; mainProgram = "proxy"; }; }) From 457c422df0ecf66a2d269d21a4169aded6000584 Mon Sep 17 00:00:00 2001 From: Moritz Hedtke Date: Sun, 9 Feb 2025 13:56:06 +0100 Subject: [PATCH 0717/2168] trunk: 0.21.5 -> 0.21.7 --- pkgs/by-name/tr/trunk/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tr/trunk/package.nix b/pkgs/by-name/tr/trunk/package.nix index e54d09b650d5..01470897bbd7 100644 --- a/pkgs/by-name/tr/trunk/package.nix +++ b/pkgs/by-name/tr/trunk/package.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage rec { pname = "trunk"; - version = "0.21.5"; + version = "0.21.7"; src = fetchFromGitHub { owner = "trunk-rs"; repo = "trunk"; rev = "v${version}"; - hash = "sha256-AHW686xPGCMLISrOLLfDR5g+2XpMJ+zfmWGn3fMfKbA="; + hash = "sha256-VAAGHM2GDrvZvOTRPkxSFs6pzDQGhi6vPpprKJSZKUw="; }; nativeBuildInputs = [ pkg-config ]; @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { checkFlags = [ "--skip=tools::tests::download_and_install_binaries" ]; useFetchCargoVendor = true; - cargoHash = "sha256-MkH0khm4b/xumrzwBfwq4CbBgqeL71iag9WTOoi/IOw="; + cargoHash = "sha256-IiKb8MD5QdGMkdX2dbcPkW1cUJq82+uDK1Ru+/otErc="; meta = with lib; { homepage = "https://github.com/trunk-rs/trunk"; From 85e6e0441e80b296608619d0be5c759d6cdc3b6f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 13:14:24 +0000 Subject: [PATCH 0718/2168] gat: 0.20.0 -> 0.20.3 --- pkgs/by-name/ga/gat/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ga/gat/package.nix b/pkgs/by-name/ga/gat/package.nix index c13f6bf7543b..952f2c035fe8 100644 --- a/pkgs/by-name/ga/gat/package.nix +++ b/pkgs/by-name/ga/gat/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gat"; - version = "0.20.0"; + version = "0.20.3"; src = fetchFromGitHub { owner = "koki-develop"; repo = "gat"; tag = "v${version}"; - hash = "sha256-xO0MUbryuglbRIbBEbKJGYPPaJD8j4hNpIR+Kqc302s="; + hash = "sha256-97rFnJPdnLv8RLI5ZGMpdEX2UwLUNBVn3Fe4vv5MFRY="; }; - vendorHash = "sha256-z2Hbn1debyJn/nTKVC2y3vd6V7XQyHFPNA6hCVuYzgU="; + vendorHash = "sha256-C3iUsS1p/+8U1KO/B5htYwCKnQThOusjE/jhOqoCFQo="; env.CGO_ENABLED = 0; From 39182f919d3c5ce4fc0038b58a128735e91c5c71 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 13:35:58 +0000 Subject: [PATCH 0719/2168] konstraint: 0.38.0 -> 0.39.0 --- pkgs/by-name/ko/konstraint/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ko/konstraint/package.nix b/pkgs/by-name/ko/konstraint/package.nix index 4fac55523b24..9c9ae6081f35 100644 --- a/pkgs/by-name/ko/konstraint/package.nix +++ b/pkgs/by-name/ko/konstraint/package.nix @@ -7,15 +7,15 @@ buildGoModule rec { pname = "konstraint"; - version = "0.38.0"; + version = "0.39.0"; src = fetchFromGitHub { owner = "plexsystems"; repo = pname; rev = "v${version}"; - sha256 = "sha256-02vmIsYGX6HB7k1HArMpNY+UxVX24IyraNPu13ht2qQ="; + sha256 = "sha256-pn5uL3ibDb3vXaBhf34LmFNGpR8SYJkg5IcnN+eVfWk="; }; - vendorHash = "sha256-eD0K2te9+9x0fUYMVZ6SreV2AhkYwBzQHUTyeNwuEHc="; + vendorHash = "sha256-ZpNLxoUHwNMzMiKSm8rY27dH9AukXZEitrFb7TlSyQ0="; # Exclude go within .github folder excludedPackages = ".github"; From 2ae7bba20eecaf7d14a49a8d5c172ec02e24cc20 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 9 Feb 2025 14:34:34 +0100 Subject: [PATCH 0720/2168] python313Packages.pygame-ce: 2.5.2 -> 2.5.3 Changelog: https://github.com/pygame-community/pygame-ce/releases/tag/2.5.3 --- .../python-modules/pygame-ce/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pygame-ce/default.nix b/pkgs/development/python-modules/pygame-ce/default.nix index 470ece383353..aee76f73983c 100644 --- a/pkgs/development/python-modules/pygame-ce/default.nix +++ b/pkgs/development/python-modules/pygame-ce/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "pygame-ce"; - version = "2.5.2"; + version = "2.5.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -39,8 +39,8 @@ buildPythonPackage rec { owner = "pygame-community"; repo = "pygame-ce"; tag = version; - hash = "sha256-9e02ZfBfk18jsVDKKhMwEJiTGMG7VdBEgVh4unMJguY="; - # Unicode file cause different checksums on HFS+ vs. other filesystems + hash = "sha256-Vl9UwCknbMHdsB1wwo/JqybWz3UbAMegIcO0GpiCxig="; + # Unicode files cause different checksums on HFS+ vs. other filesystems postFetch = "rm -rf $out/docs/reST"; }; @@ -69,11 +69,12 @@ buildPythonPackage rec { '' # cython was pinned to fix windows build hangs (pygame-community/pygame-ce/pull/3015) substituteInPlace pyproject.toml \ - --replace-fail '"meson<=1.5.1",' '"meson",' \ - --replace-fail '"meson-python<=0.16.0",' '"meson-python",' \ - --replace-fail '"ninja<=1.11.1.1",' "" \ + --replace-fail '"meson<=1.7.0",' '"meson",' \ + --replace-fail '"meson-python<=0.17.1",' '"meson-python",' \ + --replace-fail '"ninja<=1.12.1",' "" \ --replace-fail '"cython<=3.0.11",' '"cython",' \ - --replace-fail '"sphinx<=7.2.6",' "" + --replace-fail '"sphinx<=8.1.3",' "" \ + --replace-fail '"sphinx-autoapi<=3.3.2",' "" substituteInPlace buildconfig/config_{unix,darwin}.py \ --replace-fail 'from distutils' 'from setuptools._distutils' substituteInPlace src_py/sysfont.py \ @@ -160,7 +161,7 @@ buildPythonPackage rec { meta = { description = "Pygame Community Edition (CE) - library for multimedia application built on SDL"; homepage = "https://pyga.me/"; - changelog = "https://github.com/pygame-community/pygame-ce/releases/tag/${version}"; + changelog = "https://github.com/pygame-community/pygame-ce/releases/tag/${src.tag}"; license = lib.licenses.lgpl21Plus; maintainers = [ lib.maintainers.pbsds ]; platforms = lib.platforms.unix; From ca8e227777a3917e03fa4a76a1ba2507b197ad7c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 13:46:15 +0000 Subject: [PATCH 0721/2168] mini-calc: 3.3.5 -> 3.4.1 --- pkgs/by-name/mi/mini-calc/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/mini-calc/package.nix b/pkgs/by-name/mi/mini-calc/package.nix index ffdbed969b55..60784157b60c 100644 --- a/pkgs/by-name/mi/mini-calc/package.nix +++ b/pkgs/by-name/mi/mini-calc/package.nix @@ -9,17 +9,17 @@ }: rustPlatform.buildRustPackage rec { pname = "mini-calc"; - version = "3.3.5"; + version = "3.4.1"; src = fetchFromGitHub { owner = "vanilla-extracts"; repo = "calc"; rev = version; - hash = "sha256-A5nD1SuV2p2o+WRTHr9tqhyqfeZMiGWi9QUXFSSM7C0="; + hash = "sha256-p3McMsMo+l9fqLd6PZz4GBxoac4aZkJ3b4bQdmnooKI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-TFAt0JcPX8EKTSwyxF5efYJC5LbSPBr2f9L4DaQ1ebI="; + cargoHash = "sha256-VOv1CqUpsvRY0Zln7grGBRLegtJ3NhiuIxiEoBKe2eQ="; nativeBuildInputs = [ makeWrapper ]; postFixup = '' From 9c7b9ceeec4fa372b18e7566384038fca1054d4d Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sun, 9 Feb 2025 13:51:31 +0000 Subject: [PATCH 0722/2168] discord: 0.0.83 -> 0.0.84 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index e85c7cb9e89f..a622cc47dcbf 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -9,7 +9,7 @@ let versions = if stdenv.hostPlatform.isLinux then { - stable = "0.0.83"; + stable = "0.0.84"; ptb = "0.0.128"; canary = "0.0.581"; development = "0.0.68"; @@ -26,7 +26,7 @@ let x86_64-linux = { stable = fetchurl { url = "https://stable.dl2.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-thBnSYjYa2QEHyxIhEiA73hMs/S8n808oq8IAKtA7VI="; + hash = "sha256-Gbxa8Yekjx8a3BkPBfUAdLW5gdnq3WMcwW3rzVgZjog="; }; ptb = fetchurl { url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; From 5ef7061e523d1068ca33c7669aabc1e474ee2eec Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sun, 9 Feb 2025 13:52:19 +0000 Subject: [PATCH 0723/2168] discord-ptb: 0.0.128 -> 0.0.130 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index a622cc47dcbf..6ae16558f414 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -10,7 +10,7 @@ let if stdenv.hostPlatform.isLinux then { stable = "0.0.84"; - ptb = "0.0.128"; + ptb = "0.0.130"; canary = "0.0.581"; development = "0.0.68"; } @@ -30,7 +30,7 @@ let }; ptb = fetchurl { url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - hash = "sha256-ccmlOyzPu6aMqmC2+mRXMQh6OYIFLrlTNwKmBGE61ic="; + hash = "sha256-MuFPQK9HgTgkZV/48OazJfBXFgrEjT57SNKnq9HKD4s="; }; canary = fetchurl { url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; From be1e39b1d0f36976983e75416ca775f28c2d5579 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sun, 9 Feb 2025 13:53:11 +0000 Subject: [PATCH 0724/2168] discord-canary: 0.0.581 -> 0.0.585 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 6ae16558f414..bc53531da79d 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -11,7 +11,7 @@ let { stable = "0.0.84"; ptb = "0.0.130"; - canary = "0.0.581"; + canary = "0.0.585"; development = "0.0.68"; } else @@ -34,7 +34,7 @@ let }; canary = fetchurl { url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-PUTu1eoq8lB+4rX0qACh3M8tOjR83Tgs3vaN5t70Mo8="; + hash = "sha256-PxdnCrZU8QoToyXk0LSzYUp25OFOJOJ5fKpH1aT2vt8="; }; development = fetchurl { url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; From 145ca67f62e854c5d913dd1001cece9a8ec01298 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sun, 9 Feb 2025 13:55:09 +0000 Subject: [PATCH 0725/2168] pkgsCross.aarch64-darwin.discord: 0.0.334 -> 0.0.335 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index bc53531da79d..9485db4a1b6d 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -16,7 +16,7 @@ let } else { - stable = "0.0.334"; + stable = "0.0.335"; ptb = "0.0.157"; canary = "0.0.692"; development = "0.0.78"; @@ -44,7 +44,7 @@ let x86_64-darwin = { stable = fetchurl { url = "https://stable.dl2.discordapp.net/apps/osx/${version}/Discord.dmg"; - hash = "sha256-8zAwOh1waRAQwW/RnjUJsOQJmYcCK5dZ10Ib08F7U08="; + hash = "sha256-TybjfJoWoOcpmBVPwIjTpzfhsMwzfxF5Gr2xEoHNKzk="; }; ptb = fetchurl { url = "https://ptb.dl2.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; From 8043b025b5a008312c1013cc99cd79eff6ab9ade Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sun, 9 Feb 2025 13:58:48 +0000 Subject: [PATCH 0726/2168] pkgsCross.aarch64-darwin.discord-ptb: 0.0.157 -> 0.0.159 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 9485db4a1b6d..036257c20521 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -17,7 +17,7 @@ let else { stable = "0.0.335"; - ptb = "0.0.157"; + ptb = "0.0.159"; canary = "0.0.692"; development = "0.0.78"; }; @@ -48,7 +48,7 @@ let }; ptb = fetchurl { url = "https://ptb.dl2.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - hash = "sha256-bZ9LVthjBib/yRfDTIXBNKDulWhW35HOdSDyEyjyLyA="; + hash = "sha256-ZokyBmeMKlP45c7q17Xbyc1prpPXtIgZJ2LK1NXBU/4="; }; canary = fetchurl { url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; From e79b9e47841130fef92e7978761b6ca14ee5adc5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 13:38:39 +0000 Subject: [PATCH 0727/2168] kanata-with-cmd: 1.7.0 -> 1.8.0 --- nixos/doc/manual/release-notes/rl-2505.section.md | 5 +++-- pkgs/by-name/ka/kanata/package.nix | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 8067b2aad670..6c08e06874bd 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -296,9 +296,10 @@ Read the [release blog post](https://prometheus.io/blog/2024/11/14/prometheus-3-0/) and [migration guide](https://prometheus.io/docs/prometheus/3.1/migration/). -- `kanata` was updated to v1.7.0, which introduces several breaking changes. +- `kanata` was updated to v1.8.0, which introduces several breaking changes. See the release notes of - [v1.7.0](https://github.com/jtroo/kanata/releases/tag/v1.7.0) + [v1.7.0](https://github.com/jtroo/kanata/releases/tag/v1.7.0) and + [v1.8.0](https://github.com/jtroo/kanata/releases/tag/v1.8.0) for more information. - `ags` was updated to v2, which is just a CLI for Astal now. Components are available as a different package set `astal.*`. diff --git a/pkgs/by-name/ka/kanata/package.nix b/pkgs/by-name/ka/kanata/package.nix index 0fcefd35c5ce..1e8991465c1c 100644 --- a/pkgs/by-name/ka/kanata/package.nix +++ b/pkgs/by-name/ka/kanata/package.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "kanata"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "jtroo"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cG9so0x0y8CbTxLOxSQwn5vG72KxHJzzTIH4lQA4MvE="; + sha256 = "sha256-RTFP063NGNfjlOlZ4wghpcUQEmmj73Xlu3KPIxeUI/I="; }; useFetchCargoVendor = true; - cargoHash = "sha256-VKvle1hQae+0Vbvd7Epq3cDqG8OV5J2mowF5lue59oc="; + cargoHash = "sha256-/r4u7pM7asCvG3LkbuP1Y63WVls1uZtV/L3cSOzUXr4="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; From a6621bdf837f68f9d2b5c9f24d0e98fdb461ab77 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Sun, 9 Feb 2025 06:01:06 -0800 Subject: [PATCH 0728/2168] tailwindcss: use finalAttrs, run install hooks This allows for overriding this derivation with `postInstall` and better supports other sorts of overriding because of referencing `finalAttrs` instead of hard-coding the values from the initial derivation. --- pkgs/development/tools/tailwindcss/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/tailwindcss/default.nix b/pkgs/development/tools/tailwindcss/default.nix index 51e52e1a49b4..f562cabd500f 100644 --- a/pkgs/development/tools/tailwindcss/default.nix +++ b/pkgs/development/tools/tailwindcss/default.nix @@ -29,12 +29,12 @@ let } .${system} or throwSystem; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tailwindcss"; version = "3.4.17"; src = fetchurl { - url = "https://github.com/tailwindlabs/tailwindcss/releases/download/v${version}/tailwindcss-${plat}"; + url = "https://github.com/tailwindlabs/tailwindcss/releases/download/v${finalAttrs.version}/tailwindcss-${plat}"; inherit hash; }; @@ -44,13 +44,15 @@ stdenv.mkDerivation rec { dontFixup = true; installPhase = '' + runHook preInstall mkdir -p $out/bin - cp ${src} $out/bin/tailwindcss + cp ${finalAttrs.src} $out/bin/tailwindcss chmod 755 $out/bin/tailwindcss + runHook postInstall ''; passthru.tests.helptext = runCommand "tailwindcss-test-helptext" { } '' - ${tailwindcss}/bin/tailwindcss --help > $out + ${lib.getExe finalAttrs.finalPackage} --help > $out ''; passthru.updateScript = ./update.sh; @@ -63,4 +65,4 @@ stdenv.mkDerivation rec { mainProgram = "tailwindcss"; platforms = platforms.darwin ++ platforms.linux; }; -} +}) From c0cc307ab3303bbcb1d6b3dae6be47522590d959 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sun, 9 Feb 2025 14:08:25 +0000 Subject: [PATCH 0729/2168] pkgsCross.aarch64-darwin.discord-canary: 0.0.692 -> 0.0.696 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 036257c20521..8a17fadd08bc 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -18,7 +18,7 @@ let { stable = "0.0.335"; ptb = "0.0.159"; - canary = "0.0.692"; + canary = "0.0.696"; development = "0.0.78"; }; version = versions.${branch}; @@ -52,7 +52,7 @@ let }; canary = fetchurl { url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-xA9TU6ODC6c8m+dLHxc5ZxD+SmTfXIjXl1wbA5JVay4="; + hash = "sha256-N53fCN9QL1oOavM0m8iofRsCRMaxsafsseBr+XuxfKc="; }; development = fetchurl { url = "https://development.dl2.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; From 15d54e7a7dd5b8f43a1e49ae7795285da1283224 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 14:35:13 +0000 Subject: [PATCH 0730/2168] telepresence2: 2.21.2 -> 2.21.3 --- pkgs/by-name/te/telepresence2/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/telepresence2/package.nix b/pkgs/by-name/te/telepresence2/package.nix index 7ffb6e724e84..293ced9968c3 100644 --- a/pkgs/by-name/te/telepresence2/package.nix +++ b/pkgs/by-name/te/telepresence2/package.nix @@ -31,13 +31,13 @@ let in buildGoModule rec { pname = "telepresence2"; - version = "2.21.2"; + version = "2.21.3"; src = fetchFromGitHub { owner = "telepresenceio"; repo = "telepresence"; rev = "v${version}"; - hash = "sha256-Tblba2vSZvnKCKvkp+QczyhiqNBx4Qpj7BfqYkdMd18="; + hash = "sha256-s0P8l8EokVGCUXo9Bm+uPtxS9uwIhBULtFeVR/Fl38M="; }; propagatedBuildInputs = [ @@ -51,7 +51,7 @@ buildGoModule rec { export CGO_ENABLED=0 ''; - vendorHash = "sha256-Halc2oPLYagmI7+vF8LMqBLVEcdjkHdpWYV558jLJjo="; + vendorHash = "sha256-FvNC0E367p473yNfbMntSOxh6TYa7OoR6/YbZ7q4WRs="; ldflags = [ "-s" From 1dbd3b6509641ed7afc8aefd060118a793810c67 Mon Sep 17 00:00:00 2001 From: merrkry Date: Sun, 9 Feb 2025 11:27:31 +0100 Subject: [PATCH 0731/2168] asusctl: 6.1.0 -> 6.1.1, add updateScript --- pkgs/by-name/as/asusctl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/as/asusctl/package.nix b/pkgs/by-name/as/asusctl/package.nix index 9e3fe7db571b..3ff9cfb714dd 100644 --- a/pkgs/by-name/as/asusctl/package.nix +++ b/pkgs/by-name/as/asusctl/package.nix @@ -17,13 +17,13 @@ }: rustPlatform.buildRustPackage rec { pname = "asusctl"; - version = "6.1.0"; + version = "6.1.1"; src = fetchFromGitLab { owner = "asus-linux"; repo = "asusctl"; rev = version; - hash = "sha256-EedOSStqZ2Q8PUJ+0mgIC2+MbiO19VUVDoVvWkkQscc="; + hash = "sha256-E2c4KhwLGAgorq4cHdPt/j45ebL0k+A/ktkXh71utxA="; }; useFetchCargoVendor = true; From cbee131c99df028b1dd5c58a4abe06a3fbcd082b Mon Sep 17 00:00:00 2001 From: Mia <59005594+kawaiiepic@users.noreply.github.com> Date: Sun, 9 Feb 2025 10:37:31 -0500 Subject: [PATCH 0732/2168] wvkbd: 0.15 -> 0.16 (#377795) --- pkgs/by-name/wv/wvkbd/package.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/wv/wvkbd/package.nix b/pkgs/by-name/wv/wvkbd/package.nix index 0901ee9bf69e..f646cbf08bb0 100644 --- a/pkgs/by-name/wv/wvkbd/package.nix +++ b/pkgs/by-name/wv/wvkbd/package.nix @@ -10,17 +10,18 @@ cairo, pkg-config, libxkbcommon, + scdoc, }: stdenv.mkDerivation rec { pname = "wvkbd"; - version = "0.15"; + version = "0.16"; src = fetchFromGitHub { owner = "jjsullivan5196"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-9gDxMH1hghqjcXlbda7CHjDdjcjApjjie7caihKIg9M="; + repo = "wvkbd"; + tag = "v${version}"; + hash = "sha256-8KRJsx0Zv1VH/lR/QEE9kkzEY2qWihHaog2YxgNd4Rs="; }; postPatch = '' @@ -39,6 +40,7 @@ stdenv.mkDerivation rec { libxkbcommon pango wayland + scdoc ]; installFlags = [ "PREFIX=$(out)" ]; From cee2c1b02fe28f9af52cc03daf7889b12b3e6fc8 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Sun, 9 Feb 2025 12:53:13 -0300 Subject: [PATCH 0733/2168] plasmusic-toolbar: 2.2.0 -> 2.3.0 --- pkgs/by-name/pl/plasmusic-toolbar/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pl/plasmusic-toolbar/package.nix b/pkgs/by-name/pl/plasmusic-toolbar/package.nix index 21d637e39e49..1de7bdefae6b 100644 --- a/pkgs/by-name/pl/plasmusic-toolbar/package.nix +++ b/pkgs/by-name/pl/plasmusic-toolbar/package.nix @@ -7,13 +7,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "plasmusic-toolbar"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "ccatterina"; repo = "plasmusic-toolbar"; tag = "v${finalAttrs.version}"; - hash = "sha256-yVhtn52wwBw+lGWbaynuF6Vv1rw5zslW/V1eZ71R140="; + hash = "sha256-YxhZ4XhHCbEPVrc+qqO+phGnEf0nnKiDVRB5K4wjR/Q="; }; installPhase = '' From 45869faf89fb9f186cb299470c3771af2555189c Mon Sep 17 00:00:00 2001 From: hetraeus Date: Tue, 21 Jan 2025 21:15:30 +0100 Subject: [PATCH 0734/2168] leocad: 21.03 -> 23.03 --- pkgs/applications/graphics/leocad/default.nix | 47 +++++++++++++------ 1 file changed, 33 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/graphics/leocad/default.nix b/pkgs/applications/graphics/leocad/default.nix index 5df01fd9052b..d9146852744d 100644 --- a/pkgs/applications/graphics/leocad/default.nix +++ b/pkgs/applications/graphics/leocad/default.nix @@ -1,6 +1,6 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, fetchurl, povray, @@ -8,37 +8,45 @@ qttools, replaceVars, zlib, + testers, + wrapQtAppsHook, + nix-update-script, + libGL, }: /* - To use aditional parts libraries + To use additional parts libraries set the variable LEOCAD_LIB=/path/to/libs/ or use option -l /path/to/libs/ */ let parts = fetchurl { - url = "https://web.archive.org/web/20210705153544/https://www.ldraw.org/library/updates/complete.zip"; - sha256 = "sha256-PW3XCbFwRaNkx4EgCnl2rXH7QgmpNgjTi17kZ5bladA="; + url = "https://web.archive.org/web/20241230062818/https://library.ldraw.org/library/updates/complete.zip"; + hash = "sha256-0RIJYEU+MpE4MSfxk2HK5hQd8IsiPn2xEGUFmItzlk8="; }; in -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "leocad"; - version = "21.06"; + version = "23.03"; src = fetchFromGitHub { owner = "leozide"; repo = "leocad"; - rev = "v${version}"; - sha256 = "1ifbxngkbmg6d8vv08amxbnfvlyjdwzykrjp98lbwvgb0b843ygq"; + tag = "v${finalAttrs.version}"; + hash = "sha256-IY9mr2gSMZL9pxiVTKH/f7rjsOvBDNgwVKpXA57oMGo="; }; nativeBuildInputs = [ qmake qttools + wrapQtAppsHook ]; - buildInputs = [ zlib ]; + buildInputs = [ + zlib + libGL + ]; propagatedBuildInputs = [ povray ]; @@ -57,12 +65,23 @@ mkDerivation rec { "--set-default LEOCAD_LIB ${parts}" ]; - meta = with lib; { + passthru = { + tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "env QT_QPA_PLATFORM=minimal ${lib.getExe finalAttrs.finalPackage} --version"; + }; + updateScript = nix-update-script { }; + }; + + passthru = { description = "CAD program for creating virtual LEGO models"; mainProgram = "leocad"; homepage = "https://www.leocad.org/"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.linux; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ + peterhoeg + hetraeus + ]; + platforms = lib.platforms.linux; }; -} +}) From 6c453a9d51e7d609c89947774a05cf2f36137ab1 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 9 Feb 2025 10:05:55 -0600 Subject: [PATCH 0735/2168] luaPackages.neotest: fix Marked broken for some reason. --- pkgs/development/lua-modules/overrides.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 180d955528d7..0f581254e7b2 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -571,9 +571,6 @@ in final.nlua final.busted neovim-unwrapped ]; - # stick to neovim's lua version else loading shared libraries fail - meta = oa.meta // { broken = !isLua51; }; - checkPhase = '' runHook preCheck export HOME=$(mktemp -d) From 9e2fa8baa87c5640cca672f3ab47cc152078dc59 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 9 Feb 2025 10:08:23 -0600 Subject: [PATCH 0736/2168] yabai: 7.1.6 -> 7.1.8 --- pkgs/by-name/ya/yabai/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ya/yabai/package.nix b/pkgs/by-name/ya/yabai/package.nix index edf78130738c..9fa0a5e86093 100644 --- a/pkgs/by-name/ya/yabai/package.nix +++ b/pkgs/by-name/ya/yabai/package.nix @@ -14,7 +14,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "yabai"; - version = "7.1.6"; + version = "7.1.8"; src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system} @@ -66,13 +66,13 @@ stdenv.mkDerivation (finalAttrs: { # See the comments on https://github.com/NixOS/nixpkgs/pull/188322 for more information. "aarch64-darwin" = fetchzip { url = "https://github.com/koekeishiya/yabai/releases/download/v${finalAttrs.version}/yabai-v${finalAttrs.version}.tar.gz"; - hash = "sha256-6cHOHL73BB2UaZKLPxnc6n0bo7XwhxehDj+m+s1dGqk="; + hash = "sha256-lD+n3QYI53AiCi32Ci06bNulwdyhRG7xQDVqJqlHOcs="; }; "x86_64-darwin" = fetchFromGitHub { owner = "koekeishiya"; repo = "yabai"; rev = "v${finalAttrs.version}"; - hash = "sha256-yigpGy4n7QS1WvWyxESmSPNWqGWh7Mqp/NrmvdMhPdY="; + hash = "sha256-nbPs8xPh1TW6HU1yl0gStSzsj6yxsBhHUI63y1GGGW0="; }; }; From ec820a8d452a8b8e0e52a998cf4fbfbfb611e998 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Sun, 9 Feb 2025 05:42:36 -0800 Subject: [PATCH 0737/2168] haskellPackages.tailwind: enhance override to provide `tailwind` binary This reverts to previous use of `tailwind` wrapper before 50f5683d8c8534c2f125f76b5ba6d4fa22ad4fc6 removed it. Since we already had an override, this makes it a little chunkier to maintain compatibility. --- pkgs/development/haskell-modules/configuration-nix.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index f2415d204dbe..c0ff75b80800 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1426,6 +1426,16 @@ self: super: builtins.intersectAttrs super { pkgs.nodePackages."@tailwindcss/line-clamp" pkgs.nodePackages."@tailwindcss/typography" ]; + # Added a shim for the `tailwindcss` CLI entry point + nativeBuildInputs = (oa.nativeBuildInputs or []) ++ [ pkgs.buildPackages.makeBinaryWrapper ]; + postInstall = (oa.postInstall or "") + '' + nodePath="" + for p in "$out" "${pkgs.nodePackages.postcss}" $plugins; do + nodePath="$nodePath''${nodePath:+:}$p/lib/node_modules" + done + makeWrapper "$out/bin/tailwindcss" "$out/bin/tailwind" --prefix NODE_PATH : "$nodePath" + unset nodePath + ''; })) super.tailwind; emanote = addBuildDepend pkgs.stork super.emanote; From 495a1f2b6af38c564fba6a82bca2cabd585f2762 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 16:21:49 +0000 Subject: [PATCH 0738/2168] python312Packages.types-s3transfer: 0.11.1 -> 0.11.2 --- pkgs/development/python-modules/types-s3transfer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-s3transfer/default.nix b/pkgs/development/python-modules/types-s3transfer/default.nix index 51f5a2d24e74..66871ab7aaf5 100644 --- a/pkgs/development/python-modules/types-s3transfer/default.nix +++ b/pkgs/development/python-modules/types-s3transfer/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "types-s3transfer"; - version = "0.11.1"; + version = "0.11.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "types_s3transfer"; inherit version; - hash = "sha256-aridTXa8v21JRYKUmWO0ZyNH6Nqjl9l5DzaEtPz4c8Q="; + hash = "sha256-PMuLkLFENK8vsNbAhQBZbZPzqD+4BKK7hD2b9PfCymA="; }; build-system = [ setuptools ]; From d40c0faa51716fb40436f9a3ecf584270e8d1457 Mon Sep 17 00:00:00 2001 From: Anton Mosich Date: Sun, 9 Feb 2025 17:22:03 +0100 Subject: [PATCH 0739/2168] khal: fix build (#380358) * khal: fix build sphinx 8.x, introduced to nixpkgs in 0708c34ad7dc59517fcb47da86c088c55c6301e9, removed a very old and long-deprecated way of defining intersphinx_mappings[1]. khal imports and defines intersphinx_mappings in that old way[2], but doesn't use intersphinx anywhere, as far as I managed to notice. So I just delete the lines containing intersphinx. There is also an upstream issue[3]. [1]: https://www.sphinx-doc.org/en/master/changes/8.0.html#incompatible-changes [2]: https://github.com/pimutils/khal/blob/a0e3fd1cd193e5d3b2eb3b81e99e0818f1f26d2a/doc/source/conf.py#L312 [3]: https://github.com/pimutils/khal/issues/1356 * khal: small refactor --- pkgs/by-name/kh/khal/package.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/kh/khal/package.nix b/pkgs/by-name/kh/khal/package.nix index b4151a9c5095..18f574d8da2a 100644 --- a/pkgs/by-name/kh/khal/package.nix +++ b/pkgs/by-name/kh/khal/package.nix @@ -16,7 +16,7 @@ let src = fetchFromGitHub { owner = "collective"; repo = "icalendar"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-2gpWfLXR4HThw23AWxY2rY9oiK6CF3Qiad8DWHCs4Qk="; }; patches = [ ]; @@ -37,10 +37,14 @@ python.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "pimutils"; repo = "khal"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-YP2kQ/qXPDwvFvlHf+A2Ymvk49dmt5tAnTaOhrOV92M="; }; + postPatch = '' + sed -i /intersphinx/d doc/source/conf.py + ''; + build-system = with python.pkgs; [ setuptools setuptools-scm @@ -111,11 +115,11 @@ python.pkgs.buildPythonApplication rec { "test_event_no_dst" ]; - meta = with lib; { + meta = { description = "CLI calendar application"; - homepage = "http://lostpackets.de/khal/"; + homepage = "https://lostpackets.de/khal/"; changelog = "https://github.com/pimutils/khal/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ gebner ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ gebner ]; }; } From e11bcdd56821d66c2d859507dd47583bcebd7fdc Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 9 Feb 2025 10:26:14 -0600 Subject: [PATCH 0740/2168] sketchybar-app-font: 2.0.30 -> 2.0.31 --- pkgs/by-name/sk/sketchybar-app-font/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sk/sketchybar-app-font/package.nix b/pkgs/by-name/sk/sketchybar-app-font/package.nix index 7d4e6df724cc..d447a2500fc2 100644 --- a/pkgs/by-name/sk/sketchybar-app-font/package.nix +++ b/pkgs/by-name/sk/sketchybar-app-font/package.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "sketchybar-app-font"; - version = "2.0.30"; + version = "2.0.31"; src = fetchFromGitHub { owner = "kvndrsslr"; repo = "sketchybar-app-font"; - rev = "v2.0.30"; - hash = "sha256-Kx7Uazrmyn7yQedqnY1YJXSY2QFe0nCEIFLFUZwS9Tk="; + rev = "v2.0.31"; + hash = "sha256-ELe6ZKdNyhHcgktZtWZlgqoHlhagliK4bXw1SH/g9HU="; }; pnpmDeps = pnpm_9.fetchDeps { From b5599da7815393e8d31dd631f351721da90348fb Mon Sep 17 00:00:00 2001 From: emaryn Date: Mon, 10 Feb 2025 00:29:21 +0800 Subject: [PATCH 0741/2168] read-it-later: 0.5.0 -> 0.6.1 --- pkgs/by-name/re/read-it-later/package.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/re/read-it-later/package.nix b/pkgs/by-name/re/read-it-later/package.nix index 2f0d2a3b3ba6..3a446859b7eb 100644 --- a/pkgs/by-name/re/read-it-later/package.nix +++ b/pkgs/by-name/re/read-it-later/package.nix @@ -20,20 +20,20 @@ stdenv.mkDerivation rec { pname = "read-it-later"; - version = "0.5.0"; + version = "0.6.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "read-it-later"; - rev = version; - hash = "sha256-A8u1fecJAsVlordgZmUJt/KZWxx6EWMhfdayKWHTTFY="; + tag = version; + hash = "sha256-ia65XGJonf/327o7L/862tOh04DOM2oXbKq86cCaVp4="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-DgqFdihMVKWMdbGEmyGH9yXkC9Ywmh7FcmFtLBCJeDc="; + hash = "sha256-mn3Jl5XEHYbCCFjLd8TBqtZKEdevH95IWKdgHwAtXk0="; }; nativeBuildInputs = [ @@ -56,13 +56,13 @@ stdenv.mkDerivation rec { sqlite ]; - meta = with lib; { + meta = { description = "Simple Wallabag client with basic features to manage articles"; homepage = "https://gitlab.gnome.org/World/read-it-later"; - changelog = "https://gitlab.gnome.org/World/read-it-later/-/releases/${src.rev}"; - license = licenses.gpl3Plus; + changelog = "https://gitlab.gnome.org/World/read-it-later/-/releases/${src.tag}"; + license = lib.licenses.gpl3Plus; mainProgram = "read-it-later"; - maintainers = with maintainers; [ aleksana ]; - platforms = platforms.unix; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.unix; }; } From 834a56b1873f47e5215f812f9302d27ac588d394 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 10 Feb 2025 02:37:46 +1000 Subject: [PATCH 0742/2168] python312Packages.drms: 0.8.0 -> 0.9.0 (#380064) https://github.com/sunpy/drms/releases/tag/v0.9.0 --- .../python-modules/drms/default.nix | 39 ++++++++++--------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/drms/default.nix b/pkgs/development/python-modules/drms/default.nix index f079e61d6579..f87f932da4eb 100644 --- a/pkgs/development/python-modules/drms/default.nix +++ b/pkgs/development/python-modules/drms/default.nix @@ -1,41 +1,43 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + + # build-system + setuptools, + setuptools-scm, + + # dependencies numpy, pandas, - six, + packaging, + astropy, - oldest-supported-numpy, pytestCheckHook, pytest-doctestplus, - pythonOlder, - setuptools-scm, - wheel, }: buildPythonPackage rec { pname = "drms"; - version = "0.8.0"; - format = "pyproject"; - disabled = pythonOlder "3.7"; + version = "0.9.0"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-LgHu7mTgiL3n2lVaOhppdWfQiM0CFkK+6z6eBkLxmKY="; + src = fetchFromGitHub { + owner = "sunpy"; + repo = "drms"; + tag = "v${version}"; + hash = "sha256-Hd65bpJCknBeRd27JlcIkzzoZv5nGR7C6oMSGPFiyjA="; }; - nativeBuildInputs = [ - numpy - oldest-supported-numpy + build-system = [ + setuptools setuptools-scm - wheel ]; - propagatedBuildInputs = [ + dependencies = [ numpy pandas - six + packaging ]; nativeCheckInputs = [ @@ -56,6 +58,7 @@ buildPythonPackage rec { meta = { description = "Access HMI, AIA and MDI data with Python"; homepage = "https://github.com/sunpy/drms"; + changelog = "https://github.com/sunpy/drms/blob/v${version}/CHANGELOG.rst"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ bot-wxt1221 ]; }; From e905ca924547f8c9f664da5a0b0f0b92b982fc71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 9 Feb 2025 17:39:30 +0100 Subject: [PATCH 0743/2168] mitmproxy: relax some dependencies to fix build --- pkgs/development/python-modules/mitmproxy/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix index 6248d2e0d47e..2e7c2bf7848b 100644 --- a/pkgs/development/python-modules/mitmproxy/default.nix +++ b/pkgs/development/python-modules/mitmproxy/default.nix @@ -60,6 +60,8 @@ buildPythonPackage rec { pythonRelaxDeps = [ "passlib" "protobuf" + "pyparsing" + "ruamel.yaml" "urwid" ]; From 11540a7bfb786b116e40455e1f128bfb375250b8 Mon Sep 17 00:00:00 2001 From: emaryn Date: Sun, 9 Feb 2025 07:27:37 +0800 Subject: [PATCH 0744/2168] wcslib: refactor --- pkgs/by-name/wc/wcslib/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/wc/wcslib/package.nix b/pkgs/by-name/wc/wcslib/package.nix index 66374aab784a..95bb428218ca 100644 --- a/pkgs/by-name/wc/wcslib/package.nix +++ b/pkgs/by-name/wc/wcslib/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${pname}-${version}.tar.bz2"; - sha256 = "sha256-lguERCbRSotTze7XgliqkojN7ZmncywGZ8ZPpqUBJtw="; + hash = "sha256-lguERCbRSotTze7XgliqkojN7ZmncywGZ8ZPpqUBJtw="; }; nativeBuildInputs = [ flex ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { "man" ]; - meta = with lib; { + meta = { homepage = "https://www.atnf.csiro.au/people/mcalabre/WCS/"; description = "World Coordinate System library for astronomy"; longDescription = '' @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { and their conversion to image coordinate systems. This is the standard library for this purpose in astronomy. ''; - maintainers = with maintainers; [ hjones2199 ]; - license = licenses.lgpl3Plus; - platforms = platforms.unix; + maintainers = with lib.maintainers; [ hjones2199 ]; + license = lib.licenses.lgpl3Plus; + platforms = lib.platforms.unix; }; } From 1cb9c4550dc2dee415980f21e276578948071ad0 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 7 Feb 2025 11:45:28 +0100 Subject: [PATCH 0745/2168] python312Packages.dask-expr: remove (now included in dask) --- .../python-modules/dask-expr/default.nix | 65 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 67 deletions(-) delete mode 100644 pkgs/development/python-modules/dask-expr/default.nix diff --git a/pkgs/development/python-modules/dask-expr/default.nix b/pkgs/development/python-modules/dask-expr/default.nix deleted file mode 100644 index c7bb6c734ee9..000000000000 --- a/pkgs/development/python-modules/dask-expr/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - - # build-system - setuptools, - versioneer, - - # dependencies - dask, - pandas, - pyarrow, - - # checks - jinja2, - pytestCheckHook, - xarray, -}: - -buildPythonPackage rec { - pname = "dask-expr"; - version = "1.1.21"; - pyproject = true; - - src = fetchFromGitHub { - owner = "dask"; - repo = "dask-expr"; - tag = "v${version}"; - hash = "sha256-t1vPlTxV5JYArg/a7CzPP13NHbstEoCgHRmd8Y9mDfA="; - }; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "versioneer[toml]==0.28" "versioneer[toml]" - ''; - - build-system = [ - setuptools - versioneer - ]; - - dependencies = [ - dask - pandas - pyarrow - ]; - - pythonImportsCheck = [ "dask_expr" ]; - - nativeCheckInputs = [ - jinja2 - pytestCheckHook - xarray - ]; - - __darwinAllowLocalNetworking = true; - - meta = { - description = "Rewrite of Dask DataFrame that includes query optimization and generally improved organization"; - homepage = "https://github.com/dask/dask-expr"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ GaetanLepage ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 434e1b6f3cd9..c87843dcb618 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -142,6 +142,7 @@ mapAliases ({ cx_Freeze = cx-freeze; # added 2023-08-02 cx_oracle = cx-oracle; # added 2024-01-03 d2to1 = throw "d2to1 is archived and no longer works with setuptools v68"; # added 2023-07-30 + dask-expr = throw "dask-expr was removed because its features are available in dask"; # added 2025-02-07 dask-xgboost = throw "dask-xgboost was removed because its features are available in xgboost"; # added 2022-05-24 dash-renderer = throw "dash-renderer has been removed since it is abandoned"; # added 2025-01-01 dateutil = python-dateutil; # added 2021-07-03 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 84f44003ad7a..5a0133d8743d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2961,8 +2961,6 @@ self: super: with self; { dask-awkward = callPackage ../development/python-modules/dask-awkward { }; - dask-expr = callPackage ../development/python-modules/dask-expr { }; - dask-gateway = callPackage ../development/python-modules/dask-gateway { }; dask-gateway-server = callPackage ../development/python-modules/dask-gateway-server { }; From 24c5862bbec741e99e5b288c7de2177e4f5ae74b Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 7 Feb 2025 11:46:55 +0100 Subject: [PATCH 0746/2168] python312Packages.dask: 2024.12.1 -> 2025.1.0 Diff: https://github.com/dask/dask/compare/refs/tags/2024.12.1...2025.1.0 Changelog: https://docs.dask.org/en/latest/changelog.html --- .../python-modules/dask/default.nix | 272 ++++++++---------- 1 file changed, 115 insertions(+), 157 deletions(-) diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 93b38b11b1f7..b37ddce56526 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, @@ -27,168 +26,127 @@ jinja2, # tests - arrow-cpp, - dask-expr, hypothesis, pytest-asyncio, + pytest-mock, pytest-rerunfailures, pytest-xdist, pytestCheckHook, + versionCheckHook, }: -let - self = buildPythonPackage rec { - pname = "dask"; - version = "2024.12.1"; - pyproject = true; +buildPythonPackage rec { + pname = "dask"; + version = "2025.1.0"; + pyproject = true; - src = fetchFromGitHub { - owner = "dask"; - repo = "dask"; - tag = version; - hash = "sha256-QqvdldAHW2UYt1NXfk3Aa+oe97e+OpRbF8d6eKV3OJ4="; - }; - - build-system = [ setuptools ]; - - dependencies = [ - click - cloudpickle - fsspec - packaging - partd - pyyaml - importlib-metadata - toolz - ]; - - optional-dependencies = lib.fix (self: { - array = [ numpy ]; - complete = - [ - pyarrow - lz4 - ] - ++ self.array - ++ self.dataframe - ++ self.distributed - ++ self.diagnostics; - dataframe = [ - # dask-expr -> circular dependency with dask-expr - numpy - pandas - ]; - distributed = [ distributed ]; - diagnostics = [ - bokeh - jinja2 - ]; - }); - - nativeCheckInputs = - [ - dask-expr - pytestCheckHook - pytest-rerunfailures - pytest-xdist - # from panda[test] - hypothesis - pytest-asyncio - ] - ++ self.optional-dependencies.array - ++ self.optional-dependencies.dataframe - ++ lib.optionals (!arrow-cpp.meta.broken) [ - # support is sparse on aarch64 - pyarrow - ]; - - dontUseSetuptoolsCheck = true; - - postPatch = '' - # versioneer hack to set version of GitHub package - echo "def get_versions(): return {'dirty': False, 'error': None, 'full-revisionid': None, 'version': '${version}'}" > dask/_version.py - - substituteInPlace setup.py \ - --replace-fail "import versioneer" "" \ - --replace-fail "version=versioneer.get_version()," "version='${version}'," \ - --replace-fail "cmdclass=versioneer.get_cmdclass()," "" - - substituteInPlace pyproject.toml \ - --replace-fail ', "versioneer[toml]==0.29"' "" \ - --replace-fail " --durations=10" "" \ - --replace-fail " --cov-config=pyproject.toml" "" \ - --replace-fail "\"-v" "\" " - ''; - - pytestFlagsArray = [ - # Rerun failed tests up to three times - "--reruns 3" - # Don't run tests that require network access - "-m 'not network'" - ]; - - disabledTests = - lib.optionals stdenv.hostPlatform.isDarwin [ - # Test requires features of python3Packages.psutil that are - # blocked in sandboxed-builds - "test_auto_blocksize_csv" - # AttributeError: 'str' object has no attribute 'decode' - "test_read_dir_nometa" - ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ - # concurrent.futures.process.BrokenProcessPool: A process in the process pool terminated abpruptly... - "test_foldby_tree_reduction" - "test_to_bag" - ] - ++ [ - # https://github.com/dask/dask/issues/10347#issuecomment-1589683941 - "test_concat_categorical" - # AttributeError: 'ArrowStringArray' object has no attribute 'tobytes'. Did you mean: 'nbytes'? - "test_dot" - "test_dot_nan" - "test_merge_column_with_nulls" - # FileNotFoundError: [Errno 2] No such file or directory: '/build/tmp301jryv_/createme/0.part' - "test_to_csv_nodir" - "test_to_json_results" - # FutureWarning: Those tests should be working fine when pandas will have been upgraded to 2.1.1 - "test_apply" - "test_apply_infer_columns" - ]; - - __darwinAllowLocalNetworking = true; - - pythonImportsCheck = [ - "dask" - "dask.bag" - "dask.bytes" - "dask.diagnostics" - ]; - - doCheck = false; - - # Enable tests via passthru to avoid cyclic dependency with dask-expr. - passthru.tests = { - check = self.overridePythonAttrs (old: { - doCheck = true; - pythonImportsCheck = [ - # Requires the `dask.optional-dependencies.array` that are only in `nativeCheckInputs` - "dask.array" - # Requires the `dask.optional-dependencies.dataframe` that are only in `nativeCheckInputs` - "dask.dataframe" - "dask.dataframe.io" - "dask.dataframe.tseries" - ] ++ old.pythonImportsCheck; - }); - }; - - meta = { - description = "Minimal task scheduling abstraction"; - mainProgram = "dask"; - homepage = "https://dask.org/"; - changelog = "https://docs.dask.org/en/latest/changelog.html"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ GaetanLepage ]; - }; + src = fetchFromGitHub { + owner = "dask"; + repo = "dask"; + tag = version; + hash = "sha256-KBqOyf471mNg3L9dYmR7IRSltEtC+VgC+6ptsoKgVmM="; }; -in -self + + postPatch = '' + # versioneer hack to set version of GitHub package + echo "def get_versions(): return {'dirty': False, 'error': None, 'full-revisionid': None, 'version': '${version}'}" > dask/_version.py + + substituteInPlace setup.py \ + --replace-fail "import versioneer" "" \ + --replace-fail "version=versioneer.get_version()," "version='${version}'," \ + --replace-fail "cmdclass=versioneer.get_cmdclass()," "" + + substituteInPlace pyproject.toml \ + --replace-fail ', "versioneer[toml]==0.29"' "" \ + --replace-fail " --durations=10" "" \ + --replace-fail " --cov-config=pyproject.toml" "" \ + --replace-fail "\"-v" "\" " + ''; + + build-system = [ setuptools ]; + + dependencies = [ + click + cloudpickle + fsspec + packaging + partd + pyyaml + importlib-metadata + toolz + ]; + + optional-dependencies = lib.fix (self: { + array = [ numpy ]; + complete = + [ + pyarrow + lz4 + ] + ++ self.array + ++ self.dataframe + ++ self.distributed + ++ self.diagnostics; + dataframe = [ + pandas + pyarrow + ] ++ self.array; + distributed = [ distributed ]; + diagnostics = [ + bokeh + jinja2 + ]; + }); + + nativeCheckInputs = + [ + hypothesis + pytest-asyncio + pytest-mock + pytest-rerunfailures + pytest-xdist + pytestCheckHook + versionCheckHook + pyarrow + ] + ++ optional-dependencies.array + ++ optional-dependencies.dataframe; + versionCheckProgramArg = [ "--version" ]; + + pytestFlagsArray = [ + # Rerun failed tests up to three times + "--reruns 3" + # Don't run tests that require network access + "-m 'not network'" + ]; + + disabledTests = [ + # UserWarning: Insufficient elements for `head`. 10 elements requested, only 5 elements available. Try passing larger `npartitions` to `head`. + "test_set_index_head_nlargest_string" + ]; + + __darwinAllowLocalNetworking = true; + + pythonImportsCheck = [ + "dask" + "dask.bag" + "dask.bytes" + "dask.diagnostics" + + # Requires the `dask.optional-dependencies.array` that are only in `nativeCheckInputs` + "dask.array" + # Requires the `dask.optional-dependencies.dataframe` that are only in `nativeCheckInputs` + "dask.dataframe" + "dask.dataframe.io" + "dask.dataframe.tseries" + ]; + + meta = { + description = "Minimal task scheduling abstraction"; + mainProgram = "dask"; + homepage = "https://dask.org/"; + changelog = "https://docs.dask.org/en/latest/changelog.html"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} From 43ef67841e9ccc78e7b9d9684b741f9b9c4cab77 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 7 Feb 2025 12:41:10 +0100 Subject: [PATCH 0747/2168] python312Packages.streamz: cleanup --- .../python-modules/streamz/default.nix | 58 ++++++++----------- 1 file changed, 24 insertions(+), 34 deletions(-) diff --git a/pkgs/development/python-modules/streamz/default.nix b/pkgs/development/python-modules/streamz/default.nix index eea52b8fa8f2..4a4e8855d22a 100644 --- a/pkgs/development/python-modules/streamz/default.nix +++ b/pkgs/development/python-modules/streamz/default.nix @@ -1,23 +1,24 @@ { lib, buildPythonPackage, - pythonOlder, - fetchPypi, + fetchFromGitHub, + + # build-system setuptools, - confluent-kafka, - dask, - dask-expr, - distributed, - flaky, - graphviz, - networkx, - pytest-asyncio, - pytestCheckHook, - requests, + + # dependencies six, toolz, tornado, zict, + + # tests + dask, + distributed, + flaky, + pandas, + pyarrow, + pytestCheckHook, }: buildPythonPackage rec { @@ -25,17 +26,16 @@ buildPythonPackage rec { version = "0.6.4"; pyproject = true; - disabled = pythonOlder "3.6"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-VXfWkEwuxInBQVQJV3IQXgGVRkiBmYfUZCBMbjyWNPM="; + src = fetchFromGitHub { + owner = "python-streamz"; + repo = "streamz"; + tag = version; + hash = "sha256-lSb3gl+TSIzz4BZzxH8zXu74HvzSntOAoVQUUJKIEvA="; }; build-system = [ setuptools ]; dependencies = [ - networkx six toolz tornado @@ -43,15 +43,12 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - confluent-kafka dask - dask-expr distributed flaky - graphviz - pytest-asyncio + pandas + pyarrow pytestCheckHook - requests ]; pythonImportsCheck = [ "streamz" ]; @@ -63,24 +60,17 @@ buildPythonPackage rec { "test_partition_then_scatter_sync" "test_sync" "test_sync_2" - # Test fail in the sandbox - "test_tcp_async" - "test_tcp" - "test_partition_timeout" + # Tests are flaky - "test_from_iterable" "test_buffer" ]; - disabledTestPaths = [ - # Disable kafka tests - "streamz/tests/test_kafka.py" - ]; + __darwinAllowLocalNetworking = true; - meta = with lib; { + meta = { description = "Pipelines to manage continuous streams of data"; homepage = "https://github.com/python-streamz/streamz"; - license = licenses.bsd3; + license = lib.licenses.bsd3; maintainers = [ ]; }; } From 57778e074c29671facff76729fad59aa3b3af92e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 7 Feb 2025 12:41:38 +0100 Subject: [PATCH 0748/2168] python312Packages.streamz: add GaetanLepage as maintainer --- pkgs/development/python-modules/streamz/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/streamz/default.nix b/pkgs/development/python-modules/streamz/default.nix index 4a4e8855d22a..5aab96e7c462 100644 --- a/pkgs/development/python-modules/streamz/default.nix +++ b/pkgs/development/python-modules/streamz/default.nix @@ -71,6 +71,6 @@ buildPythonPackage rec { description = "Pipelines to manage continuous streams of data"; homepage = "https://github.com/python-streamz/streamz"; license = lib.licenses.bsd3; - maintainers = [ ]; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } From b6cc264c8a30a2d9171732946301d58a7674ac13 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 7 Feb 2025 14:29:01 +0100 Subject: [PATCH 0749/2168] python312Packages.narwhals: 1.22.0 -> 1.25.2 Diff: https://github.com/narwhals-dev/narwhals/compare/refs/tags/v1.22.0...v1.25.2 Changelog: https://github.com/narwhals-dev/narwhals/releases/tag/v1.25.2 --- .../python-modules/narwhals/default.nix | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/narwhals/default.nix b/pkgs/development/python-modules/narwhals/default.nix index 5aa36f62364c..f96998a32908 100644 --- a/pkgs/development/python-modules/narwhals/default.nix +++ b/pkgs/development/python-modules/narwhals/default.nix @@ -1,34 +1,36 @@ { lib, buildPythonPackage, + fetchFromGitHub, + + # build-system + hatchling, + + # optional-dependencies # cudf, dask, - dask-expr, - duckdb, - fetchFromGitHub, - hatchling, - hypothesis, # modin, pandas, polars, pyarrow, + + # tests + duckdb, + hypothesis, pytest-env, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { pname = "narwhals"; - version = "1.22.0"; + version = "1.25.2"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "narwhals-dev"; repo = "narwhals"; tag = "v${version}"; - hash = "sha256-I6nJJiiW1v04YH70OPxXKeO80N52nnCPKRzJLILEWmw="; + hash = "sha256-cp/Ang5RXLpgTdpOHRKz9fGN9D+SgFC5KhF3ukf8G+w="; }; build-system = [ @@ -39,7 +41,6 @@ buildPythonPackage rec { # cudf = [ cudf ]; dask = [ dask - dask-expr ]; # modin = [ modin ]; pandas = [ pandas ]; @@ -64,7 +65,7 @@ buildPythonPackage rec { meta = { description = "Lightweight and extensible compatibility layer between dataframe libraries"; homepage = "https://github.com/narwhals-dev/narwhals"; - changelog = "https://github.com/narwhals-dev/narwhals/releases/tag/${src.tag}"; + changelog = "https://github.com/narwhals-dev/narwhals/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; From f1309365070057256fdd32bc63ece36278ec3b5d Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 7 Feb 2025 14:37:28 +0100 Subject: [PATCH 0750/2168] python312Packages.dask-glm: add GaetanLepage as maintainer --- pkgs/development/python-modules/dask-glm/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/dask-glm/default.nix b/pkgs/development/python-modules/dask-glm/default.nix index a4bead52b43b..7fbb0359e2ca 100644 --- a/pkgs/development/python-modules/dask-glm/default.nix +++ b/pkgs/development/python-modules/dask-glm/default.nix @@ -63,5 +63,6 @@ buildPythonPackage rec { homepage = "https://github.com/dask/dask-glm/"; license = licenses.bsd3; maintainers = [ ]; + maintainers = with maintainers; [ GaetanLepage ]; }; } From 8e0c34c2824abbd1fbf9360b535980fbf02fe8bf Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 7 Feb 2025 14:38:52 +0100 Subject: [PATCH 0751/2168] python312Packages.dask-glm: fix build --- .../python-modules/dask-glm/default.nix | 59 ++++++++++--------- 1 file changed, 32 insertions(+), 27 deletions(-) diff --git a/pkgs/development/python-modules/dask-glm/default.nix b/pkgs/development/python-modules/dask-glm/default.nix index 7fbb0359e2ca..97cfa6100313 100644 --- a/pkgs/development/python-modules/dask-glm/default.nix +++ b/pkgs/development/python-modules/dask-glm/default.nix @@ -1,34 +1,46 @@ { lib, buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools-scm, + + # dependencies cloudpickle, - dask, distributed, - fetchPypi, multipledispatch, - pytestCheckHook, - pythonOlder, scikit-learn, scipy, - setuptools-scm, sparse, + dask, + + # tests + pytest-xdist, + pytestCheckHook, }: buildPythonPackage rec { pname = "dask-glm"; version = "0.3.2"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-yUelZoZmmKAdeZeK5zIzy16DitXq1ghRQ1gsXpMLmko="; + src = fetchFromGitHub { + owner = "dask"; + repo = "dask-glm"; + tag = version; + hash = "sha256-q98QMmw1toashimS16of54cgZgIPqkua3xGD1FZ1nTc="; }; - nativeBuildInputs = [ setuptools-scm ]; + # ValueError: The truth value of an empty array is ambiguous. Use `array.size > 0` to check that an array is not empty. + postPatch = '' + substituteInPlace dask_glm/utils.py \ + --replace-fail "if arr:" "if (arr is not None) and (arr.size > 0):" + ''; - propagatedBuildInputs = [ + build-system = [ setuptools-scm ]; + + dependencies = [ cloudpickle distributed multipledispatch @@ -38,31 +50,24 @@ buildPythonPackage rec { ] ++ dask.optional-dependencies.array; nativeCheckInputs = [ - sparse + pytest-xdist pytestCheckHook ]; pythonImportsCheck = [ "dask_glm" ]; - disabledTestPaths = [ - # Circular dependency with dask-ml - "dask_glm/tests/test_estimators.py" - # Test tries to imort an obsolete method - "dask_glm/tests/test_utils.py" - ]; - disabledTests = [ - # missing fixture with distributed>=2022.8.0 - "test_determinism_distributed" + # ValueError: can be computed for one-element arrays only. + "test_dot_with_sparse" ]; __darwinAllowLocalNetworking = true; - meta = with lib; { + meta = { description = "Generalized Linear Models with Dask"; homepage = "https://github.com/dask/dask-glm/"; - license = licenses.bsd3; - maintainers = [ ]; - maintainers = with maintainers; [ GaetanLepage ]; + changelog = "https://github.com/dask/dask-glm/releases/tag/${version}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } From 1d52622529ec21840a1684142bd320a0f8d7203e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 7 Feb 2025 15:12:52 +0100 Subject: [PATCH 0752/2168] python312Packages.sparse: add GaetanLepage as maintainer --- pkgs/development/python-modules/sparse/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/sparse/default.nix b/pkgs/development/python-modules/sparse/default.nix index c09040d2beaa..215b826b477d 100644 --- a/pkgs/development/python-modules/sparse/default.nix +++ b/pkgs/development/python-modules/sparse/default.nix @@ -59,5 +59,6 @@ buildPythonPackage rec { downloadPage = "https://github.com/pydata/sparse/releases/tag/${version}"; license = licenses.bsd3; maintainers = [ ]; + maintainers = with maintainers; [ GaetanLepage ]; }; } From f4fd33f95e10a48d18374114444e9b5467e1da47 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 7 Feb 2025 15:13:02 +0100 Subject: [PATCH 0753/2168] python312Packages.sparse: cleanup & mark as broken on aarch64-linux --- .../python-modules/sparse/default.nix | 53 ++++++++++--------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/pkgs/development/python-modules/sparse/default.nix b/pkgs/development/python-modules/sparse/default.nix index 215b826b477d..81e567f46ec4 100644 --- a/pkgs/development/python-modules/sparse/default.nix +++ b/pkgs/development/python-modules/sparse/default.nix @@ -1,15 +1,21 @@ { lib, buildPythonPackage, - dask, - fetchPypi, - numba, - numpy, - pytest7CheckHook, - pythonOlder, + fetchFromGitHub, + + # build-system setuptools, setuptools-scm, + + # dependencies + numba, + numpy, scipy, + + # tests + dask, + pytest-cov-stub, + pytestCheckHook, }: buildPythonPackage rec { @@ -17,18 +23,13 @@ buildPythonPackage rec { version = "0.15.5"; pyproject = true; - disabled = pythonOlder "3.8"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-THbODJb1zVwxt+eeZQ8AIkJMKxbwXxAEnpxjge5L4mY="; + src = fetchFromGitHub { + owner = "pydata"; + repo = "sparse"; + tag = version; + hash = "sha256-W4rcq7G/bQsT9oTLieOzWNst5LnIAelRMbm+uUPeQgs="; }; - postPatch = '' - substituteInPlace pytest.ini \ - --replace-fail "--cov-report term-missing --cov-report html --cov-report=xml --cov-report=term --cov sparse --cov-config .coveragerc --junitxml=junit/test-results.xml" "" - ''; - build-system = [ setuptools setuptools-scm @@ -42,23 +43,23 @@ buildPythonPackage rec { nativeCheckInputs = [ dask - pytest7CheckHook + pytest-cov-stub + pytestCheckHook ]; pythonImportsCheck = [ "sparse" ]; - pytestFlagsArray = [ - "-W" - "ignore::pytest.PytestRemovedIn8Warning" - ]; - - meta = with lib; { + meta = { description = "Sparse n-dimensional arrays computations"; homepage = "https://sparse.pydata.org/"; changelog = "https://sparse.pydata.org/en/stable/changelog.html"; downloadPage = "https://github.com/pydata/sparse/releases/tag/${version}"; - license = licenses.bsd3; - maintainers = [ ]; - maintainers = with maintainers; [ GaetanLepage ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ GaetanLepage ]; + badPlatforms = [ + # Most tests fail with: Fatal Python error: Segmentation fault + # numba/typed/typedlist.py", line 344 in append + "aarch64-linux" + ]; }; } From e6ea345642291962533b3fbccb27dd63ace175c9 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 7 Feb 2025 16:27:40 +0100 Subject: [PATCH 0754/2168] python312Packages.devito: fix build --- .../python-modules/devito/default.nix | 28 +++++++++++++------ 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/devito/default.nix b/pkgs/development/python-modules/devito/default.nix index 4c9ee562011f..a69ae736a22a 100644 --- a/pkgs/development/python-modules/devito/default.nix +++ b/pkgs/development/python-modules/devito/default.nix @@ -1,27 +1,32 @@ { lib, stdenv, - anytree, buildPythonPackage, + fetchFromGitHub, + + # build-system setuptools, + + # dependencies + anytree, cached-property, cgen, click, codepy, distributed, - fetchFromGitHub, - gcc, llvmPackages, - matplotlib, multidict, nbval, psutil, py-cpuinfo, - pytest-xdist, - pytestCheckHook, - pythonOlder, scipy, sympy, + + # tests + gcc, + matplotlib, + pytest-xdist, + pytestCheckHook, }: buildPythonPackage rec { @@ -29,8 +34,6 @@ buildPythonPackage rec { version = "4.8.11"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "devitocodes"; repo = "devito"; @@ -42,6 +45,9 @@ buildPythonPackage rec { postPatch = '' substituteInPlace requirements-testing.txt \ --replace-fail 'pooch; python_version >= "3.8"' "pooch" + + substituteInPlace tests/test_builtins.py \ + --replace-fail "from scipy.misc import ascent" "from scipy.datasets import ascent" ''; pythonRemoveDeps = [ "pip" ]; @@ -99,6 +105,10 @@ buildPythonPackage rec { "test_stability_mpi" "test_subdomainset_mpi" "test_subdomains_mpi" + + # Download dataset from the internet + "test_gs_2d_float" + "test_gs_2d_int" ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # FAILED tests/test_unexpansion.py::Test2Pass::test_v0 - assert False From d506ad7f5c0fadd3994c2895ebb68ed4aba61856 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 7 Feb 2025 17:59:30 +0100 Subject: [PATCH 0755/2168] python312Packages.catboost: mark as broken --- pkgs/development/python-modules/catboost/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/catboost/default.nix b/pkgs/development/python-modules/catboost/default.nix index d0fc77b70038..86c1211aead0 100644 --- a/pkgs/development/python-modules/catboost/default.nix +++ b/pkgs/development/python-modules/catboost/default.nix @@ -22,8 +22,8 @@ buildPythonPackage rec { pname version src - meta ; + pyproject = true; sourceRoot = "${src.name}/catboost/python-package"; @@ -55,4 +55,9 @@ buildPythonPackage rec { doCheck = false; pythonImportsCheck = [ "catboost" ]; + + meta = catboost.meta // { + # Incompatible with numpy >= 2.0 + broken = true; + }; } From cdbaefe74329ed3587d686720e5de04919306292 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 8 Feb 2025 11:49:04 +0100 Subject: [PATCH 0756/2168] python312Packages.dask-ml: 2024.4.4 -> 2025.1.0 Diff: https://github.com/dask/dask-ml/compare/refs/tags/v2024.4.4...v2025.1.0 --- .../python-modules/dask-ml/default.nix | 46 ++++--------------- 1 file changed, 9 insertions(+), 37 deletions(-) diff --git a/pkgs/development/python-modules/dask-ml/default.nix b/pkgs/development/python-modules/dask-ml/default.nix index e3949fde678b..f30adb7ff246 100644 --- a/pkgs/development/python-modules/dask-ml/default.nix +++ b/pkgs/development/python-modules/dask-ml/default.nix @@ -3,14 +3,13 @@ stdenv, buildPythonPackage, fetchFromGitHub, + fetchpatch, # build-system hatch-vcs, hatchling, - setuptools-scm, # dependencies - dask-expr, dask-glm, distributed, multipledispatch, @@ -29,25 +28,23 @@ buildPythonPackage rec { pname = "dask-ml"; - version = "2024.4.4"; + version = "2025.1.0"; pyproject = true; src = fetchFromGitHub { owner = "dask"; repo = "dask-ml"; tag = "v${version}"; - hash = "sha256-ZiBpCk3b4Tk0Hwb4uapJLEx+Nb/qHFROCnkBTNGDzoU="; + hash = "sha256-DHxx0LFuJmGWYuG/WGHj+a5XHAEekBmlHUUb90rl2IY="; }; build-system = [ hatch-vcs hatchling - setuptools-scm ]; dependencies = [ - dask-expr dask-glm distributed multipledispatch @@ -73,39 +70,14 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTestPaths = - [ - # AttributeError: 'csr_matrix' object has no attribute 'A' - # Fixed in https://github.com/dask/dask-ml/pull/996 - "tests/test_svd.py" - - # Tests fail with dask>=0.11.2 - # RuntimeError: Not enough arguments provided - # Reported in https://github.com/dask/dask-ml/issues/1003 - "tests/model_selection/test_incremental.py" - ] - ++ lib.optionals stdenv.isDarwin [ - # RuntimeError: Not enough arguments provided: missing keys - "tests/model_selection/test_hyperband.py" - "tests/model_selection/test_incremental.py" - "tests/model_selection/test_incremental_warns.py" - "tests/model_selection/test_successive_halving.py" - ]; + disabledTestPaths = [ + # AttributeError: module 'numpy' has no attribute 'product' + "tests/test_svd.py" + ]; disabledTests = [ - # Flaky: `Arrays are not almost equal to 3 decimals` (although values do actually match) - "test_whitening" - - # Tests fail with dask>=0.11.2 - # RuntimeError: Not enough arguments provided - # Reported in https://github.com/dask/dask-ml/issues/1003 - "test_basic" - "test_hyperband_patience" - "test_same_random_state_same_params" - "test_search_patience_infeasible_tol" - "test_sha_max_iter_and_metadata" - "test_warns_decay_rate" - "test_warns_decay_rate_wanted" + # AssertionError: Regex pattern did not match. + "test_unknown_category_transform_array" ]; __darwinAllowLocalNetworking = true; From 64249c9b7d2d80d7983a1efc382b3a53b6a9ae6b Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 8 Feb 2025 21:52:02 +0100 Subject: [PATCH 0757/2168] python312Packages.dask-histogram: 2024.12.1 -> 2025.2.0 Diff: https://github.com/dask-contrib/dask-histogram/compare/refs/tags/2024.12.1...2025.2.0 Changelog: https://github.com/dask-contrib/dask-histogram/releases/tag/2025.2.0 --- .../development/python-modules/dask-histogram/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dask-histogram/default.nix b/pkgs/development/python-modules/dask-histogram/default.nix index fc6af4c39c6b..98692269069d 100644 --- a/pkgs/development/python-modules/dask-histogram/default.nix +++ b/pkgs/development/python-modules/dask-histogram/default.nix @@ -10,6 +10,7 @@ # dependencies boost-histogram, dask, + dask-awkward, # tests pytestCheckHook, @@ -17,14 +18,14 @@ buildPythonPackage rec { pname = "dask-histogram"; - version = "2024.12.1"; + version = "2025.2.0"; pyproject = true; src = fetchFromGitHub { owner = "dask-contrib"; repo = "dask-histogram"; tag = version; - hash = "sha256-chznfEsMFuIioIlTz6uNpVAkjMMoMXjS62R4luKxVZQ="; + hash = "sha256-5Ec/qzVc/7LDG6SJym1e76BbxmbVjKKQHckwtTs1+6M="; }; build-system = [ @@ -35,6 +36,7 @@ buildPythonPackage rec { dependencies = [ boost-histogram dask + dask-awkward ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -44,7 +46,7 @@ buildPythonPackage rec { meta = { description = "Histograms with task scheduling"; homepage = "https://dask-histogram.readthedocs.io/"; - changelog = "https://github.com/dask-contrib/dask-histogram/releases/tag/${src.tag}"; + changelog = "https://github.com/dask-contrib/dask-histogram/releases/tag/${version}"; license = with lib.licenses; [ bsd3 ]; maintainers = with lib.maintainers; [ veprbl ]; }; From cb32a8ad1cba105da078243a973927f194e4f821 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 8 Feb 2025 21:54:54 +0100 Subject: [PATCH 0758/2168] python312Packages.dask-awkward: 2024.12.2 -> 2025.2.0 Diff: https://github.com/dask-contrib/dask-awkward/compare/refs/tags/2024.12.2...2025.2.0 Changelog: https://github.com/dask-contrib/dask-awkward/releases/tag/2025.2.0 --- .../python-modules/dask-awkward/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/dask-awkward/default.nix b/pkgs/development/python-modules/dask-awkward/default.nix index a0d8b63fe06a..8031a140ffbf 100644 --- a/pkgs/development/python-modules/dask-awkward/default.nix +++ b/pkgs/development/python-modules/dask-awkward/default.nix @@ -16,7 +16,7 @@ # optional-dependencies pyarrow, - # checks + # tests dask-histogram, distributed, hist, @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "dask-awkward"; - version = "2024.12.2"; + version = "2025.2.0"; pyproject = true; src = fetchFromGitHub { owner = "dask-contrib"; repo = "dask-awkward"; tag = version; - hash = "sha256-pL1LDW/q78V/c3Bha38k40018MFO+i8X6htYNdcsy7s="; + hash = "sha256-hhAY2cPUOYnP86FGsLvxlMeoEwY+sTrjPMKyuZrO0/M="; }; build-system = [ @@ -53,8 +53,8 @@ buildPythonPackage rec { io = [ pyarrow ]; }; - checkInputs = [ - dask-histogram + nativeCheckInputs = [ + # dask-histogram (circular dependency) distributed hist pandas @@ -86,7 +86,7 @@ buildPythonPackage rec { meta = { description = "Native Dask collection for awkward arrays, and the library to use it"; homepage = "https://github.com/dask-contrib/dask-awkward"; - changelog = "https://github.com/dask-contrib/dask-awkward/releases/tag/${src.tag}"; + changelog = "https://github.com/dask-contrib/dask-awkward/releases/tag/${version}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ veprbl ]; }; From 3af88eb4248b0a96e82a307ab0104e45a5d01d82 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 8 Feb 2025 21:59:59 +0100 Subject: [PATCH 0759/2168] python312Packages.awkward-cpp: 43 -> 44 --- pkgs/development/python-modules/awkward-cpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awkward-cpp/default.nix b/pkgs/development/python-modules/awkward-cpp/default.nix index 0063cd3f851f..ce96b50ca49b 100644 --- a/pkgs/development/python-modules/awkward-cpp/default.nix +++ b/pkgs/development/python-modules/awkward-cpp/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "awkward-cpp"; - version = "43"; + version = "44"; pyproject = true; src = fetchPypi { pname = "awkward_cpp"; inherit version; - hash = "sha256-we11WW7IKvZm2ghLW/gF2bcsg1MtA10rZeB5WQXSXq0="; + hash = "sha256-jcSZKI1tFrLqILUaJ9UEflGiR7aqz8vLOzAsrW08h9g="; }; build-system = [ From 5de8457c08fdaf5ba12e2d1bab418c5c6c5f5114 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 8 Feb 2025 21:58:04 +0100 Subject: [PATCH 0760/2168] python312Packages.awkward: 2.7.2 -> 2.7.4 Diff: https://github.com/scikit-hep/awkward/compare/refs/tags/v2.7.2...v2.7.4 Changelog: https://github.com/scikit-hep/awkward/releases/tag/v2.7.4 --- .../python-modules/awkward/default.nix | 51 +++++++++++-------- 1 file changed, 31 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index 8722a72cf635..6124a408e605 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -1,7 +1,7 @@ { lib, + stdenv, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -13,29 +13,27 @@ fsspec, numpy, packaging, - typing-extensions, - importlib-metadata, - # checks + # tests numba, - setuptools, numexpr, pandas, pyarrow, pytest-xdist, pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "awkward"; - version = "2.7.2"; + version = "2.7.4"; pyproject = true; src = fetchFromGitHub { owner = "scikit-hep"; repo = "awkward"; tag = "v${version}"; - hash = "sha256-nOKMwAQ5t8tc64bEKz0j8JxxoVQQu39Iu8Zr9cqSx7A="; + hash = "sha256-OXSl+8sfrx+JlLu40wHf+98WVNNwm9uxvsnGXRDztDg="; }; build-system = [ @@ -43,15 +41,12 @@ buildPythonPackage rec { hatchling ]; - dependencies = - [ - awkward-cpp - fsspec - numpy - packaging - ] - ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ] - ++ lib.optionals (pythonOlder "3.12") [ importlib-metadata ]; + dependencies = [ + awkward-cpp + fsspec + numpy + packaging + ]; dontUseCmakeConfigure = true; @@ -60,19 +55,35 @@ buildPythonPackage rec { nativeCheckInputs = [ fsspec numba - setuptools numexpr pandas pyarrow pytest-xdist pytestCheckHook + setuptools ]; - disabledTestPaths = [ - # Need to be run on a GPU platform. - "tests-cuda" + disabledTests = [ + # pyarrow.lib.ArrowInvalid + "test_recordarray" ]; + disabledTestPaths = + [ + # Need to be run on a GPU platform. + "tests-cuda" + ] + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ + # Fatal Python error: Segmentation fault at: + # numba/typed/typedlist.py", line 344 in append + "tests/test_0118_numba_cpointers.py" + "tests/test_0397_arrays_as_constants_in_numba.py" + "tests/test_1677_array_builder_in_numba.py" + "tests/test_2055_array_builder_check.py" + "tests/test_2349_growablebuffer_in_numba.py" + "tests/test_2408_layoutbuilder_in_numba.py" + ]; + meta = { description = "Manipulate JSON-like data with NumPy-like idioms"; homepage = "https://github.com/scikit-hep/awkward"; From 8d23cded07fe77e45db1ada00ff3a3bbda2b51ae Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 8 Feb 2025 22:08:22 +0100 Subject: [PATCH 0761/2168] python312Packages.mplhep: 0.3.55 -> 0.3.56 Diff: https://github.com/scikit-hep/mplhep/compare/refs/tags/v0.3.55...v0.3.56 --- .../python-modules/mplhep/default.nix | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/mplhep/default.nix b/pkgs/development/python-modules/mplhep/default.nix index 604eea8a8489..a5c167aa603f 100644 --- a/pkgs/development/python-modules/mplhep/default.nix +++ b/pkgs/development/python-modules/mplhep/default.nix @@ -2,36 +2,42 @@ lib, buildPythonPackage, fetchFromGitHub, - setuptools, - setuptools-scm, + + # build-system + hatch-vcs, + hatchling, + + # dependencies matplotlib, mplhep-data, numpy, packaging, uhi, + + # tests + hist, + pytest-mock, + pytest-mpl, pytestCheckHook, scipy, - pytest-mpl, - pytest-mock, uproot, - hist, }: buildPythonPackage rec { pname = "mplhep"; - version = "0.3.55"; + version = "0.3.56"; pyproject = true; src = fetchFromGitHub { owner = "scikit-hep"; repo = "mplhep"; tag = "v${version}"; - hash = "sha256-7YkrrH9Bfn3ctjv+H6TXEDE8yS/wnjO7umuHIXeYTDU="; + hash = "sha256-sMJpJUEtIqmu7kCgZp43t9XLy/6nkDgKcxC4nFb+1po="; }; build-system = [ - setuptools - setuptools-scm + hatch-vcs + hatchling ]; dependencies = [ @@ -43,12 +49,12 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + hist + pytest-mock + pytest-mpl pytestCheckHook scipy - pytest-mpl - pytest-mock uproot - hist ]; disabledTests = [ @@ -62,6 +68,7 @@ buildPythonPackage rec { meta = { description = "Extended histogram plots on top of matplotlib and HEP compatible styling similar to current collaboration requirements (ROOT)"; homepage = "https://github.com/scikit-hep/mplhep"; + changelog = "https://github.com/scikit-hep/mplhep/releases/tag/v${version}"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ veprbl ]; }; From 5b73ca5a0c6930c157c36983ed4fd54bc90fd5f7 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 8 Feb 2025 22:15:52 +0100 Subject: [PATCH 0762/2168] python312Packages.coffea: fix build --- pkgs/development/python-modules/coffea/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/coffea/default.nix b/pkgs/development/python-modules/coffea/default.nix index 5e61b17c5c2d..0710ca0f5dba 100644 --- a/pkgs/development/python-modules/coffea/default.nix +++ b/pkgs/development/python-modules/coffea/default.nix @@ -57,6 +57,10 @@ buildPythonPackage rec { hatch-vcs ]; + pythonRelaxDeps = [ + "dask" + ]; + dependencies = [ aiohttp awkward @@ -106,6 +110,10 @@ buildPythonPackage rec { # AssertionError: bug in Awkward Array: attempt to convert TypeTracerArray into a concrete array "test_apply_to_fileset" "test_lorentz_behavior" + + # ValueError: The array to mask was deleted before it could be masked. + # If you want to construct this mask, you must either keep the array alive or use 'ak.mask' explicitly. + "test_read_nanomc" ]; __darwinAllowLocalNetworking = true; From ff787004396499583498584e78d705f1f820b592 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 9 Feb 2025 12:28:47 +0100 Subject: [PATCH 0763/2168] python312Packages.dask-image: fix build --- .../python-modules/dask-image/default.nix | 27 ++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dask-image/default.nix b/pkgs/development/python-modules/dask-image/default.nix index a297902bc684..599e99853ad8 100644 --- a/pkgs/development/python-modules/dask-image/default.nix +++ b/pkgs/development/python-modules/dask-image/default.nix @@ -1,15 +1,21 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, + + # build-system setuptools, setuptools-scm, + + # dependencies dask, numpy, scipy, pandas, pims, + + # tests + pyarrow, pytestCheckHook, scikit-image, }: @@ -19,8 +25,6 @@ buildPythonPackage rec { version = "2024.5.3"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "dask"; repo = "dask-image"; @@ -28,6 +32,11 @@ buildPythonPackage rec { hash = "sha256-kXCAqJ2Zgo/2Khvo2YcK+n4oGM219GyQ2Hsq9re1Lac="; }; + postPatch = '' + substituteInPlace dask_image/ndinterp/__init__.py \ + --replace-fail "out_bounds.ptp(axis=1)" "np.ptp(out_bounds, axis=1)" + ''; + build-system = [ setuptools setuptools-scm @@ -42,15 +51,27 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pyarrow pytestCheckHook scikit-image ]; pythonImportsCheck = [ "dask_image" ]; + disabledTests = [ + # The following tests are from 'tests/test_dask_image/test_ndmeasure/test_find_objects.py' and + # fail because of errrors on numpy slices + # AttributeError: 'str' object has no attribute 'start' + "test_find_objects" + "test_3d_find_objects" + # AssertionError (comparing slices) + "test_find_objects_with_empty_chunks" + ]; + meta = { description = "Distributed image processing"; homepage = "https://github.com/dask/dask-image"; + changelog = "https://github.com/dask/dask-image/releases/tag/v${version}"; license = lib.licenses.bsdOriginal; maintainers = with lib.maintainers; [ GaetanLepage ]; }; From fa75931857641e8417749c0be12164a180478bbb Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 9 Feb 2025 17:29:03 +0100 Subject: [PATCH 0764/2168] pylyzer: 0.0.78 -> 0.0.79 Diff: https://github.com/mtshiba/pylyzer/compare/refs/tags/v0.0.78...v0.0.79 Changelog: https://github.com/mtshiba/pylyzer/releases/tag/v0.0.79 --- pkgs/by-name/py/pylyzer/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/py/pylyzer/package.nix b/pkgs/by-name/py/pylyzer/package.nix index 2d877f671de6..024a33dcb3e1 100644 --- a/pkgs/by-name/py/pylyzer/package.nix +++ b/pkgs/by-name/py/pylyzer/package.nix @@ -14,17 +14,17 @@ rustPlatform.buildRustPackage rec { pname = "pylyzer"; - version = "0.0.78"; + version = "0.0.79"; src = fetchFromGitHub { owner = "mtshiba"; repo = "pylyzer"; tag = "v${version}"; - hash = "sha256-g8/zhl0dCQOq4aTlivAh3ufgfEMzeMvTtJQxFuHHWB0="; + hash = "sha256-CCQluzwB2NAOKE11kQ60FMgIqfGsjgxeHwgJO9WF4Kw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-mi4pCYA0dQnv3MIpZxVVY0qLdIts/qvxS4og0Tyxk3w="; + cargoHash = "sha256-6QqQpABNuy+Dd5EL/E6BXG7+TWXnZ9Tjzu57iSfXvSA="; nativeBuildInputs = [ gitMinimal From 0a07262b0f60dd0a1b87474610eba4b6306918a9 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 24 Jan 2025 11:27:49 +0100 Subject: [PATCH 0765/2168] lomiri.lomiri-music-app: init at 3.2.2 --- .../applications/lomiri-music-app/default.nix | 122 ++++++++++++++++++ pkgs/desktops/lomiri/default.nix | 1 + 2 files changed, 123 insertions(+) create mode 100644 pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix diff --git a/pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix new file mode 100644 index 000000000000..23551fc2dc93 --- /dev/null +++ b/pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix @@ -0,0 +1,122 @@ +{ + stdenv, + lib, + fetchFromGitLab, + fetchpatch, + gitUpdater, + cmake, + gettext, + gst_all_1, + libusermetrics, + lomiri-content-hub, + lomiri-thumbnailer, + lomiri-ui-toolkit, + qtbase, + qtdeclarative, + qtmultimedia, + qtsystems, + wrapGAppsHook3, + wrapQtAppsHook, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "lomiri-music-app"; + version = "3.2.2"; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/apps/lomiri-music-app"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-tHCbZF+7i/gYs8WqM5jDBhhKmM4ZeUbG3DYBdQAiUT8="; + }; + + patches = [ + # Remove when version > 3.2.2 + (fetchpatch { + name = "0001-lomiri-music-app-Fix-GNUInstallDirs-usage.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-music-app/-/commit/32591f2332aa204b9ee2857992e50594db0e6ff2.patch"; + hash = "sha256-SXn+7jItzi1Q0xK0iK57+W3SpEdSCx1dKSfeghOCePg="; + }) + + # Remove when version > 3.2.2 + (fetchpatch { + name = "0002-lomiri-music-app-bindtextdomain.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-music-app/-/commit/4e950521a67e201f3d02b3b71c6bb1ddce8ef2b2.patch"; + hash = "sha256-HgGKk44FU+IXRVx2NK3iGSo/wPJce1T2k/vP8nZtewQ="; + }) + ]; + + postPatch = '' + # We don't want absolute paths in desktop files + substituteInPlace CMakeLists.txt \ + --replace-fail 'ICON ''${DATA_DIR}/''${ICON_FILE}' 'ICON lomiri-music-app' \ + --replace-fail 'SPLASH ''${DATA_DIR}/''${SPLASH_FILE}' 'SPLASH lomiri-app-launch/splash/lomiri-music-app.svg' + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + gettext + wrapGAppsHook3 + wrapQtAppsHook + ]; + + buildInputs = + [ + qtbase + qtdeclarative + + # QML + libusermetrics + lomiri-content-hub + lomiri-thumbnailer + lomiri-ui-toolkit + qtmultimedia + qtsystems + ] + # QtMultimedia playback support + ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad + ]); + + dontWrapGApps = true; + + cmakeFlags = [ + (lib.cmakeBool "CLICK_MODE" false) + (lib.cmakeBool "INSTALL_TESTS" false) + ]; + + # Only autopilot tests + doCheck = false; + + postInstall = '' + mkdir -p $out/share/{icons/hicolor/scalable/apps,lomiri-app-launch/splash} + + ln -s $out/share/{lomiri-music-app/app/graphics/music-app.svg,icons/hicolor/scalable/apps/lomiri-music-app.svg} + ln -s $out/share/{lomiri-music-app/app/graphics/music-app-splash.svg,lomiri-app-launch/splash/lomiri-music-app.svg} + ''; + + preFixup = '' + qtWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + passthru = { + updateScript = gitUpdater { }; + }; + + meta = { + description = "Default Music application for Ubuntu devices"; + homepage = "https://gitlab.com/ubports/development/apps/lomiri-music-app"; + changelog = "https://gitlab.com/ubports/development/apps/lomiri-music-app/-/blob/v${finalAttrs.version}/ChangeLog"; + license = with lib.licenses; [ + gpl3Only + ]; + mainProgram = "lomiri-music-app"; + maintainers = lib.teams.lomiri.members; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix index bd26af310969..483eacaeb58a 100644 --- a/pkgs/desktops/lomiri/default.nix +++ b/pkgs/desktops/lomiri/default.nix @@ -21,6 +21,7 @@ let lomiri-filemanager-app = callPackage ./applications/lomiri-filemanager-app { }; lomiri-gallery-app = callPackage ./applications/lomiri-gallery-app { }; lomiri-mediaplayer-app = callPackage ./applications/lomiri-mediaplayer-app { }; + lomiri-music-app = callPackage ./applications/lomiri-music-app { }; lomiri-system-settings-unwrapped = callPackage ./applications/lomiri-system-settings { }; lomiri-system-settings = callPackage ./applications/lomiri-system-settings/wrapper.nix { }; lomiri-terminal-app = callPackage ./applications/lomiri-terminal-app { }; From bc7133b8764d3ec0f4e34043bfcbbaff74149420 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 15 Dec 2024 14:37:22 +0100 Subject: [PATCH 0766/2168] nixos/lomiri: Fix mediascanner2 service --- .../services/desktop-managers/lomiri.nix | 63 ++++++++++++------- 1 file changed, 40 insertions(+), 23 deletions(-) diff --git a/nixos/modules/services/desktop-managers/lomiri.nix b/nixos/modules/services/desktop-managers/lomiri.nix index 8f04e33291ac..5c5cca1bc330 100644 --- a/nixos/modules/services/desktop-managers/lomiri.nix +++ b/nixos/modules/services/desktop-managers/lomiri.nix @@ -198,37 +198,54 @@ in "/share/sounds" ]; - systemd.user.services = { - # Unconditionally run service that collects system-installed URL handlers before LUD - # TODO also run user-installed one? - "lomiri-url-dispatcher-update-system-dir" = { - description = "Lomiri URL dispatcher system directory updater"; - wantedBy = [ "lomiri-url-dispatcher.service" ]; - before = [ "lomiri-url-dispatcher.service" ]; - serviceConfig = { - Type = "oneshot"; - ExecStart = "${pkgs.lomiri.lomiri-url-dispatcher}/libexec/lomiri-url-dispatcher/lomiri-update-directory /run/current-system/sw/share/lomiri-url-dispatcher/urls/"; - }; - }; - - "lomiri-polkit-agent" = rec { - description = "Lomiri Polkit agent"; - wantedBy = [ + systemd.user.services = + let + lomiriServiceNames = [ "lomiri.service" "lomiri-full-greeter.service" "lomiri-full-shell.service" "lomiri-greeter.service" "lomiri-shell.service" ]; - after = [ "graphical-session.target" ]; - partOf = wantedBy; - serviceConfig = { - Type = "simple"; - Restart = "always"; - ExecStart = "${pkgs.lomiri.lomiri-polkit-agent}/libexec/lomiri-polkit-agent/policykit-agent"; + in + { + # Unconditionally run service that collects system-installed URL handlers before LUD + # TODO also run user-installed one? + "lomiri-url-dispatcher-update-system-dir" = { + description = "Lomiri URL dispatcher system directory updater"; + wantedBy = [ "lomiri-url-dispatcher.service" ]; + before = [ "lomiri-url-dispatcher.service" ]; + serviceConfig = { + Type = "oneshot"; + ExecStart = "${pkgs.lomiri.lomiri-url-dispatcher}/libexec/lomiri-url-dispatcher/lomiri-update-directory /run/current-system/sw/share/lomiri-url-dispatcher/urls/"; + }; + }; + + "lomiri-polkit-agent" = { + description = "Lomiri Polkit agent"; + wantedBy = lomiriServiceNames; + after = [ "graphical-session.target" ]; + partOf = lomiriServiceNames; + serviceConfig = { + Type = "simple"; + Restart = "always"; + ExecStart = "${pkgs.lomiri.lomiri-polkit-agent}/libexec/lomiri-polkit-agent/policykit-agent"; + }; + }; + + "mediascanner-2.0" = { + description = "Media Scanner"; + wantedBy = lomiriServiceNames; + before = lomiriServiceNames; + partOf = lomiriServiceNames; + serviceConfig = { + Type = "dbus"; + BusName = "com.lomiri.MediaScanner2.Daemon"; + Restart = "on-failure"; + ExecStart = "${lib.getExe pkgs.lomiri.mediascanner2}"; + }; }; }; - }; systemd.services = { "dbus-com.lomiri.UserMetrics" = { From 6fd46df8a62f13d174ab39a86ee3f05383216fd8 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 15 Dec 2024 14:37:52 +0100 Subject: [PATCH 0767/2168] nixos/lomiri: Add music app --- nixos/modules/services/desktop-managers/lomiri.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/desktop-managers/lomiri.nix b/nixos/modules/services/desktop-managers/lomiri.nix index 5c5cca1bc330..638c1ef9bfcc 100644 --- a/nixos/modules/services/desktop-managers/lomiri.nix +++ b/nixos/modules/services/desktop-managers/lomiri.nix @@ -95,6 +95,7 @@ in lomiri-gallery-app lomiri-history-service lomiri-mediaplayer-app + lomiri-music-app lomiri-polkit-agent lomiri-schemas # exposes some required dbus interfaces lomiri-session # wrappers to properly launch the session From 4b3bdd486aac8dd3494dd4ff8736fcf7f6e56e12 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Mon, 16 Dec 2024 22:50:04 +0100 Subject: [PATCH 0768/2168] lomiri.lomiri-session: Force xdg-user-dirs-update to be run mediascanner2 expects xdg-user-dirs to be set up properly, otherwise its g_get_user_special_dir() calls fail. Lomiri, by itself, doesn't seem to ensure this by default, so hack in a call of this. --- pkgs/desktops/lomiri/data/lomiri-session/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/desktops/lomiri/data/lomiri-session/default.nix b/pkgs/desktops/lomiri/data/lomiri-session/default.nix index 960fb2794c84..fdc7b90ad875 100644 --- a/pkgs/desktops/lomiri/data/lomiri-session/default.nix +++ b/pkgs/desktops/lomiri/data/lomiri-session/default.nix @@ -13,6 +13,7 @@ makeWrapper, pkg-config, systemd, + xdg-user-dirs, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -34,6 +35,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { substituteInPlace systemd/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})' + + # Inject a call to xdg-user-dirs-update, so when mediascanner2 launches, it can actually scan for files + substituteInPlace desktop/dm-lomiri-session.in \ + --replace-fail '@CMAKE_INSTALL_FULL_LIBEXECDIR@/lomiri-session/run-systemd-session' '${lib.getExe' xdg-user-dirs "xdg-user-dirs-update"} && @CMAKE_INSTALL_FULL_LIBEXECDIR@/lomiri-session/run-systemd-session' ''; nativeBuildInputs = [ From c4c8c1181fdab6ece6f74dfeccf6f65a3a95d829 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 9 Feb 2025 15:39:44 +0100 Subject: [PATCH 0769/2168] nixosTests.lomiri-music-app: init --- nixos/tests/all-tests.nix | 1 + nixos/tests/lomiri-music-app.nix | 193 ++++++++++++++++++ .../applications/lomiri-music-app/default.nix | 2 + .../services/lomiri-thumbnailer/default.nix | 6 +- .../lomiri/services/mediascanner2/default.nix | 8 +- 5 files changed, 208 insertions(+), 2 deletions(-) create mode 100644 nixos/tests/lomiri-music-app.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index cb7f599eb6ea..24d6e0725f2a 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -569,6 +569,7 @@ in { lomiri-docviewer-app = runTest ./lomiri-docviewer-app.nix; lomiri-filemanager-app = runTest ./lomiri-filemanager-app.nix; lomiri-mediaplayer-app = runTest ./lomiri-mediaplayer-app.nix; + lomiri-music-app = runTest ./lomiri-music-app.nix; lomiri-gallery-app = runTest ./lomiri-gallery-app.nix; lomiri-system-settings = handleTest ./lomiri-system-settings.nix {}; lorri = handleTest ./lorri/default.nix {}; diff --git a/nixos/tests/lomiri-music-app.nix b/nixos/tests/lomiri-music-app.nix new file mode 100644 index 000000000000..93a3889c9127 --- /dev/null +++ b/nixos/tests/lomiri-music-app.nix @@ -0,0 +1,193 @@ +{ lib, ... }: +let + ocrContent = "Music Test"; + musicFile = "test.mp3"; + + ocrPauseColor = "#FF00FF"; + ocrStartColor = "#00FFFF"; +in +{ + name = "lomiri-music-app-standalone"; + meta = { + maintainers = lib.teams.lomiri.members; + # This needs a Linux VM + platforms = lib.platforms.linux; + }; + + nodes.machine = + { config, pkgs, ... }: + { + imports = [ + ./common/auto.nix + ./common/user-account.nix + ./common/x11.nix + ]; + + services.xserver.enable = true; + + environment = { + # Setup video + etc."${musicFile}".source = + pkgs.runCommand musicFile + { + nativeBuildInputs = with pkgs; [ + ffmpeg # produce music + (imagemagick.override { ghostscriptSupport = true; }) # produce OCR-able cover image + ]; + } + '' + magick -size 400x400 canvas:white -pointsize 40 -fill black -annotate +100+100 '${ocrContent}' output.png + ffmpeg -re \ + -f lavfi -i anullsrc=channel_layout=mono:sample_rate=44100 \ + -i output.png \ + -map 0:0 -map 1:0 \ + -id3v2_version 3 \ + -metadata:s:v title="Album cover" \ + -metadata:s:v comment="Cover (front)" \ + -t 120 \ + $out -loglevel fatal + ''; + + systemPackages = + with pkgs; + [ + xdg-user-dirs # generate XDG dirs + xdotool # mouse movement + ] + ++ (with pkgs.lomiri; [ + mediascanner2 + lomiri-music-app + lomiri-thumbnailer + # To check if playback actually works, or is broken due to missing codecs, we need to make the app's icons more OCR-able + (lib.meta.hiPrio ( + suru-icon-theme.overrideAttrs (oa: { + # Colour the background in special colours, which we can OCR for + postPatch = + (oa.postPatch or "") + + '' + substituteInPlace suru/actions/scalable/media-playback-pause.svg \ + --replace-fail 'fill:none' 'fill:${ocrPauseColor}' + + substituteInPlace suru/actions/scalable/media-playback-start.svg \ + --replace-fail 'fill:none' 'fill:${ocrStartColor}' + ''; + }) + )) + ]); + + variables = { + UITK_ICON_THEME = "suru"; + }; + }; + + # Get mediascanner-2.0.service + services.desktopManager.lomiri.enable = lib.mkForce true; + + # ...but stick with icewm + services.displayManager.defaultSession = lib.mkForce "none+icewm"; + + systemd.tmpfiles.settings = { + "10-lomiri-music-app-test-setup" = { + "/root/Music".d = { + mode = "0755"; + user = "root"; + group = "root"; + }; + "/root/Music/${musicFile}"."C+".argument = "/etc/${musicFile}"; + }; + }; + + i18n.supportedLocales = [ "all" ]; + }; + + enableOCR = true; + + testScript = '' + from collections.abc import Callable + import tempfile + import subprocess + + pauseColor: str = "${ocrPauseColor}" + startColor: str = "${ocrStartColor}" + + # Based on terminal-emulators.nix' check_for_pink + def check_for_color(color: str) -> Callable[[bool], bool]: + def check_for_color_retry(final=False) -> bool: + with tempfile.NamedTemporaryFile() as tmpin: + machine.send_monitor_command("screendump {}".format(tmpin.name)) + + cmd = 'convert {} -define histogram:unique-colors=true -format "%c" histogram:info:'.format( + tmpin.name + ) + ret = subprocess.run(cmd, shell=True, capture_output=True) + if ret.returncode != 0: + raise Exception( + "image analysis failed with exit code {}".format(ret.returncode) + ) + + text = ret.stdout.decode("utf-8") + return color in text + + return check_for_color_retry + + machine.wait_for_x() + + # mediascanner2 needs XDG dirs to exist + machine.succeed("xdg-user-dirs-update") + + # mediascanner2 needs to have run, is only started automatically by Lomiri + machine.systemctl("start mediascanner-2.0.service", "root") + + with subtest("lomiri music launches"): + machine.succeed("lomiri-music-app >&2 &") + machine.wait_for_text("favorite music") + machine.send_key("alt-f10") + machine.screenshot("lomiri-music") + + with subtest("lomiri music plays music"): + machine.succeed("xdotool mousemove 30 720 click 1") # Skip intro + machine.wait_for_text("Albums") + machine.succeed("xdotool mousemove 25 45 click 1") # Open categories + machine.wait_for_text("Tracks") + machine.succeed("xdotool mousemove 25 240 click 1") # Switch to Tracks category + machine.wait_for_text("test") # the test file + machine.screenshot("lomiri-music_listing") + + # Ensure pause colours isn't present already + assert ( + check_for_color(pauseColor)(True) == False + ), "pauseColor {} was present on the screen before we selected anything!".format(pauseColor) + + machine.succeed("xdotool mousemove 25 120 click 1") # Select the track + + # Waiting for pause icon to be displayed + with machine.nested("Waiting for the screen to have pauseColor {} on it:".format(pauseColor)): + retry(check_for_color(pauseColor)) + + machine.screenshot("lomiri-music_playback") + + # Ensure play colours isn't present already + assert ( + check_for_color(startColor)(True) == False + ), "startColor {} was present on the screen before we were expecting it to be!".format(startColor) + + machine.succeed("xdotool mousemove 860 480 click 1") # Pause track (only works if app can actually decode the file) + + # Waiting for play icon to be displayed + with machine.nested("Waiting for the screen to have startColor {} on it:".format(startColor)): + retry(check_for_color(startColor)) + + machine.screenshot("lomiri-music_paused") + + # Lastly, check if generated cover image got extracted properly + # if not, indicates an issue with mediascanner / lomiri-thumbnailer + machine.wait_for_text("${ocrContent}") + + machine.succeed("pkill -f lomiri-music-app") + + with subtest("lomiri music localisation works"): + machine.succeed("env LANG=de_DE.UTF-8 lomiri-music-app .mp4 >&2 &") + machine.wait_for_text("Titel") + machine.screenshot("lomiri-music_localised") + ''; +} diff --git a/pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix index 23551fc2dc93..f3688b33d9e3 100644 --- a/pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix @@ -4,6 +4,7 @@ fetchFromGitLab, fetchpatch, gitUpdater, + nixosTests, cmake, gettext, gst_all_1, @@ -105,6 +106,7 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { + tests.vm = nixosTests.lomiri-music-app; updateScript = gitUpdater { }; }; diff --git a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix index 925f5592c34d..a9cb0b7da1d9 100644 --- a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix @@ -176,7 +176,11 @@ stdenv.mkDerivation (finalAttrs: { passthru = { tests = { # gallery app delegates to thumbnailer, tests various formats - vm = nixosTests.lomiri-gallery-app; + gallery-app = nixosTests.lomiri-gallery-app; + + # music app relies on thumbnailer to extract embedded cover art + music-app = nixosTests.lomiri-music-app; + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; updateScript = gitUpdater { }; diff --git a/pkgs/desktops/lomiri/services/mediascanner2/default.nix b/pkgs/desktops/lomiri/services/mediascanner2/default.nix index 0401e42ca78a..a6dafcc45fd1 100644 --- a/pkgs/desktops/lomiri/services/mediascanner2/default.nix +++ b/pkgs/desktops/lomiri/services/mediascanner2/default.nix @@ -3,6 +3,7 @@ lib, fetchFromGitLab, gitUpdater, + nixosTests, testers, # dbus-cpp not compatible with Boost 1.87 # https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/issues/8 @@ -101,7 +102,12 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + tests = { + # music app needs mediascanner to work properly, so it can find files + music-app = nixosTests.lomiri-music-app; + + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; updateScript = gitUpdater { }; }; From fe7d0cd8a81956527332e09cdd0cecee4cf63b1f Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 9 Feb 2025 17:45:30 +0100 Subject: [PATCH 0770/2168] lomiri.mediascanner2: Apply patch for desktop-independance --- pkgs/desktops/lomiri/services/mediascanner2/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/desktops/lomiri/services/mediascanner2/default.nix b/pkgs/desktops/lomiri/services/mediascanner2/default.nix index a6dafcc45fd1..86172e2774c6 100644 --- a/pkgs/desktops/lomiri/services/mediascanner2/default.nix +++ b/pkgs/desktops/lomiri/services/mediascanner2/default.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitLab, + fetchpatch, gitUpdater, nixosTests, testers, @@ -45,6 +46,14 @@ stdenv.mkDerivation (finalAttrs: { "dev" ]; + patches = [ + (fetchpatch { + name = "0001-mediascanner2-scannerdaemon-Drop-desktop-and-MEDIASCANNER_RUN-check.patch"; + url = "https://gitlab.com/ubports/development/core/mediascanner2/-/commit/1e65b32e32a0536b9e2f283ba563fa78b6ef6d61.patch"; + hash = "sha256-Xhm5+/E/pP+mn+4enqdsor1oRqfYTzabg1ODVfIhra4="; + }) + ]; + postPatch = '' substituteInPlace src/qml/MediaScanner.*/CMakeLists.txt \ --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" From 105b640ae11406c5b6b01552d531e9c64ec8867e Mon Sep 17 00:00:00 2001 From: Ludovico Piero Date: Mon, 10 Feb 2025 01:58:47 +0900 Subject: [PATCH 0771/2168] wleave: 0.4.1 -> 0.5.1 Full Changelog: https://github.com/AMNatty/wleave/compare/0.4.1...0.5.1 Signed-off-by: Ludovico Piero --- pkgs/by-name/wl/wleave/package.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/wl/wleave/package.nix b/pkgs/by-name/wl/wleave/package.nix index d83e8b399757..9ba22db2ae39 100644 --- a/pkgs/by-name/wl/wleave/package.nix +++ b/pkgs/by-name/wl/wleave/package.nix @@ -5,25 +5,25 @@ at-spi2-atk, pkg-config, glib, - gtk3, - gtk-layer-shell, + gtk4, + gtk4-layer-shell, installShellFiles, scdoc, }: rustPlatform.buildRustPackage rec { pname = "wleave"; - version = "0.4.1"; + version = "0.5.1"; src = fetchFromGitHub { owner = "AMNatty"; repo = "wleave"; rev = version; - hash = "sha256-PkEj0RlSxhxG9qOJkuMTVj6r0lxsm7V8b1AIaCVaXCQ="; + hash = "sha256-xl0JOepQDvYdeTv0LFYzp8QdufKXkayJcHklLBjupeA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-HDlL/tRc60kLW2qoa/TYKe11RbpX0CCmkPiKa7BRK80="; + cargoHash = "sha256-csnArsVk/Ifhi3aO3bSG0mkSA81KACxR/xC1L8JJfmc="; nativeBuildInputs = [ pkg-config @@ -33,8 +33,8 @@ rustPlatform.buildRustPackage rec { buildInputs = [ at-spi2-atk - gtk3 - gtk-layer-shell + gtk4 + gtk4-layer-shell glib ]; @@ -63,7 +63,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - description = "Wayland-native logout script written in GTK3"; + description = "Wayland-native logout script written in GTK4"; homepage = "https://github.com/AMNatty/wleave"; license = licenses.mit; mainProgram = "wleave"; From 4bfefba805262cfb2517764de5106865fb3bc3fa Mon Sep 17 00:00:00 2001 From: Ludovico Piero Date: Mon, 10 Feb 2025 02:00:37 +0900 Subject: [PATCH 0772/2168] wleave: format with nixfmt Signed-off-by: Ludovico Piero --- pkgs/by-name/wl/wleave/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/wl/wleave/package.nix b/pkgs/by-name/wl/wleave/package.nix index 9ba22db2ae39..f29345c0afca 100644 --- a/pkgs/by-name/wl/wleave/package.nix +++ b/pkgs/by-name/wl/wleave/package.nix @@ -10,7 +10,6 @@ installShellFiles, scdoc, }: - rustPlatform.buildRustPackage rec { pname = "wleave"; version = "0.5.1"; From e5deb5d8cb430d2cf1a648e2e4e545cf2c9f4f29 Mon Sep 17 00:00:00 2001 From: Anton Mosich Date: Sun, 9 Feb 2025 18:17:16 +0100 Subject: [PATCH 0773/2168] pimsync: 0.1.0 -> 0.2.0 (#380387) pimsync now tries to create a version string using git-describe[1], but only if there isn't an environment variable PIMSYNC_VERSION. That is then used instead. Also, makeFlags in fact don't change the behavior of buildRustPackage as far as I know. Up until now man pages were neither generated nor installed. [1]: https://git.sr.ht/~whynothugo/pimsync/commit/4df1e23799ab71cf9fb214f608a6612775baf910 --- pkgs/by-name/pi/pimsync/package.nix | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/pi/pimsync/package.nix b/pkgs/by-name/pi/pimsync/package.nix index 2f5f3a6fc543..34cb166d8fda 100644 --- a/pkgs/by-name/pi/pimsync/package.nix +++ b/pkgs/by-name/pi/pimsync/package.nix @@ -5,37 +5,47 @@ pkg-config, sqlite, scdoc, + installShellFiles, makeWrapper, + nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "pimsync"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromSourcehut { owner = "~whynothugo"; repo = "pimsync"; rev = "v${version}"; - hash = "sha256-upOCrpbveSSFrhdHDkTOmja4MLmsgtuoDHMsgXyulWI="; + hash = "sha256-mNOKAnBpCo4LFn7l16UG7V3cCJkUhRxhB/0jwoPLttM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-i9t/6z1UJFppv3y7anB+df+UldGP2TynYKKIUAZff5Y="; + cargoHash = "sha256-2Uj+dDtuykQx1tBSGN3AE3Bz904bHfkbhKN3VIeG40M="; + + PIMSYNC_VERSION = version; nativeBuildInputs = [ pkg-config scdoc makeWrapper + installShellFiles ]; buildInputs = [ sqlite ]; - makeFlags = [ - "build" - "PREFIX=${placeholder "out"}" - ]; + postBuild = '' + make man + ''; + + postInstall = '' + installManPage target/pimsync.1 target/pimsync.conf.5 target/pimsync-migration.7 + ''; + + passthru.updateScript = nix-update-script { }; meta = { description = "Synchronise calendars and contacts"; From 502580e21a61275e54c0d19e0e6d69bf1e20effd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Feb 2025 18:22:10 +0000 Subject: [PATCH 0774/2168] python312Packages.databricks-sdk: 0.41.0 -> 0.43.0 Diff: https://github.com/databricks/databricks-sdk-py/compare/v0.41.0...v0.43.0 Changelog: https://github.com/databricks/databricks-sdk-py/blob/v0.43.0/CHANGELOG.md --- pkgs/development/python-modules/databricks-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/databricks-sdk/default.nix b/pkgs/development/python-modules/databricks-sdk/default.nix index 3e544760d2fd..63c6b8e74a78 100644 --- a/pkgs/development/python-modules/databricks-sdk/default.nix +++ b/pkgs/development/python-modules/databricks-sdk/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "databricks-sdk"; - version = "0.41.0"; + version = "0.43.0"; pyproject = true; src = fetchFromGitHub { owner = "databricks"; repo = "databricks-sdk-py"; tag = "v${version}"; - hash = "sha256-mKytUMPipee/sg5VWBTfCg0sZwNg69pI+Uuqu1EhNIc="; + hash = "sha256-UdGkHstRelFxlJ5zIm5PeFM7p0JQCPWD2zVS2XOlVq4="; }; build-system = [ From 2c1b82a882a7ad2bd097d20f381353ebf43da30a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 8 Feb 2025 13:52:54 +0100 Subject: [PATCH 0775/2168] n8n: fix build with noBrokenSymlinks --- pkgs/by-name/n8/n8n/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix index a58b42c53cd1..2b2ffc2aeec3 100644 --- a/pkgs/by-name/n8/n8n/package.nix +++ b/pkgs/by-name/n8/n8n/package.nix @@ -73,6 +73,9 @@ stdenv.mkDerivation (finalAttrs: { pnpm --ignore-scripts prune --prod find -type f \( -name "*.ts" -o -name "*.map" \) -exec rm -rf {} + rm -rf node_modules/.pnpm/{typescript*,prettier*} + shopt -s globstar + # https://github.com/pnpm/pnpm/issues/3645 + find node_modules packages/**/node_modules -xtype l -delete echo "Removed non-deterministic and unnecessary files" ''; From 0a7ac24b2bd3fcc9b18118ce72dcf7abe115dbce Mon Sep 17 00:00:00 2001 From: genga Date: Sun, 9 Feb 2025 19:54:21 +0300 Subject: [PATCH 0776/2168] flow-editor: 0.2.1 > 0.3.2 flow-editor: add update script flow-editor: update script flow-editor: add passthru updateScript --- pkgs/by-name/fl/flow-editor/build.zig.zon.nix | 44 +++++++++++-------- pkgs/by-name/fl/flow-editor/package.nix | 6 ++- pkgs/by-name/fl/flow-editor/update.sh | 19 ++++++++ 3 files changed, 49 insertions(+), 20 deletions(-) create mode 100755 pkgs/by-name/fl/flow-editor/update.sh diff --git a/pkgs/by-name/fl/flow-editor/build.zig.zon.nix b/pkgs/by-name/fl/flow-editor/build.zig.zon.nix index e7adff45a777..f48f86c91bd9 100644 --- a/pkgs/by-name/fl/flow-editor/build.zig.zon.nix +++ b/pkgs/by-name/fl/flow-editor/build.zig.zon.nix @@ -97,19 +97,19 @@ linkFarm name [ }; } { - name = "1220a2c8f8db1b5265458ac967ea1f7cc0a8ddcd1d774df3b73d86c4f529aadbfb94"; + name = "1220d0fb2bff7b453dbb39d1db3eb472b6680e2564f2b23b0e947671be47bbdd188f"; path = fetchZigArtifact { name = "tracy"; - url = "https://github.com/neurocyte/zig-tracy/archive/58999b786089e5319dd0707f6afbfca04c6340e7.tar.gz"; - hash = "sha256-4q1UD2hRtp9mUPL5wIKzk8AhnAoVkl9xpaUN5sp4mWA="; + url = "https://github.com/neurocyte/zig-tracy/archive/e04e31c64498149a324491b8534758e6af43a5c2.tar.gz"; + hash = "sha256-otvs9tKc8zMRFng0VJDn5iNf7lvbozjrtH0q8IFnP0w="; }; } { - name = "12202aac930cebaf2b57f443cacc2483478580a72f1316b4f0a720ddd91246fce69d"; + name = "122051b30656170b4628580e571d98b1fe45d7c0d581bc2d45e894c75c6376294ede"; path = fetchZigArtifact { name = "tracy_src"; - url = "https://github.com/wolfpld/tracy/archive/refs/tags/v0.10.tar.gz"; - hash = "sha256-p2AX2Sjz8nJ1QPuVDt07c2yql7Etu05e3OZlQsvqZgA="; + url = "https://github.com/neurocyte/tracy/archive/0ff0a1b324f497cf313a445637b7df25aabefb47.tar.gz"; + hash = "sha256-dzMilJsOSdjNyvhyDb1v5dPWcR5uvhnQmsBynAJH74I="; }; } { @@ -121,11 +121,11 @@ linkFarm name [ }; } { - name = "1220f6fdc977fff899aaf624afc8cf01e29a0e100dbb52860902a3bc256f4ddd687b"; + name = "1220bbfd147f41fa49d2e5406096f3529c62e9335f4d2a89ae381e679a76ce398f1f"; path = fetchZigArtifact { name = "thespian"; - url = "https://github.com/neurocyte/thespian/archive/9df7beb192dd0db647e55fe44272b77ca687f6cd.tar.gz"; - hash = "sha256-b8PPqmiURT9bOaa2ubz/v0J2WEyRmtL6iL4nBDkvgeQ="; + url = "https://github.com/neurocyte/thespian/archive/db3ad5f45e707a04eaa51aa657995abe43ce967a.tar.gz"; + hash = "sha256-La5pv08xPAnkNxBHjpTmLpKxrcifRFWcqm8NYp92iRA="; }; } { @@ -137,11 +137,11 @@ linkFarm name [ }; } { - name = "1220b2109e0aadf85e4ac5e1cd084e321fe50f1e59cea690c022a7a8f7eb6021eadb"; + name = "1220e4f3baf09dc23e48616f7dbf00bd45c3034faa2eddede7bb45ef4c23a19b962b"; path = fetchZigArtifact { name = "themes"; - url = "https://github.com/neurocyte/flow-themes/releases/download/master-0c2a187c604c63031225847a966b6ca279b2be91/flow-themes.tar.gz"; - hash = "sha256-8zumZneeSPVrpw2wAQwKoEOXCLYqkKQFVXQ8oum08Hw="; + url = "https://github.com/neurocyte/flow-themes/releases/download/master-8b79cf6d79373c142393ec26a81b19f4701f4372/flow-themes.tar.gz"; + hash = "sha256-xy0cTVc85U6JpI+oca2XKXE7GAs0EId21DeQCDa8+n0="; }; } { @@ -153,11 +153,11 @@ linkFarm name [ }; } { - name = "12202ee9842d28927674e552f1ea41e2c41e59f6b4b5d290de9b6fd626fd332ac627"; + name = "12207e33747072d878fce61f587c133124dc95f4ae8aab7d2b3f467699586af07c77"; path = fetchZigArtifact { name = "vaxis"; - url = "https://github.com/neurocyte/libvaxis/archive/ffe35b4342bd2913efd46c35c0ccd15544ac87e6.tar.gz"; - hash = "sha256-AQpYS1WnHLzcUMhD8BaCd+Dh+nqY5umL6KCBTuVlSQw="; + url = "https://github.com/neurocyte/libvaxis/archive/d899244bc0a3775b59c18e90eb41acee11675f96.tar.gz"; + hash = "sha256-8bK0zM6rD/mqTaHDZKMgS3+qV1VviImM9jr9D0lkPdw="; }; } { @@ -185,11 +185,19 @@ linkFarm name [ }; } { - name = "12204c99c6093230023380068f386f7eb32ab83df9a8eb8b586ffe5aa44afa34ff0e"; + name = "1220925614447b54ccc9894bbba8b202c6a8b750267890edab7732064867e46f3217"; + path = fetchZigArtifact { + name = "win32"; + url = "https://github.com/marlersoft/zigwin32/archive/259b6f353a48968d7e3171573db4fd898b046188.tar.gz"; + hash = "sha256-N9Jp2vmq1+xPWByb+VZkbS2lm9FCrUW4UBAPhSP+dUw="; + }; + } + { + name = "1220f9702ca6257f5464b31e576b1e92b0f441bf0e61733c4a2fbf95b7c0c55a3e22"; path = fetchZigArtifact { name = "tree-sitter"; - url = "https://github.com/neurocyte/tree-sitter/releases/download/master-aea6072c6178d5cd0c97fff33e130f632f355bc2/source.tar.gz"; - hash = "sha256-eqJc3lx+tnbiqcD8R0u4+sH7wKOr4McYiZNUfPTNbRc="; + url = "https://github.com/neurocyte/tree-sitter/releases/download/master-69775ce3ba8a5e331bba9feb760d1ba31394eea7/source.tar.gz"; + hash = "sha256-0ZLcPuhUV6Z3EsXfU7gXRrG/nRP9zuLRSL00Q5OGnus="; }; } ] diff --git a/pkgs/by-name/fl/flow-editor/package.nix b/pkgs/by-name/fl/flow-editor/package.nix index 358ed66f4103..a5631a0bd4be 100644 --- a/pkgs/by-name/fl/flow-editor/package.nix +++ b/pkgs/by-name/fl/flow-editor/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "flow"; - version = "0.2.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "neurocyte"; repo = "flow"; tag = "v${finalAttrs.version}"; - hash = "sha256-dXWqxV66BwtjOvmreq4+u5+xBI+1v1PAep8RQBK3rlA="; + hash = "sha256-D1pFP5tw323UJgWvLvh2sTiZG1hq5DP0FakdXEISRxs="; }; postPatch = '' ln -s ${callPackage ./build.zig.zon.nix { }} $ZIG_GLOBAL_CACHE_DIR/p @@ -24,6 +24,8 @@ stdenv.mkDerivation (finalAttrs: { zig_0_13.hook ]; + passthru.updateScript = ./update.sh; + env.VERSION = finalAttrs.version; meta = { diff --git a/pkgs/by-name/fl/flow-editor/update.sh b/pkgs/by-name/fl/flow-editor/update.sh new file mode 100755 index 000000000000..c48ce524f3ce --- /dev/null +++ b/pkgs/by-name/fl/flow-editor/update.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bash common-updater-scripts gnused nixfmt-rfc-style + +latest_tag=$(list-git-tags --url=https://github.com/neurocyte/flow | sed 's/^v//' | tail -n 1) + +update-source-version flow-editor "$latest_tag" + +mkdir -p src/syntax + +wget "https://raw.githubusercontent.com/neurocyte/flow/v${latest_tag}/build.zig.zon" +wget -P src/syntax "https://raw.githubusercontent.com/neurocyte/flow/v${latest_tag}/src/syntax/build.zig.zon" + +nix --extra-experimental-features 'nix-command flakes' run github:Cloudef/zig2nix#zon2nix -- build.zig.zon >pkgs/by-name/fl/flow-editor/build.zig.zon.nix + +# strip file protocol +sed -i '\|file = unpackZigArtifact { inherit name; artifact = /. + path; };|d' pkgs/by-name/fl/flow-editor/build.zig.zon.nix +nixfmt pkgs/by-name/fl/flow-editor/build.zig.zon.nix + +rm -rf build.zig.zon build.zig.zon2json-lock src/ From 1ad46f797d3564269a2ab81b681e9c6e2735d8d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 8 Feb 2025 12:23:37 +0100 Subject: [PATCH 0777/2168] stylelint-lsp: fix build with noBrokenSymlinks --- pkgs/by-name/st/stylelint-lsp/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/st/stylelint-lsp/package.nix b/pkgs/by-name/st/stylelint-lsp/package.nix index 14a565d5e33e..2f52bc167ea8 100644 --- a/pkgs/by-name/st/stylelint-lsp/package.nix +++ b/pkgs/by-name/st/stylelint-lsp/package.nix @@ -44,6 +44,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpm --ignore-scripts prune --prod rm -rf node_modules/.pnpm/typescript* find -type f \( -name "*.ts" -o -name "*.map" \) -exec rm -rf {} + + # https://github.com/pnpm/pnpm/issues/3645 + find node_modules -xtype l -delete ''; installPhase = '' From a073f6606354de1c178b9e0fa73b57d44cb79cf3 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Sun, 9 Feb 2025 17:46:22 +0000 Subject: [PATCH 0778/2168] koboldcpp: 1.82.4 -> 1.83.1 Changelog: https://github.com/LostRuins/koboldcpp/releases/tag/v1.83.1 Diff: https://github.com/LostRuins/koboldcpp/compare/v1.82.4...v1.83.1 --- pkgs/by-name/ko/koboldcpp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix index d6ce30fd1752..83d77150eb80 100644 --- a/pkgs/by-name/ko/koboldcpp/package.nix +++ b/pkgs/by-name/ko/koboldcpp/package.nix @@ -40,13 +40,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "koboldcpp"; - version = "1.82.4"; + version = "1.83.1"; src = fetchFromGitHub { owner = "LostRuins"; repo = "koboldcpp"; tag = "v${finalAttrs.version}"; - hash = "sha256-ObQJS6ZRdtSCTAQCq8w3gLDa1Z8z++JgDmyedTXB1F8="; + hash = "sha256-mXNPH4Fw1nJaeQpYbelN8y5R5ybyOjIDlV6dEKGgdp0="; }; enableParallelBuilding = true; From 00594b6f98c0b24bb641bc9115451ef1db5a8b70 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Sun, 9 Feb 2025 18:33:44 +0100 Subject: [PATCH 0779/2168] bakelite: clean up and provide update script --- pkgs/by-name/ba/bakelite/package.nix | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ba/bakelite/package.nix b/pkgs/by-name/ba/bakelite/package.nix index 7eb87f2b5a33..ab9e57dcd74b 100644 --- a/pkgs/by-name/ba/bakelite/package.nix +++ b/pkgs/by-name/ba/bakelite/package.nix @@ -2,15 +2,16 @@ lib, stdenv, fetchFromGitHub, + unstableGitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "bakelite"; - version = "unstable-2023-03-30"; + version = "0.4.2-unstable-2023-05-30"; src = fetchFromGitHub { owner = "richfelker"; - repo = pname; + repo = "bakelite"; rev = "65d69e88e0972d1493ebbd9bf9d1bfde36272636"; hash = "sha256-OjBw9aYD2h7BWYgQzZp03hGCyQcRgmm2AjrcT/QrQAo="; }; @@ -27,13 +28,19 @@ stdenv.mkDerivation rec { cp bakelite $out/bin ''; - meta = with lib; { + passthru = { + updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; + }; + + meta = { homepage = "https://github.com/richfelker/bakelite"; description = "Incremental backup with strong cryptographic confidentality"; mainProgram = "bakelite"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ mvs ]; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ mvs ]; # no support for Darwin (yet: https://github.com/richfelker/bakelite/pull/5) - platforms = platforms.linux; + platforms = lib.platforms.linux; }; } From 89c20fb34cc045d484e6f43f651e922442d999fd Mon Sep 17 00:00:00 2001 From: r-vdp Date: Sun, 9 Feb 2025 18:48:44 +0100 Subject: [PATCH 0780/2168] lkl: add CONFIG_BRIDGE to the config when firewall support is enabled Without this, the ruleset check fails on nftables rulesets that use the bridge family. --- .../virtualization/lkl/lkl-defconfig-enable-nftables | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/virtualization/lkl/lkl-defconfig-enable-nftables b/pkgs/applications/virtualization/lkl/lkl-defconfig-enable-nftables index 4491aef6a012..2de3bc662ee0 100644 --- a/pkgs/applications/virtualization/lkl/lkl-defconfig-enable-nftables +++ b/pkgs/applications/virtualization/lkl/lkl-defconfig-enable-nftables @@ -233,3 +233,4 @@ CONFIG_NFT_SYNPROXY=y CONFIG_NFT_TPROXY=y CONFIG_NFT_TUNNEL=y CONFIG_NFT_XFRM=y +CONFIG_BRIDGE=y From c2918476e43dab5295704840a167592c6e7b2ebd Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sun, 26 Jan 2025 16:37:47 +0100 Subject: [PATCH 0781/2168] proton-ge-bin: refactor Signed-off-by: Sefa Eyeoglu --- pkgs/by-name/pr/proton-ge-bin/package.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/pr/proton-ge-bin/package.nix b/pkgs/by-name/pr/proton-ge-bin/package.nix index ab00ecc360b3..4b7ffc28cff4 100644 --- a/pkgs/by-name/pr/proton-ge-bin/package.nix +++ b/pkgs/by-name/pr/proton-ge-bin/package.nix @@ -13,13 +13,17 @@ stdenvNoCC.mkDerivation (finalAttrs: { hash = "sha256-L0GkzpSn4f6dLDOm2iDJr8D1DINTHNW9Kkn1xFTuqfo="; }; + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + outputs = [ "out" "steamcompattool" ]; - buildCommand = '' - runHook preBuild + installPhase = '' + runHook preInstall # Make it impossible to add to an environment. You should use the appropriate NixOS option. # Also leave some breadcrumbs in the file. @@ -30,10 +34,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { rm $steamcompattool/{compatibilitytool.vdf,proton,version} cp $src/{compatibilitytool.vdf,proton,version} $steamcompattool - sed -i -r 's|GE-Proton[0-9]*-[0-9]*|GE-Proton|' $steamcompattool/compatibilitytool.vdf - sed -i -r 's|GE-Proton[0-9]*-[0-9]*|GE-Proton|' $steamcompattool/proton + runHook postInstall + ''; - runHook postBuild + preFixup = '' + substituteInPlace "$steamcompattool/compatibilitytool.vdf" \ + --replace-fail "${finalAttrs.version}" "GE-Proton" + substituteInPlace "$steamcompattool/proton" \ + --replace-fail "${finalAttrs.version}" "GE-Proton" ''; /* From a94bd68c17172818c7c1d8bcbdf3248cc25ebe7c Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sun, 26 Jan 2025 16:37:56 +0100 Subject: [PATCH 0782/2168] proton-ge-bin: add Scrumplex as maintainer Signed-off-by: Sefa Eyeoglu --- pkgs/by-name/pr/proton-ge-bin/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/pr/proton-ge-bin/package.nix b/pkgs/by-name/pr/proton-ge-bin/package.nix index 4b7ffc28cff4..059e5c22e1ec 100644 --- a/pkgs/by-name/pr/proton-ge-bin/package.nix +++ b/pkgs/by-name/pr/proton-ge-bin/package.nix @@ -70,6 +70,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ NotAShelf + Scrumplex shawn8901 ]; platforms = [ "x86_64-linux" ]; From 01858fd16adc825e2397f6602d26213ed179fe01 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 9 Feb 2025 18:38:18 +0100 Subject: [PATCH 0783/2168] python312Packages.pymilvus: 2.5.3 -> 2.5.4 Diff: https://github.com/milvus-io/pymilvus/compare/refs/tags/v2.5.3...v2.5.4 Changelog: https://github.com/milvus-io/pymilvus/releases/tag/v2.5.4 --- .../python-modules/pymilvus/default.nix | 79 +++++++++++-------- 1 file changed, 46 insertions(+), 33 deletions(-) diff --git a/pkgs/development/python-modules/pymilvus/default.nix b/pkgs/development/python-modules/pymilvus/default.nix index 4c8dd8910ab5..dea3dd58b80f 100644 --- a/pkgs/development/python-modules/pymilvus/default.nix +++ b/pkgs/development/python-modules/pymilvus/default.nix @@ -1,75 +1,88 @@ { lib, buildPythonPackage, - environs, fetchFromGitHub, + + # build-system gitpython, - grpcio, - grpcio-testing, - minio, - mmh3, - pandas, - pyarrow, - pytestCheckHook, - pythonOlder, - requests, - scikit-learn, + setuptools, setuptools-scm, + + # dependencies + grpcio, + # milvus-lite, (unpackaged) + pandas, + protobuf, + python-dotenv, ujson, - wheel, + + # tests + grpcio-testing, + pytestCheckHook, }: buildPythonPackage rec { pname = "pymilvus"; - version = "2.5.3"; + version = "2.5.4"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "milvus-io"; repo = "pymilvus"; tag = "v${version}"; - hash = "sha256-oWuaxiiwheJ7lGPN+nUOGuJLgoZORDmM8h8ND6D3uII="; + hash = "sha256-w7ZsBXmmkCp3K+YaitZXPHK5pxh/dSJm8aR7xM0VrfU="; }; + build-system = [ + gitpython + setuptools + setuptools-scm + ]; + pythonRelaxDeps = [ - "environs" "grpcio" ]; - nativeBuildInputs = [ - gitpython - setuptools-scm - wheel + pythonRemoveDeps = [ + "milvus-lite" ]; - propagatedBuildInputs = [ - environs + dependencies = [ grpcio - minio - mmh3 + # milvus-lite pandas - pyarrow - requests + protobuf + python-dotenv + setuptools ujson ]; nativeCheckInputs = [ grpcio-testing pytestCheckHook - scikit-learn + # scikit-learn ]; pythonImportsCheck = [ "pymilvus" ]; - disabledTests = [ "test_get_commit" ]; + disabledTests = [ + # Tries to read .git + "test_get_commit" - meta = with lib; { + # milvus-lite is not packaged + "test_milvus_lite" + ]; + + disabledTestPaths = [ + # pymilvus.exceptions.MilvusException: + "examples/test_bitmap_index.py" + ]; + + meta = { description = "Python SDK for Milvus"; homepage = "https://github.com/milvus-io/pymilvus"; - changelog = "https://github.com/milvus-io/pymilvus/releases/tag/${src.tag}"; - license = licenses.mit; - maintainers = with maintainers; [ happysalada ]; + changelog = "https://github.com/milvus-io/pymilvus/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ happysalada ]; }; } From 8722c7acbdc204d8131daf94ccd28c3baed1b39e Mon Sep 17 00:00:00 2001 From: Mathias Koehler Date: Sun, 9 Feb 2025 15:13:34 +0100 Subject: [PATCH 0784/2168] lib.systems: add znver5 architecture --- lib/systems/architectures.nix | 2 ++ pkgs/build-support/cc-wrapper/default.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/lib/systems/architectures.nix b/lib/systems/architectures.nix index a31b25772f29..d277ac9ce70f 100644 --- a/lib/systems/architectures.nix +++ b/lib/systems/architectures.nix @@ -40,6 +40,7 @@ rec { znver2 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "avx2" "fma" ]; znver3 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "avx2" "fma" ]; znver4 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "avx2" "avx512" "fma" ]; + znver5 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "avx2" "avx512" "fma" ]; # other armv5te = [ ]; armv6 = [ ]; @@ -113,6 +114,7 @@ rec { znver2 = [ "znver1" ] ++ inferiors.znver1; znver3 = [ "znver2" ] ++ inferiors.znver2; znver4 = lib.unique ([ "znver3" "x86-64-v4" ] ++ inferiors.znver3 ++ inferiors.x86-64-v4); + znver5 = [ "znver4" ] ++ inferiors.znver4; # other armv5te = [ ]; diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 54c1158e5dae..134fe3782799 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -172,6 +172,7 @@ let znver2 = versionAtLeast ccVersion "9.0"; znver3 = versionAtLeast ccVersion "11.0"; znver4 = versionAtLeast ccVersion "13.0"; + znver5 = versionAtLeast ccVersion "14.0"; }.${arch} or true else if isClang then { #Generic @@ -193,6 +194,7 @@ let znver2 = versionAtLeast ccVersion "9.0"; znver3 = versionAtLeast ccVersion "12.0"; znver4 = versionAtLeast ccVersion "16.0"; + znver5 = versionAtLeast ccVersion "19.1"; }.${arch} or true else false; From af541d476acab91db2c486730c4ca2a4e0256df2 Mon Sep 17 00:00:00 2001 From: NTBBloodbath Date: Sun, 26 Jan 2025 14:32:45 -0400 Subject: [PATCH 0785/2168] penpot-desktop: init at 0.10.0 --- .../penpot-desktop/electron-package-lock.diff | 39 ++++++ pkgs/by-name/pe/penpot-desktop/package.nix | 114 ++++++++++++++++++ 2 files changed, 153 insertions(+) create mode 100644 pkgs/by-name/pe/penpot-desktop/electron-package-lock.diff create mode 100644 pkgs/by-name/pe/penpot-desktop/package.nix diff --git a/pkgs/by-name/pe/penpot-desktop/electron-package-lock.diff b/pkgs/by-name/pe/penpot-desktop/electron-package-lock.diff new file mode 100644 index 000000000000..9e2fee2657fb --- /dev/null +++ b/pkgs/by-name/pe/penpot-desktop/electron-package-lock.diff @@ -0,0 +1,39 @@ +diff --git i/package-lock.json w/package-lock.json +index 039e3c0..135e0a0 100644 +--- i/package-lock.json ++++ w/package-lock.json +@@ -18,7 +18,7 @@ + "@commitlint/cli": "^19.6.1", + "@commitlint/config-conventional": "^19.6.0", + "@eslint/js": "^9.19.0", +- "electron": "^34.0.1", ++ "electron": "^33.3.1", + "electron-builder": "^25.1.8", + "eslint": "^9.19.0", + "globals": "^15.14.0", +@@ -3495,9 +3495,9 @@ + } + }, + "node_modules/electron": { +- "version": "34.0.1", +- "resolved": "https://registry.npmjs.org/electron/-/electron-34.0.1.tgz", +- "integrity": "sha512-aArw5tAM80i3CKwEREnyZSM1SkARf5Jd1yBMTIdOL4pB1M+p/oDeyWSFI9Dl+vujyfJKiK4SS5+j19wna1onMw==", ++ "version": "33.3.1", ++ "resolved": "https://registry.npmjs.org/electron/-/electron-33.3.1.tgz", ++ "integrity": "sha512-Z7l2bVgpdKxHQMI4i0CirBX2n+iCYKOx5mbzNM3BpOyFELwlobEXKmzCmEnwP+3EcNeIhUQyIEBFQxN06QgdIw==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", +diff --git i/package.json w/package.json +index 9525e62..deb065e 100644 +--- i/package.json ++++ w/package.json +@@ -43,7 +43,7 @@ + "@commitlint/cli": "^19.6.1", + "@commitlint/config-conventional": "^19.6.0", + "@eslint/js": "^9.19.0", +- "electron": "^34.0.1", ++ "electron": "^33.1.1", + "electron-builder": "^25.1.8", + "eslint": "^9.19.0", + "globals": "^15.14.0", diff --git a/pkgs/by-name/pe/penpot-desktop/package.nix b/pkgs/by-name/pe/penpot-desktop/package.nix new file mode 100644 index 000000000000..302e63e0a1da --- /dev/null +++ b/pkgs/by-name/pe/penpot-desktop/package.nix @@ -0,0 +1,114 @@ +{ + lib, + buildNpmPackage, + copyDesktopItems, + electron_33, + fetchFromGitHub, + jq, + makeDesktopItem, + makeWrapper, + nodejs_22, + stdenv, +}: + +let + description = "Unofficial desktop application for the open-source design tool, Penpot"; + icon = "penpot"; + nodejs = nodejs_22; + electron = electron_33; +in +buildNpmPackage rec { + pname = "penpot-desktop"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "author-more"; + repo = "penpot-desktop"; + tag = "v${version}"; + hash = "sha256-KlTE61k5rl13GPpOznpugSn1hmn55Cd/Z9vhwDjWhPo="; + }; + + patches = [ + ./electron-package-lock.diff # this downgrades electron version from 34 to 33 to match the latest available version in nixpkgs + ]; + + makeCacheWritable = true; + npmFlags = [ + "--engine-strict" + "--legacy-peer-deps" + ]; + npmDepsHash = "sha256-DWZ1ih4i0vyYlShBWkJTCq0IKgT4CgEmvURnGoQiSy0="; + # Do not run the default build script as it leads to errors caused by the electron-builder configuration + dontNpmBuild = true; + + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + + nativeBuildInputs = [ + jq + nodejs + makeWrapper + copyDesktopItems + ]; + + preBuild = '' + if [[ $(jq --raw-output '.devDependencies.electron' < package.json | grep -E --only-matching '\^[0-9]+' | sed -e 's/\^//') != ${lib.escapeShellArg (lib.versions.major electron.version)} ]]; then + echo 'ERROR: electron version mismatch' + exit 1 + fi + ''; + + postBuild = '' + npm exec electron-builder -- \ + --dir \ + --c.electronDist=${electron.dist} \ + --c.electronVersion=${electron.version} + ''; + + installPhase = '' + runHook preInstall + + mkdir $out + + pushd dist/linux-${lib.optionalString stdenv.hostPlatform.isAarch64 "arm64-"}unpacked + mkdir -p $out/opt/Penpot + cp -r locales resources{,.pak} $out/opt/Penpot + popd + + makeWrapper '${lib.getExe electron}' "$out/bin/penpot-desktop" \ + --add-flags $out/opt/Penpot/resources/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ + --set-default ELECTRON_IS_DEV 0 \ + --inherit-argv0 + + pushd build + for icon in icon.*; do + dir=$out/share/icons/hicolor/"''${icon%.*}"/apps + mkdir -p "$dir" + cp "$icon" "$dir"/${icon}.png + done + popd + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "Penpot"; + exec = "penpot-desktop %U"; + inherit icon; + comment = description; + desktopName = "Penpot"; + categories = [ "Graphics" ]; + }) + ]; + + meta = { + changelog = "https://github.com/author-more/penpot-desktop/releases/tag/v${version}"; + inherit description; + homepage = "https://github.com/author-more/penpot.desktop"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ ntbbloodbath ]; + platforms = electron.meta.platforms; + mainProgram = "penpot-desktop"; + }; +} From 930725442efd7864c46d47154919f12bb5f0f43c Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Sun, 2 Feb 2025 16:30:59 +0100 Subject: [PATCH 0786/2168] proton-ge-bin: allow overriding display name in steam --- pkgs/by-name/pr/proton-ge-bin/package.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/proton-ge-bin/package.nix b/pkgs/by-name/pr/proton-ge-bin/package.nix index 059e5c22e1ec..afb215ab43ba 100644 --- a/pkgs/by-name/pr/proton-ge-bin/package.nix +++ b/pkgs/by-name/pr/proton-ge-bin/package.nix @@ -3,6 +3,9 @@ stdenvNoCC, fetchzip, writeScript, + # Can be overriden to alter the display name in steam + # This could be useful if multiple versions should be installed together + steamDisplayName ? "GE-Proton", }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "proton-ge-bin"; @@ -39,9 +42,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { preFixup = '' substituteInPlace "$steamcompattool/compatibilitytool.vdf" \ - --replace-fail "${finalAttrs.version}" "GE-Proton" + --replace-fail "${finalAttrs.version}" "${steamDisplayName}" substituteInPlace "$steamcompattool/proton" \ - --replace-fail "${finalAttrs.version}" "GE-Proton" + --replace-fail "${finalAttrs.version}" "${steamDisplayName}" ''; /* From 705adede7de25e74a9092e8b8a947499c8e20780 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 9 Feb 2025 19:32:25 +0100 Subject: [PATCH 0787/2168] python312Packages.python-on-whales: cleanup --- .../python-modules/python-on-whales/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/python-on-whales/default.nix b/pkgs/development/python-modules/python-on-whales/default.nix index 083c511df6ff..bbe238cde817 100644 --- a/pkgs/development/python-modules/python-on-whales/default.nix +++ b/pkgs/development/python-modules/python-on-whales/default.nix @@ -2,8 +2,11 @@ lib, buildPythonPackage, fetchFromGitHub, + + # build-system setuptools, - pythonOlder, + + # dependencies pydantic, requests, tqdm, @@ -15,8 +18,6 @@ buildPythonPackage rec { version = "0.75.1"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "gabrieldemarmiesse"; repo = "python-on-whales"; @@ -37,12 +38,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "python_on_whales" ]; - meta = with lib; { + meta = { description = "Docker client for Python, designed to be fun and intuitive"; homepage = "https://github.com/gabrieldemarmiesse/python-on-whales"; - changelog = "https://github.com/gabrieldemarmiesse/python-on-whales/releases/tag/${src.tag}"; - license = licenses.mit; - maintainers = with maintainers; [ bcdarwin ]; - mainProgram = "python-on-whales"; + changelog = "https://github.com/gabrieldemarmiesse/python-on-whales/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bcdarwin ]; }; } From 0677547a9fe7bbf886fb277738b527a15cc1d498 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 18:45:05 +0000 Subject: [PATCH 0788/2168] python312Packages.jianpu-ly: 1.826 -> 1.832 --- pkgs/development/python-modules/jianpu-ly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jianpu-ly/default.nix b/pkgs/development/python-modules/jianpu-ly/default.nix index 2469f6569f35..8fc533bbb692 100644 --- a/pkgs/development/python-modules/jianpu-ly/default.nix +++ b/pkgs/development/python-modules/jianpu-ly/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "jianpu-ly"; - version = "1.826"; + version = "1.832"; pyproject = true; src = fetchPypi { inherit version; pname = "jianpu_ly"; - hash = "sha256-9vNCwXCOEHG2WNu8nDqCKJ3Z4vrsfX1lwKvkVGRrPPA="; + hash = "sha256-7+PM8wHzC5O8o12VjA1aeYIAdv/17TM7RymHyxkq5vs="; }; dependencies = [ lilypond ]; From c4eca80c88de566402d4378a6affbea7644f359c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 9 Feb 2025 19:41:29 +0100 Subject: [PATCH 0789/2168] bacon: 3.9.1 -> 3.10.0 Diff: https://github.com/Canop/bacon/compare/refs/tags/v3.9.1...v3.10.0 Changelog: https://github.com/Canop/bacon/blob/v3.10.0/CHANGELOG.md --- pkgs/by-name/ba/bacon/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ba/bacon/package.nix b/pkgs/by-name/ba/bacon/package.nix index 5d4965ac9a18..f7332c40c442 100644 --- a/pkgs/by-name/ba/bacon/package.nix +++ b/pkgs/by-name/ba/bacon/package.nix @@ -25,17 +25,17 @@ in rustPlatform.buildRustPackage rec { pname = "bacon"; - version = "3.9.1"; + version = "3.10.0"; src = fetchFromGitHub { owner = "Canop"; repo = "bacon"; tag = "v${version}"; - hash = "sha256-TniEPcY3mK5LO9CBXi5kgnUQkOeDwF9n1K0kSn4ucKk="; + hash = "sha256-FU7hIMAJIXD/pJ9FZSPkO1CQhmmSWwaewGyogGdZoeI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-6vR8Bxv/A6do4+oGAI0kx1yUyht7YOi1pP/mnIiBPmc="; + cargoHash = "sha256-+lk4YrJ7zI6t24y76kODfUok5Ibu3fFxpLIUQZQqgcw="; buildFeatures = lib.optionals withSound [ "sound" From 00f66d0b23190ecedb27459e214fc8fa0c0c70bc Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 4 Feb 2025 22:33:09 +0400 Subject: [PATCH 0790/2168] =?UTF-8?q?josm:=2019277=20=E2=86=92=2019307?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/jo/josm/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/jo/josm/package.nix b/pkgs/by-name/jo/josm/package.nix index b44109aa1df8..bceeff6ab2a6 100644 --- a/pkgs/by-name/jo/josm/package.nix +++ b/pkgs/by-name/jo/josm/package.nix @@ -3,21 +3,21 @@ }: let pname = "josm"; - version = "19277"; + version = "19307"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - hash = "sha256-NXf95ANB5Ezgf1CKEbefrIxoyqHgYC/WKNf7+p3D/pY="; + hash = "sha256-08dacfJrRbdk8Bj+lDW2s8YuGVvnKdvMQN825lusohk="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java21.zip"; - hash = "sha256-vP7s6kneOOpLUYZ1Un7Zdo8wMZ/fErLaJFxtR/vCvD8="; + hash = "sha256-wFLQXGOaRnFDZEDlZwmv8wb3pNJbVxocYVjc8wy1Q10="; }; pkg = fetchFromGitHub { owner = "JOSM"; repo = "josm"; tag = "${version}-tested"; - hash = "sha256-3aVMZFYz7J8fkCR4TVmkvsAu2cX7swxiNt12is42nKE="; + hash = "sha256-TwheY/9gXbKH36jZLMoV9xIBeq59FpHUUoselaiYGzA="; }; }; From 2ef08ebfecdd97a46401cd29959fc1c6fd7dc6f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Feb 2025 11:16:46 -0800 Subject: [PATCH 0791/2168] vaultwarden: 1.33.1 -> 1.33.2 Diff: https://github.com/dani-garcia/vaultwarden/compare/1.33.1...1.33.2 Changelog: https://github.com/dani-garcia/vaultwarden/releases/tag/1.33.2 --- pkgs/tools/security/vaultwarden/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/vaultwarden/default.nix b/pkgs/tools/security/vaultwarden/default.nix index 65604d531349..de0793a6a89c 100644 --- a/pkgs/tools/security/vaultwarden/default.nix +++ b/pkgs/tools/security/vaultwarden/default.nix @@ -22,17 +22,17 @@ in rustPlatform.buildRustPackage rec { pname = "vaultwarden"; - version = "1.33.1"; + version = "1.33.2"; src = fetchFromGitHub { owner = "dani-garcia"; repo = "vaultwarden"; rev = version; - hash = "sha256-p5SgXqeafEqPQmSKEtcPCHvxODxrEX4gNmpb2ybmpO4="; + hash = "sha256-Lu3/qVTi5Eedcm+3XlHAAJ1nPHm9hW4HZncQKmzDdoo="; }; useFetchCargoVendor = true; - cargoHash = "sha256-B9RztnkIbYVWdx85p1WEskwTdFrUruD0UJ7qFIg8vy8="; + cargoHash = "sha256-T/ehLSPJmEuQYhotK12iqXQSe5Ke8+dkr9PVDe4Kmis="; # used for "Server Installed" version in admin panel env.VW_VERSION = version; From b758238c547e225a2365920e7468b561f7b40c4f Mon Sep 17 00:00:00 2001 From: lyranico Date: Mon, 3 Feb 2025 02:10:35 +0800 Subject: [PATCH 0792/2168] musicpod: 1.12.0 -> 2.9.0 --- pkgs/by-name/mu/musicpod/package.nix | 37 +- pkgs/by-name/mu/musicpod/pubspec.lock.json | 836 ++++++++++++--------- 2 files changed, 514 insertions(+), 359 deletions(-) diff --git a/pkgs/by-name/mu/musicpod/package.nix b/pkgs/by-name/mu/musicpod/package.nix index c2a2c3867d99..7fc13890008b 100644 --- a/pkgs/by-name/mu/musicpod/package.nix +++ b/pkgs/by-name/mu/musicpod/package.nix @@ -1,21 +1,26 @@ { lib, - flutter324, + flutter327, fetchFromGitHub, mpv-unwrapped, libass, pulseaudio, + musicpod, + runCommand, + _experimental-update-script-combinators, + yq, + gitUpdater, }: -flutter324.buildFlutterApplication rec { +flutter327.buildFlutterApplication rec { pname = "musicpod"; - version = "1.12.0"; + version = "2.9.0"; src = fetchFromGitHub { owner = "ubuntu-flutter-community"; repo = "musicpod"; tag = "v${version}"; - hash = "sha256-gsreA8ZTLcSvIAtODZ2gopZ78iyoN18gsSi9/IoY5/0="; + hash = "sha256-jq133GdeuEENPb2igNWkjeFTpI5qqxF2RuCu78y6L8o="; }; postPatch = '' @@ -27,9 +32,11 @@ flutter324.buildFlutterApplication rec { gitHashes = { audio_service_mpris = "sha256-QRZ4a3w4MZP8/A4yXzP4P9FPwEVNXlntmBwE8I+s2Kk="; - media_kit_native_event_loop = "sha256-JBtFTYlztDQvN/qQcDxkK27mka2fSG+iiIIxk2mqEpY="; - media_kit_video = "sha256-JBtFTYlztDQvN/qQcDxkK27mka2fSG+iiIIxk2mqEpY="; - phoenix_theme = "sha256-5kgPAnK61vFi/sJ1jr3c5D2UZbxItW8YOk/IJEtHkZo="; + media_kit = "sha256-uRQmrV1jAxsWXFm5SimAY/VYMHBB9fPSnRXvUCvEI8g="; + media_kit_libs_video = "sha256-uRQmrV1jAxsWXFm5SimAY/VYMHBB9fPSnRXvUCvEI8g="; + media_kit_video = "sha256-uRQmrV1jAxsWXFm5SimAY/VYMHBB9fPSnRXvUCvEI8g="; + phoenix_theme = "sha256-HGMRQ5wdhoqYNkrjLTfz6mE/dh45IRyuQ79/E4oo+9w="; + yaru = "sha256-lwyl5aRf5HzWHk7aXYXFj6a9QiFpDN9piHYXzVccYWY="; }; buildInputs = [ @@ -44,6 +51,22 @@ flutter324.buildFlutterApplication rec { install -Dm644 snap/gui/musicpod.png -t $out/share/pixmaps ''; + passthru = { + pubspecSource = + runCommand "pubspec.lock.json" + { + nativeBuildInputs = [ yq ]; + inherit (musicpod) src; + } + '' + cat $src/pubspec.lock | yq > $out + ''; + updateScript = _experimental-update-script-combinators.sequence [ + (gitUpdater { rev-prefix = "v"; }) + (_experimental-update-script-combinators.copyAttrOutputToFile "musicpod.pubspecSource" ./pubspec.lock.json) + ]; + }; + meta = { description = "Music, radio, television and podcast player"; homepage = "https://github.com/ubuntu-flutter-community/musicpod"; diff --git a/pkgs/by-name/mu/musicpod/pubspec.lock.json b/pkgs/by-name/mu/musicpod/pubspec.lock.json index d9864f8519b2..4f3da3d51278 100644 --- a/pkgs/by-name/mu/musicpod/pubspec.lock.json +++ b/pkgs/by-name/mu/musicpod/pubspec.lock.json @@ -4,27 +4,27 @@ "dependency": "transitive", "description": { "name": "_fe_analyzer_shared", - "sha256": "f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834", + "sha256": "88399e291da5f7e889359681a8f64b18c5123e03576b01f32a6a276611e511c3", "url": "https://pub.dev" }, "source": "hosted", - "version": "72.0.0" + "version": "78.0.0" }, "_macros": { "dependency": "transitive", "description": "dart", "source": "sdk", - "version": "0.3.2" + "version": "0.3.3" }, "analyzer": { "dependency": "transitive", "description": { "name": "analyzer", - "sha256": "b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139", + "sha256": "62899ef43d0b962b056ed2ebac6b47ec76ffd003d5f7c4e4dc870afe63188e33", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.7.0" + "version": "7.1.0" }, "animated_emoji": { "dependency": "direct main", @@ -40,41 +40,51 @@ "dependency": "transitive", "description": { "name": "animated_vector", - "sha256": "e15c6596549ca6e2e7491c11fbe168a1dead87475a828a4bc81cf104feca0432", + "sha256": "f1beb10e6fcfd8bd15abb788e20345def786d1c7391d7c1426bb2a1f2adf2132", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.0" + "version": "0.2.2" }, "animated_vector_annotations": { "dependency": "transitive", "description": { "name": "animated_vector_annotations", - "sha256": "baa6b4ed98407220f2c9634f7da3cfa5eedb46798e090466f441e666e2f7c8c0", + "sha256": "07c1ea603a2096f7eb6f1c2b8f16c3c330c680843ea78b7782a3217c3c53f979", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.0" + "version": "0.2.2" }, "archive": { "dependency": "transitive", "description": { "name": "archive", - "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d", + "sha256": "6199c74e3db4fbfbd04f66d739e72fe11c8a8957d5f219f1f4482dbde6420b5a", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.6.1" + "version": "4.0.2" }, "args": { "dependency": "transitive", "description": { "name": "args", - "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a", + "sha256": "bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.0" + "version": "2.6.0" + }, + "assorted_layout_widgets": { + "dependency": "transitive", + "description": { + "name": "assorted_layout_widgets", + "sha256": "0fa75b70e3d0a8c6a8d4d89ff138eead007c1e42c6b27f7863bc2f18ea1481fa", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.4.4" }, "async": { "dependency": "transitive", @@ -90,21 +100,21 @@ "dependency": "direct main", "description": { "name": "audio_metadata_reader", - "sha256": "40bd155e2ab0de725656235c51bb8441d2af49e793f0a643653801e05a693eb4", + "sha256": "9f05d016a3277357308eb6d2f283cd1229c7fae62d6943ee6ab95b374e265222", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.0.6" + "version": "1.1.0" }, "audio_service": { "dependency": "direct main", "description": { "name": "audio_service", - "sha256": "9dd5ba7e77567b290c35908b1950d61485b4dfdd3a0ac398e98cfeec04651b75", + "sha256": "f6c8191bef6b843da34675dd0731ad11d06094c36b691ffcf3148a4feb2e585f", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.18.15" + "version": "0.18.16" }, "audio_service_mpris": { "dependency": "direct main", @@ -121,11 +131,11 @@ "dependency": "transitive", "description": { "name": "audio_service_platform_interface", - "sha256": "8431a455dac9916cc9ee6f7da5620a666436345c906ad2ebb7fa41d18b3c1bf4", + "sha256": "6283782851f6c8b501b60904a32fc7199dc631172da0629d7301e66f672ab777", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.1" + "version": "0.1.3" }, "audio_service_web": { "dependency": "transitive", @@ -141,11 +151,11 @@ "dependency": "transitive", "description": { "name": "audio_session", - "sha256": "343e83bc7809fbda2591a49e525d6b63213ade10c76f15813be9aed6657b3261", + "sha256": "b2a26ba8b7efa1790d6460e82971fde3e398cfbe2295df9dea22f3499d2c12a7", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.21" + "version": "0.1.23" }, "basic_utils": { "dependency": "direct main", @@ -181,11 +191,11 @@ "dependency": "transitive", "description": { "name": "build", - "sha256": "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0", + "sha256": "cef23f1eda9b57566c81e2133d196f8e3df48f244b317368d65c5943d91148f0", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.1" + "version": "2.4.2" }, "build_cli_annotations": { "dependency": "transitive", @@ -201,51 +211,51 @@ "dependency": "transitive", "description": { "name": "build_config", - "sha256": "bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1", + "sha256": "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.1" + "version": "1.1.2" }, "build_daemon": { "dependency": "transitive", "description": { "name": "build_daemon", - "sha256": "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9", + "sha256": "294a2edaf4814a378725bfe6358210196f5ea37af89ecd81bfa32960113d4948", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.2" + "version": "4.0.3" }, "build_resolvers": { "dependency": "transitive", "description": { "name": "build_resolvers", - "sha256": "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a", + "sha256": "99d3980049739a985cf9b21f30881f46db3ebc62c5b8d5e60e27440876b1ba1e", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.2" + "version": "2.4.3" }, "build_runner": { "dependency": "direct dev", "description": { "name": "build_runner", - "sha256": "dd09dd4e2b078992f42aac7f1a622f01882a8492fef08486b27ddde929c19f04", + "sha256": "74691599a5bc750dc96a6b4bfd48f7d9d66453eab04c7f4063134800d6a5c573", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.12" + "version": "2.4.14" }, "build_runner_core": { "dependency": "transitive", "description": { "name": "build_runner_core", - "sha256": "f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0", + "sha256": "22e3aa1c80e0ada3722fe5b63fd43d9c8990759d0a2cf489c8c5d7b2bdebc021", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.3.2" + "version": "8.0.0" }, "built_collection": { "dependency": "transitive", @@ -261,11 +271,11 @@ "dependency": "transitive", "description": { "name": "built_value", - "sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb", + "sha256": "28a712df2576b63c6c005c465989a348604960c0958d28be5303ba9baa841ac2", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.9.2" + "version": "8.9.3" }, "cached_network_image": { "dependency": "direct main", @@ -327,6 +337,16 @@ "source": "hosted", "version": "2.0.3" }, + "cli_util": { + "dependency": "transitive", + "description": { + "name": "cli_util", + "sha256": "ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.2" + }, "clock": { "dependency": "transitive", "description": { @@ -341,31 +361,31 @@ "dependency": "transitive", "description": { "name": "code_builder", - "sha256": "f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37", + "sha256": "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.10.0" + "version": "4.10.1" }, "collection": { "dependency": "direct main", "description": { "name": "collection", - "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a", + "sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.18.0" + "version": "1.19.0" }, "connectivity_plus": { "dependency": "direct main", "description": { "name": "connectivity_plus", - "sha256": "2056db5241f96cdc0126bd94459fc4cdc13876753768fc7a31c425e50a7177d0", + "sha256": "8a68739d3ee113e51ad35583fdf9ab82c55d09d693d3c39da1aebab87c938412", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.0.5" + "version": "6.1.2" }, "connectivity_plus_platform_interface": { "dependency": "transitive", @@ -381,11 +401,11 @@ "dependency": "transitive", "description": { "name": "convert", - "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592", + "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.1" + "version": "3.1.2" }, "cross_file": { "dependency": "transitive", @@ -401,11 +421,11 @@ "dependency": "transitive", "description": { "name": "crypto", - "sha256": "ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27", + "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.5" + "version": "3.0.6" }, "csslib": { "dependency": "transitive", @@ -431,11 +451,11 @@ "dependency": "transitive", "description": { "name": "dart_style", - "sha256": "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab", + "sha256": "27eb0ae77836989a3bc541ce55595e8ceee0992807f14511552a898ddd0d88ac", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.7" + "version": "3.0.1" }, "dbus": { "dependency": "transitive", @@ -471,11 +491,11 @@ "dependency": "transitive", "description": { "name": "device_info_plus_platform_interface", - "sha256": "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba", + "sha256": "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.0.1" + "version": "7.0.2" }, "dio": { "dependency": "direct main", @@ -501,11 +521,11 @@ "dependency": "transitive", "description": { "name": "equatable", - "sha256": "c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2", + "sha256": "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.5" + "version": "2.0.7" }, "fake_async": { "dependency": "transitive", @@ -531,21 +551,21 @@ "dependency": "direct main", "description": { "name": "file", - "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c", + "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.0.0" + "version": "7.0.1" }, "file_picker": { "dependency": "direct main", "description": { "name": "file_picker", - "sha256": "167bb619cdddaa10ef2907609feb8a79c16dfa479d3afaf960f8e223f754bf12", + "sha256": "c904b4ab56d53385563c7c39d8e9fa9af086f91495dfc48717ad84a42c3cf204", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.1.2" + "version": "8.1.7" }, "file_selector": { "dependency": "direct main", @@ -561,41 +581,41 @@ "dependency": "transitive", "description": { "name": "file_selector_android", - "sha256": "b8c9717a0177ca6fa035554b82cd6c83b838ddc66b7704eb6df0f77f027ecc90", + "sha256": "98ac58e878b05ea2fdb204e7f4fc4978d90406c9881874f901428e01d3b18fbc", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.1+7" + "version": "0.5.1+12" }, "file_selector_ios": { "dependency": "transitive", "description": { "name": "file_selector_ios", - "sha256": "38ebf91ecbcfa89a9639a0854ccaed8ab370c75678938eebca7d34184296f0bb", + "sha256": "94b98ad950b8d40d96fee8fa88640c2e4bd8afcdd4817993bd04e20310f45420", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.3" + "version": "0.5.3+1" }, "file_selector_linux": { "dependency": "direct main", "description": { "name": "file_selector_linux", - "sha256": "045d372bf19b02aeb69cacf8b4009555fb5f6f0b7ad8016e5f46dd1387ddd492", + "sha256": "54cbbd957e1156d29548c7d9b9ec0c0ebb6de0a90452198683a7d23aed617a33", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.9.2+1" + "version": "0.9.3+2" }, "file_selector_macos": { "dependency": "transitive", "description": { "name": "file_selector_macos", - "sha256": "f42eacb83b318e183b1ae24eead1373ab1334084404c8c16e0354f9a3e55d385", + "sha256": "271ab9986df0c135d45c3cdb6bd0faa5db6f4976d3e4b437cf7d0f258d941bfc", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.9.4" + "version": "0.9.4+2" }, "file_selector_platform_interface": { "dependency": "transitive", @@ -621,21 +641,21 @@ "dependency": "transitive", "description": { "name": "file_selector_windows", - "sha256": "2ad726953f6e8affbc4df8dc78b77c3b4a060967a291e528ef72ae846c60fb69", + "sha256": "8f5d2f6590d51ecd9179ba39c64f722edc15226cc93dcc8698466ad36a4a85a4", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.9.3+2" + "version": "0.9.3+3" }, "fixnum": { "dependency": "transitive", "description": { "name": "fixnum", - "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1", + "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "1.1.1" }, "flutter": { "dependency": "direct main", @@ -653,6 +673,16 @@ "source": "hosted", "version": "3.4.1" }, + "flutter_discord_rpc": { + "dependency": "direct main", + "description": { + "name": "flutter_discord_rpc", + "sha256": "9363a803863d56fd89c0a21639c70b126245fcbafaeb0a3d091e7ac06951d03f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, "flutter_html": { "dependency": "direct main", "description": { @@ -663,15 +693,25 @@ "source": "hosted", "version": "3.0.0-beta.2" }, + "flutter_launcher_icons": { + "dependency": "direct dev", + "description": { + "name": "flutter_launcher_icons", + "sha256": "31cd0885738e87c72d6f055564d37fabcdacee743b396b78c7636c169cac64f5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.14.2" + }, "flutter_lints": { "dependency": "direct dev", "description": { "name": "flutter_lints", - "sha256": "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c", + "sha256": "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.0" + "version": "5.0.0" }, "flutter_localizations": { "dependency": "direct main", @@ -683,31 +723,31 @@ "dependency": "direct main", "description": { "name": "flutter_markdown", - "sha256": "a23c41ee57573e62fc2190a1f36a0480c4d90bde3a8a8d7126e5d5992fb53fb7", + "sha256": "e37f4c69a07b07bb92622ef6b131a53c9aae48f64b176340af9e8e5238718487", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.3+1" + "version": "0.7.5" }, "flutter_plugin_android_lifecycle": { "dependency": "transitive", "description": { "name": "flutter_plugin_android_lifecycle", - "sha256": "9ee02950848f61c4129af3d6ec84a1cfc0e47931abc746b03e7a3bc3e8ff6eda", + "sha256": "615a505aef59b151b46bbeef55b36ce2b6ed299d160c51d84281946f0aa0ce0e", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.22" + "version": "2.0.24" }, "flutter_rust_bridge": { "dependency": "transitive", "description": { "name": "flutter_rust_bridge", - "sha256": "02720226035257ad0b571c1256f43df3e1556a499f6bcb004849a0faaa0e87f0", + "sha256": "0ad5079de35d317650fec59b26cb4d0c116ebc2ce703a29f9367513b8a91c287", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.82.6" + "version": "2.5.0" }, "flutter_staggered_grid_view": { "dependency": "transitive", @@ -723,11 +763,11 @@ "dependency": "direct main", "description": { "name": "flutter_tabler_icons", - "sha256": "8096ec5754fe9449723a093fdfce8f9c301999edaedb464c851466eaed3c6657", + "sha256": "657c2201e12fa9121a12ddb4edb74d69290f803868eb6526f04102e6d49ec882", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.41.0" + "version": "1.43.0" }, "flutter_test": { "dependency": "direct dev", @@ -755,21 +795,21 @@ "dependency": "transitive", "description": { "name": "functional_listener", - "sha256": "ee8ffc29b2448981d96addf44ac9b4af2ba4ca2627979e77d3e6fe59b967ca4f", + "sha256": "c096db771b4ce7ba0f886cc4a761044b11e8276a7bc24cfc812dc4b2bc6f5b16", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.0" + "version": "4.1.0" }, "get_it": { "dependency": "transitive", "description": { "name": "get_it", - "sha256": "ff97e5e7b2e82e63c82f5658c6ba2605ea831f0f7489b0d2fb255d817ec4eb5e", + "sha256": "f126a3e286b7f5b578bf436d5592968706c4c1de28a228b870ce375d9f743103", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.0.0" + "version": "8.0.3" }, "github": { "dependency": "direct main", @@ -855,31 +895,31 @@ "dependency": "transitive", "description": { "name": "http_multi_server", - "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b", + "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.1" + "version": "3.2.2" }, "http_parser": { "dependency": "transitive", "description": { "name": "http_parser", - "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b", + "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.2" + "version": "4.1.2" }, "image": { "dependency": "transitive", "description": { "name": "image", - "sha256": "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8", + "sha256": "8346ad4b5173924b5ddddab782fc7d8a6300178c8b1dc427775405a01701c4a6", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.2.0" + "version": "4.5.2" }, "intl": { "dependency": "direct main", @@ -895,11 +935,11 @@ "dependency": "transitive", "description": { "name": "io", - "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e", + "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.4" + "version": "1.0.5" }, "irondash_engine_context": { "dependency": "transitive", @@ -925,11 +965,11 @@ "dependency": "transitive", "description": { "name": "js", - "sha256": "f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3", + "sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.7" + "version": "0.7.1" }, "json_annotation": { "dependency": "transitive", @@ -941,25 +981,35 @@ "source": "hosted", "version": "4.9.0" }, + "lastfm": { + "dependency": "direct main", + "description": { + "name": "lastfm", + "sha256": "8252b5d8f62625ca465a7f24da3afe851e1cf3d94d75a9ca94f6638e5764dd9f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.6" + }, "leak_tracker": { "dependency": "transitive", "description": { "name": "leak_tracker", - "sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05", + "sha256": "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.0.5" + "version": "10.0.7" }, "leak_tracker_flutter_testing": { "dependency": "transitive", "description": { "name": "leak_tracker_flutter_testing", - "sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806", + "sha256": "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.5" + "version": "3.0.8" }, "leak_tracker_testing": { "dependency": "transitive", @@ -975,11 +1025,11 @@ "dependency": "transitive", "description": { "name": "lints", - "sha256": "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235", + "sha256": "c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.0" + "version": "5.1.1" }, "list_counter": { "dependency": "transitive", @@ -991,25 +1041,35 @@ "source": "hosted", "version": "1.0.2" }, + "listenbrainz_dart": { + "dependency": "direct main", + "description": { + "name": "listenbrainz_dart", + "sha256": "bb8607c14aa6a7a0edcc5f70460238b75ba3c8c18be11731bd37458f3b0f1f64", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.4" + }, "logging": { "dependency": "transitive", "description": { "name": "logging", - "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340", + "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.0" + "version": "1.3.0" }, "lottie": { "dependency": "transitive", "description": { "name": "lottie", - "sha256": "6a24ade5d3d918c306bb1c21a6b9a04aab0489d51a2582522eea820b4093b62b", + "sha256": "c5fa04a80a620066c15cf19cc44773e19e9b38e989ff23ea32e5903ef1015950", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.2" + "version": "3.3.1" }, "m3u_parser_nullsafe": { "dependency": "direct main", @@ -1025,21 +1085,21 @@ "dependency": "transitive", "description": { "name": "macros", - "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536", + "sha256": "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.2-main.4" + "version": "0.1.3-main.0" }, "markdown": { "dependency": "transitive", "description": { "name": "markdown", - "sha256": "ef2a1298144e3f985cc736b22e0ccdaf188b5b3970648f2d9dc13efd1d9df051", + "sha256": "935e23e1ff3bc02d390bad4d4be001208ee92cc217cb5b5a6c19bc14aaa318c1", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.2.2" + "version": "7.3.0" }, "matcher": { "dependency": "transitive", @@ -1061,14 +1121,25 @@ "source": "hosted", "version": "0.11.1" }, - "media_kit": { - "dependency": "direct main", + "matrix4_transform": { + "dependency": "transitive", "description": { - "name": "media_kit", - "sha256": "1f1deee148533d75129a6f38251ff8388e33ee05fc2d20a6a80e57d6051b7b62", + "name": "matrix4_transform", + "sha256": "1346e53517e3081d3e8362377be97e285e2bd348855c177eae2a18aa965cafa0", "url": "https://pub.dev" }, "source": "hosted", + "version": "4.0.1" + }, + "media_kit": { + "dependency": "direct main", + "description": { + "path": "media_kit", + "ref": "HEAD", + "resolved-ref": "4d8c634c28d439384aab40b9d2edff83077f37c9", + "url": "https://github.com/media-kit/media-kit" + }, + "source": "git", "version": "1.1.11" }, "media_kit_libs_android_video": { @@ -1114,11 +1185,12 @@ "media_kit_libs_video": { "dependency": "direct main", "description": { - "name": "media_kit_libs_video", - "sha256": "20bb4aefa8fece282b59580e1cd8528117297083a6640c98c2e98cfc96b93288", - "url": "https://pub.dev" + "path": "libs/universal/media_kit_libs_video", + "ref": "HEAD", + "resolved-ref": "4d8c634c28d439384aab40b9d2edff83077f37c9", + "url": "https://github.com/media-kit/media-kit" }, - "source": "hosted", + "source": "git", "version": "1.0.5" }, "media_kit_libs_windows_video": { @@ -1131,27 +1203,16 @@ "source": "hosted", "version": "1.0.10" }, - "media_kit_native_event_loop": { - "dependency": "direct overridden", - "description": { - "path": "media_kit_native_event_loop", - "ref": "13f6b3f0ef9ccf8a711e396bc49cb05af9b3e497", - "resolved-ref": "13f6b3f0ef9ccf8a711e396bc49cb05af9b3e497", - "url": "https://github.com/media-kit/media-kit" - }, - "source": "git", - "version": "1.0.8" - }, "media_kit_video": { "dependency": "direct main", "description": { "path": "media_kit_video", - "ref": "13f6b3f0ef9ccf8a711e396bc49cb05af9b3e497", - "resolved-ref": "13f6b3f0ef9ccf8a711e396bc49cb05af9b3e497", + "ref": "HEAD", + "resolved-ref": "4d8c634c28d439384aab40b9d2edff83077f37c9", "url": "https://github.com/media-kit/media-kit" }, "source": "git", - "version": "1.2.4" + "version": "1.2.5" }, "meta": { "dependency": "transitive", @@ -1164,34 +1225,24 @@ "version": "1.15.0" }, "mime": { - "dependency": "direct main", + "dependency": "transitive", "description": { "name": "mime", - "sha256": "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a", + "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.6" - }, - "mime_type": { - "dependency": "direct main", - "description": { - "name": "mime_type", - "sha256": "d652b613e84dac1af28030a9fba82c0999be05b98163f9e18a0849c6e63838bb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.1" + "version": "2.0.0" }, "mockito": { "dependency": "direct main", "description": { "name": "mockito", - "sha256": "6841eed20a7befac0ce07df8116c8b8233ed1f4486a7647c7fc5a02ae6163917", + "sha256": "f99d8d072e249f719a5531735d146d8cf04c580d93920b04de75bef6dfb2daf6", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.4.4" + "version": "5.4.5" }, "nm": { "dependency": "transitive", @@ -1217,41 +1268,41 @@ "dependency": "transitive", "description": { "name": "package_config", - "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd", + "sha256": "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "2.1.1" }, "package_info_plus": { "dependency": "direct main", "description": { "name": "package_info_plus", - "sha256": "a75164ade98cb7d24cfd0a13c6408927c6b217fa60dee5a7ff5c116a58f28918", + "sha256": "739e0a5c3c4055152520fa321d0645ee98e932718b4c8efeeb51451968fe0790", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.0.2" + "version": "8.1.3" }, "package_info_plus_platform_interface": { "dependency": "transitive", "description": { "name": "package_info_plus_platform_interface", - "sha256": "ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66", + "sha256": "a5ef9986efc7bf772f2696183a3992615baa76c1ffb1189318dd8803778fb05b", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.1" + "version": "3.0.2" }, "palette_generator": { "dependency": "direct main", "description": { "name": "palette_generator", - "sha256": "d50fbcd69abb80c5baec66d700033b1a320108b1aa17a5961866a12c0abb7c0c", + "sha256": "0b20245c451f14a5ca0818ab7a377765162389f8e8f0db361cceabf0fed9d1ea", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.3+4" + "version": "0.3.3+5" }, "path": { "dependency": "direct main", @@ -1267,41 +1318,41 @@ "dependency": "transitive", "description": { "name": "path_parsing", - "sha256": "e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf", + "sha256": "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.1" + "version": "1.1.0" }, "path_provider": { "dependency": "direct main", "description": { "name": "path_provider", - "sha256": "fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378", + "sha256": "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.4" + "version": "2.1.5" }, "path_provider_android": { "dependency": "transitive", "description": { "name": "path_provider_android", - "sha256": "6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7", + "sha256": "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.10" + "version": "2.2.15" }, "path_provider_foundation": { "dependency": "transitive", "description": { "name": "path_provider_foundation", - "sha256": "f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16", + "sha256": "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.0" + "version": "2.4.1" }, "path_provider_linux": { "dependency": "transitive", @@ -1333,6 +1384,66 @@ "source": "hosted", "version": "2.3.0" }, + "permission_handler": { + "dependency": "direct main", + "description": { + "name": "permission_handler", + "sha256": "18bf33f7fefbd812f37e72091a15575e72d5318854877e0e4035a24ac1113ecb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "11.3.1" + }, + "permission_handler_android": { + "dependency": "transitive", + "description": { + "name": "permission_handler_android", + "sha256": "71bbecfee799e65aff7c744761a57e817e73b738fedf62ab7afd5593da21f9f1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "12.0.13" + }, + "permission_handler_apple": { + "dependency": "transitive", + "description": { + "name": "permission_handler_apple", + "sha256": "e6f6d73b12438ef13e648c4ae56bd106ec60d17e90a59c4545db6781229082a0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.4.5" + }, + "permission_handler_html": { + "dependency": "transitive", + "description": { + "name": "permission_handler_html", + "sha256": "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.3+5" + }, + "permission_handler_platform_interface": { + "dependency": "transitive", + "description": { + "name": "permission_handler_platform_interface", + "sha256": "e9c8eadee926c4532d0305dff94b85bf961f16759c3af791486613152af4b4f9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.2.3" + }, + "permission_handler_windows": { + "dependency": "transitive", + "description": { + "name": "permission_handler_windows", + "sha256": "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.1" + }, "petitparser": { "dependency": "transitive", "description": { @@ -1347,8 +1458,8 @@ "dependency": "direct main", "description": { "path": ".", - "ref": "fe7b369cdf03a15c735c866584a251da68f3a716", - "resolved-ref": "fe7b369cdf03a15c735c866584a251da68f3a716", + "ref": "e357331e9acffc5c82627df8107e47a452ee16b9", + "resolved-ref": "e357331e9acffc5c82627df8107e47a452ee16b9", "url": "https://github.com/ubuntu-flutter-community/phoenix_theme" }, "source": "git", @@ -1368,11 +1479,11 @@ "dependency": "transitive", "description": { "name": "platform", - "sha256": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65", + "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.5" + "version": "3.1.6" }, "platform_linux": { "dependency": "transitive", @@ -1408,11 +1519,11 @@ "dependency": "direct main", "description": { "name": "podcast_search", - "sha256": "c2ca2529a7f561827cc62db6c4fba6cade0249936455912a902688125c90bd5c", + "sha256": "30eae661851bcdba2a10007b350cd0633374bbe688a98e82e2b5bf45f2742cd8", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.3" + "version": "0.7.4" }, "pointycastle": { "dependency": "transitive", @@ -1434,35 +1545,35 @@ "source": "hosted", "version": "1.5.1" }, + "posix": { + "dependency": "transitive", + "description": { + "name": "posix", + "sha256": "a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.1" + }, "pub_semver": { "dependency": "transitive", "description": { "name": "pub_semver", - "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c", + "sha256": "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.4" + "version": "2.1.5" }, "pubspec_parse": { "dependency": "transitive", "description": { "name": "pubspec_parse", - "sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8", + "sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" - }, - "puppeteer": { - "dependency": "transitive", - "description": { - "name": "puppeteer", - "sha256": "fc33b2a12731e0b9e16c40cd91ea2b6886bcc24037a435fceb59b786d4074f2b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.15.0" + "version": "1.5.0" }, "radio_browser_api": { "dependency": "direct main", @@ -1488,11 +1599,11 @@ "dependency": "transitive", "description": { "name": "rss_dart", - "sha256": "81bbcc1a5205546f2a85ebadf8f29f5b090ccb5781f400f3713cf02f1cc992ee", + "sha256": "81d45b53c88eac17991edf2ecdd468423c542c0290fa2950a3bea9affa0e956b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.10" + "version": "1.0.12" }, "rxdart": { "dependency": "transitive", @@ -1518,81 +1629,81 @@ "dependency": "transitive", "description": { "name": "safe_local_storage", - "sha256": "ede4eb6cb7d88a116b3d3bf1df70790b9e2038bc37cb19112e381217c74d9440", + "sha256": "e9a21b6fec7a8aa62cc2585ff4c1b127df42f3185adbd2aca66b47abe2e80236", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.2" - }, - "screen_brightness": { - "dependency": "transitive", - "description": { - "name": "screen_brightness", - "sha256": "ed8da4a4511e79422fc1aa88138e920e4008cd312b72cdaa15ccb426c0faaedd", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.2.2+1" + "version": "2.0.1" }, "screen_brightness_android": { "dependency": "transitive", "description": { "name": "screen_brightness_android", - "sha256": "3df10961e3a9e968a5e076fe27e7f4741fa8a1d3950bdeb48cf121ed529d0caf", + "sha256": "ff9141bed547db02233e7dd88f990ab01973a0c8a8c04ddb855c7b072f33409a", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.0+2" - }, - "screen_brightness_ios": { - "dependency": "transitive", - "description": { - "name": "screen_brightness_ios", - "sha256": "99adc3ca5490b8294284aad5fcc87f061ad685050e03cf45d3d018fe398fd9a2", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.0" - }, - "screen_brightness_macos": { - "dependency": "transitive", - "description": { - "name": "screen_brightness_macos", - "sha256": "64b34e7e3f4900d7687c8e8fb514246845a73ecec05ab53483ed025bd4a899fd", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.0+1" + "version": "2.1.0" }, "screen_brightness_platform_interface": { "dependency": "transitive", "description": { "name": "screen_brightness_platform_interface", - "sha256": "b211d07f0c96637a15fb06f6168617e18030d5d74ad03795dd8547a52717c171", + "sha256": "737bd47b57746bc4291cab1b8a5843ee881af499514881b0247ec77447ee769c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.0" - }, - "screen_brightness_windows": { - "dependency": "transitive", - "description": { - "name": "screen_brightness_windows", - "sha256": "9261bf33d0fc2707d8cf16339ce25768100a65e70af0fcabaf032fc12408ba86", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.3" + "version": "2.1.0" }, "screen_retriever": { "dependency": "transitive", "description": { "name": "screen_retriever", - "sha256": "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90", + "sha256": "570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.9" + "version": "0.2.0" + }, + "screen_retriever_linux": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_linux", + "sha256": "f7f8120c92ef0784e58491ab664d01efda79a922b025ff286e29aa123ea3dd18", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_macos": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_macos", + "sha256": "71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_platform_interface": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_platform_interface", + "sha256": "ee197f4581ff0d5608587819af40490748e1e39e648d7680ecf95c05197240c0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_windows": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_windows", + "sha256": "449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" }, "scroll_to_index": { "dependency": "direct main", @@ -1608,31 +1719,31 @@ "dependency": "direct main", "description": { "name": "shared_preferences", - "sha256": "746e5369a43170c25816cc472ee016d3a66bc13fcf430c0bc41ad7b4b2922051", + "sha256": "a752ce92ea7540fc35a0d19722816e04d0e72828a4200e83a98cf1a1eb524c9a", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.2" + "version": "2.3.5" }, "shared_preferences_android": { "dependency": "transitive", "description": { "name": "shared_preferences_android", - "sha256": "480ba4345773f56acda9abf5f50bd966f581dac5d514e5fc4a18c62976bbba7e", + "sha256": "bf808be89fe9dc467475e982c1db6c2faf3d2acf54d526cd5ec37d86c99dbd84", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.2" + "version": "2.4.1" }, "shared_preferences_foundation": { "dependency": "transitive", "description": { "name": "shared_preferences_foundation", - "sha256": "c4b35f6cb8f63c147312c054ce7c2254c8066745125264f0c88739c417fc9d9f", + "sha256": "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.2" + "version": "2.5.4" }, "shared_preferences_linux": { "dependency": "transitive", @@ -1678,31 +1789,21 @@ "dependency": "transitive", "description": { "name": "shelf", - "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4", + "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.4.1" - }, - "shelf_static": { - "dependency": "transitive", - "description": { - "name": "shelf_static", - "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.3" + "version": "1.4.2" }, "shelf_web_socket": { "dependency": "transitive", "description": { "name": "shelf_web_socket", - "sha256": "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1", + "sha256": "cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.4" + "version": "2.0.1" }, "shimmer": { "dependency": "direct main", @@ -1718,27 +1819,27 @@ "dependency": "transitive", "description": "flutter", "source": "sdk", - "version": "0.0.99" + "version": "0.0.0" }, "smtc_windows": { "dependency": "direct main", "description": { "name": "smtc_windows", - "sha256": "0fd64d0c6a0c8ea4ea7908d31195eadc8f6d45d5245159fc67259e9e8704100f", + "sha256": "80f7c10867da485ffdf87f842bf27e6763589933c18c11af5dc1cd1e158c3154", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.3" + "version": "1.0.0" }, "source_gen": { "dependency": "transitive", "description": { "name": "source_gen", - "sha256": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832", + "sha256": "35c8150ece9e8c8d263337a265153c3329667640850b9304861faea59fc98f6b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.5.0" + "version": "2.0.0" }, "source_span": { "dependency": "transitive", @@ -1764,31 +1865,61 @@ "dependency": "transitive", "description": { "name": "sqflite", - "sha256": "a43e5a27235518c03ca238e7b4732cf35eabe863a369ceba6cbefa537a66f16d", + "sha256": "2d7299468485dca85efeeadf5d38986909c5eb0cd71fd3db2c2f000e6c9454bb", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.3+1" + "version": "2.4.1" + }, + "sqflite_android": { + "dependency": "transitive", + "description": { + "name": "sqflite_android", + "sha256": "78f489aab276260cdd26676d2169446c7ecd3484bbd5fead4ca14f3ed4dd9ee3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" }, "sqflite_common": { "dependency": "transitive", "description": { "name": "sqflite_common", - "sha256": "4058172e418eb7e7f2058dcb7657d451a8fc264afa0dea4dbd0f304a57131611", + "sha256": "761b9740ecbd4d3e66b8916d784e581861fd3c3553eda85e167bc49fdb68f709", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.4+3" + "version": "2.5.4+6" + }, + "sqflite_darwin": { + "dependency": "transitive", + "description": { + "name": "sqflite_darwin", + "sha256": "22adfd9a2c7d634041e96d6241e6e1c8138ca6817018afc5d443fef91dcefa9c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1+1" + }, + "sqflite_platform_interface": { + "dependency": "transitive", + "description": { + "name": "sqflite_platform_interface", + "sha256": "8dd4515c7bdcae0a785b0062859336de775e8c65db81ae33dd5445f35be61920", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" }, "stack_trace": { "dependency": "transitive", "description": { "name": "stack_trace", - "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", + "sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.11.1" + "version": "1.12.0" }, "state_notifier": { "dependency": "transitive", @@ -1814,71 +1945,71 @@ "dependency": "transitive", "description": { "name": "stream_transform", - "sha256": "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f", + "sha256": "ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "2.1.1" }, "string_scanner": { "dependency": "transitive", "description": { "name": "string_scanner", - "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde", + "sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.0" + "version": "1.3.0" }, "super_clipboard": { "dependency": "transitive", "description": { "name": "super_clipboard", - "sha256": "cfeb142360fac67e0da1ca339accb892eb790c6528a218a008eef1709d96ed0f", + "sha256": "4a6ae6dfaa282ec1f2bff750976f535517ed8ca842d5deae13985eb11c00ac1f", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.8.22" + "version": "0.8.24" }, "super_drag_and_drop": { "dependency": "direct main", "description": { "name": "super_drag_and_drop", - "sha256": "25158161d1b114ffba0d358c3508f5a4b88a18becacffcd785c17574670204d6", + "sha256": "e1ea1528916a728b3d0c3007c0af1303947026011f78564279af68d8856a0205", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.8.22" + "version": "0.8.24" }, "super_native_extensions": { "dependency": "transitive", "description": { "name": "super_native_extensions", - "sha256": "6a7cfb7d212da7023b86fb99c736081e9c2cd982265d15dc5fe6381a32dbc875", + "sha256": "a433bba8186cd6b707560c42535bf284804665231c00bca86faf1aa4968b7637", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.8.22" + "version": "0.8.24" }, "synchronized": { "dependency": "transitive", "description": { "name": "synchronized", - "sha256": "51b08572b9f091f8c3eb4d9d4be253f196ff0075d5ec9b10a884026d5b55d7bc", + "sha256": "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.3.0+2" + "version": "3.3.0+3" }, "system_theme": { "dependency": "direct main", "description": { "name": "system_theme", - "sha256": "9396b69e74cdd1524daf26c0c33f4968d5ada1ff948a31f031cf6398869b589f", + "sha256": "5f93485401689601d4636a695f99f7c70a30873ee68c1d95025d908a3386be7e", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.1" + "version": "3.1.2" }, "system_theme_web": { "dependency": "transitive", @@ -1904,41 +2035,31 @@ "dependency": "transitive", "description": { "name": "test_api", - "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb", + "sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.2" + "version": "0.7.3" }, "timing": { "dependency": "transitive", "description": { "name": "timing", - "sha256": "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32", + "sha256": "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.1" - }, - "tuple": { - "dependency": "transitive", - "description": { - "name": "tuple", - "sha256": "a97ce2013f240b2f3807bcbaf218765b6f301c3eff91092bcfa23a039e7dd151", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.2" + "version": "1.0.2" }, "typed_data": { "dependency": "transitive", "description": { "name": "typed_data", - "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c", + "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.2" + "version": "1.4.0" }, "universal_platform": { "dependency": "transitive", @@ -1954,61 +2075,61 @@ "dependency": "transitive", "description": { "name": "uri_parser", - "sha256": "6543c9fd86d2862fac55d800a43e67c0dcd1a41677cb69c2f8edfe73bbcf1835", + "sha256": "ff4d2c720aca3f4f7d5445e23b11b2d15ef8af5ddce5164643f38ff962dcb270", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.2" + "version": "3.0.0" }, "url_launcher": { "dependency": "direct main", "description": { "name": "url_launcher", - "sha256": "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.3.0" - }, - "url_launcher_android": { - "dependency": "transitive", - "description": { - "name": "url_launcher_android", - "sha256": "e35a698ac302dd68e41f73250bd9517fe3ab5fa4f18fe4647a0872db61bacbab", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.3.10" - }, - "url_launcher_ios": { - "dependency": "transitive", - "description": { - "name": "url_launcher_ios", - "sha256": "e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e", + "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603", "url": "https://pub.dev" }, "source": "hosted", "version": "6.3.1" }, + "url_launcher_android": { + "dependency": "transitive", + "description": { + "name": "url_launcher_android", + "sha256": "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.14" + }, + "url_launcher_ios": { + "dependency": "transitive", + "description": { + "name": "url_launcher_ios", + "sha256": "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.2" + }, "url_launcher_linux": { "dependency": "transitive", "description": { "name": "url_launcher_linux", - "sha256": "e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af", + "sha256": "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.0" + "version": "3.2.1" }, "url_launcher_macos": { "dependency": "transitive", "description": { "name": "url_launcher_macos", - "sha256": "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de", + "sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.0" + "version": "3.2.2" }, "url_launcher_platform_interface": { "dependency": "transitive", @@ -2024,31 +2145,31 @@ "dependency": "transitive", "description": { "name": "url_launcher_web", - "sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e", + "sha256": "3ba963161bd0fe395917ba881d320b9c4f6dd3c4a233da62ab18a5025c85f1e9", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.3" + "version": "2.4.0" }, "url_launcher_windows": { "dependency": "transitive", "description": { "name": "url_launcher_windows", - "sha256": "49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185", + "sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.2" + "version": "3.1.4" }, "uuid": { - "dependency": "direct overridden", + "dependency": "transitive", "description": { "name": "uuid", - "sha256": "f33d6bb662f0e4f79dcd7ada2e6170f3b3a2530c28fc41f49a411ddedd576a77", + "sha256": "a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.5.0" + "version": "4.5.1" }, "vector_math": { "dependency": "transitive", @@ -2064,11 +2185,11 @@ "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d", + "sha256": "f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b", "url": "https://pub.dev" }, "source": "hosted", - "version": "14.2.5" + "version": "14.3.0" }, "volume_controller": { "dependency": "transitive", @@ -2084,71 +2205,81 @@ "dependency": "transitive", "description": { "name": "wakelock_plus", - "sha256": "bf4ee6f17a2fa373ed3753ad0e602b7603f8c75af006d5b9bdade263928c0484", + "sha256": "36c88af0b930121941345306d259ec4cc4ecca3b151c02e3a9e71aede83c615e", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.8" + "version": "1.2.10" }, "wakelock_plus_platform_interface": { "dependency": "transitive", "description": { "name": "wakelock_plus_platform_interface", - "sha256": "422d1cdbb448079a8a62a5a770b69baa489f8f7ca21aef47800c726d404f9d16", + "sha256": "70e780bc99796e1db82fe764b1e7dcb89a86f1e5b3afb1db354de50f2e41eb7a", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.1" + "version": "1.2.2" }, "watch_it": { "dependency": "direct main", "description": { "name": "watch_it", - "sha256": "a45ea7d5e841e96f904896f4783cc1820257c591f130d1513e89eaceaa528a28", + "sha256": "8ce7e442a65ef81db155dc505594f1856660fa5dd068471a1fe9c5eeaced9b93", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.5.0" + "version": "1.6.2" }, "watcher": { "dependency": "transitive", "description": { "name": "watcher", - "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8", + "sha256": "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "1.1.1" }, "web": { "dependency": "transitive", "description": { "name": "web", - "sha256": "d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062", + "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.0" + "version": "1.1.0" + }, + "web_socket": { + "dependency": "transitive", + "description": { + "name": "web_socket", + "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.6" }, "web_socket_channel": { "dependency": "transitive", "description": { "name": "web_socket_channel", - "sha256": "d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b", + "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.0" + "version": "3.0.1" }, "win32": { "dependency": "direct main", "description": { "name": "win32", - "sha256": "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a", + "sha256": "154360849a56b7b67331c21f09a386562d88903f90a1099c5987afc1912e1f29", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.5.4" + "version": "5.10.0" }, "win32_registry": { "dependency": "transitive", @@ -2164,21 +2295,21 @@ "dependency": "direct main", "description": { "name": "window_manager", - "sha256": "ab8b2a7f97543d3db2b506c9d875e637149d48ee0c6a5cb5f5fd6e0dac463792", + "sha256": "732896e1416297c63c9e3fb95aea72d0355f61390263982a47fd519169dc5059", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.4.2" + "version": "0.4.3" }, "xdg_directories": { "dependency": "direct main", "description": { "name": "xdg_directories", - "sha256": "faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d", + "sha256": "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.4" + "version": "1.1.0" }, "xml": { "dependency": "transitive", @@ -2194,21 +2325,22 @@ "dependency": "transitive", "description": { "name": "yaml", - "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5", + "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.2" + "version": "3.1.3" }, "yaru": { "dependency": "direct main", "description": { - "name": "yaru", - "sha256": "9e07131b9c3b9997d7784c3cb6ad24a218f8e0507d82f8fb07b7e160e111236d", - "url": "https://pub.dev" + "path": ".", + "ref": "4a943961ad6c1d382b1bfc3bc0e67bb9f6440089", + "resolved-ref": "4a943961ad6c1d382b1bfc3bc0e67bb9f6440089", + "url": "https://github.com/ubuntu/yaru.dart" }, - "source": "hosted", - "version": "5.2.1" + "source": "git", + "version": "6.0.0" }, "yaru_window": { "dependency": "direct main", @@ -2262,7 +2394,7 @@ } }, "sdks": { - "dart": ">=3.5.0 <4.0.0", - "flutter": ">=3.24.3" + "dart": ">=3.6.0 <4.0.0", + "flutter": ">=3.27.2" } } From 8b223bcba08ae575997f808a21ccf868f11c2d6b Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 9 Feb 2025 13:16:39 -0600 Subject: [PATCH 0793/2168] vimPlugins.avante-nvim: 0.0.16 -> 0.0.18 --- .../vim/plugins/non-generated/avante-nvim/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix index d752fb873f57..c90219bb7890 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix @@ -10,19 +10,19 @@ vimUtils, }: let - version = "0.0.16"; + version = "0.0.18"; src = fetchFromGitHub { owner = "yetone"; repo = "avante.nvim"; tag = "v${version}"; - hash = "sha256-rnd+ASzKTOF3JXjbq6JaNd/tYPpEIvzKK0TZHmDJ+MQ="; + hash = "sha256-HSXqD+bC0sdvNbmV8hIU99cLrVyIMAzbWf5cqUpIhZU="; }; avante-nvim-lib = rustPlatform.buildRustPackage { pname = "avante-nvim-lib"; inherit version src; useFetchCargoVendor = true; - cargoHash = "sha256-KbGRt5gKsXFRFMTcwK0db53Ul7M3jMFda4m+sRjXi2Y="; + cargoHash = "sha256-XDxWeEbsDf4r346OkQkZPmYLANgtydspPk1uLrnvrnY="; nativeBuildInputs = [ pkg-config @@ -39,6 +39,7 @@ let "--skip=test_hf" "--skip=test_public_url" "--skip=test_roundtrip" + "--skip=test_fetch_md" ]; }; in From 41b9d91a495f4714a7b54c7bc838b951f09203a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=20I=20N=20U=20X=20=28=20=E3=83=AA=E3=83=8A=E3=83=83?= =?UTF-8?q?=E3=82=AF=E3=82=B9=20=29?= Date: Sun, 9 Feb 2025 16:22:01 -0300 Subject: [PATCH 0794/2168] tuicam: init at 0.0.2 (#377825) --- pkgs/by-name/tu/tuicam/package.nix | 52 ++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 pkgs/by-name/tu/tuicam/package.nix diff --git a/pkgs/by-name/tu/tuicam/package.nix b/pkgs/by-name/tu/tuicam/package.nix new file mode 100644 index 000000000000..6fd231e74e9e --- /dev/null +++ b/pkgs/by-name/tu/tuicam/package.nix @@ -0,0 +1,52 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + autoPatchelfHook, + pkg-config, + udev, + opencv, + clang, + nix-update-script, +}: +rustPlatform.buildRustPackage rec { + pname = "tuicam"; + version = "0.0.2"; + + src = fetchFromGitHub { + owner = "hlsxx"; + repo = "tuicam"; + tag = "v${version}"; + hash = "sha256-4Ae9SIhKNIdHReQbAwZbxErBA66Y7IxKj5M4kEFrplA="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-Mvf5isXN8DQhL8fpYUn0seAFlqVeBF8apaL7RQqtjmU="; + + nativeBuildInputs = [ + autoPatchelfHook + pkg-config + clang + rustPlatform.bindgenHook + ]; + + buildInputs = [ + udev + opencv + ]; + + # Test require Camera Hardware + doCheck = false; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Terminal-based camera with switchable modes"; + homepage = "https://github.com/hlsxx/tuicam"; + changelog = "https://github.com/hlsxx/tuicam/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ linuxmobile ]; + platforms = lib.platforms.linux; + mainProgram = "tuicam"; + }; +} From 9aefcbba8900e376fa2dab2951d83a2790ea02df Mon Sep 17 00:00:00 2001 From: Petr Zahradnik Date: Sun, 9 Feb 2025 20:22:20 +0100 Subject: [PATCH 0795/2168] truecrack: fix build on gcc-14 --- .../tr/truecrack/fix-empty-return.patch | 11 ++++ pkgs/by-name/tr/truecrack/package.nix | 63 ++++++++++++++----- 2 files changed, 60 insertions(+), 14 deletions(-) create mode 100644 pkgs/by-name/tr/truecrack/fix-empty-return.patch diff --git a/pkgs/by-name/tr/truecrack/fix-empty-return.patch b/pkgs/by-name/tr/truecrack/fix-empty-return.patch new file mode 100644 index 000000000000..691d708ee53e --- /dev/null +++ b/pkgs/by-name/tr/truecrack/fix-empty-return.patch @@ -0,0 +1,11 @@ +--- a/src/Common/CpuCore.c ++++ b/src/Common/CpuCore.c +@@ -96,7 +96,7 @@ + derive_key_whirlpool ( word, wordlength+1, salt, PKCS5_SALT_SIZE, 1000, headerKey, cpu_GetMaxPkcs5OutSize ()); + else{ + perror("Key derivation function not supported"); +- return; ++ return 0; + } + + value=cpu_Xts(encryptionAlgorithm,encryptedHeader,headerKey,cpu_GetMaxPkcs5OutSize(), masterKey, &length); diff --git a/pkgs/by-name/tr/truecrack/package.nix b/pkgs/by-name/tr/truecrack/package.nix index c8fee97c8e1b..5c952f5ed409 100644 --- a/pkgs/by-name/tr/truecrack/package.nix +++ b/pkgs/by-name/tr/truecrack/package.nix @@ -6,6 +6,7 @@ config, cudaSupport ? config.cudaSupport, pkg-config, + versionCheckHook, }: gccStdenv.mkDerivation rec { @@ -15,10 +16,14 @@ gccStdenv.mkDerivation rec { src = fetchFromGitLab { owner = "kalilinux"; repo = "packages/truecrack"; - rev = "debian/${version}+git20150326-0kali1"; - sha256 = "+Rw9SfaQtO1AJO6UVVDMCo8DT0dYEbv7zX8SI+pHCRQ="; + tag = "kali/${version}+git20150326-0kali4"; + hash = "sha256-d6ld6KHSqYM4RymHf5qcm2AWK6FHWC0rFaLRfIQ2m5Q="; }; + patches = [ + ./fix-empty-return.patch + ]; + configureFlags = ( if cudaSupport then [ @@ -38,24 +43,54 @@ gccStdenv.mkDerivation rec { cudatoolkit ]; - # Workaround build failure on -fno-common toolchains like upstream - # gcc-10. Otherwise build fails as: - # ld: CpuAes.o:/build/source/src/Crypto/CpuAes.h:1233: multiple definition of - # `t_rc'; CpuCore.o:/build/source/src/Crypto/CpuAes.h:1237: first defined here - # TODO: remove on upstream fixes it: - # https://gitlab.com/kalilinux/packages/truecrack/-/issues/1 - env.NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = toString ([ + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: CpuAes.o:/build/source/src/Crypto/CpuAes.h:1233: multiple definition of + # `t_rc'; CpuCore.o:/build/source/src/Crypto/CpuAes.h:1237: first defined here + # TODO: remove on upstream fixes it: + # https://gitlab.com/kalilinux/packages/truecrack/-/issues/1 + "-fcommon" + # Function are declared after they are used in the file, this is error since gcc-14. + # Common/Crypto.c:42:13: error: implicit declaration of function 'cpu_CipherInit'; did you mean 'CipherInit'? [] + # https://gitlab.com/kalilinux/packages/truecrack/-/commit/5b0e3a96b747013bded7b33f65bb42be2dbafc86 + "-Wno-error=implicit-function-declaration" + ]); - installFlags = [ "prefix=$(out)" ]; enableParallelBuilding = true; - meta = with lib; { + installFlags = [ "prefix=$(out)" ]; + + doInstallCheck = true; + + installCheckPhase = '' + runHook preInstallCheck + + echo "Cracking test volumes" + $out/bin/${meta.mainProgram} -t test/ripemd160_aes.test.tc -w test/passwords.txt | grep -aF "Found password" + $out/bin/${meta.mainProgram} -t test/ripemd160_aes.test.tc -c test/tes -m 4 | grep -aF "Found password" + $out/bin/${meta.mainProgram} -t test/ripemd160_aes.test.tc -w test/passwords.txt | grep -aF "Found password" + $out/bin/${meta.mainProgram} -t test/whirlpool_aes.test.tc -w test/passwords.txt -k whirlpool | grep -aF "Found password" + $out/bin/${meta.mainProgram} -t test/sha512_aes.test.tc -w test/passwords.txt -k sha512 | grep -aF "Found password" + $out/bin/${meta.mainProgram} -t test/ripemd160_aes.test.tc -w test/passwords.txt | grep -aF "Found password" + $out/bin/${meta.mainProgram} -t test/ripemd160_serpent.test.tc -w test/passwords.txt -e serpent | grep -aF "Found password" + $out/bin/${meta.mainProgram} -t test/ripemd160_twofish.test.tc -w test/passwords.txt -e twofish | grep -aF "Found password" + echo "Finished cracking test volumes" + + runHook postInstallCheck + ''; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + + meta = { description = "Brute-force password cracker for TrueCrypt volumes, optimized for Nvidia Cuda technology"; mainProgram = "truecrack"; homepage = "https://gitlab.com/kalilinux/packages/truecrack"; broken = cudaSupport; - license = licenses.gpl3Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ ethancedwards8 ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ ethancedwards8 ]; }; } From a457935bb3fac8bec9c015c6985e3d9cff8b15f5 Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Sun, 9 Feb 2025 16:55:48 +0100 Subject: [PATCH 0796/2168] venta: fix broken symlink to marwaita The `venta` theme package contained a broken symlink to "../../Marwaita/plank" in "$out/share/themes/Venta/plank/plank". From the perspective of an FHS-compatible directory structure, this symlink certainly wants to point to "/share/themes/Marwaita/plank". So redirecting this symlink to point to that position inside the `marwaita` theme package is the right thing to do. The commit at hand thereby also fixes the `venta` package, as dangling symlinks are no longer tolerated due to the new `no-broken-symlinks` setup hook introduced in commit aa1405b6e792e6cb110c46a732ae53e445fc0eaf . --- pkgs/by-name/ve/venta/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ve/venta/package.nix b/pkgs/by-name/ve/venta/package.nix index 733f0aacac59..49d628894f11 100644 --- a/pkgs/by-name/ve/venta/package.nix +++ b/pkgs/by-name/ve/venta/package.nix @@ -6,6 +6,7 @@ gtk-engine-murrine, gtk_engines, librsvg, + marwaita, }: stdenv.mkDerivation rec { @@ -35,6 +36,7 @@ stdenv.mkDerivation rec { runHook preInstall mkdir -p $out/share/themes cp -a Venta* $out/share/themes + ln -sfT ${marwaita}/share/themes/Marwaita/plank $out/share/themes/Venta/plank/plank runHook postInstall ''; From 19a096fe9ff6ff1894d5bc8cb56cca081e954646 Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Sun, 9 Feb 2025 20:30:17 +0100 Subject: [PATCH 0797/2168] zotero: 7.0.10 -> 7.0.11 --- pkgs/by-name/zo/zotero/darwin.nix | 2 +- pkgs/by-name/zo/zotero/linux.nix | 2 +- pkgs/by-name/zo/zotero/package.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/zo/zotero/darwin.nix b/pkgs/by-name/zo/zotero/darwin.nix index 12697c31a085..adfc8329a160 100644 --- a/pkgs/by-name/zo/zotero/darwin.nix +++ b/pkgs/by-name/zo/zotero/darwin.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}.dmg"; - hash = "sha256-JP9zRPsEDICw6Q7VHRd7IB0J9+v0qU7QuLf7eTPafBo="; + hash = "sha256-JFzzOwZUhVy7DsD6xehKhhzIKe9j8IKseJTSWhYAkfM="; }; sourceRoot = "."; diff --git a/pkgs/by-name/zo/zotero/linux.nix b/pkgs/by-name/zo/zotero/linux.nix index 11da05257900..b45182f6b8f5 100644 --- a/pkgs/by-name/zo/zotero/linux.nix +++ b/pkgs/by-name/zo/zotero/linux.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - hash = "sha256-t0LApaU13tT/14nvRpnWZwFyWiJq+WfZNgVyhNayMcs="; + hash = "sha256-Sldg4sR+wG0XH00mCcns5cyfYzNg7RQP4v95VNM6Ru4="; }; dontPatchELF = true; diff --git a/pkgs/by-name/zo/zotero/package.nix b/pkgs/by-name/zo/zotero/package.nix index a56aef7d3ae7..4ae080c7a921 100644 --- a/pkgs/by-name/zo/zotero/package.nix +++ b/pkgs/by-name/zo/zotero/package.nix @@ -6,7 +6,7 @@ let pname = "zotero"; - version = "7.0.10"; + version = "7.0.11"; meta = { homepage = "https://www.zotero.org"; description = "Collect, organize, cite, and share your research sources"; From 9d049880c02badb14c36c28246bbabb84ab0303a Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Sun, 9 Feb 2025 10:52:32 +0100 Subject: [PATCH 0798/2168] tsm-client: fix symlink fixup `tsm-client` binary distribution apparently no longer contains any absolut `/usr/....` symlinks. On the other hand, there are some relative `..../opt/....` symlinks that haven't been fixed by the current build recipe. This fact got uncovered by the new `no-broken-symlinks` hook in aa1405b6e792e6cb110c46a732ae53e445fc0eaf . The commit at hand updates and shortens the symlink fixup code such that it blanketly fixes all `...../opt/....` symlinks by removing one `../` directory level for each target. --- pkgs/by-name/ts/tsm-client/package.nix | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/ts/tsm-client/package.nix b/pkgs/by-name/ts/tsm-client/package.nix index 4a0c20b02e3d..ff2d492613b9 100644 --- a/pkgs/by-name/ts/tsm-client/package.nix +++ b/pkgs/by-name/ts/tsm-client/package.nix @@ -131,22 +131,11 @@ let runHook postInstall ''; - # fix relative symlinks after `/usr` was moved up one level, - # fix absolute symlinks pointing to `/opt` + # fix symlinks pointing to `..../opt/....` preFixup = '' - for link in $out/lib{,64}/* $out/bin/* + for link in $(find $out -type l -lname '*../opt*') do - target=$(readlink "$link") - if [ "$(cut -b -6 <<< "$target")" != "../../" ] - then - echo "cannot fix this symlink: $link -> $target" - exit 1 - fi - ln --symbolic --force --no-target-directory "$out/$(cut -b 7- <<< "$target")" "$link" - done - for link in $(find $out -type l -lname '/opt/*') - do - ln --symbolic --force --no-target-directory "$out$(readlink "$link")" "$link" + ln --symbolic --force --no-target-directory "$(readlink "$link" | sed 's|../opt|opt|')" "$link" done ''; }); From 78ffd8bb3795c7f336ac599bd89bc1efbdace5a5 Mon Sep 17 00:00:00 2001 From: michaelBelsanti Date: Tue, 4 Feb 2025 19:26:14 -0500 Subject: [PATCH 0799/2168] proton-ge-bin: remove uneeded changes --- pkgs/by-name/pr/proton-ge-bin/package.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pr/proton-ge-bin/package.nix b/pkgs/by-name/pr/proton-ge-bin/package.nix index afb215ab43ba..051707f19fb0 100644 --- a/pkgs/by-name/pr/proton-ge-bin/package.nix +++ b/pkgs/by-name/pr/proton-ge-bin/package.nix @@ -34,8 +34,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { mkdir $steamcompattool ln -s $src/* $steamcompattool - rm $steamcompattool/{compatibilitytool.vdf,proton,version} - cp $src/{compatibilitytool.vdf,proton,version} $steamcompattool + rm $steamcompattool/compatibilitytool.vdf + cp $src/compatibilitytool.vdf $steamcompattool runHook postInstall ''; @@ -43,8 +43,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { preFixup = '' substituteInPlace "$steamcompattool/compatibilitytool.vdf" \ --replace-fail "${finalAttrs.version}" "${steamDisplayName}" - substituteInPlace "$steamcompattool/proton" \ - --replace-fail "${finalAttrs.version}" "${steamDisplayName}" ''; /* From b5b2a913f87470c9502c8b7ba4db6e4f4d3317bd Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 22 Jan 2025 14:14:28 +0100 Subject: [PATCH 0800/2168] nix/2_26: Add files --- .../package-management/nix/2_26/.version | 1 + .../nix/2_26/doc/manual/package.nix | 71 +++++++ .../nix/2_26/packaging/components.nix | 66 ++++++ .../nix/2_26/packaging/everything.nix | 192 ++++++++++++++++++ .../package-management/nix/2_26/source.json | 6 + .../2_26/src/external-api-docs/package.nix | 56 +++++ .../2_26/src/internal-api-docs/package.nix | 50 +++++ .../nix/2_26/src/libcmd/package.nix | 83 ++++++++ .../nix/2_26/src/libexpr-c/package.nix | 53 +++++ .../2_26/src/libexpr-test-support/package.nix | 57 ++++++ .../nix/2_26/src/libexpr-tests/package.nix | 79 +++++++ .../nix/2_26/src/libexpr/package.nix | 105 ++++++++++ .../2_26/src/libfetchers-tests/package.nix | 77 +++++++ .../nix/2_26/src/libfetchers/package.nix | 55 +++++ .../nix/2_26/src/libflake-c/package.nix | 55 +++++ .../nix/2_26/src/libflake-tests/package.nix | 80 ++++++++ .../nix/2_26/src/libflake/package.nix | 54 +++++ .../nix/2_26/src/libmain-c/package.nix | 57 ++++++ .../nix/2_26/src/libmain/package.nix | 51 +++++ .../nix/2_26/src/libstore-c/package.nix | 53 +++++ .../src/libstore-test-support/package.nix | 57 ++++++ .../nix/2_26/src/libstore-tests/package.nix | 95 +++++++++ .../nix/2_26/src/libstore/package.nix | 96 +++++++++ .../nix/2_26/src/libutil-c/package.nix | 51 +++++ .../2_26/src/libutil-test-support/package.nix | 55 +++++ .../nix/2_26/src/libutil-tests/package.nix | 78 +++++++ .../nix/2_26/src/libutil/package.nix | 81 ++++++++ .../nix/2_26/src/nix/package.nix | 105 ++++++++++ .../nix/2_26/src/perl/package.nix | 76 +++++++ .../nix/2_26/tests/functional/package.nix | 103 ++++++++++ 30 files changed, 2098 insertions(+) create mode 100644 pkgs/tools/package-management/nix/2_26/.version create mode 100644 pkgs/tools/package-management/nix/2_26/doc/manual/package.nix create mode 100644 pkgs/tools/package-management/nix/2_26/packaging/components.nix create mode 100644 pkgs/tools/package-management/nix/2_26/packaging/everything.nix create mode 100644 pkgs/tools/package-management/nix/2_26/source.json create mode 100644 pkgs/tools/package-management/nix/2_26/src/external-api-docs/package.nix create mode 100644 pkgs/tools/package-management/nix/2_26/src/internal-api-docs/package.nix create mode 100644 pkgs/tools/package-management/nix/2_26/src/libcmd/package.nix create mode 100644 pkgs/tools/package-management/nix/2_26/src/libexpr-c/package.nix create mode 100644 pkgs/tools/package-management/nix/2_26/src/libexpr-test-support/package.nix create mode 100644 pkgs/tools/package-management/nix/2_26/src/libexpr-tests/package.nix create mode 100644 pkgs/tools/package-management/nix/2_26/src/libexpr/package.nix create mode 100644 pkgs/tools/package-management/nix/2_26/src/libfetchers-tests/package.nix create mode 100644 pkgs/tools/package-management/nix/2_26/src/libfetchers/package.nix create mode 100644 pkgs/tools/package-management/nix/2_26/src/libflake-c/package.nix create mode 100644 pkgs/tools/package-management/nix/2_26/src/libflake-tests/package.nix create mode 100644 pkgs/tools/package-management/nix/2_26/src/libflake/package.nix create mode 100644 pkgs/tools/package-management/nix/2_26/src/libmain-c/package.nix create mode 100644 pkgs/tools/package-management/nix/2_26/src/libmain/package.nix create mode 100644 pkgs/tools/package-management/nix/2_26/src/libstore-c/package.nix create mode 100644 pkgs/tools/package-management/nix/2_26/src/libstore-test-support/package.nix create mode 100644 pkgs/tools/package-management/nix/2_26/src/libstore-tests/package.nix create mode 100644 pkgs/tools/package-management/nix/2_26/src/libstore/package.nix create mode 100644 pkgs/tools/package-management/nix/2_26/src/libutil-c/package.nix create mode 100644 pkgs/tools/package-management/nix/2_26/src/libutil-test-support/package.nix create mode 100644 pkgs/tools/package-management/nix/2_26/src/libutil-tests/package.nix create mode 100644 pkgs/tools/package-management/nix/2_26/src/libutil/package.nix create mode 100644 pkgs/tools/package-management/nix/2_26/src/nix/package.nix create mode 100644 pkgs/tools/package-management/nix/2_26/src/perl/package.nix create mode 100644 pkgs/tools/package-management/nix/2_26/tests/functional/package.nix diff --git a/pkgs/tools/package-management/nix/2_26/.version b/pkgs/tools/package-management/nix/2_26/.version new file mode 100644 index 000000000000..7a25c70f90cf --- /dev/null +++ b/pkgs/tools/package-management/nix/2_26/.version @@ -0,0 +1 @@ +2.26.0 diff --git a/pkgs/tools/package-management/nix/2_26/doc/manual/package.nix b/pkgs/tools/package-management/nix/2_26/doc/manual/package.nix new file mode 100644 index 000000000000..f8133f2e1dd1 --- /dev/null +++ b/pkgs/tools/package-management/nix/2_26/doc/manual/package.nix @@ -0,0 +1,71 @@ +{ lib +, mkMesonDerivation + +, meson +, ninja +, lowdown-unsandboxed +, mdbook +, mdbook-linkcheck +, jq +, python3 +, rsync +, nix-cli + +# Configuration Options + +, version +}: + +let + inherit (lib) fileset; +in + +mkMesonDerivation (finalAttrs: { + pname = "nix-manual"; + inherit version; + + workDir = ./.; + fileset = fileset.difference + (fileset.unions [ + ../../.version + # Too many different types of files to filter for now + ../../doc/manual + ./. + ]) + # Do a blacklist instead + ../../doc/manual/package.nix; + + # TODO the man pages should probably be separate + outputs = [ "out" "man" ]; + + # Hack for sake of the dev shell + passthru.externalNativeBuildInputs = [ + meson + ninja + (lib.getBin lowdown-unsandboxed) + mdbook + mdbook-linkcheck + jq + python3 + rsync + ]; + + nativeBuildInputs = finalAttrs.passthru.externalNativeBuildInputs ++ [ + nix-cli + ]; + + preConfigure = + '' + chmod u+w ./.version + echo ${finalAttrs.version} > ./.version + ''; + + postInstall = '' + mkdir -p ''$out/nix-support + echo "doc manual ''$out/share/doc/nix/manual" >> ''$out/nix-support/hydra-build-products + ''; + + meta = { + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/tools/package-management/nix/2_26/packaging/components.nix b/pkgs/tools/package-management/nix/2_26/packaging/components.nix new file mode 100644 index 000000000000..e1f661be8fbc --- /dev/null +++ b/pkgs/tools/package-management/nix/2_26/packaging/components.nix @@ -0,0 +1,66 @@ +{ + lib, + src, + officialRelease, +}: + +scope: + +let + inherit (scope) callPackage; + + baseVersion = lib.fileContents ../.version; + + versionSuffix = lib.optionalString (!officialRelease) "pre"; + + fineVersionSuffix = lib.optionalString + (!officialRelease) + "pre${builtins.substring 0 8 (src.lastModifiedDate or src.lastModified or "19700101")}_${src.shortRev or "dirty"}"; + + fineVersion = baseVersion + fineVersionSuffix; +in + +# This becomes the pkgs.nixComponents attribute set +{ + version = baseVersion + versionSuffix; + inherit versionSuffix; + + nix-util = callPackage ../src/libutil/package.nix { }; + nix-util-c = callPackage ../src/libutil-c/package.nix { }; + nix-util-test-support = callPackage ../src/libutil-test-support/package.nix { }; + nix-util-tests = callPackage ../src/libutil-tests/package.nix { }; + + nix-store = callPackage ../src/libstore/package.nix { }; + nix-store-c = callPackage ../src/libstore-c/package.nix { }; + nix-store-test-support = callPackage ../src/libstore-test-support/package.nix { }; + nix-store-tests = callPackage ../src/libstore-tests/package.nix { }; + + nix-fetchers = callPackage ../src/libfetchers/package.nix { }; + nix-fetchers-tests = callPackage ../src/libfetchers-tests/package.nix { }; + + nix-expr = callPackage ../src/libexpr/package.nix { }; + nix-expr-c = callPackage ../src/libexpr-c/package.nix { }; + nix-expr-test-support = callPackage ../src/libexpr-test-support/package.nix { }; + nix-expr-tests = callPackage ../src/libexpr-tests/package.nix { }; + + nix-flake = callPackage ../src/libflake/package.nix { }; + nix-flake-c = callPackage ../src/libflake-c/package.nix { }; + nix-flake-tests = callPackage ../src/libflake-tests/package.nix { }; + + nix-main = callPackage ../src/libmain/package.nix { }; + nix-main-c = callPackage ../src/libmain-c/package.nix { }; + + nix-cmd = callPackage ../src/libcmd/package.nix { }; + + nix-cli = callPackage ../src/nix/package.nix { version = fineVersion; }; + + nix-functional-tests = callPackage ../src/nix-functional-tests/package.nix { version = fineVersion; }; + + nix-manual = callPackage ../doc/manual/package.nix { version = fineVersion; }; + nix-internal-api-docs = callPackage ../src/internal-api-docs/package.nix { version = fineVersion; }; + nix-external-api-docs = callPackage ../src/external-api-docs/package.nix { version = fineVersion; }; + + nix-perl-bindings = callPackage ../src/perl/package.nix { }; + + nix-everything = callPackage ../packaging/everything.nix { }; +} diff --git a/pkgs/tools/package-management/nix/2_26/packaging/everything.nix b/pkgs/tools/package-management/nix/2_26/packaging/everything.nix new file mode 100644 index 000000000000..7ca878d8d535 --- /dev/null +++ b/pkgs/tools/package-management/nix/2_26/packaging/everything.nix @@ -0,0 +1,192 @@ +{ + lib, + stdenv, + buildEnv, + + nix-util, + nix-util-c, + nix-util-tests, + + nix-store, + nix-store-c, + nix-store-tests, + + nix-fetchers, + nix-fetchers-tests, + + nix-expr, + nix-expr-c, + nix-expr-tests, + + nix-flake, + nix-flake-c, + nix-flake-tests, + + nix-main, + nix-main-c, + + nix-cmd, + + nix-cli, + + nix-functional-tests, + + nix-manual, + nix-internal-api-docs, + nix-external-api-docs, + + nix-perl-bindings, + + testers, + runCommand, +}: + +let + libs = { + inherit + nix-util + nix-util-c + nix-store + nix-store-c + nix-fetchers + nix-expr + nix-expr-c + nix-flake + nix-flake-c + nix-main + nix-main-c + nix-cmd + ; + } // lib.optionalAttrs (!stdenv.hostPlatform.isStatic && stdenv.buildPlatform.canExecute stdenv.hostPlatform) { + # Currently fails in static build + inherit + nix-perl-bindings + ; + }; + + dev = stdenv.mkDerivation (finalAttrs: { + name = "nix-${nix-cli.version}-dev"; + pname = "nix"; + version = nix-cli.version; + dontUnpack = true; + dontBuild = true; + libs = map lib.getDev (lib.attrValues libs); + installPhase = '' + mkdir -p $out/nix-support + echo $libs >> $out/nix-support/propagated-build-inputs + ''; + passthru = { + tests = { + pkg-config = + testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + }; + + # If we were to fully emulate output selection here, we'd confuse the Nix CLIs, + # because they rely on `drvPath`. + dev = finalAttrs.finalPackage.out; + + libs = throw "`nix.dev.libs` is not meant to be used; use `nix.libs` instead."; + }; + meta = { + pkgConfigModules = [ + "nix-cmd" + "nix-expr" + "nix-expr-c" + "nix-fetchers" + "nix-flake" + "nix-flake-c" + "nix-main" + "nix-main-c" + "nix-store" + "nix-store-c" + "nix-util" + "nix-util-c" + ]; + }; + }); + devdoc = buildEnv { + name = "nix-${nix-cli.version}-devdoc"; + paths = [ + nix-internal-api-docs + nix-external-api-docs + ]; + }; + +in +(buildEnv { + name = "nix-${nix-cli.version}"; + paths = [ + nix-cli + nix-manual.man + ]; + + meta.mainProgram = "nix"; +}).overrideAttrs (finalAttrs: prevAttrs: { + doCheck = true; + doInstallCheck = true; + + checkInputs = [ + # Make sure the unit tests have passed + nix-util-tests.tests.run + nix-store-tests.tests.run + nix-expr-tests.tests.run + nix-fetchers-tests.tests.run + nix-flake-tests.tests.run + + # Make sure the functional tests have passed + nix-functional-tests + + # dev bundle is ok + # (checkInputs must be empty paths??) + (runCommand "check-pkg-config" { checked = dev.tests.pkg-config; } "mkdir $out") + ] ++ lib.optionals (!stdenv.hostPlatform.isStatic && stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + # Perl currently fails in static build + # TODO: Split out tests into a separate derivation? + nix-perl-bindings + ]; + passthru = prevAttrs.passthru // { + inherit (nix-cli) version; + + /** + These are the libraries that are part of the Nix project. They are used + by the Nix CLI and other tools. + + If you need to use these libraries in your project, we recommend to use + the `-c` C API libraries exclusively, if possible. + + We also recommend that you build the complete package to ensure that the unit tests pass. + You could do this in CI, or by passing it in an unused environment variable. e.g in a `mkDerivation` call: + + ```nix + buildInputs = [ nix.libs.nix-util-c nix.libs.nix-store-c ]; + # Make sure the nix libs we use are ok + unusedInputsForTests = [ nix ]; + disallowedReferences = nix.all; + ``` + */ + inherit libs; + + tests = prevAttrs.passthru.tests or {} // { + # TODO: create a proper fixpoint and: + # pkg-config = + # testers.hasPkgConfigModules { + # package = finalPackage; + # }; + }; + + /** + A derivation referencing the `dev` outputs of the Nix libraries. + */ + inherit dev; + inherit devdoc; + doc = nix-manual; + outputs = [ "out" "dev" "devdoc" "doc" ]; + all = lib.attrValues (lib.genAttrs finalAttrs.passthru.outputs (outName: finalAttrs.finalPackage.${outName})); + }; + meta = prevAttrs.meta // { + description = "The Nix package manager"; + pkgConfigModules = dev.meta.pkgConfigModules; + }; +}) diff --git a/pkgs/tools/package-management/nix/2_26/source.json b/pkgs/tools/package-management/nix/2_26/source.json new file mode 100644 index 000000000000..40acad769e09 --- /dev/null +++ b/pkgs/tools/package-management/nix/2_26/source.json @@ -0,0 +1,6 @@ +{ + "owner": "NixOS", + "repo": "nix", + "rev": "717372382f75be6832c73ec5519e5d6b9aa5141b", + "hash": "sha256-0lFNh54gkDsdHOriOEHK6lr1rGRiP1mhNaCNm+6QspE=" +} diff --git a/pkgs/tools/package-management/nix/2_26/src/external-api-docs/package.nix b/pkgs/tools/package-management/nix/2_26/src/external-api-docs/package.nix new file mode 100644 index 000000000000..57c5138cfdb4 --- /dev/null +++ b/pkgs/tools/package-management/nix/2_26/src/external-api-docs/package.nix @@ -0,0 +1,56 @@ +{ lib +, mkMesonDerivation + +, doxygen + +# Configuration Options + +, version +}: + +let + inherit (lib) fileset; +in + +mkMesonDerivation (finalAttrs: { + pname = "nix-external-api-docs"; + inherit version; + + workDir = ./.; + fileset = + let + cpp = fileset.fileFilter (file: file.hasExt "cc" || file.hasExt "h"); + in + fileset.unions [ + ./.version + ../../.version + ./meson.build + ./doxygen.cfg.in + ./README.md + # Source is not compiled, but still must be available for Doxygen + # to gather comments. + (cpp ../libexpr-c) + (cpp ../libflake-c) + (cpp ../libstore-c) + (cpp ../libutil-c) + ]; + + nativeBuildInputs = [ + doxygen + ]; + + preConfigure = + '' + chmod u+w ./.version + echo ${finalAttrs.version} > ./.version + ''; + + postInstall = '' + mkdir -p ''${!outputDoc}/nix-support + echo "doc external-api-docs $out/share/doc/nix/external-api/html" >> ''${!outputDoc}/nix-support/hydra-build-products + ''; + + meta = { + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/tools/package-management/nix/2_26/src/internal-api-docs/package.nix b/pkgs/tools/package-management/nix/2_26/src/internal-api-docs/package.nix new file mode 100644 index 000000000000..993a257a69f3 --- /dev/null +++ b/pkgs/tools/package-management/nix/2_26/src/internal-api-docs/package.nix @@ -0,0 +1,50 @@ +{ lib +, mkMesonDerivation + +, doxygen + +# Configuration Options + +, version +}: + +let + inherit (lib) fileset; +in + +mkMesonDerivation (finalAttrs: { + pname = "nix-internal-api-docs"; + inherit version; + + workDir = ./.; + fileset = let + cpp = fileset.fileFilter (file: file.hasExt "cc" || file.hasExt "hh"); + in fileset.unions [ + ./.version + ../../.version + ./meson.build + ./doxygen.cfg.in + # Source is not compiled, but still must be available for Doxygen + # to gather comments. + (cpp ../.) + ]; + + nativeBuildInputs = [ + doxygen + ]; + + preConfigure = + '' + chmod u+w ./.version + echo ${finalAttrs.version} > ./.version + ''; + + postInstall = '' + mkdir -p ''${!outputDoc}/nix-support + echo "doc internal-api-docs $out/share/doc/nix/internal-api/html" >> ''${!outputDoc}/nix-support/hydra-build-products + ''; + + meta = { + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/tools/package-management/nix/2_26/src/libcmd/package.nix b/pkgs/tools/package-management/nix/2_26/src/libcmd/package.nix new file mode 100644 index 000000000000..5cafb4dc100c --- /dev/null +++ b/pkgs/tools/package-management/nix/2_26/src/libcmd/package.nix @@ -0,0 +1,83 @@ +{ lib +, stdenv +, mkMesonLibrary + +, nix-util +, nix-store +, nix-fetchers +, nix-expr +, nix-flake +, nix-main +, editline +, readline +, lowdown +, nlohmann_json + +# Configuration Options + +, version + +# Whether to enable Markdown rendering in the Nix binary. +, enableMarkdown ? !stdenv.hostPlatform.isWindows + +# Which interactive line editor library to use for Nix's repl. +# +# Currently supported choices are: +# +# - editline (default) +# - readline +, readlineFlavor ? if stdenv.hostPlatform.isWindows then "readline" else "editline" +}: + +let + inherit (lib) fileset; +in + +mkMesonLibrary (finalAttrs: { + pname = "nix-cmd"; + inherit version; + + workDir = ./.; + fileset = fileset.unions [ + ../../nix-meson-build-support + ./nix-meson-build-support + ../../.version + ./.version + ./meson.build + ./meson.options + (fileset.fileFilter (file: file.hasExt "cc") ./.) + (fileset.fileFilter (file: file.hasExt "hh") ./.) + ]; + + buildInputs = [ + ({ inherit editline readline; }.${readlineFlavor}) + ] ++ lib.optional enableMarkdown lowdown; + + propagatedBuildInputs = [ + nix-util + nix-store + nix-fetchers + nix-expr + nix-flake + nix-main + nlohmann_json + ]; + + preConfigure = + # "Inline" .version so it's not a symlink, and includes the suffix. + # Do the meson utils, without modification. + '' + chmod u+w ./.version + echo ${version} > ../../.version + ''; + + mesonFlags = [ + (lib.mesonEnable "markdown" enableMarkdown) + (lib.mesonOption "readline-flavor" readlineFlavor) + ]; + + meta = { + platforms = lib.platforms.unix ++ lib.platforms.windows; + }; + +}) diff --git a/pkgs/tools/package-management/nix/2_26/src/libexpr-c/package.nix b/pkgs/tools/package-management/nix/2_26/src/libexpr-c/package.nix new file mode 100644 index 000000000000..5047f3e2e9ab --- /dev/null +++ b/pkgs/tools/package-management/nix/2_26/src/libexpr-c/package.nix @@ -0,0 +1,53 @@ +{ lib +, mkMesonLibrary + +, nix-store-c +, nix-expr + +# Configuration Options + +, version +}: + +let + inherit (lib) fileset; +in + +mkMesonLibrary (finalAttrs: { + pname = "nix-expr-c"; + inherit version; + + workDir = ./.; + fileset = fileset.unions [ + ../../nix-meson-build-support + ./nix-meson-build-support + ../../.version + ./.version + ./meson.build + # ./meson.options + (fileset.fileFilter (file: file.hasExt "cc") ./.) + (fileset.fileFilter (file: file.hasExt "hh") ./.) + (fileset.fileFilter (file: file.hasExt "h") ./.) + ]; + + propagatedBuildInputs = [ + nix-store-c + nix-expr + ]; + + preConfigure = + # "Inline" .version so it's not a symlink, and includes the suffix. + # Do the meson utils, without modification. + '' + chmod u+w ./.version + echo ${version} > ../../.version + ''; + + mesonFlags = [ + ]; + + meta = { + platforms = lib.platforms.unix ++ lib.platforms.windows; + }; + +}) diff --git a/pkgs/tools/package-management/nix/2_26/src/libexpr-test-support/package.nix b/pkgs/tools/package-management/nix/2_26/src/libexpr-test-support/package.nix new file mode 100644 index 000000000000..48118fa0c758 --- /dev/null +++ b/pkgs/tools/package-management/nix/2_26/src/libexpr-test-support/package.nix @@ -0,0 +1,57 @@ +{ lib +, mkMesonLibrary + +, nix-store-test-support +, nix-expr +, nix-expr-c + +, rapidcheck + +# Configuration Options + +, version +}: + +let + inherit (lib) fileset; +in + +mkMesonLibrary (finalAttrs: { + pname = "nix-util-test-support"; + inherit version; + + workDir = ./.; + fileset = fileset.unions [ + ../../nix-meson-build-support + ./nix-meson-build-support + ../../.version + ./.version + ./meson.build + # ./meson.options + (fileset.fileFilter (file: file.hasExt "cc") ./.) + (fileset.fileFilter (file: file.hasExt "hh") ./.) + ]; + + propagatedBuildInputs = [ + nix-store-test-support + nix-expr + nix-expr-c + rapidcheck + ]; + + preConfigure = + # "Inline" .version so it's not a symlink, and includes the suffix. + # Do the meson utils, without modification. + '' + chmod u+w ./.version + echo ${version} > ../../.version + ''; + + mesonFlags = [ + ]; + + meta = { + platforms = lib.platforms.unix ++ lib.platforms.windows; + }; + +}) diff --git a/pkgs/tools/package-management/nix/2_26/src/libexpr-tests/package.nix b/pkgs/tools/package-management/nix/2_26/src/libexpr-tests/package.nix new file mode 100644 index 000000000000..a4a3bb0e7ecd --- /dev/null +++ b/pkgs/tools/package-management/nix/2_26/src/libexpr-tests/package.nix @@ -0,0 +1,79 @@ +{ lib +, buildPackages +, stdenv +, mkMesonExecutable + +, nix-expr +, nix-expr-c +, nix-expr-test-support + +, rapidcheck +, gtest +, runCommand + +# Configuration Options + +, version +, resolvePath +}: + +let + inherit (lib) fileset; +in + +mkMesonExecutable (finalAttrs: { + pname = "nix-expr-tests"; + inherit version; + + workDir = ./.; + fileset = fileset.unions [ + ../../nix-meson-build-support + ./nix-meson-build-support + ../../.version + ./.version + ./meson.build + # ./meson.options + (fileset.fileFilter (file: file.hasExt "cc") ./.) + (fileset.fileFilter (file: file.hasExt "hh") ./.) + ]; + + buildInputs = [ + nix-expr + nix-expr-c + nix-expr-test-support + rapidcheck + gtest + ]; + + preConfigure = + # "Inline" .version so it's not a symlink, and includes the suffix. + # Do the meson utils, without modification. + '' + chmod u+w ./.version + echo ${version} > ../../.version + ''; + + mesonFlags = [ + ]; + + passthru = { + tests = { + run = runCommand "${finalAttrs.pname}-run" { + meta.broken = !stdenv.hostPlatform.emulatorAvailable buildPackages; + } (lib.optionalString stdenv.hostPlatform.isWindows '' + export HOME="$PWD/home-dir" + mkdir -p "$HOME" + '' + '' + export _NIX_TEST_UNIT_DATA=${resolvePath ./data} + ${stdenv.hostPlatform.emulator buildPackages} ${lib.getExe finalAttrs.finalPackage} + touch $out + ''); + }; + }; + + meta = { + platforms = lib.platforms.unix ++ lib.platforms.windows; + mainProgram = finalAttrs.pname + stdenv.hostPlatform.extensions.executable; + }; + +}) diff --git a/pkgs/tools/package-management/nix/2_26/src/libexpr/package.nix b/pkgs/tools/package-management/nix/2_26/src/libexpr/package.nix new file mode 100644 index 000000000000..3d5b78e35f2d --- /dev/null +++ b/pkgs/tools/package-management/nix/2_26/src/libexpr/package.nix @@ -0,0 +1,105 @@ +{ lib +, stdenv +, mkMesonLibrary + +, bison +, flex +, cmake # for resolving toml11 dep + +, nix-util +, nix-store +, nix-fetchers +, boost +, boehmgc +, nlohmann_json +, toml11 + +# Configuration Options + +, version + +# Whether to use garbage collection for the Nix language evaluator. +# +# If it is disabled, we just leak memory, but this is not as bad as it +# sounds so long as evaluation just takes places within short-lived +# processes. (When the process exits, the memory is reclaimed; it is +# only leaked *within* the process.) +# +# Temporarily disabled on Windows because the `GC_throw_bad_alloc` +# symbol is missing during linking. +, enableGC ? !stdenv.hostPlatform.isWindows +}: + +let + inherit (lib) fileset; +in + +mkMesonLibrary (finalAttrs: { + pname = "nix-expr"; + inherit version; + + workDir = ./.; + fileset = fileset.unions [ + ../../nix-meson-build-support + ./nix-meson-build-support + ../../.version + ./.version + ./meson.build + ./meson.options + ./primops/meson.build + (fileset.fileFilter (file: file.hasExt "cc") ./.) + (fileset.fileFilter (file: file.hasExt "hh") ./.) + ./lexer.l + ./parser.y + (fileset.difference + (fileset.fileFilter (file: file.hasExt "nix") ./.) + ./package.nix + ) + ]; + + nativeBuildInputs = [ + bison + flex + cmake + ]; + + buildInputs = [ + toml11 + ]; + + propagatedBuildInputs = [ + nix-util + nix-store + nix-fetchers + ] ++ finalAttrs.passthru.externalPropagatedBuildInputs; + + # Hack for sake of the dev shell + passthru.externalPropagatedBuildInputs = [ + boost + nlohmann_json + ] ++ lib.optional enableGC boehmgc; + + preConfigure = + # "Inline" .version so it's not a symlink, and includes the suffix. + # Do the meson utils, without modification. + '' + chmod u+w ./.version + echo ${version} > ../../.version + ''; + + mesonFlags = [ + (lib.mesonEnable "gc" enableGC) + ]; + + env = { + # Needed for Meson to find Boost. + # https://github.com/NixOS/nixpkgs/issues/86131. + BOOST_INCLUDEDIR = "${lib.getDev boost}/include"; + BOOST_LIBRARYDIR = "${lib.getLib boost}/lib"; + }; + + meta = { + platforms = lib.platforms.unix ++ lib.platforms.windows; + }; + +}) diff --git a/pkgs/tools/package-management/nix/2_26/src/libfetchers-tests/package.nix b/pkgs/tools/package-management/nix/2_26/src/libfetchers-tests/package.nix new file mode 100644 index 000000000000..5336672a2221 --- /dev/null +++ b/pkgs/tools/package-management/nix/2_26/src/libfetchers-tests/package.nix @@ -0,0 +1,77 @@ +{ lib +, buildPackages +, stdenv +, mkMesonExecutable + +, nix-fetchers +, nix-store-test-support + +, rapidcheck +, gtest +, runCommand + +# Configuration Options + +, version +, resolvePath +}: + +let + inherit (lib) fileset; +in + +mkMesonExecutable (finalAttrs: { + pname = "nix-fetchers-tests"; + inherit version; + + workDir = ./.; + fileset = fileset.unions [ + ../../nix-meson-build-support + ./nix-meson-build-support + ../../.version + ./.version + ./meson.build + # ./meson.options + (fileset.fileFilter (file: file.hasExt "cc") ./.) + (fileset.fileFilter (file: file.hasExt "hh") ./.) + ]; + + buildInputs = [ + nix-fetchers + nix-store-test-support + rapidcheck + gtest + ]; + + preConfigure = + # "Inline" .version so it's not a symlink, and includes the suffix. + # Do the meson utils, without modification. + '' + chmod u+w ./.version + echo ${version} > ../../.version + ''; + + mesonFlags = [ + ]; + + passthru = { + tests = { + run = runCommand "${finalAttrs.pname}-run" { + meta.broken = !stdenv.hostPlatform.emulatorAvailable buildPackages; + } (lib.optionalString stdenv.hostPlatform.isWindows '' + export HOME="$PWD/home-dir" + mkdir -p "$HOME" + '' + '' + export _NIX_TEST_UNIT_DATA=${resolvePath ./data} + ${stdenv.hostPlatform.emulator buildPackages} ${lib.getExe finalAttrs.finalPackage} + touch $out + ''); + }; + }; + + meta = { + platforms = lib.platforms.unix ++ lib.platforms.windows; + mainProgram = finalAttrs.pname + stdenv.hostPlatform.extensions.executable; + }; + +}) diff --git a/pkgs/tools/package-management/nix/2_26/src/libfetchers/package.nix b/pkgs/tools/package-management/nix/2_26/src/libfetchers/package.nix new file mode 100644 index 000000000000..d4ca18555031 --- /dev/null +++ b/pkgs/tools/package-management/nix/2_26/src/libfetchers/package.nix @@ -0,0 +1,55 @@ +{ lib +, mkMesonLibrary + +, nix-util +, nix-store +, nlohmann_json +, libgit2 + +# Configuration Options + +, version +}: + +let + inherit (lib) fileset; +in + +mkMesonLibrary (finalAttrs: { + pname = "nix-fetchers"; + inherit version; + + workDir = ./.; + fileset = fileset.unions [ + ../../nix-meson-build-support + ./nix-meson-build-support + ../../.version + ./.version + ./meson.build + (fileset.fileFilter (file: file.hasExt "cc") ./.) + (fileset.fileFilter (file: file.hasExt "hh") ./.) + ]; + + buildInputs = [ + libgit2 + ]; + + propagatedBuildInputs = [ + nix-store + nix-util + nlohmann_json + ]; + + preConfigure = + # "Inline" .version so it's not a symlink, and includes the suffix. + # Do the meson utils, without modification. + '' + chmod u+w ./.version + echo ${version} > ../../.version + ''; + + meta = { + platforms = lib.platforms.unix ++ lib.platforms.windows; + }; + +}) diff --git a/pkgs/tools/package-management/nix/2_26/src/libflake-c/package.nix b/pkgs/tools/package-management/nix/2_26/src/libflake-c/package.nix new file mode 100644 index 000000000000..dcd6c4966097 --- /dev/null +++ b/pkgs/tools/package-management/nix/2_26/src/libflake-c/package.nix @@ -0,0 +1,55 @@ +{ lib +, mkMesonLibrary + +, nix-store-c +, nix-expr-c +, nix-flake + +# Configuration Options + +, version +}: + +let + inherit (lib) fileset; +in + +mkMesonLibrary (finalAttrs: { + pname = "nix-flake-c"; + inherit version; + + workDir = ./.; + fileset = fileset.unions [ + ../../nix-meson-build-support + ./nix-meson-build-support + ../../.version + ./.version + ./meson.build + # ./meson.options + (fileset.fileFilter (file: file.hasExt "cc") ./.) + (fileset.fileFilter (file: file.hasExt "hh") ./.) + (fileset.fileFilter (file: file.hasExt "h") ./.) + ]; + + propagatedBuildInputs = [ + nix-expr-c + nix-store-c + nix-flake + ]; + + preConfigure = + # "Inline" .version so it's not a symlink, and includes the suffix. + # Do the meson utils, without modification. + '' + chmod u+w ./.version + echo ${version} > ../../.version + ''; + + mesonFlags = [ + ]; + + meta = { + platforms = lib.platforms.unix ++ lib.platforms.windows; + }; + +}) diff --git a/pkgs/tools/package-management/nix/2_26/src/libflake-tests/package.nix b/pkgs/tools/package-management/nix/2_26/src/libflake-tests/package.nix new file mode 100644 index 000000000000..51b68ad581ff --- /dev/null +++ b/pkgs/tools/package-management/nix/2_26/src/libflake-tests/package.nix @@ -0,0 +1,80 @@ +{ lib +, buildPackages +, stdenv +, mkMesonExecutable + +, nix-flake +, nix-flake-c +, nix-expr-test-support + +, rapidcheck +, gtest +, runCommand + +# Configuration Options + +, version +, resolvePath +}: + +let + inherit (lib) fileset; +in + +mkMesonExecutable (finalAttrs: { + pname = "nix-flake-tests"; + inherit version; + + workDir = ./.; + fileset = fileset.unions [ + ../../nix-meson-build-support + ./nix-meson-build-support + ../../.version + ./.version + ./meson.build + # ./meson.options + (fileset.fileFilter (file: file.hasExt "cc") ./.) + (fileset.fileFilter (file: file.hasExt "hh") ./.) + ]; + + buildInputs = [ + nix-flake + nix-flake-c + nix-expr-test-support + rapidcheck + gtest + ]; + + preConfigure = + # "Inline" .version so it's not a symlink, and includes the suffix. + # Do the meson utils, without modification. + '' + chmod u+w ./.version + echo ${version} > ../../.version + ''; + + mesonFlags = [ + ]; + + passthru = { + tests = { + run = runCommand "${finalAttrs.pname}-run" { + meta.broken = !stdenv.hostPlatform.emulatorAvailable buildPackages; + } (lib.optionalString stdenv.hostPlatform.isWindows '' + export HOME="$PWD/home-dir" + mkdir -p "$HOME" + '' + '' + export _NIX_TEST_UNIT_DATA=${resolvePath ./data} + export NIX_CONFIG="extra-experimental-features = flakes" + ${stdenv.hostPlatform.emulator buildPackages} ${lib.getExe finalAttrs.finalPackage} + touch $out + ''); + }; + }; + + meta = { + platforms = lib.platforms.unix ++ lib.platforms.windows; + mainProgram = finalAttrs.pname + stdenv.hostPlatform.extensions.executable; + }; + +}) diff --git a/pkgs/tools/package-management/nix/2_26/src/libflake/package.nix b/pkgs/tools/package-management/nix/2_26/src/libflake/package.nix new file mode 100644 index 000000000000..3fc96a20e58c --- /dev/null +++ b/pkgs/tools/package-management/nix/2_26/src/libflake/package.nix @@ -0,0 +1,54 @@ +{ lib +, mkMesonLibrary + +, nix-util +, nix-store +, nix-fetchers +, nix-expr +, nlohmann_json + +# Configuration Options + +, version +}: + +let + inherit (lib) fileset; +in + +mkMesonLibrary (finalAttrs: { + pname = "nix-flake"; + inherit version; + + workDir = ./.; + fileset = fileset.unions [ + ../../nix-meson-build-support + ./nix-meson-build-support + ../../.version + ./.version + ./meson.build + (fileset.fileFilter (file: file.hasExt "cc") ./.) + (fileset.fileFilter (file: file.hasExt "hh") ./.) + ]; + + propagatedBuildInputs = [ + nix-store + nix-util + nix-fetchers + nix-expr + nlohmann_json + ]; + + preConfigure = + # "Inline" .version so it's not a symlink, and includes the suffix. + # Do the meson utils, without modification. + '' + chmod u+w ./.version + echo ${version} > ../../.version + ''; + + meta = { + platforms = lib.platforms.unix ++ lib.platforms.windows; + }; + +}) diff --git a/pkgs/tools/package-management/nix/2_26/src/libmain-c/package.nix b/pkgs/tools/package-management/nix/2_26/src/libmain-c/package.nix new file mode 100644 index 000000000000..b96901bb46bb --- /dev/null +++ b/pkgs/tools/package-management/nix/2_26/src/libmain-c/package.nix @@ -0,0 +1,57 @@ +{ lib +, mkMesonLibrary + +, nix-util-c +, nix-store +, nix-store-c +, nix-main + +# Configuration Options + +, version +}: + +let + inherit (lib) fileset; +in + +mkMesonLibrary (finalAttrs: { + pname = "nix-main-c"; + inherit version; + + workDir = ./.; + fileset = fileset.unions [ + ../../nix-meson-build-support + ./nix-meson-build-support + ../../.version + ./.version + ./meson.build + # ./meson.options + (fileset.fileFilter (file: file.hasExt "cc") ./.) + (fileset.fileFilter (file: file.hasExt "hh") ./.) + (fileset.fileFilter (file: file.hasExt "h") ./.) + ]; + + propagatedBuildInputs = [ + nix-util-c + nix-store + nix-store-c + nix-main + ]; + + preConfigure = + # "Inline" .version so it's not a symlink, and includes the suffix. + # Do the meson utils, without modification. + '' + chmod u+w ./.version + echo ${version} > ../../.version + ''; + + mesonFlags = [ + ]; + + meta = { + platforms = lib.platforms.unix ++ lib.platforms.windows; + }; + +}) diff --git a/pkgs/tools/package-management/nix/2_26/src/libmain/package.nix b/pkgs/tools/package-management/nix/2_26/src/libmain/package.nix new file mode 100644 index 000000000000..9a5b9e8c2df0 --- /dev/null +++ b/pkgs/tools/package-management/nix/2_26/src/libmain/package.nix @@ -0,0 +1,51 @@ +{ lib +, mkMesonLibrary + +, openssl + +, nix-util +, nix-store + +# Configuration Options + +, version +}: + +let + inherit (lib) fileset; +in + +mkMesonLibrary (finalAttrs: { + pname = "nix-main"; + inherit version; + + workDir = ./.; + fileset = fileset.unions [ + ../../nix-meson-build-support + ./nix-meson-build-support + ../../.version + ./.version + ./meson.build + (fileset.fileFilter (file: file.hasExt "cc") ./.) + (fileset.fileFilter (file: file.hasExt "hh") ./.) + ]; + + propagatedBuildInputs = [ + nix-util + nix-store + openssl + ]; + + preConfigure = + # "Inline" .version so it's not a symlink, and includes the suffix. + # Do the meson utils, without modification. + '' + chmod u+w ./.version + echo ${version} > ../../.version + ''; + + meta = { + platforms = lib.platforms.unix ++ lib.platforms.windows; + }; + +}) diff --git a/pkgs/tools/package-management/nix/2_26/src/libstore-c/package.nix b/pkgs/tools/package-management/nix/2_26/src/libstore-c/package.nix new file mode 100644 index 000000000000..c2413c3890d1 --- /dev/null +++ b/pkgs/tools/package-management/nix/2_26/src/libstore-c/package.nix @@ -0,0 +1,53 @@ +{ lib +, mkMesonLibrary + +, nix-util-c +, nix-store + +# Configuration Options + +, version +}: + +let + inherit (lib) fileset; +in + +mkMesonLibrary (finalAttrs: { + pname = "nix-store-c"; + inherit version; + + workDir = ./.; + fileset = fileset.unions [ + ../../nix-meson-build-support + ./nix-meson-build-support + ../../.version + ./.version + ./meson.build + # ./meson.options + (fileset.fileFilter (file: file.hasExt "cc") ./.) + (fileset.fileFilter (file: file.hasExt "hh") ./.) + (fileset.fileFilter (file: file.hasExt "h") ./.) + ]; + + propagatedBuildInputs = [ + nix-util-c + nix-store + ]; + + preConfigure = + # "Inline" .version so it's not a symlink, and includes the suffix. + # Do the meson utils, without modification. + '' + chmod u+w ./.version + echo ${version} > ../../.version + ''; + + mesonFlags = [ + ]; + + meta = { + platforms = lib.platforms.unix ++ lib.platforms.windows; + }; + +}) diff --git a/pkgs/tools/package-management/nix/2_26/src/libstore-test-support/package.nix b/pkgs/tools/package-management/nix/2_26/src/libstore-test-support/package.nix new file mode 100644 index 000000000000..5d3f41b3e8b9 --- /dev/null +++ b/pkgs/tools/package-management/nix/2_26/src/libstore-test-support/package.nix @@ -0,0 +1,57 @@ +{ lib +, mkMesonLibrary + +, nix-util-test-support +, nix-store +, nix-store-c + +, rapidcheck + +# Configuration Options + +, version +}: + +let + inherit (lib) fileset; +in + +mkMesonLibrary (finalAttrs: { + pname = "nix-store-test-support"; + inherit version; + + workDir = ./.; + fileset = fileset.unions [ + ../../nix-meson-build-support + ./nix-meson-build-support + ../../.version + ./.version + ./meson.build + # ./meson.options + (fileset.fileFilter (file: file.hasExt "cc") ./.) + (fileset.fileFilter (file: file.hasExt "hh") ./.) + ]; + + propagatedBuildInputs = [ + nix-util-test-support + nix-store + nix-store-c + rapidcheck + ]; + + preConfigure = + # "Inline" .version so it's not a symlink, and includes the suffix. + # Do the meson utils, without modification. + '' + chmod u+w ./.version + echo ${version} > ../../.version + ''; + + mesonFlags = [ + ]; + + meta = { + platforms = lib.platforms.unix ++ lib.platforms.windows; + }; + +}) diff --git a/pkgs/tools/package-management/nix/2_26/src/libstore-tests/package.nix b/pkgs/tools/package-management/nix/2_26/src/libstore-tests/package.nix new file mode 100644 index 000000000000..3acf4e25c2cc --- /dev/null +++ b/pkgs/tools/package-management/nix/2_26/src/libstore-tests/package.nix @@ -0,0 +1,95 @@ +{ lib +, buildPackages +, stdenv +, mkMesonExecutable + +, nix-store +, nix-store-c +, nix-store-test-support +, sqlite + +, rapidcheck +, gtest +, runCommand + +# Configuration Options + +, version +, filesetToSource +}: + +let + inherit (lib) fileset; +in + +mkMesonExecutable (finalAttrs: { + pname = "nix-store-tests"; + inherit version; + + workDir = ./.; + fileset = fileset.unions [ + ../../nix-meson-build-support + ./nix-meson-build-support + ../../.version + ./.version + ./meson.build + # ./meson.options + (fileset.fileFilter (file: file.hasExt "cc") ./.) + (fileset.fileFilter (file: file.hasExt "hh") ./.) + ]; + + # Hack for sake of the dev shell + passthru.externalBuildInputs = [ + sqlite + rapidcheck + gtest + ]; + + buildInputs = finalAttrs.passthru.externalBuildInputs ++ [ + nix-store + nix-store-c + nix-store-test-support + ]; + + preConfigure = + # "Inline" .version so it's not a symlink, and includes the suffix. + # Do the meson utils, without modification. + '' + chmod u+w ./.version + echo ${version} > ../../.version + ''; + + mesonFlags = [ + ]; + + passthru = { + tests = { + run = let + # Some data is shared with the functional tests: they create it, + # we consume it. + data = filesetToSource { + root = ../..; + fileset = lib.fileset.unions [ + ./data + ../../tests/functional/derivation + ]; + }; + in runCommand "${finalAttrs.pname}-run" { + meta.broken = !stdenv.hostPlatform.emulatorAvailable buildPackages; + } (lib.optionalString stdenv.hostPlatform.isWindows '' + export HOME="$PWD/home-dir" + mkdir -p "$HOME" + '' + '' + export _NIX_TEST_UNIT_DATA=${data + "/src/libstore-tests/data"} + ${stdenv.hostPlatform.emulator buildPackages} ${lib.getExe finalAttrs.finalPackage} + touch $out + ''); + }; + }; + + meta = { + platforms = lib.platforms.unix ++ lib.platforms.windows; + mainProgram = finalAttrs.pname + stdenv.hostPlatform.extensions.executable; + }; + +}) diff --git a/pkgs/tools/package-management/nix/2_26/src/libstore/package.nix b/pkgs/tools/package-management/nix/2_26/src/libstore/package.nix new file mode 100644 index 000000000000..4fbaea4acc57 --- /dev/null +++ b/pkgs/tools/package-management/nix/2_26/src/libstore/package.nix @@ -0,0 +1,96 @@ +{ lib +, stdenv +, mkMesonLibrary + +, unixtools +, darwin + +, nix-util +, boost +, curl +, aws-sdk-cpp +, libseccomp +, nlohmann_json +, sqlite + +, busybox-sandbox-shell ? null + +# Configuration Options + +, version + +, embeddedSandboxShell ? stdenv.hostPlatform.isStatic +}: + +let + inherit (lib) fileset; +in + +mkMesonLibrary (finalAttrs: { + pname = "nix-store"; + inherit version; + + workDir = ./.; + fileset = fileset.unions [ + ../../nix-meson-build-support + ./nix-meson-build-support + ../../.version + ./.version + ./meson.build + ./meson.options + ./linux/meson.build + ./unix/meson.build + ./windows/meson.build + (fileset.fileFilter (file: file.hasExt "cc") ./.) + (fileset.fileFilter (file: file.hasExt "hh") ./.) + (fileset.fileFilter (file: file.hasExt "sb") ./.) + (fileset.fileFilter (file: file.hasExt "md") ./.) + (fileset.fileFilter (file: file.hasExt "sql") ./.) + ]; + + nativeBuildInputs = + lib.optional embeddedSandboxShell unixtools.hexdump; + + buildInputs = [ + boost + curl + sqlite + ] ++ lib.optional stdenv.hostPlatform.isLinux libseccomp + # There have been issues building these dependencies + ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.libs.sandbox + ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform && (stdenv.isLinux || stdenv.isDarwin)) + aws-sdk-cpp + ; + + propagatedBuildInputs = [ + nix-util + nlohmann_json + ]; + + preConfigure = + # "Inline" .version so it's not a symlink, and includes the suffix. + # Do the meson utils, without modification. + '' + chmod u+w ./.version + echo ${version} > ../../.version + ''; + + mesonFlags = [ + (lib.mesonEnable "seccomp-sandboxing" stdenv.hostPlatform.isLinux) + (lib.mesonBool "embedded-sandbox-shell" embeddedSandboxShell) + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + (lib.mesonOption "sandbox-shell" "${busybox-sandbox-shell}/bin/busybox") + ]; + + env = { + # Needed for Meson to find Boost. + # https://github.com/NixOS/nixpkgs/issues/86131. + BOOST_INCLUDEDIR = "${lib.getDev boost}/include"; + BOOST_LIBRARYDIR = "${lib.getLib boost}/lib"; + }; + + meta = { + platforms = lib.platforms.unix ++ lib.platforms.windows; + }; + +}) diff --git a/pkgs/tools/package-management/nix/2_26/src/libutil-c/package.nix b/pkgs/tools/package-management/nix/2_26/src/libutil-c/package.nix new file mode 100644 index 000000000000..f80e0b7f0a2a --- /dev/null +++ b/pkgs/tools/package-management/nix/2_26/src/libutil-c/package.nix @@ -0,0 +1,51 @@ +{ lib +, mkMesonLibrary + +, nix-util + +# Configuration Options + +, version +}: + +let + inherit (lib) fileset; +in + +mkMesonLibrary (finalAttrs: { + pname = "nix-util-c"; + inherit version; + + workDir = ./.; + fileset = fileset.unions [ + ../../nix-meson-build-support + ./nix-meson-build-support + ../../.version + ./.version + ./meson.build + ./meson.options + (fileset.fileFilter (file: file.hasExt "cc") ./.) + (fileset.fileFilter (file: file.hasExt "hh") ./.) + (fileset.fileFilter (file: file.hasExt "h") ./.) + ]; + + propagatedBuildInputs = [ + nix-util + ]; + + preConfigure = + # "Inline" .version so it's not a symlink, and includes the suffix. + # Do the meson utils, without modification. + '' + chmod u+w ./.version + echo ${version} > ../../.version + ''; + + mesonFlags = [ + ]; + + meta = { + platforms = lib.platforms.unix ++ lib.platforms.windows; + }; + +}) diff --git a/pkgs/tools/package-management/nix/2_26/src/libutil-test-support/package.nix b/pkgs/tools/package-management/nix/2_26/src/libutil-test-support/package.nix new file mode 100644 index 000000000000..a8a239717a68 --- /dev/null +++ b/pkgs/tools/package-management/nix/2_26/src/libutil-test-support/package.nix @@ -0,0 +1,55 @@ +{ lib +, mkMesonLibrary + +, nix-util +, nix-util-c + +, rapidcheck + +# Configuration Options + +, version +}: + +let + inherit (lib) fileset; +in + +mkMesonLibrary (finalAttrs: { + pname = "nix-util-test-support"; + inherit version; + + workDir = ./.; + fileset = fileset.unions [ + ../../nix-meson-build-support + ./nix-meson-build-support + ../../.version + ./.version + ./meson.build + # ./meson.options + (fileset.fileFilter (file: file.hasExt "cc") ./.) + (fileset.fileFilter (file: file.hasExt "hh") ./.) + ]; + + propagatedBuildInputs = [ + nix-util + nix-util-c + rapidcheck + ]; + + preConfigure = + # "Inline" .version so it's not a symlink, and includes the suffix. + # Do the meson utils, without modification. + '' + chmod u+w ./.version + echo ${version} > ../../.version + ''; + + mesonFlags = [ + ]; + + meta = { + platforms = lib.platforms.unix ++ lib.platforms.windows; + }; + +}) diff --git a/pkgs/tools/package-management/nix/2_26/src/libutil-tests/package.nix b/pkgs/tools/package-management/nix/2_26/src/libutil-tests/package.nix new file mode 100644 index 000000000000..28769e115224 --- /dev/null +++ b/pkgs/tools/package-management/nix/2_26/src/libutil-tests/package.nix @@ -0,0 +1,78 @@ +{ lib +, buildPackages +, stdenv +, mkMesonExecutable + +, nix-util +, nix-util-c +, nix-util-test-support + +, rapidcheck +, gtest +, runCommand + +# Configuration Options + +, version +}: + +let + inherit (lib) fileset; +in + +mkMesonExecutable (finalAttrs: { + pname = "nix-util-tests"; + inherit version; + + workDir = ./.; + fileset = fileset.unions [ + ../../nix-meson-build-support + ./nix-meson-build-support + ../../.version + ./.version + ./meson.build + # ./meson.options + (fileset.fileFilter (file: file.hasExt "cc") ./.) + (fileset.fileFilter (file: file.hasExt "hh") ./.) + ]; + + buildInputs = [ + nix-util + nix-util-c + nix-util-test-support + rapidcheck + gtest + ]; + + preConfigure = + # "Inline" .version so it's not a symlink, and includes the suffix. + # Do the meson utils, without modification. + '' + chmod u+w ./.version + echo ${version} > ../../.version + ''; + + mesonFlags = [ + ]; + + passthru = { + tests = { + run = runCommand "${finalAttrs.pname}-run" { + meta.broken = !stdenv.hostPlatform.emulatorAvailable buildPackages; + } (lib.optionalString stdenv.hostPlatform.isWindows '' + export HOME="$PWD/home-dir" + mkdir -p "$HOME" + '' + '' + export _NIX_TEST_UNIT_DATA=${./data} + ${stdenv.hostPlatform.emulator buildPackages} ${lib.getExe finalAttrs.finalPackage} + touch $out + ''); + }; + }; + + meta = { + platforms = lib.platforms.unix ++ lib.platforms.windows; + mainProgram = finalAttrs.pname + stdenv.hostPlatform.extensions.executable; + }; + +}) diff --git a/pkgs/tools/package-management/nix/2_26/src/libutil/package.nix b/pkgs/tools/package-management/nix/2_26/src/libutil/package.nix new file mode 100644 index 000000000000..679872a75c59 --- /dev/null +++ b/pkgs/tools/package-management/nix/2_26/src/libutil/package.nix @@ -0,0 +1,81 @@ +{ lib +, stdenv +, mkMesonLibrary + +, boost +, brotli +, libarchive +, libcpuid +, libsodium +, nlohmann_json +, openssl + +# Configuration Options + +, version +}: + +let + inherit (lib) fileset; +in + +mkMesonLibrary (finalAttrs: { + pname = "nix-util"; + inherit version; + + workDir = ./.; + fileset = fileset.unions [ + ../../nix-meson-build-support + ./nix-meson-build-support + ../../.version + ./.version + ./widecharwidth + ./meson.build + ./meson.options + ./linux/meson.build + ./unix/meson.build + ./windows/meson.build + (fileset.fileFilter (file: file.hasExt "cc") ./.) + (fileset.fileFilter (file: file.hasExt "hh") ./.) + ]; + + buildInputs = [ + brotli + libsodium + openssl + ] ++ lib.optional stdenv.hostPlatform.isx86_64 libcpuid + ; + + propagatedBuildInputs = [ + boost + libarchive + nlohmann_json + ]; + + preConfigure = + # "Inline" .version so it's not a symlink, and includes the suffix. + # Do the meson utils, without modification. + # + # TODO: change release process to add `pre` in `.version`, remove it + # before tagging, and restore after. + '' + chmod u+w ./.version + echo ${version} > ../../.version + ''; + + mesonFlags = [ + (lib.mesonEnable "cpuid" stdenv.hostPlatform.isx86_64) + ]; + + env = { + # Needed for Meson to find Boost. + # https://github.com/NixOS/nixpkgs/issues/86131. + BOOST_INCLUDEDIR = "${lib.getDev boost}/include"; + BOOST_LIBRARYDIR = "${lib.getLib boost}/lib"; + }; + + meta = { + platforms = lib.platforms.unix ++ lib.platforms.windows; + }; + +}) diff --git a/pkgs/tools/package-management/nix/2_26/src/nix/package.nix b/pkgs/tools/package-management/nix/2_26/src/nix/package.nix new file mode 100644 index 000000000000..171621af9176 --- /dev/null +++ b/pkgs/tools/package-management/nix/2_26/src/nix/package.nix @@ -0,0 +1,105 @@ +{ lib +, mkMesonExecutable + +, nix-store +, nix-expr +, nix-main +, nix-cmd + +# Configuration Options + +, version +}: + +let + inherit (lib) fileset; +in + +mkMesonExecutable (finalAttrs: { + pname = "nix"; + inherit version; + + workDir = ./.; + fileset = fileset.unions ([ + ../../nix-meson-build-support + ./nix-meson-build-support + ../../.version + ./.version + ./meson.build + ./meson.options + + # Symbolic links to other dirs + ## exes + ./build-remote + ./doc + ./nix-build + ./nix-channel + ./nix-collect-garbage + ./nix-copy-closure + ./nix-env + ./nix-instantiate + ./nix-store + ## dirs + ./scripts + ../../scripts + ./misc + ../../misc + + # Doc nix files for --help + ../../doc/manual/generate-manpage.nix + ../../doc/manual/utils.nix + ../../doc/manual/generate-settings.nix + ../../doc/manual/generate-store-info.nix + + # Other files to be included as string literals + ../nix-channel/unpack-channel.nix + ../nix-env/buildenv.nix + ./get-env.sh + ./help-stores.md + ../../doc/manual/source/store/types/index.md.in + ./profiles.md + ../../doc/manual/source/command-ref/files/profiles.md + + # Files + ] ++ lib.concatMap + (dir: [ + (fileset.fileFilter (file: file.hasExt "cc") dir) + (fileset.fileFilter (file: file.hasExt "hh") dir) + (fileset.fileFilter (file: file.hasExt "md") dir) + ]) + [ + ./. + ../build-remote + ../nix-build + ../nix-channel + ../nix-collect-garbage + ../nix-copy-closure + ../nix-env + ../nix-instantiate + ../nix-store + ] + ); + + buildInputs = [ + nix-store + nix-expr + nix-main + nix-cmd + ]; + + preConfigure = + # "Inline" .version so it's not a symlink, and includes the suffix. + # Do the meson utils, without modification. + '' + chmod u+w ./.version + echo ${version} > ../../../.version + ''; + + mesonFlags = [ + ]; + + meta = { + platforms = lib.platforms.unix ++ lib.platforms.windows; + }; + +}) diff --git a/pkgs/tools/package-management/nix/2_26/src/perl/package.nix b/pkgs/tools/package-management/nix/2_26/src/perl/package.nix new file mode 100644 index 000000000000..5ee0df13c9d1 --- /dev/null +++ b/pkgs/tools/package-management/nix/2_26/src/perl/package.nix @@ -0,0 +1,76 @@ +{ lib +, stdenv +, mkMesonDerivation +, pkg-config +, perl +, perlPackages +, nix-store +, version +, curl +, bzip2 +, libsodium +}: + +let + inherit (lib) fileset; +in + +perl.pkgs.toPerlModule (mkMesonDerivation (finalAttrs: { + pname = "nix-perl"; + inherit version; + + workDir = ./.; + fileset = fileset.unions ([ + ./.version + ../../.version + ./MANIFEST + ./lib + ./meson.build + ./meson.options + ] ++ lib.optionals finalAttrs.doCheck [ + ./.yath.rc.in + ./t + ]); + + nativeBuildInputs = [ + pkg-config + perl + curl + ]; + + buildInputs = [ + nix-store + ] ++ finalAttrs.passthru.externalBuildInputs; + + # Hack for sake of the dev shell + passthru.externalBuildInputs = [ + bzip2 + libsodium + ]; + + # `perlPackages.Test2Harness` is marked broken for Darwin + doCheck = !stdenv.isDarwin; + + nativeCheckInputs = [ + perlPackages.Test2Harness + ]; + + preConfigure = + # "Inline" .version so its not a symlink, and includes the suffix + '' + chmod u+w .version + echo ${finalAttrs.version} > .version + ''; + + mesonFlags = [ + (lib.mesonOption "dbi_path" "${perlPackages.DBI}/${perl.libPrefix}") + (lib.mesonOption "dbd_sqlite_path" "${perlPackages.DBDSQLite}/${perl.libPrefix}") + (lib.mesonEnable "tests" finalAttrs.doCheck) + ]; + + mesonCheckFlags = [ + "--print-errorlogs" + ]; + + strictDeps = false; +})) diff --git a/pkgs/tools/package-management/nix/2_26/tests/functional/package.nix b/pkgs/tools/package-management/nix/2_26/tests/functional/package.nix new file mode 100644 index 000000000000..d1582b05d145 --- /dev/null +++ b/pkgs/tools/package-management/nix/2_26/tests/functional/package.nix @@ -0,0 +1,103 @@ +{ lib +, stdenv +, mkMesonDerivation + +, meson +, ninja +, pkg-config + +, jq +, git +, mercurial +, util-linux + +, nix-store +, nix-expr +, nix-cli + +, busybox-sandbox-shell ? null + +# Configuration Options + +, pname ? "nix-functional-tests" +, version + +# For running the functional tests against a different pre-built Nix. +, test-daemon ? null +}: + +let + inherit (lib) fileset; +in + +mkMesonDerivation (finalAttrs: { + inherit pname version; + + workDir = ./.; + fileset = fileset.unions [ + ../../scripts/nix-profile.sh.in + ../../.version + ../../tests/functional + ./. + ]; + + # Hack for sake of the dev shell + passthru.externalNativeBuildInputs = [ + meson + ninja + pkg-config + + jq + git + mercurial + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + # For various sandboxing tests that needs a statically-linked shell, + # etc. + busybox-sandbox-shell + # For Overlay FS tests need `mount`, `umount`, and `unshare`. + # For `script` command (ensuring a TTY) + # TODO use `unixtools` to be precise over which executables instead? + util-linux + ]; + + nativeBuildInputs = finalAttrs.passthru.externalNativeBuildInputs ++ [ + nix-cli + ]; + + buildInputs = [ + nix-store + nix-expr + ]; + + preConfigure = + # "Inline" .version so it's not a symlink, and includes the suffix. + # Do the meson utils, without modification. + '' + chmod u+w ./.version + echo ${version} > ../../../.version + '' + # TEMP hack for Meson before make is gone, where + # `src/nix-functional-tests` is during the transition a symlink and + # not the actual directory directory. + + '' + cd $(readlink -e $PWD) + echo $PWD | grep tests/functional + ''; + + mesonCheckFlags = [ + "--print-errorlogs" + ]; + + doCheck = true; + + installPhase = '' + mkdir $out + ''; + + meta = { + platforms = lib.platforms.unix; + }; + +} // lib.optionalAttrs (test-daemon != null) { + NIX_DAEMON_PACKAGE = test-daemon; +}) From 0c89e259affea05b309877b2830cb3a8cb582046 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 22 Jan 2025 14:42:35 +0100 Subject: [PATCH 0801/2168] nixVersions.nix_2_26: init --- .../nix/2_26/componentized.nix | 44 ++++ .../nix/2_26/dependencies.nix | 193 ++++++++++++++++++ .../nix/2_26/packaging/components.nix | 2 +- .../nix/2_26/src/libutil-tests/package.nix | 3 +- pkgs/tools/package-management/nix/default.nix | 4 + 5 files changed, 244 insertions(+), 2 deletions(-) create mode 100644 pkgs/tools/package-management/nix/2_26/componentized.nix create mode 100644 pkgs/tools/package-management/nix/2_26/dependencies.nix diff --git a/pkgs/tools/package-management/nix/2_26/componentized.nix b/pkgs/tools/package-management/nix/2_26/componentized.nix new file mode 100644 index 000000000000..2d9a3f46f146 --- /dev/null +++ b/pkgs/tools/package-management/nix/2_26/componentized.nix @@ -0,0 +1,44 @@ + +{ lib, fetchFromGitHub, splicePackages, generateSplicesForMkScope, newScope, pkgs, stdenv, + libgit2-thin-packfile, + ... }: +let + officialRelease = true; + src = fetchFromGitHub (builtins.fromJSON (builtins.readFile ./source.json)); + + # A new scope, so that we can use `callPackage` to inject our own interdependencies + # without "polluting" the top level "`pkgs`" attrset. + # This also has the benefit of providing us with a distinct set of packages + # we can iterate over. + nixComponents = + lib.makeScopeWithSplicing' + { + inherit splicePackages; + inherit (nixDependencies) newScope; + } + { + otherSplices = generateSplicesForMkScope "nixComponents"; + f = import ./packaging/components.nix { + inherit lib officialRelease src; + }; + }; + + # The dependencies are in their own scope, so that they don't have to be + # in Nixpkgs top level `pkgs` or `nixComponents`. + nixDependencies = + lib.makeScopeWithSplicing' + { + inherit splicePackages; + inherit newScope; # layered directly on pkgs, unlike nixComponents above + } + { + otherSplices = generateSplicesForMkScope "nixDependencies"; + f = import ./dependencies.nix { + inherit pkgs; + inherit stdenv; + inherit src; + inherit libgit2-thin-packfile; + }; + }; +in + nixComponents.nix-everything diff --git a/pkgs/tools/package-management/nix/2_26/dependencies.nix b/pkgs/tools/package-management/nix/2_26/dependencies.nix new file mode 100644 index 000000000000..2cfac6cb63e4 --- /dev/null +++ b/pkgs/tools/package-management/nix/2_26/dependencies.nix @@ -0,0 +1,193 @@ +# These overrides are applied to the dependencies of the Nix components. + +{ + src, + + # The raw Nixpkgs, not affected by this scope + pkgs, + + stdenv, + libgit2-thin-packfile, +}: + +let + prevStdenv = stdenv; +in + +let + inherit (pkgs) lib; + + root = ./.; + + stdenv = if prevStdenv.isDarwin && prevStdenv.isx86_64 + then darwinStdenv + else prevStdenv; + + # Fix the following error with the default x86_64-darwin SDK: + # + # error: aligned allocation function of type 'void *(std::size_t, std::align_val_t)' is only available on macOS 10.13 or newer + # + # Despite the use of the 10.13 deployment target here, the aligned + # allocation function Clang uses with this setting actually works + # all the way back to 10.6. + darwinStdenv = pkgs.overrideSDK prevStdenv { darwinMinVersion = "10.13"; }; + + resolveRelPath = p: lib.path.removePrefix root p; + resolvePath = p: src + "/${resolveRelPath p}"; + + # Indirection for Nixpkgs to override when package.nix files are vendored + # fileset filtering is not possible without IFD on src, so we ignore the fileset + # and produce a path containing _more_, but the extra files generally won't be + # accessed. + # The Nix flake uses fileset.toSource for this. + filesetToSource = { root, fileset }: resolvePath root; + + /** Given a set of layers, create a mkDerivation-like function */ + mkPackageBuilder = exts: userFn: + stdenv.mkDerivation (lib.extends (lib.composeManyExtensions exts) userFn); + + localSourceLayer = finalAttrs: prevAttrs: + let + workDirPath = + # Ideally we'd pick finalAttrs.workDir, but for now `mkDerivation` has + # the requirement that everything except passthru and meta must be + # serialized by mkDerivation, which doesn't work for this. + prevAttrs.workDir; + + workDirSubpath = resolveRelPath workDirPath; + # sources = assert prevAttrs.fileset._type == "fileset"; prevAttrs.fileset; + # src = lib.fileset.toSource { fileset = sources; inherit root; }; + + in + { + sourceRoot = "${src.name}/" + workDirSubpath; + inherit src; + + # Clear what `derivation` can't/shouldn't serialize; see prevAttrs.workDir. + fileset = null; + workDir = null; + }; + + mesonLayer = finalAttrs: prevAttrs: + { + # NOTE: + # As of https://github.com/NixOS/nixpkgs/blob/8baf8241cea0c7b30e0b8ae73474cb3de83c1a30/pkgs/by-name/me/meson/setup-hook.sh#L26, + # `mesonBuildType` defaults to `plain` if not specified. We want our Nix-built binaries to be optimized by default. + # More on build types here: https://mesonbuild.com/Builtin-options.html#details-for-buildtype. + mesonBuildType = "release"; + # NOTE: + # Users who are debugging Nix builds are expected to set the environment variable `mesonBuildType`, per the + # guidance in https://github.com/NixOS/nix/blob/8a3fc27f1b63a08ac983ee46435a56cf49ebaf4a/doc/manual/source/development/debugging.md?plain=1#L10. + # For this reason, we don't want to refer to `finalAttrs.mesonBuildType` here, but rather use the environment variable. + preConfigure = prevAttrs.preConfigure or "" + lib.optionalString ( + !stdenv.hostPlatform.isWindows + # build failure + && !stdenv.hostPlatform.isStatic + # LTO breaks exception handling on x86-64-darwin. + && stdenv.system != "x86_64-darwin" + ) '' + case "$mesonBuildType" in + release|minsize) appendToVar mesonFlags "-Db_lto=true" ;; + *) appendToVar mesonFlags "-Db_lto=false" ;; + esac + ''; + nativeBuildInputs = [ + pkgs.buildPackages.meson + pkgs.buildPackages.ninja + ] ++ prevAttrs.nativeBuildInputs or []; + mesonCheckFlags = prevAttrs.mesonCheckFlags or [] ++ [ + "--print-errorlogs" + ]; + }; + + mesonBuildLayer = finalAttrs: prevAttrs: + { + nativeBuildInputs = prevAttrs.nativeBuildInputs or [] ++ [ + pkgs.buildPackages.pkg-config + ]; + separateDebugInfo = !stdenv.hostPlatform.isStatic; + hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie"; + env = prevAttrs.env or {} + // lib.optionalAttrs + (stdenv.isLinux + && !(stdenv.hostPlatform.isStatic && stdenv.system == "aarch64-linux") + && !(stdenv.hostPlatform.useLLVM or false)) + { LDFLAGS = "-fuse-ld=gold"; }; + }; + + mesonLibraryLayer = finalAttrs: prevAttrs: + { + outputs = prevAttrs.outputs or [ "out" ] ++ [ "dev" ]; + }; + + # Work around weird `--as-needed` linker behavior with BSD, see + # https://github.com/mesonbuild/meson/issues/3593 + bsdNoLinkAsNeeded = finalAttrs: prevAttrs: + lib.optionalAttrs stdenv.hostPlatform.isBSD { + mesonFlags = [ (lib.mesonBool "b_asneeded" false) ] ++ prevAttrs.mesonFlags or []; + }; + + miscGoodPractice = finalAttrs: prevAttrs: + { + strictDeps = prevAttrs.strictDeps or true; + enableParallelBuilding = true; + }; +in +scope: { + inherit stdenv; + inherit libgit2-thin-packfile; + + aws-sdk-cpp = (pkgs.aws-sdk-cpp.override { + apis = [ "s3" "transfer" ]; + customMemoryManagement = false; + }).overrideAttrs { + # only a stripped down version is built, which takes a lot less resources + # to build, so we don't need a "big-parallel" machine. + requiredSystemFeatures = [ ]; + }; + + boehmgc = pkgs.boehmgc.override { + enableLargeConfig = true; + }; + + # TODO Hack until https://github.com/NixOS/nixpkgs/issues/45462 is fixed. + boost = (pkgs.boost.override { + extraB2Args = [ + "--with-container" + "--with-context" + "--with-coroutine" + ]; + }).overrideAttrs (old: { + # Need to remove `--with-*` to use `--with-libraries=...` + buildPhase = lib.replaceStrings [ "--without-python" ] [ "" ] old.buildPhase; + installPhase = lib.replaceStrings [ "--without-python" ] [ "" ] old.installPhase; + }); + + libgit2 = libgit2-thin-packfile; + + inherit resolvePath filesetToSource; + + mkMesonDerivation = + mkPackageBuilder [ + miscGoodPractice + localSourceLayer + mesonLayer + ]; + mkMesonExecutable = + mkPackageBuilder [ + miscGoodPractice + bsdNoLinkAsNeeded + localSourceLayer + mesonLayer + mesonBuildLayer + ]; + mkMesonLibrary = + mkPackageBuilder [ + miscGoodPractice + bsdNoLinkAsNeeded + localSourceLayer + mesonLayer + mesonBuildLayer + mesonLibraryLayer + ]; +} diff --git a/pkgs/tools/package-management/nix/2_26/packaging/components.nix b/pkgs/tools/package-management/nix/2_26/packaging/components.nix index e1f661be8fbc..bd9d5687a71c 100644 --- a/pkgs/tools/package-management/nix/2_26/packaging/components.nix +++ b/pkgs/tools/package-management/nix/2_26/packaging/components.nix @@ -54,7 +54,7 @@ in nix-cli = callPackage ../src/nix/package.nix { version = fineVersion; }; - nix-functional-tests = callPackage ../src/nix-functional-tests/package.nix { version = fineVersion; }; + nix-functional-tests = callPackage ../tests/functional/package.nix { version = fineVersion; }; nix-manual = callPackage ../doc/manual/package.nix { version = fineVersion; }; nix-internal-api-docs = callPackage ../src/internal-api-docs/package.nix { version = fineVersion; }; diff --git a/pkgs/tools/package-management/nix/2_26/src/libutil-tests/package.nix b/pkgs/tools/package-management/nix/2_26/src/libutil-tests/package.nix index 28769e115224..e5805ec3968e 100644 --- a/pkgs/tools/package-management/nix/2_26/src/libutil-tests/package.nix +++ b/pkgs/tools/package-management/nix/2_26/src/libutil-tests/package.nix @@ -14,6 +14,7 @@ # Configuration Options , version +, resolvePath }: let @@ -63,7 +64,7 @@ mkMesonExecutable (finalAttrs: { export HOME="$PWD/home-dir" mkdir -p "$HOME" '' + '' - export _NIX_TEST_UNIT_DATA=${./data} + export _NIX_TEST_UNIT_DATA=${resolvePath ./data} ${stdenv.hostPlatform.emulator buildPackages} ${lib.getExe finalAttrs.finalPackage} touch $out ''); diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 548adcb8d7a7..20d545b79874 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -160,6 +160,10 @@ in lib.makeExtensible (self: ({ self_attribute_name = "nix_2_25"; }; + nix_2_26 = callPackage ./2_26/componentized.nix { + inherit libgit2-thin-packfile; + }; + git = common rec { version = "2.25.0"; suffix = "pre20241101_${lib.substring 0 8 src.rev}"; From 062c34cdace499aa44f0fa6ca6f2ca71769f6c43 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 22 Jan 2025 14:51:18 +0100 Subject: [PATCH 0802/2168] Format --- .../nix/2_26/componentized.nix | 15 +- .../nix/2_26/dependencies.nix | 218 +++++++++--------- .../nix/2_26/doc/manual/package.nix | 60 ++--- .../nix/2_26/packaging/components.nix | 8 +- .../nix/2_26/packaging/everything.nix | 183 ++++++++------- .../2_26/src/external-api-docs/package.nix | 20 +- .../2_26/src/internal-api-docs/package.nix | 44 ++-- .../nix/2_26/src/libcmd/package.nix | 49 ++-- .../nix/2_26/src/libexpr-c/package.nix | 13 +- .../2_26/src/libexpr-test-support/package.nix | 17 +- .../nix/2_26/src/libexpr-tests/package.nix | 53 +++-- .../nix/2_26/src/libexpr/package.nix | 56 +++-- .../2_26/src/libfetchers-tests/package.nix | 51 ++-- .../nix/2_26/src/libfetchers/package.nix | 17 +- .../nix/2_26/src/libflake-c/package.nix | 15 +- .../nix/2_26/src/libflake-tests/package.nix | 55 +++-- .../nix/2_26/src/libflake/package.nix | 19 +- .../nix/2_26/src/libmain-c/package.nix | 17 +- .../nix/2_26/src/libmain/package.nix | 15 +- .../nix/2_26/src/libstore-c/package.nix | 13 +- .../src/libstore-test-support/package.nix | 17 +- .../nix/2_26/src/libstore-tests/package.nix | 76 +++--- .../nix/2_26/src/libstore/package.nix | 68 +++--- .../nix/2_26/src/libutil-c/package.nix | 11 +- .../2_26/src/libutil-test-support/package.nix | 15 +- .../nix/2_26/src/libutil-tests/package.nix | 53 +++-- .../nix/2_26/src/libutil/package.nix | 28 +-- .../nix/2_26/src/nix/package.nix | 132 ++++++----- .../nix/2_26/src/perl/package.nix | 126 +++++----- .../nix/2_26/tests/functional/package.nix | 169 +++++++------- 30 files changed, 870 insertions(+), 763 deletions(-) diff --git a/pkgs/tools/package-management/nix/2_26/componentized.nix b/pkgs/tools/package-management/nix/2_26/componentized.nix index 2d9a3f46f146..9dbf54392fb4 100644 --- a/pkgs/tools/package-management/nix/2_26/componentized.nix +++ b/pkgs/tools/package-management/nix/2_26/componentized.nix @@ -1,7 +1,14 @@ - -{ lib, fetchFromGitHub, splicePackages, generateSplicesForMkScope, newScope, pkgs, stdenv, +{ + lib, + fetchFromGitHub, + splicePackages, + generateSplicesForMkScope, + newScope, + pkgs, + stdenv, libgit2-thin-packfile, - ... }: + ... +}: let officialRelease = true; src = fetchFromGitHub (builtins.fromJSON (builtins.readFile ./source.json)); @@ -41,4 +48,4 @@ let }; }; in - nixComponents.nix-everything +nixComponents.nix-everything diff --git a/pkgs/tools/package-management/nix/2_26/dependencies.nix b/pkgs/tools/package-management/nix/2_26/dependencies.nix index 2cfac6cb63e4..e226384f2acf 100644 --- a/pkgs/tools/package-management/nix/2_26/dependencies.nix +++ b/pkgs/tools/package-management/nix/2_26/dependencies.nix @@ -19,9 +19,7 @@ let root = ./.; - stdenv = if prevStdenv.isDarwin && prevStdenv.isx86_64 - then darwinStdenv - else prevStdenv; + stdenv = if prevStdenv.isDarwin && prevStdenv.isx86_64 then darwinStdenv else prevStdenv; # Fix the following error with the default x86_64-darwin SDK: # @@ -42,11 +40,14 @@ let # The Nix flake uses fileset.toSource for this. filesetToSource = { root, fileset }: resolvePath root; - /** Given a set of layers, create a mkDerivation-like function */ - mkPackageBuilder = exts: userFn: - stdenv.mkDerivation (lib.extends (lib.composeManyExtensions exts) userFn); + /** + Given a set of layers, create a mkDerivation-like function + */ + mkPackageBuilder = + exts: userFn: stdenv.mkDerivation (lib.extends (lib.composeManyExtensions exts) userFn); - localSourceLayer = finalAttrs: prevAttrs: + localSourceLayer = + finalAttrs: prevAttrs: let workDirPath = # Ideally we'd pick finalAttrs.workDir, but for now `mkDerivation` has @@ -68,126 +69,133 @@ let workDir = null; }; - mesonLayer = finalAttrs: prevAttrs: - { - # NOTE: - # As of https://github.com/NixOS/nixpkgs/blob/8baf8241cea0c7b30e0b8ae73474cb3de83c1a30/pkgs/by-name/me/meson/setup-hook.sh#L26, - # `mesonBuildType` defaults to `plain` if not specified. We want our Nix-built binaries to be optimized by default. - # More on build types here: https://mesonbuild.com/Builtin-options.html#details-for-buildtype. - mesonBuildType = "release"; - # NOTE: - # Users who are debugging Nix builds are expected to set the environment variable `mesonBuildType`, per the - # guidance in https://github.com/NixOS/nix/blob/8a3fc27f1b63a08ac983ee46435a56cf49ebaf4a/doc/manual/source/development/debugging.md?plain=1#L10. - # For this reason, we don't want to refer to `finalAttrs.mesonBuildType` here, but rather use the environment variable. - preConfigure = prevAttrs.preConfigure or "" + lib.optionalString ( - !stdenv.hostPlatform.isWindows - # build failure - && !stdenv.hostPlatform.isStatic - # LTO breaks exception handling on x86-64-darwin. - && stdenv.system != "x86_64-darwin" - ) '' - case "$mesonBuildType" in - release|minsize) appendToVar mesonFlags "-Db_lto=true" ;; - *) appendToVar mesonFlags "-Db_lto=false" ;; - esac - ''; - nativeBuildInputs = [ - pkgs.buildPackages.meson - pkgs.buildPackages.ninja - ] ++ prevAttrs.nativeBuildInputs or []; - mesonCheckFlags = prevAttrs.mesonCheckFlags or [] ++ [ - "--print-errorlogs" - ]; - }; + mesonLayer = finalAttrs: prevAttrs: { + # NOTE: + # As of https://github.com/NixOS/nixpkgs/blob/8baf8241cea0c7b30e0b8ae73474cb3de83c1a30/pkgs/by-name/me/meson/setup-hook.sh#L26, + # `mesonBuildType` defaults to `plain` if not specified. We want our Nix-built binaries to be optimized by default. + # More on build types here: https://mesonbuild.com/Builtin-options.html#details-for-buildtype. + mesonBuildType = "release"; + # NOTE: + # Users who are debugging Nix builds are expected to set the environment variable `mesonBuildType`, per the + # guidance in https://github.com/NixOS/nix/blob/8a3fc27f1b63a08ac983ee46435a56cf49ebaf4a/doc/manual/source/development/debugging.md?plain=1#L10. + # For this reason, we don't want to refer to `finalAttrs.mesonBuildType` here, but rather use the environment variable. + preConfigure = + prevAttrs.preConfigure or "" + + + lib.optionalString + ( + !stdenv.hostPlatform.isWindows + # build failure + && !stdenv.hostPlatform.isStatic + # LTO breaks exception handling on x86-64-darwin. + && stdenv.system != "x86_64-darwin" + ) + '' + case "$mesonBuildType" in + release|minsize) appendToVar mesonFlags "-Db_lto=true" ;; + *) appendToVar mesonFlags "-Db_lto=false" ;; + esac + ''; + nativeBuildInputs = [ + pkgs.buildPackages.meson + pkgs.buildPackages.ninja + ] ++ prevAttrs.nativeBuildInputs or [ ]; + mesonCheckFlags = prevAttrs.mesonCheckFlags or [ ] ++ [ + "--print-errorlogs" + ]; + }; - mesonBuildLayer = finalAttrs: prevAttrs: - { - nativeBuildInputs = prevAttrs.nativeBuildInputs or [] ++ [ - pkgs.buildPackages.pkg-config - ]; - separateDebugInfo = !stdenv.hostPlatform.isStatic; - hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie"; - env = prevAttrs.env or {} - // lib.optionalAttrs - (stdenv.isLinux - && !(stdenv.hostPlatform.isStatic && stdenv.system == "aarch64-linux") - && !(stdenv.hostPlatform.useLLVM or false)) - { LDFLAGS = "-fuse-ld=gold"; }; - }; + mesonBuildLayer = finalAttrs: prevAttrs: { + nativeBuildInputs = prevAttrs.nativeBuildInputs or [ ] ++ [ + pkgs.buildPackages.pkg-config + ]; + separateDebugInfo = !stdenv.hostPlatform.isStatic; + hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie"; + env = + prevAttrs.env or { } + // lib.optionalAttrs ( + stdenv.isLinux + && !(stdenv.hostPlatform.isStatic && stdenv.system == "aarch64-linux") + && !(stdenv.hostPlatform.useLLVM or false) + ) { LDFLAGS = "-fuse-ld=gold"; }; + }; - mesonLibraryLayer = finalAttrs: prevAttrs: - { - outputs = prevAttrs.outputs or [ "out" ] ++ [ "dev" ]; - }; + mesonLibraryLayer = finalAttrs: prevAttrs: { + outputs = prevAttrs.outputs or [ "out" ] ++ [ "dev" ]; + }; # Work around weird `--as-needed` linker behavior with BSD, see # https://github.com/mesonbuild/meson/issues/3593 - bsdNoLinkAsNeeded = finalAttrs: prevAttrs: + bsdNoLinkAsNeeded = + finalAttrs: prevAttrs: lib.optionalAttrs stdenv.hostPlatform.isBSD { - mesonFlags = [ (lib.mesonBool "b_asneeded" false) ] ++ prevAttrs.mesonFlags or []; + mesonFlags = [ (lib.mesonBool "b_asneeded" false) ] ++ prevAttrs.mesonFlags or [ ]; }; - miscGoodPractice = finalAttrs: prevAttrs: - { - strictDeps = prevAttrs.strictDeps or true; - enableParallelBuilding = true; - }; + miscGoodPractice = finalAttrs: prevAttrs: { + strictDeps = prevAttrs.strictDeps or true; + enableParallelBuilding = true; + }; in scope: { inherit stdenv; inherit libgit2-thin-packfile; - aws-sdk-cpp = (pkgs.aws-sdk-cpp.override { - apis = [ "s3" "transfer" ]; - customMemoryManagement = false; - }).overrideAttrs { - # only a stripped down version is built, which takes a lot less resources - # to build, so we don't need a "big-parallel" machine. - requiredSystemFeatures = [ ]; - }; + aws-sdk-cpp = + (pkgs.aws-sdk-cpp.override { + apis = [ + "s3" + "transfer" + ]; + customMemoryManagement = false; + }).overrideAttrs + { + # only a stripped down version is built, which takes a lot less resources + # to build, so we don't need a "big-parallel" machine. + requiredSystemFeatures = [ ]; + }; boehmgc = pkgs.boehmgc.override { enableLargeConfig = true; }; # TODO Hack until https://github.com/NixOS/nixpkgs/issues/45462 is fixed. - boost = (pkgs.boost.override { - extraB2Args = [ - "--with-container" - "--with-context" - "--with-coroutine" - ]; - }).overrideAttrs (old: { - # Need to remove `--with-*` to use `--with-libraries=...` - buildPhase = lib.replaceStrings [ "--without-python" ] [ "" ] old.buildPhase; - installPhase = lib.replaceStrings [ "--without-python" ] [ "" ] old.installPhase; - }); + boost = + (pkgs.boost.override { + extraB2Args = [ + "--with-container" + "--with-context" + "--with-coroutine" + ]; + }).overrideAttrs + (old: { + # Need to remove `--with-*` to use `--with-libraries=...` + buildPhase = lib.replaceStrings [ "--without-python" ] [ "" ] old.buildPhase; + installPhase = lib.replaceStrings [ "--without-python" ] [ "" ] old.installPhase; + }); libgit2 = libgit2-thin-packfile; inherit resolvePath filesetToSource; - mkMesonDerivation = - mkPackageBuilder [ - miscGoodPractice - localSourceLayer - mesonLayer - ]; - mkMesonExecutable = - mkPackageBuilder [ - miscGoodPractice - bsdNoLinkAsNeeded - localSourceLayer - mesonLayer - mesonBuildLayer - ]; - mkMesonLibrary = - mkPackageBuilder [ - miscGoodPractice - bsdNoLinkAsNeeded - localSourceLayer - mesonLayer - mesonBuildLayer - mesonLibraryLayer - ]; + mkMesonDerivation = mkPackageBuilder [ + miscGoodPractice + localSourceLayer + mesonLayer + ]; + mkMesonExecutable = mkPackageBuilder [ + miscGoodPractice + bsdNoLinkAsNeeded + localSourceLayer + mesonLayer + mesonBuildLayer + ]; + mkMesonLibrary = mkPackageBuilder [ + miscGoodPractice + bsdNoLinkAsNeeded + localSourceLayer + mesonLayer + mesonBuildLayer + mesonLibraryLayer + ]; } diff --git a/pkgs/tools/package-management/nix/2_26/doc/manual/package.nix b/pkgs/tools/package-management/nix/2_26/doc/manual/package.nix index f8133f2e1dd1..8f5d0dfe1370 100644 --- a/pkgs/tools/package-management/nix/2_26/doc/manual/package.nix +++ b/pkgs/tools/package-management/nix/2_26/doc/manual/package.nix @@ -1,19 +1,20 @@ -{ lib -, mkMesonDerivation +{ + lib, + mkMesonDerivation, -, meson -, ninja -, lowdown-unsandboxed -, mdbook -, mdbook-linkcheck -, jq -, python3 -, rsync -, nix-cli + meson, + ninja, + lowdown-unsandboxed, + mdbook, + mdbook-linkcheck, + jq, + python3, + rsync, + nix-cli, -# Configuration Options + # Configuration Options -, version + version, }: let @@ -25,18 +26,22 @@ mkMesonDerivation (finalAttrs: { inherit version; workDir = ./.; - fileset = fileset.difference - (fileset.unions [ - ../../.version - # Too many different types of files to filter for now - ../../doc/manual - ./. - ]) - # Do a blacklist instead - ../../doc/manual/package.nix; + fileset = + fileset.difference + (fileset.unions [ + ../../.version + # Too many different types of files to filter for now + ../../doc/manual + ./. + ]) + # Do a blacklist instead + ../../doc/manual/package.nix; # TODO the man pages should probably be separate - outputs = [ "out" "man" ]; + outputs = [ + "out" + "man" + ]; # Hack for sake of the dev shell passthru.externalNativeBuildInputs = [ @@ -54,11 +59,10 @@ mkMesonDerivation (finalAttrs: { nix-cli ]; - preConfigure = - '' - chmod u+w ./.version - echo ${finalAttrs.version} > ./.version - ''; + preConfigure = '' + chmod u+w ./.version + echo ${finalAttrs.version} > ./.version + ''; postInstall = '' mkdir -p ''$out/nix-support diff --git a/pkgs/tools/package-management/nix/2_26/packaging/components.nix b/pkgs/tools/package-management/nix/2_26/packaging/components.nix index bd9d5687a71c..57932617f827 100644 --- a/pkgs/tools/package-management/nix/2_26/packaging/components.nix +++ b/pkgs/tools/package-management/nix/2_26/packaging/components.nix @@ -13,9 +13,11 @@ let versionSuffix = lib.optionalString (!officialRelease) "pre"; - fineVersionSuffix = lib.optionalString - (!officialRelease) - "pre${builtins.substring 0 8 (src.lastModifiedDate or src.lastModified or "19700101")}_${src.shortRev or "dirty"}"; + fineVersionSuffix = + lib.optionalString (!officialRelease) + "pre${ + builtins.substring 0 8 (src.lastModifiedDate or src.lastModified or "19700101") + }_${src.shortRev or "dirty"}"; fineVersion = baseVersion + fineVersionSuffix; in diff --git a/pkgs/tools/package-management/nix/2_26/packaging/everything.nix b/pkgs/tools/package-management/nix/2_26/packaging/everything.nix index 7ca878d8d535..2b47c31bbf54 100644 --- a/pkgs/tools/package-management/nix/2_26/packaging/everything.nix +++ b/pkgs/tools/package-management/nix/2_26/packaging/everything.nix @@ -42,27 +42,31 @@ }: let - libs = { - inherit - nix-util - nix-util-c - nix-store - nix-store-c - nix-fetchers - nix-expr - nix-expr-c - nix-flake - nix-flake-c - nix-main - nix-main-c - nix-cmd - ; - } // lib.optionalAttrs (!stdenv.hostPlatform.isStatic && stdenv.buildPlatform.canExecute stdenv.hostPlatform) { - # Currently fails in static build - inherit - nix-perl-bindings - ; - }; + libs = + { + inherit + nix-util + nix-util-c + nix-store + nix-store-c + nix-fetchers + nix-expr + nix-expr-c + nix-flake + nix-flake-c + nix-main + nix-main-c + nix-cmd + ; + } + // lib.optionalAttrs + (!stdenv.hostPlatform.isStatic && stdenv.buildPlatform.canExecute stdenv.hostPlatform) + { + # Currently fails in static build + inherit + nix-perl-bindings + ; + }; dev = stdenv.mkDerivation (finalAttrs: { name = "nix-${nix-cli.version}-dev"; @@ -77,10 +81,9 @@ let ''; passthru = { tests = { - pkg-config = - testers.hasPkgConfigModules { - package = finalAttrs.finalPackage; - }; + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; }; # If we were to fully emulate output selection here, we'd confuse the Nix CLIs, @@ -123,70 +126,84 @@ in ]; meta.mainProgram = "nix"; -}).overrideAttrs (finalAttrs: prevAttrs: { - doCheck = true; - doInstallCheck = true; +}).overrideAttrs + ( + finalAttrs: prevAttrs: { + doCheck = true; + doInstallCheck = true; - checkInputs = [ - # Make sure the unit tests have passed - nix-util-tests.tests.run - nix-store-tests.tests.run - nix-expr-tests.tests.run - nix-fetchers-tests.tests.run - nix-flake-tests.tests.run + checkInputs = + [ + # Make sure the unit tests have passed + nix-util-tests.tests.run + nix-store-tests.tests.run + nix-expr-tests.tests.run + nix-fetchers-tests.tests.run + nix-flake-tests.tests.run - # Make sure the functional tests have passed - nix-functional-tests + # Make sure the functional tests have passed + nix-functional-tests - # dev bundle is ok - # (checkInputs must be empty paths??) - (runCommand "check-pkg-config" { checked = dev.tests.pkg-config; } "mkdir $out") - ] ++ lib.optionals (!stdenv.hostPlatform.isStatic && stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - # Perl currently fails in static build - # TODO: Split out tests into a separate derivation? - nix-perl-bindings - ]; - passthru = prevAttrs.passthru // { - inherit (nix-cli) version; + # dev bundle is ok + # (checkInputs must be empty paths??) + (runCommand "check-pkg-config" { checked = dev.tests.pkg-config; } "mkdir $out") + ] + ++ lib.optionals + (!stdenv.hostPlatform.isStatic && stdenv.buildPlatform.canExecute stdenv.hostPlatform) + [ + # Perl currently fails in static build + # TODO: Split out tests into a separate derivation? + nix-perl-bindings + ]; + passthru = prevAttrs.passthru // { + inherit (nix-cli) version; - /** - These are the libraries that are part of the Nix project. They are used - by the Nix CLI and other tools. + /** + These are the libraries that are part of the Nix project. They are used + by the Nix CLI and other tools. - If you need to use these libraries in your project, we recommend to use - the `-c` C API libraries exclusively, if possible. + If you need to use these libraries in your project, we recommend to use + the `-c` C API libraries exclusively, if possible. - We also recommend that you build the complete package to ensure that the unit tests pass. - You could do this in CI, or by passing it in an unused environment variable. e.g in a `mkDerivation` call: + We also recommend that you build the complete package to ensure that the unit tests pass. + You could do this in CI, or by passing it in an unused environment variable. e.g in a `mkDerivation` call: - ```nix - buildInputs = [ nix.libs.nix-util-c nix.libs.nix-store-c ]; - # Make sure the nix libs we use are ok - unusedInputsForTests = [ nix ]; - disallowedReferences = nix.all; - ``` - */ - inherit libs; + ```nix + buildInputs = [ nix.libs.nix-util-c nix.libs.nix-store-c ]; + # Make sure the nix libs we use are ok + unusedInputsForTests = [ nix ]; + disallowedReferences = nix.all; + ``` + */ + inherit libs; - tests = prevAttrs.passthru.tests or {} // { - # TODO: create a proper fixpoint and: - # pkg-config = - # testers.hasPkgConfigModules { - # package = finalPackage; - # }; - }; + tests = prevAttrs.passthru.tests or { } // { + # TODO: create a proper fixpoint and: + # pkg-config = + # testers.hasPkgConfigModules { + # package = finalPackage; + # }; + }; - /** - A derivation referencing the `dev` outputs of the Nix libraries. - */ - inherit dev; - inherit devdoc; - doc = nix-manual; - outputs = [ "out" "dev" "devdoc" "doc" ]; - all = lib.attrValues (lib.genAttrs finalAttrs.passthru.outputs (outName: finalAttrs.finalPackage.${outName})); - }; - meta = prevAttrs.meta // { - description = "The Nix package manager"; - pkgConfigModules = dev.meta.pkgConfigModules; - }; -}) + /** + A derivation referencing the `dev` outputs of the Nix libraries. + */ + inherit dev; + inherit devdoc; + doc = nix-manual; + outputs = [ + "out" + "dev" + "devdoc" + "doc" + ]; + all = lib.attrValues ( + lib.genAttrs finalAttrs.passthru.outputs (outName: finalAttrs.finalPackage.${outName}) + ); + }; + meta = prevAttrs.meta // { + description = "The Nix package manager"; + pkgConfigModules = dev.meta.pkgConfigModules; + }; + } + ) diff --git a/pkgs/tools/package-management/nix/2_26/src/external-api-docs/package.nix b/pkgs/tools/package-management/nix/2_26/src/external-api-docs/package.nix index 57c5138cfdb4..b194e16d4608 100644 --- a/pkgs/tools/package-management/nix/2_26/src/external-api-docs/package.nix +++ b/pkgs/tools/package-management/nix/2_26/src/external-api-docs/package.nix @@ -1,11 +1,12 @@ -{ lib -, mkMesonDerivation +{ + lib, + mkMesonDerivation, -, doxygen + doxygen, -# Configuration Options + # Configuration Options -, version + version, }: let @@ -39,11 +40,10 @@ mkMesonDerivation (finalAttrs: { doxygen ]; - preConfigure = - '' - chmod u+w ./.version - echo ${finalAttrs.version} > ./.version - ''; + preConfigure = '' + chmod u+w ./.version + echo ${finalAttrs.version} > ./.version + ''; postInstall = '' mkdir -p ''${!outputDoc}/nix-support diff --git a/pkgs/tools/package-management/nix/2_26/src/internal-api-docs/package.nix b/pkgs/tools/package-management/nix/2_26/src/internal-api-docs/package.nix index 993a257a69f3..6c4f354aee5c 100644 --- a/pkgs/tools/package-management/nix/2_26/src/internal-api-docs/package.nix +++ b/pkgs/tools/package-management/nix/2_26/src/internal-api-docs/package.nix @@ -1,11 +1,12 @@ -{ lib -, mkMesonDerivation +{ + lib, + mkMesonDerivation, -, doxygen + doxygen, -# Configuration Options + # Configuration Options -, version + version, }: let @@ -17,27 +18,28 @@ mkMesonDerivation (finalAttrs: { inherit version; workDir = ./.; - fileset = let - cpp = fileset.fileFilter (file: file.hasExt "cc" || file.hasExt "hh"); - in fileset.unions [ - ./.version - ../../.version - ./meson.build - ./doxygen.cfg.in - # Source is not compiled, but still must be available for Doxygen - # to gather comments. - (cpp ../.) - ]; + fileset = + let + cpp = fileset.fileFilter (file: file.hasExt "cc" || file.hasExt "hh"); + in + fileset.unions [ + ./.version + ../../.version + ./meson.build + ./doxygen.cfg.in + # Source is not compiled, but still must be available for Doxygen + # to gather comments. + (cpp ../.) + ]; nativeBuildInputs = [ doxygen ]; - preConfigure = - '' - chmod u+w ./.version - echo ${finalAttrs.version} > ./.version - ''; + preConfigure = '' + chmod u+w ./.version + echo ${finalAttrs.version} > ./.version + ''; postInstall = '' mkdir -p ''${!outputDoc}/nix-support diff --git a/pkgs/tools/package-management/nix/2_26/src/libcmd/package.nix b/pkgs/tools/package-management/nix/2_26/src/libcmd/package.nix index 5cafb4dc100c..d155d9f1e620 100644 --- a/pkgs/tools/package-management/nix/2_26/src/libcmd/package.nix +++ b/pkgs/tools/package-management/nix/2_26/src/libcmd/package.nix @@ -1,32 +1,33 @@ -{ lib -, stdenv -, mkMesonLibrary +{ + lib, + stdenv, + mkMesonLibrary, -, nix-util -, nix-store -, nix-fetchers -, nix-expr -, nix-flake -, nix-main -, editline -, readline -, lowdown -, nlohmann_json + nix-util, + nix-store, + nix-fetchers, + nix-expr, + nix-flake, + nix-main, + editline, + readline, + lowdown, + nlohmann_json, -# Configuration Options + # Configuration Options -, version + version, -# Whether to enable Markdown rendering in the Nix binary. -, enableMarkdown ? !stdenv.hostPlatform.isWindows + # Whether to enable Markdown rendering in the Nix binary. + enableMarkdown ? !stdenv.hostPlatform.isWindows, -# Which interactive line editor library to use for Nix's repl. -# -# Currently supported choices are: -# -# - editline (default) -# - readline -, readlineFlavor ? if stdenv.hostPlatform.isWindows then "readline" else "editline" + # Which interactive line editor library to use for Nix's repl. + # + # Currently supported choices are: + # + # - editline (default) + # - readline + readlineFlavor ? if stdenv.hostPlatform.isWindows then "readline" else "editline", }: let diff --git a/pkgs/tools/package-management/nix/2_26/src/libexpr-c/package.nix b/pkgs/tools/package-management/nix/2_26/src/libexpr-c/package.nix index 5047f3e2e9ab..ad1ea371c2d7 100644 --- a/pkgs/tools/package-management/nix/2_26/src/libexpr-c/package.nix +++ b/pkgs/tools/package-management/nix/2_26/src/libexpr-c/package.nix @@ -1,12 +1,13 @@ -{ lib -, mkMesonLibrary +{ + lib, + mkMesonLibrary, -, nix-store-c -, nix-expr + nix-store-c, + nix-expr, -# Configuration Options + # Configuration Options -, version + version, }: let diff --git a/pkgs/tools/package-management/nix/2_26/src/libexpr-test-support/package.nix b/pkgs/tools/package-management/nix/2_26/src/libexpr-test-support/package.nix index 48118fa0c758..5628d606a452 100644 --- a/pkgs/tools/package-management/nix/2_26/src/libexpr-test-support/package.nix +++ b/pkgs/tools/package-management/nix/2_26/src/libexpr-test-support/package.nix @@ -1,15 +1,16 @@ -{ lib -, mkMesonLibrary +{ + lib, + mkMesonLibrary, -, nix-store-test-support -, nix-expr -, nix-expr-c + nix-store-test-support, + nix-expr, + nix-expr-c, -, rapidcheck + rapidcheck, -# Configuration Options + # Configuration Options -, version + version, }: let diff --git a/pkgs/tools/package-management/nix/2_26/src/libexpr-tests/package.nix b/pkgs/tools/package-management/nix/2_26/src/libexpr-tests/package.nix index a4a3bb0e7ecd..bb5acb7c873d 100644 --- a/pkgs/tools/package-management/nix/2_26/src/libexpr-tests/package.nix +++ b/pkgs/tools/package-management/nix/2_26/src/libexpr-tests/package.nix @@ -1,20 +1,21 @@ -{ lib -, buildPackages -, stdenv -, mkMesonExecutable +{ + lib, + buildPackages, + stdenv, + mkMesonExecutable, -, nix-expr -, nix-expr-c -, nix-expr-test-support + nix-expr, + nix-expr-c, + nix-expr-test-support, -, rapidcheck -, gtest -, runCommand + rapidcheck, + gtest, + runCommand, -# Configuration Options + # Configuration Options -, version -, resolvePath + version, + resolvePath, }: let @@ -58,16 +59,22 @@ mkMesonExecutable (finalAttrs: { passthru = { tests = { - run = runCommand "${finalAttrs.pname}-run" { - meta.broken = !stdenv.hostPlatform.emulatorAvailable buildPackages; - } (lib.optionalString stdenv.hostPlatform.isWindows '' - export HOME="$PWD/home-dir" - mkdir -p "$HOME" - '' + '' - export _NIX_TEST_UNIT_DATA=${resolvePath ./data} - ${stdenv.hostPlatform.emulator buildPackages} ${lib.getExe finalAttrs.finalPackage} - touch $out - ''); + run = + runCommand "${finalAttrs.pname}-run" + { + meta.broken = !stdenv.hostPlatform.emulatorAvailable buildPackages; + } + ( + lib.optionalString stdenv.hostPlatform.isWindows '' + export HOME="$PWD/home-dir" + mkdir -p "$HOME" + '' + + '' + export _NIX_TEST_UNIT_DATA=${resolvePath ./data} + ${stdenv.hostPlatform.emulator buildPackages} ${lib.getExe finalAttrs.finalPackage} + touch $out + '' + ); }; }; diff --git a/pkgs/tools/package-management/nix/2_26/src/libexpr/package.nix b/pkgs/tools/package-management/nix/2_26/src/libexpr/package.nix index 3d5b78e35f2d..afd01c3846e9 100644 --- a/pkgs/tools/package-management/nix/2_26/src/libexpr/package.nix +++ b/pkgs/tools/package-management/nix/2_26/src/libexpr/package.nix @@ -1,33 +1,34 @@ -{ lib -, stdenv -, mkMesonLibrary +{ + lib, + stdenv, + mkMesonLibrary, -, bison -, flex -, cmake # for resolving toml11 dep + bison, + flex, + cmake, # for resolving toml11 dep -, nix-util -, nix-store -, nix-fetchers -, boost -, boehmgc -, nlohmann_json -, toml11 + nix-util, + nix-store, + nix-fetchers, + boost, + boehmgc, + nlohmann_json, + toml11, -# Configuration Options + # Configuration Options -, version + version, -# Whether to use garbage collection for the Nix language evaluator. -# -# If it is disabled, we just leak memory, but this is not as bad as it -# sounds so long as evaluation just takes places within short-lived -# processes. (When the process exits, the memory is reclaimed; it is -# only leaked *within* the process.) -# -# Temporarily disabled on Windows because the `GC_throw_bad_alloc` -# symbol is missing during linking. -, enableGC ? !stdenv.hostPlatform.isWindows + # Whether to use garbage collection for the Nix language evaluator. + # + # If it is disabled, we just leak memory, but this is not as bad as it + # sounds so long as evaluation just takes places within short-lived + # processes. (When the process exits, the memory is reclaimed; it is + # only leaked *within* the process.) + # + # Temporarily disabled on Windows because the `GC_throw_bad_alloc` + # symbol is missing during linking. + enableGC ? !stdenv.hostPlatform.isWindows, }: let @@ -51,10 +52,7 @@ mkMesonLibrary (finalAttrs: { (fileset.fileFilter (file: file.hasExt "hh") ./.) ./lexer.l ./parser.y - (fileset.difference - (fileset.fileFilter (file: file.hasExt "nix") ./.) - ./package.nix - ) + (fileset.difference (fileset.fileFilter (file: file.hasExt "nix") ./.) ./package.nix) ]; nativeBuildInputs = [ diff --git a/pkgs/tools/package-management/nix/2_26/src/libfetchers-tests/package.nix b/pkgs/tools/package-management/nix/2_26/src/libfetchers-tests/package.nix index 5336672a2221..f2680e9b3c1f 100644 --- a/pkgs/tools/package-management/nix/2_26/src/libfetchers-tests/package.nix +++ b/pkgs/tools/package-management/nix/2_26/src/libfetchers-tests/package.nix @@ -1,19 +1,20 @@ -{ lib -, buildPackages -, stdenv -, mkMesonExecutable +{ + lib, + buildPackages, + stdenv, + mkMesonExecutable, -, nix-fetchers -, nix-store-test-support + nix-fetchers, + nix-store-test-support, -, rapidcheck -, gtest -, runCommand + rapidcheck, + gtest, + runCommand, -# Configuration Options + # Configuration Options -, version -, resolvePath + version, + resolvePath, }: let @@ -56,16 +57,22 @@ mkMesonExecutable (finalAttrs: { passthru = { tests = { - run = runCommand "${finalAttrs.pname}-run" { - meta.broken = !stdenv.hostPlatform.emulatorAvailable buildPackages; - } (lib.optionalString stdenv.hostPlatform.isWindows '' - export HOME="$PWD/home-dir" - mkdir -p "$HOME" - '' + '' - export _NIX_TEST_UNIT_DATA=${resolvePath ./data} - ${stdenv.hostPlatform.emulator buildPackages} ${lib.getExe finalAttrs.finalPackage} - touch $out - ''); + run = + runCommand "${finalAttrs.pname}-run" + { + meta.broken = !stdenv.hostPlatform.emulatorAvailable buildPackages; + } + ( + lib.optionalString stdenv.hostPlatform.isWindows '' + export HOME="$PWD/home-dir" + mkdir -p "$HOME" + '' + + '' + export _NIX_TEST_UNIT_DATA=${resolvePath ./data} + ${stdenv.hostPlatform.emulator buildPackages} ${lib.getExe finalAttrs.finalPackage} + touch $out + '' + ); }; }; diff --git a/pkgs/tools/package-management/nix/2_26/src/libfetchers/package.nix b/pkgs/tools/package-management/nix/2_26/src/libfetchers/package.nix index d4ca18555031..b0aecd04979e 100644 --- a/pkgs/tools/package-management/nix/2_26/src/libfetchers/package.nix +++ b/pkgs/tools/package-management/nix/2_26/src/libfetchers/package.nix @@ -1,14 +1,15 @@ -{ lib -, mkMesonLibrary +{ + lib, + mkMesonLibrary, -, nix-util -, nix-store -, nlohmann_json -, libgit2 + nix-util, + nix-store, + nlohmann_json, + libgit2, -# Configuration Options + # Configuration Options -, version + version, }: let diff --git a/pkgs/tools/package-management/nix/2_26/src/libflake-c/package.nix b/pkgs/tools/package-management/nix/2_26/src/libflake-c/package.nix index dcd6c4966097..f0615a42798e 100644 --- a/pkgs/tools/package-management/nix/2_26/src/libflake-c/package.nix +++ b/pkgs/tools/package-management/nix/2_26/src/libflake-c/package.nix @@ -1,13 +1,14 @@ -{ lib -, mkMesonLibrary +{ + lib, + mkMesonLibrary, -, nix-store-c -, nix-expr-c -, nix-flake + nix-store-c, + nix-expr-c, + nix-flake, -# Configuration Options + # Configuration Options -, version + version, }: let diff --git a/pkgs/tools/package-management/nix/2_26/src/libflake-tests/package.nix b/pkgs/tools/package-management/nix/2_26/src/libflake-tests/package.nix index 51b68ad581ff..f9d9b0bc0c6b 100644 --- a/pkgs/tools/package-management/nix/2_26/src/libflake-tests/package.nix +++ b/pkgs/tools/package-management/nix/2_26/src/libflake-tests/package.nix @@ -1,20 +1,21 @@ -{ lib -, buildPackages -, stdenv -, mkMesonExecutable +{ + lib, + buildPackages, + stdenv, + mkMesonExecutable, -, nix-flake -, nix-flake-c -, nix-expr-test-support + nix-flake, + nix-flake-c, + nix-expr-test-support, -, rapidcheck -, gtest -, runCommand + rapidcheck, + gtest, + runCommand, -# Configuration Options + # Configuration Options -, version -, resolvePath + version, + resolvePath, }: let @@ -58,17 +59,23 @@ mkMesonExecutable (finalAttrs: { passthru = { tests = { - run = runCommand "${finalAttrs.pname}-run" { - meta.broken = !stdenv.hostPlatform.emulatorAvailable buildPackages; - } (lib.optionalString stdenv.hostPlatform.isWindows '' - export HOME="$PWD/home-dir" - mkdir -p "$HOME" - '' + '' - export _NIX_TEST_UNIT_DATA=${resolvePath ./data} - export NIX_CONFIG="extra-experimental-features = flakes" - ${stdenv.hostPlatform.emulator buildPackages} ${lib.getExe finalAttrs.finalPackage} - touch $out - ''); + run = + runCommand "${finalAttrs.pname}-run" + { + meta.broken = !stdenv.hostPlatform.emulatorAvailable buildPackages; + } + ( + lib.optionalString stdenv.hostPlatform.isWindows '' + export HOME="$PWD/home-dir" + mkdir -p "$HOME" + '' + + '' + export _NIX_TEST_UNIT_DATA=${resolvePath ./data} + export NIX_CONFIG="extra-experimental-features = flakes" + ${stdenv.hostPlatform.emulator buildPackages} ${lib.getExe finalAttrs.finalPackage} + touch $out + '' + ); }; }; diff --git a/pkgs/tools/package-management/nix/2_26/src/libflake/package.nix b/pkgs/tools/package-management/nix/2_26/src/libflake/package.nix index 3fc96a20e58c..ebd38e140d30 100644 --- a/pkgs/tools/package-management/nix/2_26/src/libflake/package.nix +++ b/pkgs/tools/package-management/nix/2_26/src/libflake/package.nix @@ -1,15 +1,16 @@ -{ lib -, mkMesonLibrary +{ + lib, + mkMesonLibrary, -, nix-util -, nix-store -, nix-fetchers -, nix-expr -, nlohmann_json + nix-util, + nix-store, + nix-fetchers, + nix-expr, + nlohmann_json, -# Configuration Options + # Configuration Options -, version + version, }: let diff --git a/pkgs/tools/package-management/nix/2_26/src/libmain-c/package.nix b/pkgs/tools/package-management/nix/2_26/src/libmain-c/package.nix index b96901bb46bb..cf710e03b0d0 100644 --- a/pkgs/tools/package-management/nix/2_26/src/libmain-c/package.nix +++ b/pkgs/tools/package-management/nix/2_26/src/libmain-c/package.nix @@ -1,14 +1,15 @@ -{ lib -, mkMesonLibrary +{ + lib, + mkMesonLibrary, -, nix-util-c -, nix-store -, nix-store-c -, nix-main + nix-util-c, + nix-store, + nix-store-c, + nix-main, -# Configuration Options + # Configuration Options -, version + version, }: let diff --git a/pkgs/tools/package-management/nix/2_26/src/libmain/package.nix b/pkgs/tools/package-management/nix/2_26/src/libmain/package.nix index 9a5b9e8c2df0..046b505dfd46 100644 --- a/pkgs/tools/package-management/nix/2_26/src/libmain/package.nix +++ b/pkgs/tools/package-management/nix/2_26/src/libmain/package.nix @@ -1,14 +1,15 @@ -{ lib -, mkMesonLibrary +{ + lib, + mkMesonLibrary, -, openssl + openssl, -, nix-util -, nix-store + nix-util, + nix-store, -# Configuration Options + # Configuration Options -, version + version, }: let diff --git a/pkgs/tools/package-management/nix/2_26/src/libstore-c/package.nix b/pkgs/tools/package-management/nix/2_26/src/libstore-c/package.nix index c2413c3890d1..89abeaab8706 100644 --- a/pkgs/tools/package-management/nix/2_26/src/libstore-c/package.nix +++ b/pkgs/tools/package-management/nix/2_26/src/libstore-c/package.nix @@ -1,12 +1,13 @@ -{ lib -, mkMesonLibrary +{ + lib, + mkMesonLibrary, -, nix-util-c -, nix-store + nix-util-c, + nix-store, -# Configuration Options + # Configuration Options -, version + version, }: let diff --git a/pkgs/tools/package-management/nix/2_26/src/libstore-test-support/package.nix b/pkgs/tools/package-management/nix/2_26/src/libstore-test-support/package.nix index 5d3f41b3e8b9..7cc29795c190 100644 --- a/pkgs/tools/package-management/nix/2_26/src/libstore-test-support/package.nix +++ b/pkgs/tools/package-management/nix/2_26/src/libstore-test-support/package.nix @@ -1,15 +1,16 @@ -{ lib -, mkMesonLibrary +{ + lib, + mkMesonLibrary, -, nix-util-test-support -, nix-store -, nix-store-c + nix-util-test-support, + nix-store, + nix-store-c, -, rapidcheck + rapidcheck, -# Configuration Options + # Configuration Options -, version + version, }: let diff --git a/pkgs/tools/package-management/nix/2_26/src/libstore-tests/package.nix b/pkgs/tools/package-management/nix/2_26/src/libstore-tests/package.nix index 3acf4e25c2cc..670386c4a6ff 100644 --- a/pkgs/tools/package-management/nix/2_26/src/libstore-tests/package.nix +++ b/pkgs/tools/package-management/nix/2_26/src/libstore-tests/package.nix @@ -1,21 +1,22 @@ -{ lib -, buildPackages -, stdenv -, mkMesonExecutable +{ + lib, + buildPackages, + stdenv, + mkMesonExecutable, -, nix-store -, nix-store-c -, nix-store-test-support -, sqlite + nix-store, + nix-store-c, + nix-store-test-support, + sqlite, -, rapidcheck -, gtest -, runCommand + rapidcheck, + gtest, + runCommand, -# Configuration Options + # Configuration Options -, version -, filesetToSource + version, + filesetToSource, }: let @@ -64,26 +65,33 @@ mkMesonExecutable (finalAttrs: { passthru = { tests = { - run = let - # Some data is shared with the functional tests: they create it, - # we consume it. - data = filesetToSource { - root = ../..; - fileset = lib.fileset.unions [ - ./data - ../../tests/functional/derivation - ]; - }; - in runCommand "${finalAttrs.pname}-run" { - meta.broken = !stdenv.hostPlatform.emulatorAvailable buildPackages; - } (lib.optionalString stdenv.hostPlatform.isWindows '' - export HOME="$PWD/home-dir" - mkdir -p "$HOME" - '' + '' - export _NIX_TEST_UNIT_DATA=${data + "/src/libstore-tests/data"} - ${stdenv.hostPlatform.emulator buildPackages} ${lib.getExe finalAttrs.finalPackage} - touch $out - ''); + run = + let + # Some data is shared with the functional tests: they create it, + # we consume it. + data = filesetToSource { + root = ../..; + fileset = lib.fileset.unions [ + ./data + ../../tests/functional/derivation + ]; + }; + in + runCommand "${finalAttrs.pname}-run" + { + meta.broken = !stdenv.hostPlatform.emulatorAvailable buildPackages; + } + ( + lib.optionalString stdenv.hostPlatform.isWindows '' + export HOME="$PWD/home-dir" + mkdir -p "$HOME" + '' + + '' + export _NIX_TEST_UNIT_DATA=${data + "/src/libstore-tests/data"} + ${stdenv.hostPlatform.emulator buildPackages} ${lib.getExe finalAttrs.finalPackage} + touch $out + '' + ); }; }; diff --git a/pkgs/tools/package-management/nix/2_26/src/libstore/package.nix b/pkgs/tools/package-management/nix/2_26/src/libstore/package.nix index 4fbaea4acc57..c982b44f0b73 100644 --- a/pkgs/tools/package-management/nix/2_26/src/libstore/package.nix +++ b/pkgs/tools/package-management/nix/2_26/src/libstore/package.nix @@ -1,25 +1,26 @@ -{ lib -, stdenv -, mkMesonLibrary +{ + lib, + stdenv, + mkMesonLibrary, -, unixtools -, darwin + unixtools, + darwin, -, nix-util -, boost -, curl -, aws-sdk-cpp -, libseccomp -, nlohmann_json -, sqlite + nix-util, + boost, + curl, + aws-sdk-cpp, + libseccomp, + nlohmann_json, + sqlite, -, busybox-sandbox-shell ? null + busybox-sandbox-shell ? null, -# Configuration Options + # Configuration Options -, version + version, -, embeddedSandboxShell ? stdenv.hostPlatform.isStatic + embeddedSandboxShell ? stdenv.hostPlatform.isStatic, }: let @@ -48,19 +49,20 @@ mkMesonLibrary (finalAttrs: { (fileset.fileFilter (file: file.hasExt "sql") ./.) ]; - nativeBuildInputs = - lib.optional embeddedSandboxShell unixtools.hexdump; + nativeBuildInputs = lib.optional embeddedSandboxShell unixtools.hexdump; - buildInputs = [ - boost - curl - sqlite - ] ++ lib.optional stdenv.hostPlatform.isLinux libseccomp + buildInputs = + [ + boost + curl + sqlite + ] + ++ lib.optional stdenv.hostPlatform.isLinux libseccomp # There have been issues building these dependencies ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.libs.sandbox - ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform && (stdenv.isLinux || stdenv.isDarwin)) - aws-sdk-cpp - ; + ++ lib.optional ( + stdenv.hostPlatform == stdenv.buildPlatform && (stdenv.isLinux || stdenv.isDarwin) + ) aws-sdk-cpp; propagatedBuildInputs = [ nix-util @@ -75,12 +77,14 @@ mkMesonLibrary (finalAttrs: { echo ${version} > ../../.version ''; - mesonFlags = [ - (lib.mesonEnable "seccomp-sandboxing" stdenv.hostPlatform.isLinux) - (lib.mesonBool "embedded-sandbox-shell" embeddedSandboxShell) - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - (lib.mesonOption "sandbox-shell" "${busybox-sandbox-shell}/bin/busybox") - ]; + mesonFlags = + [ + (lib.mesonEnable "seccomp-sandboxing" stdenv.hostPlatform.isLinux) + (lib.mesonBool "embedded-sandbox-shell" embeddedSandboxShell) + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + (lib.mesonOption "sandbox-shell" "${busybox-sandbox-shell}/bin/busybox") + ]; env = { # Needed for Meson to find Boost. diff --git a/pkgs/tools/package-management/nix/2_26/src/libutil-c/package.nix b/pkgs/tools/package-management/nix/2_26/src/libutil-c/package.nix index f80e0b7f0a2a..72f57d6f9c62 100644 --- a/pkgs/tools/package-management/nix/2_26/src/libutil-c/package.nix +++ b/pkgs/tools/package-management/nix/2_26/src/libutil-c/package.nix @@ -1,11 +1,12 @@ -{ lib -, mkMesonLibrary +{ + lib, + mkMesonLibrary, -, nix-util + nix-util, -# Configuration Options + # Configuration Options -, version + version, }: let diff --git a/pkgs/tools/package-management/nix/2_26/src/libutil-test-support/package.nix b/pkgs/tools/package-management/nix/2_26/src/libutil-test-support/package.nix index a8a239717a68..33cd5217defa 100644 --- a/pkgs/tools/package-management/nix/2_26/src/libutil-test-support/package.nix +++ b/pkgs/tools/package-management/nix/2_26/src/libutil-test-support/package.nix @@ -1,14 +1,15 @@ -{ lib -, mkMesonLibrary +{ + lib, + mkMesonLibrary, -, nix-util -, nix-util-c + nix-util, + nix-util-c, -, rapidcheck + rapidcheck, -# Configuration Options + # Configuration Options -, version + version, }: let diff --git a/pkgs/tools/package-management/nix/2_26/src/libutil-tests/package.nix b/pkgs/tools/package-management/nix/2_26/src/libutil-tests/package.nix index e5805ec3968e..d4eea3a8dc26 100644 --- a/pkgs/tools/package-management/nix/2_26/src/libutil-tests/package.nix +++ b/pkgs/tools/package-management/nix/2_26/src/libutil-tests/package.nix @@ -1,20 +1,21 @@ -{ lib -, buildPackages -, stdenv -, mkMesonExecutable +{ + lib, + buildPackages, + stdenv, + mkMesonExecutable, -, nix-util -, nix-util-c -, nix-util-test-support + nix-util, + nix-util-c, + nix-util-test-support, -, rapidcheck -, gtest -, runCommand + rapidcheck, + gtest, + runCommand, -# Configuration Options + # Configuration Options -, version -, resolvePath + version, + resolvePath, }: let @@ -58,16 +59,22 @@ mkMesonExecutable (finalAttrs: { passthru = { tests = { - run = runCommand "${finalAttrs.pname}-run" { - meta.broken = !stdenv.hostPlatform.emulatorAvailable buildPackages; - } (lib.optionalString stdenv.hostPlatform.isWindows '' - export HOME="$PWD/home-dir" - mkdir -p "$HOME" - '' + '' - export _NIX_TEST_UNIT_DATA=${resolvePath ./data} - ${stdenv.hostPlatform.emulator buildPackages} ${lib.getExe finalAttrs.finalPackage} - touch $out - ''); + run = + runCommand "${finalAttrs.pname}-run" + { + meta.broken = !stdenv.hostPlatform.emulatorAvailable buildPackages; + } + ( + lib.optionalString stdenv.hostPlatform.isWindows '' + export HOME="$PWD/home-dir" + mkdir -p "$HOME" + '' + + '' + export _NIX_TEST_UNIT_DATA=${resolvePath ./data} + ${stdenv.hostPlatform.emulator buildPackages} ${lib.getExe finalAttrs.finalPackage} + touch $out + '' + ); }; }; diff --git a/pkgs/tools/package-management/nix/2_26/src/libutil/package.nix b/pkgs/tools/package-management/nix/2_26/src/libutil/package.nix index 679872a75c59..586119a6e5d5 100644 --- a/pkgs/tools/package-management/nix/2_26/src/libutil/package.nix +++ b/pkgs/tools/package-management/nix/2_26/src/libutil/package.nix @@ -1,18 +1,19 @@ -{ lib -, stdenv -, mkMesonLibrary +{ + lib, + stdenv, + mkMesonLibrary, -, boost -, brotli -, libarchive -, libcpuid -, libsodium -, nlohmann_json -, openssl + boost, + brotli, + libarchive, + libcpuid, + libsodium, + nlohmann_json, + openssl, -# Configuration Options + # Configuration Options -, version + version, }: let @@ -43,8 +44,7 @@ mkMesonLibrary (finalAttrs: { brotli libsodium openssl - ] ++ lib.optional stdenv.hostPlatform.isx86_64 libcpuid - ; + ] ++ lib.optional stdenv.hostPlatform.isx86_64 libcpuid; propagatedBuildInputs = [ boost diff --git a/pkgs/tools/package-management/nix/2_26/src/nix/package.nix b/pkgs/tools/package-management/nix/2_26/src/nix/package.nix index 171621af9176..89c52c3bb050 100644 --- a/pkgs/tools/package-management/nix/2_26/src/nix/package.nix +++ b/pkgs/tools/package-management/nix/2_26/src/nix/package.nix @@ -1,14 +1,15 @@ -{ lib -, mkMesonExecutable +{ + lib, + mkMesonExecutable, -, nix-store -, nix-expr -, nix-main -, nix-cmd + nix-store, + nix-expr, + nix-main, + nix-cmd, -# Configuration Options + # Configuration Options -, version + version, }: let @@ -20,64 +21,67 @@ mkMesonExecutable (finalAttrs: { inherit version; workDir = ./.; - fileset = fileset.unions ([ - ../../nix-meson-build-support - ./nix-meson-build-support - ../../.version - ./.version - ./meson.build - ./meson.options - - # Symbolic links to other dirs - ## exes - ./build-remote - ./doc - ./nix-build - ./nix-channel - ./nix-collect-garbage - ./nix-copy-closure - ./nix-env - ./nix-instantiate - ./nix-store - ## dirs - ./scripts - ../../scripts - ./misc - ../../misc - - # Doc nix files for --help - ../../doc/manual/generate-manpage.nix - ../../doc/manual/utils.nix - ../../doc/manual/generate-settings.nix - ../../doc/manual/generate-store-info.nix - - # Other files to be included as string literals - ../nix-channel/unpack-channel.nix - ../nix-env/buildenv.nix - ./get-env.sh - ./help-stores.md - ../../doc/manual/source/store/types/index.md.in - ./profiles.md - ../../doc/manual/source/command-ref/files/profiles.md - - # Files - ] ++ lib.concatMap - (dir: [ - (fileset.fileFilter (file: file.hasExt "cc") dir) - (fileset.fileFilter (file: file.hasExt "hh") dir) - (fileset.fileFilter (file: file.hasExt "md") dir) - ]) + fileset = fileset.unions ( [ - ./. - ../build-remote - ../nix-build - ../nix-channel - ../nix-collect-garbage - ../nix-copy-closure - ../nix-env - ../nix-instantiate - ../nix-store + ../../nix-meson-build-support + ./nix-meson-build-support + ../../.version + ./.version + ./meson.build + ./meson.options + + # Symbolic links to other dirs + ## exes + ./build-remote + ./doc + ./nix-build + ./nix-channel + ./nix-collect-garbage + ./nix-copy-closure + ./nix-env + ./nix-instantiate + ./nix-store + ## dirs + ./scripts + ../../scripts + ./misc + ../../misc + + # Doc nix files for --help + ../../doc/manual/generate-manpage.nix + ../../doc/manual/utils.nix + ../../doc/manual/generate-settings.nix + ../../doc/manual/generate-store-info.nix + + # Other files to be included as string literals + ../nix-channel/unpack-channel.nix + ../nix-env/buildenv.nix + ./get-env.sh + ./help-stores.md + ../../doc/manual/source/store/types/index.md.in + ./profiles.md + ../../doc/manual/source/command-ref/files/profiles.md + + # Files ] + ++ + lib.concatMap + (dir: [ + (fileset.fileFilter (file: file.hasExt "cc") dir) + (fileset.fileFilter (file: file.hasExt "hh") dir) + (fileset.fileFilter (file: file.hasExt "md") dir) + ]) + [ + ./. + ../build-remote + ../nix-build + ../nix-channel + ../nix-collect-garbage + ../nix-copy-closure + ../nix-env + ../nix-instantiate + ../nix-store + ] ); buildInputs = [ diff --git a/pkgs/tools/package-management/nix/2_26/src/perl/package.nix b/pkgs/tools/package-management/nix/2_26/src/perl/package.nix index 5ee0df13c9d1..d95d13aa9213 100644 --- a/pkgs/tools/package-management/nix/2_26/src/perl/package.nix +++ b/pkgs/tools/package-management/nix/2_26/src/perl/package.nix @@ -1,76 +1,82 @@ -{ lib -, stdenv -, mkMesonDerivation -, pkg-config -, perl -, perlPackages -, nix-store -, version -, curl -, bzip2 -, libsodium +{ + lib, + stdenv, + mkMesonDerivation, + pkg-config, + perl, + perlPackages, + nix-store, + version, + curl, + bzip2, + libsodium, }: let inherit (lib) fileset; in -perl.pkgs.toPerlModule (mkMesonDerivation (finalAttrs: { - pname = "nix-perl"; - inherit version; +perl.pkgs.toPerlModule ( + mkMesonDerivation (finalAttrs: { + pname = "nix-perl"; + inherit version; - workDir = ./.; - fileset = fileset.unions ([ - ./.version - ../../.version - ./MANIFEST - ./lib - ./meson.build - ./meson.options - ] ++ lib.optionals finalAttrs.doCheck [ - ./.yath.rc.in - ./t - ]); + workDir = ./.; + fileset = fileset.unions ( + [ + ./.version + ../../.version + ./MANIFEST + ./lib + ./meson.build + ./meson.options + ] + ++ lib.optionals finalAttrs.doCheck [ + ./.yath.rc.in + ./t + ] + ); - nativeBuildInputs = [ - pkg-config - perl - curl - ]; + nativeBuildInputs = [ + pkg-config + perl + curl + ]; - buildInputs = [ - nix-store - ] ++ finalAttrs.passthru.externalBuildInputs; + buildInputs = [ + nix-store + ] ++ finalAttrs.passthru.externalBuildInputs; - # Hack for sake of the dev shell - passthru.externalBuildInputs = [ - bzip2 - libsodium - ]; + # Hack for sake of the dev shell + passthru.externalBuildInputs = [ + bzip2 + libsodium + ]; - # `perlPackages.Test2Harness` is marked broken for Darwin - doCheck = !stdenv.isDarwin; + # `perlPackages.Test2Harness` is marked broken for Darwin + doCheck = !stdenv.isDarwin; - nativeCheckInputs = [ - perlPackages.Test2Harness - ]; + nativeCheckInputs = [ + perlPackages.Test2Harness + ]; - preConfigure = - # "Inline" .version so its not a symlink, and includes the suffix - '' - chmod u+w .version - echo ${finalAttrs.version} > .version - ''; + preConfigure = + # "Inline" .version so its not a symlink, and includes the suffix + '' + chmod u+w .version + echo ${finalAttrs.version} > .version + ''; - mesonFlags = [ - (lib.mesonOption "dbi_path" "${perlPackages.DBI}/${perl.libPrefix}") - (lib.mesonOption "dbd_sqlite_path" "${perlPackages.DBDSQLite}/${perl.libPrefix}") - (lib.mesonEnable "tests" finalAttrs.doCheck) - ]; + mesonFlags = [ + (lib.mesonOption "dbi_path" "${perlPackages.DBI}/${perl.libPrefix}") + (lib.mesonOption "dbd_sqlite_path" "${perlPackages.DBDSQLite}/${perl.libPrefix}") + (lib.mesonEnable "tests" finalAttrs.doCheck) + ]; - mesonCheckFlags = [ - "--print-errorlogs" - ]; + mesonCheckFlags = [ + "--print-errorlogs" + ]; - strictDeps = false; -})) + strictDeps = false; + }) +) diff --git a/pkgs/tools/package-management/nix/2_26/tests/functional/package.nix b/pkgs/tools/package-management/nix/2_26/tests/functional/package.nix index d1582b05d145..74c034196fde 100644 --- a/pkgs/tools/package-management/nix/2_26/tests/functional/package.nix +++ b/pkgs/tools/package-management/nix/2_26/tests/functional/package.nix @@ -1,103 +1,110 @@ -{ lib -, stdenv -, mkMesonDerivation +{ + lib, + stdenv, + mkMesonDerivation, -, meson -, ninja -, pkg-config + meson, + ninja, + pkg-config, -, jq -, git -, mercurial -, util-linux + jq, + git, + mercurial, + util-linux, -, nix-store -, nix-expr -, nix-cli + nix-store, + nix-expr, + nix-cli, -, busybox-sandbox-shell ? null + busybox-sandbox-shell ? null, -# Configuration Options + # Configuration Options -, pname ? "nix-functional-tests" -, version + pname ? "nix-functional-tests", + version, -# For running the functional tests against a different pre-built Nix. -, test-daemon ? null + # For running the functional tests against a different pre-built Nix. + test-daemon ? null, }: let inherit (lib) fileset; in -mkMesonDerivation (finalAttrs: { - inherit pname version; +mkMesonDerivation ( + finalAttrs: + { + inherit pname version; - workDir = ./.; - fileset = fileset.unions [ - ../../scripts/nix-profile.sh.in - ../../.version - ../../tests/functional - ./. - ]; + workDir = ./.; + fileset = fileset.unions [ + ../../scripts/nix-profile.sh.in + ../../.version + ../../tests/functional + ./. + ]; - # Hack for sake of the dev shell - passthru.externalNativeBuildInputs = [ - meson - ninja - pkg-config + # Hack for sake of the dev shell + passthru.externalNativeBuildInputs = + [ + meson + ninja + pkg-config - jq - git - mercurial - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - # For various sandboxing tests that needs a statically-linked shell, - # etc. - busybox-sandbox-shell - # For Overlay FS tests need `mount`, `umount`, and `unshare`. - # For `script` command (ensuring a TTY) - # TODO use `unixtools` to be precise over which executables instead? - util-linux - ]; + jq + git + mercurial + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + # For various sandboxing tests that needs a statically-linked shell, + # etc. + busybox-sandbox-shell + # For Overlay FS tests need `mount`, `umount`, and `unshare`. + # For `script` command (ensuring a TTY) + # TODO use `unixtools` to be precise over which executables instead? + util-linux + ]; - nativeBuildInputs = finalAttrs.passthru.externalNativeBuildInputs ++ [ - nix-cli - ]; + nativeBuildInputs = finalAttrs.passthru.externalNativeBuildInputs ++ [ + nix-cli + ]; - buildInputs = [ - nix-store - nix-expr - ]; + buildInputs = [ + nix-store + nix-expr + ]; - preConfigure = - # "Inline" .version so it's not a symlink, and includes the suffix. - # Do the meson utils, without modification. - '' - chmod u+w ./.version - echo ${version} > ../../../.version - '' - # TEMP hack for Meson before make is gone, where - # `src/nix-functional-tests` is during the transition a symlink and - # not the actual directory directory. - + '' - cd $(readlink -e $PWD) - echo $PWD | grep tests/functional + preConfigure = + # "Inline" .version so it's not a symlink, and includes the suffix. + # Do the meson utils, without modification. + '' + chmod u+w ./.version + echo ${version} > ../../../.version + '' + # TEMP hack for Meson before make is gone, where + # `src/nix-functional-tests` is during the transition a symlink and + # not the actual directory directory. + + '' + cd $(readlink -e $PWD) + echo $PWD | grep tests/functional + ''; + + mesonCheckFlags = [ + "--print-errorlogs" + ]; + + doCheck = true; + + installPhase = '' + mkdir $out ''; - mesonCheckFlags = [ - "--print-errorlogs" - ]; + meta = { + platforms = lib.platforms.unix; + }; - doCheck = true; - - installPhase = '' - mkdir $out - ''; - - meta = { - platforms = lib.platforms.unix; - }; - -} // lib.optionalAttrs (test-daemon != null) { - NIX_DAEMON_PACKAGE = test-daemon; -}) + } + // lib.optionalAttrs (test-daemon != null) { + NIX_DAEMON_PACKAGE = test-daemon; + } +) From 82dbd490221a44f5956f3836117d244d39664577 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 22 Jan 2025 15:35:54 +0100 Subject: [PATCH 0803/2168] refactor: Extract pkgs/.../nix/tests.nix --- pkgs/tools/package-management/nix/common.nix | 34 ++----------- pkgs/tools/package-management/nix/tests.nix | 52 ++++++++++++++++++++ 2 files changed, 55 insertions(+), 31 deletions(-) create mode 100644 pkgs/tools/package-management/nix/tests.nix diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix index 9732b8a98c04..bfecf16919dc 100644 --- a/pkgs/tools/package-management/nix/common.nix +++ b/pkgs/tools/package-management/nix/common.nix @@ -250,37 +250,9 @@ self = stdenv.mkDerivation { perl-bindings = perl.pkgs.toPerlModule (callPackage ./nix-perl.nix { nix = self; inherit Security; }); - tests = { - srcVersion = runCommand "nix-src-version" { - inherit version; - } '' - # This file is an implementation detail, but it's a good sanity check - # If upstream changes that, we'll have to adapt. - srcVersion=$(cat ${src}/.version) - echo "Version in nix nix expression: $version" - echo "Version in nix.src: $srcVersion" - if [ "$version" != "$srcVersion" ]; then - echo "Version mismatch!" - exit 1 - fi - touch $out - ''; - - /** Intended to test `lib`, but also a good smoke test for Nix */ - nixpkgs-lib = import ../../../../lib/tests/test-with-nix.nix { - inherit lib pkgs; - nix = self; - }; - } // lib.optionalAttrs stdenv.hostPlatform.isLinux { - nixStatic = pkgsStatic.nixVersions.${self_attribute_name}; - - # Basic smoke tests that needs to pass when upgrading nix. - # Note that this test does only test the nixVersions.stable attribute. - misc = nixosTests.nix-misc.default; - upgrade = nixosTests.nix-upgrade; - simpleUefiSystemdBoot = nixosTests.installer.simpleUefiSystemdBoot; - } // lib.optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux") { - nixi686 = pkgsi686Linux.nixVersions.${self_attribute_name}; + tests = import ./tests.nix { + inherit runCommand version src lib stdenv pkgs pkgsi686Linux pkgsStatic nixosTests self_attribute_name; + nix = self; }; }; diff --git a/pkgs/tools/package-management/nix/tests.nix b/pkgs/tools/package-management/nix/tests.nix new file mode 100644 index 000000000000..662cfe7d194c --- /dev/null +++ b/pkgs/tools/package-management/nix/tests.nix @@ -0,0 +1,52 @@ +{ + runCommand, + version, + src, + nix, + lib, + stdenv, + pkgs, + pkgsi686Linux, + pkgsStatic, + nixosTests, + self_attribute_name, +}: +{ + srcVersion = + runCommand "nix-src-version" + { + inherit version; + } + '' + # This file is an implementation detail, but it's a good sanity check + # If upstream changes that, we'll have to adapt. + srcVersion=$(cat ${src}/.version) + echo "Version in nix nix expression: $version" + echo "Version in nix.src: $srcVersion" + if [ "$version" != "$srcVersion" ]; then + echo "Version mismatch!" + exit 1 + fi + touch $out + ''; + + /** + Intended to test `lib`, but also a good smoke test for Nix + */ + nixpkgs-lib = import ../../../../lib/tests/test-with-nix.nix { + inherit lib pkgs; + inherit nix; + }; +} +// lib.optionalAttrs stdenv.hostPlatform.isLinux { + nixStatic = pkgsStatic.nixVersions.${self_attribute_name}; + + # Basic smoke tests that needs to pass when upgrading nix. + # Note that this test does only test the nixVersions.stable attribute. + misc = nixosTests.nix-misc.default; + upgrade = nixosTests.nix-upgrade; + simpleUefiSystemdBoot = nixosTests.installer.simpleUefiSystemdBoot; +} +// lib.optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux") { + nixi686 = pkgsi686Linux.nixVersions.${self_attribute_name}; +} From c40da46bc7c6d8e311a9590efcf741d9e4f9e93a Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 22 Jan 2025 15:42:44 +0100 Subject: [PATCH 0804/2168] nix_2_26: Fix dev output shim nativeBuildInputs = [ nix ] would have no effect before this change. The pkg-config test on the dev output probably didn't work before, so I've removed it for now. --- .../nix/2_26/packaging/everything.nix | 27 +++++++++---------- pkgs/tools/package-management/nix/default.nix | 19 +++++++++++-- 2 files changed, 29 insertions(+), 17 deletions(-) diff --git a/pkgs/tools/package-management/nix/2_26/packaging/everything.nix b/pkgs/tools/package-management/nix/2_26/packaging/everything.nix index 2b47c31bbf54..c89d35a60a7d 100644 --- a/pkgs/tools/package-management/nix/2_26/packaging/everything.nix +++ b/pkgs/tools/package-management/nix/2_26/packaging/everything.nix @@ -68,7 +68,7 @@ let ; }; - dev = stdenv.mkDerivation (finalAttrs: { + dev = nixAttrs: stdenv.mkDerivation (finalAttrs: { name = "nix-${nix-cli.version}-dev"; pname = "nix"; version = nix-cli.version; @@ -78,17 +78,20 @@ let installPhase = '' mkdir -p $out/nix-support echo $libs >> $out/nix-support/propagated-build-inputs + echo ${nixAttrs.finalPackage} >> $out/nix-support/propagated-build-inputs ''; passthru = { tests = { - pkg-config = testers.hasPkgConfigModules { - package = finalAttrs.finalPackage; - }; + # TODO: is this supposed to work for a dev output? + # pkg-config = testers.hasPkgConfigModules { + # package = finalAttrs.finalPackage; + # }; }; # If we were to fully emulate output selection here, we'd confuse the Nix CLIs, # because they rely on `drvPath`. dev = finalAttrs.finalPackage.out; + out = nixAttrs.finalPackage.out; libs = throw "`nix.dev.libs` is not meant to be used; use `nix.libs` instead."; }; @@ -143,10 +146,6 @@ in # Make sure the functional tests have passed nix-functional-tests - - # dev bundle is ok - # (checkInputs must be empty paths??) - (runCommand "check-pkg-config" { checked = dev.tests.pkg-config; } "mkdir $out") ] ++ lib.optionals (!stdenv.hostPlatform.isStatic && stdenv.buildPlatform.canExecute stdenv.hostPlatform) @@ -178,17 +177,15 @@ in inherit libs; tests = prevAttrs.passthru.tests or { } // { - # TODO: create a proper fixpoint and: - # pkg-config = - # testers.hasPkgConfigModules { - # package = finalPackage; - # }; + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; }; /** A derivation referencing the `dev` outputs of the Nix libraries. */ - inherit dev; + dev = dev finalAttrs; inherit devdoc; doc = nix-manual; outputs = [ @@ -203,7 +200,7 @@ in }; meta = prevAttrs.meta // { description = "The Nix package manager"; - pkgConfigModules = dev.meta.pkgConfigModules; + pkgConfigModules = (dev finalAttrs).meta.pkgConfigModules; }; } ) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 20d545b79874..53cee6fcb819 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -9,6 +9,10 @@ , fetchpatch2 , runCommand , Security +, pkgs +, pkgsi686Linux +, pkgsStatic +, nixosTests , storeDir ? "/nix/store" , stateDir ? "/nix/var" @@ -160,9 +164,20 @@ in lib.makeExtensible (self: ({ self_attribute_name = "nix_2_25"; }; - nix_2_26 = callPackage ./2_26/componentized.nix { + nix_2_26 = (callPackage ./2_26/componentized.nix { inherit libgit2-thin-packfile; - }; + }).overrideAttrs (this: old: { + passthru = old.passthru or {} // { + tests = + old.passthru.tests or {} + // import ./tests.nix { + inherit runCommand lib stdenv pkgs pkgsi686Linux pkgsStatic nixosTests; + inherit (old) version src; + nix = this.finalPackage; + self_attribute_name = "nix_2_26"; + }; + }; + }); git = common rec { version = "2.25.0"; From 34f269c14ac18d89ddee9a8f54b1ca92a85bbcc6 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 22 Jan 2025 20:43:48 +0100 Subject: [PATCH 0805/2168] Format --- .../nix/2_26/packaging/everything.nix | 88 ++++++++++--------- 1 file changed, 45 insertions(+), 43 deletions(-) diff --git a/pkgs/tools/package-management/nix/2_26/packaging/everything.nix b/pkgs/tools/package-management/nix/2_26/packaging/everything.nix index c89d35a60a7d..7ac7a156d226 100644 --- a/pkgs/tools/package-management/nix/2_26/packaging/everything.nix +++ b/pkgs/tools/package-management/nix/2_26/packaging/everything.nix @@ -68,50 +68,52 @@ let ; }; - dev = nixAttrs: stdenv.mkDerivation (finalAttrs: { - name = "nix-${nix-cli.version}-dev"; - pname = "nix"; - version = nix-cli.version; - dontUnpack = true; - dontBuild = true; - libs = map lib.getDev (lib.attrValues libs); - installPhase = '' - mkdir -p $out/nix-support - echo $libs >> $out/nix-support/propagated-build-inputs - echo ${nixAttrs.finalPackage} >> $out/nix-support/propagated-build-inputs - ''; - passthru = { - tests = { - # TODO: is this supposed to work for a dev output? - # pkg-config = testers.hasPkgConfigModules { - # package = finalAttrs.finalPackage; - # }; + dev = + nixAttrs: + stdenv.mkDerivation (finalAttrs: { + name = "nix-${nix-cli.version}-dev"; + pname = "nix"; + version = nix-cli.version; + dontUnpack = true; + dontBuild = true; + libs = map lib.getDev (lib.attrValues libs); + installPhase = '' + mkdir -p $out/nix-support + echo $libs >> $out/nix-support/propagated-build-inputs + echo ${nixAttrs.finalPackage} >> $out/nix-support/propagated-build-inputs + ''; + passthru = { + tests = { + # TODO: is this supposed to work for a dev output? + # pkg-config = testers.hasPkgConfigModules { + # package = finalAttrs.finalPackage; + # }; + }; + + # If we were to fully emulate output selection here, we'd confuse the Nix CLIs, + # because they rely on `drvPath`. + dev = finalAttrs.finalPackage.out; + out = nixAttrs.finalPackage.out; + + libs = throw "`nix.dev.libs` is not meant to be used; use `nix.libs` instead."; }; - - # If we were to fully emulate output selection here, we'd confuse the Nix CLIs, - # because they rely on `drvPath`. - dev = finalAttrs.finalPackage.out; - out = nixAttrs.finalPackage.out; - - libs = throw "`nix.dev.libs` is not meant to be used; use `nix.libs` instead."; - }; - meta = { - pkgConfigModules = [ - "nix-cmd" - "nix-expr" - "nix-expr-c" - "nix-fetchers" - "nix-flake" - "nix-flake-c" - "nix-main" - "nix-main-c" - "nix-store" - "nix-store-c" - "nix-util" - "nix-util-c" - ]; - }; - }); + meta = { + pkgConfigModules = [ + "nix-cmd" + "nix-expr" + "nix-expr-c" + "nix-fetchers" + "nix-flake" + "nix-flake-c" + "nix-main" + "nix-main-c" + "nix-store" + "nix-store-c" + "nix-util" + "nix-util-c" + ]; + }; + }); devdoc = buildEnv { name = "nix-${nix-cli.version}-devdoc"; paths = [ From 430a6df76f75d78feece9b7a6e25837b524973b3 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 28 Jan 2025 10:17:30 +0100 Subject: [PATCH 0806/2168] nixVersions.nix_2_26: 2.26.0 -> 2.26.1 --- pkgs/tools/package-management/nix/2_26/.version | 2 +- pkgs/tools/package-management/nix/2_26/source.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/2_26/.version b/pkgs/tools/package-management/nix/2_26/.version index 7a25c70f90cf..f34083e034ae 100644 --- a/pkgs/tools/package-management/nix/2_26/.version +++ b/pkgs/tools/package-management/nix/2_26/.version @@ -1 +1 @@ -2.26.0 +2.26.1 diff --git a/pkgs/tools/package-management/nix/2_26/source.json b/pkgs/tools/package-management/nix/2_26/source.json index 40acad769e09..09afd9c0640f 100644 --- a/pkgs/tools/package-management/nix/2_26/source.json +++ b/pkgs/tools/package-management/nix/2_26/source.json @@ -1,6 +1,6 @@ { "owner": "NixOS", "repo": "nix", - "rev": "717372382f75be6832c73ec5519e5d6b9aa5141b", - "hash": "sha256-0lFNh54gkDsdHOriOEHK6lr1rGRiP1mhNaCNm+6QspE=" + "rev": "36bd92736faaf81c6af3dff8f560963eb4e76b14", + "hash": "sha256-1T7WRNfUMsiiNB77BuHElzjavguL8oJx+wBtfMcobq8=" } From 3cbcec03f22d70bc6df9b5c99e380a08a3968133 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 28 Jan 2025 10:20:50 +0100 Subject: [PATCH 0807/2168] nixVersions.nix_2_26: Use default boost package --- .../package-management/nix/2_26/dependencies.nix | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/pkgs/tools/package-management/nix/2_26/dependencies.nix b/pkgs/tools/package-management/nix/2_26/dependencies.nix index e226384f2acf..fddcf228e7cb 100644 --- a/pkgs/tools/package-management/nix/2_26/dependencies.nix +++ b/pkgs/tools/package-management/nix/2_26/dependencies.nix @@ -159,21 +159,6 @@ scope: { enableLargeConfig = true; }; - # TODO Hack until https://github.com/NixOS/nixpkgs/issues/45462 is fixed. - boost = - (pkgs.boost.override { - extraB2Args = [ - "--with-container" - "--with-context" - "--with-coroutine" - ]; - }).overrideAttrs - (old: { - # Need to remove `--with-*` to use `--with-libraries=...` - buildPhase = lib.replaceStrings [ "--without-python" ] [ "" ] old.buildPhase; - installPhase = lib.replaceStrings [ "--without-python" ] [ "" ] old.installPhase; - }); - libgit2 = libgit2-thin-packfile; inherit resolvePath filesetToSource; From 64a9532416f4f2cd88e4b16a8f7433d87555aee5 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 28 Jan 2025 10:23:04 +0100 Subject: [PATCH 0808/2168] nix//.version: Drop newline --- pkgs/tools/package-management/nix/2_26/.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/2_26/.version b/pkgs/tools/package-management/nix/2_26/.version index f34083e034ae..53effa101a05 100644 --- a/pkgs/tools/package-management/nix/2_26/.version +++ b/pkgs/tools/package-management/nix/2_26/.version @@ -1 +1 @@ -2.26.1 +2.26.1 \ No newline at end of file From 1b0c666e99f71e14241258d900c3f2920e1ec1d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 19:59:10 +0000 Subject: [PATCH 0809/2168] forgejo-runner: 6.2.0 -> 6.2.2 --- pkgs/by-name/fo/forgejo-runner/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix index ee846eadd863..eaa5ae612c62 100644 --- a/pkgs/by-name/fo/forgejo-runner/package.nix +++ b/pkgs/by-name/fo/forgejo-runner/package.nix @@ -17,17 +17,17 @@ let in buildGoModule rec { pname = "forgejo-runner"; - version = "6.2.0"; + version = "6.2.2"; src = fetchFromGitea { domain = "code.forgejo.org"; owner = "forgejo"; repo = "runner"; rev = "v${version}"; - hash = "sha256-2+/PJZPqKbxeWbIVx2647/xK5CqVUUvsdd67YFwjhms="; + hash = "sha256-vyJ5Fr38YvR8jjw/Tnih6c+GoctnVpgiaX7Bl+YNti0="; }; - vendorHash = "sha256-wvvzD2lD1TPXEriNaI6nzNGR/Kg94zC58pAR42/DlMA="; + vendorHash = "sha256-KITZV8U4Hhdg9nXYd83p0joYOXulCsJ0sakiP2Q8gi0="; ldflags = [ "-s" From ae7447170667497a992c9333bafe731691b46aba Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 9 Feb 2025 21:01:08 +0100 Subject: [PATCH 0810/2168] nixVersions.nix_2_26: Drop libgit2-thin-packfile override --- pkgs/tools/package-management/nix/2_26/componentized.nix | 2 -- pkgs/tools/package-management/nix/2_26/dependencies.nix | 4 ---- pkgs/tools/package-management/nix/default.nix | 4 +--- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/tools/package-management/nix/2_26/componentized.nix b/pkgs/tools/package-management/nix/2_26/componentized.nix index 9dbf54392fb4..48f2d052d36f 100644 --- a/pkgs/tools/package-management/nix/2_26/componentized.nix +++ b/pkgs/tools/package-management/nix/2_26/componentized.nix @@ -6,7 +6,6 @@ newScope, pkgs, stdenv, - libgit2-thin-packfile, ... }: let @@ -44,7 +43,6 @@ let inherit pkgs; inherit stdenv; inherit src; - inherit libgit2-thin-packfile; }; }; in diff --git a/pkgs/tools/package-management/nix/2_26/dependencies.nix b/pkgs/tools/package-management/nix/2_26/dependencies.nix index fddcf228e7cb..73739e2edcc5 100644 --- a/pkgs/tools/package-management/nix/2_26/dependencies.nix +++ b/pkgs/tools/package-management/nix/2_26/dependencies.nix @@ -7,7 +7,6 @@ pkgs, stdenv, - libgit2-thin-packfile, }: let @@ -139,7 +138,6 @@ let in scope: { inherit stdenv; - inherit libgit2-thin-packfile; aws-sdk-cpp = (pkgs.aws-sdk-cpp.override { @@ -159,8 +157,6 @@ scope: { enableLargeConfig = true; }; - libgit2 = libgit2-thin-packfile; - inherit resolvePath filesetToSource; mkMesonDerivation = mkPackageBuilder [ diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 53cee6fcb819..23b11f1c6285 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -164,9 +164,7 @@ in lib.makeExtensible (self: ({ self_attribute_name = "nix_2_25"; }; - nix_2_26 = (callPackage ./2_26/componentized.nix { - inherit libgit2-thin-packfile; - }).overrideAttrs (this: old: { + nix_2_26 = (callPackage ./2_26/componentized.nix { }).overrideAttrs (this: old: { passthru = old.passthru or {} // { tests = old.passthru.tests or {} From d15cb14276e18e09c55fa7cec87b94d43ec7e757 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 8 Feb 2025 14:07:35 +0100 Subject: [PATCH 0811/2168] nix-prefetch: modernize --- pkgs/by-name/ni/nix-prefetch/package.nix | 52 ++++++++++++++++-------- 1 file changed, 35 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/ni/nix-prefetch/package.nix b/pkgs/by-name/ni/nix-prefetch/package.nix index 25c2bab4565e..423b2df932ca 100644 --- a/pkgs/by-name/ni/nix-prefetch/package.nix +++ b/pkgs/by-name/ni/nix-prefetch/package.nix @@ -3,31 +3,38 @@ stdenv, fetchFromGitHub, fetchpatch, - installShellFiles, - makeWrapper, + + # nativeBuildInputs asciidoc, docbook_xml_dtd_45, - git, docbook_xsl, + installShellFiles, libxml2, libxslt, + makeWrapper, + + # wrapper coreutils, gawk, + gitMinimal, gnugrep, gnused, jq, nix, + + versionCheckHook, + gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nix-prefetch"; version = "0.4.1"; src = fetchFromGitHub { owner = "msteen"; repo = "nix-prefetch"; - rev = version; - sha256 = "0bwv6x651gyq703pywrhb7lfby6xwnd1iwnrzzjihipn7x3v2hz9"; + tag = finalAttrs.version; + hash = "sha256-6UOxRz/2Rhjl/9nyGJrl3fjl6Fkwc38HONi/UEw3my8="; # the stat call has to be in a subshell or we get the current date postFetch = '' echo $(stat -c %Y $out) > $out/.timestamp @@ -43,7 +50,7 @@ stdenv.mkDerivation rec { ]; postPatch = '' - lib=$out/lib/${pname} + lib=$out/lib/nix-prefetch substituteInPlace doc/nix-prefetch.1.asciidoc \ --subst-var-by version $version @@ -76,12 +83,12 @@ stdenv.mkDerivation rec { installPhase = '' install -Dm555 -t $lib src/*.sh install -Dm444 -t $lib lib/* - makeWrapper $lib/main.sh $out/bin/${pname} \ + makeWrapper $lib/main.sh $out/bin/nix-prefetch \ --prefix PATH : ${ lib.makeBinPath [ coreutils gawk - git + gitMinimal gnugrep gnused jq @@ -91,18 +98,29 @@ stdenv.mkDerivation rec { installManPage doc/nix-prefetch.? - installShellCompletion --name ${pname} contrib/nix-prefetch-completion.{bash,zsh} + installShellCompletion --name nix-prefetch contrib/nix-prefetch-completion.{bash,zsh} - mkdir -p $out/share/doc/${pname}/contrib - cp -r contrib/hello_rs $out/share/doc/${pname}/contrib + mkdir -p $out/share/doc/nix-prefetch/contrib + cp -r contrib/hello_rs $out/share/doc/nix-prefetch/contrib ''; - meta = with lib; { + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + + passthru = { + updateScript = gitUpdater { }; + }; + + meta = { description = "Prefetch any fetcher function call, e.g. package sources"; - license = licenses.mit; - maintainers = with maintainers; [ msteen ]; homepage = "https://github.com/msteen/nix-prefetch"; - platforms = platforms.all; + changelog = "https://github.com/msteen/nix-prefetch/blob/${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ msteen ]; + platforms = lib.platforms.all; mainProgram = "nix-prefetch"; }; -} +}) From e6682ef3f668726fc71883c96fb6501f0b7ebf64 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Mon, 10 Feb 2025 07:41:40 +1100 Subject: [PATCH 0812/2168] python312Packages.gto: fix build; set SSL_CERT_FILE --- pkgs/development/python-modules/gto/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/gto/default.nix b/pkgs/development/python-modules/gto/default.nix index 8ee83e7b84dd..411804fe201c 100644 --- a/pkgs/development/python-modules/gto/default.nix +++ b/pkgs/development/python-modules/gto/default.nix @@ -1,8 +1,8 @@ { lib, buildPythonPackage, + cacert, entrypoints, - fastentrypoints, fetchFromGitHub, freezegun, funcy, @@ -68,6 +68,9 @@ buildPythonPackage rec { git config --global user.email "nobody@example.com" git config --global user.name "Nobody" + + # _pygit2.GitError: OpenSSL error: failed to load certificates: error:00000000:lib(0)::reason(0) + export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt ''; disabledTests = [ From fe6ba0d17756a43098d8926611dd27fc1b4298d4 Mon Sep 17 00:00:00 2001 From: XBagon Date: Sun, 9 Feb 2025 20:55:30 +0100 Subject: [PATCH 0813/2168] egglog: 0-unstable-2024-01-26 -> 0.4.0 Diff: https://github.com/egraphs-good/egglog/compare/b78f69ca1f7187c363bb31271c8e8958f477f15d...v0.4.0 remove git dependency (d913a539f7c0d35c84c2cc3fb8785abc0a28daea) --- pkgs/by-name/eg/egglog/Cargo.lock | 1415 ---------------------------- pkgs/by-name/eg/egglog/package.nix | 23 +- 2 files changed, 11 insertions(+), 1427 deletions(-) delete mode 100644 pkgs/by-name/eg/egglog/Cargo.lock diff --git a/pkgs/by-name/eg/egglog/Cargo.lock b/pkgs/by-name/eg/egglog/Cargo.lock deleted file mode 100644 index 0d2fbadc10bc..000000000000 --- a/pkgs/by-name/eg/egglog/Cargo.lock +++ /dev/null @@ -1,1415 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "ahash" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - -[[package]] -name = "ahash" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" -dependencies = [ - "cfg-if 1.0.0", - "once_cell", - "version_check", - "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 = "allocator-api2" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" - -[[package]] -name = "anstream" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" - -[[package]] -name = "anstyle-parse" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" -dependencies = [ - "windows-sys", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" -dependencies = [ - "anstyle", - "windows-sys", -] - -[[package]] -name = "ascii-canvas" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6" -dependencies = [ - "term", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" - -[[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 = "bumpalo" -version = "3.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" - -[[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 = "clap" -version = "4.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_derive" -version = "4.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "clap_lex" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[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 1.0.0", - "wasm-bindgen", -] - -[[package]] -name = "cpufeatures" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" -dependencies = [ - "libc", -] - -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "diff" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "crypto-common", -] - -[[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if 1.0.0", - "dirs-sys-next", -] - -[[package]] -name = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "dot-generator" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aaac7ada45f71873ebce336491d1c1bc4a7c8042c7cea978168ad59e805b871" -dependencies = [ - "dot-structures", -] - -[[package]] -name = "dot-structures" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "675e35c02a51bb4d4618cb4885b3839ce6d1787c97b664474d9208d074742e20" - -[[package]] -name = "egglog" -version = "0.1.0" -dependencies = [ - "clap", - "egraph-serialize", - "env_logger", - "generic_symbolic_expressions", - "getrandom", - "glob", - "hashbrown 0.14.2", - "indexmap", - "instant", - "lalrpop", - "lalrpop-util", - "lazy_static", - "libtest-mimic", - "log", - "num-integer", - "num-rational", - "num-traits", - "ordered-float", - "regex", - "rustc-hash", - "serde_json", - "smallvec", - "symbol_table", - "thiserror", -] - -[[package]] -name = "egraph-serialize" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a41150f383849cfc16ae6230f592112b3c0a2c0e3ec43eb0b09db037bfcce703" -dependencies = [ - "graphviz-rust", - "indexmap", - "once_cell", - "ordered-float", - "serde", - "serde_json", -] - -[[package]] -name = "either" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" - -[[package]] -name = "ena" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c533630cf40e9caa44bd91aadc88a75d75a4c3a12b4cfde353cbed41daa1e1f1" -dependencies = [ - "log", -] - -[[package]] -name = "env_logger" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" -dependencies = [ - "humantime", - "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.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" -dependencies = [ - "libc", - "windows-sys", -] - -[[package]] -name = "fastrand" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" - -[[package]] -name = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "generic_symbolic_expressions" -version = "5.0.3" -source = "git+https://github.com/oflatt/symbolic-expressions?rev=655b6a4c06b4b3d3b2300e17779860b4abe440f0#655b6a4c06b4b3d3b2300e17779860b4abe440f0" - -[[package]] -name = "getrandom" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" -dependencies = [ - "cfg-if 1.0.0", - "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 = "graphviz-rust" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27dafd1ac303e0dfb347a3861d9ac440859bab26ec2f534bbceb262ea492a1e0" -dependencies = [ - "dot-generator", - "dot-structures", - "into-attr", - "into-attr-derive", - "pest", - "pest_derive", - "rand", - "tempfile", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.7", -] - -[[package]] -name = "hashbrown" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" -dependencies = [ - "ahash 0.8.6", - "allocator-api2", -] - -[[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.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "indexmap" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" -dependencies = [ - "equivalent", - "hashbrown 0.14.2", - "serde", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if 1.0.0", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "into-attr" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18b48c537e49a709e678caec3753a7dba6854661a1eaa27675024283b3f8b376" -dependencies = [ - "dot-structures", -] - -[[package]] -name = "into-attr-derive" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecac7c1ae6cd2c6a3a64d1061a8bdc7f52ff62c26a831a2301e54c1b5d70d5b1" -dependencies = [ - "dot-generator", - "dot-structures", - "into-attr", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "is-terminal" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" -dependencies = [ - "hermit-abi", - "rustix", - "windows-sys", -] - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" - -[[package]] -name = "js-sys" -version = "0.3.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "lalrpop" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da4081d44f4611b66c6dd725e6de3169f9f63905421e8626fcb86b6a898998b8" -dependencies = [ - "ascii-canvas", - "bit-set", - "diff", - "ena", - "is-terminal", - "itertools", - "lalrpop-util", - "petgraph", - "pico-args", - "regex", - "regex-syntax 0.7.5", - "string_cache", - "term", - "tiny-keccak", - "unicode-xid", -] - -[[package]] -name = "lalrpop-util" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f35c735096c0293d313e8f2a641627472b83d01b937177fe76e5e2708d31e0d" -dependencies = [ - "regex", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.149" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" - -[[package]] -name = "libtest-mimic" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d8de370f98a6cb8a4606618e53e802f93b094ddec0f96988eaec2c27e6e9ce7" -dependencies = [ - "clap", - "termcolor", - "threadpool", -] - -[[package]] -name = "linux-raw-sys" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" - -[[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 = "memchr" -version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" - -[[package]] -name = "memory_units" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3" - -[[package]] -name = "new_debug_unreachable" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" - -[[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", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" -dependencies = [ - "autocfg", - "num-bigint", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "once_cell" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" - -[[package]] -name = "ordered-float" -version = "3.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc" -dependencies = [ - "num-traits", - "rand", - "serde", -] - -[[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 0.4.1", - "smallvec", - "windows-targets", -] - -[[package]] -name = "pest" -version = "2.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae9cee2a55a544be8b89dc6848072af97a20f2422603c10865be2a42b580fff5" -dependencies = [ - "memchr", - "thiserror", - "ucd-trie", -] - -[[package]] -name = "pest_derive" -version = "2.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81d78524685f5ef2a3b3bd1cafbc9fcabb036253d9b1463e726a91cd16e2dfc2" -dependencies = [ - "pest", - "pest_generator", -] - -[[package]] -name = "pest_generator" -version = "2.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68bd1206e71118b5356dae5ddc61c8b11e28b09ef6a31acbd15ea48a28e0c227" -dependencies = [ - "pest", - "pest_meta", - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "pest_meta" -version = "2.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c747191d4ad9e4a4ab9c8798f1e82a39affe7ef9648390b7e5548d18e099de6" -dependencies = [ - "once_cell", - "pest", - "sha2", -] - -[[package]] -name = "petgraph" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" -dependencies = [ - "fixedbitset", - "indexmap", -] - -[[package]] -name = "phf_shared" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pico-args" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "precomputed-hash" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" - -[[package]] -name = "proc-macro2" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" -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", - "serde", -] - -[[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", - "serde", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - -[[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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -dependencies = [ - "getrandom", - "redox_syscall 0.2.16", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax 0.8.2", -] - -[[package]] -name = "regex-automata" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.8.2", -] - -[[package]] -name = "regex-syntax" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" - -[[package]] -name = "regex-syntax" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" - -[[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.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" -dependencies = [ - "bitflags 2.4.1", - "errno", - "libc", - "linux-raw-sys", - "windows-sys", -] - -[[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.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "serde" -version = "1.0.190" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.190" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "serde_json" -version = "1.0.108" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" -dependencies = [ - "indexmap", - "itoa", - "ryu", - "serde", -] - -[[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 = "siphasher" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" - -[[package]] -name = "smallvec" -version = "1.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" - -[[package]] -name = "string_cache" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" -dependencies = [ - "new_debug_unreachable", - "once_cell", - "parking_lot", - "phf_shared", - "precomputed-hash", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "symbol_table" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "828f672b631c220bf6ea8a1d3b82c7d0fc998e5ba8373383d8604bc1e2a6245a" -dependencies = [ - "ahash 0.7.7", - "hashbrown 0.12.3", -] - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "tempfile" -version = "3.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" -dependencies = [ - "cfg-if 1.0.0", - "fastrand", - "redox_syscall 0.4.1", - "rustix", - "windows-sys", -] - -[[package]] -name = "term" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" -dependencies = [ - "dirs-next", - "rustversion", - "winapi", -] - -[[package]] -name = "termcolor" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "thiserror" -version = "1.0.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "threadpool" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" -dependencies = [ - "num_cpus", -] - -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "ucd-trie" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[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.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" -dependencies = [ - "cfg-if 1.0.0", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.38", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" - -[[package]] -name = "wasm-logger" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "074649a66bb306c8f2068c9016395fa65d8e08d2affcbf95acf3c24c3ab19718" -dependencies = [ - "log", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "web-demo" -version = "0.1.0" -dependencies = [ - "console_error_panic_hook", - "egglog", - "js-sys", - "log", - "wasm-bindgen", - "wasm-logger", - "web-sys", - "wee_alloc", -] - -[[package]] -name = "web-sys" -version = "0.3.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "wee_alloc" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb3b5a6b2bb17cb6ad44a2e68a43e8d2722c997da10e928665c72ec6c0a0b8e" -dependencies = [ - "cfg-if 0.1.10", - "libc", - "memory_units", - "winapi", -] - -[[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-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[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_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[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_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "zerocopy" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd66a62464e3ffd4e37bd09950c2b9dd6c4f8767380fabba0d523f9a775bc85a" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "255c4596d41e6916ced49cfafea18727b24d67878fa180ddfd69b9df34fd1726" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] diff --git a/pkgs/by-name/eg/egglog/package.nix b/pkgs/by-name/eg/egglog/package.nix index 1e947e1cfcb3..1a46064ac5bd 100644 --- a/pkgs/by-name/eg/egglog/package.nix +++ b/pkgs/by-name/eg/egglog/package.nix @@ -4,31 +4,30 @@ fetchFromGitHub, }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { pname = "egglog"; - version = "0-unstable-2024-01-26"; + version = "0.4.0"; src = fetchFromGitHub { owner = "egraphs-good"; repo = "egglog"; - rev = "b78f69ca1f7187c363bb31271c8e8958f477f15d"; - hash = "sha256-/1ktyz8wU1yLTdAFPnupK6jUFjiK6nQfotGRNOWiOsA="; + rev = "v${version}"; + hash = "sha256-j+3qknmezKqHVxvfmG9oPFtWOzJsimGXYe5PWX694mI="; }; + useFetchCargoVendor = true; + cargoHash = "sha256-gWccsWZCOucNP6M6cJqCMF8emwzqLXkaRm/huK4ARTs="; + useNextest = true; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "generic_symbolic_expressions-5.0.3" = "sha256-UX6fS470YJMdNnn0GR3earMGQK3p/YvaFia7IEvGGKg="; - }; - }; - meta = with lib; { description = "Fixpoint reasoning system that unifies Datalog and equality saturation"; mainProgram = "egglog"; homepage = "https://github.com/egraphs-good/egglog"; license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; + maintainers = with maintainers; [ + figsoda + XBagon + ]; }; } From 05caaeac03a6dca14de5fa9e10d45036736dddff Mon Sep 17 00:00:00 2001 From: Tert0 Date: Sat, 8 Feb 2025 19:49:16 +0100 Subject: [PATCH 0814/2168] libreoffice-{still,fresh}-unwrapped: fix build and tests --- .../office/libreoffice/default.nix | 2 + .../libreoffice/skip-broken-tests-fresh.patch | 117 +++++++++--------- .../libreoffice/skip-broken-tests-still.patch | 92 +++++++++++--- .../libreoffice/skip-broken-tests.patch | 45 ++++--- 4 files changed, 164 insertions(+), 92 deletions(-) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 438500f41cc0..57227d4c23be 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -527,6 +527,8 @@ in stdenv.mkDerivation (finalAttrs: { ] ++ (if variant == "fresh" then [ "--with-system-rhino" "--with-rhino-jar=${rhino}/share/java/js.jar" + + "--without-system-java-websocket" ] else [ # our Rhino is too new for older versions "--without-system-rhino" diff --git a/pkgs/applications/office/libreoffice/skip-broken-tests-fresh.patch b/pkgs/applications/office/libreoffice/skip-broken-tests-fresh.patch index e19711b706e4..f1cd5c261d04 100644 --- a/pkgs/applications/office/libreoffice/skip-broken-tests-fresh.patch +++ b/pkgs/applications/office/libreoffice/skip-broken-tests-fresh.patch @@ -43,63 +43,6 @@ createSwDoc("tdf150606-1-min.odt"); SwXTextDocument* pTextDoc = dynamic_cast(mxComponent.get()); ---- a/sw/qa/extras/layout/layout3.cxx -+++ b/sw/qa/extras/layout/layout3.cxx -@@ -3354,6 +3354,9 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf104209VertRTL) - - CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408LTR) - { -+ return; // requests Noto Sans Hebrew with charset=28, which the font does not have -+ // FIXME: investigate -+ - // Verify that line breaking a first bidi portion correctly underflows in LTR text - createSwDoc("tdf56408-ltr.fodt"); - auto pXmlDoc = parseLayoutDump(); -@@ -3368,6 +3371,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408LTR) - - CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408RTL) - { -+ return; // same Noto Sans Hebrew issue -+ - // Verify that line breaking a first bidi portion correctly underflows in RTL text - createSwDoc("tdf56408-rtl.fodt"); - auto pXmlDoc = parseLayoutDump(); -@@ -3382,6 +3387,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408RTL) - - CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408NoUnderflow) - { -+ return; // same Noto Sans Hebrew issue -+ - // The fix for tdf#56408 introduced a change to line breaking between text with - // direction changes. This test verifies behavior in the trivial case, when a - // break opportunity exists at the direction change boundary. -@@ -3398,6 +3405,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408NoUnderflow) - - CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408AfterFieldCrash) - { -+ return; // same Noto Sans Hebrew issue -+ - // Verify there is no crash/assertion for underflow after a number field - createSwDoc("tdf56408-after-field.fodt"); - } -@@ -3436,6 +3445,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf146081) - - CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf157829LTR) - { -+ return; // same Noto Sans Hebrew issue -+ - // Verify that line breaking inside a bidi portion triggers underflow to previous bidi portions - createSwDoc("tdf157829-ltr.fodt"); - auto pXmlDoc = parseLayoutDump(); -@@ -3450,6 +3461,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf157829LTR) - - CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf157829RTL) - { -+ return; // same Noto Sans Hebrew issue -+ - // Verify that line breaking inside a bidi portion triggers underflow to previous bidi portions - createSwDoc("tdf157829-rtl.fodt"); - auto pXmlDoc = parseLayoutDump(); --- a/sw/qa/extras/tiledrendering/tiledrendering.cxx +++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx @@ -4091,6 +4091,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testRedlineTooltip) @@ -111,3 +54,63 @@ SwXTextDocument* pXTextDocument = createDoc(); int nView1 = SfxLokHelper::getView(); +--- a/sw/qa/extras/layout/layout4.cxx ++++ b/sw/qa/extras/layout/layout4.cxx +@@ -1518,6 +1518,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf104209VertRTL) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408LTR) + { ++ return; // fails due to missing font: Noto Sans Hebrew + // Verify that line breaking a first bidi portion correctly underflows in LTR text + createSwDoc("tdf56408-ltr.fodt"); + auto pXmlDoc = parseLayoutDump(); +@@ -1532,6 +1532,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408LTR) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408RTL) + { ++ return; // fails due to missing font: Noto Sans Hebrew + // Verify that line breaking a first bidi portion correctly underflows in RTL text + createSwDoc("tdf56408-rtl.fodt"); + auto pXmlDoc = parseLayoutDump(); +@@ -1546,6 +1547,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408RTL) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408NoUnderflow) + { ++ return; // fails due to missing font: Noto Sans Hebrew + // The fix for tdf#56408 introduced a change to line breaking between text with + // direction changes. This test verifies behavior in the trivial case, when a + // break opportunity exists at the direction change boundary. +@@ -1562,6 +1563,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408NoUnderflow) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408AfterFieldCrash) + { ++ return; // fails due to missing font: Noto Sans Hebrew + // Verify there is no crash/assertion for underflow after a number field + createSwDoc("tdf56408-after-field.fodt"); + } +@@ -1612,6 +1614,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf155229RowAtLeast) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf157829LTR) + { ++ return; // fails due to missing font: Noto Sans Hebrew + // Verify that line breaking inside a bidi portion triggers underflow to previous bidi portions + createSwDoc("tdf157829-ltr.fodt"); + auto pXmlDoc = parseLayoutDump(); +@@ -1626,6 +1629,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf157829LTR) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf157829RTL) + { ++ return; // fails due to missing font: Noto Sans Hebrew + // Verify that line breaking inside a bidi portion triggers underflow to previous bidi portions + createSwDoc("tdf157829-rtl.fodt"); + auto pXmlDoc = parseLayoutDump(); +--- a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx ++++ b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx +@@ -6079,6 +6079,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf162750SmallCapsLigature) + + CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf164106SplitReorderedClusters) + { ++ return; // fails due to missing font: Noto Sans + saveAsPDF(u"tdf164106.fodt"); + + auto pPdfDocument = parsePDFExport(); diff --git a/pkgs/applications/office/libreoffice/skip-broken-tests-still.patch b/pkgs/applications/office/libreoffice/skip-broken-tests-still.patch index e7064d108552..c3442d43c485 100644 --- a/pkgs/applications/office/libreoffice/skip-broken-tests-still.patch +++ b/pkgs/applications/office/libreoffice/skip-broken-tests-still.patch @@ -1,14 +1,24 @@ --- a/sc/qa/extras/vba-macro-test.cxx +++ b/sc/qa/extras/vba-macro-test.cxx -@@ -364,7 +364,7 @@ CPPUNIT_TEST_FIXTURE(VBAMacroTest, testVba) +@@ -355,7 +355,7 @@ CPPUNIT_TEST_FIXTURE(VBAMacroTest, testVba) // Failed: : Test change event for Range.FillRight: // Tests passed: 4 // Tests failed: 4 -#if !defined(_WIN32) +#if 0 // flaky, see above - { OUString("Ranges-3.xls"), - OUString( - "vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, + { u"Ranges-3.xls"_ustr, + u"vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"_ustr }, + #endif +--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx ++++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx +@@ -2954,6 +2954,7 @@ CPPUNIT_TEST_FIXTURE(ScTiledRenderingTest, testCommentCellCopyPaste) + + CPPUNIT_TEST_FIXTURE(ScTiledRenderingTest, testInvalidEntrySave) + { ++ return; // hangs (forever?) + loadFromFile(u"validity.xlsx"); + + // .uno:Save modifies the original file, make a copy first --- a/sc/qa/unit/ucalc_formula.cxx +++ b/sc/qa/unit/ucalc_formula.cxx @@ -1507,6 +1507,8 @@ CPPUNIT_TEST_FIXTURE(TestFormula, testFormulaAnnotateTrimOnDoubleRefs) @@ -17,13 +27,63 @@ { + return; // fails consistently on nixpkgs? + - m_pDoc->InsertTab(0, "Formula"); + m_pDoc->InsertTab(0, u"Formula"_ustr); sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn auto calc on. +--- a/sw/qa/extras/layout/layout3.cxx ++++ b/sw/qa/extras/layout/layout3.cxx +@@ -3640,6 +3642,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf104209VertRTL) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408LTR) + { ++ return; // fails due to missing font: Noto Sans Hebrew + // Verify that line breaking a first bidi portion correctly underflows in LTR text + createSwDoc("tdf56408-ltr.fodt"); + auto pXmlDoc = parseLayoutDump(); +@@ -3654,6 +3656,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408LTR) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408RTL) + { ++ return; // fails due to missing font: Noto Sans Hebrew + // Verify that line breaking a first bidi portion correctly underflows in RTL text + createSwDoc("tdf56408-rtl.fodt"); + auto pXmlDoc = parseLayoutDump(); +@@ -3671,6 +3671,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408RTL) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408NoUnderflow) + { ++ return; // fails due to missing font: Noto Sans Hebrew + // The fix for tdf#56408 introduced a change to line breaking between text with + // direction changes. This test verifies behavior in the trivial case, when a + // break opportunity exists at the direction change boundary. +@@ -3684,6 +3687,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408NoUnderflow) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408AfterFieldCrash) + { ++ return; // fails due to missing font: Noto Sans Hebrew + // Verify there is no crash/assertion for underflow after a number field + createSwDoc("tdf56408-after-field.fodt"); + } +@@ -3722,6 +3722,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf146081) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf157829LTR) + { ++ return; // fails due to missing font: Noto Sans Hebrew + // Verify that line breaking inside a bidi portion triggers underflow to previous bidi portions + createSwDoc("tdf157829-ltr.fodt"); + auto pXmlDoc = parseLayoutDump(); +@@ -3736,6 +3740,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf157829LTR) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf157829RTL) + { ++ return; // fails due to missing Noto Sans Hebrew + // Verify that line breaking inside a bidi portion triggers underflow to previous bidi portions + createSwDoc("tdf157829-rtl.fodt"); + auto pXmlDoc = parseLayoutDump(); --- a/sw/qa/extras/tiledrendering/tiledrendering.cxx +++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx -@@ -685,6 +685,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testSearchAll) - +@@ -700,6 +700,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testSearchAll) + CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testSearchAllNotifications) { + return; // flaky on GTK @@ -31,8 +91,8 @@ SwXTextDocument* pXTextDocument = createDoc("search.odt"); SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell(); setupLibreOfficeKitViewCallback(pWrtShell->GetSfxViewShell()); -@@ -949,6 +951,8 @@ namespace { - +@@ -970,6 +972,8 @@ namespace { + CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testMissingInvalidation) { + return; // flaky on GTK @@ -40,8 +100,8 @@ // Create two views. SwXTextDocument* pXTextDocument = createDoc("dummy.fodt"); ViewCallback aView1; -@@ -982,6 +986,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testMissingInvalidation) - +@@ -1003,6 +1007,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testMissingInvalidation) + CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testViewCursors) { + return; // flaky on GTK @@ -49,8 +109,8 @@ SwXTextDocument* pXTextDocument = createDoc("dummy.fodt"); ViewCallback aView1; SfxLokHelper::createView(); -@@ -3189,6 +3189,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testRedlineNotificationDuringSave) - +@@ -3197,6 +3203,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testRedlineNotificationDuringSave) + CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testHyperlink) { + return; // flaky on GTK @@ -58,12 +118,12 @@ comphelper::LibreOfficeKit::setViewIdForVisCursorInvalidation(true); SwXTextDocument* pXTextDocument = createDoc("hyperlink.odt"); SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell(); -@@ -3399,6 +3401,8 @@ static void lcl_extractHandleParameters(std::string_view selection, sal_Int32& i - +@@ -3407,6 +3415,8 @@ static void lcl_extractHandleParameters(std::string_view selection, sal_Int32& i + CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testMoveShapeHandle) { + return; // flaky on GTK + comphelper::LibreOfficeKit::setActive(); SwXTextDocument* pXTextDocument = createDoc("shape.fodt"); - + diff --git a/pkgs/applications/office/libreoffice/skip-broken-tests.patch b/pkgs/applications/office/libreoffice/skip-broken-tests.patch index 3f45a7cda9db..959510958a7e 100644 --- a/pkgs/applications/office/libreoffice/skip-broken-tests.patch +++ b/pkgs/applications/office/libreoffice/skip-broken-tests.patch @@ -1,7 +1,7 @@ --- a/desktop/qa/desktop_lib/test_desktop_lib.cxx +++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx -@@ -600,6 +600,8 @@ void DesktopLOKTest::testGetFilterTypes() - +@@ -595,6 +595,8 @@ void DesktopLOKTest::testGetFilterTypes() + void DesktopLOKTest::testSearchCalc() { + return; // flaky @@ -9,8 +9,8 @@ LibLibreOffice_Impl aOffice; LibLODocument_Impl* pDocument = loadDoc("search.ods"); pDocument->pClass->initializeForRendering(pDocument, nullptr); -@@ -630,6 +632,8 @@ void DesktopLOKTest::testSearchCalc() - +@@ -625,6 +627,8 @@ void DesktopLOKTest::testSearchCalc() + void DesktopLOKTest::testSearchAllNotificationsCalc() { + return; // flaky @@ -30,8 +30,8 @@ --- a/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx +++ b/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx -@@ -284,6 +284,8 @@ void checkIssuePosition(std::shared_ptr const& pIssue, - +@@ -361,6 +361,8 @@ void checkIssuePosition(std::shared_ptr const& pIssue, + CPPUNIT_TEST_FIXTURE(AccessibilityCheckTest, testOnlineNodeSplitAppend) { + return; // flaky? @@ -41,7 +41,7 @@ // happen on editing all the time. --- a/sw/qa/core/text/text.cxx +++ b/sw/qa/core/text/text.cxx -@@ -1577,6 +1577,8 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testParaUpperMarginFlyIntersect) +@@ -1630,6 +1630,8 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testParaUpperMarginFlyIntersect) CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testTdf129810) { @@ -52,7 +52,7 @@ // even when the font is not installed. --- a/sw/qa/extras/htmlimport/htmlimport.cxx +++ b/sw/qa/extras/htmlimport/htmlimport.cxx -@@ -306,6 +306,8 @@ CPPUNIT_TEST_FIXTURE(HtmlImportTest, testTableBorder1px) +@@ -308,6 +308,8 @@ CPPUNIT_TEST_FIXTURE(HtmlImportTest, testTableBorder1px) CPPUNIT_TEST_FIXTURE(HtmlImportTest, testOutlineLevel) { @@ -63,18 +63,18 @@ // Heading 1 styles. --- a/sw/qa/extras/layout/layout3.cxx +++ b/sw/qa/extras/layout/layout3.cxx -@@ -539,6 +539,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, testTdf120287c) - +@@ -1038,6 +1038,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, testTdf158658c) + CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, testTdf155177) { + return; // flaky + createSwDoc("tdf155177-1-min.odt"); - - uno::Reference xStyle(getStyles("ParagraphStyles")->getByName("Body Text"), + + uno::Reference xStyle( --- a/sw/qa/extras/odfimport/odfimport.cxx +++ b/sw/qa/extras/odfimport/odfimport.cxx -@@ -601,6 +601,8 @@ CPPUNIT_TEST_FIXTURE(Test, testFdo56272) +@@ -602,6 +602,8 @@ CPPUNIT_TEST_FIXTURE(Test, testFdo56272) CPPUNIT_TEST_FIXTURE(Test, testIncorrectSum) { @@ -94,8 +94,8 @@ SwXTextDocument* pXTextDocument = createDoc("dummy.fodt"); ViewCallback aView1; int nView1 = SfxLokHelper::getView(); -@@ -3187,6 +3187,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testDoubleUnderlineAndStrikeOut) - +@@ -3048,6 +3050,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testDoubleUnderlineAndStrikeOut) + CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testTdf43244_SpacesOnMargin) { + return; // fails consistently @@ -103,14 +103,21 @@ // Load a document where the top left tile contains // paragraph and line break symbols with redlining. SwXTextDocument* pXTextDocument = createDoc("tdf43244_SpacesOnMargin.odt"); +@@ -4091,6 +4095,7 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testRedlineTooltip) + // toggling Formatting Marks on/off for one view should have no effect on other views + CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testToggleFormattingMarks) + { ++ return; // fails + SwXTextDocument* pXTextDocument = createDoc(); + int nView1 = SfxLokHelper::getView(); + --- a/sw/qa/extras/uiwriter/uiwriter5.cxx +++ b/sw/qa/extras/uiwriter/uiwriter5.cxx -@@ -1613,6 +1613,8 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testDateFormFieldCurrentDateHandling) - #if !defined(_WIN32) - CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testDateFormFieldCurrentDateInvalidation) +@@ -1571,6 +1571,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testDateFormFieldContentOperations) + + CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testDateFormFieldCurrentDateHandling) { + return; // flaky on KF6 -+ createSwDoc(); SwDoc* pDoc = getSwDoc(); CPPUNIT_ASSERT(pDoc); From a161ff01c7de59e6ee0949d1ac386a026ad653ea Mon Sep 17 00:00:00 2001 From: Chuang Zhu Date: Mon, 10 Feb 2025 04:58:24 +0800 Subject: [PATCH 0815/2168] python3Packages.wn: fix build --- pkgs/development/python-modules/wn/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/wn/default.nix b/pkgs/development/python-modules/wn/default.nix index 586f0cafd721..b742ee5902b4 100644 --- a/pkgs/development/python-modules/wn/default.nix +++ b/pkgs/development/python-modules/wn/default.nix @@ -4,8 +4,8 @@ fetchPypi, pytestCheckHook, pythonOlder, - flit-core, - requests, + hatchling, + httpx, tomli, }: @@ -14,17 +14,17 @@ buildPythonPackage rec { version = "0.11.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; hash = "sha256-TDvTNh+5cxgBoy9nuXItHOdtfbsP+3F16egZjUBSpak="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ - requests + dependencies = [ + httpx tomli ]; From fcb71bf658d15153b3aff455bae568e0407465ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Feb 2025 12:50:20 -0800 Subject: [PATCH 0816/2168] nixos/tests/vaultwarden: adapt to new webvault --- nixos/tests/vaultwarden.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/nixos/tests/vaultwarden.nix b/nixos/tests/vaultwarden.nix index 6ddb6161f15c..c656e9ef1a06 100644 --- a/nixos/tests/vaultwarden.nix +++ b/nixos/tests/vaultwarden.nix @@ -69,14 +69,13 @@ let driver.find_element(By.XPATH, "//button[contains(., 'Continue')]").click() - driver.find_element(By.CSS_SELECTOR, 'input#login_input_master-password').send_keys( + driver.find_element(By.XPATH, '//input[@type="password"]').send_keys( '${userPassword}' ) - driver.find_element(By.XPATH, "//button[contains(., 'Log in')]").click() + driver.find_element(By.XPATH, "//button[contains(., 'Log in with master password')]").click() - wait.until(EC.title_contains("Vaults")) - - driver.find_element(By.XPATH, "//button[contains(., 'New item')]").click() + wait.until(EC.presence_of_element_located((By.CSS_SELECTOR, 'button#newItemDropdown'))).click() + driver.find_element(By.XPATH, "//button[contains(., 'Item')]").click() driver.find_element(By.CSS_SELECTOR, 'input#name').send_keys( 'secrets' From a21f682b66c6c9b05a5c736cc856fbbc3a347fb5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Feb 2025 17:32:28 +0100 Subject: [PATCH 0817/2168] openvino: 2024.6.0 -> 2025.0.0 https://github.com/openvinotoolkit/openvino/releases/tag/2025.0.0 https://github.com/openvinotoolkit/openvino/compare/refs/tags/2024.6.0...2025.0.0 --- pkgs/by-name/op/openvino/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/openvino/package.nix b/pkgs/by-name/op/openvino/package.nix index 2e81c9d1d8aa..5cf19cc781cb 100644 --- a/pkgs/by-name/op/openvino/package.nix +++ b/pkgs/by-name/op/openvino/package.nix @@ -58,14 +58,14 @@ in stdenv.mkDerivation rec { pname = "openvino"; - version = "2024.6.0"; + version = "2025.0.0"; src = fetchFromGitHub { owner = "openvinotoolkit"; repo = "openvino"; tag = version; fetchSubmodules = true; - hash = "sha256-GmbRuFM5L60vQNJLCkva1NzBWWKXK674xjMUpME4o4c="; + hash = "sha256-+LXOX5ChfVbD2dbQYuIp9unz6v3OIpH5YUpdhn2okbM="; }; outputs = [ @@ -172,6 +172,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + changelog = "https://github.com/openvinotoolkit/openvino/releases/tag/${src.tag}"; description = "OpenVINO™ Toolkit repository"; longDescription = '' This toolkit allows developers to deploy pre-trained deep learning models through a high-level C++ Inference Engine API integrated with application logic. From 05f423eb0002ec86489dacc96b44e9616b284f20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Feb 2025 13:21:19 -0800 Subject: [PATCH 0818/2168] python313Packages.paho-mqtt: 1.6.1 -> 2.1.0 --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8f7554dd90ff..d3105799d860 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10040,7 +10040,7 @@ self: super: with self; { paho-mqtt_1 = callPackage ../development/python-modules/paho-mqtt/1.nix { }; paho-mqtt_2 = callPackage ../development/python-modules/paho-mqtt/default.nix { }; - paho-mqtt = paho-mqtt_1; + paho-mqtt = paho-mqtt_2; paintcompiler = callPackage ../development/python-modules/paintcompiler { }; From d7d9a5982f39aeeddfa41474829701b70c07687b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Feb 2025 13:24:53 -0800 Subject: [PATCH 0819/2168] frigate: unpin paho-mqtt --- pkgs/by-name/fr/frigate/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/fr/frigate/package.nix b/pkgs/by-name/fr/frigate/package.nix index 590a483444a0..c9219a2e5a91 100644 --- a/pkgs/by-name/fr/frigate/package.nix +++ b/pkgs/by-name/fr/frigate/package.nix @@ -26,7 +26,6 @@ let python = python312.override { self = python; packageOverrides = self: super: { - paho-mqtt = super.paho-mqtt_2; }; }; From 369074d4bd2f601fc6ea1ea5eeaf1a1aeb147bca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Feb 2025 13:25:36 -0800 Subject: [PATCH 0820/2168] python313Packages.weconnect-mqtt: unpin paho-mqtt --- pkgs/development/python-modules/weconnect-mqtt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weconnect-mqtt/default.nix b/pkgs/development/python-modules/weconnect-mqtt/default.nix index 19a2cd2fb32b..2c7b5045cf83 100644 --- a/pkgs/development/python-modules/weconnect-mqtt/default.nix +++ b/pkgs/development/python-modules/weconnect-mqtt/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - paho-mqtt_2, + paho-mqtt, pytest-cov-stub, pytestCheckHook, python-dateutil, @@ -39,7 +39,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; dependencies = [ - paho-mqtt_2 + paho-mqtt python-dateutil weconnect ] ++ weconnect.optional-dependencies.Images; From f37ff3af3ea38672553f40070a433d82563d4345 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Feb 2025 13:26:09 -0800 Subject: [PATCH 0821/2168] mqtt-exporter: unpin paho-mqtt --- pkgs/by-name/mq/mqtt-exporter/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/mq/mqtt-exporter/package.nix b/pkgs/by-name/mq/mqtt-exporter/package.nix index 01715b67d838..47464ffe1f9a 100644 --- a/pkgs/by-name/mq/mqtt-exporter/package.nix +++ b/pkgs/by-name/mq/mqtt-exporter/package.nix @@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec { build-system = with python3.pkgs; [ setuptools ]; dependencies = with python3.pkgs; [ - paho-mqtt_2 + paho-mqtt prometheus-client ]; From 430baeedba5ab4eaca3030a74941cf3b777ac4b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Feb 2025 13:40:31 -0800 Subject: [PATCH 0822/2168] python313Packages.ha-mqtt-discoverable: mark broken with paho-mqtt v2 --- .../development/python-modules/ha-mqtt-discoverable/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix b/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix index 911a852655ae..4e2275dba2d1 100644 --- a/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix +++ b/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix @@ -43,6 +43,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "ha_mqtt_discoverable" ]; meta = with lib; { + # https://github.com/unixorn/ha-mqtt-discoverable/pull/310 + broken = lib.versionAtLeast paho-mqtt.version "2"; description = "Python module to create MQTT entities that are automatically discovered by Home Assistant"; homepage = "https://github.com/unixorn/ha-mqtt-discoverable"; changelog = "https://github.com/unixorn/ha-mqtt-discoverable/releases/tag/v${version}"; From 6ca1674e4c5424a9738dbd40272646cdb8f64b9b Mon Sep 17 00:00:00 2001 From: Nico Felbinger Date: Sun, 9 Feb 2025 22:50:11 +0100 Subject: [PATCH 0823/2168] jefferson: relax cstruct dependency --- pkgs/by-name/je/jefferson/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/je/jefferson/package.nix b/pkgs/by-name/je/jefferson/package.nix index 62e57693c532..81b27588147f 100644 --- a/pkgs/by-name/je/jefferson/package.nix +++ b/pkgs/by-name/je/jefferson/package.nix @@ -26,6 +26,8 @@ python3.pkgs.buildPythonApplication rec { lzallright ]; + pythonRelaxDeps = [ "cstruct" ]; + pythonImportsCheck = [ "jefferson" ]; From c45a2f9d7568acfe876ea32f88939120e15049b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Feb 2025 13:42:00 -0800 Subject: [PATCH 0824/2168] ha-mqtt-discoverable-cli: pin paho-mqtt to v1 --- .../ha/ha-mqtt-discoverable-cli/package.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix b/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix index dfa7b6f4cc2e..8007859bf840 100644 --- a/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix +++ b/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix @@ -4,7 +4,16 @@ python3, }: -python3.pkgs.buildPythonApplication rec { +let + python = python3.override { + self = python; + packageOverrides = self: super: { + # https://github.com/unixorn/ha-mqtt-discoverable/pull/310 + paho-mqtt = self.paho-mqtt_1; + }; + }; +in +python.pkgs.buildPythonApplication rec { pname = "ha-mqtt-discoverable-cli"; version = "0.16.4.1"; pyproject = true; @@ -18,9 +27,9 @@ python3.pkgs.buildPythonApplication rec { pythonRelaxDeps = [ "ha-mqtt-discoverable" ]; - build-system = with python3.pkgs; [ poetry-core ]; + build-system = with python.pkgs; [ poetry-core ]; - dependencies = with python3.pkgs; [ ha-mqtt-discoverable ]; + dependencies = with python.pkgs; [ ha-mqtt-discoverable ]; # Project has no real tests doCheck = false; From ab15130c1a8a76cea8fd5bf8ee4728d209bedbb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Feb 2025 13:58:13 -0800 Subject: [PATCH 0825/2168] python313Packages.azure-iot-device: mark broken with paho-mqtt v2 --- pkgs/development/python-modules/azure-iot-device/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/azure-iot-device/default.nix b/pkgs/development/python-modules/azure-iot-device/default.nix index cae7ceb73efc..08928f7bcba1 100644 --- a/pkgs/development/python-modules/azure-iot-device/default.nix +++ b/pkgs/development/python-modules/azure-iot-device/default.nix @@ -50,6 +50,8 @@ buildPythonPackage rec { ]; meta = with lib; { + # https://github.com/Azure/azure-iot-sdk-python/issues/1196 + broken = lib.versionAtLeast paho-mqtt.version "2"; description = "Microsoft Azure IoT Device Library for Python"; homepage = "https://github.com/Azure/azure-iot-sdk-python"; license = licenses.mit; From 8cd3dc02231177b62d137b103615b0d08e46f658 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Feb 2025 14:00:04 -0800 Subject: [PATCH 0826/2168] Revert "python3Packages.amshan: 2.1.1 -> 2021.12.1" This reverts commit 96ab7ef710c74c081abb9a986e5524260ea1b391. --- pkgs/development/python-modules/amshan/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/amshan/default.nix b/pkgs/development/python-modules/amshan/default.nix index 5f0bc3fbbacf..82eaa056d876 100644 --- a/pkgs/development/python-modules/amshan/default.nix +++ b/pkgs/development/python-modules/amshan/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "amshan"; - version = "2021.12.1"; + version = "2.1.1"; pyproject = true; src = fetchFromGitHub { owner = "toreamun"; repo = "amshan"; - tag = version; - hash = "sha256-eL8YzQB6Vj4l3cYFgWve88vLojvcxMtr2xvTUKT+Ekk="; + rev = version; + hash = "sha256-aw0wTqb2s84STVUN55h6L926pXwaMSppBCfXZVb87w0="; }; build-system = [ From 24b53d053ecf1bd358328aca8b6d15be1b772734 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Feb 2025 14:01:19 -0800 Subject: [PATCH 0827/2168] python313Packages.amshan: skip bulk update --- pkgs/development/python-modules/amshan/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/amshan/default.nix b/pkgs/development/python-modules/amshan/default.nix index 82eaa056d876..f019474e89b4 100644 --- a/pkgs/development/python-modules/amshan/default.nix +++ b/pkgs/development/python-modules/amshan/default.nix @@ -37,6 +37,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "han" ]; + # 2021.12.1 is an older version + passthru.skipBulkUpdate = true; + meta = { description = "Decode smart power meter data stream of Cosem HDLC frames used by MBUS"; longDescription = '' From 19f7ed2c2c9ea4268ec2af4b3910ab568d786a5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Feb 2025 14:04:24 -0800 Subject: [PATCH 0828/2168] python313Packages.meross-iot: mark broken with paho-mqtt v2 --- pkgs/development/python-modules/meross-iot/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/meross-iot/default.nix b/pkgs/development/python-modules/meross-iot/default.nix index 5f037426b477..02f953c0ac8a 100644 --- a/pkgs/development/python-modules/meross-iot/default.nix +++ b/pkgs/development/python-modules/meross-iot/default.nix @@ -41,6 +41,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "meross_iot" ]; meta = with lib; { + # https://github.com/albertogeniola/MerossIot/pull/413 + broken = lib.versionAtLeast paho-mqtt.version "2"; description = "Python library to interact with Meross devices"; homepage = "https://github.com/albertogeniola/MerossIot"; changelog = "https://github.com/albertogeniola/MerossIot/releases/tag/${version}"; From f6604f9491c0c9cecc837659058d6be1339dfda6 Mon Sep 17 00:00:00 2001 From: lucasew Date: Sat, 8 Feb 2025 11:12:43 -0300 Subject: [PATCH 0829/2168] flet-client-flutter: adjusting the updater to handle the new cases Signed-off-by: lucasew --- .../fl/flet-client-flutter/git_hashes.json | 1 + .../fl/flet-client-flutter/package.nix | 20 ++++----- .../flet-client-flutter/update-lockfiles.py | 42 +++++++++++++++++++ 3 files changed, 52 insertions(+), 11 deletions(-) create mode 100644 pkgs/by-name/fl/flet-client-flutter/git_hashes.json create mode 100644 pkgs/by-name/fl/flet-client-flutter/update-lockfiles.py diff --git a/pkgs/by-name/fl/flet-client-flutter/git_hashes.json b/pkgs/by-name/fl/flet-client-flutter/git_hashes.json new file mode 100644 index 000000000000..9e26dfeeb6e6 --- /dev/null +++ b/pkgs/by-name/fl/flet-client-flutter/git_hashes.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/pkgs/by-name/fl/flet-client-flutter/package.nix b/pkgs/by-name/fl/flet-client-flutter/package.nix index 7bd3d5847bfa..af44df54cb59 100644 --- a/pkgs/by-name/fl/flet-client-flutter/package.nix +++ b/pkgs/by-name/fl/flet-client-flutter/package.nix @@ -7,13 +7,13 @@ , makeWrapper , mimalloc , orc -, yq -, runCommand +, python3 +, nix , gitUpdater +, nix-prefetch-git , mpv-unwrapped , libplacebo , _experimental-update-script-combinators -, flet-client-flutter , fletTarget ? "linux" }: @@ -30,6 +30,8 @@ flutter324.buildFlutterApplication rec { sourceRoot = "${src.name}/client"; + gitHashes = lib.importJSON ./git_hashes.json; + cmakeFlags = [ "-DMIMALLOC_LIB=${mimalloc}/lib/mimalloc.o" ]; @@ -59,16 +61,12 @@ flutter324.buildFlutterApplication rec { ; passthru = { - pubspecSource = runCommand "pubspec.lock.json" { - buildInputs = [ yq ]; - inherit (flet-client-flutter) src; - } '' - cat $src/client/pubspec.lock | yq > $out - ''; - updateScript = _experimental-update-script-combinators.sequence [ (gitUpdater { rev-prefix = "v"; }) - (_experimental-update-script-combinators.copyAttrOutputToFile "flet-client-flutter.pubspecSource" ./pubspec.lock.json) + { + command = ["env" "PATH=${lib.makeBinPath [(python3.withPackages (p: [p.pyyaml])) nix-prefetch-git nix]}" "python3" ./update-lockfiles.py ]; + supportedFeatures = ["silent"]; + } ]; }; diff --git a/pkgs/by-name/fl/flet-client-flutter/update-lockfiles.py b/pkgs/by-name/fl/flet-client-flutter/update-lockfiles.py new file mode 100644 index 000000000000..cc35d251bd4e --- /dev/null +++ b/pkgs/by-name/fl/flet-client-flutter/update-lockfiles.py @@ -0,0 +1,42 @@ +from argparse import ArgumentParser +from pathlib import Path +import json +import subprocess +import yaml + +THIS_FOLDER = Path(__file__).parent +FLAKE_DIR = THIS_FOLDER +while True: + assert str(FLAKE_DIR) != '/' + if (FLAKE_DIR / "flake.nix").exists(): + break + FLAKE_DIR = FLAKE_DIR.parent + +source = Path(subprocess.run(['nix-build', FLAKE_DIR, '-A', 'flet-client-flutter.src', '--no-out-link'], stdout=subprocess.PIPE).stdout.decode('utf-8').strip()) +assert source.is_absolute() + +source_pubspec_lock = source / "client" / "pubspec.lock" + +output_pubspec = THIS_FOLDER / "pubspec.lock.json" +output_git_hashes = THIS_FOLDER / "git_hashes.json" + +data = yaml.safe_load(source_pubspec_lock.open('r')) +output_pubspec.write_text(json.dumps(data, indent=2) + "\n") + +output_data = {} + +def hash_git(package): + print(package) + resolved_ref = package['resolved-ref'] + url = package['url'] + full_output = subprocess.run(['nix-prefetch-git', '--url', url, '--rev', resolved_ref], stdout=subprocess.PIPE).stdout.decode('utf-8') + json_output = json.loads(full_output) + return json_output['hash'] + +for name, package in data['packages'].items(): + if package['source'] != 'git': + continue + hash = hash_git(package['description']) + output_data[name] = hash + +output_git_hashes.write_text(json.dumps(output_data, indent=2) + "\n") From 8d4f14e20d71aed5b733db065d16661f991e5497 Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Sun, 9 Feb 2025 23:37:11 +0100 Subject: [PATCH 0830/2168] zoxide: 0.9.6 -> 0.9.7 --- pkgs/by-name/zo/zoxide/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/zo/zoxide/package.nix b/pkgs/by-name/zo/zoxide/package.nix index 78ff39b89a46..140990537964 100644 --- a/pkgs/by-name/zo/zoxide/package.nix +++ b/pkgs/by-name/zo/zoxide/package.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "zoxide"; - version = "0.9.6"; + version = "0.9.7"; src = fetchFromGitHub { owner = "ajeetdsouza"; repo = "zoxide"; tag = "v${version}"; - hash = "sha256-3XC5K4OlituoFMPN9yJkYi+tkH6M0KK5jVAGdr/GLd0="; + hash = "sha256-+QZpLMlHOZdbKLFYOUOIRZHvIsbMDdstj9oGzyEGVxk="; }; nativeBuildInputs = [ installShellFiles ]; @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { ''; useFetchCargoVendor = true; - cargoHash = "sha256-+Vip7MjVV23dZdD8GxmNFrfnsjmucohMDUZE9vbpG5w="; + cargoHash = "sha256-uqIL8KTrgWzzzyoPR9gctyh0Rf7WQpTGqXow2/xFvCU="; postInstall = '' installManPage man/man*/* From f4946d810a501c9c4b3b75c90537195af71d2102 Mon Sep 17 00:00:00 2001 From: lucasew Date: Sun, 9 Feb 2025 19:37:33 -0300 Subject: [PATCH 0831/2168] flet-client-flutter: 0.25.2 -> 0.26.0 Signed-off-by: lucasew --- .../fl/flet-client-flutter/git_hashes.json | 14 +- .../fl/flet-client-flutter/package.nix | 4 +- .../fl/flet-client-flutter/pubspec.lock.json | 186 +++++++++++------- 3 files changed, 134 insertions(+), 70 deletions(-) diff --git a/pkgs/by-name/fl/flet-client-flutter/git_hashes.json b/pkgs/by-name/fl/flet-client-flutter/git_hashes.json index 9e26dfeeb6e6..f220955a2be9 100644 --- a/pkgs/by-name/fl/flet-client-flutter/git_hashes.json +++ b/pkgs/by-name/fl/flet-client-flutter/git_hashes.json @@ -1 +1,13 @@ -{} \ No newline at end of file +{ + "flet_ads": "sha256-uvfhwfuhw0by5CN9Z9VAUKrH9s2S4ltOf/93PDdGGKM=", + "flet_audio": "sha256-3xr0pYUylBNvswNvRath10A/EuCr4mTrTFjvlUAVgJQ=", + "flet_audio_recorder": "sha256-gOgd+6XZ0KJUG7bvxqyr5IjsNL/dy9RsJ0wbtMVr3bM=", + "flet_flashlight": "sha256-a/WnJdrSjM0FrYm/HghbocyGTMpT2xfa90z/Zv+Bp1Y=", + "flet_geolocator": "sha256-ZXt9rYWHr27FBzlQT1uxg5/l2E7JX1tDI3WgChx9DAs=", + "flet_lottie": "sha256-tpoMiI+rpD5HSqIsDvo0QNkwN4nifG3rJkUlVSHWNzM=", + "flet_map": "sha256-k42GK37MGdMI/QM04GuF0LQ6AAaL7mrZ6z9IGObYhYM=", + "flet_permission_handler": "sha256-Lj0bHcERjdfgUAbvPW7z58fAWT/BfKEJkBhNUrNVG9o=", + "flet_rive": "sha256-X8MRlnktjd5v0dfi9wvPvgl8lTgexfocgf5/ja7UpWk=", + "flet_video": "sha256-IfUkld4TZgtkIL1l1vmWFoCAzgVOEtALosmvkBZVq1M=", + "flet_webview": "sha256-wvypCJx5OuNYWcJMiW3L05PQI9ZY1tONebujI+EJu4E=" +} diff --git a/pkgs/by-name/fl/flet-client-flutter/package.nix b/pkgs/by-name/fl/flet-client-flutter/package.nix index af44df54cb59..9357a94e0fdf 100644 --- a/pkgs/by-name/fl/flet-client-flutter/package.nix +++ b/pkgs/by-name/fl/flet-client-flutter/package.nix @@ -19,13 +19,13 @@ flutter324.buildFlutterApplication rec { pname = "flet-client-flutter"; - version = "0.25.2"; + version = "0.26.0"; src = fetchFromGitHub { owner = "flet-dev"; repo = "flet"; tag = "v${version}"; - hash = "sha256-bD44MCRZPXB/xuw2vBCzNbRNSVgdc4GyyWg3F2adxKk="; + hash = "sha256-KmZ13QiZeZ6jljs2wibetbACfNODGJ47II8XcRAxoX4="; }; sourceRoot = "${src.name}/client"; diff --git a/pkgs/by-name/fl/flet-client-flutter/pubspec.lock.json b/pkgs/by-name/fl/flet-client-flutter/pubspec.lock.json index eea4dd8db1e2..291888ba981e 100644 --- a/pkgs/by-name/fl/flet-client-flutter/pubspec.lock.json +++ b/pkgs/by-name/fl/flet-client-flutter/pubspec.lock.json @@ -154,11 +154,11 @@ "dependency": "transitive", "description": { "name": "collection", - "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a", + "sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.18.0" + "version": "1.19.0" }, "cross_file": { "dependency": "transitive", @@ -210,6 +210,26 @@ "source": "hosted", "version": "0.7.10" }, + "device_info_plus": { + "dependency": "transitive", + "description": { + "name": "device_info_plus", + "sha256": "b37d37c2f912ad4e8ec694187de87d05de2a3cb82b465ff1f65f65a2d05de544", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "11.2.1" + }, + "device_info_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "device_info_plus_platform_interface", + "sha256": "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.2" + }, "dio": { "dependency": "transitive", "description": { @@ -301,112 +321,134 @@ "version": "0.69.0" }, "flet": { - "dependency": "direct main", + "dependency": "direct overridden", "description": { "path": "../packages/flet", "relative": true }, "source": "path", - "version": "0.25.1" + "version": "0.26.0" }, "flet_ads": { "dependency": "direct main", "description": { - "path": "../packages/flet_ads", - "relative": true + "path": "src/flutter/flet_ads", + "ref": "0.1.0", + "resolved-ref": "01e7065fcbebb1317b3f16951e6cf0c5fcff658b", + "url": "https://github.com/flet-dev/flet-ads.git" }, - "source": "path", - "version": "0.25.1" + "source": "git", + "version": "0.1.0" }, "flet_audio": { "dependency": "direct main", "description": { - "path": "../packages/flet_audio", - "relative": true + "path": "src/flutter/flet_audio", + "ref": "0.1.0", + "resolved-ref": "a146bf580a211c6d1f5c45070d15532ea2e92af7", + "url": "https://github.com/flet-dev/flet-audio.git" }, - "source": "path", - "version": "0.25.1" + "source": "git", + "version": "0.1.0" }, "flet_audio_recorder": { "dependency": "direct main", "description": { - "path": "../packages/flet_audio_recorder", - "relative": true + "path": "src/flutter/flet_audio_recorder", + "ref": "0.1.0", + "resolved-ref": "eb186cd49fde3136f65d0d074bca5ca688260e53", + "url": "https://github.com/flet-dev/flet-audio-recorder.git" }, - "source": "path", - "version": "0.25.1" + "source": "git", + "version": "0.1.0" }, "flet_flashlight": { "dependency": "direct main", "description": { - "path": "../packages/flet_flashlight", - "relative": true + "path": "src/flutter/flet_flashlight", + "ref": "0.1.0", + "resolved-ref": "a12a12259eaac801ee99d465727ec4a9fe50121e", + "url": "https://github.com/flet-dev/flet-flashlight.git" }, - "source": "path", - "version": "0.25.1" + "source": "git", + "version": "0.1.0" }, "flet_geolocator": { "dependency": "direct main", "description": { - "path": "../packages/flet_geolocator", - "relative": true + "path": "src/flutter/flet_geolocator", + "ref": "0.1.0", + "resolved-ref": "7b17d7aab169a7488da90fd73b3acd8e568f4f03", + "url": "https://github.com/flet-dev/flet-geolocator.git" }, - "source": "path", - "version": "0.25.1" + "source": "git", + "version": "0.25.2" }, "flet_lottie": { "dependency": "direct main", "description": { - "path": "../packages/flet_lottie", - "relative": true + "path": "src/flutter/flet_lottie", + "ref": "0.1.0", + "resolved-ref": "f28c767b5d43de650155a5a97e2d971fb833c9f8", + "url": "https://github.com/flet-dev/flet-lottie.git" }, - "source": "path", - "version": "0.25.1" + "source": "git", + "version": "0.1.0" }, "flet_map": { "dependency": "direct main", "description": { - "path": "../packages/flet_map", - "relative": true + "path": "src/flutter/flet_map", + "ref": "0.1.0", + "resolved-ref": "dfa3cf6776b0dc5f238227d5f378cda7be190eaf", + "url": "https://github.com/flet-dev/flet-map.git" }, - "source": "path", - "version": "0.25.1" + "source": "git", + "version": "0.1.0" }, "flet_permission_handler": { "dependency": "direct main", "description": { - "path": "../packages/flet_permission_handler", - "relative": true + "path": "src/flutter/flet_permission_handler", + "ref": "0.1.0", + "resolved-ref": "4ead86b6c7e54b914215b6087fcb17b7e921d75c", + "url": "https://github.com/flet-dev/flet-permission-handler.git" }, - "source": "path", - "version": "0.25.1" + "source": "git", + "version": "0.1.0" }, "flet_rive": { "dependency": "direct main", "description": { - "path": "../packages/flet_rive", - "relative": true + "path": "src/flutter/flet_rive", + "ref": "0.1.0", + "resolved-ref": "089f7ad923f747ad764aa2781eca9a36382bb912", + "url": "https://github.com/flet-dev/flet-rive.git" }, - "source": "path", - "version": "0.25.1" + "source": "git", + "version": "0.1.0" }, "flet_video": { "dependency": "direct main", "description": { - "path": "../packages/flet_video", - "relative": true + "path": "src/flutter/flet_video", + "ref": "0.1.0", + "resolved-ref": "76f3f76f04c7573e047204648378ee2f31db7a15", + "url": "https://github.com/flet-dev/flet-video.git" }, - "source": "path", - "version": "0.25.1" + "source": "git", + "version": "0.1.0" }, "flet_webview": { "dependency": "direct main", "description": { - "path": "../packages/flet_webview", - "relative": true + "path": "src/flutter/flet_webview", + "ref": "0.1.0", + "resolved-ref": "b1cfb3155469bc0a9a7578afcd58e7f32669b164", + "url": "https://github.com/flet-dev/flet-webview.git" }, - "source": "path", - "version": "0.25.1" + "source": "git", + "version": "0.1.0" }, "flutter": { "dependency": "direct main", @@ -714,21 +756,21 @@ "dependency": "transitive", "description": { "name": "leak_tracker", - "sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05", + "sha256": "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.0.5" + "version": "10.0.7" }, "leak_tracker_flutter_testing": { "dependency": "transitive", "description": { "name": "leak_tracker_flutter_testing", - "sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806", + "sha256": "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.5" + "version": "3.0.8" }, "leak_tracker_testing": { "dependency": "transitive", @@ -1234,21 +1276,21 @@ "dependency": "transitive", "description": { "name": "rive", - "sha256": "b44b62feb908610ca6c85e05f4573a66118a23867425926cf06152d171236141", + "sha256": "2551a44fa766a7ed3f52aa2b94feda6d18d00edc25dee5f66e72e9b365bb6d6c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.13.17" + "version": "0.13.20" }, "rive_common": { "dependency": "transitive", "description": { "name": "rive_common", - "sha256": "a3e5786f8d85c89977062b9ceeb3b72a7c28f81e32fb68497744042ce20bee2f", + "sha256": "2ba42f80d37a4efd0696fb715787c4785f8a13361e8aea9227c50f1e78cf763a", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.4.12" + "version": "0.4.15" }, "safe_local_storage": { "dependency": "transitive", @@ -1464,7 +1506,7 @@ "dependency": "transitive", "description": "flutter", "source": "sdk", - "version": "0.0.99" + "version": "0.0.0" }, "source_span": { "dependency": "transitive", @@ -1490,11 +1532,11 @@ "dependency": "transitive", "description": { "name": "stack_trace", - "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", + "sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.11.1" + "version": "1.12.0" }, "stream_channel": { "dependency": "transitive", @@ -1510,11 +1552,11 @@ "dependency": "transitive", "description": { "name": "string_scanner", - "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde", + "sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.0" + "version": "1.3.0" }, "sync_http": { "dependency": "transitive", @@ -1550,11 +1592,11 @@ "dependency": "transitive", "description": { "name": "test_api", - "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb", + "sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.2" + "version": "0.7.3" }, "torch_light": { "dependency": "transitive", @@ -1750,11 +1792,11 @@ "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d", + "sha256": "f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b", "url": "https://pub.dev" }, "source": "hosted", - "version": "14.2.5" + "version": "14.3.0" }, "volume_controller": { "dependency": "transitive", @@ -1810,11 +1852,11 @@ "dependency": "transitive", "description": { "name": "webdriver", - "sha256": "003d7da9519e1e5f329422b36c4dcdf18d7d2978d1ba099ea4e45ba490ed845e", + "sha256": "3d773670966f02a646319410766d3b5e1037efb7f07cc68f844d5e06cd4d61c8", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.3" + "version": "3.0.4" }, "webview_flutter": { "dependency": "transitive", @@ -1876,6 +1918,16 @@ "source": "hosted", "version": "5.5.3" }, + "win32_registry": { + "dependency": "transitive", + "description": { + "name": "win32_registry", + "sha256": "723b7f851e5724c55409bb3d5a32b203b3afe8587eaf5dafb93a5fed8ecda0d6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.4" + }, "window_manager": { "dependency": "transitive", "description": { From b7ab2d9e191b87c4bc0a63439792dfadbea17732 Mon Sep 17 00:00:00 2001 From: lucasew Date: Sat, 8 Feb 2025 14:14:44 -0300 Subject: [PATCH 0832/2168] flet-client-flutter: fix build Signed-off-by: lucasew --- pkgs/by-name/fl/flet-client-flutter/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fl/flet-client-flutter/package.nix b/pkgs/by-name/fl/flet-client-flutter/package.nix index 9357a94e0fdf..07d894302091 100644 --- a/pkgs/by-name/fl/flet-client-flutter/package.nix +++ b/pkgs/by-name/fl/flet-client-flutter/package.nix @@ -1,7 +1,7 @@ { lib , fetchFromGitHub , pkg-config -, flutter324 +, flutter327 , gst_all_1 , libunwind , makeWrapper @@ -17,7 +17,7 @@ , fletTarget ? "linux" }: -flutter324.buildFlutterApplication rec { +flutter327.buildFlutterApplication rec { pname = "flet-client-flutter"; version = "0.26.0"; From 6a68f2f732a0fa76dd7f086bf3c9853dbf4542d4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 00:25:12 +0000 Subject: [PATCH 0833/2168] immich-public-proxy: 1.6.3 -> 1.7.2 --- pkgs/by-name/im/immich-public-proxy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/im/immich-public-proxy/package.nix b/pkgs/by-name/im/immich-public-proxy/package.nix index 63157a6af6c5..ff2255d7adc4 100644 --- a/pkgs/by-name/im/immich-public-proxy/package.nix +++ b/pkgs/by-name/im/immich-public-proxy/package.nix @@ -8,17 +8,17 @@ }: buildNpmPackage rec { pname = "immich-public-proxy"; - version = "1.6.3"; + version = "1.7.2"; src = fetchFromGitHub { owner = "alangrainger"; repo = "immich-public-proxy"; tag = "v${version}"; - hash = "sha256-nhVU3CVexXV+WCUP8E1tGvwwjy+PCTL9v3/3KI1tDus="; + hash = "sha256-G08xucggEdO+iwW7m1D53nr4Rah9D/qD4xlyLwWwBq0="; }; sourceRoot = "${src.name}/app"; - npmDepsHash = "sha256-NQgxAHNMPp2eDoiMqjqBOZ3364XjW3WtvrK/ciqg1DI="; + npmDepsHash = "sha256-aXTdKGlF2mK8I+vQMd+V6JNTG49S4jJd1kTNBai6sZE="; # patch in absolute nix store paths so the process doesn't need to cwd in $out postPatch = '' From ad60461a744300f61aac738d41ff01b61572c5ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 00:27:14 +0000 Subject: [PATCH 0834/2168] python312Packages.mkdocs-git-committers-plugin-2: 2.4.1 -> 2.5.0 --- .../mkdocs-git-committers-plugin-2/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs-git-committers-plugin-2/default.nix b/pkgs/development/python-modules/mkdocs-git-committers-plugin-2/default.nix index 6ff5a1c51101..4405d028dc19 100644 --- a/pkgs/development/python-modules/mkdocs-git-committers-plugin-2/default.nix +++ b/pkgs/development/python-modules/mkdocs-git-committers-plugin-2/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "mkdocs-git-committers-plugin-2"; - version = "2.4.1"; + version = "2.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ojacques"; repo = "mkdocs-git-committers-plugin-2"; - rev = "refs/tags/${version}"; - hash = "sha256-hKt0K5gOkdUDwTlyMTwodl4gD1RD+s+CM+zEpngSnlc="; + tag = version; + hash = "sha256-PpXgY5RlOeb0mB46gcNVWkSGMZa4WPkCwDUXMxCUjsI="; }; build-system = [ @@ -45,7 +45,7 @@ buildPythonPackage rec { meta = { description = "MkDocs plugin for displaying a list of contributors on each page"; homepage = "https://github.com/ojacques/mkdocs-git-committers-plugin-2"; - changelog = "https://github.com/ojacques/mkdocs-git-committers-plugin-2/releases/tag/${version}"; + changelog = "https://github.com/ojacques/mkdocs-git-committers-plugin-2/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ mahtaran ]; }; From 7ca7bb9dee684b31f440d9ad4f49678a6b6a63f5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 00:31:14 +0000 Subject: [PATCH 0835/2168] anilibria-winmaclinux: 2.2.24 -> 2.2.25 --- pkgs/applications/video/anilibria-winmaclinux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/anilibria-winmaclinux/default.nix b/pkgs/applications/video/anilibria-winmaclinux/default.nix index 38e4c25b7b19..c1a1114fe3df 100644 --- a/pkgs/applications/video/anilibria-winmaclinux/default.nix +++ b/pkgs/applications/video/anilibria-winmaclinux/default.nix @@ -21,13 +21,13 @@ mkDerivation rec { pname = "anilibria-winmaclinux"; - version = "2.2.24"; + version = "2.2.25"; src = fetchFromGitHub { owner = "anilibria"; repo = "anilibria-winmaclinux"; rev = version; - hash = "sha256-FAnVgrH6ZXfIp8FaacSpcHIwF6DCFt4K5e+UMAUb6qI="; + hash = "sha256-9jlGENJVgzQi5oEspM6JHIgYt9np8WNKPJzoW2kSgQs="; }; sourceRoot = "${src.name}/src"; From 36f020a50fa8ad5b7b56cbc472decf47106fc489 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 00:32:55 +0000 Subject: [PATCH 0836/2168] adrs: 0.2.9 -> 0.3.0 --- pkgs/by-name/ad/adrs/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ad/adrs/package.nix b/pkgs/by-name/ad/adrs/package.nix index a64f07771437..44473edfff22 100644 --- a/pkgs/by-name/ad/adrs/package.nix +++ b/pkgs/by-name/ad/adrs/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "adrs"; - version = "0.2.9"; + version = "0.3.0"; src = fetchFromGitHub { owner = "joshrotenberg"; repo = "adrs"; rev = "v${version}"; - hash = "sha256-a1vxo2Zw2fvCJeGaatNqf2h74t7pvWppYS2l2gbCF5k="; + hash = "sha256-BnbI5QsrnyEQFpTWqOPrbZnVa7J3vaByO9fnKd5t64o="; }; useFetchCargoVendor = true; - cargoHash = "sha256-VtMgvUifHddSncsKxtT5v44sDhihLgpbq38szvHVrVk="; + cargoHash = "sha256-Ep1Y2PDNesaDzEc2JNoKZjFSay1utZiNR5eQYhdqiUU="; meta = { description = "Command-line tool for managing Architectural Decision Records"; From 2cc96c173f001071180a20d56ebaa2588e0f97f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 00:53:11 +0000 Subject: [PATCH 0837/2168] clap: 1.2.2 -> 1.2.3 --- pkgs/by-name/cl/clap/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cl/clap/package.nix b/pkgs/by-name/cl/clap/package.nix index 15543b4c50b7..421f0cbdec45 100644 --- a/pkgs/by-name/cl/clap/package.nix +++ b/pkgs/by-name/cl/clap/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "clap"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "free-audio"; repo = "clap"; rev = finalAttrs.version; - hash = "sha256-W3cvAtBrd+zyGj7xNSuFFChUUVjRadH6aCv5Zcvq/qs="; + hash = "sha256-c8mG6X++13yO+Ggdlw9YOtDes1XaT00C16evv7swsoU="; }; postPatch = '' From 55e9df7f95048d4db59f9ed9387a620c6b92586b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 00:55:13 +0000 Subject: [PATCH 0838/2168] cppreference-doc: 20241110 -> 20250209 --- pkgs/by-name/cp/cppreference-doc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cp/cppreference-doc/package.nix b/pkgs/by-name/cp/cppreference-doc/package.nix index 33827e12132e..abb5931e7323 100644 --- a/pkgs/by-name/cp/cppreference-doc/package.nix +++ b/pkgs/by-name/cp/cppreference-doc/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation rec { pname = "cppreference-doc"; - version = "20241110"; + version = "20250209"; src = fetchurl { url = "https://github.com/PeterFeicht/${pname}/releases/download/v${version}/html-book-${version}.tar.xz"; - hash = "sha256-Qx6Ahi63D9R5OmDX07bBPIYFKEl4+eoFKVcuj9FWLMY="; + hash = "sha256-rFBnGh9S1/CrCRHRRFDrNejC+BLt0OQmss0ePZ25HW8="; }; sourceRoot = "."; From ce9c3ba23a51d774c608fdc75b2f418a3a7f1ecb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 00:56:15 +0000 Subject: [PATCH 0839/2168] gowall: 0.1.9 -> 0.2.0 --- pkgs/by-name/go/gowall/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/gowall/package.nix b/pkgs/by-name/go/gowall/package.nix index 2053137ec69f..581840505d15 100644 --- a/pkgs/by-name/go/gowall/package.nix +++ b/pkgs/by-name/go/gowall/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "gowall"; - version = "0.1.9"; + version = "0.2.0"; src = fetchFromGitHub { owner = "Achno"; repo = "gowall"; rev = "v${version}"; - hash = "sha256-BBalJADhQ7D7p5PeafddkqQmHGhLsq1DlF1FUoazJGg="; + hash = "sha256-QKukWA8TB0FoNHu0Wyco55x4oBY+E33qdoT/SaXW6DE="; }; vendorHash = "sha256-H2Io1K2LEFmEPJYVcEaVAK2ieBrkV6u+uX82XOvNXj4="; From b120605deb471c4078fc9f9b502c092743bb14fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Feb 2025 16:59:18 -0800 Subject: [PATCH 0840/2168] python313Packages.homeassistant-stubs: 2025.2.0 -> 2025.2.1 Diff: https://github.com/KapJI/homeassistant-stubs/compare/refs/tags/2025.2.0...2025.2.1 Changelog: https://github.com/KapJI/homeassistant-stubs/releases/tag/2025.2.1 --- pkgs/servers/home-assistant/stubs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 66f7fb3eca5b..ee532d02e048 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2025.2.0"; + version = "2025.2.1"; pyproject = true; disabled = python.version != home-assistant.python.version; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-u9RclA8vtsr34TKdocFgc3e/LjaRjP3fqQC0QjqsOs4="; + hash = "sha256-Lw+eItDQX77jKIE9/9S0C9khzR+HMHFPGvPpzRHwrZw="; }; build-system = [ From bf236cc49d7ca410ccaac4cc348f25422cf724f2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 01:04:53 +0000 Subject: [PATCH 0841/2168] wgo: 0.5.7 -> 0.5.9 --- pkgs/by-name/wg/wgo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wg/wgo/package.nix b/pkgs/by-name/wg/wgo/package.nix index c6c007e6e339..594da9ebab83 100644 --- a/pkgs/by-name/wg/wgo/package.nix +++ b/pkgs/by-name/wg/wgo/package.nix @@ -6,7 +6,7 @@ let pname = "wgo"; - version = "0.5.7"; + version = "0.5.9"; in buildGoModule { inherit pname version; @@ -15,7 +15,7 @@ buildGoModule { owner = "bokwoon95"; repo = "wgo"; rev = "v${version}"; - hash = "sha256-4nVDpvMmhw6t6BmQoOssef2V5uUb3jwmn8oU1W7UbUw="; + hash = "sha256-IC8v4Hsnhp6RFoYE0eBsl3r9oQyUBoUfdkJKYIjCXlA="; }; vendorHash = "sha256-w6UJxZToHbbQmuXkyqFzyssFcE+7uVNqOuIF/XKdEsU="; From 7a57caade0267dbc7fb6d68390a55fd48990c128 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 01:06:59 +0000 Subject: [PATCH 0842/2168] cargo-zigbuild: 0.19.7 -> 0.19.8 --- pkgs/development/tools/rust/cargo-zigbuild/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-zigbuild/default.nix b/pkgs/development/tools/rust/cargo-zigbuild/default.nix index 4ba9eb792e98..c8147819969d 100644 --- a/pkgs/development/tools/rust/cargo-zigbuild/default.nix +++ b/pkgs/development/tools/rust/cargo-zigbuild/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-zigbuild"; - version = "0.19.7"; + version = "0.19.8"; src = fetchFromGitHub { owner = "messense"; repo = pname; rev = "v${version}"; - hash = "sha256-kuzKW7ol4ZdxIhfAdvAKRb8fgwaU2LTO43dxrpke1Ow="; + hash = "sha256-S/Xx487z8LFjCSrB9tQTJy4+AQial2Dptg5xZqzPkVE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-WsX1noIRlMRzNqJUxR55CxdTCxJ+DVddVRIbkLtWK1Q="; + cargoHash = "sha256-L9SoaXGzYHY6vOWESvovHNzSehOWD4RGAC/3K6qT6Ks="; nativeBuildInputs = [ makeWrapper ]; From 80db1d7e7e21092c070e28d23df4647d9459d5dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Feb 2025 17:15:53 -0800 Subject: [PATCH 0843/2168] lf: 33 -> 34 Diff: https://github.com/gokcehan/lf/compare/r33...r34 Changelog: https://github.com/gokcehan/lf/releases/tag/r34 --- pkgs/applications/file-managers/lf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/file-managers/lf/default.nix b/pkgs/applications/file-managers/lf/default.nix index 0426d0725ac0..2109b49807d3 100644 --- a/pkgs/applications/file-managers/lf/default.nix +++ b/pkgs/applications/file-managers/lf/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "lf"; - version = "33"; + version = "34"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; rev = "r${version}"; - hash = "sha256-aKvTf2tqAUbB3plOemvgJJ7qYdGfQoXhsGVE7Y9wuMo="; + hash = "sha256-LUlNwzTusp3Deg01K0HOtR5VXI6Ujnb1Dq6p88gFxAU="; }; - vendorHash = "sha256-E6uZVsQAiwy3uGXp9COvtJSlgXhXxfS7vOfhM5uBPQw="; + vendorHash = "sha256-CwsHhFVdC+OCv0LWEahJYu33fE0/isNlHKG3rtEw0Ic="; nativeBuildInputs = [ installShellFiles ]; From 0da935170fff461a3bb3fc48b8e336618b983df8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Feb 2025 17:20:08 -0800 Subject: [PATCH 0844/2168] lf: move to pkgs/by-name --- .../file-managers/lf/default.nix => by-name/lf/lf/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/file-managers/lf/default.nix => by-name/lf/lf/package.nix} (100%) diff --git a/pkgs/applications/file-managers/lf/default.nix b/pkgs/by-name/lf/lf/package.nix similarity index 100% rename from pkgs/applications/file-managers/lf/default.nix rename to pkgs/by-name/lf/lf/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a58cf1edb0c..9db2ad349c09 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1484,8 +1484,6 @@ with pkgs; krusader = libsForQt5.callPackage ../applications/file-managers/krusader { }; - lf = callPackage ../applications/file-managers/lf { }; - ctpv = callPackage ../applications/file-managers/lf/ctpv.nix { }; mc = callPackage ../applications/file-managers/mc { From 69a56a74ae0f7fa0c3e23f9f9c73c810aed9513b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Feb 2025 17:21:11 -0800 Subject: [PATCH 0845/2168] ctpv: move to pkgs/by-name --- .../file-managers/lf/ctpv.nix => by-name/ct/ctpv/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/file-managers/lf/ctpv.nix => by-name/ct/ctpv/package.nix} (100%) diff --git a/pkgs/applications/file-managers/lf/ctpv.nix b/pkgs/by-name/ct/ctpv/package.nix similarity index 100% rename from pkgs/applications/file-managers/lf/ctpv.nix rename to pkgs/by-name/ct/ctpv/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9db2ad349c09..02ef5bb2992e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1484,8 +1484,6 @@ with pkgs; krusader = libsForQt5.callPackage ../applications/file-managers/krusader { }; - ctpv = callPackage ../applications/file-managers/lf/ctpv.nix { }; - mc = callPackage ../applications/file-managers/mc { inherit (darwin) autoSignDarwinBinariesHook; }; From 652fe8258f7d2ab2748325faf467efe2683d9f36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Feb 2025 17:25:24 -0800 Subject: [PATCH 0846/2168] python313Packages.flammkuchen: fix build with NumPy v2 --- .../python-modules/flammkuchen/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/flammkuchen/default.nix b/pkgs/development/python-modules/flammkuchen/default.nix index 8af55dfe7c02..eabc1277fe7e 100644 --- a/pkgs/development/python-modules/flammkuchen/default.nix +++ b/pkgs/development/python-modules/flammkuchen/default.nix @@ -1,6 +1,7 @@ { lib, buildPythonPackage, + fetchpatch2, fetchPypi, numpy, pandas, @@ -13,16 +14,24 @@ buildPythonPackage rec { pname = "flammkuchen"; version = "1.0.3"; - format = "pyproject"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-z68HBsU9J6oe8+YL4OOQiMYQRs3TZUDM+e2ssqo6BFI="; }; - nativeBuildInputs = [ setuptools ]; + patches = [ + (fetchpatch2 { + name = "numpy-v2-compat.patch"; + url = "https://github.com/portugueslab/flammkuchen/commit/c523ea78e10facd98d4893f045249c68bae17940.patch?full_index=1"; + hash = "sha256-/goNkiEBrcprywQYf2oKvGbu5j12hmalPuB45wNNt+I="; + }) + ]; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ numpy scipy tables From b39a906d9557e647f48916541440686e3a33a648 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Feb 2025 17:29:59 -0800 Subject: [PATCH 0847/2168] python313Packages.stytra: specify build-system --- pkgs/development/python-modules/stytra/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/stytra/default.nix b/pkgs/development/python-modules/stytra/default.nix index 5af44d463921..21520a78aaa7 100644 --- a/pkgs/development/python-modules/stytra/default.nix +++ b/pkgs/development/python-modules/stytra/default.nix @@ -27,6 +27,7 @@ qimage2ndarray, scikit-image, scipy, + setuptools, tables, }: @@ -46,7 +47,9 @@ buildPythonPackage rec { ./0000-workaround-pyqtgraph.patch ]; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ opencv4 pyqt5 pyqtgraph From c976561fcf9764eb09eedbf7db6bd498e9cee9ff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 01:38:57 +0000 Subject: [PATCH 0848/2168] mihomo: 1.19.1 -> 1.19.2 --- pkgs/by-name/mi/mihomo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/mihomo/package.nix b/pkgs/by-name/mi/mihomo/package.nix index c6a314d2027b..ef456ae69c95 100644 --- a/pkgs/by-name/mi/mihomo/package.nix +++ b/pkgs/by-name/mi/mihomo/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "mihomo"; - version = "1.19.1"; + version = "1.19.2"; src = fetchFromGitHub { owner = "MetaCubeX"; repo = "mihomo"; rev = "v${version}"; - hash = "sha256-leeD/lra0ZA7in5ZX+uZwWRyHEaE9WzC8UEigI+Z+aA="; + hash = "sha256-lTrUM4/t7GP8IhuyMqit7Iv4AX2I8tlMJWvgx2tDbgE="; }; - vendorHash = "sha256-0CStTmN2+bXJuoolVM8Spfj2HKYK7a8krxlA0uwHOOw="; + vendorHash = "sha256-/YW3IRdDHcOrwUkXt/ORhN3OrwwV5H63WP6ioTFDR+c="; excludedPackages = [ "./test" ]; From 0c229d3692e44a9975279c8caa537f4dc509f7b9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 01:39:49 +0000 Subject: [PATCH 0849/2168] mdbook-d2: 0.3.1 -> 0.3.2 --- pkgs/by-name/md/mdbook-d2/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/md/mdbook-d2/package.nix b/pkgs/by-name/md/mdbook-d2/package.nix index 5129da5484b6..b948c7a2cb0b 100644 --- a/pkgs/by-name/md/mdbook-d2/package.nix +++ b/pkgs/by-name/md/mdbook-d2/package.nix @@ -7,17 +7,17 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-d2"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "danieleades"; repo = "mdbook-d2"; rev = "v${version}"; - hash = "sha256-5/vChjSYMlCcieA10jncoXZw9Gpeol+Am7mUo78Zqho="; + hash = "sha256-d3PKwvTpOpqp6J1i53T7FYSEGO+yuL+wtpAwNjrPZcQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-MxeSgSwBOQ5Eb/2mPtacNNX8MBSToon31egrbfxZjZg="; + cargoHash = "sha256-nV0VBbAivS6Qj62H1Uk/alDEPnryRmEfY3LZIIvDEKE="; doCheck = false; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ From 63446d92c6c0b8df396265c3fac4f519464cca3c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 01:42:06 +0000 Subject: [PATCH 0850/2168] nvidia_oc: 0.1.16 -> 0.1.18 --- pkgs/by-name/nv/nvidia_oc/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/nv/nvidia_oc/package.nix b/pkgs/by-name/nv/nvidia_oc/package.nix index 1d6ca57286ae..4b0177161dc3 100644 --- a/pkgs/by-name/nv/nvidia_oc/package.nix +++ b/pkgs/by-name/nv/nvidia_oc/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "nvidia_oc"; - version = "0.1.16"; + version = "0.1.18"; src = fetchFromGitHub { owner = "Dreaming-Codes"; repo = "nvidia_oc"; tag = version; - hash = "sha256-9FNulyXLHDQ/FQBAGaINRW0F3KZdRcgmDHn7vQX2L2U="; + hash = "sha256-4dXdOwo7RidYEwKkoJp3+IvkGcXuS+irRbOlsfOKqIQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-DuuHqBhL25ghgcYxcOtWRArUqL9+c3d5mBrAcWTAFW8="; + cargoHash = "sha256-CxiKkm4NyYtKqSf/FtE7Pp3myCYxMMaV0h3Khd6HgTY="; nativeBuildInputs = [ autoAddDriverRunpath From b5404e7f51a546c9c805cdf79c33c0e3eaa097d9 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Sun, 9 Feb 2025 17:48:20 -0800 Subject: [PATCH 0851/2168] termusic: fix build --- pkgs/by-name/te/termusic/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/te/termusic/package.nix b/pkgs/by-name/te/termusic/package.nix index 1557d1d407c3..a2465c9c5516 100644 --- a/pkgs/by-name/te/termusic/package.nix +++ b/pkgs/by-name/te/termusic/package.nix @@ -41,9 +41,9 @@ rustPlatform.buildRustPackage rec { ]; postPatch = '' - pushd $cargoDepsCopy/stream-download + pushd $cargoDepsCopy/stream-download-0.6.0 oldHash=$(sha256sum src/lib.rs | cut -d " " -f 1) - substituteInPlace $cargoDepsCopy/stream-download/src/lib.rs \ + substituteInPlace $cargoDepsCopy/stream-download-0.6.0/src/lib.rs \ --replace-warn '#![doc = include_str!("../README.md")]' "" substituteInPlace .cargo-checksum.json \ --replace-warn $oldHash $(sha256sum src/lib.rs | cut -d " " -f 1) From 6647b53cd6f970b7b51d3f92fa10bb28b81c8163 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 02:09:25 +0000 Subject: [PATCH 0852/2168] cargo-mutants: 25.0.0 -> 25.0.1 --- pkgs/by-name/ca/cargo-mutants/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-mutants/package.nix b/pkgs/by-name/ca/cargo-mutants/package.nix index 04ffbf2ff0d6..f97aa1bdf8a7 100644 --- a/pkgs/by-name/ca/cargo-mutants/package.nix +++ b/pkgs/by-name/ca/cargo-mutants/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-mutants"; - version = "25.0.0"; + version = "25.0.1"; src = fetchFromGitHub { owner = "sourcefrog"; repo = "cargo-mutants"; rev = "v${version}"; - hash = "sha256-JwRMXFXYXPg/grFqeGIcWpDPI5/wFIldx4ORE8ODyk8="; + hash = "sha256-aTGuCkPk1GYUlRXCdNIy94d5zHxUPpNNFN4aapf8s0U="; }; useFetchCargoVendor = true; - cargoHash = "sha256-K3O5o69ogkCFs6sjTPLLRq2CmBaH2eeFXBjvvwBBhQE="; + cargoHash = "sha256-Vrh8N29EWIwVgAR6aEQcnkbrs/+llCx+GfiV0WlZOqw="; # too many tests require internet access doCheck = false; From 6399f3b22d6f7ed0cdc4d4b6fe9e43fd87d6edef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 02:14:53 +0000 Subject: [PATCH 0853/2168] cargo-temp: 0.3.1 -> 0.3.2 --- pkgs/by-name/ca/cargo-temp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-temp/package.nix b/pkgs/by-name/ca/cargo-temp/package.nix index 816b000c9432..e43d0a1903d5 100644 --- a/pkgs/by-name/ca/cargo-temp/package.nix +++ b/pkgs/by-name/ca/cargo-temp/package.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-temp"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "yozhgoor"; repo = "cargo-temp"; rev = "v${version}"; - hash = "sha256-fy4bG+UoN/51hiveYecl3ciJPV1g8/fC2dTFnUJZqAY="; + hash = "sha256-ejcqgfnvIGUhidhJpAh6uJrm8oFb8rS98wRI3iQBP9I="; }; useFetchCargoVendor = true; - cargoHash = "sha256-E7msh553ijldpVI2OJ6PL0Wp+Z4eLbv8Oexl7NtBdYc="; + cargoHash = "sha256-lfahdQtv35VH9XTApcu/GIR2QOqXKlb8Gpy6X58LmpA="; meta = with lib; { description = "CLI tool that allow you to create a temporary new Rust project using cargo with already installed dependencies"; From c62d1dce962ec2d9adbf557f64e6ee453bca40c6 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Mon, 10 Feb 2025 05:58:27 +0300 Subject: [PATCH 0854/2168] proton-ge-bin: GE-Proton9-24 -> GE-Proton9-25 --- pkgs/by-name/pr/proton-ge-bin/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/proton-ge-bin/package.nix b/pkgs/by-name/pr/proton-ge-bin/package.nix index afb215ab43ba..ddf4afe56219 100644 --- a/pkgs/by-name/pr/proton-ge-bin/package.nix +++ b/pkgs/by-name/pr/proton-ge-bin/package.nix @@ -9,11 +9,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "proton-ge-bin"; - version = "GE-Proton9-24"; + version = "GE-Proton9-25"; src = fetchzip { url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz"; - hash = "sha256-L0GkzpSn4f6dLDOm2iDJr8D1DINTHNW9Kkn1xFTuqfo="; + hash = "sha256-cMN/U09NAsghx0A8dy+mjuvSFZxgvETmkigeOLskiQs="; }; dontUnpack = true; From 310e3e7aea0df740ff5d7bf28ffdd84350290f04 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 03:02:39 +0000 Subject: [PATCH 0855/2168] prometheus-snmp-exporter: 0.26.0 -> 0.28.0 --- pkgs/servers/monitoring/prometheus/snmp-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix index b4f395c18361..7c2ad7f12dd6 100644 --- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "snmp_exporter"; - version = "0.26.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "prometheus"; repo = "snmp_exporter"; rev = "v${version}"; - sha256 = "sha256-6UTvzcN0BB4uLfyZxr8CkmlMAjggYRV/EmQPRD7ZqmY="; + sha256 = "sha256-/uNmY4xON9VFXEi4njAC5nD1RVWn+nUr1oQnt9w8pmQ="; }; - vendorHash = "sha256-0WGiVM4HTgcVkCxfjW1c+z1wlf/ay5BXZXuGRPS4guc="; + vendorHash = "sha256-WSqkuRzeSctO+modNHBGBD3HvhrSXFlmsdfB/3lS5sw="; buildInputs = [ net-snmp ]; From 29aae62ed1c548953b44bc0a929664a7d347a3ff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 03:05:48 +0000 Subject: [PATCH 0856/2168] python312Packages.llama-index-graph-stores-neptune: 0.3.0 -> 0.3.1 --- .../llama-index-graph-stores-neptune/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-graph-stores-neptune/default.nix b/pkgs/development/python-modules/llama-index-graph-stores-neptune/default.nix index 741ce168bfdd..d4ffe45bdce5 100644 --- a/pkgs/development/python-modules/llama-index-graph-stores-neptune/default.nix +++ b/pkgs/development/python-modules/llama-index-graph-stores-neptune/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-graph-stores-neptune"; - version = "0.3.0"; + version = "0.3.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_graph_stores_neptune"; inherit version; - hash = "sha256-RWrFrV35djxEF9Nfh5Fz5VxQA7Jon7cmxDJXigx2dmQ="; + hash = "sha256-wZRjK/ZFh5lVxya1q0vFvv+VnvGLNljMSvSeflR8Z7I="; }; build-system = [ poetry-core ]; From 09331cc1cc4e8939054ff091f93d4ef0c6c4e044 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 03:27:30 +0000 Subject: [PATCH 0857/2168] zoxide: 0.9.6 -> 0.9.7 --- pkgs/by-name/zo/zoxide/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/zo/zoxide/package.nix b/pkgs/by-name/zo/zoxide/package.nix index 78ff39b89a46..140990537964 100644 --- a/pkgs/by-name/zo/zoxide/package.nix +++ b/pkgs/by-name/zo/zoxide/package.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "zoxide"; - version = "0.9.6"; + version = "0.9.7"; src = fetchFromGitHub { owner = "ajeetdsouza"; repo = "zoxide"; tag = "v${version}"; - hash = "sha256-3XC5K4OlituoFMPN9yJkYi+tkH6M0KK5jVAGdr/GLd0="; + hash = "sha256-+QZpLMlHOZdbKLFYOUOIRZHvIsbMDdstj9oGzyEGVxk="; }; nativeBuildInputs = [ installShellFiles ]; @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { ''; useFetchCargoVendor = true; - cargoHash = "sha256-+Vip7MjVV23dZdD8GxmNFrfnsjmucohMDUZE9vbpG5w="; + cargoHash = "sha256-uqIL8KTrgWzzzyoPR9gctyh0Rf7WQpTGqXow2/xFvCU="; postInstall = '' installManPage man/man*/* From 4d20fd65f1c02fc40ec62b5527f26c9406191e37 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 03:30:18 +0000 Subject: [PATCH 0858/2168] ytdownloader: 3.18.5 -> 3.19.0 --- pkgs/by-name/yt/ytdownloader/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/yt/ytdownloader/package.nix b/pkgs/by-name/yt/ytdownloader/package.nix index 0d831a9b011a..9b9d0e34ca8c 100644 --- a/pkgs/by-name/yt/ytdownloader/package.nix +++ b/pkgs/by-name/yt/ytdownloader/package.nix @@ -12,16 +12,16 @@ buildNpmPackage rec { pname = "ytDownloader"; - version = "3.18.5"; + version = "3.19.0"; src = fetchFromGitHub { owner = "aandrew-me"; repo = "ytDownloader"; tag = "v${version}"; - hash = "sha256-914sEFUVwiHMXwnwZjdeSQmeSPRREeoihLKYYTTKAcs="; + hash = "sha256-Oj462x1oyhaLFbVNr90hKmg0S+BZXUv1DyNdxsc2L7Y="; }; - npmDepsHash = "sha256-zBFRzVBmKAncZFTFa0hhv5BaE0rsAv9IdezZBNd5J2E="; + npmDepsHash = "sha256-ZJdPfNndYOWzvJpgra16/tCuWTvPLd4ZhSFualJB00E="; nativeBuildInputs = [ copyDesktopItems From 62a3d78cb73556bd532024ed3b0c148924618496 Mon Sep 17 00:00:00 2001 From: wattmto Date: Mon, 10 Feb 2025 13:29:15 +0900 Subject: [PATCH 0859/2168] chatgpt: init at 1.2025.014 --- pkgs/by-name/ch/chatgpt/package.nix | 48 +++++++++++++++++++++++++++++ pkgs/by-name/ch/chatgpt/source.nix | 7 +++++ pkgs/by-name/ch/chatgpt/update.sh | 21 +++++++++++++ 3 files changed, 76 insertions(+) create mode 100644 pkgs/by-name/ch/chatgpt/package.nix create mode 100644 pkgs/by-name/ch/chatgpt/source.nix create mode 100755 pkgs/by-name/ch/chatgpt/update.sh diff --git a/pkgs/by-name/ch/chatgpt/package.nix b/pkgs/by-name/ch/chatgpt/package.nix new file mode 100644 index 000000000000..0dc77de11805 --- /dev/null +++ b/pkgs/by-name/ch/chatgpt/package.nix @@ -0,0 +1,48 @@ +{ + lib, + stdenvNoCC, + darwin, + fetchurl, + _7zz, + undmg, +}: + +let + source = import ./source.nix; +in +stdenvNoCC.mkDerivation { + pname = "chatgpt"; + inherit (source) version; + + src = fetchurl source.src; + + nativeBuildInputs = [ + undmg + ]; + + sourceRoot = "."; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/Applications" + mkdir -p "$out/bin" + cp -a ChatGPT.app "$out/Applications" + ln -s "$out/Applications/ChatGPT.app/Contents/MacOS/ChatGPT" "$out/bin/ChatGPT" + + runHook postInstall + ''; + + passthru.updateScript = ./update.sh; + + meta = { + description = "Desktop application for ChatGPT"; + homepage = "https://openai.com/chatgpt/desktop/"; + changelog = "https://help.openai.com/en/articles/9703738-macos-app-release-notes"; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ wattmto ]; + platforms = lib.platforms.darwin; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + mainProgram = "ChatGPT"; + }; +} diff --git a/pkgs/by-name/ch/chatgpt/source.nix b/pkgs/by-name/ch/chatgpt/source.nix new file mode 100644 index 000000000000..e4d400134ddf --- /dev/null +++ b/pkgs/by-name/ch/chatgpt/source.nix @@ -0,0 +1,7 @@ +{ + version = "1.2025.014"; + src = { + url = "https://persistent.oaistatic.com/sidekick/public/ChatGPT_Desktop_public_1.2025.014_1737150122.dmg"; + hash = "sha256-NxCkrsPaptYNTZ+urkJqYeC4a0nGaEOFO/7SQL1Jmpc="; + }; +} diff --git a/pkgs/by-name/ch/chatgpt/update.sh b/pkgs/by-name/ch/chatgpt/update.sh new file mode 100755 index 000000000000..732c9ff8f6ee --- /dev/null +++ b/pkgs/by-name/ch/chatgpt/update.sh @@ -0,0 +1,21 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl libxml2 + +XML_URL="https://persistent.oaistatic.com/sidekick/public/sparkle_public_appcast.xml" + +XML_DATA=$(curl -s $XML_URL) + +LATEST_VERSION=$(echo "$XML_DATA" | xmllint --xpath '/rss/channel/item[1]/*[local-name()="shortVersionString"]/text()' -) +DOWNLOAD_URL=$(echo "$XML_DATA" | xmllint --xpath 'string(//item[1]/enclosure/@url)' -) + +HASH=$(nix-prefetch-url $DOWNLOAD_URL | xargs nix hash convert --hash-algo sha256) + +cat > source.nix << _EOF_ +{ + version = "$LATEST_VERSION"; + src = fetchurl { + url = "$DOWNLOAD_URL"; + sha256 = "$HASH"; + }; +} +_EOF_ From 6eba2ef25a17bd11bd3aeea237c77e05d8677c94 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Feb 2025 23:49:04 +0000 Subject: [PATCH 0860/2168] jenkins: 2.479.3 -> 2.492.1 --- pkgs/by-name/je/jenkins/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/je/jenkins/package.nix b/pkgs/by-name/je/jenkins/package.nix index 28df57aae22a..13854ecb5bd4 100644 --- a/pkgs/by-name/je/jenkins/package.nix +++ b/pkgs/by-name/je/jenkins/package.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.479.3"; + version = "2.492.1"; src = fetchurl { url = "https://get.jenkins.io/war-stable/${version}/jenkins.war"; - hash = "sha256-MEyFkoYNWwPewnyWteiexY/HRPeBYcU/ejRKC/fOkgM="; + hash = "sha256-wFNPna+QJa5AVOwwUYsbifxdl7Mvr9tVa5s6YOn//8g="; }; nativeBuildInputs = [ makeWrapper ]; From d0431c9884cb73b8c9779eea5ec63900e3d167ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 04:49:49 +0000 Subject: [PATCH 0861/2168] websurfx: 1.23.0 -> 1.23.6 --- pkgs/by-name/we/websurfx/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/we/websurfx/package.nix b/pkgs/by-name/we/websurfx/package.nix index ebe1ce4ac311..5c76c9d13462 100644 --- a/pkgs/by-name/we/websurfx/package.nix +++ b/pkgs/by-name/we/websurfx/package.nix @@ -6,7 +6,7 @@ pkg-config, }: let - version = "1.23.0"; + version = "1.23.6"; in rustPlatform.buildRustPackage { pname = "websurfx"; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage { owner = "neon-mmd"; repo = "websurfx"; tag = "v${version}"; - hash = "sha256-+29Q963+CdYgy8JmhZwG22CElliYpFyEtOj8pHZj8XY="; + hash = "sha256-tTwY+cmGUmqaTBHjZl/MA8wVBH/2CpoTcZZitZEKxJo="; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage { useFetchCargoVendor = true; - cargoHash = "sha256-16u9pb8+qjoQPK5xipJAFCMIpebJRTiGtv1gFn3xyj8="; + cargoHash = "sha256-/cfpj1/PvJ6lkVyfdzrMXiG1d3Fg5p6eui3QuRlrnNw="; postPatch = '' substituteInPlace src/handler/mod.rs \ From 151acd07537ed8866d7dfd043f564a8c1cb7f24e Mon Sep 17 00:00:00 2001 From: Qiming Chu Date: Mon, 10 Feb 2025 13:07:38 +0800 Subject: [PATCH 0862/2168] circt: 1.104.0 -> 1.105.0 Signed-off-by: Qiming Chu --- pkgs/by-name/ci/circt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ci/circt/package.nix b/pkgs/by-name/ci/circt/package.nix index 8c54990b6ba8..eacf44702b47 100644 --- a/pkgs/by-name/ci/circt/package.nix +++ b/pkgs/by-name/ci/circt/package.nix @@ -19,12 +19,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.104.0"; + version = "1.105.0"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - hash = "sha256-r5UYoeqrXSWvWtR0IgjrH67RIgul3vpNoN+4lWlGrHw="; + hash = "sha256-1LnCvXcGDQ1pBEux2yX6crPaWdcoWbLHFALtjoGJGL0="; fetchSubmodules = true; }; From 4dc9c3973f4905238a540b4d52e1d5525c47c837 Mon Sep 17 00:00:00 2001 From: Greg Pfeil Date: Thu, 6 Feb 2025 07:38:29 -0700 Subject: [PATCH 0863/2168] mas: 1.8.6 -> 1.9.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Notably, this switches back to the .pkg from the tarball, since mas-cli/mas#452 was fixed about three years ago (just after this package was last bumped) and tarballs are no longer published. Also, the Bash completion file isn’t included in the pkg (but it’s still in the repo). Here are the intervening release notes: - https://github.com/mas-cli/mas/releases/tag/v1.8.7 - https://github.com/mas-cli/mas/releases/tag/v1.8.8 - https://github.com/mas-cli/mas/releases/tag/v1.9.0 And the list of (almost 600) commits since the version currently in Nixpkgs: https://github.com/mas-cli/mas/compare/v1.8.6...v1.9.0 --- pkgs/by-name/ma/mas/package.nix | 35 ++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ma/mas/package.nix b/pkgs/by-name/ma/mas/package.nix index 1926bf254742..db4fa214b380 100644 --- a/pkgs/by-name/ma/mas/package.nix +++ b/pkgs/by-name/ma/mas/package.nix @@ -2,27 +2,44 @@ lib, stdenvNoCC, fetchurl, - installShellFiles, + libarchive, + p7zip, testers, mas, }: stdenvNoCC.mkDerivation rec { pname = "mas"; - version = "1.8.6"; + version = "1.9.0"; src = fetchurl { - # Use the tarball until https://github.com/mas-cli/mas/issues/452 is fixed. - # Even though it looks like an OS/arch specific build it is actually a universal binary. - url = "https://github.com/mas-cli/mas/releases/download/v${version}/mas-${version}.monterey.bottle.tar.gz"; - sha256 = "0q4skdhymgn5xrwafyisfshx327faia682yv83mf68r61m2jl10d"; + url = "https://github.com/mas-cli/mas/releases/download/v${version}/mas-${version}.pkg"; + hash = "sha256-MiSrCHLby3diTAzDPCYX1ZwdmzcHwOx/UJuWrlRJe54="; }; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + libarchive + p7zip + ]; + + unpackPhase = '' + runHook preUnpack + + 7z x $src + bsdtar -xf Payload~ + + runHook postUnpack + ''; + + dontBuild = true; installPhase = '' - install -D './${version}/bin/mas' "$out/bin/mas" - installShellCompletion --cmd mas --bash './${version}/etc/bash_completion.d/mas' + runHook preInstall + + mkdir -p $out/bin + cp mas $out/bin + + runHook postInstall ''; passthru.tests = { From cb8300fbae92c8fe802f979b66bcb341e33c6f56 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Thu, 30 Jan 2025 23:27:49 +0900 Subject: [PATCH 0864/2168] bfg-repo-cleaner: prefer versionCheckHook rather than testers.testVersion https://github.com/NixOS/nixpkgs/blob/bd352cd67834c983d69adf4080d225dbe28f99ba/doc/stdenv/passthru.chapter.md?plain=1#L84 --- pkgs/by-name/bf/bfg-repo-cleaner/package.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/bf/bfg-repo-cleaner/package.nix b/pkgs/by-name/bf/bfg-repo-cleaner/package.nix index d2044dd34c78..f7b73362d43e 100644 --- a/pkgs/by-name/bf/bfg-repo-cleaner/package.nix +++ b/pkgs/by-name/bf/bfg-repo-cleaner/package.nix @@ -4,8 +4,7 @@ fetchurl, jre, makeWrapper, - testers, - bfg-repo-cleaner, + versionCheckHook, }: stdenv.mkDerivation rec { @@ -31,9 +30,12 @@ stdenv.mkDerivation rec { makeWrapper "${jre}/bin/java" $out/bin/bfg --add-flags "-cp $out/share/java/$jarName com.madgag.git.bfg.cli.Main" ''; - passthru.tests.version = testers.testVersion { - package = bfg-repo-cleaner; - }; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; + versionCheckProgramArg = [ "--version" ]; meta = with lib; { homepage = "https://rtyley.github.io/bfg-repo-cleaner/"; From 82d95f18fdcbde3640402db949125c0ba1a430a6 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Thu, 30 Jan 2025 23:31:26 +0900 Subject: [PATCH 0865/2168] bfg-repo-cleaner: 1.14.0 -> 1.15.0 Diff: https://github.com/rtyley/bfg-repo-cleaner/compare/v1.14.0...v1.15.0 --- pkgs/by-name/bf/bfg-repo-cleaner/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bf/bfg-repo-cleaner/package.nix b/pkgs/by-name/bf/bfg-repo-cleaner/package.nix index f7b73362d43e..bf6c2ce7eafc 100644 --- a/pkgs/by-name/bf/bfg-repo-cleaner/package.nix +++ b/pkgs/by-name/bf/bfg-repo-cleaner/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "bfg-repo-cleaner"; - version = "1.14.0"; + version = "1.15.0"; jarName = "bfg-${version}.jar"; src = fetchurl { url = "mirror://maven/com/madgag/bfg/${version}/${jarName}"; - hash = "sha256-GnXpOQVB9LVdnAElazYbgVweCiY+L7PQcrVcKRHq0Lc="; + hash = "sha256-3+KIWtwpFjeQk/AqgBgSAFNoVsmph78hxJLkUq3v73o="; }; nativeBuildInputs = [ makeWrapper ]; From 16398cdcd42a7dd09586beaed0c25a41feb866c5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 05:34:56 +0000 Subject: [PATCH 0866/2168] python312Packages.deepsearch-toolkit: 2.0.0 -> 2.0.1 --- .../development/python-modules/deepsearch-toolkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/deepsearch-toolkit/default.nix b/pkgs/development/python-modules/deepsearch-toolkit/default.nix index ba2ca3a324d7..d1b25adba3d5 100644 --- a/pkgs/development/python-modules/deepsearch-toolkit/default.nix +++ b/pkgs/development/python-modules/deepsearch-toolkit/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "deepsearch-toolkit"; - version = "2.0.0"; + version = "2.0.1"; pyproject = true; src = fetchFromGitHub { owner = "DS4SD"; repo = "deepsearch-toolkit"; tag = "v${version}"; - hash = "sha256-ObVil+0d5RIYwkz7OHJIziD3gANh9ZGN+pY9pqhY+Yg="; + hash = "sha256-nrz9pvyA5gPIaKt6CsJOB9cLy3sXiWW5e1Rk4vtNIY8="; }; build-system = [ From f780db4505588b541fd472cd1c7ed9cbd9c4b469 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Mon, 6 Jan 2025 04:19:32 +0100 Subject: [PATCH 0867/2168] ocamlPackages.magic: 0.7.3 -> 0.7.4, remove myself from maintainer --- pkgs/development/ocaml-modules/magic/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/magic/default.nix b/pkgs/development/ocaml-modules/magic/default.nix index a6bd0eb2a033..da5415453fc9 100644 --- a/pkgs/development/ocaml-modules/magic/default.nix +++ b/pkgs/development/ocaml-modules/magic/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "magic"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "Chris00"; repo = "ocaml-magic"; - rev = "510c473d222a3d3d900b8ae1892d13e0d49d08be"; # no tags in repo - sha256 = "0qks3v51xvzxhidai414mbszxhcl8wg8g7zxd04qi260433g77yg"; + tag = "v${version}"; + sha256 = "sha256-rsBMx68UDqmVVsyeZCxIS97A/0JCBM/JOgh60ly1uSs="; }; createFindlibDestdir = true; @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Chris00/ocaml-magic"; description = "Bindings for libmagic"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ dandellion ]; + maintainers = with maintainers; [ ]; }; } From 62cd5d5f7e6a1f682cfa42ae467b370310b04c2c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 06:55:35 +0000 Subject: [PATCH 0868/2168] python312Packages.microsoft-kiota-serialization-multipart: 1.9.1 -> 1.9.2 --- .../microsoft-kiota-serialization-multipart/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-multipart/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-multipart/default.nix index 83181b9fd692..784eea1362e2 100644 --- a/pkgs/development/python-modules/microsoft-kiota-serialization-multipart/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-serialization-multipart/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "microsoft-kiota-serialization-multipart"; - version = "1.9.1"; + version = "1.9.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "microsoft"; repo = "kiota-python"; - tag = "microsoft-kiota-serialization-multipart-v${version}"; - hash = "sha256-ESRnI8prXG1h5H5RVD4eOQ1sQYSEMMLVHSk8yhzFGVw="; + tag = "microsoft-kiota-serialization-text-v${version}"; + hash = "sha256-ribVfvKmDMxGmeqj30SDcnbNGdRBfs1DmqQGXP3EHCk="; }; sourceRoot = "source/packages/serialization/multipart/"; @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Multipart serialization implementation for Kiota clients in Python"; homepage = "https://github.com/microsoft/kiota-python/tree/main/packages/serialization/multipart"; - changelog = "https://github.com/microsoft/kiota-python/releases/tag/microsoft-kiota-serialization-multipart-v${version}"; + changelog = "https://github.com/microsoft/kiota-python/releases/tag/microsoft-kiota-serialization-multipart-${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From 4f630e0e92150cbdc1703aed4e8c46cc5a2f55c4 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Mon, 10 Feb 2025 08:32:14 +0100 Subject: [PATCH 0869/2168] python3Packages.rioxarray: drop patch applied upstream --- pkgs/development/python-modules/rioxarray/default.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/development/python-modules/rioxarray/default.nix b/pkgs/development/python-modules/rioxarray/default.nix index 21000c1241b0..483598a8d7f6 100644 --- a/pkgs/development/python-modules/rioxarray/default.nix +++ b/pkgs/development/python-modules/rioxarray/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, - fetchpatch, # build-system setuptools, @@ -33,14 +32,6 @@ buildPythonPackage rec { hash = "sha256-HNtMLY83e6MQakIlmsJohmhjDWiM5/hqq25qSY1dPBw="; }; - patches = [ - # https://github.com/corteva/rioxarray/issues/836 - (fetchpatch { - url = "https://github.com/corteva/rioxarray/commit/6294b7468587b8c243ee4f561a90ca8de90ea0f1.patch"; - hash = "sha256-0IvDAr17ymMN1J2vC1U3z/2N1Np1RaRjCAODZthQz8g="; - }) - ]; - build-system = [ setuptools ]; dependencies = [ From 605a7ee46b79d4beecf690906c1d816b5a8cd2c0 Mon Sep 17 00:00:00 2001 From: Ovyerus Date: Thu, 19 Dec 2024 11:10:25 +1100 Subject: [PATCH 0870/2168] qimgv: 1.0.3-alpha -> 1.0.3-unstable-2024-10-11 --- pkgs/applications/graphics/qimgv/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/qimgv/default.nix b/pkgs/applications/graphics/qimgv/default.nix index 6bd3fabee5e1..338bd5ff3f14 100644 --- a/pkgs/applications/graphics/qimgv/default.nix +++ b/pkgs/applications/graphics/qimgv/default.nix @@ -12,17 +12,18 @@ qtbase, qtimageformats, qtsvg, + qttools, }: mkDerivation rec { pname = "qimgv"; - version = "1.0.3-alpha"; + version = "1.0.3-unstable-2024-10-11"; src = fetchFromGitHub { owner = "easymodo"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-fHMSo8zlOl9Lt8nYwClUzON4TPB9Ogwven+TidsesxY="; + rev = "a4d475fae07847be7c106cb628fb97dad51ab920"; + sha256 = "sha256-iURUJiPe8hbCnpaf6lk8OVSzVqrJKGab889yOic5yLI="; }; nativeBuildInputs = [ @@ -41,6 +42,7 @@ mkDerivation rec { qtbase qtimageformats qtsvg + qttools ]; postPatch = '' From 4758c02fc271af4cac017752cbcc7da8d8ee0184 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 10 Feb 2025 00:46:00 +0100 Subject: [PATCH 0871/2168] television: 0.10.4 -> 0.10.6 Diff: https://github.com/alexpasmantier/television/compare/refs/tags/0.10.4...0.10.6 Changelog: https://github.com/alexpasmantier/television/releases/tag/0.10.6 --- pkgs/by-name/te/television/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/television/package.nix b/pkgs/by-name/te/television/package.nix index 2f070b840487..6b49018b9931 100644 --- a/pkgs/by-name/te/television/package.nix +++ b/pkgs/by-name/te/television/package.nix @@ -8,17 +8,17 @@ }: rustPlatform.buildRustPackage rec { pname = "television"; - version = "0.10.4"; + version = "0.10.6"; src = fetchFromGitHub { owner = "alexpasmantier"; repo = "television"; tag = version; - hash = "sha256-ja3Xqp8nRTQnf0K1okHSBPcqQe/m8DqH7UWbdohxlvM="; + hash = "sha256-O5BV3+zOUnDdviA8tCGxYmPTTBfge5+BKolIgJSqgOI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-eplkAaNgoAxMLK3BG0EvNLYT1T3vJpHpbuGvwooegeI="; + cargoHash = "sha256-4ApdtAuVQNeBBgBhXpp/N3CMLTZKPJnI3vUiAQUddyg="; passthru = { tests.version = testers.testVersion { From d2636f9978302a5aaa8b7adcc8bb45257b649f32 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 6 Feb 2025 15:18:45 +0100 Subject: [PATCH 0872/2168] spatialite_tools: adopt package under geospatial team --- pkgs/by-name/sp/spatialite_tools/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/sp/spatialite_tools/package.nix b/pkgs/by-name/sp/spatialite_tools/package.nix index 03deae8f639c..958c5f845ac5 100644 --- a/pkgs/by-name/sp/spatialite_tools/package.nix +++ b/pkgs/by-name/sp/spatialite_tools/package.nix @@ -58,16 +58,16 @@ stdenv.mkDerivation rec { version = "${libspatialite.version}"; }; - meta = with lib; { + meta = { description = "Complete sqlite3-compatible CLI front-end for libspatialite"; homepage = "https://www.gaia-gis.it/fossil/spatialite-tools"; - license = with licenses; [ + license = with lib.licenses; [ mpl11 gpl2Plus lgpl21Plus ]; - platforms = platforms.unix; - maintainers = with maintainers; [ dotlambda ]; + platforms = lib.platforms.unix; + maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ dotlambda ]); mainProgram = "spatialite_tool"; }; } From c59f85e660f352570910c4d1ae31c164a9a63c60 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 6 Feb 2025 15:31:09 +0100 Subject: [PATCH 0873/2168] spatialite_tools: rename package to spatialite-tools --- .../sp/{spatialite_tools => spatialite-tools}/package.nix | 4 ++-- pkgs/top-level/aliases.nix | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) rename pkgs/by-name/sp/{spatialite_tools => spatialite-tools}/package.nix (96%) diff --git a/pkgs/by-name/sp/spatialite_tools/package.nix b/pkgs/by-name/sp/spatialite-tools/package.nix similarity index 96% rename from pkgs/by-name/sp/spatialite_tools/package.nix rename to pkgs/by-name/sp/spatialite-tools/package.nix index 958c5f845ac5..b19c2f08a648 100644 --- a/pkgs/by-name/sp/spatialite_tools/package.nix +++ b/pkgs/by-name/sp/spatialite-tools/package.nix @@ -15,7 +15,7 @@ readosm, sqlite, testers, - spatialite_tools, + spatialite-tools, }: stdenv.mkDerivation rec { @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru.tests.version = testers.testVersion { - package = spatialite_tools; + package = spatialite-tools; command = "! spatialite_tool --version"; version = "${libspatialite.version}"; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c60b89cd4649..68e65cd3d308 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1287,6 +1287,7 @@ mapAliases { SPAdes = spades; # Added 2024-06-12 spark2014 = gnatprove; # Added 2024-02-25 spatialite_gui = throw "spatialite_gui has been renamed to spatialite-gui"; # Added 2025-01-12 + spatialite_tools = throw "spatialite_tools has been renamed to spatialite-tools"; # Added 2025-02-06 # Added 2020-02-10 sourceHanSansPackages = { From 5bb476ab6a291a4ce61a6437f06e357d437828b2 Mon Sep 17 00:00:00 2001 From: ZarredFelicite Date: Mon, 10 Feb 2025 19:04:27 +1100 Subject: [PATCH 0874/2168] maintainers: add zsenai --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index dda73802e1e0..0b547a3f7ba2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -26058,6 +26058,12 @@ githubId = 8100652; name = "David Mell"; }; + zsenai = { + email = "zarred.f@gmail.com"; + github = "ZarredFelicite"; + githubId = 54928291; + name = "Zarred Felicite"; + }; zshipko = { email = "zachshipko@gmail.com"; github = "zshipko"; From 6fb189919b40a1bb55be3d30062361d968627c37 Mon Sep 17 00:00:00 2001 From: ZarredFelicite Date: Mon, 10 Feb 2025 19:05:34 +1100 Subject: [PATCH 0875/2168] lowfi: init at 1.5.6 --- pkgs/by-name/lo/lowfi/package.nix | 47 +++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 pkgs/by-name/lo/lowfi/package.nix diff --git a/pkgs/by-name/lo/lowfi/package.nix b/pkgs/by-name/lo/lowfi/package.nix new file mode 100644 index 000000000000..fb5988e05ddd --- /dev/null +++ b/pkgs/by-name/lo/lowfi/package.nix @@ -0,0 +1,47 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, + stdenv, + darwin, + alsa-lib, +}: + +rustPlatform.buildRustPackage rec { + pname = "lowfi"; + version = "1.5.6"; + + src = fetchFromGitHub { + owner = "talwat"; + repo = "lowfi"; + tag = version; + hash = "sha256-pfvTOoWsXukZTfev9+Ifcp3YYIqtYZgmEVPHuqD4IsM="; + }; + + cargoHash = "sha256-TGj3xH18xanhA25r+gTtLPa7KQKS9WEyGl412pnFZdw="; + + buildFeatures = [ "mpris" ]; + + nativeBuildInputs = [ + pkg-config + rustPlatform.bindgenHook + ]; + + buildInputs = + [ + openssl + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + ]; + + meta = { + description = "Extremely simple lofi player"; + homepage = "https://github.com/talwat/lowfi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ zsenai ]; + mainProgram = "lowfi"; + }; +} From d09e16b1e438291629a647bb43a925a1f6af8e05 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 10 Feb 2025 00:20:02 +0100 Subject: [PATCH 0876/2168] python313Packages.bring-api: 1.0.1 -> 1.0.2 Diff: https://github.com/miaucl/bring-api/compare/refs/tags/1.0.1...1.0.2 Changelog: https://github.com/miaucl/bring-api/blob/1.0.2/CHANGELOG.md --- pkgs/development/python-modules/bring-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bring-api/default.nix b/pkgs/development/python-modules/bring-api/default.nix index ef749574df9e..51157da219da 100644 --- a/pkgs/development/python-modules/bring-api/default.nix +++ b/pkgs/development/python-modules/bring-api/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "bring-api"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "miaucl"; repo = "bring-api"; tag = version; - hash = "sha256-ohWemgZhnUUz5O40nIlrTN1jEUDQvGGLNvqXNbYYAaM="; + hash = "sha256-GBRPC4oTCTy8MdGNsPYrgB8Lji0ojRL3Z4ELTe543PY="; }; build-system = [ setuptools ]; From 4f0353c207a84eef20142adeeb2431401eb7acbe Mon Sep 17 00:00:00 2001 From: Moritz Sanft <58110325+msanft@users.noreply.github.com> Date: Sun, 9 Feb 2025 12:10:07 +0100 Subject: [PATCH 0877/2168] {python3Packages.}pwndbg: remove pwndbg has very specific versioning requirements for its dependencies, such as `unicorn`. Due to the amount and complexity of the packages, it's not feasible to maintain pinned versions just for `pwndbg`, as they'd come with a massive overhead of patches and build changes that'd need to be overridden here. As `pwndbg` already provides a downstream flake with all that versioning, users should rather consume it from there. --- pkgs/by-name/pw/pwndbg/package.nix | 77 ------------------- .../python-modules/pwndbg/default.nix | 64 --------------- .../python-modules/pwntools/default.nix | 2 +- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 6 files changed, 3 insertions(+), 144 deletions(-) delete mode 100644 pkgs/by-name/pw/pwndbg/package.nix delete mode 100644 pkgs/development/python-modules/pwndbg/default.nix diff --git a/pkgs/by-name/pw/pwndbg/package.nix b/pkgs/by-name/pw/pwndbg/package.nix deleted file mode 100644 index a87f63d00451..000000000000 --- a/pkgs/by-name/pw/pwndbg/package.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ - lib, - stdenv, - python3, - makeWrapper, - gdb, -}: - -let - pwndbg-py = python3.pkgs.pwndbg; - - pythonPath = python3.pkgs.makePythonPath [ pwndbg-py ]; - - binPath = lib.makeBinPath ( - [ - python3.pkgs.pwntools # ref: https://github.com/pwndbg/pwndbg/blob/2022.12.19/pwndbg/wrappers/checksec.py#L8 - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - python3.pkgs.ropper # ref: https://github.com/pwndbg/pwndbg/blob/2022.12.19/pwndbg/commands/ropper.py#L30 - python3.pkgs.ropgadget # ref: https://github.com/pwndbg/pwndbg/blob/2022.12.19/pwndbg/commands/rop.py#L32 - ] - ); -in -stdenv.mkDerivation { - pname = "pwndbg"; - version = lib.getVersion pwndbg-py; - format = "other"; - - inherit (pwndbg-py) src; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/pwndbg - cp gdbinit.py $out/share/pwndbg/gdbinit.py - chmod +x $out/share/pwndbg/gdbinit.py - # First line is a import from future, so we need to append our imports after that - sed '2 i import sys, os - 3 i [sys.path.append(p) for p in "${pythonPath}".split(":")] - 4 i os.environ["PATH"] += ":${binPath}"' -i $out/share/pwndbg/gdbinit.py - - # Don't require an in-package venv - touch $out/share/pwndbg/.skip-venv - - makeWrapper ${gdb}/bin/gdb $out/bin/pwndbg \ - --add-flags "-q -x $out/share/pwndbg/gdbinit.py" - - runHook postInstall - ''; - - doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - - # Check if pwndbg is installed correctly - HOME=$TMPDIR LC_CTYPE=C.UTF-8 $out/bin/pwndbg -ex exit - - runHook postInstallCheck - ''; - - meta = with lib; { - description = "Exploit Development and Reverse Engineering with GDB Made Easy"; - mainProgram = "pwndbg"; - homepage = "https://github.com/pwndbg/pwndbg"; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ - mic92 - patryk4815 - msanft - ]; - # not supported on aarch64-darwin see: https://inbox.sourceware.org/gdb/3185c3b8-8a91-4beb-a5d5-9db6afb93713@Spark/ - broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; - }; -} diff --git a/pkgs/development/python-modules/pwndbg/default.nix b/pkgs/development/python-modules/pwndbg/default.nix deleted file mode 100644 index f71117d7497a..000000000000 --- a/pkgs/development/python-modules/pwndbg/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - capstone, - future, - ipython, - psutil, - pwntools, - pycparser, - pyelftools, - pygments, - requests, - rpyc, - sortedcontainers, - tabulate, - typing-extensions, - unicorn, - gdb-pt-dump, - poetry-core, -}: -buildPythonPackage rec { - pname = "pwndbg"; - version = "2024.08.29"; - pyproject = true; - - src = fetchFromGitHub { - owner = "pwndbg"; - repo = "pwndbg"; - rev = version; - hash = "sha256-mpkUEP0GBwOfbbpogupmDvCo8dkbSGy1YtH8T55rX9g="; - }; - - nativeBuildInputs = [ - poetry-core - ]; - pythonRelaxDeps = true; - - propagatedBuildInputs = [ - capstone - future - ipython - psutil - pwntools - pycparser - pyelftools - pygments - requests - rpyc - sortedcontainers - tabulate - typing-extensions - unicorn - gdb-pt-dump - ]; - - meta = { - description = "Exploit Development and Reverse Engineering with GDB Made Easy"; - homepage = "https://pwndbg.re"; - changelog = "https://github.com/pwndbg/pwndbg/releases/tag/${version}"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ msanft ]; - }; -} diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix index 1ab82189326f..4e6a06900892 100644 --- a/pkgs/development/python-modules/pwntools/default.nix +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { postPatch = '' # Upstream hardcoded the check for the command `gdb-multiarch`; - # Forcefully use the provided debugger, as `gdb` (hence `pwndbg`) is built with multiarch in `nixpkgs`. + # Forcefully use the provided debugger as `gdb`. sed -i 's/gdb-multiarch/${debuggerName}/' pwnlib/gdb.py ''; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c60b89cd4649..7aeeafa91701 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1164,6 +1164,7 @@ mapAliases { protonvpn-gui_legacy = throw "protonvpn-gui_legacy source code was removed from upstream. Use protonvpn-gui instead."; # Added 2024-10-12 proxmark3-rrg = proxmark3; # Added 2023-07-25 psensor = throw "'psensor' has been removed due to lack of maintenance upstream. Consider using 'mission-center', 'resources' or 'monitorets' instead"; # Added 2024-09-14 + pwndbg = throw "'pwndbg' has been removed due to dependency version incompatibilities that are infeasible to maintain in nixpkgs. Use the downstream flake that pwndbg provides instead: https://github.com/pwndbg/pwndbg"; # Added 2025-02-09 pyo3-pack = maturin; pypi2nix = throw "pypi2nix has been removed due to being unmaintained"; pypolicyd-spf = spf-engine; # Added 2022-10-09 diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 434e1b6f3cd9..77e2a0cd0e15 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -467,6 +467,7 @@ mapAliases ({ pur = throw "pur has been renamed to pkgs.pur"; # added 2021-11-08 pushbullet = pushbullet-py; # Added 2022-10-15 Pweave = pweave; # added 2023-02-19 + pwndbg = throw "'pwndbg' has been removed due to dependency version incompatibilities that are infeasible to maintain in nixpkgs. Use the downstream flake that pwndbg provides instead: https://github.com/pwndbg/pwndbg"; # Added 2025-02-09 pxml = throw "pxml was removed, because it was disabled on all python version since 3.8 and last updated in 2020."; # added 2024-05-13 py3to2 = throw "py3to2 is unmaintained and source is no longer available"; # added 2024-10-23 py-radix = throw "py-radix has been removed, since it abandoned"; # added 2023-07-07 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 81197ab34f04..cb54ee7887dc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11369,8 +11369,6 @@ self: super: with self; { pwlf = callPackage ../development/python-modules/pwlf { }; - pwndbg = callPackage ../development/python-modules/pwndbg { }; - pwntools = callPackage ../development/python-modules/pwntools { debugger = pkgs.gdb; }; From 53a609dd6e94eda8a08fa00db6108085ae57cb39 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 10 Feb 2025 00:18:47 +0100 Subject: [PATCH 0878/2168] python313Packages.aioshelly: 12.4.1 -> 12.4.2 Diff: https://github.com/home-assistant-libs/aioshelly/compare/refs/tags/12.4.1...12.4.2 Changelog: https://github.com/home-assistant-libs/aioshelly/releases/tag/12.4.2 --- pkgs/development/python-modules/aioshelly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index 63980cd75b45..cf635121e312 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "12.4.1"; + version = "12.4.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "aioshelly"; tag = version; - hash = "sha256-OhfLl/IJUSmzVHoYjJszxwN4RZEr5zCfxxh5T0/z2Bg="; + hash = "sha256-QwO1Vi69rj4tCSSkp/j3vtdV6zpgkgM33waDw7ZjApw="; }; build-system = [ setuptools ]; From 8493848a9ad3cd7df8e0d09394bac892e5179a26 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 10 Feb 2025 00:27:12 +0100 Subject: [PATCH 0879/2168] python313Packages.identify: 2.6.6 -> 2.6.7 Diff: https://github.com/pre-commit/identify/compare/refs/tags/v2.6.6...v2.6.7 --- pkgs/development/python-modules/identify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 284dce8d24be..4d55ae3c9a10 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "identify"; - version = "2.6.6"; + version = "2.6.7"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = "identify"; tag = "v${version}"; - hash = "sha256-yglqCpaX9RnFn4kARf5HIu7xnL2ZbUet4ukbqECTwCw="; + hash = "sha256-eIBKuYiBKJL624e717EEIegUH0Pr0gnTEk+jRfX/Yzw="; }; build-system = [ setuptools ]; From 7147ab20f316cf9e07d0369a76fbb3244545b4c4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 10 Feb 2025 00:08:12 +0100 Subject: [PATCH 0880/2168] python313Packages.msgraph-core: 1.2.0 -> 1.3.1 Diff: https://github.com/microsoftgraph/msgraph-sdk-python-core/compare/refs/tags/v1.2.0...v1.3.1 Changelog: https://github.com/microsoftgraph/msgraph-sdk-python-core/releases/tag/v1.3.1 --- pkgs/development/python-modules/msgraph-core/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/msgraph-core/default.nix b/pkgs/development/python-modules/msgraph-core/default.nix index 39c230b133fa..f9382b4bd42a 100644 --- a/pkgs/development/python-modules/msgraph-core/default.nix +++ b/pkgs/development/python-modules/msgraph-core/default.nix @@ -17,16 +17,16 @@ buildPythonPackage rec { pname = "msgraph-core"; - version = "1.2.0"; + version = "1.3.1"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "microsoftgraph"; repo = "msgraph-sdk-python-core"; tag = "v${version}"; - hash = "sha256-B0dff5ynokI49P0irgPOWvqwHKt4mKv3/+XwfbgwMF8="; + hash = "sha256-GtIKZRnjG9fZcVNcaT+B9SbCo3yxUiqKPIZ2Er0WhAU="; }; build-system = [ setuptools ]; From 91e7e82d0c7afed14309861dae89968daaa2f33b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 10 Feb 2025 00:14:16 +0100 Subject: [PATCH 0881/2168] python313Packages.msgraph-sdk: 1.18.0 -> 1.20.0 Diff: https://github.com/microsoftgraph/msgraph-sdk-python/compare/refs/tags/v1.18.0...v1.20.0 Changelog: https://github.com/microsoftgraph/msgraph-sdk-python/blob/v1.20.0/CHANGELOG.md --- pkgs/development/python-modules/msgraph-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msgraph-sdk/default.nix b/pkgs/development/python-modules/msgraph-sdk/default.nix index 1b5ae82b7db9..9473c4aae69a 100644 --- a/pkgs/development/python-modules/msgraph-sdk/default.nix +++ b/pkgs/development/python-modules/msgraph-sdk/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "msgraph-sdk"; - version = "1.18.0"; + version = "1.20.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "microsoftgraph"; repo = "msgraph-sdk-python"; tag = "v${version}"; - hash = "sha256-qYlBRXYsZ71B33iwdwgjx/NFBRUF4I/0XCnNZePo/+M="; + hash = "sha256-kZ+m75oNTh/AJ+hl8Nhulzvk62CWVOx0hJKRFyc0CSI="; }; build-system = [ flit-core ]; From 10ac6580d0b9786dba029e0fde8452fdf849c668 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=B9=82=E0=B8=97=E0=B8=AA=E0=B8=BA=E0=B8=95=E0=B8=B1?= =?UTF-8?q?=E0=B8=A5?= Date: Mon, 10 Feb 2025 15:14:46 +0700 Subject: [PATCH 0882/2168] h2o: add mainProgram --- pkgs/by-name/h2/h2o/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix index b5b838945881..c1f29fc62e27 100644 --- a/pkgs/by-name/h2/h2o/package.nix +++ b/pkgs/by-name/h2/h2o/package.nix @@ -55,6 +55,7 @@ stdenv.mkDerivation (finalAttrs: { toastal thoughtpolice ]; + mainProgram = "h2o"; platforms = platforms.linux; }; }) From 064b13dc8c36935a42e6b38726c3b66e90d6944d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 10 Feb 2025 09:25:23 +0100 Subject: [PATCH 0883/2168] python313Packages.tencentcloud-sdk-python: 3.0.1314 -> 3.0.1315 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1314...3.0.1315 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1315/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 ad8640a4af49..dc0cf2c020be 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.1314"; + version = "3.0.1315"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = version; - hash = "sha256-8fcKPSkE+yZa8wm7tuyXuWdCWgKBRsxzTpcTcCVVE1M="; + hash = "sha256-rnrBlKeBY/D2Z+EQbUVg7zT6ZAwbxOmMbkV8Ig0qj6I="; }; build-system = [ setuptools ]; From 4cc025e22e6d55d2288d5c8cf355e94aff801176 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 10 Feb 2025 09:26:45 +0100 Subject: [PATCH 0884/2168] python313Packages.publicsuffixlist: 1.0.2.20250202 -> 1.0.2.20250207 Changelog: https://github.com/ko-zu/psl/blob/v1.0.2.20250207-gha/CHANGES.md --- pkgs/development/python-modules/publicsuffixlist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 26ff52f85857..b37d8a649d23 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "1.0.2.20250202"; + version = "1.0.2.20250207"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zYOlYyR/tJvY9EouLHyVjaK8ELwRBf8cowhsfd6pilI="; + hash = "sha256-wYOFcyEO9wH0lpEtrTCCDJKb4NQJ51BnJ8dysjsZwSM="; }; build-system = [ setuptools ]; From c5cd0ac769d51c7d03c72057c787fcf5f2b78dc0 Mon Sep 17 00:00:00 2001 From: Cassie Cheung Date: Mon, 10 Feb 2025 16:30:22 +0800 Subject: [PATCH 0885/2168] roundcube: temporarily disable symlinks check At the current release upstream ships a broken symlink. Disable the check until the next release which should contain a proper .htaccess file. --- pkgs/servers/roundcube/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix index 15b6ca2544e9..f8b50b66fcea 100644 --- a/pkgs/servers/roundcube/default.nix +++ b/pkgs/servers/roundcube/default.nix @@ -21,6 +21,9 @@ stdenv.mkDerivation rec { dontBuild = true; + # FIXME: this should be removed after upstream releases the update forcing the use of public_html. + dontCheckForBrokenSymlinks = true; + installPhase = '' mkdir $out cp -r * $out/ From 30f46aecba53aa1966a797c3240668d5bf418f67 Mon Sep 17 00:00:00 2001 From: Cassie Cheung Date: Mon, 10 Feb 2025 16:30:17 +0800 Subject: [PATCH 0886/2168] roundcube: 1.6.9 -> 1.6.10 --- pkgs/servers/roundcube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix index f8b50b66fcea..b88ba3a60819 100644 --- a/pkgs/servers/roundcube/default.nix +++ b/pkgs/servers/roundcube/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "roundcube"; - version = "1.6.9"; + version = "1.6.10"; src = fetchurl { url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; - sha256 = "sha256-thpfXCL4kMKZ6TWqz88IcGdpkNiuv/DWzf8HW/F8708="; + sha256 = "sha256-A8+sL0lN2Zwlw177CtTTM/JI4y8l9CBPvI8nMb+68OQ="; }; patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ]; From fe1d0f13516d291186403eb895a6991327a643aa Mon Sep 17 00:00:00 2001 From: misilelab Date: Mon, 10 Feb 2025 17:47:00 +0900 Subject: [PATCH 0887/2168] python3Packages.truststore: 0.10.0 -> 0.10.1 Signed-off-by: misilelab --- 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 b43bc451b071..ca3a254d3d37 100644 --- a/pkgs/development/python-modules/truststore/default.nix +++ b/pkgs/development/python-modules/truststore/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "truststore"; - version = "0.10.0"; + version = "0.10.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "sethmlarson"; repo = "truststore"; tag = "v${version}"; - hash = "sha256-SzCeuc/tIOearYAXCK7s/Q99fK0JvJc1rSbsiE7m6+k="; + hash = "sha256-oVFNR8qxEmCZdTGqzb9Gj3XIUwPy6YWV3YJPkIDA8Cw="; }; build-system = [ flit-core ]; From d509c47663027a854c59a857a950badb47e07652 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 10 Feb 2025 00:48:51 -0800 Subject: [PATCH 0888/2168] immich-cli: fix broken symlink (#380796) Before this change, the build failed with ERROR: noBrokenSymlinks: the symlink /nix/store/wgqby3gmmfld3ywkdmcpcmprzj64lk0p-immich-cli-2.2.48/node_modules/@oazapfts points to a missing target /nix/store/wgqby3gmmfld3ywkdmcpcmprzj64lk0p-immich-cli-2.2.48/node_modules/node_modules/@immich/sdk/node_modules/@oazapfts --- pkgs/by-name/im/immich/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix index 06839ba36e60..50cdafbc71a3 100644 --- a/pkgs/by-name/im/immich/package.nix +++ b/pkgs/by-name/im/immich/package.nix @@ -115,8 +115,6 @@ let preBuild = '' rm node_modules/@immich/sdk ln -s ${openapi} node_modules/@immich/sdk - # Rollup does not find the dependency otherwise - ln -s node_modules/@immich/sdk/node_modules/@oazapfts node_modules/ ''; installPhase = '' From 083a1ec2a9e87d1614bbaf202d7f5b7c9d3a888e Mon Sep 17 00:00:00 2001 From: Alessandro Sappia Date: Thu, 6 Feb 2025 11:16:24 +0000 Subject: [PATCH 0889/2168] maintainers: add asappia Signed-off-by: Alessandro Sappia --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5570d588f74a..d4bcc0c629f4 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2019,6 +2019,12 @@ githubId = 21687187; name = "Mirza Arnaut"; }; + asappia = { + email = "asappia@gmail.com"; + github = "asappia"; + githubId = 891399; + name = "Alessandro Sappia"; + }; asbachb = { email = "asbachb-nixpkgs-5c2a@impl.it"; matrix = "@asbachb:matrix.org"; From 27490dc932ac59cc6941e50b6312c755f6e0e909 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sun, 19 Jan 2025 16:34:33 +0800 Subject: [PATCH 0890/2168] python313Packages.picologging: fix build --- .../python-modules/picologging/default.nix | 7 ++ .../python-modules/picologging/pr-212.patch | 94 +++++++++++++++++++ 2 files changed, 101 insertions(+) create mode 100644 pkgs/development/python-modules/picologging/pr-212.patch diff --git a/pkgs/development/python-modules/picologging/default.nix b/pkgs/development/python-modules/picologging/default.nix index c5a3ac178273..1ee2ae7943cf 100644 --- a/pkgs/development/python-modules/picologging/default.nix +++ b/pkgs/development/python-modules/picologging/default.nix @@ -25,6 +25,12 @@ buildPythonPackage rec { hash = "sha256-t75D7aNKAifzeCPwtyKp8LoiXtbbXspRFYnsI0gx+V4="; }; + patches = [ + # For python 313 + # https://github.com/microsoft/picologging/pull/212 + ./pr-212.patch + ]; + build-system = [ setuptools cmake @@ -37,6 +43,7 @@ buildPythonPackage rec { ]; dontUseCmakeConfigure = true; + __darwinAllowLocalNetworking = true; dependencies = [ flaky diff --git a/pkgs/development/python-modules/picologging/pr-212.patch b/pkgs/development/python-modules/picologging/pr-212.patch new file mode 100644 index 000000000000..01498fcd7409 --- /dev/null +++ b/pkgs/development/python-modules/picologging/pr-212.patch @@ -0,0 +1,94 @@ +diff --git a/src/picologging/compat.hxx b/src/picologging/compat.hxx +index d3356da..be7a1fc 100644 +--- a/src/picologging/compat.hxx ++++ b/src/picologging/compat.hxx +@@ -88,4 +88,12 @@ static inline PyObject* _Py_XNewRef(PyObject *obj) + } + #endif + ++// For Python 3.13 and above, PyTime_t is now part of the public API ++#if PY_VERSION_HEX >= 0x030d0000 ++#define _PyTime_t PyTime_t ++#define _PyTime_AsSecondsDouble PyTime_AsSecondsDouble ++#define _PyTime_AsMilliseconds PyTime_AsMilliseconds ++#define _PyTime_ROUND_CEILING PyTime_ROUND_CEILING ++#endif ++ + #endif // COMPAT_H +\ No newline at end of file + +From fe313d8b3dcf0115e1be781e03b20673d3f51c3f Mon Sep 17 00:00:00 2001 +From: Anthony Shaw +Date: Sat, 14 Sep 2024 17:33:25 +1000 +Subject: [PATCH 2/2] Patch other changed APIs for pytime + +--- + pyproject.toml | 2 +- + src/picologging/compat.hxx | 2 -- + src/picologging/logrecord.cxx | 13 +++++++++++++ + 3 files changed, 14 insertions(+), 3 deletions(-) + +diff --git a/pyproject.toml b/pyproject.toml +index 33abe66..27628c9 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -1,7 +1,7 @@ + [build-system] + requires = [ + "setuptools>=65.4.1", +- "scikit-build>=0.17.0", ++ "scikit-build>=0.18.0", + "cmake>=3.18", + "ninja", + ] +diff --git a/src/picologging/compat.hxx b/src/picologging/compat.hxx +index be7a1fc..7c6970d 100644 +--- a/src/picologging/compat.hxx ++++ b/src/picologging/compat.hxx +@@ -92,8 +92,6 @@ static inline PyObject* _Py_XNewRef(PyObject *obj) + #if PY_VERSION_HEX >= 0x030d0000 + #define _PyTime_t PyTime_t + #define _PyTime_AsSecondsDouble PyTime_AsSecondsDouble +-#define _PyTime_AsMilliseconds PyTime_AsMilliseconds +-#define _PyTime_ROUND_CEILING PyTime_ROUND_CEILING + #endif + + #endif // COMPAT_H +\ No newline at end of file +diff --git a/src/picologging/logrecord.cxx b/src/picologging/logrecord.cxx +index cec68c9..9f5cf86 100644 +--- a/src/picologging/logrecord.cxx ++++ b/src/picologging/logrecord.cxx +@@ -16,11 +16,19 @@ _PyFloat_FromPyTime(_PyTime_t t) + + _PyTime_t current_time() + { ++#if PY_VERSION_HEX >= 0x030d0000 ++ _PyTime_t t; ++ if (PyTime_Time(&t) < 0) { ++ return -1; ++ } ++ return t; ++#else + _PyTime_t t; + if (_PyTime_GetSystemClockWithInfo(&t, NULL) < 0) { + return -1; + } + return t; ++#endif + } + + PyObject* LogRecord_new(PyTypeObject* type, PyObject *initargs, PyObject *kwds) +@@ -162,7 +170,12 @@ LogRecord* LogRecord_create(LogRecord* self, PyObject* name, PyObject* msg, PyOb + } + + self->created = _PyTime_AsSecondsDouble(ctime); ++// msecs conversion isn't in 3.13 API ++#if PY_VERSION_HEX < 0x030d0000 + self->msecs = _PyTime_AsMilliseconds(ctime, _PyTime_ROUND_CEILING); ++#else ++ self->msecs = 0; ++#endif + self->relativeCreated = _PyFloat_FromPyTime((ctime - startTime) * 1000); + self->thread = PyThread_get_thread_ident(); // Only supported in Python 3.7+, if big demand for 3.6 patch this out for the old API. + // TODO #2 : See if there is a performant way to get the thread name. From 527405539523b5ec60451f5f3825cc91545bb98d Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Mon, 20 Jan 2025 18:21:18 +0800 Subject: [PATCH 0891/2168] python313Packages.psycopg: 3.2.3 -> 3.2.4 --- pkgs/development/python-modules/psycopg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix index b25dd7e325e5..fb09ffcf3cc5 100644 --- a/pkgs/development/python-modules/psycopg/default.nix +++ b/pkgs/development/python-modules/psycopg/default.nix @@ -35,13 +35,13 @@ let pname = "psycopg"; - version = "3.2.3"; + version = "3.2.4"; src = fetchFromGitHub { owner = "psycopg"; - repo = pname; + repo = "psycopg"; tag = version; - hash = "sha256-vcUZvQeD5MnEM02phk73I9dpf0Eug95V7Rspi0s6S2M="; + hash = "sha256-gicntSAEK5VO67M2gAGR6wSwKQwgnbHxVUoPpaAbaDk="; }; patches = [ From 3d4b776702ad085925909be57a213d45e20127de Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 6 Feb 2025 18:51:59 +0100 Subject: [PATCH 0892/2168] python312Packages.primp: 0.6.5 -> 0.12.0 Co-authored-by: Pol Dellaiera --- .../python-modules/primp/default.nix | 51 ++++++++++++++++--- 1 file changed, 45 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/primp/default.nix b/pkgs/development/python-modules/primp/default.nix index fc0e7d96ab97..8c8e94229551 100644 --- a/pkgs/development/python-modules/primp/default.nix +++ b/pkgs/development/python-modules/primp/default.nix @@ -12,33 +12,71 @@ patchelf, gcc-unwrapped, python, + fetchpatch, }: let + boringsslPatched = boringssl.overrideAttrs (oa: { + # boringssl source obtained from https://github.com/0x676e67/boring2/tree/1a0f1cd24e728aac100df68027c820f858199224/boring-sys/deps + src = fetchFromGitHub { + owner = "google"; + repo = "boringssl"; + rev = "44b3df6f03d85c901767250329c571db405122d5"; + hash = "sha256-REELo7X9aFy2OHjubYLO1UQXLTgekD4QFd2vyFthIrg="; + }; + modRoot = "./src"; + patches = [ + # A patch required to build boringssl compatible with `boring-sys2`. + # See https://github.com/0x676e67/boring2/blob/1a0f1cd24e728aac100df68027c820f858199224/boring-sys/build/main.rs#L486-L489 + (fetchpatch { + name = "boringssl-44b3df6f03d85c901767250329c571db405122d5.patch"; + url = "https://raw.githubusercontent.com/0x676e67/boring2/4edbff8cade24d5d83cc372c4502b59c5192b5a1/boring-sys/patches/boringssl-44b3df6f03d85c901767250329c571db405122d5.patch"; + hash = "sha256-lM+2lLvfDHnxLl+OgZ6R8Y4Z6JfA9AiDqboT1mbxmao="; + }) + ]; + + # Remove bazel specific build file to make way for build directory + # This is a problem on Darwin because of case-insensitive filesystem + preBuild = + (lib.optionalString stdenv.isDarwin '' + rm ../BUILD + '') + + oa.preBuild; + + env.NIX_CFLAGS_COMPILE = + oa.env.NIX_CFLAGS_COMPILE + + " " + + toString ( + lib.optionals stdenv.cc.isGNU [ + "-Wno-error=ignored-attributes" + ] + ); + + vendorHash = "sha256-06MkjXl0DKFzIH/H+uT9kXsQdPq7qdZh2dlLW/YhJuk="; + }); # boring-sys expects the static libraries in build/ instead of lib/ boringssl-wrapper = runCommand "boringssl-wrapper" { } '' mkdir $out - cd $out - ln -s ${boringssl.out}/lib build - ln -s ${boringssl.dev}/include include + ln -s ${boringsslPatched.out}/lib $out/build + ln -s ${boringsslPatched.dev}/include $out/include ''; in buildPythonPackage rec { pname = "primp"; - version = "0.6.5"; + version = "0.12.0"; pyproject = true; src = fetchFromGitHub { owner = "deedy5"; repo = "primp"; tag = "v${version}"; - hash = "sha256-dexJdeNGpRsPLk8b/gNeQc1dsQLOiXNL5zgDEN9qHfQ="; + hash = "sha256-yzcrUER+NiDfSjJ3my45IS+2GmeusvJgyX5nFSaqFUk="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-s+LAuZmnmTDPIFDSi9AkyWposFFnboJCmog1kiEBnrw="; + hash = "sha256-gCNnP0B0D6AJ1L/E6sQKASx8BbSJU5jTNia+tL2USvU="; }; nativeBuildInputs = [ @@ -58,6 +96,7 @@ buildPythonPackage rec { ]; env.BORING_BSSL_PATH = boringssl-wrapper; + env.BORING_BSSL_ASSUME_PATCHED = true; optional-dependencies = { dev = [ pytest ]; From 669c6b62018d96c62fe5a04fe093bfc7bcf04529 Mon Sep 17 00:00:00 2001 From: YooLc <3220101835@zju.edu.cn> Date: Mon, 10 Feb 2025 17:06:56 +0800 Subject: [PATCH 0893/2168] feishu: remove unused dependency libcurl.so --- pkgs/by-name/fe/feishu/package.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/by-name/fe/feishu/package.nix b/pkgs/by-name/fe/feishu/package.nix index 9ceb57eb3fda..b1851fb15798 100644 --- a/pkgs/by-name/fe/feishu/package.nix +++ b/pkgs/by-name/fe/feishu/package.nix @@ -7,7 +7,6 @@ autoPatchelfHook, cairo, cups, - curl, dbus, dpkg, expat, @@ -87,7 +86,6 @@ let atk cairo cups - curl dbus expat fontconfig @@ -154,7 +152,6 @@ stdenv.mkDerivation { # for autopatchelf alsa-lib cups - curl libXdamage libXtst libdrm @@ -199,12 +196,6 @@ stdenv.mkDerivation { mkdir -p $out/bin ln -s $out/opt/bytedance/feishu/bytedance-feishu $out/bin/bytedance-feishu - - # feishu comes with a bundled libcurl.so - # and has many dependencies that are hard to satisfy - # e.g. openldap version 2.4 - # so replace it with our own libcurl.so - ln -sf ${curl.out}/lib/libcurl.so $out/opt/bytedance/feishu/libcurl.so ''; passthru = { From 61e539c4ba0b02c037a395e86505deaa94e522a5 Mon Sep 17 00:00:00 2001 From: rewine Date: Mon, 10 Feb 2025 17:12:17 +0800 Subject: [PATCH 0894/2168] deepin.deepin-icon-theme: fix build --- pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix b/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix index 2f15e0f1f195..8c44914e7bb5 100644 --- a/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix +++ b/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix @@ -29,7 +29,9 @@ stdenvNoCC.mkDerivation rec { dontDropIconThemeCache = true; + # Remove broken symbolic link(https://github.com/linuxdeepin/developer-center/issues/11245) preFixup = '' + rm $out/share/icons/bloom/actions/24/{draw-triangle1.svg,draw-triangle2.svg,draw-triangle3.svg,draw-triangle4.svg} for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done From ec2d3cd6577a0ecda42f7251d19d6ff39fc507de Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 6 Feb 2025 08:36:33 +0100 Subject: [PATCH 0895/2168] open-webui: 0.5.9 -> 0.5.10 changelog: https://github.com/open-webui/open-webui/releases/tag/v0.5.10 diff: https://github.com/open-webui/open-webui/compare/v0.5.9..v0.5.10 --- pkgs/by-name/op/open-webui/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix index 4e7841d6b03c..80a000b83b11 100644 --- a/pkgs/by-name/op/open-webui/package.nix +++ b/pkgs/by-name/op/open-webui/package.nix @@ -7,19 +7,19 @@ }: let pname = "open-webui"; - version = "0.5.9"; + version = "0.5.10"; src = fetchFromGitHub { owner = "open-webui"; repo = "open-webui"; tag = "v${version}"; - hash = "sha256-r4jl1WNI8tyhwyYbTZ+Q52xvv3PJY2FvhexMYHIIDPg="; + hash = "sha256-zwVrDdCMapuHKmtlEUnCwxXCBU93C5uT9eqDk5Of2BE="; }; frontend = buildNpmPackage { inherit pname version src; - npmDepsHash = "sha256-PAX3aa0WdvCBvAD8AGQYqnx5Sd/85luMqP6hAyICyhA="; + npmDepsHash = "sha256-G08r+2eelxV3ottsNEZ6xysu13AbzPNTwkwZdY1qadg="; # Disabling `pyodide:fetch` as it downloads packages during `buildPhase` # Until this is solved, running python packages from the browser will not work. From cc1265d99558e02ab13a26372c38dd2b56baf924 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Sun, 9 Feb 2025 11:30:02 +0100 Subject: [PATCH 0896/2168] brlaser: Switch to maintained fork --- pkgs/by-name/br/brlaser/package.nix | 45 +++++------------------------ 1 file changed, 8 insertions(+), 37 deletions(-) diff --git a/pkgs/by-name/br/brlaser/package.nix b/pkgs/by-name/br/brlaser/package.nix index deeda18924ec..b7d5e8cf4488 100644 --- a/pkgs/by-name/br/brlaser/package.nix +++ b/pkgs/by-name/br/brlaser/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "brlaser"; - version = "6-unstable-2023-02-30"; + version = "6.2.7"; src = fetchFromGitHub { - owner = "pdewacht"; + owner = "Owl-Maintain"; repo = "brlaser"; - rev = "2a49e3287c70c254e7e3ac9dabe9d6a07218c3fa"; - sha256 = "sha256-1fvO9F7ifbYQHAy54mOx052XutfKXSK6iT/zj4Mhbww="; + tag = "v${version}"; + hash = "sha256-a+TjLmjqBz0b7v6kW1uxh4BGzrYOQ8aMdVo4orZeMT4="; }; nativeBuildInputs = [ @@ -38,40 +38,11 @@ stdenv.mkDerivation rec { longDescription = '' Although most Brother printers support a standard printer language such as PCL or PostScript, not all do. If you have a monochrome Brother laser printer (or multi-function device) and the other open source drivers don't work, this one might help. - This driver is known to work with these printers: - - Brother DCP-1510 - Brother DCP-1602 - Brother DCP-7030 - Brother DCP-7040 - Brother DCP-7055 - Brother DCP-7055W - Brother DCP-7060D - Brother DCP-7065DN - Brother DCP-7080 - Brother DCP-L2500D - Brother DCP-L2520D - Brother DCP-L2540DW - Brother HL-1110 - Brother HL-1200 - Brother HL-2030 - Brother HL-2140 - Brother HL-2220 - Brother HL-2270DW - Brother HL-5030 - Brother HL-L2300D - Brother HL-L2320D - Brother HL-L2340D - Brother HL-L2360D - Brother MFC-1910W - Brother MFC-7240 - Brother MFC-7360N - Brother MFC-7365DN - Brother MFC-7840W - Brother MFC-L2710DW - Lenovo M7605D + This driver is known to work with many printers in the DCP, HL and MFC series, along with a few others. + See the homepage for a full list. ''; - homepage = "https://github.com/pdewacht/brlaser"; + homepage = "https://github.com/Owl-Maintain/brlaser"; + changelog = "https://github.com/Owl-Maintain/brlaser/releases/tag/v${version}"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ StijnDW ]; From 4d376f1f8c2ccf7266875f78a20a9dc24419dbce Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Sun, 9 Feb 2025 11:31:44 +0100 Subject: [PATCH 0897/2168] brlaser: Change maintainers --- pkgs/by-name/br/brlaser/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/br/brlaser/package.nix b/pkgs/by-name/br/brlaser/package.nix index b7d5e8cf4488..2cc36dd9d4ed 100644 --- a/pkgs/by-name/br/brlaser/package.nix +++ b/pkgs/by-name/br/brlaser/package.nix @@ -45,6 +45,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/Owl-Maintain/brlaser/releases/tag/v${version}"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ StijnDW ]; + maintainers = with lib.maintainers; [ onny ]; }; } From 083811ef4f1afadbdced814207a37fbf087552ff Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Mon, 10 Feb 2025 10:28:22 +0100 Subject: [PATCH 0898/2168] xeol: 0.10.3 -> 0.10.4 Signed-off-by: Paul Meyer --- pkgs/by-name/xe/xeol/package.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/xe/xeol/package.nix b/pkgs/by-name/xe/xeol/package.nix index 787a9bd778bf..086b30c9c6d9 100644 --- a/pkgs/by-name/xe/xeol/package.nix +++ b/pkgs/by-name/xe/xeol/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "xeol"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitHub { owner = "xeol-io"; repo = "xeol"; tag = "v${version}"; - hash = "sha256-zpggEl1tyzuxo/EcHMeupEVJ5/ALY51wYrw7eKEaMEw="; + hash = "sha256-zm8PIYWFLEiWuZGt5Fev35d8EYOfzduIXX6SmJZ27o0="; }; vendorHash = "sha256-hPWjXTxk/jRkzvLYNgVlgj0hjzfikwel1bxSqWquVhk="; @@ -22,7 +22,6 @@ buildGoModule rec { subPackages = [ "cmd/xeol/" ]; ldflags = [ - "-w" "-s" "-X=main.version=${version}" "-X=main.gitCommit=${src.rev}" From 88b1420c415c8c5153c9f0f6309c54f7314cb6be Mon Sep 17 00:00:00 2001 From: bstanderline <153822813+bstanderline@users.noreply.github.com> Date: Mon, 10 Feb 2025 09:46:00 +0000 Subject: [PATCH 0899/2168] zabbix70: 7.0.8 -> 7.0.9 --- pkgs/servers/monitoring/zabbix/versions.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index 8b6197ee6755..e1533c25991b 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -1,7 +1,7 @@ generic: { v70 = generic { - version = "7.0.8"; - hash = "sha256-VYfyJ/ASjQgG5VyWWB9iNNanG+3v2pCZFkwLXyWmdYI="; + version = "7.0.9"; + hash = "sha256-jXdVV28wtdYJn/XjV0VJ/CSCKcAX+XU4KFZRdBJQafY="; vendorHash = null; }; v64 = generic { From 1495671a0c6d69c63f22a4110d7800e0e1fc98ef Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 10 Feb 2025 10:50:49 +0100 Subject: [PATCH 0900/2168] python312Packages.dvclive: 3.48.1 -> 3.48.2 Diff: https://github.com/iterative/dvclive/compare/refs/tags/3.48.1...3.48.2 Changelog: https://github.com/iterative/dvclive/releases/tag/3.48.2 --- pkgs/development/python-modules/dvclive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dvclive/default.nix b/pkgs/development/python-modules/dvclive/default.nix index 40a4973763be..90c541c09e8b 100644 --- a/pkgs/development/python-modules/dvclive/default.nix +++ b/pkgs/development/python-modules/dvclive/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "dvclive"; - version = "3.48.1"; + version = "3.48.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "dvclive"; tag = version; - hash = "sha256-fLlP3kWmThQVVPEOd9KWitBIye/fhd/+zcHoVTF/pV8="; + hash = "sha256-KwS5426EU0vym2fDbtIH4bmlSLKWLfZRRxXE+bEmGfc="; }; build-system = [ setuptools-scm ]; From ab15e3b7e847c2f646c00f3b6a9f40aa9aac5a2f Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Mon, 20 Jan 2025 12:50:40 +0800 Subject: [PATCH 0901/2168] litestar: build for all python version --- pkgs/by-name/li/litestar/package.nix | 57 +-------- .../python-modules/litestar/default.nix | 113 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 116 insertions(+), 56 deletions(-) create mode 100644 pkgs/development/python-modules/litestar/default.nix diff --git a/pkgs/by-name/li/litestar/package.nix b/pkgs/by-name/li/litestar/package.nix index 14d597236c96..4f7c0e98b65d 100644 --- a/pkgs/by-name/li/litestar/package.nix +++ b/pkgs/by-name/li/litestar/package.nix @@ -1,56 +1 @@ -{ - python3Packages, - lib, - fetchFromGitHub, -}: - -python3Packages.buildPythonApplication rec { - pname = "litestar"; - version = "2.13.0"; - pyproject = true; - - build-system = with python3Packages; [ - hatchling - ]; - - src = fetchFromGitHub { - owner = "litestar-org"; - repo = "litestar"; - tag = "v${version}"; - hash = "sha256-PR2DVNRtILHs7XwVi9/ZCVRJQFqfGLn1x2gpYtYjHDo="; - }; - - dependencies = with python3Packages; [ - anyio - click - redis - httpx - msgspec - multidict - jinja2 - pyyaml - rich - rich-click - typing-extensions - psutil - polyfactory - litestar-htmx - trio - cryptography - psycopg - fsspec - mako - time-machine - asyncpg - picologging - ]; - - meta = { - homepage = "https://litestar.dev/"; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ bot-wxt1221 ]; - changelog = "https://github.com/litestar-org/litestar/releases/tag/v${version}"; - description = "Production-ready, Light, Flexible and Extensible ASGI API framework"; - license = lib.licenses.mit; - }; -} +{ python3Packages }: with python3Packages; toPythonApplication litestar diff --git a/pkgs/development/python-modules/litestar/default.nix b/pkgs/development/python-modules/litestar/default.nix new file mode 100644 index 000000000000..f6461d0fc6ca --- /dev/null +++ b/pkgs/development/python-modules/litestar/default.nix @@ -0,0 +1,113 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + hatchling, + + # dependencies + anyio, + asyncpg, + click, + cryptography, + fsspec, + httpx, + jinja2, + litestar-htmx, + mako, + msgspec, + multidict, + picologging, + polyfactory, + psutil, + psycopg, + pyyaml, + redis, + rich, + rich-click, + time-machine, + trio, + typing-extensions, + + # tests + pytestCheckHook, + pytest-lazy-fixtures, + pytest-xdist, + pytest-mock, + pytest-asyncio, + pytest-timeout, + pytest-rerunfailures, + versionCheckHook, +}: + +buildPythonPackage rec { + pname = "litestar"; + version = "2.13.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "litestar-org"; + repo = "litestar"; + tag = "v${version}"; + hash = "sha256-PR2DVNRtILHs7XwVi9/ZCVRJQFqfGLn1x2gpYtYjHDo="; + }; + + build-system = [ + hatchling + ]; + + dependencies = [ + anyio + asyncpg + click + cryptography + fsspec + httpx + jinja2 + litestar-htmx + mako + msgspec + multidict + picologging + polyfactory + psutil + psycopg + pyyaml + redis + rich + rich-click + time-machine + trio + typing-extensions + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-lazy-fixtures + pytest-xdist + pytest-mock + pytest-asyncio + pytest-timeout + pytest-rerunfailures + versionCheckHook + ]; + versionCheckProgramArg = [ "version" ]; + + __darwinAllowLocalNetworking = true; + + pytestFlagsArray = [ + # Follow github CI + "docs/examples/" + ]; + + meta = { + homepage = "https://litestar.dev/"; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + changelog = "https://github.com/litestar-org/litestar/releases/tag/v${version}"; + description = "Production-ready, Light, Flexible and Extensible ASGI API framework"; + license = lib.licenses.mit; + mainProgram = "litestar"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index adb25a2e7497..f2a890631fc7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7603,6 +7603,8 @@ self: super: with self; { litestar-htmx = callPackage ../development/python-modules/litestar-htmx { }; + litestar = callPackage ../development/python-modules/litestar { }; + littleutils = callPackage ../development/python-modules/littleutils { }; livelossplot = callPackage ../development/python-modules/livelossplot { }; From a88eedeec72e99093232dc5491d20725d8da55bf Mon Sep 17 00:00:00 2001 From: Anton Mosich Date: Tue, 10 Dec 2024 10:40:42 +0100 Subject: [PATCH 0902/2168] maildir-rank-addr: init at 1.4.1 --- pkgs/by-name/ma/maildir-rank-addr/package.nix | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 pkgs/by-name/ma/maildir-rank-addr/package.nix diff --git a/pkgs/by-name/ma/maildir-rank-addr/package.nix b/pkgs/by-name/ma/maildir-rank-addr/package.nix new file mode 100644 index 000000000000..4d3fd086e1e6 --- /dev/null +++ b/pkgs/by-name/ma/maildir-rank-addr/package.nix @@ -0,0 +1,31 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, + ... +}: +buildGoModule rec { + pname = "maildir-rank-addr"; + version = "1.4.1"; + + src = fetchFromGitHub { + owner = "ferdinandyb"; + repo = "maildir-rank-addr"; + tag = "v${version}"; + hash = "sha256-3iDvVeiQjyck4+/IvxOe6w2ebR7yju2dV1ijVpajsKU="; + }; + + vendorHash = "sha256-Wl7KfvNYtvSUiYS1LpN027SrU+K3Uq0UQHv7slC2Xwc="; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Generate a ranked addressbook from a maildir folder"; + homepage = "https://github.com/ferdinandyb/maildir-rank-addr"; + changelog = "https://github.com/ferdinandyb/maildir-rank-addr/blob/v${version}/CHANGELOG.md"; + license = lib.licenses.mit; + mainProgram = "maildir-rank-addr"; + maintainers = with lib.maintainers; [ antonmosich ]; + }; +} From 586fa8aae46d37c000cff6441698bee8f7557899 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 02:36:01 +0000 Subject: [PATCH 0903/2168] zbus-xmlgen: 5.0.2 -> 5.1.0 --- pkgs/by-name/zb/zbus-xmlgen/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/zb/zbus-xmlgen/package.nix b/pkgs/by-name/zb/zbus-xmlgen/package.nix index 439bf07fd58d..dcb14a0e2e85 100644 --- a/pkgs/by-name/zb/zbus-xmlgen/package.nix +++ b/pkgs/by-name/zb/zbus-xmlgen/package.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "zbus_xmlgen"; - version = "5.0.2"; + version = "5.1.0"; src = fetchCrate { inherit pname version; - hash = "sha256-H3QA1Eh1AL1CtiUykEjJ7Ltskcen8tIfbGg6jy7Xic8="; + hash = "sha256-LHY4E2YemGksK8xJx0r3iTHnk3CqMl5abM08VSBPIfo="; }; useFetchCargoVendor = true; - cargoHash = "sha256-aD0aEMQ8YAOXTJCjGolqG9k5UciK3pXB7Z9dbp4E2uY="; + cargoHash = "sha256-g5GLyloeyVXcJgMVx21ePYlcYUj+NGFtVarpYeQN9rw="; nativeBuildInputs = [ makeBinaryWrapper ]; nativeCheckInputs = [ rustfmt ]; From ba3471b5e7504af0a0c82aa644d55e2596f6cf40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Sun, 9 Feb 2025 13:56:04 -0600 Subject: [PATCH 0904/2168] linux/hardened/patches/5.10: v5.10.233-hardened1 -> v5.10.234-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index c14ac3ab6357..9ec97bb60bc3 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,12 +2,12 @@ "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v5.10.233-hardened1.patch", - "sha256": "1dchzjp4dvdla2mpac8bk6cj4ymx2vkwllck9wvlsbi15897a50y", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.10.233-hardened1/linux-hardened-v5.10.233-hardened1.patch" + "name": "linux-hardened-v5.10.234-hardened1.patch", + "sha256": "0155pikfzyrmrf9xc2bid6s7jz6qw6pb1x1pbzgphsvsi83jm886", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.10.234-hardened1/linux-hardened-v5.10.234-hardened1.patch" }, - "sha256": "0lkz2g8r032f027j3gih3f7crx991mrpng9qgqc5k4cc1wl5g7i3", - "version": "5.10.233" + "sha256": "1rgb4v6dvqlw1mgzsli0hxaj2d5d4m1nylgcrwm4bkpiwbzc95wm", + "version": "5.10.234" }, "5.15": { "patch": { From 084714f8d4257a8a0db7ff56cb5cfc0d1ddc7c13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Sun, 9 Feb 2025 13:56:09 -0600 Subject: [PATCH 0905/2168] linux/hardened/patches/5.15: v5.15.176-hardened1 -> v5.15.178-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 9ec97bb60bc3..b1c7769bc361 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -12,12 +12,12 @@ "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v5.15.176-hardened1.patch", - "sha256": "10r86rxixrvclzfpzp449ry7j79gr0n75zvh4x9bzr1860f0mha6", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.15.176-hardened1/linux-hardened-v5.15.176-hardened1.patch" + "name": "linux-hardened-v5.15.178-hardened1.patch", + "sha256": "01gbhdfnbxsb20qvgchk1qar7mf9phrzfidx825jags1v565jbpf", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.15.178-hardened1/linux-hardened-v5.15.178-hardened1.patch" }, - "sha256": "1cfk55469swywnf4r6pl7b3njxws8w3np81r99f0wnlaihrbajm8", - "version": "5.15.176" + "sha256": "0hkw2l4gr5m6jw2adxcgm2sb6kl0w51r6s4hcbn6rlm4bvmzgsgg", + "version": "5.15.178" }, "5.4": { "patch": { From 43519bc0e747b0f5dd300e98d11610c949665c61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Sun, 9 Feb 2025 13:56:13 -0600 Subject: [PATCH 0906/2168] linux/hardened/patches/5.4: v5.4.289-hardened1 -> v5.4.290-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index b1c7769bc361..d60b8f78038a 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -22,12 +22,12 @@ "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v5.4.289-hardened1.patch", - "sha256": "1gg4awiiggks5biyhkqdlxm7xxkpd754lxibflk3nwfj1rs44iwn", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.4.289-hardened1/linux-hardened-v5.4.289-hardened1.patch" + "name": "linux-hardened-v5.4.290-hardened1.patch", + "sha256": "0bd1g3zx5x5hxljw0qfis6h5y13pjlw1sizj7cx261iqb35vsv3x", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.4.290-hardened1/linux-hardened-v5.4.290-hardened1.patch" }, - "sha256": "043dl195h06hs3zdjd6j1m1zgvmky3s0plrpma75zqf8ab05yghy", - "version": "5.4.289" + "sha256": "0mm4q8f6kbqddy4zaxjf5xyqpnla5qprvsf7v3vq01gmlzr3rivc", + "version": "5.4.290" }, "6.1": { "patch": { From 9e1464b34732564618c15a283aaa06753663493e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Sun, 9 Feb 2025 13:56:18 -0600 Subject: [PATCH 0907/2168] linux/hardened/patches/6.1: v6.1.126-hardened1 -> v6.1.128-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index d60b8f78038a..b9f4dabb272f 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -32,12 +32,12 @@ "6.1": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v6.1.126-hardened1.patch", - "sha256": "096bchjy9n7q48r7xzzky9pmicdzz9pvmg5sk6943s4q5icrhi6s", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.1.126-hardened1/linux-hardened-v6.1.126-hardened1.patch" + "name": "linux-hardened-v6.1.128-hardened1.patch", + "sha256": "1p3j0qr8zwqz2rpfm024ardm75xzxxkdrxb9kkffkanp40zrcilr", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.1.128-hardened1/linux-hardened-v6.1.128-hardened1.patch" }, - "sha256": "140pprw2fkyz9qi5wnhi0yzpj65lzwi3zbmnvsk2yhgc9arj06f9", - "version": "6.1.126" + "sha256": "1wshgkgcxaf4mnm4ngngsj8gq1cg8kq56f5kqsdfcw0m339nfkc7", + "version": "6.1.128" }, "6.11": { "patch": { From 5f703fcfad4761c024be7b633b18732817130f92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Sun, 9 Feb 2025 13:56:23 -0600 Subject: [PATCH 0908/2168] linux/hardened/patches/6.12: v6.12.10-hardened1 -> v6.12.12-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index b9f4dabb272f..0f1eb78773c5 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -52,12 +52,12 @@ "6.12": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v6.12.10-hardened1.patch", - "sha256": "1m48sf0ihzpcj4ca9420rmhrihhchd2qrv86vw8llq3jmv7xqij5", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.12.10-hardened1/linux-hardened-v6.12.10-hardened1.patch" + "name": "linux-hardened-v6.12.12-hardened1.patch", + "sha256": "0k413adalc62ykrfar8dgp6480jmc6sx9c60sbk869xq8ghs6hq3", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.12.12-hardened1/linux-hardened-v6.12.12-hardened1.patch" }, - "sha256": "15xjjn8ff7g9q0ljr2g8k098ppxnpvxlgv22rdrplls8sxg6wlaa", - "version": "6.12.10" + "sha256": "1zwfw3lci3ihandx2cpq3h12x7l94jzr4xkd5lzkn1ppgv8l52g9", + "version": "6.12.12" }, "6.6": { "patch": { From 7e5604eba24bad9eb0bc58eda40c14ebbfbacaf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Sun, 9 Feb 2025 13:56:27 -0600 Subject: [PATCH 0909/2168] linux/hardened/patches/6.6: v6.6.73-hardened1 -> v6.6.75-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 0f1eb78773c5..9e075ee54282 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -62,11 +62,11 @@ "6.6": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v6.6.73-hardened1.patch", - "sha256": "18jy2acz7gh4f8gqc6ifq1rkgxqlc53wmrhs0m8ndi5p70wswr6v", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.6.73-hardened1/linux-hardened-v6.6.73-hardened1.patch" + "name": "linux-hardened-v6.6.75-hardened1.patch", + "sha256": "12wsj7g431lb0abqs9dcryx9czycnrg4jl8760rgj2qvaa1cpfrc", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.6.75-hardened1/linux-hardened-v6.6.75-hardened1.patch" }, - "sha256": "141428a3bxks9w5jj17w8jmp7zp90p3v33dyk046a0f2j2qqs0nj", - "version": "6.6.73" + "sha256": "1402g6qjk1242gsl6n8xlbg01m0nb19n30ac1ffi7fhnjzxb3pzp", + "version": "6.6.75" } } From f09a72a89131e63d793a8e8c856ab60cb784e1f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 10:04:15 +0000 Subject: [PATCH 0910/2168] python312Packages.amaranth-boards: 0-unstable-2024-12-21 -> 0-unstable-2025-02-07 --- pkgs/development/python-modules/amaranth-boards/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/amaranth-boards/default.nix b/pkgs/development/python-modules/amaranth-boards/default.nix index 8406ef39103e..82c530f3cd73 100644 --- a/pkgs/development/python-modules/amaranth-boards/default.nix +++ b/pkgs/development/python-modules/amaranth-boards/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "amaranth-boards"; - version = "0-unstable-2024-12-21"; + version = "0-unstable-2025-02-07"; pyproject = true; # from `pdm show` realVersion = @@ -22,10 +22,10 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "amaranth-lang"; repo = "amaranth-boards"; - rev = "9d97c4816288c9c2cc304d9280c2c63178d50d2f"; + rev = "6e01882eefd62cf19f5740406144632fe2d21947"; # these files change depending on git branch status postFetch = "rm -f $out/.git_archival.txt $out/.gitattributes"; - hash = "sha256-c+LUWNik95PO5oPM/Bjdxu8j9TD2Q8YSGtdNq1E+i4o="; + hash = "sha256-U/+5v4wN+HfpWHnT9E9hf4XYpzqQQ7Tgq6Z09nEIBeE="; }; build-system = [ pdm-backend ]; From 2133ff69f58c2ea59edf380a9a5c440c0ba73086 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Sun, 9 Feb 2025 11:13:23 +0100 Subject: [PATCH 0911/2168] eslint: 9.10.0 -> 9.20.0 --- pkgs/by-name/es/eslint/package-lock.json | 7940 ++++++++++++---------- pkgs/by-name/es/eslint/package.nix | 11 +- 2 files changed, 4329 insertions(+), 3622 deletions(-) diff --git a/pkgs/by-name/es/eslint/package-lock.json b/pkgs/by-name/es/eslint/package-lock.json index 071051a7aee9..3e559295931d 100644 --- a/pkgs/by-name/es/eslint/package-lock.json +++ b/pkgs/by-name/es/eslint/package-lock.json @@ -1,31 +1,34 @@ { "name": "eslint", - "version": "9.10.0", + "version": "9.20.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "eslint", - "version": "9.10.0", + "version": "9.20.0", "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", - "@eslint-community/regexpp": "^4.11.0", - "@eslint/config-array": "^0.18.0", - "@eslint/eslintrc": "^3.1.0", - "@eslint/js": "9.10.0", - "@eslint/plugin-kit": "^0.1.0", + "@eslint-community/regexpp": "^4.12.1", + "@eslint/config-array": "^0.19.0", + "@eslint/core": "^0.11.0", + "@eslint/eslintrc": "^3.2.0", + "@eslint/js": "9.20.0", + "@eslint/plugin-kit": "^0.2.5", + "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", - "@humanwhocodes/retry": "^0.3.0", - "@nodelib/fs.walk": "^1.2.8", + "@humanwhocodes/retry": "^0.4.1", + "@types/estree": "^1.0.6", + "@types/json-schema": "^7.0.15", "ajv": "^6.12.4", "chalk": "^4.0.0", - "cross-spawn": "^7.0.2", + "cross-spawn": "^7.0.6", "debug": "^4.3.2", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^8.0.2", - "eslint-visitor-keys": "^4.0.0", - "espree": "^10.1.0", + "eslint-scope": "^8.2.0", + "eslint-visitor-keys": "^4.2.0", + "espree": "^10.3.0", "esquery": "^1.5.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", @@ -35,31 +38,27 @@ "ignore": "^5.2.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", - "is-path-inside": "^3.0.3", "json-stable-stringify-without-jsonify": "^1.0.1", "lodash.merge": "^4.6.2", "minimatch": "^3.1.2", "natural-compare": "^1.4.0", - "optionator": "^0.9.3", - "strip-ansi": "^6.0.1", - "text-table": "^0.2.0" + "optionator": "^0.9.3" }, "bin": { "eslint": "bin/eslint.js" }, "devDependencies": { + "@arethetypeswrong/cli": "^0.17.0", "@babel/core": "^7.4.3", "@babel/preset-env": "^7.4.3", - "@eslint/core": "^0.5.0", - "@eslint/json": "^0.4.0", + "@eslint/json": "^0.10.0", "@trunkio/launcher": "^1.3.0", - "@types/estree": "^1.0.5", - "@types/json-schema": "^7.0.15", "@types/node": "^20.11.5", - "@wdio/browser-runner": "^9.0.5", - "@wdio/cli": "^9.0.5", - "@wdio/concise-reporter": "^9.0.4", - "@wdio/mocha-framework": "^9.0.5", + "@typescript-eslint/parser": "^8.4.0", + "@wdio/browser-runner": "^9.2.4", + "@wdio/cli": "^9.2.4", + "@wdio/concise-reporter": "^9.2.2", + "@wdio/mocha-framework": "^9.2.2", "babel-loader": "^8.0.5", "c8": "^7.12.0", "chai": "^4.0.1", @@ -70,8 +69,9 @@ "eslint": "file:.", "eslint-config-eslint": "file:packages/eslint-config-eslint", "eslint-plugin-eslint-plugin": "^6.0.0", + "eslint-plugin-expect-type": "^0.6.0", "eslint-plugin-yml": "^1.14.0", - "eslint-release": "^3.2.2", + "eslint-release": "^3.3.0", "eslint-rule-composer": "^0.3.0", "eslump": "^3.0.0", "esprima": "^4.0.1", @@ -81,8 +81,8 @@ "globals": "^15.0.0", "got": "^11.8.3", "gray-matter": "^4.0.3", - "jiti": "^1.21.6", - "knip": "^5.21.0", + "jiti": "^2.1.0", + "knip": "^5.32.0", "lint-staged": "^11.0.0", "load-perf": "^0.2.0", "markdown-it": "^12.2.0", @@ -94,7 +94,7 @@ "metascraper-logo": "^5.25.7", "metascraper-logo-favicon": "^5.25.7", "metascraper-title": "^5.25.7", - "mocha": "^8.3.2", + "mocha": "^10.7.3", "node-polyfill-webpack-plugin": "^1.0.3", "npm-license": "^0.3.3", "pirates": "^4.0.5", @@ -141,14 +141,103 @@ "node": ">=6.0.0" } }, - "node_modules/@babel/code-frame": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz", - "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==", + "node_modules/@andrewbranch/untar.js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@andrewbranch/untar.js/-/untar.js-1.0.3.tgz", + "integrity": "sha512-Jh15/qVmrLGhkKJBdXlK1+9tY4lZruYjsgkDFj08ZmDiWVBLJcqkok7Z0/R0In+i1rScBpJlSvrTS2Lm41Pbnw==", + "dev": true + }, + "node_modules/@arethetypeswrong/cli": { + "version": "0.17.3", + "resolved": "https://registry.npmjs.org/@arethetypeswrong/cli/-/cli-0.17.3.tgz", + "integrity": "sha512-wI9ZSTweunmzHboSyYtWRFpba9fM9mpX1g7EUoRr+86zHSd7NR7svb6EmJD2hv1V+SoisB2fERu6EQGGEfQ8oQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/highlight": "^7.24.7", + "@arethetypeswrong/core": "0.17.3", + "chalk": "^4.1.2", + "cli-table3": "^0.6.3", + "commander": "^10.0.1", + "marked": "^9.1.2", + "marked-terminal": "^7.1.0", + "semver": "^7.5.4" + }, + "bin": { + "attw": "dist/index.js" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@arethetypeswrong/cli/node_modules/marked": { + "version": "9.1.6", + "resolved": "https://registry.npmjs.org/marked/-/marked-9.1.6.tgz", + "integrity": "sha512-jcByLnIFkd5gSXZmjNvS1TlmRhCXZjIzHYlaGkPlLIekG55JDR2Z4va9tZwCiP+/RDERiNhMOFu01xd6O5ct1Q==", + "dev": true, + "license": "MIT", + "bin": { + "marked": "bin/marked.js" + }, + "engines": { + "node": ">= 16" + } + }, + "node_modules/@arethetypeswrong/core": { + "version": "0.17.3", + "resolved": "https://registry.npmjs.org/@arethetypeswrong/core/-/core-0.17.3.tgz", + "integrity": "sha512-2TB7O5JmC7UX7QHRGGftxRVQjV4Ce6oOIDGIDDERyT9dQ8lK/tRGfFubzO80rWeXm/gSrA8jirlXSWSE1i5ynQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@andrewbranch/untar.js": "^1.0.3", + "cjs-module-lexer": "^1.2.3", + "fflate": "^0.8.2", + "lru-cache": "^10.4.3", + "semver": "^7.5.4", + "typescript": "5.6.1-rc", + "validate-npm-package-name": "^5.0.0" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@arethetypeswrong/core/node_modules/typescript": { + "version": "5.6.1-rc", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.1-rc.tgz", + "integrity": "sha512-E3b2+1zEFu84jB0YQi9BORDjz9+jGbwwy1Zi3G0LUNw7a7cePUrHMRNy8aPh53nXpkFGVHSxIZo5vKTfYaFiBQ==", + "dev": true, + "license": "Apache-2.0", + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=14.17" + } + }, + "node_modules/@asamuzakjp/css-color": { + "version": "2.8.3", + "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-2.8.3.tgz", + "integrity": "sha512-GIc76d9UI1hCvOATjZPyHFmE5qhRccp3/zGfMPapK3jBi+yocEzp6BBB0UnfRYP9NP4FANqUZYb0hnfs3TM3hw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@csstools/css-calc": "^2.1.1", + "@csstools/css-color-parser": "^3.0.7", + "@csstools/css-parser-algorithms": "^3.0.4", + "@csstools/css-tokenizer": "^3.0.3", + "lru-cache": "^10.4.3" + } + }, + "node_modules/@babel/code-frame": { + "version": "7.26.2", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz", + "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-validator-identifier": "^7.25.9", + "js-tokens": "^4.0.0", "picocolors": "^1.0.0" }, "engines": { @@ -156,9 +245,9 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.4.tgz", - "integrity": "sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ==", + "version": "7.26.8", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.8.tgz", + "integrity": "sha512-oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ==", "dev": true, "license": "MIT", "engines": { @@ -166,22 +255,23 @@ } }, "node_modules/@babel/core": { - "version": "7.25.2", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz", - "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==", + "version": "7.26.8", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.8.tgz", + "integrity": "sha512-l+lkXCHS6tQEc5oUpK28xBOZ6+HwaH7YwoYQbLFiYb4nS2/l1tKnZEtEWkD0GuiYdvArf9qBS0XlQGXzPMsNqQ==", "dev": true, "license": "MIT", "dependencies": { "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.24.7", - "@babel/generator": "^7.25.0", - "@babel/helper-compilation-targets": "^7.25.2", - "@babel/helper-module-transforms": "^7.25.2", - "@babel/helpers": "^7.25.0", - "@babel/parser": "^7.25.0", - "@babel/template": "^7.25.0", - "@babel/traverse": "^7.25.2", - "@babel/types": "^7.25.2", + "@babel/code-frame": "^7.26.2", + "@babel/generator": "^7.26.8", + "@babel/helper-compilation-targets": "^7.26.5", + "@babel/helper-module-transforms": "^7.26.0", + "@babel/helpers": "^7.26.7", + "@babel/parser": "^7.26.8", + "@babel/template": "^7.26.8", + "@babel/traverse": "^7.26.8", + "@babel/types": "^7.26.8", + "@types/gensync": "^1.0.0", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -207,58 +297,45 @@ } }, "node_modules/@babel/generator": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.6.tgz", - "integrity": "sha512-VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw==", + "version": "7.26.8", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.8.tgz", + "integrity": "sha512-ef383X5++iZHWAXX0SXQR6ZyQhw/0KtTkrTz61WXRhFM6dhpHulO/RJz79L8S6ugZHJkOOkUrUdxgdF2YiPFnA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^7.25.6", + "@babel/parser": "^7.26.8", + "@babel/types": "^7.26.8", "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.25", - "jsesc": "^2.5.1" + "jsesc": "^3.0.2" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-annotate-as-pure": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz", - "integrity": "sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz", + "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^7.24.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.24.7.tgz", - "integrity": "sha512-xZeCVVdwb4MsDBkkyZ64tReWYrLRHlMN72vP7Bdm3OUOuyFZExhsHUUnuWnm2/XOlAJzR0LfPpB56WXZn0X/lA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/traverse": "^7.24.7", - "@babel/types": "^7.24.7" + "@babel/types": "^7.25.9" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.25.2", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz", - "integrity": "sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==", + "version": "7.26.5", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.26.5.tgz", + "integrity": "sha512-IXuyn5EkouFJscIDuFF5EsiSolseme1s0CZB+QxVugqJLYmKdxI1VfIBOst0SUu4rnk2Z7kqTwmoO1lp3HIfnA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/compat-data": "^7.25.2", - "@babel/helper-validator-option": "^7.24.8", - "browserslist": "^4.23.1", + "@babel/compat-data": "^7.26.5", + "@babel/helper-validator-option": "^7.25.9", + "browserslist": "^4.24.0", "lru-cache": "^5.1.1", "semver": "^6.3.1" }, @@ -266,6 +343,16 @@ "node": ">=6.9.0" } }, + "node_modules/@babel/helper-compilation-targets/node_modules/lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "dev": true, + "license": "ISC", + "dependencies": { + "yallist": "^3.0.2" + } + }, "node_modules/@babel/helper-compilation-targets/node_modules/semver": { "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", @@ -276,19 +363,26 @@ "semver": "bin/semver.js" } }, + "node_modules/@babel/helper-compilation-targets/node_modules/yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "dev": true, + "license": "ISC" + }, "node_modules/@babel/helper-create-class-features-plugin": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.4.tgz", - "integrity": "sha512-ro/bFs3/84MDgDmMwbcHgDa8/E6J3QKNTk4xJJnVeFtGE+tL0K26E3pNxhYz2b67fJpt7Aphw5XcploKXuCvCQ==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.9.tgz", + "integrity": "sha512-UTZQMvt0d/rSz6KI+qdu7GQze5TIajwTS++GUozlw8VBJDEOAqSXwm1WvmYEZwqdqSGQshRocPDqrt4HBZB3fQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.24.7", - "@babel/helper-member-expression-to-functions": "^7.24.8", - "@babel/helper-optimise-call-expression": "^7.24.7", - "@babel/helper-replace-supers": "^7.25.0", - "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7", - "@babel/traverse": "^7.25.4", + "@babel/helper-annotate-as-pure": "^7.25.9", + "@babel/helper-member-expression-to-functions": "^7.25.9", + "@babel/helper-optimise-call-expression": "^7.25.9", + "@babel/helper-replace-supers": "^7.25.9", + "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9", + "@babel/traverse": "^7.25.9", "semver": "^6.3.1" }, "engines": { @@ -309,14 +403,14 @@ } }, "node_modules/@babel/helper-create-regexp-features-plugin": { - "version": "7.25.2", - "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.2.tgz", - "integrity": "sha512-+wqVGP+DFmqwFD3EH6TMTfUNeqDehV3E/dl+Sd54eaXqm17tEUNbEIn4sVivVowbvUpOtIGxdo3GoXyDH9N/9g==", + "version": "7.26.3", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.26.3.tgz", + "integrity": "sha512-G7ZRb40uUgdKOQqPLjfD12ZmGA54PzqDFUv2BKImnC9QIfGhIHKvVML0oN8IUiDq4iRqpq74ABpvOaerfWdong==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.24.7", - "regexpu-core": "^5.3.1", + "@babel/helper-annotate-as-pure": "^7.25.9", + "regexpu-core": "^6.2.0", "semver": "^6.3.1" }, "engines": { @@ -337,9 +431,9 @@ } }, "node_modules/@babel/helper-define-polyfill-provider": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz", - "integrity": "sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ==", + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.3.tgz", + "integrity": "sha512-HK7Bi+Hj6H+VTHA3ZvBis7V/6hu9QuTrnMXNybfUf2iiuU/N97I8VjB+KbhFF8Rld/Lx5MzoCwPCpPjfK+n8Cg==", "dev": true, "license": "MIT", "dependencies": { @@ -354,44 +448,43 @@ } }, "node_modules/@babel/helper-member-expression-to-functions": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.8.tgz", - "integrity": "sha512-LABppdt+Lp/RlBxqrh4qgf1oEH/WxdzQNDJIu5gC/W1GyvPVrOBiItmmM8wan2fm4oYqFuFfkXmlGpLQhPY8CA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.9.tgz", + "integrity": "sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/traverse": "^7.24.8", - "@babel/types": "^7.24.8" + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.25.9" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-imports": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz", - "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz", + "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/traverse": "^7.24.7", - "@babel/types": "^7.24.7" + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.25.9" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.25.2", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz", - "integrity": "sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz", + "integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-module-imports": "^7.24.7", - "@babel/helper-simple-access": "^7.24.7", - "@babel/helper-validator-identifier": "^7.24.7", - "@babel/traverse": "^7.25.2" + "@babel/helper-module-imports": "^7.25.9", + "@babel/helper-validator-identifier": "^7.25.9", + "@babel/traverse": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -401,22 +494,22 @@ } }, "node_modules/@babel/helper-optimise-call-expression": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.24.7.tgz", - "integrity": "sha512-jKiTsW2xmWwxT1ixIdfXUZp+P5yURx2suzLZr5Hi64rURpDYdMW0pv+Uf17EYk2Rd428Lx4tLsnjGJzYKDM/6A==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.9.tgz", + "integrity": "sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^7.24.7" + "@babel/types": "^7.25.9" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-plugin-utils": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz", - "integrity": "sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==", + "version": "7.26.5", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz", + "integrity": "sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==", "dev": true, "license": "MIT", "engines": { @@ -424,15 +517,15 @@ } }, "node_modules/@babel/helper-remap-async-to-generator": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.0.tgz", - "integrity": "sha512-NhavI2eWEIz/H9dbrG0TuOicDhNexze43i5z7lEqwYm0WEZVTwnPpA0EafUTP7+6/W79HWIP2cTe3Z5NiSTVpw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.9.tgz", + "integrity": "sha512-IZtukuUeBbhgOcaW2s06OXTzVNJR0ybm4W5xC1opWFFJMZbwRj5LCk+ByYH7WdZPZTt8KnFwA8pvjN2yqcPlgw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.24.7", - "@babel/helper-wrap-function": "^7.25.0", - "@babel/traverse": "^7.25.0" + "@babel/helper-annotate-as-pure": "^7.25.9", + "@babel/helper-wrap-function": "^7.25.9", + "@babel/traverse": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -442,15 +535,15 @@ } }, "node_modules/@babel/helper-replace-supers": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.0.tgz", - "integrity": "sha512-q688zIvQVYtZu+i2PsdIu/uWGRpfxzr5WESsfpShfZECkO+d2o+WROWezCi/Q6kJ0tfPa5+pUGUlfx2HhrA3Bg==", + "version": "7.26.5", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.26.5.tgz", + "integrity": "sha512-bJ6iIVdYX1YooY2X7w1q6VITt+LnUILtNk7zT78ykuwStx8BauCzxvFqFaHjOpW1bVnSUM1PN1f0p5P21wHxvg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-member-expression-to-functions": "^7.24.8", - "@babel/helper-optimise-call-expression": "^7.24.7", - "@babel/traverse": "^7.25.0" + "@babel/helper-member-expression-to-functions": "^7.25.9", + "@babel/helper-optimise-call-expression": "^7.25.9", + "@babel/traverse": "^7.26.5" }, "engines": { "node": ">=6.9.0" @@ -459,38 +552,24 @@ "@babel/core": "^7.0.0" } }, - "node_modules/@babel/helper-simple-access": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz", - "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/traverse": "^7.24.7", - "@babel/types": "^7.24.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, "node_modules/@babel/helper-skip-transparent-expression-wrappers": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.24.7.tgz", - "integrity": "sha512-IO+DLT3LQUElMbpzlatRASEyQtfhSE0+m465v++3jyyXeBTBUjtVZg28/gHeV5mrTJqvEKhKroBGAvhW+qPHiQ==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.9.tgz", + "integrity": "sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/traverse": "^7.24.7", - "@babel/types": "^7.24.7" + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.25.9" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-string-parser": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz", - "integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz", + "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==", "dev": true, "license": "MIT", "engines": { @@ -498,9 +577,9 @@ } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz", - "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz", + "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==", "dev": true, "license": "MIT", "engines": { @@ -508,9 +587,9 @@ } }, "node_modules/@babel/helper-validator-option": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz", - "integrity": "sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz", + "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==", "dev": true, "license": "MIT", "engines": { @@ -518,136 +597,42 @@ } }, "node_modules/@babel/helper-wrap-function": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.0.tgz", - "integrity": "sha512-s6Q1ebqutSiZnEjaofc/UKDyC4SbzV5n5SrA2Gq8UawLycr3i04f1dX4OzoQVnexm6aOCh37SQNYlJ/8Ku+PMQ==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.9.tgz", + "integrity": "sha512-ETzz9UTjQSTmw39GboatdymDq4XIQbR8ySgVrylRhPOFpsd+JrKHIuF0de7GCWmem+T4uC5z7EZguod7Wj4A4g==", "dev": true, "license": "MIT", "dependencies": { - "@babel/template": "^7.25.0", - "@babel/traverse": "^7.25.0", - "@babel/types": "^7.25.0" + "@babel/template": "^7.25.9", + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.25.9" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helpers": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.6.tgz", - "integrity": "sha512-Xg0tn4HcfTijTwfDwYlvVCl43V6h4KyVVX2aEm4qdO/PC6L2YvzLHFdmxhoeSA3eslcE6+ZVXHgWwopXYLNq4Q==", + "version": "7.26.7", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.7.tgz", + "integrity": "sha512-8NHiL98vsi0mbPQmYAGWwfcFaOy4j2HY49fXJCfuDcdE7fMIsH9a7GdaeXpIBsbT7307WU8KCMp5pUVDNL4f9A==", "dev": true, "license": "MIT", "dependencies": { - "@babel/template": "^7.25.0", - "@babel/types": "^7.25.6" + "@babel/template": "^7.25.9", + "@babel/types": "^7.26.7" }, "engines": { "node": ">=6.9.0" } }, - "node_modules/@babel/highlight": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz", - "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-validator-identifier": "^7.24.7", - "chalk": "^2.4.2", - "js-tokens": "^4.0.0", - "picocolors": "^1.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/highlight/node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "license": "MIT", - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "license": "MIT", - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/@babel/highlight/node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true, - "license": "MIT" - }, - "node_modules/@babel/highlight/node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/@babel/highlight/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "license": "MIT", - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/@babel/parser": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.6.tgz", - "integrity": "sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==", + "version": "7.26.8", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.8.tgz", + "integrity": "sha512-TZIQ25pkSoaKEYYaHbbxkfL36GNsQ6iFiBbeuzAkLnXayKR1yP1zFe+NxuZWWsUyvt8icPU9CCq0sgWGXR1GEw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^7.25.6" + "@babel/types": "^7.26.8" }, "bin": { "parser": "bin/babel-parser.js" @@ -657,14 +642,14 @@ } }, "node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": { - "version": "7.25.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.3.tgz", - "integrity": "sha512-wUrcsxZg6rqBXG05HG1FPYgsP6EvwF4WpBbxIpWIIYnH8wG0gzx3yZY3dtEHas4sTAOGkbTsc9EGPxwff8lRoA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.9.tgz", + "integrity": "sha512-ZkRyVkThtxQ/J6nv3JFYv1RYY+JT5BvU0y3k5bWrmuG4woXypRa4PXmm9RhOwodRkYFWqC0C0cqcJ4OqR7kW+g==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/traverse": "^7.25.3" + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/traverse": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -674,13 +659,13 @@ } }, "node_modules/@babel/plugin-bugfix-safari-class-field-initializer-scope": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.0.tgz", - "integrity": "sha512-Bm4bH2qsX880b/3ziJ8KD711LT7z4u8CFudmjqle65AZj/HNUFhEf90dqYv6O86buWvSBmeQDjv0Tn2aF/bIBA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.9.tgz", + "integrity": "sha512-MrGRLZxLD/Zjj0gdU15dfs+HH/OXvnw/U4jJD8vpcP2CJQapPEv1IWwjc/qMg7ItBlPwSv1hRBbb7LeuANdcnw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -690,13 +675,13 @@ } }, "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.0.tgz", - "integrity": "sha512-lXwdNZtTmeVOOFtwM/WDe7yg1PL8sYhRk/XH0FzbR2HDQ0xC+EnQ/JHeoMYSavtU115tnUk0q9CDyq8si+LMAA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.9.tgz", + "integrity": "sha512-2qUwwfAFpJLZqxd02YW9btUCZHl+RFvdDkNfZwaIJrvB8Tesjsk8pEQkTvGwZXLqXUx/2oyY3ySRhm6HOXuCug==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -706,15 +691,15 @@ } }, "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.7.tgz", - "integrity": "sha512-+izXIbke1T33mY4MSNnrqhPXDz01WYhEf3yF5NbnUtkiNnm+XBZJl3kNfoK6NKmYlz/D07+l2GWVK/QfDkNCuQ==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.25.9.tgz", + "integrity": "sha512-6xWgLZTJXwilVjlnV7ospI3xi+sl8lN8rXXbBD6vYn3UYDlGsag8wrZkKcSI8G6KgqKP7vNFaDgeDnfAABq61g==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7", - "@babel/plugin-transform-optional-chaining": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9", + "@babel/plugin-transform-optional-chaining": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -724,14 +709,14 @@ } }, "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.0.tgz", - "integrity": "sha512-tggFrk1AIShG/RUQbEwt2Tr/E+ObkfwrPjR6BjbRvsx24+PSjK8zrq0GWPNCjo8qpRx4DuJzlcvWJqlm+0h3kw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.9.tgz", + "integrity": "sha512-aLnMXYPnzwwqhYSCyXfKkIkYgJ8zv9RK+roo9DkTXz38ynIhd9XCbN08s3MGvqL2MYGVUGdRQLL/JqBIeJhJBg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/traverse": "^7.25.0" + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/traverse": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -753,82 +738,14 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-syntax-async-generators": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", - "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-class-properties": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", - "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.12.13" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-class-static-block": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz", - "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.14.5" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-dynamic-import": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz", - "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-export-namespace-from": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz", - "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.3" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, "node_modules/@babel/plugin-syntax-import-assertions": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.25.6.tgz", - "integrity": "sha512-aABl0jHw9bZ2karQ/uUD6XP4u0SG22SJrOHFoL6XB1R7dTovOP4TzTlsxOYC5yQ1pdscVK2JTUnF6QL3ARoAiQ==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.26.0.tgz", + "integrity": "sha512-QCWT5Hh830hK5EQa7XzuqIkQU9tT/whqbDz7kuaZMHFl1inRRg7JnuAEOQ0Ur0QUl0NufCk1msK2BeY79Aj/eg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -838,149 +755,13 @@ } }, "node_modules/@babel/plugin-syntax-import-attributes": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.25.6.tgz", - "integrity": "sha512-sXaDXaJN9SNLymBdlWFA+bjzBhFD617ZaFiY13dGt7TVslVvVgA6fkZOP7Ki3IGElC45lwHdOTrCtKZGVAWeLQ==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.26.0.tgz", + "integrity": "sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-import-meta": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz", - "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.10.4" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-json-strings": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", - "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-logical-assignment-operators": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", - "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.10.4" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", - "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-numeric-separator": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", - "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.10.4" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-object-rest-spread": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", - "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-optional-catch-binding": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", - "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-optional-chaining": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", - "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-private-property-in-object": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz", - "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.14.5" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-top-level-await": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", - "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.14.5" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1007,13 +788,13 @@ } }, "node_modules/@babel/plugin-transform-arrow-functions": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.7.tgz", - "integrity": "sha512-Dt9LQs6iEY++gXUwY03DNFat5C2NbO48jj+j/bSAz6b3HgPs39qcPiYt77fDObIcFwj3/C2ICX9YMwGflUoSHQ==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.25.9.tgz", + "integrity": "sha512-6jmooXYIwn9ca5/RylZADJ+EnSxVUS5sjeJ9UPk6RWRzXCmOJCy6dqItPJFpw2cuCangPK4OYr5uhGKcmrm5Qg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1023,16 +804,15 @@ } }, "node_modules/@babel/plugin-transform-async-generator-functions": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.4.tgz", - "integrity": "sha512-jz8cV2XDDTqjKPwVPJBIjORVEmSGYhdRa8e5k5+vN+uwcjSrSxUaebBRa4ko1jqNF2uxyg8G6XYk30Jv285xzg==", + "version": "7.26.8", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.26.8.tgz", + "integrity": "sha512-He9Ej2X7tNf2zdKMAGOsmg2MrFc+hfoAhd3po4cWfo/NWjzEAKa0oQruj1ROVUdl0e6fb6/kE/G3SSxE0lRJOg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/helper-remap-async-to-generator": "^7.25.0", - "@babel/plugin-syntax-async-generators": "^7.8.4", - "@babel/traverse": "^7.25.4" + "@babel/helper-plugin-utils": "^7.26.5", + "@babel/helper-remap-async-to-generator": "^7.25.9", + "@babel/traverse": "^7.26.8" }, "engines": { "node": ">=6.9.0" @@ -1042,15 +822,15 @@ } }, "node_modules/@babel/plugin-transform-async-to-generator": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.7.tgz", - "integrity": "sha512-SQY01PcJfmQ+4Ash7NE+rpbLFbmqA2GPIgqzxfFTL4t1FKRq4zTms/7htKpoCUI9OcFYgzqfmCdH53s6/jn5fA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.25.9.tgz", + "integrity": "sha512-NT7Ejn7Z/LjUH0Gv5KsBCxh7BH3fbLTV0ptHvpeMvrt3cPThHfJfst9Wrb7S8EvJ7vRTFI7z+VAvFVEQn/m5zQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-module-imports": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/helper-remap-async-to-generator": "^7.24.7" + "@babel/helper-module-imports": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-remap-async-to-generator": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1060,13 +840,13 @@ } }, "node_modules/@babel/plugin-transform-block-scoped-functions": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.7.tgz", - "integrity": "sha512-yO7RAz6EsVQDaBH18IDJcMB1HnrUn2FJ/Jslc/WtPPWcjhpUJXU/rjbwmluzp7v/ZzWcEhTMXELnnsz8djWDwQ==", + "version": "7.26.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.26.5.tgz", + "integrity": "sha512-chuTSY+hq09+/f5lMj8ZSYgCFpppV2CbYrhNFJ1BFoXpiWPnnAb7R0MqrafCpN8E1+YRrtM1MXZHJdIx8B6rMQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.26.5" }, "engines": { "node": ">=6.9.0" @@ -1076,13 +856,13 @@ } }, "node_modules/@babel/plugin-transform-block-scoping": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.0.tgz", - "integrity": "sha512-yBQjYoOjXlFv9nlXb3f1casSHOZkWr29NX+zChVanLg5Nc157CrbEX9D7hxxtTpuFy7Q0YzmmWfJxzvps4kXrQ==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.9.tgz", + "integrity": "sha512-1F05O7AYjymAtqbsFETboN1NvBdcnzMerO+zlMyJBEz6WkMdejvGWw9p05iTSjC85RLlBseHHQpYaM4gzJkBGg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1092,14 +872,14 @@ } }, "node_modules/@babel/plugin-transform-class-properties": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.4.tgz", - "integrity": "sha512-nZeZHyCWPfjkdU5pA/uHiTaDAFUEqkpzf1YoQT2NeSynCGYq9rxfyI3XpQbfx/a0hSnFH6TGlEXvae5Vi7GD8g==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.9.tgz", + "integrity": "sha512-bbMAII8GRSkcd0h0b4X+36GksxuheLFjP65ul9w6C3KgAamI3JqErNgSrosX6ZPj+Mpim5VvEbawXxJCyEUV3Q==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.25.4", - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-create-class-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1109,15 +889,14 @@ } }, "node_modules/@babel/plugin-transform-class-static-block": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.7.tgz", - "integrity": "sha512-HMXK3WbBPpZQufbMG4B46A90PkuuhN9vBCb5T8+VAHqvAqvcLi+2cKoukcpmUYkszLhScU3l1iudhrks3DggRQ==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.26.0.tgz", + "integrity": "sha512-6J2APTs7BDDm+UMqP1useWqhcRAXo0WIoVj26N7kPFB6S73Lgvyka4KTZYIxtgYXiN5HTyRObA72N2iu628iTQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-class-static-block": "^7.14.5" + "@babel/helper-create-class-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1127,17 +906,17 @@ } }, "node_modules/@babel/plugin-transform-classes": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.4.tgz", - "integrity": "sha512-oexUfaQle2pF/b6E0dwsxQtAol9TLSO88kQvym6HHBWFliV2lGdrPieX+WgMRLSJDVzdYywk7jXbLPuO2KLTLg==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.9.tgz", + "integrity": "sha512-mD8APIXmseE7oZvZgGABDyM34GUmK45Um2TXiBUt7PnuAxrgoSVf123qUzPxEr/+/BHrRn5NMZCdE2m/1F8DGg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.24.7", - "@babel/helper-compilation-targets": "^7.25.2", - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/helper-replace-supers": "^7.25.0", - "@babel/traverse": "^7.25.4", + "@babel/helper-annotate-as-pure": "^7.25.9", + "@babel/helper-compilation-targets": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-replace-supers": "^7.25.9", + "@babel/traverse": "^7.25.9", "globals": "^11.1.0" }, "engines": { @@ -1158,14 +937,14 @@ } }, "node_modules/@babel/plugin-transform-computed-properties": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.7.tgz", - "integrity": "sha512-25cS7v+707Gu6Ds2oY6tCkUwsJ9YIDbggd9+cu9jzzDgiNq7hR/8dkzxWfKWnTic26vsI3EsCXNd4iEB6e8esQ==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.25.9.tgz", + "integrity": "sha512-HnBegGqXZR12xbcTHlJ9HGxw1OniltT26J5YpfruGqtUHlz/xKf/G2ak9e+t0rVqrjXa9WOhvYPz1ERfMj23AA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/template": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/template": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1175,13 +954,13 @@ } }, "node_modules/@babel/plugin-transform-destructuring": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.8.tgz", - "integrity": "sha512-36e87mfY8TnRxc7yc6M9g9gOB7rKgSahqkIKwLpz4Ppk2+zC2Cy1is0uwtuSG6AE4zlTOUa+7JGz9jCJGLqQFQ==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.9.tgz", + "integrity": "sha512-WkCGb/3ZxXepmMiX101nnGiU+1CAdut8oHyEOHxkKuS1qKpU2SMXE2uSvfz8PBuLd49V6LEsbtyPhWC7fnkgvQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1191,14 +970,14 @@ } }, "node_modules/@babel/plugin-transform-dotall-regex": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.7.tgz", - "integrity": "sha512-ZOA3W+1RRTSWvyqcMJDLqbchh7U4NRGqwRfFSVbOLS/ePIP4vHB5e8T8eXcuqyN1QkgKyj5wuW0lcS85v4CrSw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.25.9.tgz", + "integrity": "sha512-t7ZQ7g5trIgSRYhI9pIJtRl64KHotutUJsh4Eze5l7olJv+mRSg4/MmbZ0tv1eeqRbdvo/+trvJD/Oc5DmW2cA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-create-regexp-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1208,13 +987,13 @@ } }, "node_modules/@babel/plugin-transform-duplicate-keys": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.7.tgz", - "integrity": "sha512-JdYfXyCRihAe46jUIliuL2/s0x0wObgwwiGxw/UbgJBr20gQBThrokO4nYKgWkD7uBaqM7+9x5TU7NkExZJyzw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.25.9.tgz", + "integrity": "sha512-LZxhJ6dvBb/f3x8xwWIuyiAHy56nrRG3PeYTpBkkzkYRRQ6tJLu68lEF5VIqMUZiAV7a8+Tb78nEoMCMcqjXBw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1224,14 +1003,14 @@ } }, "node_modules/@babel/plugin-transform-duplicate-named-capturing-groups-regex": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.0.tgz", - "integrity": "sha512-YLpb4LlYSc3sCUa35un84poXoraOiQucUTTu8X1j18JV+gNa8E0nyUf/CjZ171IRGr4jEguF+vzJU66QZhn29g==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.9.tgz", + "integrity": "sha512-0UfuJS0EsXbRvKnwcLjFtJy/Sxc5J5jhLHnFhy7u4zih97Hz6tJkLU+O+FMMrNZrosUPxDi6sYxJ/EA8jDiAog==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.25.0", - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-create-regexp-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1241,14 +1020,13 @@ } }, "node_modules/@babel/plugin-transform-dynamic-import": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.24.7.tgz", - "integrity": "sha512-sc3X26PhZQDb3JhORmakcbvkeInvxz+A8oda99lj7J60QRuPZvNAk9wQlTBS1ZynelDrDmTU4pw1tyc5d5ZMUg==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.25.9.tgz", + "integrity": "sha512-GCggjexbmSLaFhqsojeugBpeaRIgWNTcgKVq/0qIteFEqY2A+b9QidYadrWlnbWQUrW5fn+mCvf3tr7OeBFTyg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-dynamic-import": "^7.8.3" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1258,14 +1036,13 @@ } }, "node_modules/@babel/plugin-transform-exponentiation-operator": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.7.tgz", - "integrity": "sha512-Rqe/vSc9OYgDajNIK35u7ot+KeCoetqQYFXM4Epf7M7ez3lWlOjrDjrwMei6caCVhfdw+mIKD4cgdGNy5JQotQ==", + "version": "7.26.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.26.3.tgz", + "integrity": "sha512-7CAHcQ58z2chuXPWblnn1K6rLDnDWieghSOEmqQsrBenH0P9InCUtOJYD89pvngljmZlJcz3fcmgYsXFNGa1ZQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-builder-binary-assignment-operator-visitor": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1275,14 +1052,13 @@ } }, "node_modules/@babel/plugin-transform-export-namespace-from": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.24.7.tgz", - "integrity": "sha512-v0K9uNYsPL3oXZ/7F9NNIbAj2jv1whUEtyA6aujhekLs56R++JDQuzRcP2/z4WX5Vg/c5lE9uWZA0/iUoFhLTA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.25.9.tgz", + "integrity": "sha512-2NsEz+CxzJIVOPx2o9UsW1rXLqtChtLoVnwYHHiB04wS5sgn7mrV45fWMBX0Kk+ub9uXytVYfNP2HjbVbCB3Ww==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-export-namespace-from": "^7.8.3" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1292,14 +1068,14 @@ } }, "node_modules/@babel/plugin-transform-for-of": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.7.tgz", - "integrity": "sha512-wo9ogrDG1ITTTBsy46oGiN1dS9A7MROBTcYsfS8DtsImMkHk9JXJ3EWQM6X2SUw4x80uGPlwj0o00Uoc6nEE3g==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.25.9.tgz", + "integrity": "sha512-LqHxduHoaGELJl2uhImHwRQudhCM50pT46rIBNvtT/Oql3nqiS3wOwP+5ten7NpYSXrrVLgtZU3DZmPtWZo16A==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1309,15 +1085,15 @@ } }, "node_modules/@babel/plugin-transform-function-name": { - "version": "7.25.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.1.tgz", - "integrity": "sha512-TVVJVdW9RKMNgJJlLtHsKDTydjZAbwIsn6ySBPQaEAUU5+gVvlJt/9nRmqVbsV/IBanRjzWoaAQKLoamWVOUuA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.9.tgz", + "integrity": "sha512-8lP+Yxjv14Vc5MuWBpJsoUCd3hD6V9DgBon2FVYL4jJgbnVQ9fTgYmonchzZJOVNgzEgbxp4OwAf6xz6M/14XA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-compilation-targets": "^7.24.8", - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/traverse": "^7.25.1" + "@babel/helper-compilation-targets": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/traverse": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1327,14 +1103,13 @@ } }, "node_modules/@babel/plugin-transform-json-strings": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.24.7.tgz", - "integrity": "sha512-2yFnBGDvRuxAaE/f0vfBKvtnvvqU8tGpMHqMNpTN2oWMKIR3NqFkjaAgGwawhqK/pIN2T3XdjGPdaG0vDhOBGw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.25.9.tgz", + "integrity": "sha512-xoTMk0WXceiiIvsaquQQUaLLXSW1KJ159KP87VilruQm0LNNGxWzahxSS6T6i4Zg3ezp4vA4zuwiNUR53qmQAw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-json-strings": "^7.8.3" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1344,13 +1119,13 @@ } }, "node_modules/@babel/plugin-transform-literals": { - "version": "7.25.2", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.2.tgz", - "integrity": "sha512-HQI+HcTbm9ur3Z2DkO+jgESMAMcYLuN/A7NRw9juzxAezN9AvqvUTnpKP/9kkYANz6u7dFlAyOu44ejuGySlfw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.9.tgz", + "integrity": "sha512-9N7+2lFziW8W9pBl2TzaNht3+pgMIRP74zizeCSrtnSKVdUl8mAjjOP2OOVQAfZ881P2cNjDj1uAMEdeD50nuQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1360,14 +1135,13 @@ } }, "node_modules/@babel/plugin-transform-logical-assignment-operators": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.24.7.tgz", - "integrity": "sha512-4D2tpwlQ1odXmTEIFWy9ELJcZHqrStlzK/dAOWYyxX3zT0iXQB6banjgeOJQXzEc4S0E0a5A+hahxPaEFYftsw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.25.9.tgz", + "integrity": "sha512-wI4wRAzGko551Y8eVf6iOY9EouIDTtPb0ByZx+ktDGHwv6bHFimrgJM/2T021txPZ2s4c7bqvHbd+vXG6K948Q==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1377,13 +1151,13 @@ } }, "node_modules/@babel/plugin-transform-member-expression-literals": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.7.tgz", - "integrity": "sha512-T/hRC1uqrzXMKLQ6UCwMT85S3EvqaBXDGf0FaMf4446Qx9vKwlghvee0+uuZcDUCZU5RuNi4781UQ7R308zzBw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.25.9.tgz", + "integrity": "sha512-PYazBVfofCQkkMzh2P6IdIUaCEWni3iYEerAsRWuVd8+jlM1S9S9cz1dF9hIzyoZ8IA3+OwVYIp9v9e+GbgZhA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1393,14 +1167,14 @@ } }, "node_modules/@babel/plugin-transform-modules-amd": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.7.tgz", - "integrity": "sha512-9+pB1qxV3vs/8Hdmz/CulFB8w2tuu6EB94JZFsjdqxQokwGa9Unap7Bo2gGBGIvPmDIVvQrom7r5m/TCDMURhg==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.25.9.tgz", + "integrity": "sha512-g5T11tnI36jVClQlMlt4qKDLlWnG5pP9CSM4GhdRciTNMRgkfpo5cR6b4rGIOYPgRRuFAvwjPQ/Yk+ql4dyhbw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-module-transforms": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-module-transforms": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1410,15 +1184,14 @@ } }, "node_modules/@babel/plugin-transform-modules-commonjs": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.8.tgz", - "integrity": "sha512-WHsk9H8XxRs3JXKWFiqtQebdh9b/pTk4EgueygFzYlTKAg0Ud985mSevdNjdXdFBATSKVJGQXP1tv6aGbssLKA==", + "version": "7.26.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.26.3.tgz", + "integrity": "sha512-MgR55l4q9KddUDITEzEFYn5ZsGDXMSsU9E+kh7fjRXTIC3RHqfCo8RPRbyReYJh44HQ/yomFkqbOFohXvDCiIQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-module-transforms": "^7.24.8", - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/helper-simple-access": "^7.24.7" + "@babel/helper-module-transforms": "^7.26.0", + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1428,16 +1201,16 @@ } }, "node_modules/@babel/plugin-transform-modules-systemjs": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.0.tgz", - "integrity": "sha512-YPJfjQPDXxyQWg/0+jHKj1llnY5f/R6a0p/vP4lPymxLu7Lvl4k2WMitqi08yxwQcCVUUdG9LCUj4TNEgAp3Jw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.9.tgz", + "integrity": "sha512-hyss7iIlH/zLHaehT+xwiymtPOpsiwIIRlCAOwBB04ta5Tt+lNItADdlXw3jAWZ96VJ2jlhl/c+PNIQPKNfvcA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-module-transforms": "^7.25.0", - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/helper-validator-identifier": "^7.24.7", - "@babel/traverse": "^7.25.0" + "@babel/helper-module-transforms": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-validator-identifier": "^7.25.9", + "@babel/traverse": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1447,14 +1220,14 @@ } }, "node_modules/@babel/plugin-transform-modules-umd": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.7.tgz", - "integrity": "sha512-3aytQvqJ/h9z4g8AsKPLvD4Zqi2qT+L3j7XoFFu1XBlZWEl2/1kWnhmAbxpLgPrHSY0M6UA02jyTiwUVtiKR6A==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.25.9.tgz", + "integrity": "sha512-bS9MVObUgE7ww36HEfwe6g9WakQ0KF07mQF74uuXdkoziUPfKyu/nIm663kz//e5O1nPInPFx36z7WJmJ4yNEw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-module-transforms": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-module-transforms": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1464,14 +1237,14 @@ } }, "node_modules/@babel/plugin-transform-named-capturing-groups-regex": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.24.7.tgz", - "integrity": "sha512-/jr7h/EWeJtk1U/uz2jlsCioHkZk1JJZVcc8oQsJ1dUlaJD83f4/6Zeh2aHt9BIFokHIsSeDfhUmju0+1GPd6g==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.25.9.tgz", + "integrity": "sha512-oqB6WHdKTGl3q/ItQhpLSnWWOpjUJLsOCLVyeFgeTktkBSCiurvPOsyt93gibI9CmuKvTUEtWmG5VhZD+5T/KA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-create-regexp-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1481,13 +1254,13 @@ } }, "node_modules/@babel/plugin-transform-new-target": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.7.tgz", - "integrity": "sha512-RNKwfRIXg4Ls/8mMTza5oPF5RkOW8Wy/WgMAp1/F1yZ8mMbtwXW+HDoJiOsagWrAhI5f57Vncrmr9XeT4CVapA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.25.9.tgz", + "integrity": "sha512-U/3p8X1yCSoKyUj2eOBIx3FOn6pElFOKvAAGf8HTtItuPyB+ZeOqfn+mvTtg9ZlOAjsPdK3ayQEjqHjU/yLeVQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1497,14 +1270,13 @@ } }, "node_modules/@babel/plugin-transform-nullish-coalescing-operator": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.24.7.tgz", - "integrity": "sha512-Ts7xQVk1OEocqzm8rHMXHlxvsfZ0cEF2yomUqpKENHWMF4zKk175Y4q8H5knJes6PgYad50uuRmt3UJuhBw8pQ==", + "version": "7.26.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.26.6.tgz", + "integrity": "sha512-CKW8Vu+uUZneQCPtXmSBUC6NCAUdya26hWCElAWh5mVSlSRsmiCPUUDKb3Z0szng1hiAJa098Hkhg9o4SE35Qw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3" + "@babel/helper-plugin-utils": "^7.26.5" }, "engines": { "node": ">=6.9.0" @@ -1514,14 +1286,13 @@ } }, "node_modules/@babel/plugin-transform-numeric-separator": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.24.7.tgz", - "integrity": "sha512-e6q1TiVUzvH9KRvicuxdBTUj4AdKSRwzIyFFnfnezpCfP2/7Qmbb8qbU2j7GODbl4JMkblitCQjKYUaX/qkkwA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.25.9.tgz", + "integrity": "sha512-TlprrJ1GBZ3r6s96Yq8gEQv82s8/5HnCVHtEJScUj90thHQbwe+E5MLhi2bbNHBEJuzrvltXSru+BUxHDoog7Q==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-numeric-separator": "^7.10.4" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1531,16 +1302,15 @@ } }, "node_modules/@babel/plugin-transform-object-rest-spread": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.7.tgz", - "integrity": "sha512-4QrHAr0aXQCEFni2q4DqKLD31n2DL+RxcwnNjDFkSG0eNQ/xCavnRkfCUjsyqGC2OviNJvZOF/mQqZBw7i2C5Q==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.25.9.tgz", + "integrity": "sha512-fSaXafEE9CVHPweLYw4J0emp1t8zYTXyzN3UuG+lylqkvYd7RMrsOQ8TYx5RF231be0vqtFC6jnx3UmpJmKBYg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-compilation-targets": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-transform-parameters": "^7.24.7" + "@babel/helper-compilation-targets": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/plugin-transform-parameters": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1550,14 +1320,14 @@ } }, "node_modules/@babel/plugin-transform-object-super": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.7.tgz", - "integrity": "sha512-A/vVLwN6lBrMFmMDmPPz0jnE6ZGx7Jq7d6sT/Ev4H65RER6pZ+kczlf1DthF5N0qaPHBsI7UXiE8Zy66nmAovg==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.25.9.tgz", + "integrity": "sha512-Kj/Gh+Rw2RNLbCK1VAWj2U48yxxqL2x0k10nPtSdRa0O2xnHXalD0s+o1A6a0W43gJ00ANo38jxkQreckOzv5A==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/helper-replace-supers": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-replace-supers": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1567,14 +1337,13 @@ } }, "node_modules/@babel/plugin-transform-optional-catch-binding": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.24.7.tgz", - "integrity": "sha512-uLEndKqP5BfBbC/5jTwPxLh9kqPWWgzN/f8w6UwAIirAEqiIVJWWY312X72Eub09g5KF9+Zn7+hT7sDxmhRuKA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.25.9.tgz", + "integrity": "sha512-qM/6m6hQZzDcZF3onzIhZeDHDO43bkNNlOX0i8n3lR6zLbu0GN2d8qfM/IERJZYauhAHSLHy39NF0Ctdvcid7g==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.3" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1584,15 +1353,14 @@ } }, "node_modules/@babel/plugin-transform-optional-chaining": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.8.tgz", - "integrity": "sha512-5cTOLSMs9eypEy8JUVvIKOu6NgvbJMnpG62VpIHrTmROdQ+L5mDAaI40g25k5vXti55JWNX5jCkq3HZxXBQANw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.25.9.tgz", + "integrity": "sha512-6AvV0FsLULbpnXeBjrY4dmWF8F7gf8QnvTEoO/wX/5xm/xE1Xo8oPuD3MPS+KS9f9XBEAWN7X1aWr4z9HdOr7A==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7", - "@babel/plugin-syntax-optional-chaining": "^7.8.3" + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1602,13 +1370,13 @@ } }, "node_modules/@babel/plugin-transform-parameters": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.7.tgz", - "integrity": "sha512-yGWW5Rr+sQOhK0Ot8hjDJuxU3XLRQGflvT4lhlSY0DFvdb3TwKaY26CJzHtYllU0vT9j58hc37ndFPsqT1SrzA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.9.tgz", + "integrity": "sha512-wzz6MKwpnshBAiRmn4jR8LYz/g8Ksg0o80XmwZDlordjwEk9SxBzTWC7F5ef1jhbrbOW2DJ5J6ayRukrJmnr0g==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1618,14 +1386,14 @@ } }, "node_modules/@babel/plugin-transform-private-methods": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.4.tgz", - "integrity": "sha512-ao8BG7E2b/URaUQGqN3Tlsg+M3KlHY6rJ1O1gXAEUnZoyNQnvKyH87Kfg+FoxSeyWUB8ISZZsC91C44ZuBFytw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.9.tgz", + "integrity": "sha512-D/JUozNpQLAPUVusvqMxyvjzllRaF8/nSrP1s2YGQT/W4LHK4xxsMcHjhOGTS01mp9Hda8nswb+FblLdJornQw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.25.4", - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-create-class-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1635,16 +1403,15 @@ } }, "node_modules/@babel/plugin-transform-private-property-in-object": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.7.tgz", - "integrity": "sha512-9z76mxwnwFxMyxZWEgdgECQglF2Q7cFLm0kMf8pGwt+GSJsY0cONKj/UuO4bOH0w/uAel3ekS4ra5CEAyJRmDA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.25.9.tgz", + "integrity": "sha512-Evf3kcMqzXA3xfYJmZ9Pg1OvKdtqsDMSWBDzZOPLvHiTt36E75jLDQo5w1gtRU95Q4E5PDttrTf25Fw8d/uWLw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.24.7", - "@babel/helper-create-class-features-plugin": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-private-property-in-object": "^7.14.5" + "@babel/helper-annotate-as-pure": "^7.25.9", + "@babel/helper-create-class-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1654,13 +1421,13 @@ } }, "node_modules/@babel/plugin-transform-property-literals": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.7.tgz", - "integrity": "sha512-EMi4MLQSHfd2nrCqQEWxFdha2gBCqU4ZcCng4WBGZ5CJL4bBRW0ptdqqDdeirGZcpALazVVNJqRmsO8/+oNCBA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.25.9.tgz", + "integrity": "sha512-IvIUeV5KrS/VPavfSM/Iu+RE6llrHrYIKY1yfCzyO/lMXHQ+p7uGhonmGVisv6tSBSVgWzMBohTcvkC9vQcQFA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1670,13 +1437,13 @@ } }, "node_modules/@babel/plugin-transform-regenerator": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.7.tgz", - "integrity": "sha512-lq3fvXPdimDrlg6LWBoqj+r/DEWgONuwjuOuQCSYgRroXDH/IdM1C0IZf59fL5cHLpjEH/O6opIRBbqv7ELnuA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.25.9.tgz", + "integrity": "sha512-vwDcDNsgMPDGP0nMqzahDWE5/MLcX8sv96+wfX7as7LoF/kr97Bo/7fI00lXY4wUXYfVmwIIyG80fGZ1uvt2qg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", + "@babel/helper-plugin-utils": "^7.25.9", "regenerator-transform": "^0.15.2" }, "engines": { @@ -1686,14 +1453,31 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-reserved-words": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.7.tgz", - "integrity": "sha512-0DUq0pHcPKbjFZCfTss/pGkYMfy3vFWydkUBd9r0GHpIyfs2eCDENvqadMycRS9wZCXR41wucAfJHJmwA0UmoQ==", + "node_modules/@babel/plugin-transform-regexp-modifiers": { + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regexp-modifiers/-/plugin-transform-regexp-modifiers-7.26.0.tgz", + "integrity": "sha512-vN6saax7lrA2yA/Pak3sCxuD6F5InBjn9IcrIKQPjpsLvuHYLVroTxjdlVRHjjBWxKOqIwpTXDkOssYT4BFdRw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-create-regexp-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/@babel/plugin-transform-reserved-words": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.25.9.tgz", + "integrity": "sha512-7DL7DKYjn5Su++4RXu8puKZm2XBPHyjWLUidaPEkCUBbE7IPcsrkRHggAOOKydH1dASWdcUBxrkOGNxUv5P3Jg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1703,13 +1487,13 @@ } }, "node_modules/@babel/plugin-transform-shorthand-properties": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.7.tgz", - "integrity": "sha512-KsDsevZMDsigzbA09+vacnLpmPH4aWjcZjXdyFKGzpplxhbeB4wYtury3vglQkg6KM/xEPKt73eCjPPf1PgXBA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.9.tgz", + "integrity": "sha512-MUv6t0FhO5qHnS/W8XCbHmiRWOphNufpE1IVxhK5kuN3Td9FT1x4rx4K42s3RYdMXCXpfWkGSbCSd0Z64xA7Ng==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1719,14 +1503,14 @@ } }, "node_modules/@babel/plugin-transform-spread": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.7.tgz", - "integrity": "sha512-x96oO0I09dgMDxJaANcRyD4ellXFLLiWhuwDxKZX5g2rWP1bTPkBSwCYv96VDXVT1bD9aPj8tppr5ITIh8hBng==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.25.9.tgz", + "integrity": "sha512-oNknIB0TbURU5pqJFVbOOFspVlrpVwo2H1+HUIsVDvp5VauGGDP1ZEvO8Nn5xyMEs3dakajOxlmkNW7kNgSm6A==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1736,13 +1520,13 @@ } }, "node_modules/@babel/plugin-transform-sticky-regex": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.7.tgz", - "integrity": "sha512-kHPSIJc9v24zEml5geKg9Mjx5ULpfncj0wRpYtxbvKyTtHCYDkVE3aHQ03FrpEo4gEe2vrJJS1Y9CJTaThA52g==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.25.9.tgz", + "integrity": "sha512-WqBUSgeVwucYDP9U/xNRQam7xV8W5Zf+6Eo7T2SRVUFlhRiMNFdFz58u0KZmCVVqs2i7SHgpRnAhzRNmKfi2uA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1752,13 +1536,13 @@ } }, "node_modules/@babel/plugin-transform-template-literals": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.7.tgz", - "integrity": "sha512-AfDTQmClklHCOLxtGoP7HkeMw56k1/bTQjwsfhL6pppo/M4TOBSq+jjBUBLmV/4oeFg4GWMavIl44ZeCtmmZTw==", + "version": "7.26.8", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.26.8.tgz", + "integrity": "sha512-OmGDL5/J0CJPJZTHZbi2XpO0tyT2Ia7fzpW5GURwdtp2X3fMmN8au/ej6peC/T33/+CRiIpA8Krse8hFGVmT5Q==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.26.5" }, "engines": { "node": ">=6.9.0" @@ -1768,13 +1552,13 @@ } }, "node_modules/@babel/plugin-transform-typeof-symbol": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.8.tgz", - "integrity": "sha512-adNTUpDCVnmAE58VEqKlAA6ZBlNkMnWD0ZcW76lyNFN3MJniyGFZfNwERVk8Ap56MCnXztmDr19T4mPTztcuaw==", + "version": "7.26.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.26.7.tgz", + "integrity": "sha512-jfoTXXZTgGg36BmhqT3cAYK5qkmqvJpvNrPhaK/52Vgjhw4Rq29s9UqpWWV0D6yuRmgiFH/BUVlkl96zJWqnaw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-plugin-utils": "^7.26.5" }, "engines": { "node": ">=6.9.0" @@ -1784,13 +1568,13 @@ } }, "node_modules/@babel/plugin-transform-unicode-escapes": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.7.tgz", - "integrity": "sha512-U3ap1gm5+4edc2Q/P+9VrBNhGkfnf+8ZqppY71Bo/pzZmXhhLdqgaUl6cuB07O1+AQJtCLfaOmswiNbSQ9ivhw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.25.9.tgz", + "integrity": "sha512-s5EDrE6bW97LtxOcGj1Khcx5AaXwiMmi4toFWRDP9/y0Woo6pXC+iyPu/KuhKtfSrNFd7jJB+/fkOtZy6aIC6Q==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1800,14 +1584,14 @@ } }, "node_modules/@babel/plugin-transform-unicode-property-regex": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.24.7.tgz", - "integrity": "sha512-uH2O4OV5M9FZYQrwc7NdVmMxQJOCCzFeYudlZSzUAHRFeOujQefa92E74TQDVskNHCzOXoigEuoyzHDhaEaK5w==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.25.9.tgz", + "integrity": "sha512-Jt2d8Ga+QwRluxRQ307Vlxa6dMrYEMZCgGxoPR8V52rxPyldHu3hdlHspxaqYmE7oID5+kB+UKUB/eWS+DkkWg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-create-regexp-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1817,14 +1601,14 @@ } }, "node_modules/@babel/plugin-transform-unicode-regex": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.7.tgz", - "integrity": "sha512-hlQ96MBZSAXUq7ltkjtu3FJCCSMx/j629ns3hA3pXnBXjanNP0LHi+JpPeA81zaWgVK1VGH95Xuy7u0RyQ8kMg==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.25.9.tgz", + "integrity": "sha512-yoxstj7Rg9dlNn9UQxzk4fcNivwv4nUYz7fYXBaKxvw/lnmPuOm/ikoELygbYq68Bls3D/D+NBPHiLwZdZZ4HA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-create-regexp-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1834,14 +1618,14 @@ } }, "node_modules/@babel/plugin-transform-unicode-sets-regex": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.4.tgz", - "integrity": "sha512-qesBxiWkgN1Q+31xUE9RcMk79eOXXDCv6tfyGMRSs4RGlioSg2WVyQAm07k726cSE56pa+Kb0y9epX2qaXzTvA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.9.tgz", + "integrity": "sha512-8BYqO3GeVNHtx69fdPshN3fnzUNLrWdHhk/icSwigksJGczKSizZ+Z6SBCxTs723Fr5VSNorTIK7a+R2tISvwQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.25.2", - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-create-regexp-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1851,94 +1635,80 @@ } }, "node_modules/@babel/preset-env": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.25.4.tgz", - "integrity": "sha512-W9Gyo+KmcxjGahtt3t9fb14vFRWvPpu5pT6GBlovAK6BTBcxgjfVMSQCfJl4oi35ODrxP6xx2Wr8LNST57Mraw==", + "version": "7.26.8", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.26.8.tgz", + "integrity": "sha512-um7Sy+2THd697S4zJEfv/U5MHGJzkN2xhtsR3T/SWRbVSic62nbISh51VVfU9JiO/L/Z97QczHTaFVkOU8IzNg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/compat-data": "^7.25.4", - "@babel/helper-compilation-targets": "^7.25.2", - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/helper-validator-option": "^7.24.8", - "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.25.3", - "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.25.0", - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.25.0", - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.24.7", - "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.25.0", + "@babel/compat-data": "^7.26.8", + "@babel/helper-compilation-targets": "^7.26.5", + "@babel/helper-plugin-utils": "^7.26.5", + "@babel/helper-validator-option": "^7.25.9", + "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.25.9", + "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.25.9", + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.25.9", + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.25.9", + "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.25.9", "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2", - "@babel/plugin-syntax-async-generators": "^7.8.4", - "@babel/plugin-syntax-class-properties": "^7.12.13", - "@babel/plugin-syntax-class-static-block": "^7.14.5", - "@babel/plugin-syntax-dynamic-import": "^7.8.3", - "@babel/plugin-syntax-export-namespace-from": "^7.8.3", - "@babel/plugin-syntax-import-assertions": "^7.24.7", - "@babel/plugin-syntax-import-attributes": "^7.24.7", - "@babel/plugin-syntax-import-meta": "^7.10.4", - "@babel/plugin-syntax-json-strings": "^7.8.3", - "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", - "@babel/plugin-syntax-numeric-separator": "^7.10.4", - "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", - "@babel/plugin-syntax-optional-chaining": "^7.8.3", - "@babel/plugin-syntax-private-property-in-object": "^7.14.5", - "@babel/plugin-syntax-top-level-await": "^7.14.5", + "@babel/plugin-syntax-import-assertions": "^7.26.0", + "@babel/plugin-syntax-import-attributes": "^7.26.0", "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6", - "@babel/plugin-transform-arrow-functions": "^7.24.7", - "@babel/plugin-transform-async-generator-functions": "^7.25.4", - "@babel/plugin-transform-async-to-generator": "^7.24.7", - "@babel/plugin-transform-block-scoped-functions": "^7.24.7", - "@babel/plugin-transform-block-scoping": "^7.25.0", - "@babel/plugin-transform-class-properties": "^7.25.4", - "@babel/plugin-transform-class-static-block": "^7.24.7", - "@babel/plugin-transform-classes": "^7.25.4", - "@babel/plugin-transform-computed-properties": "^7.24.7", - "@babel/plugin-transform-destructuring": "^7.24.8", - "@babel/plugin-transform-dotall-regex": "^7.24.7", - "@babel/plugin-transform-duplicate-keys": "^7.24.7", - "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.25.0", - "@babel/plugin-transform-dynamic-import": "^7.24.7", - "@babel/plugin-transform-exponentiation-operator": "^7.24.7", - "@babel/plugin-transform-export-namespace-from": "^7.24.7", - "@babel/plugin-transform-for-of": "^7.24.7", - "@babel/plugin-transform-function-name": "^7.25.1", - "@babel/plugin-transform-json-strings": "^7.24.7", - "@babel/plugin-transform-literals": "^7.25.2", - "@babel/plugin-transform-logical-assignment-operators": "^7.24.7", - "@babel/plugin-transform-member-expression-literals": "^7.24.7", - "@babel/plugin-transform-modules-amd": "^7.24.7", - "@babel/plugin-transform-modules-commonjs": "^7.24.8", - "@babel/plugin-transform-modules-systemjs": "^7.25.0", - "@babel/plugin-transform-modules-umd": "^7.24.7", - "@babel/plugin-transform-named-capturing-groups-regex": "^7.24.7", - "@babel/plugin-transform-new-target": "^7.24.7", - "@babel/plugin-transform-nullish-coalescing-operator": "^7.24.7", - "@babel/plugin-transform-numeric-separator": "^7.24.7", - "@babel/plugin-transform-object-rest-spread": "^7.24.7", - "@babel/plugin-transform-object-super": "^7.24.7", - "@babel/plugin-transform-optional-catch-binding": "^7.24.7", - "@babel/plugin-transform-optional-chaining": "^7.24.8", - "@babel/plugin-transform-parameters": "^7.24.7", - "@babel/plugin-transform-private-methods": "^7.25.4", - "@babel/plugin-transform-private-property-in-object": "^7.24.7", - "@babel/plugin-transform-property-literals": "^7.24.7", - "@babel/plugin-transform-regenerator": "^7.24.7", - "@babel/plugin-transform-reserved-words": "^7.24.7", - "@babel/plugin-transform-shorthand-properties": "^7.24.7", - "@babel/plugin-transform-spread": "^7.24.7", - "@babel/plugin-transform-sticky-regex": "^7.24.7", - "@babel/plugin-transform-template-literals": "^7.24.7", - "@babel/plugin-transform-typeof-symbol": "^7.24.8", - "@babel/plugin-transform-unicode-escapes": "^7.24.7", - "@babel/plugin-transform-unicode-property-regex": "^7.24.7", - "@babel/plugin-transform-unicode-regex": "^7.24.7", - "@babel/plugin-transform-unicode-sets-regex": "^7.25.4", + "@babel/plugin-transform-arrow-functions": "^7.25.9", + "@babel/plugin-transform-async-generator-functions": "^7.26.8", + "@babel/plugin-transform-async-to-generator": "^7.25.9", + "@babel/plugin-transform-block-scoped-functions": "^7.26.5", + "@babel/plugin-transform-block-scoping": "^7.25.9", + "@babel/plugin-transform-class-properties": "^7.25.9", + "@babel/plugin-transform-class-static-block": "^7.26.0", + "@babel/plugin-transform-classes": "^7.25.9", + "@babel/plugin-transform-computed-properties": "^7.25.9", + "@babel/plugin-transform-destructuring": "^7.25.9", + "@babel/plugin-transform-dotall-regex": "^7.25.9", + "@babel/plugin-transform-duplicate-keys": "^7.25.9", + "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.25.9", + "@babel/plugin-transform-dynamic-import": "^7.25.9", + "@babel/plugin-transform-exponentiation-operator": "^7.26.3", + "@babel/plugin-transform-export-namespace-from": "^7.25.9", + "@babel/plugin-transform-for-of": "^7.25.9", + "@babel/plugin-transform-function-name": "^7.25.9", + "@babel/plugin-transform-json-strings": "^7.25.9", + "@babel/plugin-transform-literals": "^7.25.9", + "@babel/plugin-transform-logical-assignment-operators": "^7.25.9", + "@babel/plugin-transform-member-expression-literals": "^7.25.9", + "@babel/plugin-transform-modules-amd": "^7.25.9", + "@babel/plugin-transform-modules-commonjs": "^7.26.3", + "@babel/plugin-transform-modules-systemjs": "^7.25.9", + "@babel/plugin-transform-modules-umd": "^7.25.9", + "@babel/plugin-transform-named-capturing-groups-regex": "^7.25.9", + "@babel/plugin-transform-new-target": "^7.25.9", + "@babel/plugin-transform-nullish-coalescing-operator": "^7.26.6", + "@babel/plugin-transform-numeric-separator": "^7.25.9", + "@babel/plugin-transform-object-rest-spread": "^7.25.9", + "@babel/plugin-transform-object-super": "^7.25.9", + "@babel/plugin-transform-optional-catch-binding": "^7.25.9", + "@babel/plugin-transform-optional-chaining": "^7.25.9", + "@babel/plugin-transform-parameters": "^7.25.9", + "@babel/plugin-transform-private-methods": "^7.25.9", + "@babel/plugin-transform-private-property-in-object": "^7.25.9", + "@babel/plugin-transform-property-literals": "^7.25.9", + "@babel/plugin-transform-regenerator": "^7.25.9", + "@babel/plugin-transform-regexp-modifiers": "^7.26.0", + "@babel/plugin-transform-reserved-words": "^7.25.9", + "@babel/plugin-transform-shorthand-properties": "^7.25.9", + "@babel/plugin-transform-spread": "^7.25.9", + "@babel/plugin-transform-sticky-regex": "^7.25.9", + "@babel/plugin-transform-template-literals": "^7.26.8", + "@babel/plugin-transform-typeof-symbol": "^7.26.7", + "@babel/plugin-transform-unicode-escapes": "^7.25.9", + "@babel/plugin-transform-unicode-property-regex": "^7.25.9", + "@babel/plugin-transform-unicode-regex": "^7.25.9", + "@babel/plugin-transform-unicode-sets-regex": "^7.25.9", "@babel/preset-modules": "0.1.6-no-external-plugins", "babel-plugin-polyfill-corejs2": "^0.4.10", - "babel-plugin-polyfill-corejs3": "^0.10.6", + "babel-plugin-polyfill-corejs3": "^0.11.0", "babel-plugin-polyfill-regenerator": "^0.6.1", - "core-js-compat": "^3.37.1", + "core-js-compat": "^3.40.0", "semver": "^6.3.1" }, "engines": { @@ -1973,17 +1743,10 @@ "@babel/core": "^7.0.0-0 || ^8.0.0-0 <8.0.0" } }, - "node_modules/@babel/regjsgen": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz", - "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==", - "dev": true, - "license": "MIT" - }, "node_modules/@babel/runtime": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.6.tgz", - "integrity": "sha512-VBj9MYyDb9tuLq7yzqjgzt6Q+IBQLrGZfdjOekyEirZPHxXWoTSGUTMrpsfi58Up73d13NfYLv8HT9vmznjzhQ==", + "version": "7.26.7", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.7.tgz", + "integrity": "sha512-AOPI3D+a8dXnja+iwsUqGRjr1BbZIe771sXdapOtYI531gSqpi92vXivKcq2asu/DFpdl1ceFAKZyRzK2PCVcQ==", "dev": true, "license": "MIT", "dependencies": { @@ -1994,9 +1757,9 @@ } }, "node_modules/@babel/standalone": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/standalone/-/standalone-7.25.6.tgz", - "integrity": "sha512-Kf2ZcZVqsKbtYhlA7sP0z5A3q5hmCVYMKMWRWNK/5OVwHIve3JY1djVRmIVAx8FMueLIfZGKQDIILK2w8zO4mg==", + "version": "7.26.8", + "resolved": "https://registry.npmjs.org/@babel/standalone/-/standalone-7.26.8.tgz", + "integrity": "sha512-WS5Cw/8gWP9qBJ+qPUVr5Le4bCeXTMoVHF9TofgEqAUpEgvVzNXCPf97SNLuDpSRNHNWcH2lFixGUGjaM6VVCg==", "dev": true, "license": "MIT", "optional": true, @@ -2005,32 +1768,32 @@ } }, "node_modules/@babel/template": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.0.tgz", - "integrity": "sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==", + "version": "7.26.8", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.26.8.tgz", + "integrity": "sha512-iNKaX3ZebKIsCvJ+0jd6embf+Aulaa3vNBqZ41kM7iTWjx5qzWKXGHiJUW3+nTpQ18SG11hdF8OAzKrpXkb96Q==", "dev": true, "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.24.7", - "@babel/parser": "^7.25.0", - "@babel/types": "^7.25.0" + "@babel/code-frame": "^7.26.2", + "@babel/parser": "^7.26.8", + "@babel/types": "^7.26.8" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.6.tgz", - "integrity": "sha512-9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ==", + "version": "7.26.8", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.8.tgz", + "integrity": "sha512-nic9tRkjYH0oB2dzr/JoGIm+4Q6SuYeLEiIiZDwBscRMYFJ+tMAz98fuel9ZnbXViA2I0HVSSRRK8DW5fjXStA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.24.7", - "@babel/generator": "^7.25.6", - "@babel/parser": "^7.25.6", - "@babel/template": "^7.25.0", - "@babel/types": "^7.25.6", + "@babel/code-frame": "^7.26.2", + "@babel/generator": "^7.26.8", + "@babel/parser": "^7.26.8", + "@babel/template": "^7.26.8", + "@babel/types": "^7.26.8", "debug": "^4.3.1", "globals": "^11.1.0" }, @@ -2049,15 +1812,14 @@ } }, "node_modules/@babel/types": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.6.tgz", - "integrity": "sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==", + "version": "7.26.8", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.8.tgz", + "integrity": "sha512-eUuWapzEGWFEpHFxgEaBG8e3n6S8L3MSu0oda755rOfabWPnh0Our1AozNFVUxGFIhbKgd1ksprsoDGMinTOTA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-string-parser": "^7.24.8", - "@babel/helper-validator-identifier": "^7.24.7", - "to-fast-properties": "^2.0.0" + "@babel/helper-string-parser": "^7.25.9", + "@babel/helper-validator-identifier": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -2070,6 +1832,132 @@ "dev": true, "license": "MIT" }, + "node_modules/@colors/colors": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz", + "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">=0.1.90" + } + }, + "node_modules/@csstools/color-helpers": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-5.0.1.tgz", + "integrity": "sha512-MKtmkA0BX87PKaO1NFRTFH+UnkgnmySQOvNxJubsadusqPEC2aJ9MOQiMceZJJ6oitUl/i0L6u0M1IrmAOmgBA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/csstools" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + } + ], + "license": "MIT-0", + "engines": { + "node": ">=18" + } + }, + "node_modules/@csstools/css-calc": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-2.1.1.tgz", + "integrity": "sha512-rL7kaUnTkL9K+Cvo2pnCieqNpTKgQzy5f+N+5Iuko9HAoasP+xgprVh7KN/MaJVvVL1l0EzQq2MoqBHKSrDrag==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/csstools" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + } + ], + "license": "MIT", + "engines": { + "node": ">=18" + }, + "peerDependencies": { + "@csstools/css-parser-algorithms": "^3.0.4", + "@csstools/css-tokenizer": "^3.0.3" + } + }, + "node_modules/@csstools/css-color-parser": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-3.0.7.tgz", + "integrity": "sha512-nkMp2mTICw32uE5NN+EsJ4f5N+IGFeCFu4bGpiKgb2Pq/7J/MpyLBeQ5ry4KKtRFZaYs6sTmcMYrSRIyj5DFKA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/csstools" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + } + ], + "license": "MIT", + "dependencies": { + "@csstools/color-helpers": "^5.0.1", + "@csstools/css-calc": "^2.1.1" + }, + "engines": { + "node": ">=18" + }, + "peerDependencies": { + "@csstools/css-parser-algorithms": "^3.0.4", + "@csstools/css-tokenizer": "^3.0.3" + } + }, + "node_modules/@csstools/css-parser-algorithms": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.4.tgz", + "integrity": "sha512-Up7rBoV77rv29d3uKHUIVubz1BTcgyUK72IvCQAbfbMv584xHcGKCKbWh7i8hPrRJ7qU4Y8IO3IY9m+iTB7P3A==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/csstools" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + } + ], + "license": "MIT", + "engines": { + "node": ">=18" + }, + "peerDependencies": { + "@csstools/css-tokenizer": "^3.0.3" + } + }, + "node_modules/@csstools/css-tokenizer": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.3.tgz", + "integrity": "sha512-UJnjoFsmxfKUdNYdWgOB0mWUypuLvAfQPH1+pyvRJs6euowbFkFC6P13w1l8mJyi3vxYMxc9kld5jZEGRQs6bw==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/csstools" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + } + ], + "license": "MIT", + "engines": { + "node": ">=18" + } + }, "node_modules/@discoveryjs/json-ext": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz", @@ -2526,9 +2414,9 @@ } }, "node_modules/@eslint-community/eslint-plugin-eslint-comments": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-plugin-eslint-comments/-/eslint-plugin-eslint-comments-4.4.0.tgz", - "integrity": "sha512-yljsWl5Qv3IkIRmJ38h3NrHXFCm4EUl55M8doGTF6hvzvFF8kRpextgSrg2dwHev9lzBZyafCr9RelGIyQm6fw==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-plugin-eslint-comments/-/eslint-plugin-eslint-comments-4.4.1.tgz", + "integrity": "sha512-lb/Z/MzbTf7CaVYM9WCFNQZ4L1yi3ev2fsFPF99h31ljhSEyUoyEsKsNWiU+qD1glbYTDJdqgyaLKtyTkkqtuQ==", "dev": true, "license": "MIT", "dependencies": { @@ -2546,16 +2434,19 @@ } }, "node_modules/@eslint-community/eslint-utils": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", - "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz", + "integrity": "sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==", "license": "MIT", "dependencies": { - "eslint-visitor-keys": "^3.3.0" + "eslint-visitor-keys": "^3.4.3" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, + "funding": { + "url": "https://opencollective.com/eslint" + }, "peerDependencies": { "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" } @@ -2573,21 +2464,21 @@ } }, "node_modules/@eslint-community/regexpp": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz", - "integrity": "sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==", + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz", + "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==", "license": "MIT", "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } }, "node_modules/@eslint/config-array": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.18.0.tgz", - "integrity": "sha512-fTxvnS1sRMu3+JjXwJG0j/i4RT9u4qJ+lqS/yCGap4lH4zZGzQ7tu+xZqQmcMZq5OBZDL4QRxQzRjkWcGt8IVw==", + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.2.tgz", + "integrity": "sha512-GNKqxfHG2ySmJOBSHg7LxeUx4xpuCoFjacmlCoYWEbaPXLwvfIjixRI12xCQZeULksQb23uiA8F40w5TojpV7w==", "license": "Apache-2.0", "dependencies": { - "@eslint/object-schema": "^2.1.4", + "@eslint/object-schema": "^2.1.6", "debug": "^4.3.1", "minimatch": "^3.1.2" }, @@ -2596,19 +2487,21 @@ } }, "node_modules/@eslint/core": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.5.0.tgz", - "integrity": "sha512-d7dQItxTFa0mgeYhU+E1sN28mYYX4Z5FRw0DRszhD8OQr92Tbd00dtSVU/HWj9+Q0iKPQUMtPcExqI/QvkHUow==", - "dev": true, + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.11.0.tgz", + "integrity": "sha512-DWUB2pksgNEb6Bz2fggIy1wh6fGgZP4Xyy/Mt0QZPiloKKXerbqq9D3SBQTlCRYOrcRPu4vuz+CGjwdfqxnoWA==", "license": "Apache-2.0", + "dependencies": { + "@types/json-schema": "^7.0.15" + }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, "node_modules/@eslint/eslintrc": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.1.0.tgz", - "integrity": "sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.2.0.tgz", + "integrity": "sha512-grOjVNN8P3hjJn/eIETF1wwd12DdnwFDoyceUJLYYdkpbwq3nLi+4fqrTAONx7XDALqlL220wC/RHSC/QTI/0w==", "license": "MIT", "dependencies": { "ajv": "^6.12.4", @@ -2641,51 +2534,112 @@ } }, "node_modules/@eslint/js": { - "version": "9.10.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.10.0.tgz", - "integrity": "sha512-fuXtbiP5GWIn8Fz+LWoOMVf/Jxm+aajZYkhi6CuEm4SxymFM+eUWzbO9qXT+L0iCkL5+KGYMCSGxo686H19S1g==", + "version": "9.20.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.20.0.tgz", + "integrity": "sha512-iZA07H9io9Wn836aVTytRaNqh00Sad+EamwOVJT12GTLw1VGMFV/4JaME+JjLtr9fiGaoWgYnS54wrfWsSs4oQ==", "license": "MIT", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, "node_modules/@eslint/json": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/@eslint/json/-/json-0.4.0.tgz", - "integrity": "sha512-1yhWrmsE0H97cS9FUEOY81FzndRJ69KmP3E6rjjL0vFq2A5wRM1JAmuZ67q4pFD/Ni3LzlwJ/EfeGiLNiYM9uQ==", + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/@eslint/json/-/json-0.10.0.tgz", + "integrity": "sha512-aW0181XofoAwuB0sI263bhwnvAlb6OGnGGxHjTZQNLFErfsAXCnwRD+Uxx6/pK73XtKuQ2w1wbhiTJ2BC/erAQ==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@humanwhocodes/momoa": "^3.2.0" + "@eslint/core": "^0.10.0", + "@eslint/plugin-kit": "^0.2.5", + "@humanwhocodes/momoa": "^3.3.4", + "natural-compare": "^1.4.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@eslint/json/node_modules/@eslint/core": { + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.10.0.tgz", + "integrity": "sha512-gFHJ+xBOo4G3WRlR1e/3G8A6/KZAH6zcE/hkLRCZTi/B9avAG365QhFA8uOGzTMqgTghpn7/fSnscW++dpMSAw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@types/json-schema": "^7.0.15" }, - "peerDependencies": { - "eslint": "^9.6.0" + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, "node_modules/@eslint/object-schema": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.4.tgz", - "integrity": "sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ==", + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz", + "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==", "license": "Apache-2.0", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, "node_modules/@eslint/plugin-kit": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.1.0.tgz", - "integrity": "sha512-autAXT203ixhqei9xt+qkYOvY8l6LAFIdT2UXc/RPNeUVfqRF1BV94GTJyVPFKT8nFM6MyVJhjLj9E8JWvf5zQ==", + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.5.tgz", + "integrity": "sha512-lB05FkqEdUg2AA0xEbUz0SnkXT1LcCTa438W4IWTUh4hdOnVbQyOJ81OrDXsJk/LSiJHubgGEFoR5EHq1NsH1A==", "license": "Apache-2.0", "dependencies": { + "@eslint/core": "^0.10.0", "levn": "^0.4.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, + "node_modules/@eslint/plugin-kit/node_modules/@eslint/core": { + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.10.0.tgz", + "integrity": "sha512-gFHJ+xBOo4G3WRlR1e/3G8A6/KZAH6zcE/hkLRCZTi/B9avAG365QhFA8uOGzTMqgTghpn7/fSnscW++dpMSAw==", + "license": "Apache-2.0", + "dependencies": { + "@types/json-schema": "^7.0.15" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@humanfs/core": { + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz", + "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==", + "license": "Apache-2.0", + "engines": { + "node": ">=18.18.0" + } + }, + "node_modules/@humanfs/node": { + "version": "0.16.6", + "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz", + "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==", + "license": "Apache-2.0", + "dependencies": { + "@humanfs/core": "^0.19.1", + "@humanwhocodes/retry": "^0.3.0" + }, + "engines": { + "node": ">=18.18.0" + } + }, + "node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz", + "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==", + "license": "Apache-2.0", + "engines": { + "node": ">=18.18" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, "node_modules/@humanwhocodes/module-importer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", @@ -2700,9 +2654,9 @@ } }, "node_modules/@humanwhocodes/momoa": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/momoa/-/momoa-3.2.1.tgz", - "integrity": "sha512-3l+O+FZENSlXe2qiZcRHr4GlJ9NOG6fibMvOlgwK5Cc0KgfTEh2SQEMKdXVoFFpzDhVG9zXZ6H0jqiVG+UbWow==", + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/@humanwhocodes/momoa/-/momoa-3.3.6.tgz", + "integrity": "sha512-7/sAGm3YsT6xG1bDkTSHvOpQB+cR4I2InfMVw110nuOCrxZvOQHgRqBMxSoTeUQrk9RS4OU9Aw2MBMZVJgLZMg==", "dev": true, "license": "Apache-2.0", "engines": { @@ -2710,9 +2664,9 @@ } }, "node_modules/@humanwhocodes/retry": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.0.tgz", - "integrity": "sha512-d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew==", + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.1.tgz", + "integrity": "sha512-c7hNEllBlenFTHBky65mhq8WD2kbN9Q6gk0bTk8lSBvc554jpXSkST1iePudpt7+A/AQvuHs9EMqjHDXMY1lrA==", "license": "Apache-2.0", "engines": { "node": ">=18.18" @@ -2723,15 +2677,15 @@ } }, "node_modules/@inquirer/checkbox": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-2.5.0.tgz", - "integrity": "sha512-sMgdETOfi2dUHT8r7TT1BTKOwNvdDGFDXYWtQ2J69SvlYNntk9I/gJe7r5yvMwwsuKnYbuRs3pNhx4tgNck5aA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-3.0.1.tgz", + "integrity": "sha512-0hm2nrToWUdD6/UHnel/UKGdk1//ke5zGUpHIvk5ZWmaKezlGxZkOJXNSWsdxO/rEqTkbB3lNC2J6nBElV2aAQ==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^9.1.0", - "@inquirer/figures": "^1.0.5", - "@inquirer/type": "^1.5.3", + "@inquirer/core": "^9.2.1", + "@inquirer/figures": "^1.0.6", + "@inquirer/type": "^2.0.0", "ansi-escapes": "^4.3.2", "yoctocolors-cjs": "^2.1.2" }, @@ -2740,33 +2694,32 @@ } }, "node_modules/@inquirer/confirm": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-3.2.0.tgz", - "integrity": "sha512-oOIwPs0Dvq5220Z8lGL/6LHRTEr9TgLHmiI99Rj1PJ1p1czTys+olrgBqZk4E2qC0YTzeHprxSQmoHioVdJ7Lw==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-4.0.1.tgz", + "integrity": "sha512-46yL28o2NJ9doViqOy0VDcoTzng7rAb6yPQKU7VDLqkmbCaH4JqK4yk4XqlzNWy9PVC5pG1ZUXPBQv+VqnYs2w==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^9.1.0", - "@inquirer/type": "^1.5.3" + "@inquirer/core": "^9.2.1", + "@inquirer/type": "^2.0.0" }, "engines": { "node": ">=18" } }, "node_modules/@inquirer/core": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-9.1.0.tgz", - "integrity": "sha512-RZVfH//2ytTjmaBIzeKT1zefcQZzuruwkpTwwbe/i2jTl4o9M+iML5ChULzz6iw1Ok8iUBBsRCjY2IEbD8Ft4w==", + "version": "9.2.1", + "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-9.2.1.tgz", + "integrity": "sha512-F2VBt7W/mwqEU4bL0RnHNZmC/OxzNx9cOYxHqnXX3MP6ruYvZUZAW9imgN9+h/uBT/oP8Gh888J2OZSbjSeWcg==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/figures": "^1.0.5", - "@inquirer/type": "^1.5.3", + "@inquirer/figures": "^1.0.6", + "@inquirer/type": "^2.0.0", "@types/mute-stream": "^0.0.4", - "@types/node": "^22.5.2", + "@types/node": "^22.5.5", "@types/wrap-ansi": "^3.0.0", "ansi-escapes": "^4.3.2", - "cli-spinners": "^2.9.2", "cli-width": "^4.1.0", "mute-stream": "^1.0.0", "signal-exit": "^4.1.0", @@ -2779,37 +2732,44 @@ } }, "node_modules/@inquirer/core/node_modules/@types/node": { - "version": "22.5.4", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.4.tgz", - "integrity": "sha512-FDuKUJQm/ju9fT/SeX/6+gBzoPzlVCzfzmGkwKvRHQVxi4BntVbyIwf6a4Xn62mrvndLiml6z/UBXIdEVjQLXg==", + "version": "22.13.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.1.tgz", + "integrity": "sha512-jK8uzQlrvXqEU91UxiK5J7pKHyzgnI1Qnl0QDHIgVGuolJhRb9EEl28Cj9b3rGR8B2lhFCtvIm5os8lFnO/1Ew==", "dev": true, "license": "MIT", "dependencies": { - "undici-types": "~6.19.2" + "undici-types": "~6.20.0" } }, - "node_modules/@inquirer/core/node_modules/cli-spinners": { - "version": "2.9.2", - "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz", - "integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==", + "node_modules/@inquirer/core/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, "license": "MIT", - "engines": { - "node": ">=6" + "dependencies": { + "ansi-regex": "^5.0.1" }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "engines": { + "node": ">=8" } }, + "node_modules/@inquirer/core/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "node_modules/@inquirer/editor": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-2.2.0.tgz", - "integrity": "sha512-9KHOpJ+dIL5SZli8lJ6xdaYLPPzB8xB9GZItg39MBybzhxA16vxmszmQFrRwbOA918WA2rvu8xhDEg/p6LXKbw==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-3.0.1.tgz", + "integrity": "sha512-VA96GPFaSOVudjKFraokEEmUQg/Lub6OXvbIEZU1SDCmBzRkHGhxoFAVaF30nyiB4m5cEbDgiI2QRacXZ2hw9Q==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^9.1.0", - "@inquirer/type": "^1.5.3", + "@inquirer/core": "^9.2.1", + "@inquirer/type": "^2.0.0", "external-editor": "^3.1.0" }, "engines": { @@ -2817,14 +2777,14 @@ } }, "node_modules/@inquirer/expand": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-2.3.0.tgz", - "integrity": "sha512-qnJsUcOGCSG1e5DTOErmv2BPQqrtT6uzqn1vI/aYGiPKq+FgslGZmtdnXbhuI7IlT7OByDoEEqdnhUnVR2hhLw==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-3.0.1.tgz", + "integrity": "sha512-ToG8d6RIbnVpbdPdiN7BCxZGiHOTomOX94C2FaT5KOHupV40tKEDozp12res6cMIfRKrXLJyexAZhWVHgbALSQ==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^9.1.0", - "@inquirer/type": "^1.5.3", + "@inquirer/core": "^9.2.1", + "@inquirer/type": "^2.0.0", "yoctocolors-cjs": "^2.1.2" }, "engines": { @@ -2832,9 +2792,9 @@ } }, "node_modules/@inquirer/figures": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.5.tgz", - "integrity": "sha512-79hP/VWdZ2UVc9bFGJnoQ/lQMpL74mGgzSYX1xUqCVk7/v73vJCMw1VuyWN1jGkZ9B3z7THAbySqGbCNefcjfA==", + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.10.tgz", + "integrity": "sha512-Ey6176gZmeqZuY/W/nZiUyvmb1/qInjcpiZjXWi6nON+nxJpD1bxtSoBxNliGISae32n6OwbY+TSXPZ1CfS4bw==", "dev": true, "license": "MIT", "engines": { @@ -2842,42 +2802,42 @@ } }, "node_modules/@inquirer/input": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-2.3.0.tgz", - "integrity": "sha512-XfnpCStx2xgh1LIRqPXrTNEEByqQWoxsWYzNRSEUxJ5c6EQlhMogJ3vHKu8aXuTacebtaZzMAHwEL0kAflKOBw==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-3.0.1.tgz", + "integrity": "sha512-BDuPBmpvi8eMCxqC5iacloWqv+5tQSJlUafYWUe31ow1BVXjW2a5qe3dh4X/Z25Wp22RwvcaLCc2siHobEOfzg==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^9.1.0", - "@inquirer/type": "^1.5.3" + "@inquirer/core": "^9.2.1", + "@inquirer/type": "^2.0.0" }, "engines": { "node": ">=18" } }, "node_modules/@inquirer/number": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@inquirer/number/-/number-1.1.0.tgz", - "integrity": "sha512-ilUnia/GZUtfSZy3YEErXLJ2Sljo/mf9fiKc08n18DdwdmDbOzRcTv65H1jjDvlsAuvdFXf4Sa/aL7iw/NanVA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@inquirer/number/-/number-2.0.1.tgz", + "integrity": "sha512-QpR8jPhRjSmlr/mD2cw3IR8HRO7lSVOnqUvQa8scv1Lsr3xoAMMworcYW3J13z3ppjBFBD2ef1Ci6AE5Qn8goQ==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^9.1.0", - "@inquirer/type": "^1.5.3" + "@inquirer/core": "^9.2.1", + "@inquirer/type": "^2.0.0" }, "engines": { "node": ">=18" } }, "node_modules/@inquirer/password": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-2.2.0.tgz", - "integrity": "sha512-5otqIpgsPYIshqhgtEwSspBQE40etouR8VIxzpJkv9i0dVHIpyhiivbkH9/dGiMLdyamT54YRdGJLfl8TFnLHg==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-3.0.1.tgz", + "integrity": "sha512-haoeEPUisD1NeE2IanLOiFr4wcTXGWrBOyAyPZi1FfLJuXOzNmxCJPgUrGYKVh+Y8hfGJenIfz5Wb/DkE9KkMQ==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^9.1.0", - "@inquirer/type": "^1.5.3", + "@inquirer/core": "^9.2.1", + "@inquirer/type": "^2.0.0", "ansi-escapes": "^4.3.2" }, "engines": { @@ -2885,36 +2845,36 @@ } }, "node_modules/@inquirer/prompts": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-5.5.0.tgz", - "integrity": "sha512-BHDeL0catgHdcHbSFFUddNzvx/imzJMft+tWDPwTm3hfu8/tApk1HrooNngB2Mb4qY+KaRWF+iZqoVUPeslEog==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-6.0.1.tgz", + "integrity": "sha512-yl43JD/86CIj3Mz5mvvLJqAOfIup7ncxfJ0Btnl0/v5TouVUyeEdcpknfgc+yMevS/48oH9WAkkw93m7otLb/A==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/checkbox": "^2.5.0", - "@inquirer/confirm": "^3.2.0", - "@inquirer/editor": "^2.2.0", - "@inquirer/expand": "^2.3.0", - "@inquirer/input": "^2.3.0", - "@inquirer/number": "^1.1.0", - "@inquirer/password": "^2.2.0", - "@inquirer/rawlist": "^2.3.0", - "@inquirer/search": "^1.1.0", - "@inquirer/select": "^2.5.0" + "@inquirer/checkbox": "^3.0.1", + "@inquirer/confirm": "^4.0.1", + "@inquirer/editor": "^3.0.1", + "@inquirer/expand": "^3.0.1", + "@inquirer/input": "^3.0.1", + "@inquirer/number": "^2.0.1", + "@inquirer/password": "^3.0.1", + "@inquirer/rawlist": "^3.0.1", + "@inquirer/search": "^2.0.1", + "@inquirer/select": "^3.0.1" }, "engines": { "node": ">=18" } }, "node_modules/@inquirer/rawlist": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-2.3.0.tgz", - "integrity": "sha512-zzfNuINhFF7OLAtGHfhwOW2TlYJyli7lOUoJUXw/uyklcwalV6WRXBXtFIicN8rTRK1XTiPWB4UY+YuW8dsnLQ==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-3.0.1.tgz", + "integrity": "sha512-VgRtFIwZInUzTiPLSfDXK5jLrnpkuSOh1ctfaoygKAdPqjcjKYmGh6sCY1pb0aGnCGsmhUxoqLDUAU0ud+lGXQ==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^9.1.0", - "@inquirer/type": "^1.5.3", + "@inquirer/core": "^9.2.1", + "@inquirer/type": "^2.0.0", "yoctocolors-cjs": "^2.1.2" }, "engines": { @@ -2922,15 +2882,15 @@ } }, "node_modules/@inquirer/search": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@inquirer/search/-/search-1.1.0.tgz", - "integrity": "sha512-h+/5LSj51dx7hp5xOn4QFnUaKeARwUCLs6mIhtkJ0JYPBLmEYjdHSYh7I6GrLg9LwpJ3xeX0FZgAG1q0QdCpVQ==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@inquirer/search/-/search-2.0.1.tgz", + "integrity": "sha512-r5hBKZk3g5MkIzLVoSgE4evypGqtOannnB3PKTG9NRZxyFRKcfzrdxXXPcoJQsxJPzvdSU2Rn7pB7lw0GCmGAg==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^9.1.0", - "@inquirer/figures": "^1.0.5", - "@inquirer/type": "^1.5.3", + "@inquirer/core": "^9.2.1", + "@inquirer/figures": "^1.0.6", + "@inquirer/type": "^2.0.0", "yoctocolors-cjs": "^2.1.2" }, "engines": { @@ -2938,15 +2898,15 @@ } }, "node_modules/@inquirer/select": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-2.5.0.tgz", - "integrity": "sha512-YmDobTItPP3WcEI86GvPo+T2sRHkxxOq/kXmsBjHS5BVXUgvgZ5AfJjkvQvZr03T81NnI3KrrRuMzeuYUQRFOA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-3.0.1.tgz", + "integrity": "sha512-lUDGUxPhdWMkN/fHy1Lk7pF3nK1fh/gqeyWXmctefhxLYxlDsc7vsPBEpxrfVGDsVdyYJsiJoD4bJ1b623cV1Q==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^9.1.0", - "@inquirer/figures": "^1.0.5", - "@inquirer/type": "^1.5.3", + "@inquirer/core": "^9.2.1", + "@inquirer/figures": "^1.0.6", + "@inquirer/type": "^2.0.0", "ansi-escapes": "^4.3.2", "yoctocolors-cjs": "^2.1.2" }, @@ -2955,9 +2915,9 @@ } }, "node_modules/@inquirer/type": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-1.5.3.tgz", - "integrity": "sha512-xUQ14WQGR/HK5ei+2CvgcwoH9fQ4PgPGmVFSN0pc1+fVyDL3MREhyAY7nxEErSu6CkllBM3D7e3e+kOvtu+eIg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-2.0.0.tgz", + "integrity": "sha512-XvJRx+2KR3YXyYtPUUy+qd9i7p+GO9Ko6VIIpWlBrpWwXDv8WLFeHTxz35CfQFUiBMLXlGHhGzys7lqit9gWag==", "dev": true, "license": "MIT", "dependencies": { @@ -2985,19 +2945,6 @@ "node": ">=12" } }, - "node_modules/@isaacs/cliui/node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, "node_modules/@isaacs/cliui/node_modules/ansi-styles": { "version": "6.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", @@ -3011,20 +2958,29 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/@isaacs/cliui/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "node_modules/@isaacs/cliui/node_modules/emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "dev": true, + "license": "MIT" + }, + "node_modules/@isaacs/cliui/node_modules/string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", "dev": true, "license": "MIT", "dependencies": { - "ansi-regex": "^6.0.1" + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" }, "engines": { "node": ">=12" }, "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/@isaacs/cliui/node_modules/wrap-ansi": { @@ -3169,40 +3125,66 @@ "node": ">=8" } }, + "node_modules/@jclem/logfmt2": { + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@jclem/logfmt2/-/logfmt2-2.4.3.tgz", + "integrity": "sha512-d7zluLlx+JRtVICF0+ghcrVdXBdE3eXrpIuFdcCcWxA3ABOyemkTySG4ha2AdsWFwAnh8tkB1vtyeZsWAbLumg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 14.x", + "npm": ">= 7.x" + } + }, "node_modules/@jest/expect-utils": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz", - "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==", + "version": "30.0.0-alpha.7", + "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-30.0.0-alpha.7.tgz", + "integrity": "sha512-lr711aEHiXWM9X0BC/fH+HID5eatdCjluh2PKxKHPZbjmtWA5RiHXC/s16cPFI6voSnofOjDICvzNVxSO87ZrQ==", "dev": true, "license": "MIT", "dependencies": { - "jest-get-type": "^29.6.3" + "jest-get-type": "30.0.0-alpha.7" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^16.10.0 || ^18.12.0 || >=20.0.0" + } + }, + "node_modules/@jest/pattern": { + "version": "30.0.0-alpha.7", + "resolved": "https://registry.npmjs.org/@jest/pattern/-/pattern-30.0.0-alpha.7.tgz", + "integrity": "sha512-PpuWkTJwcFJlyo6YOuMLi96doaaDfz90gOAU+cuyIZyr6wjbjKjdMkHlt7rE6gNaZNEUEA9sSJzKsg8oXfLW0w==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*", + "jest-regex-util": "30.0.0-alpha.7" + }, + "engines": { + "node": "^16.10.0 || ^18.12.0 || >=20.0.0" } }, "node_modules/@jest/schemas": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", - "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", + "version": "30.0.0-alpha.7", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.0-alpha.7.tgz", + "integrity": "sha512-fzJDwdg3E8Gq+Aqo/h+JQc1ZD+Mqbkz7OVqpoUa0A2Btd70zdgu1Hza8AyhJjr83paRQ+ZCHnHepp4/+tpqDFQ==", "dev": true, "license": "MIT", "dependencies": { - "@sinclair/typebox": "^0.27.8" + "@sinclair/typebox": "^0.34.0" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^16.10.0 || ^18.12.0 || >=20.0.0" } }, "node_modules/@jest/types": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", - "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", + "version": "30.0.0-alpha.7", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.0-alpha.7.tgz", + "integrity": "sha512-hrdUqtIjUMpoNlpmo4DQfe6fvD0Rk02kdOv0+AsAbO689llpzNmb+kLcojzKp/H2jVGqcYrUb0wNSRgn4KcuqA==", "dev": true, "license": "MIT", "dependencies": { - "@jest/schemas": "^29.6.3", + "@jest/pattern": "30.0.0-alpha.7", + "@jest/schemas": "30.0.0-alpha.7", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -3210,13 +3192,13 @@ "chalk": "^4.0.0" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^16.10.0 || ^18.12.0 || >=20.0.0" } }, "node_modules/@jridgewell/gen-mapping": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", - "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz", + "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==", "dev": true, "license": "MIT", "dependencies": { @@ -3278,10 +3260,11 @@ } }, "node_modules/@jspm/core": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@jspm/core/-/core-2.0.1.tgz", - "integrity": "sha512-Lg3PnLp0QXpxwLIAuuJboLeRaIhrgJjeuh797QADg3xz8wGLugQOS5DpsE8A6i6Adgzf+bacllkKZG3J0tGfDw==", - "dev": true + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@jspm/core/-/core-2.1.0.tgz", + "integrity": "sha512-3sRl+pkyFY/kLmHl0cgHiFp2xEqErA8N3ECjMs7serSUBmoJ70lBa0PG5t0IM6WJgdZNyyI0R8YFfi5wM8+mzg==", + "dev": true, + "license": "Apache-2.0" }, "node_modules/@keyvhq/core": { "version": "2.1.1", @@ -3310,18 +3293,29 @@ "node": ">= 16" } }, + "node_modules/@kikobeats/time-span": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@kikobeats/time-span/-/time-span-1.0.5.tgz", + "integrity": "sha512-txRAdmi35N1wnsLS1AO5mTlbY5Cv5/61WXqek2y3L9Q7u4mgdUVq819so5xe753hL5gYeLzlWoJ/VJfXg9nx8g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 18" + } + }, "node_modules/@metascraper/helpers": { - "version": "5.45.22", - "resolved": "https://registry.npmjs.org/@metascraper/helpers/-/helpers-5.45.22.tgz", - "integrity": "sha512-9fOXBEgxdiBedT1qB1obDCHqkU5hmqoJ/xr7CqI0u1h54zPe845Kj4ZQgMqSoF+Azg3fe43AAV1R9MwQlko3Mw==", + "version": "5.46.5", + "resolved": "https://registry.npmjs.org/@metascraper/helpers/-/helpers-5.46.5.tgz", + "integrity": "sha512-SuFJ7qu0MK1yaV9VnVDVY0eMsJ6hU3/4XYPhjrdZL9GejJUzzDhTTzNoi1V5NYF68YF+VlGEwQL101wDc/zo+A==", "dev": true, "license": "MIT", "dependencies": { "audio-extensions": "0.0.0", - "chrono-node": "~2.7.6", + "chrono-node": "~2.7.7", "condense-whitespace": "~2.0.0", "data-uri-utils": "~1.0.8", - "entities": "~4.5.0", + "debug-logfmt": "~1.2.3", + "entities": "~6.0.0", "file-extension": "~4.0.5", "has-values": "~2.0.1", "image-extensions": "~1.1.0", @@ -3329,26 +3323,26 @@ "is-uri": "~1.2.6", "iso-639-3": "~2.2.0", "isostring": "0.0.1", - "jsdom": "~24.1.0", + "jsdom": "~25.0.1", "lodash": "~4.17.21", "memoize-one": "~6.0.0", "microsoft-capitalize": "~1.0.5", - "mime": "~3.0.0", + "mime": "3", "normalize-url": "~6.1.0", - "re2": "~1.21.0", + "re2": "~1.21.4", "smartquotes": "~2.3.2", - "tldts": "~6.1.24", + "tldts": "~6.1.70", "url-regex-safe": "~4.0.0", - "video-extensions": "~1.2.0" + "video-extensions": "1" }, "engines": { "node": ">= 16" } }, "node_modules/@metascraper/helpers/node_modules/entities": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", - "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.0.tgz", + "integrity": "sha512-aKstq2TDOndCn4diEyp9Uq/Flu2i1GlLkc6XIDQSDMuaFE3OPW5OphLCyQ5SpSJZTb4reN+kTcYru5yIfXoRPw==", "dev": true, "license": "BSD-2-Clause", "engines": { @@ -3362,6 +3356,7 @@ "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dev": true, "license": "MIT", "dependencies": { "@nodelib/fs.stat": "2.0.5", @@ -3375,6 +3370,7 @@ "version": "2.0.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true, "license": "MIT", "engines": { "node": ">= 8" @@ -3384,6 +3380,7 @@ "version": "1.2.8", "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dev": true, "license": "MIT", "dependencies": { "@nodelib/fs.scandir": "2.1.5", @@ -3410,13 +3407,6 @@ "node": "^16.14.0 || >=18.0.0" } }, - "node_modules/@npmcli/agent/node_modules/lru-cache": { - "version": "10.4.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", - "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", - "dev": true, - "license": "ISC" - }, "node_modules/@npmcli/fs": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz", @@ -3431,61 +3421,139 @@ } }, "node_modules/@nuxt/kit": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/@nuxt/kit/-/kit-3.13.1.tgz", - "integrity": "sha512-FkUL349lp/3nVfTIyws4UDJ3d2jyv5Pk1DC1HQUCOkSloYYMdbRcQAUcb4fe2TCLNWvHM+FhU8jnzGTzjALZYA==", + "version": "3.15.4", + "resolved": "https://registry.npmjs.org/@nuxt/kit/-/kit-3.15.4.tgz", + "integrity": "sha512-dr7I7eZOoRLl4uxdxeL2dQsH0OrbEiVPIyBHnBpA4co24CBnoJoF+JINuP9l3PAM3IhUzc5JIVq3/YY3lEc3Hw==", "dev": true, "license": "MIT", "optional": true, "dependencies": { - "@nuxt/schema": "3.13.1", - "c12": "^1.11.2", - "consola": "^3.2.3", + "c12": "^2.0.1", + "consola": "^3.4.0", "defu": "^6.1.4", "destr": "^2.0.3", "globby": "^14.0.2", - "hash-sum": "^2.0.0", - "ignore": "^5.3.2", - "jiti": "^1.21.6", + "ignore": "^7.0.3", + "jiti": "^2.4.2", "klona": "^2.0.6", - "knitwork": "^1.1.0", - "mlly": "^1.7.1", - "pathe": "^1.1.2", - "pkg-types": "^1.2.0", + "knitwork": "^1.2.0", + "mlly": "^1.7.4", + "ohash": "^1.1.4", + "pathe": "^2.0.2", + "pkg-types": "^1.3.1", "scule": "^1.3.0", "semver": "^7.6.3", + "std-env": "^3.8.0", "ufo": "^1.5.4", - "unctx": "^2.3.1", - "unimport": "^3.11.1", - "untyped": "^1.4.2" + "unctx": "^2.4.1", + "unimport": "^4.0.0", + "untyped": "^1.5.2" }, "engines": { - "node": "^14.18.0 || >=16.10.0" + "node": ">=18.12.0" } }, - "node_modules/@nuxt/schema": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/@nuxt/schema/-/schema-3.13.1.tgz", - "integrity": "sha512-ishbhzVGspjshG9AG0hYnKYY6LWXzCtua7OXV7C/DQ2yA7rRcy1xHpzKZUDbIRyxCHHCAcBd8jfHEUmEuhEPrA==", + "node_modules/@nuxt/kit/node_modules/escape-string-regexp": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz", + "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@nuxt/kit/node_modules/estree-walker": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz", + "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==", "dev": true, "license": "MIT", "optional": true, "dependencies": { - "compatx": "^0.1.8", - "consola": "^3.2.3", - "defu": "^6.1.4", - "hookable": "^5.5.3", - "pathe": "^1.1.2", - "pkg-types": "^1.2.0", - "scule": "^1.3.0", - "std-env": "^3.7.0", - "ufo": "^1.5.4", - "uncrypto": "^0.1.3", - "unimport": "^3.11.1", - "untyped": "^1.4.2" + "@types/estree": "^1.0.0" + } + }, + "node_modules/@nuxt/kit/node_modules/ignore": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.3.tgz", + "integrity": "sha512-bAH5jbK/F3T3Jls4I0SO1hmPR0dKU0a7+SY6n1yzRtG54FLO8d6w/nxLFX2Nb7dBu6cCWXPaAME6cYqFUMmuCA==", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">= 4" + } + }, + "node_modules/@nuxt/kit/node_modules/js-tokens": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-9.0.1.tgz", + "integrity": "sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ==", + "dev": true, + "license": "MIT", + "optional": true + }, + "node_modules/@nuxt/kit/node_modules/local-pkg": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-1.0.0.tgz", + "integrity": "sha512-bbgPw/wmroJsil/GgL4qjDzs5YLTBMQ99weRsok1XCDccQeehbHA/I1oRvk2NPtr7KGZgT/Y5tPRnAtMqeG2Kg==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "mlly": "^1.7.3", + "pkg-types": "^1.3.0" }, "engines": { - "node": "^14.18.0 || >=16.10.0" + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/antfu" + } + }, + "node_modules/@nuxt/kit/node_modules/strip-literal": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-3.0.0.tgz", + "integrity": "sha512-TcccoMhJOM3OebGhSBEmp3UZ2SfDMZUEBdRA/9ynfLi8yYajyWX3JiXArcJt4Umh4vISpspkQIY8ZZoCqjbviA==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "js-tokens": "^9.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/antfu" + } + }, + "node_modules/@nuxt/kit/node_modules/unimport": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/unimport/-/unimport-4.1.0.tgz", + "integrity": "sha512-y5ZYDG+j7IB45+Y6CIkWIKou4E1JFigCUw6vI+h15HdYAKmT0oQWcawnxXuwJG8srJyXhIZuWz5uXB1MQ/ARZw==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "acorn": "^8.14.0", + "escape-string-regexp": "^5.0.0", + "estree-walker": "^3.0.3", + "fast-glob": "^3.3.3", + "local-pkg": "^1.0.0", + "magic-string": "^0.30.17", + "mlly": "^1.7.4", + "pathe": "^2.0.2", + "picomatch": "^4.0.2", + "pkg-types": "^1.3.1", + "scule": "^1.3.0", + "strip-literal": "^3.0.0", + "unplugin": "^2.1.2", + "unplugin-utils": "^0.2.3" + }, + "engines": { + "node": ">=18.20.6" } }, "node_modules/@originjs/vite-plugin-commonjs": { @@ -3577,9 +3645,9 @@ } }, "node_modules/@promptbook/utils": { - "version": "0.70.0-1", - "resolved": "https://registry.npmjs.org/@promptbook/utils/-/utils-0.70.0-1.tgz", - "integrity": "sha512-qd2lLRRN+sE6UuNMi2tEeUUeb4zmXnxY5EMdfHVXNE+bqBDpUC7/aEfXgA3jnUXEr+xFjQ8PTFQgWvBMaKvw0g==", + "version": "0.69.5", + "resolved": "https://registry.npmjs.org/@promptbook/utils/-/utils-0.69.5.tgz", + "integrity": "sha512-xm5Ti/Hp3o4xHrsK9Yy3MS6KbDxYbq485hDsFvxqaNA7equHLPdo8H8faTitTeb14QCDfLW4iwCxdVYu5sn6YQ==", "dev": true, "funding": [ { @@ -3593,23 +3661,22 @@ ], "license": "CC-BY-4.0", "dependencies": { - "spacetrim": "0.11.39" + "spacetrim": "0.11.59" } }, "node_modules/@puppeteer/browsers": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.4.0.tgz", - "integrity": "sha512-x8J1csfIygOwf6D6qUAZ0ASk3z63zPb7wkNeHRerCMh82qWKUrOgkuP005AJC8lDL6/evtXETGEJVcwykKT4/g==", + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.7.1.tgz", + "integrity": "sha512-MK7rtm8JjaxPN7Mf1JdZIZKPD2Z+W7osvrC1vjpvfOX1K0awDIHYbNi89f7eotp7eMUn2shWnt03HwVbriXtKQ==", "dev": true, "license": "Apache-2.0", "dependencies": { - "debug": "^4.3.6", + "debug": "^4.4.0", "extract-zip": "^2.0.1", "progress": "^2.0.3", - "proxy-agent": "^6.4.0", - "semver": "^7.6.3", - "tar-fs": "^3.0.6", - "unbzip2-stream": "^1.4.3", + "proxy-agent": "^6.5.0", + "semver": "^7.7.0", + "tar-fs": "^3.0.8", "yargs": "^17.7.2" }, "bin": { @@ -3638,15 +3705,15 @@ } }, "node_modules/@rollup/pluginutils": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.0.tgz", - "integrity": "sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==", + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.4.tgz", + "integrity": "sha512-USm05zrsFxYLPdWWq+K3STlWiT/3ELn3RcV5hJMghpeAIhxfsUIg6mt12CBJBInWMV4VneoV7SfGv8xIwo2qNQ==", "dev": true, "license": "MIT", "dependencies": { "@types/estree": "^1.0.0", "estree-walker": "^2.0.2", - "picomatch": "^2.3.1" + "picomatch": "^4.0.2" }, "engines": { "node": ">=14.0.0" @@ -3661,9 +3728,9 @@ } }, "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.21.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.21.2.tgz", - "integrity": "sha512-fSuPrt0ZO8uXeS+xP3b+yYTCBUd05MoSp2N/MFOgjhhUhMmchXlpTQrTpI8T+YAwAQuK7MafsCOxW7VrPMrJcg==", + "version": "4.34.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.34.6.tgz", + "integrity": "sha512-+GcCXtOQoWuC7hhX1P00LqjjIiS/iOouHXhMdiDSnq/1DGTox4SpUvO52Xm+div6+106r+TcvOeo/cxvyEyTgg==", "cpu": [ "arm" ], @@ -3675,9 +3742,9 @@ ] }, "node_modules/@rollup/rollup-android-arm64": { - "version": "4.21.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.21.2.tgz", - "integrity": "sha512-xGU5ZQmPlsjQS6tzTTGwMsnKUtu0WVbl0hYpTPauvbRAnmIvpInhJtgjj3mcuJpEiuUw4v1s4BimkdfDWlh7gA==", + "version": "4.34.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.34.6.tgz", + "integrity": "sha512-E8+2qCIjciYUnCa1AiVF1BkRgqIGW9KzJeesQqVfyRITGQN+dFuoivO0hnro1DjT74wXLRZ7QF8MIbz+luGaJA==", "cpu": [ "arm64" ], @@ -3689,9 +3756,9 @@ ] }, "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.21.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.21.2.tgz", - "integrity": "sha512-99AhQ3/ZMxU7jw34Sq8brzXqWH/bMnf7ZVhvLk9QU2cOepbQSVTns6qoErJmSiAvU3InRqC2RRZ5ovh1KN0d0Q==", + "version": "4.34.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.34.6.tgz", + "integrity": "sha512-z9Ib+OzqN3DZEjX7PDQMHEhtF+t6Mi2z/ueChQPLS/qUMKY7Ybn5A2ggFoKRNRh1q1T03YTQfBTQCJZiepESAg==", "cpu": [ "arm64" ], @@ -3703,9 +3770,9 @@ ] }, "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.21.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.21.2.tgz", - "integrity": "sha512-ZbRaUvw2iN/y37x6dY50D8m2BnDbBjlnMPotDi/qITMJ4sIxNY33HArjikDyakhSv0+ybdUxhWxE6kTI4oX26w==", + "version": "4.34.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.34.6.tgz", + "integrity": "sha512-PShKVY4u0FDAR7jskyFIYVyHEPCPnIQY8s5OcXkdU8mz3Y7eXDJPdyM/ZWjkYdR2m0izD9HHWA8sGcXn+Qrsyg==", "cpu": [ "x64" ], @@ -3716,10 +3783,38 @@ "darwin" ] }, + "node_modules/@rollup/rollup-freebsd-arm64": { + "version": "4.34.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.34.6.tgz", + "integrity": "sha512-YSwyOqlDAdKqs0iKuqvRHLN4SrD2TiswfoLfvYXseKbL47ht1grQpq46MSiQAx6rQEN8o8URtpXARCpqabqxGQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ] + }, + "node_modules/@rollup/rollup-freebsd-x64": { + "version": "4.34.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.34.6.tgz", + "integrity": "sha512-HEP4CgPAY1RxXwwL5sPFv6BBM3tVeLnshF03HMhJYCNc6kvSqBgTMmsEjb72RkZBAWIqiPUyF1JpEBv5XT9wKQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ] + }, "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.21.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.21.2.tgz", - "integrity": "sha512-ztRJJMiE8nnU1YFcdbd9BcH6bGWG1z+jP+IPW2oDUAPxPjo9dverIOyXz76m6IPA6udEL12reYeLojzW2cYL7w==", + "version": "4.34.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.34.6.tgz", + "integrity": "sha512-88fSzjC5xeH9S2Vg3rPgXJULkHcLYMkh8faix8DX4h4TIAL65ekwuQMA/g2CXq8W+NJC43V6fUpYZNjaX3+IIg==", "cpu": [ "arm" ], @@ -3731,9 +3826,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-musleabihf": { - "version": "4.21.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.21.2.tgz", - "integrity": "sha512-flOcGHDZajGKYpLV0JNc0VFH361M7rnV1ee+NTeC/BQQ1/0pllYcFmxpagltANYt8FYf9+kL6RSk80Ziwyhr7w==", + "version": "4.34.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.34.6.tgz", + "integrity": "sha512-wM4ztnutBqYFyvNeR7Av+reWI/enK9tDOTKNF+6Kk2Q96k9bwhDDOlnCUNRPvromlVXo04riSliMBs/Z7RteEg==", "cpu": [ "arm" ], @@ -3745,9 +3840,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.21.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.21.2.tgz", - "integrity": "sha512-69CF19Kp3TdMopyteO/LJbWufOzqqXzkrv4L2sP8kfMaAQ6iwky7NoXTp7bD6/irKgknDKM0P9E/1l5XxVQAhw==", + "version": "4.34.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.34.6.tgz", + "integrity": "sha512-9RyprECbRa9zEjXLtvvshhw4CMrRa3K+0wcp3KME0zmBe1ILmvcVHnypZ/aIDXpRyfhSYSuN4EPdCCj5Du8FIA==", "cpu": [ "arm64" ], @@ -3759,9 +3854,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.21.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.21.2.tgz", - "integrity": "sha512-48pD/fJkTiHAZTnZwR0VzHrao70/4MlzJrq0ZsILjLW/Ab/1XlVUStYyGt7tdyIiVSlGZbnliqmult/QGA2O2w==", + "version": "4.34.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.34.6.tgz", + "integrity": "sha512-qTmklhCTyaJSB05S+iSovfo++EwnIEZxHkzv5dep4qoszUMX5Ca4WM4zAVUMbfdviLgCSQOu5oU8YoGk1s6M9Q==", "cpu": [ "arm64" ], @@ -3772,10 +3867,24 @@ "linux" ] }, + "node_modules/@rollup/rollup-linux-loongarch64-gnu": { + "version": "4.34.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.34.6.tgz", + "integrity": "sha512-4Qmkaps9yqmpjY5pvpkfOerYgKNUGzQpFxV6rnS7c/JfYbDSU0y6WpbbredB5cCpLFGJEqYX40WUmxMkwhWCjw==", + "cpu": [ + "loong64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, "node_modules/@rollup/rollup-linux-powerpc64le-gnu": { - "version": "4.21.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.21.2.tgz", - "integrity": "sha512-cZdyuInj0ofc7mAQpKcPR2a2iu4YM4FQfuUzCVA2u4HI95lCwzjoPtdWjdpDKyHxI0UO82bLDoOaLfpZ/wviyQ==", + "version": "4.34.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.34.6.tgz", + "integrity": "sha512-Zsrtux3PuaxuBTX/zHdLaFmcofWGzaWW1scwLU3ZbW/X+hSsFbz9wDIp6XvnT7pzYRl9MezWqEqKy7ssmDEnuQ==", "cpu": [ "ppc64" ], @@ -3787,9 +3896,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.21.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.21.2.tgz", - "integrity": "sha512-RL56JMT6NwQ0lXIQmMIWr1SW28z4E4pOhRRNqwWZeXpRlykRIlEpSWdsgNWJbYBEWD84eocjSGDu/XxbYeCmwg==", + "version": "4.34.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.34.6.tgz", + "integrity": "sha512-aK+Zp+CRM55iPrlyKiU3/zyhgzWBxLVrw2mwiQSYJRobCURb781+XstzvA8Gkjg/hbdQFuDw44aUOxVQFycrAg==", "cpu": [ "riscv64" ], @@ -3801,9 +3910,9 @@ ] }, "node_modules/@rollup/rollup-linux-s390x-gnu": { - "version": "4.21.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.21.2.tgz", - "integrity": "sha512-PMxkrWS9z38bCr3rWvDFVGD6sFeZJw4iQlhrup7ReGmfn7Oukrr/zweLhYX6v2/8J6Cep9IEA/SmjXjCmSbrMQ==", + "version": "4.34.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.34.6.tgz", + "integrity": "sha512-WoKLVrY9ogmaYPXwTH326+ErlCIgMmsoRSx6bO+l68YgJnlOXhygDYSZe/qbUJCSiCiZAQ+tKm88NcWuUXqOzw==", "cpu": [ "s390x" ], @@ -3815,9 +3924,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.21.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.21.2.tgz", - "integrity": "sha512-B90tYAUoLhU22olrafY3JQCFLnT3NglazdwkHyxNDYF/zAxJt5fJUB/yBoWFoIQ7SQj+KLe3iL4BhOMa9fzgpw==", + "version": "4.34.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.34.6.tgz", + "integrity": "sha512-Sht4aFvmA4ToHd2vFzwMFaQCiYm2lDFho5rPcvPBT5pCdC+GwHG6CMch4GQfmWTQ1SwRKS0dhDYb54khSrjDWw==", "cpu": [ "x64" ], @@ -3829,9 +3938,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.21.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.21.2.tgz", - "integrity": "sha512-7twFizNXudESmC9oneLGIUmoHiiLppz/Xs5uJQ4ShvE6234K0VB1/aJYU3f/4g7PhssLGKBVCC37uRkkOi8wjg==", + "version": "4.34.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.34.6.tgz", + "integrity": "sha512-zmmpOQh8vXc2QITsnCiODCDGXFC8LMi64+/oPpPx5qz3pqv0s6x46ps4xoycfUiVZps5PFn1gksZzo4RGTKT+A==", "cpu": [ "x64" ], @@ -3843,9 +3952,9 @@ ] }, "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.21.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.21.2.tgz", - "integrity": "sha512-9rRero0E7qTeYf6+rFh3AErTNU1VCQg2mn7CQcI44vNUWM9Ze7MSRS/9RFuSsox+vstRt97+x3sOhEey024FRQ==", + "version": "4.34.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.34.6.tgz", + "integrity": "sha512-3/q1qUsO/tLqGBaD4uXsB6coVGB3usxw3qyeVb59aArCgedSF66MPdgRStUd7vbZOsko/CgVaY5fo2vkvPLWiA==", "cpu": [ "arm64" ], @@ -3857,9 +3966,9 @@ ] }, "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.21.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.21.2.tgz", - "integrity": "sha512-5rA4vjlqgrpbFVVHX3qkrCo/fZTj1q0Xxpg+Z7yIo3J2AilW7t2+n6Q8Jrx+4MrYpAnjttTYF8rr7bP46BPzRw==", + "version": "4.34.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.34.6.tgz", + "integrity": "sha512-oLHxuyywc6efdKVTxvc0135zPrRdtYVjtVD5GUm55I3ODxhU/PwkQFD97z16Xzxa1Fz0AEe4W/2hzRtd+IfpOA==", "cpu": [ "ia32" ], @@ -3871,9 +3980,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.21.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.21.2.tgz", - "integrity": "sha512-6UUxd0+SKomjdzuAcp+HAmxw1FlGBnl1v2yEPSabtx4lBfdXHDVsW7+lQkgz9cNFJGY3AWR7+V8P5BqkD9L9nA==", + "version": "4.34.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.34.6.tgz", + "integrity": "sha512-0PVwmgzZ8+TZ9oGBmdZoQVXflbvuwzN/HRclujpl4N/q3i+y0lqLw8n1bXA8ru3sApDjlmONaNAuYr38y1Kr9w==", "cpu": [ "x64" ], @@ -3892,9 +4001,9 @@ "license": "MIT" }, "node_modules/@sinclair/typebox": { - "version": "0.27.8", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", - "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", + "version": "0.34.16", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.16.tgz", + "integrity": "sha512-rIljj8VPYAfn26ANY+5pCNVBPiv6hSufuKGe46y65cJZpvx8vHvPXlU0Q/Le4OGtlNaL8Jg2FuhtvQX18lSIqA==", "dev": true, "license": "MIT" }, @@ -3991,10 +4100,20 @@ "node": ">=8.10" } }, + "node_modules/@snyk/github-codeowners/node_modules/commander": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", + "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 6" + } + }, "node_modules/@stencil/core": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.21.0.tgz", - "integrity": "sha512-v50lnVbzS8mpMSnEVxR+G75XpvxHKtkJaQrNPE8+/fF6Ppr5z4bcdcBhcP8LPfEW+4BZcic6VifMXRwTopc+kw==", + "version": "4.25.3", + "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.25.3.tgz", + "integrity": "sha512-wYSMS59jxB2ulWF8oNYOCMCo4NhGsvopn0Q7l7MBDQPRluBrodKRMfJiDV40tkJfYB4tq7o2TvgjcacH1gDNvQ==", "dev": true, "license": "MIT", "optional": true, @@ -4007,15 +4126,15 @@ } }, "node_modules/@swc/core": { - "version": "1.7.23", - "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.7.23.tgz", - "integrity": "sha512-VDNkpDvDlreGh2E3tlDj8B3piiuLhhQA/7rIVZpiLUvG1YpucAa6N7iDXA7Gc/+Hah8spaCg/qvEaBkCmcIYCQ==", + "version": "1.10.15", + "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.10.15.tgz", + "integrity": "sha512-/iFeQuNaGdK7mfJbQcObhAhsMqLT7qgMYl7jX2GEIO+VDTejESpzAyKwaMeYXExN8D6e5BRHBCe7M5YlsuzjDA==", "dev": true, "hasInstallScript": true, "license": "Apache-2.0", "dependencies": { "@swc/counter": "^0.1.3", - "@swc/types": "^0.1.12" + "@swc/types": "^0.1.17" }, "engines": { "node": ">=10" @@ -4025,16 +4144,16 @@ "url": "https://opencollective.com/swc" }, "optionalDependencies": { - "@swc/core-darwin-arm64": "1.7.23", - "@swc/core-darwin-x64": "1.7.23", - "@swc/core-linux-arm-gnueabihf": "1.7.23", - "@swc/core-linux-arm64-gnu": "1.7.23", - "@swc/core-linux-arm64-musl": "1.7.23", - "@swc/core-linux-x64-gnu": "1.7.23", - "@swc/core-linux-x64-musl": "1.7.23", - "@swc/core-win32-arm64-msvc": "1.7.23", - "@swc/core-win32-ia32-msvc": "1.7.23", - "@swc/core-win32-x64-msvc": "1.7.23" + "@swc/core-darwin-arm64": "1.10.15", + "@swc/core-darwin-x64": "1.10.15", + "@swc/core-linux-arm-gnueabihf": "1.10.15", + "@swc/core-linux-arm64-gnu": "1.10.15", + "@swc/core-linux-arm64-musl": "1.10.15", + "@swc/core-linux-x64-gnu": "1.10.15", + "@swc/core-linux-x64-musl": "1.10.15", + "@swc/core-win32-arm64-msvc": "1.10.15", + "@swc/core-win32-ia32-msvc": "1.10.15", + "@swc/core-win32-x64-msvc": "1.10.15" }, "peerDependencies": { "@swc/helpers": "*" @@ -4046,9 +4165,9 @@ } }, "node_modules/@swc/core-darwin-arm64": { - "version": "1.7.23", - "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.7.23.tgz", - "integrity": "sha512-yyOHPfti6yKlQulfVWMt7BVKst+SyEZYCWuQSGMn1KgmNCH/bYufRWfQXIhkGSj44ZkEepJmsJ8tDyIb4k5WyA==", + "version": "1.10.15", + "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.10.15.tgz", + "integrity": "sha512-zFdZ6/yHqMCPk7OhLFqHy/MQ1EqJhcZMpNHd1gXYT7VRU3FaqvvKETrUlG3VYl65McPC7AhMRfXPyJ0JO/jARQ==", "cpu": [ "arm64" ], @@ -4063,9 +4182,9 @@ } }, "node_modules/@swc/core-darwin-x64": { - "version": "1.7.23", - "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.7.23.tgz", - "integrity": "sha512-GzqHwQ0Y1VyjdI/bBKFX2GKm5HD3PIB6OhuAQtWZMTtEr2yIrlT0YK2T+XKh7oIg31JwxGBeQdBk3KTI7DARmQ==", + "version": "1.10.15", + "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.10.15.tgz", + "integrity": "sha512-8g4yiQwbr8fxOOjKXdot0dEkE5zgE8uNZudLy/ZyAhiwiZ8pbJ8/wVrDOu6dqbX7FBXAoDnvZ7fwN1jk4C8jdA==", "cpu": [ "x64" ], @@ -4080,9 +4199,9 @@ } }, "node_modules/@swc/core-linux-arm-gnueabihf": { - "version": "1.7.23", - "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.7.23.tgz", - "integrity": "sha512-qwX4gB41OS6/OZkHcpTqLFGsdmvoZyffnJIlgB/kZKwH3lfeJWzv6vx57zXtNpM/t7GoQEe0VZUVdmNjxSxBZw==", + "version": "1.10.15", + "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.10.15.tgz", + "integrity": "sha512-rl+eVOltl2+7WXOnvmWBpMgh6aO13G5x0U0g8hjwlmD6ku3Y9iRcThpOhm7IytMEarUp5pQxItNoPq+VUGjVHg==", "cpu": [ "arm" ], @@ -4097,9 +4216,9 @@ } }, "node_modules/@swc/core-linux-arm64-gnu": { - "version": "1.7.23", - "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.7.23.tgz", - "integrity": "sha512-TsrbUZdMaUwzI7+g/8rHPLWbntMKYSu5Bn5IBSqVKPeyqaXxNnlIUnWXgXcUcRAc+T+Y8ADfr7EiFz9iz5DuSA==", + "version": "1.10.15", + "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.10.15.tgz", + "integrity": "sha512-qxWEQeyAJMWJqjaN4hi58WMpPdt3Tn0biSK9CYRegQtvZWCbewr6v2agtSu5AZ2rudeH6OfCWAMDQQeSgn6PJQ==", "cpu": [ "arm64" ], @@ -4114,9 +4233,9 @@ } }, "node_modules/@swc/core-linux-arm64-musl": { - "version": "1.7.23", - "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.7.23.tgz", - "integrity": "sha512-JEdtwdthazKq4PBz53KSubwwK8MvqODAihGSAzc8u3Unq4ojcvaS8b0CwLBeD+kTQ78HpxOXTt3DsFIxpgaCAA==", + "version": "1.10.15", + "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.10.15.tgz", + "integrity": "sha512-QcELd9/+HjZx0WCxRrKcyKGWTiQ0485kFb5w8waxcSNd0d9Lgk4EFfWWVyvIb5gIHpDQmhrgzI/yRaWQX4YSZQ==", "cpu": [ "arm64" ], @@ -4131,9 +4250,9 @@ } }, "node_modules/@swc/core-linux-x64-gnu": { - "version": "1.7.23", - "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.7.23.tgz", - "integrity": "sha512-V51gFPWaVAHbI1yg9ahsoya3aB4uawye3SZ5uQWgcP7wdCdiv60dw4F5nuPJf5Z1oXD3U/BslXuamv8Oh9vXqQ==", + "version": "1.10.15", + "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.10.15.tgz", + "integrity": "sha512-S1+ZEEn3+a/MiMeQqQypbwTGoBG8/sPoCvpNbk+uValyygT+jSn3U0xVr45FbukpmMB+NhBMqfedMLqKA0QnJA==", "cpu": [ "x64" ], @@ -4148,9 +4267,9 @@ } }, "node_modules/@swc/core-linux-x64-musl": { - "version": "1.7.23", - "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.7.23.tgz", - "integrity": "sha512-BBqQi4+UdeRqag3yM4IJjaHG4yc1o3l9ksENHToE0o/u2DT0FY5+K/DiYGZLC1JHbSFzNqRCYsa7DIzRtZ0A1A==", + "version": "1.10.15", + "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.10.15.tgz", + "integrity": "sha512-qW+H9g/2zTJ4jP7NDw4VAALY0ZlNEKzYsEoSj/HKi7k3tYEHjMzsxjfsY9I8WZCft23bBdV3RTCPoxCshaj1CQ==", "cpu": [ "x64" ], @@ -4165,9 +4284,9 @@ } }, "node_modules/@swc/core-win32-arm64-msvc": { - "version": "1.7.23", - "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.7.23.tgz", - "integrity": "sha512-JPk6pvCKncL6bXG7p+NLZf8PWx4FakVvKNdwGeMrYunb+yk1IZf7qf9LJk8+GDGF5QviDXPs8opZrTrfsW80fA==", + "version": "1.10.15", + "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.10.15.tgz", + "integrity": "sha512-AhRB11aA6LxjIqut+mg7qsu/7soQDmbK6MKR9nP3hgBszpqtXbRba58lr24xIbBCMr+dpo6kgEapWt+t5Po6Zg==", "cpu": [ "arm64" ], @@ -4182,9 +4301,9 @@ } }, "node_modules/@swc/core-win32-ia32-msvc": { - "version": "1.7.23", - "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.7.23.tgz", - "integrity": "sha512-2Whxi8d+bLQBzJcQ5qYPHlk02YYVGsMVav0fWk+FnX2z1QRREIu1L1xvrpi7gBpjXp6BIU40ya8GiKeekNT2bg==", + "version": "1.10.15", + "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.10.15.tgz", + "integrity": "sha512-UGdh430TQwbDn6KjgvRTg1fO022sbQ4yCCHUev0+5B8uoBwi9a89qAz3emy2m56C8TXxUoihW9Y9OMfaRwPXUw==", "cpu": [ "ia32" ], @@ -4199,9 +4318,9 @@ } }, "node_modules/@swc/core-win32-x64-msvc": { - "version": "1.7.23", - "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.7.23.tgz", - "integrity": "sha512-82fARk4/yJ40kwWKY/gdKDisPdtgJE9jgpl/vkNG3alyJxrCzuNM7+CtiKoYbXLeqM8GQTS3wlvCaJu9oQ8dag==", + "version": "1.10.15", + "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.10.15.tgz", + "integrity": "sha512-XJzBCqO1m929qbJsOG7FZXQWX26TnEoMctS3QjuCoyBmkHxxQmZsy78KjMes1aomTcKHCyFYgrRGWgVmk7tT4Q==", "cpu": [ "x64" ], @@ -4223,9 +4342,9 @@ "license": "Apache-2.0" }, "node_modules/@swc/types": { - "version": "0.1.12", - "resolved": "https://registry.npmjs.org/@swc/types/-/types-0.1.12.tgz", - "integrity": "sha512-wBJA+SdtkbFhHjTMYH+dEH1y4VpfGdAc2Kw/LK09i9bXd/K6j6PkDcFCEzb6iVfZMkPRrl/q0e3toqTAJdkIVA==", + "version": "0.1.17", + "resolved": "https://registry.npmjs.org/@swc/types/-/types-0.1.17.tgz", + "integrity": "sha512-V5gRru+aD8YVyCOMAjMpWR1Ui577DD5KSJsHP8RAxopAH22jFz6GZd/qxqjO6MJHQhcsjvjOFXyDhyLQUnMveQ==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -4253,9 +4372,9 @@ "license": "MIT" }, "node_modules/@trunkio/launcher": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/@trunkio/launcher/-/launcher-1.3.2.tgz", - "integrity": "sha512-b5XTWaCjfXDk1wrFKutBqhoc3jVBEjD6l36aUc9AI+QFWWOqX5bLjkgOMAa2krN1QqAjP834wDYIW4n3PvXhCA==", + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/@trunkio/launcher/-/launcher-1.3.4.tgz", + "integrity": "sha512-4LCsFVvZtKht7EkbOq5gDsRLIBOH05ycNxm1Vrv+YzY+uOK2HueLBcLU8oejV9v01LTtWjfLJxonIgTSo7lwng==", "dev": true, "license": "ISC", "dependencies": { @@ -4283,10 +4402,38 @@ "@types/responselike": "^1.0.0" } }, + "node_modules/@types/eslint": { + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz", + "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/estree": "*", + "@types/json-schema": "*" + } + }, + "node_modules/@types/eslint-scope": { + "version": "3.7.7", + "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz", + "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/eslint": "*", + "@types/estree": "*" + } + }, "node_modules/@types/estree": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", - "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", + "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", + "license": "MIT" + }, + "node_modules/@types/gensync": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@types/gensync/-/gensync-1.0.4.tgz", + "integrity": "sha512-C3YYeRQWp2fmq9OryX+FoDy8nXS6scQ7dPptD8LnFDAUNcKWJjXQKDNJD3HVm+kOUsXhTOkpi69vI4EuAr95bA==", "dev": true, "license": "MIT" }, @@ -4314,17 +4461,6 @@ "@types/istanbul-lib-coverage": "*" } }, - "node_modules/@types/istanbul-lib-source-maps": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.4.tgz", - "integrity": "sha512-p+nSH0hBMLvuqgnT0rbBnDcfO3IuOZrLU+Yf4x0BhGVmXynB+gm9D35gAvWeMuk+riik5Rj12NBQm8rnzIPH3g==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/istanbul-lib-coverage": "*", - "source-map": "^0.6.1" - } - }, "node_modules/@types/istanbul-reports": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz", @@ -4339,7 +4475,6 @@ "version": "7.0.15", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", - "dev": true, "license": "MIT" }, "node_modules/@types/keyv": { @@ -4353,9 +4488,9 @@ } }, "node_modules/@types/mocha": { - "version": "10.0.7", - "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.7.tgz", - "integrity": "sha512-GN8yJ1mNTcFcah/wKEFIJckJx9iJLoMSzWcfRRuxz/Jk+U6KQNnml+etbtxFK8lPjzOw3zp4Ha/kjSst9fsHYw==", + "version": "10.0.10", + "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.10.tgz", + "integrity": "sha512-xPyYSz1cMPnJQhl0CLMH68j3gprKZaTjG3s5Vi+fDgx+uhG9NOXwbVt52eFS8ECyXhyKcjDLCBEqBExKuiZb7Q==", "dev": true, "license": "MIT" }, @@ -4370,9 +4505,9 @@ } }, "node_modules/@types/node": { - "version": "20.16.5", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.5.tgz", - "integrity": "sha512-VwYCweNo3ERajwy0IUlqqcyZ8/A7Zwa9ZP3MnENWcB11AejO+tLy3pu850goUW2FC/IJMdZUfKpX/yxL1gymCA==", + "version": "20.17.17", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.17.17.tgz", + "integrity": "sha512-/WndGO4kIfMicEQLTi/mDANUu/iVUhT7KboZPdEqqHQ4aTS+3qT3U5gIqWDFV+XouorjfgGqvKILJeHhuQgFYg==", "dev": true, "license": "MIT", "dependencies": { @@ -4432,9 +4567,9 @@ "license": "MIT" }, "node_modules/@types/ws": { - "version": "8.5.12", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.12.tgz", - "integrity": "sha512-3tPRkv1EtkDpzlgyKyI8pGsGZAGPEaXeu0DOj5DI25Ja91bdAYddYHbADRYVrZMRbfW+1l5YwXVDKohDJNQxkQ==", + "version": "8.5.14", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.14.tgz", + "integrity": "sha512-bd/YFLW+URhBzMXurx7lWByOu+xzU9+kb3RboOteXYDfW+tr+JZa99OyNmPINEGB/ahzKrEuc8rcv4gnpJmxTw==", "dev": true, "license": "MIT", "dependencies": { @@ -4469,17 +4604,162 @@ "@types/node": "*" } }, - "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==", + "node_modules/@typescript-eslint/parser": { + "version": "8.23.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.23.0.tgz", + "integrity": "sha512-h2lUByouOXFAlMec2mILeELUbME5SZRN/7R9Cw2RD2lRQQY08MWMM+PmVVKKJNK1aIwqTo9t/0CvOxwPbRIE2Q==", "dev": true, - "license": "ISC" + "license": "MIT", + "dependencies": { + "@typescript-eslint/scope-manager": "8.23.0", + "@typescript-eslint/types": "8.23.0", + "@typescript-eslint/typescript-estree": "8.23.0", + "@typescript-eslint/visitor-keys": "8.23.0", + "debug": "^4.3.4" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^8.57.0 || ^9.0.0", + "typescript": ">=4.8.4 <5.8.0" + } + }, + "node_modules/@typescript-eslint/scope-manager": { + "version": "8.23.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.23.0.tgz", + "integrity": "sha512-OGqo7+dXHqI7Hfm+WqkZjKjsiRtFUQHPdGMXzk5mYXhJUedO7e/Y7i8AK3MyLMgZR93TX4bIzYrfyVjLC+0VSw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/types": "8.23.0", + "@typescript-eslint/visitor-keys": "8.23.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/types": { + "version": "8.23.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.23.0.tgz", + "integrity": "sha512-1sK4ILJbCmZOTt9k4vkoulT6/y5CHJ1qUYxqpF1K/DBAd8+ZUL4LlSCxOssuH5m4rUaaN0uS0HlVPvd45zjduQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/typescript-estree": { + "version": "8.23.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.23.0.tgz", + "integrity": "sha512-LcqzfipsB8RTvH8FX24W4UUFk1bl+0yTOf9ZA08XngFwMg4Kj8A+9hwz8Cr/ZS4KwHrmo9PJiLZkOt49vPnuvQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/types": "8.23.0", + "@typescript-eslint/visitor-keys": "8.23.0", + "debug": "^4.3.4", + "fast-glob": "^3.3.2", + "is-glob": "^4.0.3", + "minimatch": "^9.0.4", + "semver": "^7.6.0", + "ts-api-utils": "^2.0.1" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "typescript": ">=4.8.4 <5.8.0" + } + }, + "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@typescript-eslint/utils": { + "version": "8.23.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.23.0.tgz", + "integrity": "sha512-uB/+PSo6Exu02b5ZEiVtmY6RVYO7YU5xqgzTIVZwTHvvK3HsL8tZZHFaTLFtRG3CsV4A5mhOv+NZx5BlhXPyIA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/eslint-utils": "^4.4.0", + "@typescript-eslint/scope-manager": "8.23.0", + "@typescript-eslint/types": "8.23.0", + "@typescript-eslint/typescript-estree": "8.23.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^8.57.0 || ^9.0.0", + "typescript": ">=4.8.4 <5.8.0" + } + }, + "node_modules/@typescript-eslint/visitor-keys": { + "version": "8.23.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.23.0.tgz", + "integrity": "sha512-oWWhcWDLwDfu++BGTZcmXWqpwtkwb5o7fxUIGksMQQDSdPW9prsSnfIOZMlsj4vBOSrcnjIUZMiIjODgGosFhQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/types": "8.23.0", + "eslint-visitor-keys": "^4.2.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } }, "node_modules/@vitest/pretty-format": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-2.0.5.tgz", - "integrity": "sha512-h8k+1oWHfwTkyTkb9egzwNMfJAEx4veaPSnMeKbVSjp4euqGSbQlm5+6VHwTr7u4FJslVVsUG5nopCaAYdOmSQ==", + "version": "2.1.9", + "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-2.1.9.tgz", + "integrity": "sha512-KhRIdGV2U9HOUzxfiHmY8IFHTdqtOhIzCpd8WRdJiE7D/HUcZVD0EgQCVjm+Q9gkUXWgBvMmTtZgIG48wq7sOQ==", "dev": true, "license": "MIT", "dependencies": { @@ -4490,53 +4770,59 @@ } }, "node_modules/@vitest/snapshot": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-1.6.0.tgz", - "integrity": "sha512-+Hx43f8Chus+DCmygqqfetcAZrDJwvTj0ymqjQq4CvmpKFSTVteEOBzCusu1x2tt4OJcvBflyHUE0DZSLgEMtQ==", + "version": "2.1.9", + "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-2.1.9.tgz", + "integrity": "sha512-oBO82rEjsxLNJincVhLhaxxZdEtV0EFHMK5Kmx5sJ6H9L183dHECjiefOAdnqpIgT5eZwT04PoggUnW88vOBNQ==", "dev": true, "license": "MIT", "dependencies": { - "magic-string": "^0.30.5", - "pathe": "^1.1.1", - "pretty-format": "^29.7.0" + "@vitest/pretty-format": "2.1.9", + "magic-string": "^0.30.12", + "pathe": "^1.1.2" }, "funding": { "url": "https://opencollective.com/vitest" } }, + "node_modules/@vitest/snapshot/node_modules/pathe": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz", + "integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==", + "dev": true, + "license": "MIT" + }, "node_modules/@vitest/spy": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-2.0.5.tgz", - "integrity": "sha512-c/jdthAhvJdpfVuaexSrnawxZz6pywlTPe84LUB2m/4t3rl2fTo9NFGBG4oWgaD+FTgDDV8hJ/nibT7IfH3JfA==", + "version": "2.1.9", + "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-2.1.9.tgz", + "integrity": "sha512-E1B35FwzXXTs9FHNK6bDszs7mtydNi5MIfUWpceJ8Xbfb1gBMscAnwLbEu+B44ed6W3XjL9/ehLPHR1fkf1KLQ==", "dev": true, "license": "MIT", "dependencies": { - "tinyspy": "^3.0.0" + "tinyspy": "^3.0.2" }, "funding": { "url": "https://opencollective.com/vitest" } }, "node_modules/@wdio/browser-runner": { - "version": "9.0.9", - "resolved": "https://registry.npmjs.org/@wdio/browser-runner/-/browser-runner-9.0.9.tgz", - "integrity": "sha512-3ysXRq5dzLNSdLOcOHSrNQK0OCXmgaUg81mpKUQs//iseZB/YhtrslCDrE7/C0RMIh/jTllX8Zpqfofbk/Oc2A==", + "version": "9.8.0", + "resolved": "https://registry.npmjs.org/@wdio/browser-runner/-/browser-runner-9.8.0.tgz", + "integrity": "sha512-e838YjFr+lhcI2TyIv5rYgEihukYx8Y2EpXDFHAfkLIzf5Y49K41IFYbmShrl/fEX7/5uUKOMhZ9eTnZ9QakvQ==", "dev": true, "license": "MIT", "dependencies": { "@originjs/vite-plugin-commonjs": "^1.0.3", - "@types/istanbul-lib-source-maps": "^4.0.4", "@vitest/spy": "^2.0.4", - "@wdio/globals": "9.0.9", - "@wdio/local-runner": "9.0.9", - "@wdio/logger": "9.0.8", - "@wdio/mocha-framework": "9.0.8", - "@wdio/protocols": "9.0.8", - "@wdio/runner": "9.0.9", - "@wdio/types": "9.0.8", - "@wdio/utils": "9.0.8", + "@wdio/globals": "9.8.0", + "@wdio/local-runner": "9.8.0", + "@wdio/logger": "9.4.4", + "@wdio/mocha-framework": "9.7.3", + "@wdio/protocols": "9.7.0", + "@wdio/runner": "9.8.0", + "@wdio/types": "9.6.3", + "@wdio/utils": "9.7.3", "deepmerge-ts": "^7.0.3", - "expect": "^29.7.0", + "expect": "30.0.0-alpha.7", "expect-webdriverio": "^5.0.1", "get-port": "^7.1.0", "import-meta-resolve": "^4.0.0", @@ -4549,11 +4835,11 @@ "recast": "^0.23.6", "safe-stringify": "^1.1.0", "source-map-support": "^0.5.21", - "vite": "~5.4.0", + "vite": "^5.4.10", "vite-plugin-istanbul": "^6.0.0", "vite-plugin-top-level-await": "^1.4.1", - "webdriver": "9.0.8", - "webdriverio": "9.0.9" + "webdriver": "9.7.3", + "webdriverio": "9.8.0" }, "engines": { "node": ">=18.20.0" @@ -4565,36 +4851,35 @@ } }, "node_modules/@wdio/cli": { - "version": "9.0.9", - "resolved": "https://registry.npmjs.org/@wdio/cli/-/cli-9.0.9.tgz", - "integrity": "sha512-/sY0pMpLhsnhWpWovG81F/PqYmC7EluskrUhQ8/7BW1XDcNkUminCsd685HgAqPE3nX6Npx1oRhCbNDL/7Z7pw==", + "version": "9.8.0", + "resolved": "https://registry.npmjs.org/@wdio/cli/-/cli-9.8.0.tgz", + "integrity": "sha512-q9Kw7kciffTG6shnvcs08cVLD6RWhSl22B0iCAOZHd7D1kk2LG2TdqqELSSQF5/sVblSq99XtMoaDm3L2Iy9qw==", "dev": true, "license": "MIT", "dependencies": { "@types/node": "^20.1.1", - "@vitest/snapshot": "^1.2.1", - "@wdio/config": "9.0.8", - "@wdio/globals": "9.0.9", - "@wdio/logger": "9.0.8", - "@wdio/protocols": "9.0.8", - "@wdio/types": "9.0.8", - "@wdio/utils": "9.0.8", + "@vitest/snapshot": "^2.1.1", + "@wdio/config": "9.7.3", + "@wdio/globals": "9.8.0", + "@wdio/logger": "9.4.4", + "@wdio/protocols": "9.7.0", + "@wdio/types": "9.6.3", + "@wdio/utils": "9.7.3", "async-exit-hook": "^2.0.1", "chalk": "^5.2.0", - "chokidar": "^3.5.3", - "cli-spinners": "^3.0.0", + "chokidar": "^4.0.0", "dotenv": "^16.3.1", "ejs": "^3.1.9", "execa": "^9.2.0", "import-meta-resolve": "^4.0.0", - "inquirer": "^10.1.8", + "inquirer": "^11.0.1", "lodash.flattendeep": "^4.4.0", "lodash.pickby": "^4.6.0", "lodash.union": "^4.6.0", "read-pkg-up": "^10.0.0", "recursive-readdir": "^2.2.3", "tsx": "^4.7.2", - "webdriverio": "9.0.9", + "webdriverio": "9.8.0", "yargs": "^17.7.2" }, "bin": { @@ -4605,9 +4890,9 @@ } }, "node_modules/@wdio/cli/node_modules/chalk": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", - "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.4.1.tgz", + "integrity": "sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w==", "dev": true, "license": "MIT", "engines": { @@ -4618,14 +4903,14 @@ } }, "node_modules/@wdio/concise-reporter": { - "version": "9.0.8", - "resolved": "https://registry.npmjs.org/@wdio/concise-reporter/-/concise-reporter-9.0.8.tgz", - "integrity": "sha512-FIekyKoQyEV5zdHoIkL/JEoy3x1edncyH/tfj6Gj+dYvj8V1wzvd6VqX6biJdDWq6es7/0OvRi5UhUw+/fy4MA==", + "version": "9.6.3", + "resolved": "https://registry.npmjs.org/@wdio/concise-reporter/-/concise-reporter-9.6.3.tgz", + "integrity": "sha512-FnYX7/ke+xKmQJ53vRNb2MyVZ0oXZXvGe0cFAJ2FyCfQKZtWOC9u9KEHfba2wUtXIv2qNQI4xN18gys0v3pHug==", "dev": true, "license": "MIT", "dependencies": { - "@wdio/reporter": "9.0.8", - "@wdio/types": "9.0.8", + "@wdio/reporter": "9.6.3", + "@wdio/types": "9.6.3", "chalk": "^5.0.1", "pretty-ms": "^9.0.0" }, @@ -4634,9 +4919,9 @@ } }, "node_modules/@wdio/concise-reporter/node_modules/chalk": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", - "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.4.1.tgz", + "integrity": "sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w==", "dev": true, "license": "MIT", "engines": { @@ -4647,16 +4932,15 @@ } }, "node_modules/@wdio/config": { - "version": "9.0.8", - "resolved": "https://registry.npmjs.org/@wdio/config/-/config-9.0.8.tgz", - "integrity": "sha512-37L+hd+A1Nyehd/pgfTrLC6w+Ngbu0CIoFh9Vv6v8Cgu5Hih0TLofvlg+J1BNbcTd5eQ2tFKZBDeFMhQaIiTpg==", + "version": "9.7.3", + "resolved": "https://registry.npmjs.org/@wdio/config/-/config-9.7.3.tgz", + "integrity": "sha512-rWiGR0WMcUpGTTMn3XP9OzNW3WH64AcNK93b9kSwq9WzVGVIzMBCZK8LPXpdQ+pFwizq/ExIXTx/Z39kc0LCyw==", "dev": true, "license": "MIT", "dependencies": { - "@wdio/logger": "9.0.8", - "@wdio/types": "9.0.8", - "@wdio/utils": "9.0.8", - "decamelize": "^6.0.0", + "@wdio/logger": "9.4.4", + "@wdio/types": "9.6.3", + "@wdio/utils": "9.7.3", "deepmerge-ts": "^7.0.3", "glob": "^10.2.2", "import-meta-resolve": "^4.0.0" @@ -4665,10 +4949,38 @@ "node": ">=18.20.0" } }, + "node_modules/@wdio/dot-reporter": { + "version": "9.6.3", + "resolved": "https://registry.npmjs.org/@wdio/dot-reporter/-/dot-reporter-9.6.3.tgz", + "integrity": "sha512-/54vTrG08Q66QFFvw96SrdKpqhFknucdKZZj5rN8h5/e5zT+nl7BXUvCkXy6eEP9CCR+DOYLvA2sXZjoArG6xw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@wdio/reporter": "9.6.3", + "@wdio/types": "9.6.3", + "chalk": "^5.0.1" + }, + "engines": { + "node": ">=18.20.0" + } + }, + "node_modules/@wdio/dot-reporter/node_modules/chalk": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.4.1.tgz", + "integrity": "sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.17.0 || ^14.13 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, "node_modules/@wdio/globals": { - "version": "9.0.9", - "resolved": "https://registry.npmjs.org/@wdio/globals/-/globals-9.0.9.tgz", - "integrity": "sha512-Lmzf82NoNK+i+Z6slt/Ueu0iOfHMLMNxxWnvoC+en3g8A1xj2JxAinC4ymrc0iFC3uvG0SxMWlpVmGTk78wp2Q==", + "version": "9.8.0", + "resolved": "https://registry.npmjs.org/@wdio/globals/-/globals-9.8.0.tgz", + "integrity": "sha512-W8XbOzTGQG1J1k9yAMSYtxWEGrxMQi++xdD62MsnbDU++RHiBD9ZDm8yRVPo9HoPL3Y+xovtsWbKbZ0eC4xFDQ==", "dev": true, "license": "MIT", "engines": { @@ -4676,21 +4988,21 @@ }, "optionalDependencies": { "expect-webdriverio": "^5.0.1", - "webdriverio": "9.0.9" + "webdriverio": "9.8.0" } }, "node_modules/@wdio/local-runner": { - "version": "9.0.9", - "resolved": "https://registry.npmjs.org/@wdio/local-runner/-/local-runner-9.0.9.tgz", - "integrity": "sha512-cqhCqHHO9PnH51+buvXd0ck3FB0HCnqPQLe/SLZuGI5tzywK1X7wFKlcAHkmqCPyu3xdV2mh8QZTEL4k8ayzsw==", + "version": "9.8.0", + "resolved": "https://registry.npmjs.org/@wdio/local-runner/-/local-runner-9.8.0.tgz", + "integrity": "sha512-nK5LFUJqAW0bNMcc2uuboRHL2aUR2GxDS2fAkSqCN1aKAl/kzwDW88TgyWz3RgOSE9Iyi+6OFUIXN/4XSJ4CRQ==", "dev": true, "license": "MIT", "dependencies": { "@types/node": "^20.1.0", - "@wdio/logger": "9.0.8", - "@wdio/repl": "9.0.8", - "@wdio/runner": "9.0.9", - "@wdio/types": "9.0.8", + "@wdio/logger": "9.4.4", + "@wdio/repl": "9.4.4", + "@wdio/runner": "9.8.0", + "@wdio/types": "9.6.3", "async-exit-hook": "^2.0.1", "split2": "^4.1.0", "stream-buffers": "^3.0.2" @@ -4700,9 +5012,9 @@ } }, "node_modules/@wdio/logger": { - "version": "9.0.8", - "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-9.0.8.tgz", - "integrity": "sha512-uIyYIDBwLczmsp9JE5hN3ME8Xg+9WNBfSNXD69ICHrY9WPTzFf94UeTuavK7kwSKF3ro2eJbmNZItYOfnoovnw==", + "version": "9.4.4", + "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-9.4.4.tgz", + "integrity": "sha512-BXx8RXFUW2M4dcO6t5Le95Hi2ZkTQBRsvBQqLekT2rZ6Xmw8ZKZBPf0FptnoftFGg6dYmwnDidYv/0+4PiHjpQ==", "dev": true, "license": "MIT", "dependencies": { @@ -4715,23 +5027,10 @@ "node": ">=18.20.0" } }, - "node_modules/@wdio/logger/node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, "node_modules/@wdio/logger/node_modules/chalk": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", - "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.4.1.tgz", + "integrity": "sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w==", "dev": true, "license": "MIT", "engines": { @@ -4741,265 +5040,35 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/@wdio/logger/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, "node_modules/@wdio/mocha-framework": { - "version": "9.0.8", - "resolved": "https://registry.npmjs.org/@wdio/mocha-framework/-/mocha-framework-9.0.8.tgz", - "integrity": "sha512-0zwnyybxN8zxeOaFsjCpqdcvZIyzb8QglZorQ17VH9GR0/giMtcRbC4usYJgh4W37e1FCwvyvQyij93JYSSkNA==", + "version": "9.7.3", + "resolved": "https://registry.npmjs.org/@wdio/mocha-framework/-/mocha-framework-9.7.3.tgz", + "integrity": "sha512-DG2TVjjP9n1lESfB0p0pmhl/tVFIRhKVtJaEuSwIOy3YDc3S6iJtGIeoy4jtqxBm/c6srbx5j3d5yMIHP4/wRA==", "dev": true, "license": "MIT", "dependencies": { "@types/mocha": "^10.0.6", "@types/node": "^20.11.28", - "@wdio/logger": "9.0.8", - "@wdio/types": "9.0.8", - "@wdio/utils": "9.0.8", + "@wdio/logger": "9.4.4", + "@wdio/types": "9.6.3", + "@wdio/utils": "9.7.3", "mocha": "^10.3.0" }, "engines": { "node": ">=18.20.0" } }, - "node_modules/@wdio/mocha-framework/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/@wdio/mocha-framework/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, - "license": "ISC", - "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", - "wrap-ansi": "^7.0.0" - } - }, - "node_modules/@wdio/mocha-framework/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, - "license": "MIT" - }, - "node_modules/@wdio/mocha-framework/node_modules/glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", - "deprecated": "Glob versions prior to v9 are no longer supported", - "dev": true, - "license": "ISC", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/@wdio/mocha-framework/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, - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@wdio/mocha-framework/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, - "license": "MIT", - "dependencies": { - "chalk": "^4.1.0", - "is-unicode-supported": "^0.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@wdio/mocha-framework/node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@wdio/mocha-framework/node_modules/mocha": { - "version": "10.7.3", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.7.3.tgz", - "integrity": "sha512-uQWxAu44wwiACGqjbPYmjo7Lg8sFrS3dQe7PP2FQI+woptP4vZXSMcfMyFL/e1yFEeEpV4RtyTpZROOKmxis+A==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-colors": "^4.1.3", - "browser-stdout": "^1.3.1", - "chokidar": "^3.5.3", - "debug": "^4.3.5", - "diff": "^5.2.0", - "escape-string-regexp": "^4.0.0", - "find-up": "^5.0.0", - "glob": "^8.1.0", - "he": "^1.2.0", - "js-yaml": "^4.1.0", - "log-symbols": "^4.1.0", - "minimatch": "^5.1.6", - "ms": "^2.1.3", - "serialize-javascript": "^6.0.2", - "strip-json-comments": "^3.1.1", - "supports-color": "^8.1.1", - "workerpool": "^6.5.1", - "yargs": "^16.2.0", - "yargs-parser": "^20.2.9", - "yargs-unparser": "^2.0.0" - }, - "bin": { - "_mocha": "bin/_mocha", - "mocha": "bin/mocha.js" - }, - "engines": { - "node": ">= 14.0.0" - } - }, - "node_modules/@wdio/mocha-framework/node_modules/serialize-javascript": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", - "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "randombytes": "^2.1.0" - } - }, - "node_modules/@wdio/mocha-framework/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, - "license": "MIT", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/@wdio/mocha-framework/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, - "license": "MIT", - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/supports-color?sponsor=1" - } - }, - "node_modules/@wdio/mocha-framework/node_modules/workerpool": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz", - "integrity": "sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==", - "dev": true, - "license": "Apache-2.0" - }, - "node_modules/@wdio/mocha-framework/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, - "license": "MIT", - "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/@wdio/mocha-framework/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, - "license": "MIT", - "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/@wdio/protocols": { - "version": "9.0.8", - "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-9.0.8.tgz", - "integrity": "sha512-xRH54byFf623/w/KW62xkf/C2mGyigSfMm+UT3tNEAd5ZA9X2VAWQWQBPzdcrsck7Fxk4zlQX8Kb34RSs7Cy4Q==", + "version": "9.7.0", + "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-9.7.0.tgz", + "integrity": "sha512-5DI8cqJqT9K6oQn8UpaSTmcGAl4ufkUWC5FoPT3oXdLjILfxvweZDf/2XNBCbGMk4+VOMKqB2ofOqKhDIB2nAg==", "dev": true, "license": "MIT" }, "node_modules/@wdio/repl": { - "version": "9.0.8", - "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-9.0.8.tgz", - "integrity": "sha512-3iubjl4JX5zD21aFxZwQghqC3lgu+mSs8c3NaiYYNCC+IT5cI/8QuKlgh9s59bu+N3gG988jqMJeCYlKuUv/iw==", + "version": "9.4.4", + "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-9.4.4.tgz", + "integrity": "sha512-kchPRhoG/pCn4KhHGiL/ocNhdpR8OkD2e6sANlSUZ4TGBVi86YSIEjc2yXUwLacHknC/EnQk/SFnqd4MsNjGGg==", "dev": true, "license": "MIT", "dependencies": { @@ -5010,16 +5079,16 @@ } }, "node_modules/@wdio/reporter": { - "version": "9.0.8", - "resolved": "https://registry.npmjs.org/@wdio/reporter/-/reporter-9.0.8.tgz", - "integrity": "sha512-2T2XmCL31bLVkHN0UvHagg4KkkUHwzbXnHm1wjlWtd90BdVZ3lJyMhDh3TkKsyyDxPaZZJEhyDp9g/COwuF/bw==", + "version": "9.6.3", + "resolved": "https://registry.npmjs.org/@wdio/reporter/-/reporter-9.6.3.tgz", + "integrity": "sha512-OwuwhRtqDZDPU8/6TBSMg+bvw9DKgUVfGu160zamBt8jPg8LZ5VU2VoZlRBNZMAHl3OnSwj+ih2/meEoLf3DUg==", "dev": true, "license": "MIT", "dependencies": { "@types/node": "^20.1.0", - "@wdio/logger": "9.0.8", - "@wdio/types": "9.0.8", - "diff": "^5.0.0", + "@wdio/logger": "9.4.4", + "@wdio/types": "9.6.3", + "diff": "^7.0.0", "object-inspect": "^1.12.0" }, "engines": { @@ -5027,32 +5096,32 @@ } }, "node_modules/@wdio/runner": { - "version": "9.0.9", - "resolved": "https://registry.npmjs.org/@wdio/runner/-/runner-9.0.9.tgz", - "integrity": "sha512-DIyFSt/mF7EVyFvgKztVAzf7lfunXsMxfYm3Hqjxgh0IQXJfjvOFKmT+R/T61tTHyzHHsx0JBQTu12WqHkNQtA==", + "version": "9.8.0", + "resolved": "https://registry.npmjs.org/@wdio/runner/-/runner-9.8.0.tgz", + "integrity": "sha512-Qak3SzdC48HZ7NHK/Ilh/x6s95mAx8Fy/iovntjpphyGQ9k3Ra/cIqzzpiMkV/3+X4Gdo1lQ5AGa5KakkQJHeg==", "dev": true, "license": "MIT", "dependencies": { "@types/node": "^20.11.28", - "@wdio/config": "9.0.8", - "@wdio/globals": "9.0.9", - "@wdio/logger": "9.0.8", - "@wdio/types": "9.0.8", - "@wdio/utils": "9.0.8", + "@wdio/config": "9.7.3", + "@wdio/dot-reporter": "9.6.3", + "@wdio/globals": "9.8.0", + "@wdio/logger": "9.4.4", + "@wdio/types": "9.6.3", + "@wdio/utils": "9.7.3", "deepmerge-ts": "^7.0.3", "expect-webdriverio": "^5.0.1", - "gaze": "^1.1.3", - "webdriver": "9.0.8", - "webdriverio": "9.0.9" + "webdriver": "9.7.3", + "webdriverio": "9.8.0" }, "engines": { "node": ">=18.20.0" } }, "node_modules/@wdio/types": { - "version": "9.0.8", - "resolved": "https://registry.npmjs.org/@wdio/types/-/types-9.0.8.tgz", - "integrity": "sha512-pmz2iRWddTanrv8JC7v3wUGm17KRv2WyyJhQfklMSANn9V1ep6pw1RJG2WJnKq4NojMvH1nVv1sMZxXrYPhpYw==", + "version": "9.6.3", + "resolved": "https://registry.npmjs.org/@wdio/types/-/types-9.6.3.tgz", + "integrity": "sha512-K3Lu7K5g5bsUcQV6/95XaS3jMwcGUn2pDdryYibKZafklhHjVt3o/xnw6Vgd/JzoSneCKHdwj941n+yDpTJHAw==", "dev": true, "license": "MIT", "dependencies": { @@ -5063,23 +5132,23 @@ } }, "node_modules/@wdio/utils": { - "version": "9.0.8", - "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-9.0.8.tgz", - "integrity": "sha512-p3EgOdkhCvMxJFd3WTtSChqYFQu2mz69/5tOsljDaL+4QYwnRR7O8M9wFsL3/9XMVcHdnC4Ija2VRxQ/lb+hHQ==", + "version": "9.7.3", + "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-9.7.3.tgz", + "integrity": "sha512-gScYudyuq/aOmiPTz7vTvEhWtmiUMdrrzkOSQqGCQk0AMy7WpAzKM19NESPe9iPTN96i11jLJnpLOXwm2j+6LQ==", "dev": true, "license": "MIT", "dependencies": { "@puppeteer/browsers": "^2.2.0", - "@wdio/logger": "9.0.8", - "@wdio/types": "9.0.8", + "@wdio/logger": "9.4.4", + "@wdio/types": "9.6.3", "decamelize": "^6.0.0", "deepmerge-ts": "^7.0.3", - "edgedriver": "^5.6.1", - "geckodriver": "^4.3.3", + "edgedriver": "^6.1.1", + "geckodriver": "^5.0.0", "get-port": "^7.0.0", "import-meta-resolve": "^4.0.0", "locate-app": "^2.2.24", - "safaridriver": "^0.1.2", + "safaridriver": "^1.0.0", "split2": "^4.2.0", "wait-port": "^1.1.0" }, @@ -5088,73 +5157,73 @@ } }, "node_modules/@webassemblyjs/ast": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz", - "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz", + "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==", "dev": true, "license": "MIT", "dependencies": { - "@webassemblyjs/helper-numbers": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6" + "@webassemblyjs/helper-numbers": "1.13.2", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2" } }, "node_modules/@webassemblyjs/floating-point-hex-parser": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz", - "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz", + "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==", "dev": true, "license": "MIT" }, "node_modules/@webassemblyjs/helper-api-error": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz", - "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz", + "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==", "dev": true, "license": "MIT" }, "node_modules/@webassemblyjs/helper-buffer": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz", - "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz", + "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==", "dev": true, "license": "MIT" }, "node_modules/@webassemblyjs/helper-numbers": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz", - "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz", + "integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==", "dev": true, "license": "MIT", "dependencies": { - "@webassemblyjs/floating-point-hex-parser": "1.11.6", - "@webassemblyjs/helper-api-error": "1.11.6", + "@webassemblyjs/floating-point-hex-parser": "1.13.2", + "@webassemblyjs/helper-api-error": "1.13.2", "@xtuc/long": "4.2.2" } }, "node_modules/@webassemblyjs/helper-wasm-bytecode": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz", - "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz", + "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==", "dev": true, "license": "MIT" }, "node_modules/@webassemblyjs/helper-wasm-section": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz", - "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz", + "integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==", "dev": true, "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-buffer": "1.12.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/wasm-gen": "1.12.1" + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-buffer": "1.14.1", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2", + "@webassemblyjs/wasm-gen": "1.14.1" } }, "node_modules/@webassemblyjs/ieee754": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz", - "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz", + "integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==", "dev": true, "license": "MIT", "dependencies": { @@ -5162,9 +5231,9 @@ } }, "node_modules/@webassemblyjs/leb128": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz", - "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz", + "integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -5172,79 +5241,79 @@ } }, "node_modules/@webassemblyjs/utf8": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz", - "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz", + "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==", "dev": true, "license": "MIT" }, "node_modules/@webassemblyjs/wasm-edit": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz", - "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz", + "integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==", "dev": true, "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-buffer": "1.12.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/helper-wasm-section": "1.12.1", - "@webassemblyjs/wasm-gen": "1.12.1", - "@webassemblyjs/wasm-opt": "1.12.1", - "@webassemblyjs/wasm-parser": "1.12.1", - "@webassemblyjs/wast-printer": "1.12.1" + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-buffer": "1.14.1", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2", + "@webassemblyjs/helper-wasm-section": "1.14.1", + "@webassemblyjs/wasm-gen": "1.14.1", + "@webassemblyjs/wasm-opt": "1.14.1", + "@webassemblyjs/wasm-parser": "1.14.1", + "@webassemblyjs/wast-printer": "1.14.1" } }, "node_modules/@webassemblyjs/wasm-gen": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz", - "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz", + "integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==", "dev": true, "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/ieee754": "1.11.6", - "@webassemblyjs/leb128": "1.11.6", - "@webassemblyjs/utf8": "1.11.6" + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2", + "@webassemblyjs/ieee754": "1.13.2", + "@webassemblyjs/leb128": "1.13.2", + "@webassemblyjs/utf8": "1.13.2" } }, "node_modules/@webassemblyjs/wasm-opt": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz", - "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz", + "integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==", "dev": true, "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-buffer": "1.12.1", - "@webassemblyjs/wasm-gen": "1.12.1", - "@webassemblyjs/wasm-parser": "1.12.1" + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-buffer": "1.14.1", + "@webassemblyjs/wasm-gen": "1.14.1", + "@webassemblyjs/wasm-parser": "1.14.1" } }, "node_modules/@webassemblyjs/wasm-parser": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz", - "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz", + "integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==", "dev": true, "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-api-error": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/ieee754": "1.11.6", - "@webassemblyjs/leb128": "1.11.6", - "@webassemblyjs/utf8": "1.11.6" + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-api-error": "1.13.2", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2", + "@webassemblyjs/ieee754": "1.13.2", + "@webassemblyjs/leb128": "1.13.2", + "@webassemblyjs/utf8": "1.13.2" } }, "node_modules/@webassemblyjs/wast-printer": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz", - "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz", + "integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==", "dev": true, "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/ast": "1.14.1", "@xtuc/long": "4.2.2" } }, @@ -5302,9 +5371,9 @@ "license": "Apache-2.0" }, "node_modules/@zip.js/zip.js": { - "version": "2.7.52", - "resolved": "https://registry.npmjs.org/@zip.js/zip.js/-/zip.js-2.7.52.tgz", - "integrity": "sha512-+5g7FQswvrCHwYKNMd/KFxZSObctLSsQOgqBSi0LzwHo3li9Eh1w5cF5ndjQw9Zbr3ajVnd2+XyiX85gAetx1Q==", + "version": "2.7.57", + "resolved": "https://registry.npmjs.org/@zip.js/zip.js/-/zip.js-2.7.57.tgz", + "integrity": "sha512-BtonQ1/jDnGiMed6OkV6rZYW78gLmLswkHOzyMrMb+CAR7CZO8phOHO6c2qw6qb1g1betN7kwEHhhZk30dv+NA==", "dev": true, "license": "BSD-3-Clause", "engines": { @@ -5334,9 +5403,9 @@ } }, "node_modules/acorn": { - "version": "8.12.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz", - "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==", + "version": "8.14.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz", + "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==", "license": "MIT", "bin": { "acorn": "bin/acorn" @@ -5345,16 +5414,6 @@ "node": ">=0.4.0" } }, - "node_modules/acorn-import-attributes": { - "version": "1.9.5", - "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz", - "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==", - "dev": true, - "license": "MIT", - "peerDependencies": { - "acorn": "^8" - } - }, "node_modules/acorn-jsx": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", @@ -5365,14 +5424,11 @@ } }, "node_modules/agent-base": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz", - "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==", + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz", + "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==", "dev": true, "license": "MIT", - "dependencies": { - "debug": "^4.3.4" - }, "engines": { "node": ">= 14" } @@ -5407,6 +5463,48 @@ "url": "https://github.com/sponsors/epoberezkin" } }, + "node_modules/ajv-formats": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz", + "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ajv": "^8.0.0" + }, + "peerDependencies": { + "ajv": "^8.0.0" + }, + "peerDependenciesMeta": { + "ajv": { + "optional": true + } + } + }, + "node_modules/ajv-formats/node_modules/ajv": { + "version": "8.17.1", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", + "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-deep-equal": "^3.1.3", + "fast-uri": "^3.0.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/ajv-formats/node_modules/json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "dev": true, + "license": "MIT" + }, "node_modules/ajv-keywords": { "version": "3.5.2", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", @@ -5447,6 +5545,7 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -5467,6 +5566,13 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, + "node_modules/any-promise": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", + "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==", + "dev": true, + "license": "MIT" + }, "node_modules/anymatch": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", @@ -5481,6 +5587,19 @@ "node": ">= 8" } }, + "node_modules/anymatch/node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, "node_modules/archiver": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/archiver/-/archiver-7.0.1.tgz", @@ -5533,9 +5652,9 @@ } }, "node_modules/archiver-utils/node_modules/readable-stream": { - "version": "4.5.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.5.2.tgz", - "integrity": "sha512-yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g==", + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.7.0.tgz", + "integrity": "sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==", "dev": true, "license": "MIT", "dependencies": { @@ -5550,9 +5669,9 @@ } }, "node_modules/archiver/node_modules/readable-stream": { - "version": "4.5.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.5.2.tgz", - "integrity": "sha512-yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g==", + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.7.0.tgz", + "integrity": "sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==", "dev": true, "license": "MIT", "dependencies": { @@ -5583,13 +5702,13 @@ "license": "Python-2.0" }, "node_modules/aria-query": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz", - "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.2.tgz", + "integrity": "sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==", "dev": true, "license": "Apache-2.0", - "dependencies": { - "dequal": "^2.0.3" + "engines": { + "node": ">= 0.4" } }, "node_modules/asap": { @@ -5612,9 +5731,9 @@ } }, "node_modules/asn1.js/node_modules/bn.js": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.1.tgz", + "integrity": "sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg==", "dev": true, "license": "MIT" }, @@ -5726,21 +5845,21 @@ } }, "node_modules/b4a": { - "version": "1.6.6", - "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.6.tgz", - "integrity": "sha512-5Tk1HLk6b6ctmjIkAcU/Ujv/1WqiDl0F0JdRCR80VsOcUlHcu7pWeWRlOqQLHfDEsVx9YH/aif5AG4ehoCtTmg==", + "version": "1.6.7", + "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.7.tgz", + "integrity": "sha512-OnAYlL5b7LEkALw87fUVafQw5rVR9RjwGd4KUwNQ6DrrNmaVaUCgLipfVlzrPQ4tWOR9P0IXGNOx50jYCCdSJg==", "dev": true, "license": "Apache-2.0" }, "node_modules/babel-loader": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.3.0.tgz", - "integrity": "sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==", + "version": "8.4.1", + "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.4.1.tgz", + "integrity": "sha512-nXzRChX+Z1GoE6yWavBQg6jDslyFF3SDjl2paADuoQtQW10JqShJt62R6eJQ5m/pjJFDT8xgKIWSP85OY8eXeA==", "dev": true, "license": "MIT", "dependencies": { "find-cache-dir": "^3.3.1", - "loader-utils": "^2.0.0", + "loader-utils": "^2.0.4", "make-dir": "^3.1.0", "schema-utils": "^2.6.5" }, @@ -5753,14 +5872,14 @@ } }, "node_modules/babel-plugin-polyfill-corejs2": { - "version": "0.4.11", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.11.tgz", - "integrity": "sha512-sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q==", + "version": "0.4.12", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.12.tgz", + "integrity": "sha512-CPWT6BwvhrTO2d8QVorhTCQw9Y43zOu7G9HigcfxvepOU6b8o3tcWad6oVgZIsZCTt42FFv97aA7ZJsbM4+8og==", "dev": true, "license": "MIT", "dependencies": { "@babel/compat-data": "^7.22.6", - "@babel/helper-define-polyfill-provider": "^0.6.2", + "@babel/helper-define-polyfill-provider": "^0.6.3", "semver": "^6.3.1" }, "peerDependencies": { @@ -5778,27 +5897,27 @@ } }, "node_modules/babel-plugin-polyfill-corejs3": { - "version": "0.10.6", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.10.6.tgz", - "integrity": "sha512-b37+KR2i/khY5sKmWNVQAnitvquQbNdWy6lJdsr0kmquCKEEUgMKK4SboVM3HtfnZilfjr4MMQ7vY58FVWDtIA==", + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.11.1.tgz", + "integrity": "sha512-yGCqvBT4rwMczo28xkH/noxJ6MZ4nJfkVYdoDaC/utLtWrXxv27HVrzAeSbqR8SxDsp46n0YF47EbHoixy6rXQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-define-polyfill-provider": "^0.6.2", - "core-js-compat": "^3.38.0" + "@babel/helper-define-polyfill-provider": "^0.6.3", + "core-js-compat": "^3.40.0" }, "peerDependencies": { "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" } }, "node_modules/babel-plugin-polyfill-regenerator": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.2.tgz", - "integrity": "sha512-2R25rQZWP63nGwaAswvDazbPXfrM3HwVoBXK6HcqeKrSrL/JqcC/rDcf95l4r7LXLyxDXc8uQDa064GubtCABg==", + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.3.tgz", + "integrity": "sha512-LiWSbl4CRSIa5x/JAU6jZiG9eit9w6mz+yVMFwDE83LAWvt0AfGBoZ7HS/mkhrKuh2ZlzfVZYKoLjXdqw6Yt7Q==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-define-polyfill-provider": "^0.6.2" + "@babel/helper-define-polyfill-provider": "^0.6.3" }, "peerDependencies": { "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" @@ -5811,55 +5930,72 @@ "license": "MIT" }, "node_modules/bare-events": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.4.2.tgz", - "integrity": "sha512-qMKFd2qG/36aA4GwvKq8MxnPgCQAmBWmSyLWsJcbn8v03wvIPQ/hG1Ms8bPzndZxMDoHpxez5VOS+gC9Yi24/Q==", + "version": "2.5.4", + "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.5.4.tgz", + "integrity": "sha512-+gFfDkR8pj4/TrWCGUGWmJIkBwuxPS5F+a5yWjOHQt2hHvNZd5YLzadjmDUtFmMM4y429bnKLa8bYBMHcYdnQA==", "dev": true, "license": "Apache-2.0", "optional": true }, "node_modules/bare-fs": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-2.3.3.tgz", - "integrity": "sha512-7RYKL+vZVCyAsMLi5SPu7QGauGGT8avnP/HO571ndEuV4MYdGXvLhtW67FuLPeEI8EiIY7zbbRR9x7x7HU0kgw==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-4.0.1.tgz", + "integrity": "sha512-ilQs4fm/l9eMfWY2dY0WCIUplSUp7U0CT1vrqMg1MUdeZl4fypu5UP0XcDBK5WBQPJAKP1b7XEodISmekH/CEg==", "dev": true, "license": "Apache-2.0", "optional": true, "dependencies": { "bare-events": "^2.0.0", - "bare-path": "^2.0.0", + "bare-path": "^3.0.0", "bare-stream": "^2.0.0" + }, + "engines": { + "bare": ">=1.7.0" } }, "node_modules/bare-os": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-2.4.2.tgz", - "integrity": "sha512-HZoJwzC+rZ9lqEemTMiO0luOePoGYNBgsLLgegKR/cljiJvcDNhDZQkzC+NC5Oh0aHbdBNSOHpghwMuB5tqhjg==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-3.4.0.tgz", + "integrity": "sha512-9Ous7UlnKbe3fMi7Y+qh0DwAup6A1JkYgPnjvMDNOlmnxNRQvQ/7Nst+OnUQKzk0iAT0m9BisbDVp9gCv8+ETA==", "dev": true, "license": "Apache-2.0", - "optional": true + "optional": true, + "engines": { + "bare": ">=1.6.0" + } }, "node_modules/bare-path": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-2.1.3.tgz", - "integrity": "sha512-lh/eITfU8hrj9Ru5quUp0Io1kJWIk1bTjzo7JH1P5dWmQ2EL4hFUlfI8FonAhSlgIfhn63p84CDY/x+PisgcXA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-3.0.0.tgz", + "integrity": "sha512-tyfW2cQcB5NN8Saijrhqn0Zh7AnFNsnczRcuWODH0eYAXBsJ5gVxAUuNr7tsHSC6IZ77cA0SitzT+s47kot8Mw==", "dev": true, "license": "Apache-2.0", "optional": true, "dependencies": { - "bare-os": "^2.1.0" + "bare-os": "^3.0.1" } }, "node_modules/bare-stream": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.2.1.tgz", - "integrity": "sha512-YTB47kHwBW9zSG8LD77MIBAAQXjU2WjAkMHeeb7hUplVs6+IoM5I7uEVQNPMB7lj9r8I76UMdoMkGnCodHOLqg==", + "version": "2.6.5", + "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.6.5.tgz", + "integrity": "sha512-jSmxKJNJmHySi6hC42zlZnq00rga4jjxcgNZjY9N5WlOe/iOoGRtdwGsHzQv2RlH2KOYMwGUXhf2zXd32BA9RA==", "dev": true, "license": "Apache-2.0", "optional": true, "dependencies": { - "b4a": "^1.6.6", - "streamx": "^2.18.0" + "streamx": "^2.21.0" + }, + "peerDependencies": { + "bare-buffer": "*", + "bare-events": "*" + }, + "peerDependenciesMeta": { + "bare-buffer": { + "optional": true + }, + "bare-events": { + "optional": true + } } }, "node_modules/base64-js": { @@ -6008,14 +6144,18 @@ } }, "node_modules/browserify-rsa": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz", - "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.1.tgz", + "integrity": "sha512-YBjSAiTqM04ZVei6sXighu679a3SqWORA3qZTEqZImnlkDIFtKc6pNutpjyZ8RJTjQtuYfeetkxM11GwoYXMIQ==", "dev": true, "license": "MIT", "dependencies": { - "bn.js": "^5.0.0", - "randombytes": "^2.0.1" + "bn.js": "^5.2.1", + "randombytes": "^2.1.0", + "safe-buffer": "^5.2.1" + }, + "engines": { + "node": ">= 0.10" } }, "node_modules/browserify-sign": { @@ -6091,9 +6231,9 @@ } }, "node_modules/browserslist": { - "version": "4.23.3", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz", - "integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==", + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz", + "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==", "dev": true, "funding": [ { @@ -6111,10 +6251,10 @@ ], "license": "MIT", "dependencies": { - "caniuse-lite": "^1.0.30001646", - "electron-to-chromium": "^1.5.4", - "node-releases": "^2.0.18", - "update-browserslist-db": "^1.1.0" + "caniuse-lite": "^1.0.30001688", + "electron-to-chromium": "^1.5.73", + "node-releases": "^2.0.19", + "update-browserslist-db": "^1.1.1" }, "bin": { "browserslist": "cli.js" @@ -6193,28 +6333,28 @@ "license": "MIT" }, "node_modules/c12": { - "version": "1.11.2", - "resolved": "https://registry.npmjs.org/c12/-/c12-1.11.2.tgz", - "integrity": "sha512-oBs8a4uvSDO9dm8b7OCFW7+dgtVrwmwnrVXYzLm43ta7ep2jCn/0MhoUFygIWtxhyy6+/MG7/agvpY0U1Iemew==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/c12/-/c12-2.0.1.tgz", + "integrity": "sha512-Z4JgsKXHG37C6PYUtIxCfLJZvo6FyhHJoClwwb9ftUkLpPSkuYqn6Tr+vnaN8hymm0kIbcg6Ey3kv/Q71k5w/A==", "dev": true, "license": "MIT", "optional": true, "dependencies": { - "chokidar": "^3.6.0", + "chokidar": "^4.0.1", "confbox": "^0.1.7", "defu": "^6.1.4", "dotenv": "^16.4.5", "giget": "^1.2.3", - "jiti": "^1.21.6", + "jiti": "^2.3.0", "mlly": "^1.7.1", - "ohash": "^1.1.3", + "ohash": "^1.1.4", "pathe": "^1.1.2", "perfect-debounce": "^1.0.0", "pkg-types": "^1.2.0", "rc9": "^2.1.2" }, "peerDependencies": { - "magicast": "^0.3.4" + "magicast": "^0.3.5" }, "peerDependenciesMeta": { "magicast": { @@ -6222,6 +6362,14 @@ } } }, + "node_modules/c12/node_modules/pathe": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz", + "integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==", + "dev": true, + "license": "MIT", + "optional": true + }, "node_modules/c8": { "version": "7.14.0", "resolved": "https://registry.npmjs.org/c8/-/c8-7.14.0.tgz", @@ -6261,23 +6409,14 @@ "wrap-ansi": "^7.0.0" } }, - "node_modules/c8/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, - "license": "MIT" - }, - "node_modules/c8/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==", + "node_modules/c8/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, "license": "MIT", "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" + "ansi-regex": "^5.0.1" }, "engines": { "node": ">=8" @@ -6344,13 +6483,6 @@ "node": "^16.14.0 || >=18.0.0" } }, - "node_modules/cacache/node_modules/lru-cache": { - "version": "10.4.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", - "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", - "dev": true, - "license": "ISC" - }, "node_modules/cacheable-lookup": { "version": "5.0.4", "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz", @@ -6397,17 +6529,47 @@ } }, "node_modules/call-bind": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", - "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz", + "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==", "dev": true, "license": "MIT", "dependencies": { + "call-bind-apply-helpers": "^1.0.0", "es-define-property": "^1.0.0", - "es-errors": "^1.3.0", - "function-bind": "^1.1.2", "get-intrinsic": "^1.2.4", - "set-function-length": "^1.2.1" + "set-function-length": "^1.2.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/call-bind-apply-helpers": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.1.tgz", + "integrity": "sha512-BhYE+WDaywFg2TBWYNXAE+8B1ATnThNBqXHP5nQu0jWJdVvY2hvkpyB3qOmtmDePiS5/BDQ8wASEWGMWRG148g==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/call-bound": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.3.tgz", + "integrity": "sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.1", + "get-intrinsic": "^1.2.6" }, "engines": { "node": ">= 0.4" @@ -6436,9 +6598,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001658", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001658.tgz", - "integrity": "sha512-N2YVqWbJELVdrnsW5p+apoQyYt51aBMSsBZki1XZEfeBCexcM/sf4xiAHcXQBkuOwJBXtWF7aW1sYX6tKebPHw==", + "version": "1.0.30001699", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001699.tgz", + "integrity": "sha512-b+uH5BakXZ9Do9iK+CkDmctUSEqZl+SP056vc5usa0PL+ev5OHw003rZXcnjNDv3L8P5j6rwT6C0BPKSikW08w==", "dev": true, "funding": [ { @@ -6491,6 +6653,16 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, + "node_modules/char-regex": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz", + "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + } + }, "node_modules/chardet": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", @@ -6632,9 +6804,9 @@ } }, "node_modules/cheerio-select/node_modules/domutils": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz", - "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.2.2.tgz", + "integrity": "sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==", "dev": true, "license": "BSD-2-Clause", "dependencies": { @@ -6673,41 +6845,19 @@ } }, "node_modules/chokidar": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", - "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz", + "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==", "dev": true, "license": "MIT", "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" + "readdirp": "^4.0.1" }, "engines": { - "node": ">= 8.10.0" + "node": ">= 14.16.0" }, "funding": { "url": "https://paulmillr.com/funding/" - }, - "optionalDependencies": { - "fsevents": "~2.3.2" - } - }, - "node_modules/chokidar/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==", - "dev": true, - "license": "ISC", - "dependencies": { - "is-glob": "^4.0.1" - }, - "engines": { - "node": ">= 6" } }, "node_modules/chownr": { @@ -6731,9 +6881,9 @@ } }, "node_modules/chrono-node": { - "version": "2.7.6", - "resolved": "https://registry.npmjs.org/chrono-node/-/chrono-node-2.7.6.tgz", - "integrity": "sha512-yugKSRLHc6B6kXxm/DwNc94zhaddAjCSO9IOGH3w7NIWNM+gUoLl/2/XLndiw4I+XhU4H2LOhC5Ab2JjS6JWsA==", + "version": "2.7.8", + "resolved": "https://registry.npmjs.org/chrono-node/-/chrono-node-2.7.8.tgz", + "integrity": "sha512-pzxemrTKu6jFVyAfkNxUckp9nlrmRFtr5lGrEJcVKyeKV9WSeGT78Oysazlzd/H0BdMv7EzACtJrw0pi2KODBQ==", "dev": true, "license": "MIT", "dependencies": { @@ -6744,9 +6894,9 @@ } }, "node_modules/ci-info": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", - "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.1.0.tgz", + "integrity": "sha512-HutrvTNsF48wnxkzERIXOe5/mlcfFcbfCmwcg6CJnizbSue78AbDt+1cgl26zwn61WFxhcPykPfZrbqjGmBb4A==", "dev": true, "funding": [ { @@ -6760,14 +6910,17 @@ } }, "node_modules/cipher-base": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", - "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.6.tgz", + "integrity": "sha512-3Ek9H3X6pj5TgenXYtNWdaBon1tgYCaebd+XPg0keyjEbEfkD4KkmAxkQ/i1vYvxdcT5nscLBfq9VJRmCBcFSw==", "dev": true, "license": "MIT", "dependencies": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" + "inherits": "^2.0.4", + "safe-buffer": "^5.2.1" + }, + "engines": { + "node": ">= 0.10" } }, "node_modules/citty": { @@ -6781,6 +6934,13 @@ "consola": "^3.2.3" } }, + "node_modules/cjs-module-lexer": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.3.tgz", + "integrity": "sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q==", + "dev": true, + "license": "MIT" + }, "node_modules/clean-regexp": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/clean-regexp/-/clean-regexp-1.0.0.tgz", @@ -6827,17 +6987,104 @@ "node": ">=8" } }, - "node_modules/cli-spinners": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-3.2.0.tgz", - "integrity": "sha512-pXftdQloMZzjCr3pCTIRniDcys6dDzgpgVhAHHk6TKBDbRuP1MkuetTF5KSv4YUutbOPa7+7ZrAJ2kVtbMqyXA==", + "node_modules/cli-highlight": { + "version": "2.1.11", + "resolved": "https://registry.npmjs.org/cli-highlight/-/cli-highlight-2.1.11.tgz", + "integrity": "sha512-9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg==", + "dev": true, + "license": "ISC", + "dependencies": { + "chalk": "^4.0.0", + "highlight.js": "^10.7.1", + "mz": "^2.4.0", + "parse5": "^5.1.1", + "parse5-htmlparser2-tree-adapter": "^6.0.0", + "yargs": "^16.0.0" + }, + "bin": { + "highlight": "bin/highlight" + }, + "engines": { + "node": ">=8.0.0", + "npm": ">=5.0.0" + } + }, + "node_modules/cli-highlight/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, + "license": "ISC", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + } + }, + "node_modules/cli-highlight/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, "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, "engines": { - "node": ">=18.20" + "node": ">=8" + } + }, + "node_modules/cli-highlight/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, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/cli-highlight/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, + "license": "MIT", + "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/cli-table3": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.5.tgz", + "integrity": "sha512-+W/5efTR7y5HRD7gACw9yQjqMVvEMLBHmboM/kPWam+H+Hmyrgjh6YncVKK122YZkXrLudzTuAukUw9FnMf7IQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "string-width": "^4.2.0" + }, + "engines": { + "node": "10.* || >= 12.*" + }, + "optionalDependencies": { + "@colors/colors": "1.5.0" } }, "node_modules/cli-truncate": { @@ -6857,28 +7104,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/cli-truncate/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, - "license": "MIT" - }, - "node_modules/cli-truncate/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, - "license": "MIT", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/cli-width": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-4.1.0.tgz", @@ -6904,23 +7129,14 @@ "node": ">=12" } }, - "node_modules/cliui/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, - "license": "MIT" - }, - "node_modules/cliui/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==", + "node_modules/cliui/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, "license": "MIT", "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" + "ansi-regex": "^5.0.1" }, "engines": { "node": ">=8" @@ -7022,13 +7238,13 @@ } }, "node_modules/commander": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", - "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==", + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", + "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==", "dev": true, "license": "MIT", "engines": { - "node": ">= 6" + "node": ">=14" } }, "node_modules/comment-parser": { @@ -7058,14 +7274,6 @@ "dev": true, "license": "MIT" }, - "node_modules/compatx": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/compatx/-/compatx-0.1.8.tgz", - "integrity": "sha512-jcbsEAR81Bt5s1qOFymBufmCbXCXbk0Ql+K5ouj6gCyx2yHlu6AgmGIi9HxfKixpUDO5bCFJUHQ5uM6ecbTebw==", - "dev": true, - "license": "MIT", - "optional": true - }, "node_modules/compress-commons": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-6.0.2.tgz", @@ -7097,9 +7305,9 @@ } }, "node_modules/compress-commons/node_modules/readable-stream": { - "version": "4.5.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.5.2.tgz", - "integrity": "sha512-yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g==", + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.7.0.tgz", + "integrity": "sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==", "dev": true, "license": "MIT", "dependencies": { @@ -7130,16 +7338,16 @@ } }, "node_modules/confbox": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.1.7.tgz", - "integrity": "sha512-uJcB/FKZtBMCJpK8MQji6bJHgu1tixKPxRLeGkNzBoOZzpnZUJm0jm2/sBDWcuBx1dYgxV4JU+g5hmNxCyAmdA==", + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.1.8.tgz", + "integrity": "sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==", "dev": true, "license": "MIT" }, "node_modules/consola": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/consola/-/consola-3.2.3.tgz", - "integrity": "sha512-I5qxpzLv+sJhTVEoLYNcTW+bThDCPsit0vLNKShZx6rLtpilNpmmeTPaeqJb9ZE9dV3DGaeby6Vuhrw38WjeyQ==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/consola/-/consola-3.4.0.tgz", + "integrity": "sha512-EiPU8G6dQG0GFHNR8ljnZFki/8a+cQwEQ+7wpxdChl02Q8HXlwEZWD5lqAF8vC2sEC3Tehr8hy7vErz88LHyUA==", "dev": true, "license": "MIT", "optional": true, @@ -7168,9 +7376,9 @@ "license": "MIT" }, "node_modules/core-js": { - "version": "3.38.1", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.38.1.tgz", - "integrity": "sha512-OP35aUorbU3Zvlx7pjsFdu1rGNnD4pgw/CWoYzRY3t2EzoVT7shKHY1dlAy3f41cGIO7ZDPQimhGFTlEYkG/Hw==", + "version": "3.40.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.40.0.tgz", + "integrity": "sha512-7vsMc/Lty6AGnn7uFpYT56QesI5D2Y/UkgKounk87OP9Z2H9Z8kj6jzcSGAxFmUtDOS0ntK6lbQz+Nsa0Jj6mQ==", "dev": true, "hasInstallScript": true, "license": "MIT", @@ -7180,13 +7388,13 @@ } }, "node_modules/core-js-compat": { - "version": "3.38.1", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.38.1.tgz", - "integrity": "sha512-JRH6gfXxGmrzF3tZ57lFx97YARxCXPaMzPo6jELZhv88pBH5VXpQ+y0znKGlFnzuaihqhLbefxSJxWJMPtfDzw==", + "version": "3.40.0", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.40.0.tgz", + "integrity": "sha512-0XEDpr5y5mijvw8Lbc6E5AkjrHfp7eEoPlu36SWeAbcL8fn1G1ANe8DBlo2XoNN89oVpxWwOjYIPVzR4ZvsKCQ==", "dev": true, "license": "MIT", "dependencies": { - "browserslist": "^4.23.3" + "browserslist": "^4.24.3" }, "funding": { "type": "opencollective", @@ -7265,9 +7473,9 @@ } }, "node_modules/crc32-stream/node_modules/readable-stream": { - "version": "4.5.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.5.2.tgz", - "integrity": "sha512-yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g==", + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.7.0.tgz", + "integrity": "sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==", "dev": true, "license": "MIT", "dependencies": { @@ -7293,9 +7501,9 @@ } }, "node_modules/create-ecdh/node_modules/bn.js": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.1.tgz", + "integrity": "sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg==", "dev": true, "license": "MIT" }, @@ -7329,9 +7537,9 @@ } }, "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==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "license": "MIT", "dependencies": { "path-key": "^3.1.0", @@ -7343,26 +7551,30 @@ } }, "node_modules/crypto-browserify": { - "version": "3.12.0", - "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz", - "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==", + "version": "3.12.1", + "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.1.tgz", + "integrity": "sha512-r4ESw/IlusD17lgQi1O20Fa3qNnsckR126TdUuBgAu7GBYSIPvdNyONd3Zrxh0xCwA4+6w/TDArBPsMvhur+KQ==", "dev": true, "license": "MIT", "dependencies": { - "browserify-cipher": "^1.0.0", - "browserify-sign": "^4.0.0", - "create-ecdh": "^4.0.0", - "create-hash": "^1.1.0", - "create-hmac": "^1.1.0", - "diffie-hellman": "^5.0.0", - "inherits": "^2.0.1", - "pbkdf2": "^3.0.3", - "public-encrypt": "^4.0.0", - "randombytes": "^2.0.0", - "randomfill": "^1.0.3" + "browserify-cipher": "^1.0.1", + "browserify-sign": "^4.2.3", + "create-ecdh": "^4.0.4", + "create-hash": "^1.2.0", + "create-hmac": "^1.1.7", + "diffie-hellman": "^5.0.3", + "hash-base": "~3.0.4", + "inherits": "^2.0.4", + "pbkdf2": "^3.1.2", + "public-encrypt": "^4.0.3", + "randombytes": "^2.1.0", + "randomfill": "^1.0.4" }, "engines": { - "node": "*" + "node": ">= 0.10" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/css-select": { @@ -7379,10 +7591,11 @@ } }, "node_modules/css-shorthand-properties": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/css-shorthand-properties/-/css-shorthand-properties-1.1.1.tgz", - "integrity": "sha512-Md+Juc7M3uOdbAFwOYlTrccIZ7oCFuzrhKYQjdeUEW/sE1hv17Jp/Bws+ReOPpGVBTYCBoYo+G17V5Qo8QQ75A==", - "dev": true + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/css-shorthand-properties/-/css-shorthand-properties-1.1.2.tgz", + "integrity": "sha512-C2AugXIpRGQTxaCW0N7n5jD/p5irUmCrwl03TrnMFBHDbdq44CFWR2zO7rK9xPN4Eo3pUxC4vQzQgbIpzrD1PQ==", + "dev": true, + "license": "MIT" }, "node_modules/css-value": { "version": "0.0.1", @@ -7401,18 +7614,40 @@ } }, "node_modules/cssstyle": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.1.0.tgz", - "integrity": "sha512-h66W1URKpBS5YMI/V8PyXvTMFT8SupJ1IzoIV8IeBC/ji8WVmrO8dGlTi+2dh6whmdk6BiKJLD/ZBkhWbcg6nA==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.2.1.tgz", + "integrity": "sha512-9+vem03dMXG7gDmZ62uqmRiMRNtinIZ9ZyuF6BdxzfOD+FdN5hretzynkn0ReS2DO2GSw76RWHs0UmJPI2zUjw==", "dev": true, "license": "MIT", "dependencies": { - "rrweb-cssom": "^0.7.1" + "@asamuzakjp/css-color": "^2.8.2", + "rrweb-cssom": "^0.8.0" }, "engines": { "node": ">=18" } }, + "node_modules/cssstyle/node_modules/rrweb-cssom": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.8.0.tgz", + "integrity": "sha512-guoltQEx+9aMf2gDZ0s62EcV8lsXR+0w8915TC3ITdn2YueuNjdAYh/levpU9nFaoChh9RUS5ZdQMrKfVEN9tw==", + "dev": true, + "license": "MIT" + }, + "node_modules/d": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/d/-/d-1.0.2.tgz", + "integrity": "sha512-MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw==", + "dev": true, + "license": "ISC", + "dependencies": { + "es5-ext": "^0.10.64", + "type": "^2.7.2" + }, + "engines": { + "node": ">=0.12" + } + }, "node_modules/data-uri-to-buffer": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-5.0.1.tgz", @@ -7468,9 +7703,9 @@ "license": "MIT" }, "node_modules/debug": { - "version": "4.3.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", - "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", + "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", "license": "MIT", "dependencies": { "ms": "^2.1.3" @@ -7484,6 +7719,62 @@ } } }, + "node_modules/debug-fabulous": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/debug-fabulous/-/debug-fabulous-2.0.2.tgz", + "integrity": "sha512-XfAbX8/owqC+pjIg0/+3V1gp8TugJT7StX/TE1TYedjrRf7h7SgUAL/+gKoAQGPCLbSU5L5LPvDg4/cGn1E/WA==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "^4", + "memoizee": "0.4" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/debug-logfmt": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/debug-logfmt/-/debug-logfmt-1.2.3.tgz", + "integrity": "sha512-Btc8hrSu2017BcECwhnkKtA7+9qBRv06x8igvJRRyDcZo1cmEbwp/OmLDSJFuJ/wgrdF7TbtGeVV6FCxagJoNQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jclem/logfmt2": "~2.4.3", + "@kikobeats/time-span": "~1.0.2", + "debug-fabulous": "2.0.2", + "pretty-ms": "~7.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/debug-logfmt/node_modules/parse-ms": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-2.1.0.tgz", + "integrity": "sha512-kHt7kzLoS9VBZfUsiKjv43mr91ea+U05EyKkEtqp7vNbHxmaVuEqN7XxeEVnGrMtYOAxGrDElSi96K7EgO1zCA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/debug-logfmt/node_modules/pretty-ms": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-7.0.1.tgz", + "integrity": "sha512-973driJZvxiGOQ5ONsFhOF/DtzPMOMtgC11kCpUrPGMTgqp2q/1gwzCquocrN33is0VZ5GFHXZYMM9l6h67v2Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "parse-ms": "^2.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/debuglog": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz", @@ -7509,9 +7800,9 @@ } }, "node_modules/decimal.js": { - "version": "10.4.3", - "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz", - "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==", + "version": "10.5.0", + "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.5.0.tgz", + "integrity": "sha512-8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw==", "dev": true, "license": "MIT" }, @@ -7564,9 +7855,9 @@ "license": "MIT" }, "node_modules/deepmerge-ts": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/deepmerge-ts/-/deepmerge-ts-7.1.0.tgz", - "integrity": "sha512-q6bNsfNBtgr8ZOQqmZbl94MmYWm+QcDNIkqCxVWiw1vKvf+y/N2dZQKdnDXn4c5Ygt/y63tDof6OCN+2YwWVEg==", + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/deepmerge-ts/-/deepmerge-ts-7.1.4.tgz", + "integrity": "sha512-fxqo6nHGQ9zOVgI4KXqtWXJR/yCLtC7aXIVq+6jc8tHPFUxlFmuUcm2kC4vztQ+LJxQ3gER/XAWearGYQ8niGA==", "dev": true, "license": "BSD-3-Clause", "engines": { @@ -7666,16 +7957,6 @@ "node": ">=0.4.0" } }, - "node_modules/dequal": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz", - "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, "node_modules/des.js": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.1.0.tgz", @@ -7707,9 +7988,9 @@ } }, "node_modules/diff": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz", - "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-7.0.0.tgz", + "integrity": "sha512-PJWHUb1RFevKCwaFA9RlG5tCd+FO5iRh9A8HEtkmBH2Li03iJriB6m6JIN4rGz3K3JLawI7/veA1xzRKP6ISBw==", "dev": true, "license": "BSD-3-Clause", "engines": { @@ -7717,13 +7998,13 @@ } }, "node_modules/diff-sequences": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz", - "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==", + "version": "30.0.0-alpha.7", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-30.0.0-alpha.7.tgz", + "integrity": "sha512-T8qx2cdaE0DW3nMpgf0jxOvSECOIkvPpjEeTs3qVT/+gzhZGLKjex4lc+dNiaLA92hDwmt6AG9WO/j2RUlNQJw==", "dev": true, "license": "MIT", "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^16.10.0 || ^18.12.0 || >=20.0.0" } }, "node_modules/diffie-hellman": { @@ -7739,9 +8020,9 @@ } }, "node_modules/diffie-hellman/node_modules/bn.js": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.1.tgz", + "integrity": "sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg==", "dev": true, "license": "MIT" }, @@ -7797,9 +8078,9 @@ } }, "node_modules/dotenv": { - "version": "16.4.5", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz", - "integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==", + "version": "16.4.7", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.7.tgz", + "integrity": "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==", "dev": true, "license": "BSD-2-Clause", "engines": { @@ -7809,6 +8090,21 @@ "url": "https://dotenvx.com" } }, + "node_modules/dunder-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", + "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.1", + "es-errors": "^1.3.0", + "gopd": "^1.2.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/eastasianwidth": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", @@ -7847,65 +8143,28 @@ } }, "node_modules/edgedriver": { - "version": "5.6.1", - "resolved": "https://registry.npmjs.org/edgedriver/-/edgedriver-5.6.1.tgz", - "integrity": "sha512-3Ve9cd5ziLByUdigw6zovVeWJjVs8QHVmqOB0sJ0WNeVPcwf4p18GnxMmVvlFmYRloUwf5suNuorea4QzwBIOA==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/edgedriver/-/edgedriver-6.1.1.tgz", + "integrity": "sha512-/dM/PoBf22Xg3yypMWkmRQrBKEnSyNaZ7wHGCT9+qqT14izwtFT+QvdR89rjNkMfXwW+bSFoqOfbcvM+2Cyc7w==", "dev": true, "hasInstallScript": true, "license": "MIT", "dependencies": { - "@wdio/logger": "^8.38.0", - "@zip.js/zip.js": "^2.7.48", + "@wdio/logger": "^9.1.3", + "@zip.js/zip.js": "^2.7.53", "decamelize": "^6.0.0", "edge-paths": "^3.0.5", - "fast-xml-parser": "^4.4.1", + "fast-xml-parser": "^4.5.0", + "http-proxy-agent": "^7.0.2", + "https-proxy-agent": "^7.0.5", "node-fetch": "^3.3.2", - "which": "^4.0.0" + "which": "^5.0.0" }, "bin": { "edgedriver": "bin/edgedriver.js" - } - }, - "node_modules/edgedriver/node_modules/@wdio/logger": { - "version": "8.38.0", - "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-8.38.0.tgz", - "integrity": "sha512-kcHL86RmNbcQP+Gq/vQUGlArfU6IIcbbnNp32rRIraitomZow+iEoc519rdQmSVusDozMS5DZthkgDdxK+vz6Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "chalk": "^5.1.2", - "loglevel": "^1.6.0", - "loglevel-plugin-prefix": "^0.8.4", - "strip-ansi": "^7.1.0" }, "engines": { - "node": "^16.13 || >=18" - } - }, - "node_modules/edgedriver/node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/edgedriver/node_modules/chalk": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", - "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^12.17.0 || ^14.13 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" + "node": ">=18.0.0" } }, "node_modules/edgedriver/node_modules/isexe": { @@ -7918,26 +8177,10 @@ "node": ">=16" } }, - "node_modules/edgedriver/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, "node_modules/edgedriver/node_modules/which": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz", - "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz", + "integrity": "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==", "dev": true, "license": "ISC", "dependencies": { @@ -7947,7 +8190,7 @@ "node-which": "bin/which.js" }, "engines": { - "node": "^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/ejs": { @@ -7967,16 +8210,16 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.5.18", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.18.tgz", - "integrity": "sha512-1OfuVACu+zKlmjsNdcJuVQuVE61sZOLbNM4JAQ1Rvh6EOj0/EUKhMJjRH73InPlXSh8HIJk1cVZ8pyOV/FMdUQ==", + "version": "1.5.96", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.96.tgz", + "integrity": "sha512-8AJUW6dh75Fm/ny8+kZKJzI1pgoE8bKLZlzDU2W1ENd+DXKJrx7I7l9hb8UWR4ojlnb5OlixMt00QWiYJoVw1w==", "dev": true, "license": "ISC" }, "node_modules/elliptic": { - "version": "6.5.7", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.7.tgz", - "integrity": "sha512-ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q==", + "version": "6.6.1", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.6.1.tgz", + "integrity": "sha512-RaddvvMatK2LJHqFJ+YA4WysVN5Ita9E35botqIYspQ4TkRAlCicdzKOjlyv/1Za5RyTNn7di//eEV0uTAfe3g==", "dev": true, "license": "MIT", "dependencies": { @@ -7990,16 +8233,23 @@ } }, "node_modules/elliptic/node_modules/bn.js": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.1.tgz", + "integrity": "sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg==", "dev": true, "license": "MIT" }, "node_modules/emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "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, + "license": "MIT" + }, + "node_modules/emojilib": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/emojilib/-/emojilib-2.4.0.tgz", + "integrity": "sha512-5U0rVMU5Y2n2+ykNLQqMoqklN9ICBT/KsvC1Gz6vqHbz2AXXGkG+Pm5rMWk/8Vjrr/mY9985Hi8DYzn1F09Nyw==", "dev": true, "license": "MIT" }, @@ -8076,9 +8326,9 @@ } }, "node_modules/enhanced-resolve": { - "version": "5.17.1", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz", - "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==", + "version": "5.18.1", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz", + "integrity": "sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==", "dev": true, "license": "MIT", "dependencies": { @@ -8103,6 +8353,19 @@ "node": ">=8.6" } }, + "node_modules/enquirer/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, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/entities": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz", @@ -8121,9 +8384,9 @@ } }, "node_modules/envinfo": { - "version": "7.13.0", - "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.13.0.tgz", - "integrity": "sha512-cvcaMr7KqXVh4nyzGTVqTum+gAiL265x5jUWQIDLq//zOGbW+gSW/C+OWLleY/rs9Qole6AZLMXPbtIFQbqu+Q==", + "version": "7.14.0", + "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.14.0.tgz", + "integrity": "sha512-CO40UI41xDQzhLB1hWyqUKgFhs250pNcGbyGKe1l/e4FSaI/+YE4IMG76GDt0In67WLPACIITC+sOi08x4wIvg==", "dev": true, "license": "MIT", "bin": { @@ -8133,6 +8396,19 @@ "node": ">=4" } }, + "node_modules/environment": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/environment/-/environment-1.1.0.tgz", + "integrity": "sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/err-code": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", @@ -8151,14 +8427,11 @@ } }, "node_modules/es-define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", - "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", + "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", "dev": true, "license": "MIT", - "dependencies": { - "get-intrinsic": "^1.2.4" - }, "engines": { "node": ">= 0.4" } @@ -8174,12 +8447,81 @@ } }, "node_modules/es-module-lexer": { - "version": "1.5.4", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.4.tgz", - "integrity": "sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.6.0.tgz", + "integrity": "sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ==", "dev": true, "license": "MIT" }, + "node_modules/es-object-atoms": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", + "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es5-ext": { + "version": "0.10.64", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.64.tgz", + "integrity": "sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==", + "dev": true, + "hasInstallScript": true, + "license": "ISC", + "dependencies": { + "es6-iterator": "^2.0.3", + "es6-symbol": "^3.1.3", + "esniff": "^2.0.1", + "next-tick": "^1.1.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/es6-iterator": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", + "integrity": "sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==", + "dev": true, + "license": "MIT", + "dependencies": { + "d": "1", + "es5-ext": "^0.10.35", + "es6-symbol": "^3.1.1" + } + }, + "node_modules/es6-symbol": { + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.4.tgz", + "integrity": "sha512-U9bFFjX8tFiATgtkJ1zg25+KviIXpgRvRHS8sau3GfhVzThRQrOeksPeT0BWW2MNZs1OEWJ1DPXOQMn0KKRkvg==", + "dev": true, + "license": "ISC", + "dependencies": { + "d": "^1.0.2", + "ext": "^1.7.0" + }, + "engines": { + "node": ">=0.12" + } + }, + "node_modules/es6-weak-map": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz", + "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==", + "dev": true, + "license": "ISC", + "dependencies": { + "d": "1", + "es5-ext": "^0.10.46", + "es6-iterator": "^2.0.3", + "es6-symbol": "^3.1.1" + } + }, "node_modules/esbuild": { "version": "0.18.20", "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz", @@ -8608,9 +8950,9 @@ "link": true }, "node_modules/eslint-compat-utils": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/eslint-compat-utils/-/eslint-compat-utils-0.5.1.tgz", - "integrity": "sha512-3z3vFexKIEnjHE3zCMRo6fn/e44U7T1khUjg+Hp0ZQMCigh28rALD0nPFBcGZuiLC5rLZa2ubQHDRln09JfU2Q==", + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/eslint-compat-utils/-/eslint-compat-utils-0.6.4.tgz", + "integrity": "sha512-/u+GQt8NMfXO8w17QendT4gvO5acfxQsAKirAt0LVxDnr2N8YLCVbregaNc/Yhp7NM128DwCaRvr8PLDfeNkQw==", "dev": true, "license": "MIT", "dependencies": { @@ -8649,10 +8991,26 @@ "eslint": ">=8" } }, + "node_modules/eslint-plugin-es-x/node_modules/eslint-compat-utils": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/eslint-compat-utils/-/eslint-compat-utils-0.5.1.tgz", + "integrity": "sha512-3z3vFexKIEnjHE3zCMRo6fn/e44U7T1khUjg+Hp0ZQMCigh28rALD0nPFBcGZuiLC5rLZa2ubQHDRln09JfU2Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "semver": "^7.5.4" + }, + "engines": { + "node": ">=12" + }, + "peerDependencies": { + "eslint": ">=6.0.0" + } + }, "node_modules/eslint-plugin-eslint-plugin": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-eslint-plugin/-/eslint-plugin-eslint-plugin-6.2.0.tgz", - "integrity": "sha512-+SSHlThUMBb6MhXl/CqNhKvnUY3111s/1vEcu+paOwTJzniTanRZCfl0kQXNfK57XsWJ5aRsiwMlPg/FgnYsag==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-eslint-plugin/-/eslint-plugin-eslint-plugin-6.4.0.tgz", + "integrity": "sha512-X94/hr7DnckX68wE6Qqeo3DsZndZSclfoewjwD249yG5z2EAOl3UGUohLIgOpmbUjcFv6AlfW3wxBnOiWkS1Iw==", "dev": true, "license": "MIT", "dependencies": { @@ -8666,6 +9024,26 @@ "eslint": ">=8.23.0" } }, + "node_modules/eslint-plugin-expect-type": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-expect-type/-/eslint-plugin-expect-type-0.6.2.tgz", + "integrity": "sha512-XWgtpplzr6GlpPUFG9ZApnSTv7QJXAPNN6hNmrlleVVCkAK23f/3E2BiCoA3Xtb0rIKfVKh7TLe+D1tcGt8/1w==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@typescript-eslint/utils": "^6.10.0 || ^7.0.1 || ^8", + "fs-extra": "^11.1.1", + "get-tsconfig": "^4.8.1" + }, + "engines": { + "node": ">=18" + }, + "peerDependencies": { + "@typescript-eslint/parser": ">=6", + "eslint": ">=7", + "typescript": ">=4" + } + }, "node_modules/eslint-plugin-jsdoc": { "version": "48.11.0", "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-48.11.0.tgz", @@ -8704,20 +9082,20 @@ } }, "node_modules/eslint-plugin-n": { - "version": "17.10.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-17.10.2.tgz", - "integrity": "sha512-e+s4eAf5NtJaxPhTNu3qMO0Iz40WANS93w9LQgYcvuljgvDmWi/a3rh+OrNyMHeng6aOWGJO0rCg5lH4zi8yTw==", + "version": "17.15.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-17.15.1.tgz", + "integrity": "sha512-KFw7x02hZZkBdbZEFQduRGH4VkIH4MW97ClsbAM4Y4E6KguBJWGfWG1P4HEIpZk2bkoWf0bojpnjNAhYQP8beA==", "dev": true, "license": "MIT", "dependencies": { - "@eslint-community/eslint-utils": "^4.4.0", - "enhanced-resolve": "^5.17.0", - "eslint-plugin-es-x": "^7.5.0", - "get-tsconfig": "^4.7.0", - "globals": "^15.8.0", - "ignore": "^5.2.4", + "@eslint-community/eslint-utils": "^4.4.1", + "enhanced-resolve": "^5.17.1", + "eslint-plugin-es-x": "^7.8.0", + "get-tsconfig": "^4.8.1", + "globals": "^15.11.0", + "ignore": "^5.3.2", "minimatch": "^9.0.5", - "semver": "^7.5.3" + "semver": "^7.6.3" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -8813,22 +9191,6 @@ "url": "https://opencollective.com/eslint" } }, - "node_modules/eslint-plugin-unicorn/node_modules/ci-info": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.0.0.tgz", - "integrity": "sha512-TdHqgGf9odd8SXNuxtUBVx8Nv+qZOejE6qyqiy5NtbYYQOeFa6zmHkxlPzmaLxWWHsU6nJmB7AETdVPi+2NBUg==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/sibiraj-s" - } - ], - "license": "MIT", - "engines": { - "node": ">=8" - } - }, "node_modules/eslint-plugin-unicorn/node_modules/eslint-visitor-keys": { "version": "3.4.3", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", @@ -8890,19 +9252,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/eslint-plugin-unicorn/node_modules/jsesc": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz", - "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==", - "dev": true, - "license": "MIT", - "bin": { - "jsesc": "bin/jsesc" - }, - "engines": { - "node": ">=6" - } - }, "node_modules/eslint-plugin-unicorn/node_modules/locate-path": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", @@ -9048,14 +9397,14 @@ } }, "node_modules/eslint-plugin-yml": { - "version": "1.14.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-yml/-/eslint-plugin-yml-1.14.0.tgz", - "integrity": "sha512-ESUpgYPOcAYQO9czugcX5OqRvn/ydDVwGCPXY4YjPqc09rHaUVUA6IE6HLQys4rXk/S+qx3EwTd1wHCwam/OWQ==", + "version": "1.16.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-yml/-/eslint-plugin-yml-1.16.0.tgz", + "integrity": "sha512-t4MNCetPjTn18/fUDlQ/wKkcYjnuLYKChBrZ0qUaNqRigVqChHWzTP8SrfFi5s4keX3vdlkWRSu8zHJMdKwxWQ==", "dev": true, "license": "MIT", "dependencies": { "debug": "^4.3.2", - "eslint-compat-utils": "^0.5.0", + "eslint-compat-utils": "^0.6.0", "lodash": "^4.17.21", "natural-compare": "^1.4.0", "yaml-eslint-parser": "^1.2.1" @@ -9071,9 +9420,9 @@ } }, "node_modules/eslint-release": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/eslint-release/-/eslint-release-3.2.2.tgz", - "integrity": "sha512-D606ic8e3WMx9Q8btEJu7dA9WjaHyPVac1IQHMp+YcW+pQRP/SSct0X1A+53a9l1XQqka9J+jTrY/Y/T46kEEg==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/eslint-release/-/eslint-release-3.3.0.tgz", + "integrity": "sha512-Zb6jg2NzpEvG9/IRnlE5MXMSbuLaq13jUuXHoste+QJkEPrkQgBGMYiEVsMvph1HDWwoeCh5FpS2IatRe38soQ==", "dev": true, "license": "MIT", "dependencies": { @@ -9112,9 +9461,9 @@ } }, "node_modules/eslint-scope": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.0.2.tgz", - "integrity": "sha512-6E4xmrTw5wtxnLA5wYL3WDfhZ/1bUBGOXV0zQvVRDOtrR8D0p6W7fs3JweNYhwRYeGvd/1CKX2se0/2s7Q/nJA==", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.2.0.tgz", + "integrity": "sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==", "license": "BSD-2-Clause", "dependencies": { "esrecurse": "^4.3.0", @@ -9128,9 +9477,9 @@ } }, "node_modules/eslint-visitor-keys": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz", - "integrity": "sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", + "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", "license": "Apache-2.0", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -9160,15 +9509,31 @@ "eslump": "src/cli-runner.js" } }, + "node_modules/esniff": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/esniff/-/esniff-2.0.1.tgz", + "integrity": "sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==", + "dev": true, + "license": "ISC", + "dependencies": { + "d": "^1.0.1", + "es5-ext": "^0.10.62", + "event-emitter": "^0.3.5", + "type": "^2.7.2" + }, + "engines": { + "node": ">=0.10" + } + }, "node_modules/espree": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-10.1.0.tgz", - "integrity": "sha512-M1M6CpiE6ffoigIOWYO9UDP8TMUw9kqb21tf+08IgDYjCsOvCuDt4jQcZmoYxx+w7zlKw9/N0KXfto+I8/FrXA==", + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz", + "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==", "license": "BSD-2-Clause", "dependencies": { - "acorn": "^8.12.0", + "acorn": "^8.14.0", "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^4.0.0" + "eslint-visitor-keys": "^4.2.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -9240,6 +9605,17 @@ "node": ">=0.10.0" } }, + "node_modules/event-emitter": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", + "integrity": "sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==", + "dev": true, + "license": "MIT", + "dependencies": { + "d": "1", + "es5-ext": "~0.10.14" + } + }, "node_modules/event-target-shim": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", @@ -9272,9 +9648,9 @@ } }, "node_modules/execa": { - "version": "9.3.1", - "resolved": "https://registry.npmjs.org/execa/-/execa-9.3.1.tgz", - "integrity": "sha512-gdhefCCNy/8tpH/2+ajP9IQc14vXchNdd0weyzSJEFURhRMGncQ+zKFxwjAufIewPEJm9BPOaJnvg2UtlH2gPQ==", + "version": "9.5.2", + "resolved": "https://registry.npmjs.org/execa/-/execa-9.5.2.tgz", + "integrity": "sha512-EHlpxMCpHWSAh1dgS6bVeoLAXGnJNdR93aabr4QCGbzOM73o5XmRfM/e5FUqsw3aagP8S8XEWUWFAxnRBnAF0Q==", "dev": true, "license": "MIT", "dependencies": { @@ -9285,7 +9661,7 @@ "human-signals": "^8.0.0", "is-plain-obj": "^4.1.0", "is-stream": "^4.0.1", - "npm-run-path": "^5.2.0", + "npm-run-path": "^6.0.0", "pretty-ms": "^9.0.0", "signal-exit": "^4.1.0", "strip-final-newline": "^4.0.0", @@ -9299,26 +9675,27 @@ } }, "node_modules/expect": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz", - "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==", + "version": "30.0.0-alpha.7", + "resolved": "https://registry.npmjs.org/expect/-/expect-30.0.0-alpha.7.tgz", + "integrity": "sha512-tWb6p3Dn1S8GTunR9jfsku6l6dkZrqZQ5smI+UWx0KIk5ugS0QuPo66w40NdWRWcH+JklC9Dk8Elh2S2M4FfSw==", "dev": true, "license": "MIT", "dependencies": { - "@jest/expect-utils": "^29.7.0", - "jest-get-type": "^29.6.3", - "jest-matcher-utils": "^29.7.0", - "jest-message-util": "^29.7.0", - "jest-util": "^29.7.0" + "@jest/expect-utils": "30.0.0-alpha.7", + "jest-get-type": "30.0.0-alpha.7", + "jest-matcher-utils": "30.0.0-alpha.7", + "jest-message-util": "30.0.0-alpha.7", + "jest-mock": "30.0.0-alpha.7", + "jest-util": "30.0.0-alpha.7" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^16.10.0 || ^18.12.0 || >=20.0.0" } }, "node_modules/expect-webdriverio": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/expect-webdriverio/-/expect-webdriverio-5.0.2.tgz", - "integrity": "sha512-vkUwoUvURH25pRClX1I5oCIObju8cT9kN5jQH4RN5QxKXK7hdowYd8dbDXD5JKOE/OutdYx67YtCl8vpZq/uSg==", + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/expect-webdriverio/-/expect-webdriverio-5.0.5.tgz", + "integrity": "sha512-h04OGd7ZksVj8bgv3bYdjFpmJuKeCnyRrBmpMxYpMDmYSspxg9vsSr0kD5p9oOM16bX0ZXEVXr42RbI2hoLpTw==", "dev": true, "license": "MIT", "dependencies": { @@ -9347,28 +9724,249 @@ } } }, - "node_modules/expect-webdriverio/node_modules/@vitest/snapshot": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-2.0.5.tgz", - "integrity": "sha512-SgCPUeDFLaM0mIUHfaArq8fD2WbaXG/zVXjRupthYfYGzc8ztbFbu6dUNOblBG7XLMR1kEhS/DNnfCZ2IhdDew==", + "node_modules/expect-webdriverio/node_modules/@jest/expect-utils": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz", + "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/pretty-format": "2.0.5", - "magic-string": "^0.30.10", - "pathe": "^1.1.2" + "jest-get-type": "^29.6.3" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/expect-webdriverio/node_modules/@jest/schemas": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@sinclair/typebox": "^0.27.8" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/expect-webdriverio/node_modules/@jest/types": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/schemas": "^29.6.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^17.0.8", + "chalk": "^4.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/expect-webdriverio/node_modules/@sinclair/typebox": { + "version": "0.27.8", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", + "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", + "dev": true, + "license": "MIT" + }, + "node_modules/expect-webdriverio/node_modules/ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" }, "funding": { - "url": "https://opencollective.com/vitest" + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/expect-webdriverio/node_modules/ci-info": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/expect-webdriverio/node_modules/diff-sequences": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz", + "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/expect-webdriverio/node_modules/expect": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz", + "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/expect-utils": "^29.7.0", + "jest-get-type": "^29.6.3", + "jest-matcher-utils": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/expect-webdriverio/node_modules/jest-diff": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz", + "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==", + "dev": true, + "license": "MIT", + "dependencies": { + "chalk": "^4.0.0", + "diff-sequences": "^29.6.3", + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/expect-webdriverio/node_modules/jest-get-type": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz", + "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/expect-webdriverio/node_modules/jest-matcher-utils": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz", + "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "chalk": "^4.0.0", + "jest-diff": "^29.7.0", + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/expect-webdriverio/node_modules/jest-message-util": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz", + "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.12.13", + "@jest/types": "^29.6.3", + "@types/stack-utils": "^2.0.0", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "micromatch": "^4.0.4", + "pretty-format": "^29.7.0", + "slash": "^3.0.0", + "stack-utils": "^2.0.3" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/expect-webdriverio/node_modules/jest-util": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", + "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/expect-webdriverio/node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/expect-webdriverio/node_modules/pretty-format": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", + "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/schemas": "^29.6.3", + "ansi-styles": "^5.0.0", + "react-is": "^18.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/expect-webdriverio/node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" } }, "node_modules/exponential-backoff": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz", - "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.2.tgz", + "integrity": "sha512-8QxYTVXUkuy7fIIoitQkPwGonB8F3Zj8eEO8Sqg9Zv/bkI7RJAzowee4gr81Hak/dUTpA2Z7VfQgoijjPNlUZA==", "dev": true, "license": "Apache-2.0" }, + "node_modules/ext": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz", + "integrity": "sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==", + "dev": true, + "license": "ISC", + "dependencies": { + "type": "^2.7.2" + } + }, "node_modules/extend-shallow": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", @@ -9448,9 +10046,9 @@ "license": "MIT" }, "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==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz", + "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==", "dev": true, "license": "MIT", "dependencies": { @@ -9458,7 +10056,7 @@ "@nodelib/fs.walk": "^1.2.3", "glob-parent": "^5.1.2", "merge2": "^1.3.0", - "micromatch": "^4.0.4" + "micromatch": "^4.0.8" }, "engines": { "node": ">=8.6.0" @@ -9489,10 +10087,27 @@ "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", "license": "MIT" }, + "node_modules/fast-uri": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz", + "integrity": "sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/fastify" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/fastify" + } + ], + "license": "BSD-3-Clause" + }, "node_modules/fast-xml-parser": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.5.0.tgz", - "integrity": "sha512-/PlTQCI96+fZMAOLMZK4CWG1ItCbfZ/0jx7UIJFChPNrx7tcEgerUgWbeieCM9MfHInUDyK8DWYZ+YrywDJuTg==", + "version": "4.5.1", + "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.5.1.tgz", + "integrity": "sha512-y655CeyUQ+jj7KBbYMc4FG01V8ZQqjN+gDYGJ50RtfsUB8iG9AmwmwoAgeKLJdmueKKMrH1RJ7yXHTSoczdv5w==", "dev": true, "funding": [ { @@ -9523,9 +10138,10 @@ } }, "node_modules/fastq": { - "version": "1.17.1", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", - "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", + "version": "1.19.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.0.tgz", + "integrity": "sha512-7SFSRCNjBQIZH/xZR3iy5iQYR8aGBE0h3VG6/cwlbrpdciNYBMotQav8c1XI3HjHH+NikUpP53nPdlZSdWmFzA==", + "dev": true, "license": "ISC", "dependencies": { "reusify": "^1.0.4" @@ -9565,6 +10181,13 @@ "node": "^12.20 || >= 14.13" } }, + "node_modules/fflate": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/fflate/-/fflate-0.8.2.tgz", + "integrity": "sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A==", + "dev": true, + "license": "MIT" + }, "node_modules/figures": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/figures/-/figures-6.1.0.tgz", @@ -9731,9 +10354,9 @@ } }, "node_modules/flatted": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", - "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.2.tgz", + "integrity": "sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA==", "license": "ISC" }, "node_modules/follow-redirects": { @@ -9758,13 +10381,19 @@ } }, "node_modules/for-each": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", - "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", + "version": "0.3.4", + "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.4.tgz", + "integrity": "sha512-kKaIINnFpzW6ffJNDjjyjrk21BkDx38c0xa/klsT8VzLCaMEefv4ZTacrcVR4DmgTeBra++jMDAfS/tS799YDw==", "dev": true, "license": "MIT", "dependencies": { - "is-callable": "^1.1.3" + "is-callable": "^1.2.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/foreground-child": { @@ -9789,9 +10418,9 @@ "license": "ISC" }, "node_modules/form-data": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", - "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz", + "integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==", "dev": true, "license": "MIT", "dependencies": { @@ -9817,9 +10446,9 @@ } }, "node_modules/fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", + "version": "11.3.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.0.tgz", + "integrity": "sha512-Z4XaCL6dUDHfP/jT25jJKMmtxvuwbkrD1vNSMFlo9lNLY2c5FHYSQgHPRZUjAB26TpDEoW9HCOgplrdbaPV/ew==", "dev": true, "license": "MIT", "dependencies": { @@ -9828,7 +10457,7 @@ "universalify": "^2.0.0" }, "engines": { - "node": ">=12" + "node": ">=14.14" } }, "node_modules/fs-minipass": { @@ -9854,6 +10483,21 @@ "fs-extra": "^10.0.0" } }, + "node_modules/fs-teardown/node_modules/fs-extra": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=12" + } + }, "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -9886,41 +10530,28 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/gaze": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz", - "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==", - "dev": true, - "license": "MIT", - "dependencies": { - "globule": "^1.0.0" - }, - "engines": { - "node": ">= 4.0.0" - } - }, "node_modules/geckodriver": { - "version": "4.4.4", - "resolved": "https://registry.npmjs.org/geckodriver/-/geckodriver-4.4.4.tgz", - "integrity": "sha512-0zaw19tcmWeluqx7+Y559JGBtidu1D0Lb8ElYKiNEQu8r3sCfrLUf5V10xypl8u29ZLbgRV7WflxCJVTCkCMFA==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/geckodriver/-/geckodriver-5.0.0.tgz", + "integrity": "sha512-vn7TtQ3b9VMJtVXsyWtQQl1fyBVFhQy7UvJF96kPuuJ0or5THH496AD3eUyaDD11+EqCxH9t6V+EP9soZQk4YQ==", "dev": true, "hasInstallScript": true, - "license": "MPL-2.0", + "license": "MIT", "dependencies": { - "@wdio/logger": "^9.0.0", - "@zip.js/zip.js": "^2.7.48", + "@wdio/logger": "^9.1.3", + "@zip.js/zip.js": "^2.7.53", "decamelize": "^6.0.0", "http-proxy-agent": "^7.0.2", "https-proxy-agent": "^7.0.5", "node-fetch": "^3.3.2", "tar-fs": "^3.0.6", - "which": "^4.0.0" + "which": "^5.0.0" }, "bin": { "geckodriver": "bin/geckodriver.js" }, "engines": { - "node": "^16.13 || >=18 || >=20" + "node": ">=18.0.0" } }, "node_modules/geckodriver/node_modules/isexe": { @@ -9934,9 +10565,9 @@ } }, "node_modules/geckodriver/node_modules/which": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz", - "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz", + "integrity": "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==", "dev": true, "license": "ISC", "dependencies": { @@ -9946,7 +10577,7 @@ "node-which": "bin/which.js" }, "engines": { - "node": "^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/gensync": { @@ -9980,17 +10611,22 @@ } }, "node_modules/get-intrinsic": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", - "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.7.tgz", + "integrity": "sha512-VW6Pxhsrk0KAOqs3WEd0klDiF/+V7gQOpAvY1jVU/LHmaD/kQO4523aiJuikX/QAKYiW6x8Jh+RJej1almdtCA==", "dev": true, "license": "MIT", "dependencies": { + "call-bind-apply-helpers": "^1.0.1", + "es-define-property": "^1.0.1", "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", "function-bind": "^1.1.2", - "has-proto": "^1.0.1", - "has-symbols": "^1.0.3", - "hasown": "^2.0.0" + "get-proto": "^1.0.0", + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "hasown": "^2.0.2", + "math-intrinsics": "^1.1.0" }, "engines": { "node": ">= 0.4" @@ -10029,6 +10665,20 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/get-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", + "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", + "dev": true, + "license": "MIT", + "dependencies": { + "dunder-proto": "^1.0.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/get-stream": { "version": "9.0.1", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-9.0.1.tgz", @@ -10047,9 +10697,9 @@ } }, "node_modules/get-tsconfig": { - "version": "4.8.0", - "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.8.0.tgz", - "integrity": "sha512-Pgba6TExTZ0FJAn1qkJAjIeKoDJ3CsI2ChuLohJnZl/tTU8MVrq3b+2t5UOPfRa4RMsorClBjJALkJUMjG1PAw==", + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.10.0.tgz", + "integrity": "sha512-kGzZ3LWWQcGIAmg6iWvXn0ei6WDtV26wzHRMwDSzmAbcXrTEXxHy6IehI6/4eT6VRKyMP1eF1VqwrVUmE/LR7A==", "dev": true, "license": "MIT", "dependencies": { @@ -10060,16 +10710,15 @@ } }, "node_modules/get-uri": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.3.tgz", - "integrity": "sha512-BzUrJBS9EcUb4cFol8r4W3v1cPsSyajLSthNkz5BxbpDcHN5tIrM10E2eNvfnvBn3DaT3DUgx0OpsBKkaOpanw==", + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.4.tgz", + "integrity": "sha512-E1b1lFFLvLgak2whF2xDBcOy6NLVGZBqqjJjsIhvopKfWWEi64pLVTWWehV8KlLerZkfNTA95sTe2OdJKm1OzQ==", "dev": true, "license": "MIT", "dependencies": { "basic-ftp": "^5.0.2", "data-uri-to-buffer": "^6.0.2", - "debug": "^4.3.4", - "fs-extra": "^11.2.0" + "debug": "^4.3.4" }, "engines": { "node": ">= 14" @@ -10085,37 +10734,22 @@ "node": ">= 14" } }, - "node_modules/get-uri/node_modules/fs-extra": { - "version": "11.2.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz", - "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=14.14" - } - }, "node_modules/giget": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/giget/-/giget-1.2.3.tgz", - "integrity": "sha512-8EHPljDvs7qKykr6uw8b+lqLiUc/vUg+KVTI0uND4s63TdsZM2Xus3mflvF0DDG9SiM4RlCkFGL+7aAjRmV7KA==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/giget/-/giget-1.2.4.tgz", + "integrity": "sha512-Wv+daGyispVoA31TrWAVR+aAdP7roubTPEM/8JzRnqXhLbdJH0T9eQyXVFF8fjk3WKTsctII6QcyxILYgNp2DA==", "dev": true, "license": "MIT", "optional": true, "dependencies": { "citty": "^0.1.6", - "consola": "^3.2.3", + "consola": "^3.4.0", "defu": "^6.1.4", - "node-fetch-native": "^1.6.3", - "nypm": "^0.3.8", - "ohash": "^1.1.3", - "pathe": "^1.1.2", - "tar": "^6.2.0" + "node-fetch-native": "^1.6.6", + "nypm": "^0.5.1", + "ohash": "^1.1.4", + "pathe": "^2.0.2", + "tar": "^6.2.1" }, "bin": { "giget": "dist/cli.mjs" @@ -10235,9 +10869,9 @@ } }, "node_modules/globals": { - "version": "15.9.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-15.9.0.tgz", - "integrity": "sha512-SmSKyLLKFbSr6rptvP8izbyxJL4ILwqO9Jg23UA0sDlGlu58V59D1//I3vlc0KJphVdUR7vMjHIplYnzBxorQA==", + "version": "15.14.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-15.14.0.tgz", + "integrity": "sha512-OkToC372DtlQeje9/zHIo5CT8lRP/FUgEOKBEhU4e0abL7J7CD24fD9ohiLN5hagG/kWCYj4K5oaxxtj2Z0Dig==", "dev": true, "license": "MIT", "engines": { @@ -10248,19 +10882,19 @@ } }, "node_modules/globby": { - "version": "14.0.2", - "resolved": "https://registry.npmjs.org/globby/-/globby-14.0.2.tgz", - "integrity": "sha512-s3Fq41ZVh7vbbe2PN3nrW7yC7U7MFVc5c98/iTl9c2GawNMKx/J648KQRW6WKkuU8GIbbh2IXfIRQjOZnXcTnw==", + "version": "14.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-14.1.0.tgz", + "integrity": "sha512-0Ia46fDOaT7k4og1PDW4YbodWWr3scS2vAr2lTbsplOt2WkKp0vQbkI9wKis/T5LV/dqPjO3bpS/z6GTJB82LA==", "dev": true, "license": "MIT", "optional": true, "dependencies": { "@sindresorhus/merge-streams": "^2.1.0", - "fast-glob": "^3.3.2", - "ignore": "^5.2.4", - "path-type": "^5.0.0", + "fast-glob": "^3.3.3", + "ignore": "^7.0.3", + "path-type": "^6.0.0", "slash": "^5.1.0", - "unicorn-magic": "^0.1.0" + "unicorn-magic": "^0.3.0" }, "engines": { "node": ">=18" @@ -10283,64 +10917,25 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/globule": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.4.tgz", - "integrity": "sha512-OPTIfhMBh7JbBYDpa5b+Q5ptmMWKwcNcFSR/0c6t8V4f3ZAVBEsKNY37QdVqmLRYSMhOUGYrY0QhSoEpzGr/Eg==", + "node_modules/globby/node_modules/ignore": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.3.tgz", + "integrity": "sha512-bAH5jbK/F3T3Jls4I0SO1hmPR0dKU0a7+SY6n1yzRtG54FLO8d6w/nxLFX2Nb7dBu6cCWXPaAME6cYqFUMmuCA==", "dev": true, "license": "MIT", - "dependencies": { - "glob": "~7.1.1", - "lodash": "^4.17.21", - "minimatch": "~3.0.2" - }, + "optional": true, "engines": { - "node": ">= 0.10" - } - }, - "node_modules/globule/node_modules/glob": { - "version": "7.1.7", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", - "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", - "deprecated": "Glob versions prior to v9 are no longer supported", - "dev": true, - "license": "ISC", - "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/globule/node_modules/minimatch": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz", - "integrity": "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" + "node": ">= 4" } }, "node_modules/gopd": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", - "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", + "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", "dev": true, "license": "MIT", - "dependencies": { - "get-intrinsic": "^1.1.3" + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -10433,16 +11028,6 @@ "dev": true, "license": "BSD-3-Clause" }, - "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, - "license": "MIT", - "engines": { - "node": ">=4.x" - } - }, "node_modules/has-ansi": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", @@ -10488,23 +11073,10 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/has-proto": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", - "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/has-symbols": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", + "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", "dev": true, "license": "MIT", "engines": { @@ -10544,27 +11116,19 @@ } }, "node_modules/hash-base": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz", - "integrity": "sha512-EeeoJKjTyt868liAlVmcv2ZsUfGHlE3Q+BICOXcZiwN3osr5Q/zFGYmTJpoIzuaSTAwndFy+GqhEwlU4L3j4Ow==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.5.tgz", + "integrity": "sha512-vXm0l45VbcHEVlTCzs8M+s0VeYsB2lnlAaThoLKGXr3bE/VWDOelNUnycUPEhKEaXARL2TEFjBOyUiM6+55KBg==", "dev": true, "license": "MIT", "dependencies": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" + "inherits": "^2.0.4", + "safe-buffer": "^5.2.1" }, "engines": { - "node": ">=4" + "node": ">= 0.10" } }, - "node_modules/hash-sum": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz", - "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==", - "dev": true, - "license": "MIT", - "optional": true - }, "node_modules/hash.js": { "version": "1.1.7", "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz", @@ -10599,6 +11163,16 @@ "he": "bin/he" } }, + "node_modules/highlight.js": { + "version": "10.7.3", + "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz", + "integrity": "sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": "*" + } + }, "node_modules/hmac-drbg": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", @@ -10611,14 +11185,6 @@ "minimalistic-crypto-utils": "^1.0.1" } }, - "node_modules/hookable": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/hookable/-/hookable-5.5.3.tgz", - "integrity": "sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ==", - "dev": true, - "license": "MIT", - "optional": true - }, "node_modules/hosted-git-info": { "version": "2.8.9", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", @@ -10647,9 +11213,9 @@ "license": "MIT" }, "node_modules/htmlfy": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/htmlfy/-/htmlfy-0.2.1.tgz", - "integrity": "sha512-HoomFHQ3av1uhq+7FxJTq4Ns0clAD+tGbQNrSd0WFY3UAjjUk6G3LaWEqdgmIXYkY4pexZiyZ3ykZJhQlM0J5A==", + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/htmlfy/-/htmlfy-0.6.0.tgz", + "integrity": "sha512-EV1RNjYuG6xIxwA8zDjAUQVeS/SsPE0nhFsdjM8ALopS22ZRAcePocdrhKaaV26PYiTkUrKplJuSZkGRN6Y0Rg==", "dev": true, "license": "MIT" }, @@ -10711,13 +11277,13 @@ "license": "MIT" }, "node_modules/https-proxy-agent": { - "version": "7.0.5", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz", - "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz", + "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==", "dev": true, "license": "MIT", "dependencies": { - "agent-base": "^7.0.2", + "agent-base": "^7.1.2", "debug": "4" }, "engines": { @@ -10795,9 +11361,9 @@ "license": "MIT" }, "node_modules/import-fresh": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", - "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz", + "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==", "license": "MIT", "dependencies": { "parent-module": "^1.0.0", @@ -10880,15 +11446,15 @@ "license": "ISC" }, "node_modules/inquirer": { - "version": "10.2.2", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-10.2.2.tgz", - "integrity": "sha512-tyao/4Vo36XnUItZ7DnUXX4f1jVao2mSrleV/5IPtW/XAEA26hRVsbc68nuTEKWcr5vMP/1mVoT2O7u8H4v1Vg==", + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-11.1.0.tgz", + "integrity": "sha512-CmLAZT65GG/v30c+D2Fk8+ceP6pxD6RL+hIUOWAltCmeyEqWYwqu9v76q03OvjyZ3AB0C1Ala2stn1z/rMqGEw==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^9.1.0", - "@inquirer/prompts": "^5.5.0", - "@inquirer/type": "^1.5.3", + "@inquirer/core": "^9.2.1", + "@inquirer/prompts": "^6.0.1", + "@inquirer/type": "^2.0.0", "@types/mute-stream": "^0.0.4", "ansi-escapes": "^4.3.2", "mute-stream": "^1.0.0", @@ -10955,14 +11521,14 @@ } }, "node_modules/is-arguments": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", - "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.2.0.tgz", + "integrity": "sha512-7bVbi0huj/wrIAOzb8U1aszg9kdi3KN/CyU19CTI7tAoZYEZoL9yCDXpbXN+uPsuWnP02cyug1gleqq+TU+YCA==", "dev": true, "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" + "call-bound": "^1.0.2", + "has-tostringtag": "^1.0.2" }, "engines": { "node": ">= 0.4" @@ -11041,9 +11607,9 @@ "license": "MIT" }, "node_modules/is-core-module": { - "version": "2.15.1", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz", - "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==", + "version": "2.16.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", + "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", "dev": true, "license": "MIT", "dependencies": { @@ -11086,13 +11652,16 @@ } }, "node_modules/is-generator-function": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz", - "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.0.tgz", + "integrity": "sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==", "dev": true, "license": "MIT", "dependencies": { - "has-tostringtag": "^1.0.0" + "call-bound": "^1.0.3", + "get-proto": "^1.0.0", + "has-tostringtag": "^1.0.2", + "safe-regex-test": "^1.1.0" }, "engines": { "node": ">= 0.4" @@ -11167,15 +11736,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-path-inside": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", - "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", - "license": "MIT", - "engines": { - "node": ">=8" - } - }, "node_modules/is-plain-obj": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz", @@ -11209,6 +11769,32 @@ "dev": true, "license": "MIT" }, + "node_modules/is-promise": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz", + "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/is-regex": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz", + "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "gopd": "^1.2.0", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-regexp": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz", @@ -11246,13 +11832,13 @@ } }, "node_modules/is-typed-array": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz", - "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==", + "version": "1.1.15", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz", + "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==", "dev": true, "license": "MIT", "dependencies": { - "which-typed-array": "^1.1.14" + "which-typed-array": "^1.1.16" }, "engines": { "node": ">= 0.4" @@ -11262,9 +11848,9 @@ } }, "node_modules/is-unicode-supported": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-2.0.0.tgz", - "integrity": "sha512-FRdAyx5lusK1iHG0TWpVtk9+1i+GjrzRffhDg4ovQ7mcidMQ6mj+MhKPmvh7Xwyv5gIS06ns49CA7Sqg7lC22Q==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-2.1.0.tgz", + "integrity": "sha512-mE00Gnza5EEB3Ds0HfMyllZzbBrmLOX3vfWoj9A9PEnTfratQ/BcaJOuMhnkhjXvb2+FkY3VuHqtAGpTPmglFQ==", "dev": true, "license": "MIT", "engines": { @@ -11451,66 +12037,66 @@ } }, "node_modules/jest-diff": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz", - "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==", + "version": "30.0.0-alpha.7", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-30.0.0-alpha.7.tgz", + "integrity": "sha512-a2O+O+qBIhpUtKSwApNDN6zWqNuP1vfSN1maXmm0ix1+GkBezSdNWSGlcQqJNVM1cwSD/oQQo7EzhixpMi6TWQ==", "dev": true, "license": "MIT", "dependencies": { "chalk": "^4.0.0", - "diff-sequences": "^29.6.3", - "jest-get-type": "^29.6.3", - "pretty-format": "^29.7.0" + "diff-sequences": "30.0.0-alpha.7", + "jest-get-type": "30.0.0-alpha.7", + "pretty-format": "30.0.0-alpha.7" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^16.10.0 || ^18.12.0 || >=20.0.0" } }, "node_modules/jest-get-type": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz", - "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==", + "version": "30.0.0-alpha.7", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-30.0.0-alpha.7.tgz", + "integrity": "sha512-0Zt3y51PSw3FZxgRYyoC6TlKnL2Z2wMWS1NCQbs/CrmNEDRNpx9ZMF+UIByQgFcDT+fB3U/gwKeLtmSpNhJRNw==", "dev": true, "license": "MIT", "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^16.10.0 || ^18.12.0 || >=20.0.0" } }, "node_modules/jest-matcher-utils": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz", - "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==", + "version": "30.0.0-alpha.7", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-30.0.0-alpha.7.tgz", + "integrity": "sha512-qD99h6nz8VXD+qimS4BSfFKtWXsDsFtKk10jGBdo5+yiuSViY/plr1MWKA1QpbJswXmqcTiPeoViNmhUKqjefw==", "dev": true, "license": "MIT", "dependencies": { "chalk": "^4.0.0", - "jest-diff": "^29.7.0", - "jest-get-type": "^29.6.3", - "pretty-format": "^29.7.0" + "jest-diff": "30.0.0-alpha.7", + "jest-get-type": "30.0.0-alpha.7", + "pretty-format": "30.0.0-alpha.7" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^16.10.0 || ^18.12.0 || >=20.0.0" } }, "node_modules/jest-message-util": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz", - "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==", + "version": "30.0.0-alpha.7", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-30.0.0-alpha.7.tgz", + "integrity": "sha512-Wzfx5D8SQwdeb4iXex86ddzTMK2QTc0FUIIFEQ7VuQ+RWEcCRgpOPu6QaQqLl9X8q/JZ1yU/6ZIhb7dpJ6TnWw==", "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^7.12.13", - "@jest/types": "^29.6.3", + "@jest/types": "30.0.0-alpha.7", "@types/stack-utils": "^2.0.0", "chalk": "^4.0.0", "graceful-fs": "^4.2.9", - "micromatch": "^4.0.4", - "pretty-format": "^29.7.0", + "micromatch": "^4.0.8", + "pretty-format": "30.0.0-alpha.7", "slash": "^3.0.0", "stack-utils": "^2.0.3" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^16.10.0 || ^18.12.0 || >=20.0.0" } }, "node_modules/jest-message-util/node_modules/slash": { @@ -11523,22 +12109,47 @@ "node": ">=8" } }, - "node_modules/jest-util": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", - "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", + "node_modules/jest-mock": { + "version": "30.0.0-alpha.7", + "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-30.0.0-alpha.7.tgz", + "integrity": "sha512-HQc7Uem+l5hzVZNMKpUV5F27AahfgmMuYbyRT5NV9OGD2WGkw9BouKAcV5tFGykcQc2+Rt5kk/hF1l5qi4Iwrw==", "dev": true, "license": "MIT", "dependencies": { - "@jest/types": "^29.6.3", + "@jest/types": "30.0.0-alpha.7", "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" + "jest-util": "30.0.0-alpha.7" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^16.10.0 || ^18.12.0 || >=20.0.0" + } + }, + "node_modules/jest-regex-util": { + "version": "30.0.0-alpha.7", + "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-30.0.0-alpha.7.tgz", + "integrity": "sha512-EUHpErwer3WQVcX1wKlvGHtIzVnGz5PzFVzp3/PzI+kTGduDvo0JuOnKHWuBYVwc5TADQmrdNiVU3+25swZoug==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^16.10.0 || ^18.12.0 || >=20.0.0" + } + }, + "node_modules/jest-util": { + "version": "30.0.0-alpha.7", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.0.0-alpha.7.tgz", + "integrity": "sha512-8slx+UQVqYE7WgkOyAab//u0YlTKXFIv31+nsHNFpT0boE5E/w4uJ/HSer0SWpUOotcrGLveeWYi2Pyy8gxVfg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/types": "30.0.0-alpha.7", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^4.0.0", + "graceful-fs": "^4.2.9", + "picomatch": "^4.0.0" + }, + "engines": { + "node": "^16.10.0 || ^18.12.0 || >=20.0.0" } }, "node_modules/jest-worker": { @@ -11573,13 +12184,13 @@ } }, "node_modules/jiti": { - "version": "1.21.6", - "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.6.tgz", - "integrity": "sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.4.2.tgz", + "integrity": "sha512-rg9zJN+G4n2nfJl5MW3BMygZX56zKPNVEYYqq7adpmMh4Jn2QNEwhvQlFy6jPVdcod7txZtKHWnyZiA3a0zP7A==", "dev": true, "license": "MIT", "bin": { - "jiti": "bin/jiti.js" + "jiti": "lib/jiti-cli.mjs" } }, "node_modules/js-base64": { @@ -11626,13 +12237,13 @@ } }, "node_modules/jsdom": { - "version": "24.1.3", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-24.1.3.tgz", - "integrity": "sha512-MyL55p3Ut3cXbeBEG7Hcv0mVM8pp8PBNWxRqchZnSfAiES1v1mRnMeFfaHWIPULpwsYfvO+ZmMZz5tGCnjzDUQ==", + "version": "25.0.1", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-25.0.1.tgz", + "integrity": "sha512-8i7LzZj7BF8uplX+ZyOlIz86V6TAsSs+np6m1kpW9u0JWi4z/1t+FzcK1aek+ybTnAC4KhBL4uXCNT0wcUIeCw==", "dev": true, "license": "MIT", "dependencies": { - "cssstyle": "^4.0.1", + "cssstyle": "^4.1.0", "data-urls": "^5.0.0", "decimal.js": "^10.4.3", "form-data": "^4.0.0", @@ -11645,7 +12256,7 @@ "rrweb-cssom": "^0.7.1", "saxes": "^6.0.0", "symbol-tree": "^3.2.4", - "tough-cookie": "^4.1.4", + "tough-cookie": "^5.0.0", "w3c-xmlserializer": "^5.0.0", "webidl-conversions": "^7.0.0", "whatwg-encoding": "^3.1.1", @@ -11666,17 +12277,43 @@ } } }, + "node_modules/jsdom/node_modules/entities": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=0.12" + }, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, + "node_modules/jsdom/node_modules/parse5": { + "version": "7.2.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.2.1.tgz", + "integrity": "sha512-BuBYQYlv1ckiPdQi/ohiivi9Sagc9JG+Ozs0r7b/0iK3sKmrb0b9FdWdBbOdx6hBCM/F9Ir82ofnBhtZOjCRPQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "entities": "^4.5.0" + }, + "funding": { + "url": "https://github.com/inikulin/parse5?sponsor=1" + } + }, "node_modules/jsesc": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz", + "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==", "dev": true, "license": "MIT", "bin": { "jsesc": "bin/jsesc" }, "engines": { - "node": ">=4" + "node": ">=6" } }, "node_modules/json-buffer": { @@ -11814,9 +12451,9 @@ } }, "node_modules/knip": { - "version": "5.30.0", - "resolved": "https://registry.npmjs.org/knip/-/knip-5.30.0.tgz", - "integrity": "sha512-QDpxtXosXK3OBnmWC2LJudjJROozAXyGzSi+aTuEx/Pf9/OKjmegQWix+X6uBYhPbMb8YEFcKWvI7qBnQCkIEA==", + "version": "5.43.6", + "resolved": "https://registry.npmjs.org/knip/-/knip-5.43.6.tgz", + "integrity": "sha512-bUCFlg44imdV5vayYxu0pIAB373S8Ufjda0qaI9oRZDH6ltJFwUoAO2j7nafxDmo5G0ZeP4IiLAHqlc3wYIONQ==", "dev": true, "funding": [ { @@ -11834,18 +12471,18 @@ ], "license": "ISC", "dependencies": { - "@nodelib/fs.walk": "1.2.8", + "@nodelib/fs.walk": "3.0.1", "@snyk/github-codeowners": "1.1.0", "easy-table": "1.2.0", - "enhanced-resolve": "^5.17.1", - "fast-glob": "^3.3.2", - "jiti": "^1.21.6", + "enhanced-resolve": "^5.18.0", + "fast-glob": "^3.3.3", + "jiti": "^2.4.2", "js-yaml": "^4.1.0", "minimist": "^1.2.8", - "picocolors": "^1.0.0", + "picocolors": "^1.1.0", "picomatch": "^4.0.1", "pretty-ms": "^9.0.0", - "smol-toml": "^1.1.4", + "smol-toml": "^1.3.1", "strip-json-comments": "5.0.1", "summary": "2.1.0", "zod": "^3.22.4", @@ -11856,24 +12493,49 @@ "knip-bun": "bin/knip-bun.js" }, "engines": { - "node": ">=18.6.0" + "node": ">=18.18.0" }, "peerDependencies": { "@types/node": ">=18", "typescript": ">=5.0.4" } }, - "node_modules/knip/node_modules/picomatch": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", - "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", + "node_modules/knip/node_modules/@nodelib/fs.scandir": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-4.0.1.tgz", + "integrity": "sha512-vAkI715yhnmiPupY+dq+xenu5Tdf2TBQ66jLvBIcCddtz+5Q8LbMKaf9CIJJreez8fQ8fgaY+RaywQx8RJIWpw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.stat": "4.0.0", + "run-parallel": "^1.2.0" + }, + "engines": { + "node": ">=18.18.0" + } + }, + "node_modules/knip/node_modules/@nodelib/fs.stat": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-4.0.0.tgz", + "integrity": "sha512-ctr6bByzksKRCV0bavi8WoQevU6plSp2IkllIsEqaiKe2mwNNnaluhnRhcsgGZHrrHk57B3lf95MkLMO3STYcg==", "dev": true, "license": "MIT", "engines": { - "node": ">=12" + "node": ">=18.18.0" + } + }, + "node_modules/knip/node_modules/@nodelib/fs.walk": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-3.0.1.tgz", + "integrity": "sha512-nIh/M6Kh3ZtOmlY00DaUYB4xeeV6F3/ts1l29iwl3/cfyY/OuCfUx+v08zgx8TKPTifXRcjjqVQ4KB2zOYSbyw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.scandir": "4.0.1", + "fastq": "^1.15.0" }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" + "engines": { + "node": ">=18.18.0" } }, "node_modules/knip/node_modules/strip-json-comments": { @@ -11890,9 +12552,9 @@ } }, "node_modules/knitwork": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/knitwork/-/knitwork-1.1.0.tgz", - "integrity": "sha512-oHnmiBUVHz1V+URE77PNot2lv3QiYU2zQf1JjOVkMt3YDKGbu8NAFr+c4mcNOhdsGrB/VpVbRwPwhiXrPhxQbw==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/knitwork/-/knitwork-1.2.0.tgz", + "integrity": "sha512-xYSH7AvuQ6nXkq42x0v5S8/Iry+cfulBz/DJQzhIyESdLD7425jXsPy4vn5cCXU+HhRN2kVw51Vd1K6/By4BQg==", "dev": true, "license": "MIT", "optional": true @@ -12173,23 +12835,14 @@ "dev": true, "license": "MIT" }, - "node_modules/listr2/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, - "license": "MIT" - }, - "node_modules/listr2/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==", + "node_modules/listr2/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, "license": "MIT", "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" + "ansi-regex": "^5.0.1" }, "engines": { "node": ">=8" @@ -12400,9 +13053,9 @@ } }, "node_modules/locate-app": { - "version": "2.4.39", - "resolved": "https://registry.npmjs.org/locate-app/-/locate-app-2.4.39.tgz", - "integrity": "sha512-hl7NwJrpGKLlmVgNrMRxFLRJTjve6IIav08bnv4MQSjahFRUPPVp+R02PSYpll6wY/YZqMrha68uScTmRJeMeA==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/locate-app/-/locate-app-2.5.0.tgz", + "integrity": "sha512-xIqbzPMBYArJRmPGUZD9CzV9wOqmVtQnaAn3wrj3s6WYW0bQvPI7x+sPYUGmDTYMHefVK//zc6HEYZ1qnxIK+Q==", "dev": true, "funding": [ { @@ -12414,21 +13067,21 @@ "url": "https://github.com/hejny/locate-app/blob/main/README.md#%EF%B8%8F-contributing" } ], - "license": "SEE LICENSE IN LICENSE", + "license": "Apache-2.0", "dependencies": { - "@promptbook/utils": "0.70.0-1", - "type-fest": "2.13.0", - "userhome": "1.0.0" + "@promptbook/utils": "0.69.5", + "type-fest": "4.26.0", + "userhome": "1.0.1" } }, "node_modules/locate-app/node_modules/type-fest": { - "version": "2.13.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.13.0.tgz", - "integrity": "sha512-lPfAm42MxE4/456+QyIaaVBAwgpJb6xZ8PRu09utnhPdWwcyj9vgy6Sq0Z5yNbJ21EdxB5dRU/Qg8bsyAMtlcw==", + "version": "4.26.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.26.0.tgz", + "integrity": "sha512-OduNjVJsFbifKb57UqZ2EMP1i4u64Xwow3NYXUtBbD4vIwJdQd4+xl8YDou1dlm4DVrtwT/7Ky8z8WyCULVfxw==", "dev": true, "license": "(MIT OR CC0-1.0)", "engines": { - "node": ">=12.20" + "node": ">=16" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -12523,6 +13176,7 @@ "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==", + "deprecated": "This package is deprecated. Use the optional chaining (?.) operator instead.", "dev": true, "license": "MIT" }, @@ -12530,6 +13184,7 @@ "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==", + "deprecated": "This package is deprecated. Use require('node:util').isDeepStrictEqual instead.", "dev": true, "license": "MIT" }, @@ -12550,6 +13205,7 @@ "version": "4.4.0", "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz", "integrity": "sha512-hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q==", + "deprecated": "This package is deprecated. Use destructuring assignment syntax instead.", "dev": true, "license": "MIT" }, @@ -12596,16 +13252,33 @@ "license": "MIT" }, "node_modules/log-symbols": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz", - "integrity": "sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==", + "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, "license": "MIT", "dependencies": { - "chalk": "^4.0.0" + "chalk": "^4.1.0", + "is-unicode-supported": "^0.1.0" }, "engines": { "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/log-symbols/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, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/log-update": { @@ -12687,19 +13360,26 @@ } }, "node_modules/lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", "dev": true, - "license": "ISC", + "license": "ISC" + }, + "node_modules/lru-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz", + "integrity": "sha512-BpdYkt9EvGl8OfWHDQPISVpcl5xZthb+XPsbELj5AQXxIC8IriDZIQYjBJPEm5rS420sjZ0TLEzRcq5KdBhYrQ==", + "dev": true, + "license": "MIT", "dependencies": { - "yallist": "^3.0.2" + "es5-ext": "~0.10.2" } }, "node_modules/magic-string": { - "version": "0.30.11", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz", - "integrity": "sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==", + "version": "0.30.17", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz", + "integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==", "dev": true, "license": "MIT", "dependencies": { @@ -12803,6 +13483,80 @@ "node": ">= 12" } }, + "node_modules/marked-terminal": { + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/marked-terminal/-/marked-terminal-7.3.0.tgz", + "integrity": "sha512-t4rBvPsHc57uE/2nJOLmMbZCQ4tgAccAED3ngXQqW6g+TxA488JzJ+FK3lQkzBQOI1mRV/r/Kq+1ZlJ4D0owQw==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-escapes": "^7.0.0", + "ansi-regex": "^6.1.0", + "chalk": "^5.4.1", + "cli-highlight": "^2.1.11", + "cli-table3": "^0.6.5", + "node-emoji": "^2.2.0", + "supports-hyperlinks": "^3.1.0" + }, + "engines": { + "node": ">=16.0.0" + }, + "peerDependencies": { + "marked": ">=1 <16" + } + }, + "node_modules/marked-terminal/node_modules/ansi-escapes": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.0.0.tgz", + "integrity": "sha512-GdYO7a61mR0fOlAsvC9/rIHf7L96sBc6dEWzeOu+KAea5bZyQRPIpojrVoI4AXGJS/ycu/fBTdLrUkA4ODrvjw==", + "dev": true, + "license": "MIT", + "dependencies": { + "environment": "^1.0.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/marked-terminal/node_modules/ansi-regex": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", + "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/marked-terminal/node_modules/chalk": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.4.1.tgz", + "integrity": "sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.17.0 || ^14.13 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/math-intrinsics": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", + "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, "node_modules/md5.js": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", @@ -12829,6 +13583,26 @@ "dev": true, "license": "MIT" }, + "node_modules/memoizee": { + "version": "0.4.17", + "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.17.tgz", + "integrity": "sha512-DGqD7Hjpi/1or4F/aYAspXKNm5Yili0QDAFAY4QYvpqpgiY6+1jOfqpmByzjxbWd/T9mChbCArXAbDAsTm5oXA==", + "dev": true, + "license": "ISC", + "dependencies": { + "d": "^1.0.2", + "es5-ext": "^0.10.64", + "es6-weak-map": "^2.0.3", + "event-emitter": "^0.3.5", + "is-promise": "^2.2.2", + "lru-queue": "^0.1.0", + "next-tick": "^1.1.0", + "timers-ext": "^0.1.7" + }, + "engines": { + "node": ">=0.12" + } + }, "node_modules/merge-descriptors": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", @@ -12857,55 +13631,56 @@ } }, "node_modules/metascraper": { - "version": "5.45.23", - "resolved": "https://registry.npmjs.org/metascraper/-/metascraper-5.45.23.tgz", - "integrity": "sha512-RLtEikq+2IggEqbxx/AajdoRGbipBNtmPAR0cJ9X2180g49767pfL9ogA9bDztur3w11r5bK7Fu1hYARPjZRKQ==", + "version": "5.46.7", + "resolved": "https://registry.npmjs.org/metascraper/-/metascraper-5.46.7.tgz", + "integrity": "sha512-fBWVQQH3blesqRRxO8lfOh5lxnp4gMBld7uz+hFElY5Kk9sJZIhzFW2TJW+rqqvnjbbmDiaYvGfBEzfZ5sC1Sw==", "dev": true, "license": "MIT", "dependencies": { - "@metascraper/helpers": "^5.45.22", + "@metascraper/helpers": "5.46.5", "cheerio": "~1.0.0", + "debug-logfmt": "~1.2.3", "lodash": "~4.17.21", - "whoops": "~4.1.7" + "whoops": "~5.0.1" }, "engines": { "node": ">= 16" } }, "node_modules/metascraper-description": { - "version": "5.45.22", - "resolved": "https://registry.npmjs.org/metascraper-description/-/metascraper-description-5.45.22.tgz", - "integrity": "sha512-z6z3MJrLcl366xagzSi+x56JOVSdTevAq5JMVh9NxLDKRfNSTmXYqCVC8mZmcJxjHCqJ2iinAMfgDvIdVgbVdA==", + "version": "5.46.5", + "resolved": "https://registry.npmjs.org/metascraper-description/-/metascraper-description-5.46.5.tgz", + "integrity": "sha512-RJKfwVPXRy8+w7mSjJM+6oe1ws3AtPA5CspcJty1fdKD1S4jF0nFzgwtrTgOCtggMK8iHG01/qAunPobFEbs+w==", "dev": true, "license": "MIT", "dependencies": { - "@metascraper/helpers": "^5.45.22" + "@metascraper/helpers": "5.46.5" }, "engines": { "node": ">= 16" } }, "node_modules/metascraper-image": { - "version": "5.45.22", - "resolved": "https://registry.npmjs.org/metascraper-image/-/metascraper-image-5.45.22.tgz", - "integrity": "sha512-oo0KHIReTrid2iVcJMi95hs+W0/D/u7rpMhyS9mJz30vpRC7j45Or4EGUC2yuUGq7wAqG1ehuWFwkuaJ9cF/mA==", + "version": "5.46.5", + "resolved": "https://registry.npmjs.org/metascraper-image/-/metascraper-image-5.46.5.tgz", + "integrity": "sha512-wgfilKtxeiwBjNYsMXr4AKVIu3jqScDZnWILl2MkILnn6BttLetgNRXsAvE5bT9LD8Upnf5ufJebLK+hoHAiwg==", "dev": true, "license": "MIT", "dependencies": { - "@metascraper/helpers": "^5.45.22" + "@metascraper/helpers": "5.46.5" }, "engines": { "node": ">= 16" } }, "node_modules/metascraper-logo": { - "version": "5.45.22", - "resolved": "https://registry.npmjs.org/metascraper-logo/-/metascraper-logo-5.45.22.tgz", - "integrity": "sha512-5jydNOnEWUhgcCE/OFMLL2qHcYINvY/GSQ4uIYbunLbgApozpDg5kR8S65itQU28O20PnjJJ4RZKfHu7g+CNSA==", + "version": "5.46.5", + "resolved": "https://registry.npmjs.org/metascraper-logo/-/metascraper-logo-5.46.5.tgz", + "integrity": "sha512-Wp7u7CEXjo7PA7kRKPG9EtD57xXWkv0E9klVgkQeSzBaVmXCTcEMYhHMfyBumpeZn02+Gmj/cuEuHjuMtbJ/uQ==", "dev": true, "license": "MIT", "dependencies": { - "@metascraper/helpers": "^5.45.22", + "@metascraper/helpers": "5.46.5", "lodash": "~4.17.21" }, "engines": { @@ -12913,14 +13688,14 @@ } }, "node_modules/metascraper-logo-favicon": { - "version": "5.45.22", - "resolved": "https://registry.npmjs.org/metascraper-logo-favicon/-/metascraper-logo-favicon-5.45.22.tgz", - "integrity": "sha512-Yya1Z661CQ7Olt6WR+IcJaiScmCSZxdD5oAA4ctkzSBJkiy4pc0CSRFiPJ1CZsElYZsnVXepm6OpDa5lr/rCHA==", + "version": "5.46.8", + "resolved": "https://registry.npmjs.org/metascraper-logo-favicon/-/metascraper-logo-favicon-5.46.8.tgz", + "integrity": "sha512-Inca7SFeo758hLvCQP7KHpZF3xP0zmTePddv+ScyiQBxWg6WLOEjnNbbEQtbQR69TBrxlZasTsz6KJ/XGDjiOw==", "dev": true, "license": "MIT", "dependencies": { - "@keyvhq/memoize": "~2.1.1", - "@metascraper/helpers": "^5.45.22", + "@keyvhq/memoize": "~2.1.5", + "@metascraper/helpers": "5.46.5", "lodash": "~4.17.21", "reachable-url": "~1.8.1" }, @@ -12929,13 +13704,13 @@ } }, "node_modules/metascraper-title": { - "version": "5.45.22", - "resolved": "https://registry.npmjs.org/metascraper-title/-/metascraper-title-5.45.22.tgz", - "integrity": "sha512-bjG29m8FLFtZU0QFdDJATeafuAxp2pkOOLxgeEZyRdx6QXl9HyCQenh9MnFNSK4PXH7v/9KVZt8S8e2pzY4uYA==", + "version": "5.46.5", + "resolved": "https://registry.npmjs.org/metascraper-title/-/metascraper-title-5.46.5.tgz", + "integrity": "sha512-AciK4SgOCdkRgXQ6isYcV/JzxomUd7hJ7BrikXqIfZME+UK6OHUtjQV3gtdB0SHBbIBE7Q+h1X5r8j5nWwBALg==", "dev": true, "license": "MIT", "dependencies": { - "@metascraper/helpers": "^5.45.22" + "@metascraper/helpers": "5.46.5" }, "engines": { "node": ">= 16" @@ -13012,9 +13787,9 @@ } }, "node_modules/metascraper/node_modules/domutils": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz", - "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.2.2.tgz", + "integrity": "sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==", "dev": true, "license": "BSD-2-Clause", "dependencies": { @@ -13059,6 +13834,33 @@ "entities": "^4.5.0" } }, + "node_modules/metascraper/node_modules/parse5": { + "version": "7.2.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.2.1.tgz", + "integrity": "sha512-BuBYQYlv1ckiPdQi/ohiivi9Sagc9JG+Ozs0r7b/0iK3sKmrb0b9FdWdBbOdx6hBCM/F9Ir82ofnBhtZOjCRPQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "entities": "^4.5.0" + }, + "funding": { + "url": "https://github.com/inikulin/parse5?sponsor=1" + } + }, + "node_modules/metascraper/node_modules/parse5-htmlparser2-tree-adapter": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-7.1.0.tgz", + "integrity": "sha512-ruw5xyKs6lrpo9x9rCZqZZnIUntICjQAd0Wsmp396Ul9lN/h+ifgVV1x1gZHi8euej6wTfpqX8j+BFQxF0NS/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "domhandler": "^5.0.3", + "parse5": "^7.0.0" + }, + "funding": { + "url": "https://github.com/inikulin/parse5?sponsor=1" + } + }, "node_modules/micromatch": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", @@ -13073,6 +13875,19 @@ "node": ">=8.6" } }, + "node_modules/micromatch/node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, "node_modules/microsoft-capitalize": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/microsoft-capitalize/-/microsoft-capitalize-1.0.5.tgz", @@ -13098,9 +13913,9 @@ } }, "node_modules/miller-rabin/node_modules/bn.js": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.1.tgz", + "integrity": "sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg==", "dev": true, "license": "MIT" }, @@ -13273,13 +14088,6 @@ "node": ">=8" } }, - "node_modules/minipass-flush/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true, - "license": "ISC" - }, "node_modules/minipass-pipeline": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", @@ -13306,13 +14114,6 @@ "node": ">=8" } }, - "node_modules/minipass-pipeline/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true, - "license": "ISC" - }, "node_modules/minipass-sized": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz", @@ -13339,13 +14140,6 @@ "node": ">=8" } }, - "node_modules/minipass-sized/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true, - "license": "ISC" - }, "node_modules/minizlib": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", @@ -13373,13 +14167,6 @@ "node": ">=8" } }, - "node_modules/minizlib/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true, - "license": "ISC" - }, "node_modules/mkdirp": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", @@ -13394,93 +14181,87 @@ } }, "node_modules/mlly": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.7.1.tgz", - "integrity": "sha512-rrVRZRELyQzrIUAVMHxP97kv+G786pHmOKzuFII8zDYahFBS7qnHh2AlYSl1GAHhaMPCz6/oHjVMcfFYgFYHgA==", + "version": "1.7.4", + "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.7.4.tgz", + "integrity": "sha512-qmdSIPC4bDJXgZTCR7XosJiNKySV7O215tsPtDN9iEO/7q/76b/ijtgRu/+epFXSJhijtTCCGp3DWS549P3xKw==", "dev": true, "license": "MIT", "dependencies": { - "acorn": "^8.11.3", - "pathe": "^1.1.2", - "pkg-types": "^1.1.1", - "ufo": "^1.5.3" + "acorn": "^8.14.0", + "pathe": "^2.0.1", + "pkg-types": "^1.3.0", + "ufo": "^1.5.4" } }, "node_modules/mocha": { - "version": "8.4.0", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.4.0.tgz", - "integrity": "sha512-hJaO0mwDXmZS4ghXsvPVriOhsxQ7ofcpQdm8dE+jISUOKopitvnXFQmpRR7jd2K6VBG6E26gU3IAbXXGIbu4sQ==", + "version": "10.8.2", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.8.2.tgz", + "integrity": "sha512-VZlYo/WE8t1tstuRmqgeyBgCbJc/lEdopaa+axcKzTBJ+UIdlAB9XnmvTCAH4pwR4ElNInaedhEBmZD8iCSVEg==", "dev": true, "license": "MIT", "dependencies": { - "@ungap/promise-all-settled": "1.1.2", - "ansi-colors": "4.1.1", - "browser-stdout": "1.3.1", - "chokidar": "3.5.1", - "debug": "4.3.1", - "diff": "5.0.0", - "escape-string-regexp": "4.0.0", - "find-up": "5.0.0", - "glob": "7.1.6", - "growl": "1.10.5", - "he": "1.2.0", - "js-yaml": "4.0.0", - "log-symbols": "4.0.0", - "minimatch": "3.0.4", - "ms": "2.1.3", - "nanoid": "3.1.20", - "serialize-javascript": "5.0.1", - "strip-json-comments": "3.1.1", - "supports-color": "8.1.1", - "which": "2.0.2", - "wide-align": "1.1.3", - "workerpool": "6.1.0", - "yargs": "16.2.0", - "yargs-parser": "20.2.4", - "yargs-unparser": "2.0.0" + "ansi-colors": "^4.1.3", + "browser-stdout": "^1.3.1", + "chokidar": "^3.5.3", + "debug": "^4.3.5", + "diff": "^5.2.0", + "escape-string-regexp": "^4.0.0", + "find-up": "^5.0.0", + "glob": "^8.1.0", + "he": "^1.2.0", + "js-yaml": "^4.1.0", + "log-symbols": "^4.1.0", + "minimatch": "^5.1.6", + "ms": "^2.1.3", + "serialize-javascript": "^6.0.2", + "strip-json-comments": "^3.1.1", + "supports-color": "^8.1.1", + "workerpool": "^6.5.1", + "yargs": "^16.2.0", + "yargs-parser": "^20.2.9", + "yargs-unparser": "^2.0.0" }, "bin": { "_mocha": "bin/_mocha", - "mocha": "bin/mocha" + "mocha": "bin/mocha.js" }, "engines": { - "node": ">= 10.12.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/mochajs" + "node": ">= 14.0.0" } }, - "node_modules/mocha/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, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/mocha/node_modules/chokidar": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz", - "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==", + "node_modules/mocha/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", "dev": true, "license": "MIT", "dependencies": { - "anymatch": "~3.1.1", + "balanced-match": "^1.0.0" + } + }, + "node_modules/mocha/node_modules/chokidar": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", + "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", + "dev": true, + "license": "MIT", + "dependencies": { + "anymatch": "~3.1.2", "braces": "~3.0.2", - "glob-parent": "~5.1.0", + "glob-parent": "~5.1.2", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", "normalize-path": "~3.0.0", - "readdirp": "~3.5.0" + "readdirp": "~3.6.0" }, "engines": { "node": ">= 8.10.0" }, + "funding": { + "url": "https://paulmillr.com/funding/" + }, "optionalDependencies": { - "fsevents": "~2.3.1" + "fsevents": "~2.3.2" } }, "node_modules/mocha/node_modules/cliui": { @@ -13495,52 +14276,20 @@ "wrap-ansi": "^7.0.0" } }, - "node_modules/mocha/node_modules/debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/mocha/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, - "license": "MIT" - }, "node_modules/mocha/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==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz", + "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==", "dev": true, "license": "BSD-3-Clause", "engines": { "node": ">=0.3.1" } }, - "node_modules/mocha/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, - "license": "MIT" - }, "node_modules/mocha/node_modules/glob": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", - "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", + "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", "deprecated": "Glob versions prior to v9 are no longer supported", "dev": true, "license": "ISC", @@ -13548,12 +14297,11 @@ "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" + "minimatch": "^5.0.1", + "once": "^1.3.0" }, "engines": { - "node": "*" + "node": ">=12" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -13572,36 +14320,36 @@ "node": ">= 6" } }, - "node_modules/mocha/node_modules/js-yaml": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.0.0.tgz", - "integrity": "sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, "node_modules/mocha/node_modules/minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", "dev": true, "license": "ISC", "dependencies": { - "brace-expansion": "^1.1.7" + "brace-expansion": "^2.0.1" }, "engines": { - "node": "*" + "node": ">=10" + } + }, + "node_modules/mocha/node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" } }, "node_modules/mocha/node_modules/readdirp": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz", - "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", "dev": true, "license": "MIT", "dependencies": { @@ -13611,16 +14359,14 @@ "node": ">=8.10.0" } }, - "node_modules/mocha/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==", + "node_modules/mocha/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, "license": "MIT", "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" + "ansi-regex": "^5.0.1" }, "engines": { "node": ">=8" @@ -13679,16 +14425,6 @@ "node": ">=10" } }, - "node_modules/mocha/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, - "license": "ISC", - "engines": { - "node": ">=10" - } - }, "node_modules/modern-node-polyfills": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/modern-node-polyfills/-/modern-node-polyfills-1.0.0.tgz", @@ -13714,17 +14450,6 @@ "dev": true, "license": "MIT" }, - "node_modules/mri": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz", - "integrity": "sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==", - "dev": true, - "license": "MIT", - "optional": true, - "engines": { - "node": ">=4" - } - }, "node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", @@ -13748,18 +14473,36 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, + "node_modules/mz": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz", + "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "any-promise": "^1.0.0", + "object-assign": "^4.0.1", + "thenify-all": "^1.0.0" + } + }, "node_modules/nan": { - "version": "2.20.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.20.0.tgz", - "integrity": "sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw==", + "version": "2.22.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz", + "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==", "dev": true, "license": "MIT" }, "node_modules/nanoid": { - "version": "3.1.20", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.20.tgz", - "integrity": "sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw==", + "version": "3.3.8", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz", + "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==", "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], "license": "MIT", "bin": { "nanoid": "bin/nanoid.cjs" @@ -13775,9 +14518,9 @@ "license": "MIT" }, "node_modules/negotiator": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", - "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz", + "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==", "dev": true, "license": "MIT", "engines": { @@ -13801,6 +14544,13 @@ "node": ">= 0.4.0" } }, + "node_modules/next-tick": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz", + "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==", + "dev": true, + "license": "ISC" + }, "node_modules/nise": { "version": "5.1.9", "resolved": "https://registry.npmjs.org/nise/-/nise-5.1.9.tgz", @@ -13865,6 +14615,22 @@ "node": ">=10.5.0" } }, + "node_modules/node-emoji": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-2.2.0.tgz", + "integrity": "sha512-Z3lTE9pLaJF47NyMhd4ww1yFTAP8YhYI8SleJiHzM46Fgpm5cnNzSl9XfzFNqbaz+VlJrIj3fXQ4DeN1Rjm6cw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@sindresorhus/is": "^4.6.0", + "char-regex": "^1.0.2", + "emojilib": "^2.4.0", + "skin-tone": "^2.0.0" + }, + "engines": { + "node": ">=18" + } + }, "node_modules/node-fetch": { "version": "3.3.2", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz", @@ -13885,9 +14651,9 @@ } }, "node_modules/node-fetch-native": { - "version": "1.6.4", - "resolved": "https://registry.npmjs.org/node-fetch-native/-/node-fetch-native-1.6.4.tgz", - "integrity": "sha512-IhOigYzAKHd244OC0JIMIUrjzctirCmPkaIfhDeGcEETWof5zKYUW7e7MYvChGWh/4CJeXEgsRyGzuF334rOOQ==", + "version": "1.6.6", + "resolved": "https://registry.npmjs.org/node-fetch-native/-/node-fetch-native-1.6.6.tgz", + "integrity": "sha512-8Mc2HhqPdlIfedsuZoc3yioPuzp6b+L5jRCRY1QzuWZh2EGJVQrGppC6V6cF0bLdbW0+O2YpqCA25aF/1lvipQ==", "dev": true, "license": "MIT", "optional": true @@ -13903,9 +14669,9 @@ } }, "node_modules/node-gyp": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.2.0.tgz", - "integrity": "sha512-sp3FonBAaFe4aYTcFdZUn2NYkbP7xroPGYvQmP4Nl5PxamznItBnNCgjrVTKrEfQynInMsJvZrdmqUnysCJ8rw==", + "version": "10.3.1", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.3.1.tgz", + "integrity": "sha512-Pp3nFHBThHzVtNY7U6JfPjvT/DTE8+o/4xKsLQtBoU+j2HLsGlhcfzflAoUreaJbNmYnX+LlLi0qjV8kpyO6xQ==", "dev": true, "license": "MIT", "dependencies": { @@ -14019,9 +14785,9 @@ } }, "node_modules/node-releases": { - "version": "2.0.18", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz", - "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==", + "version": "2.0.19", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz", + "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==", "dev": true, "license": "MIT" }, @@ -14131,16 +14897,17 @@ "license": "ISC" }, "node_modules/npm-run-path": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz", - "integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-6.0.0.tgz", + "integrity": "sha512-9qny7Z9DsQU8Ou39ERsPU4OZQlSTP47ShQzuKZ6PRXpYLtIFgl/DEBYEXKlvcEa+9tHVcK8CF81Y2V72qaZhWA==", "dev": true, "license": "MIT", "dependencies": { - "path-key": "^4.0.0" + "path-key": "^4.0.0", + "unicorn-magic": "^0.3.0" }, "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -14170,25 +14937,25 @@ } }, "node_modules/nwsapi": { - "version": "2.2.12", - "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.12.tgz", - "integrity": "sha512-qXDmcVlZV4XRtKFzddidpfVP4oMSGhga+xdMc25mv8kaLUHtgzCDhUxkrN8exkGdTlLNaXj7CV3GtON7zuGZ+w==", + "version": "2.2.16", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.16.tgz", + "integrity": "sha512-F1I/bimDpj3ncaNDhfyMWuFqmQDBwDB0Fogc2qpL3BWvkQteFD/8BzWuIRl83rq0DXfm8SGt/HFhLXZyljTXcQ==", "dev": true, "license": "MIT" }, "node_modules/nypm": { - "version": "0.3.11", - "resolved": "https://registry.npmjs.org/nypm/-/nypm-0.3.11.tgz", - "integrity": "sha512-E5GqaAYSnbb6n1qZyik2wjPDZON43FqOJO59+3OkWrnmQtjggrMOVnsyzfjxp/tS6nlYJBA4zRA5jSM2YaadMg==", + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/nypm/-/nypm-0.5.2.tgz", + "integrity": "sha512-AHzvnyUJYSrrphPhRWWZNcoZfArGNp3Vrc4pm/ZurO74tYNTgAPrEyBQEKy+qioqmWlPXwvMZCG2wOaHlPG0Pw==", "dev": true, "license": "MIT", "optional": true, "dependencies": { "citty": "^0.1.6", - "consola": "^3.2.3", - "execa": "^8.0.1", - "pathe": "^1.1.2", - "pkg-types": "^1.2.0", + "consola": "^3.4.0", + "pathe": "^2.0.2", + "pkg-types": "^1.3.1", + "tinyexec": "^0.3.2", "ufo": "^1.5.4" }, "bin": { @@ -14198,115 +14965,6 @@ "node": "^14.16.0 || >=16.10.0" } }, - "node_modules/nypm/node_modules/execa": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/execa/-/execa-8.0.1.tgz", - "integrity": "sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "cross-spawn": "^7.0.3", - "get-stream": "^8.0.1", - "human-signals": "^5.0.0", - "is-stream": "^3.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^5.1.0", - "onetime": "^6.0.0", - "signal-exit": "^4.1.0", - "strip-final-newline": "^3.0.0" - }, - "engines": { - "node": ">=16.17" - }, - "funding": { - "url": "https://github.com/sindresorhus/execa?sponsor=1" - } - }, - "node_modules/nypm/node_modules/get-stream": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-8.0.1.tgz", - "integrity": "sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==", - "dev": true, - "license": "MIT", - "optional": true, - "engines": { - "node": ">=16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/nypm/node_modules/human-signals": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-5.0.0.tgz", - "integrity": "sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==", - "dev": true, - "license": "Apache-2.0", - "optional": true, - "engines": { - "node": ">=16.17.0" - } - }, - "node_modules/nypm/node_modules/is-stream": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz", - "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==", - "dev": true, - "license": "MIT", - "optional": true, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/nypm/node_modules/mimic-fn": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz", - "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==", - "dev": true, - "license": "MIT", - "optional": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/nypm/node_modules/onetime": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz", - "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "mimic-fn": "^4.0.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/nypm/node_modules/strip-final-newline": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz", - "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==", - "dev": true, - "license": "MIT", - "optional": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", @@ -14318,9 +14976,9 @@ } }, "node_modules/object-inspect": { - "version": "1.13.2", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz", - "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==", + "version": "1.13.4", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", + "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", "dev": true, "license": "MIT", "engines": { @@ -14358,15 +15016,17 @@ } }, "node_modules/object.assign": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz", - "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==", + "version": "4.1.7", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz", + "integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==", "dev": true, "license": "MIT", "dependencies": { - "call-bind": "^1.0.5", + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", "define-properties": "^1.2.1", - "has-symbols": "^1.0.3", + "es-object-atoms": "^1.0.0", + "has-symbols": "^1.1.0", "object-keys": "^1.1.1" }, "engines": { @@ -14377,9 +15037,9 @@ } }, "node_modules/ohash": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/ohash/-/ohash-1.1.3.tgz", - "integrity": "sha512-zuHHiGTYTA1sYJ/wZN+t5HKZaH23i4yI1HMwbuXm24Nid7Dv0KcuRlKoNKS9UNfAVSBlnGLcuQrnOKWOZoEGaw==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/ohash/-/ohash-1.1.4.tgz", + "integrity": "sha512-FlDryZAahJmEF3VR3w1KogSEdWX3WhA5GPakFx4J81kEAiHyLMpdLLElS8n8dfNadMgAne/MywcvmogzscVt4g==", "dev": true, "license": "MIT", "optional": true @@ -14541,20 +15201,20 @@ } }, "node_modules/pac-proxy-agent": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.0.2.tgz", - "integrity": "sha512-BFi3vZnO9X5Qt6NRz7ZOaPja3ic0PhlsmCRYLOpN11+mWBCR6XJDqW5RF3j8jm4WGGQZtBA+bTfxYzeKW73eHg==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.1.0.tgz", + "integrity": "sha512-Z5FnLVVZSnX7WjBg0mhDtydeRZ1xMcATZThjySQUHqr+0ksP8kqaw23fNKkaaN/Z8gwLUs/W7xdl0I75eP2Xyw==", "dev": true, "license": "MIT", "dependencies": { "@tootallnate/quickjs-emscripten": "^0.23.0", - "agent-base": "^7.0.2", + "agent-base": "^7.1.2", "debug": "^4.3.4", "get-uri": "^6.0.1", "http-proxy-agent": "^7.0.0", - "https-proxy-agent": "^7.0.5", + "https-proxy-agent": "^7.0.6", "pac-resolver": "^7.0.1", - "socks-proxy-agent": "^8.0.4" + "socks-proxy-agent": "^8.0.5" }, "engines": { "node": ">= 14" @@ -14575,9 +15235,9 @@ } }, "node_modules/package-json-from-dist": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz", - "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz", + "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==", "dev": true, "license": "BlueOak-1.0.0" }, @@ -14626,11 +15286,11 @@ } }, "node_modules/parse-imports": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/parse-imports/-/parse-imports-2.1.1.tgz", - "integrity": "sha512-TDT4HqzUiTMO1wJRwg/t/hYk8Wdp3iF/ToMIlAoVQfL1Xs/sTxq1dKWSMjMbQmIarfWKymOyly40+zmPHXMqCA==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/parse-imports/-/parse-imports-2.2.1.tgz", + "integrity": "sha512-OL/zLggRp8mFhKL0rNORUTR4yBYujK/uU+xZL+/0Rgm2QE4nLO9v8PzEweSJEbMGKmDRjJE4R3IMJlL2di4JeQ==", "dev": true, - "license": "Apache-2.0", + "license": "Apache-2.0 AND MIT", "dependencies": { "es-module-lexer": "^1.5.3", "slashes": "^3.0.12" @@ -14682,60 +15342,28 @@ } }, "node_modules/parse5": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz", - "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz", + "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==", "dev": true, - "license": "MIT", - "dependencies": { - "entities": "^4.4.0" - }, - "funding": { - "url": "https://github.com/inikulin/parse5?sponsor=1" - } + "license": "MIT" }, "node_modules/parse5-htmlparser2-tree-adapter": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-7.0.0.tgz", - "integrity": "sha512-B77tOZrqqfUfnVcOrUvfdLbz4pu4RopLD/4vmu3HUPswwTA8OH0EMW9BlWR2B0RCoiZRAHEUu7IxeP1Pd1UU+g==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz", + "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==", "dev": true, "license": "MIT", "dependencies": { - "domhandler": "^5.0.2", - "parse5": "^7.0.0" - }, - "funding": { - "url": "https://github.com/inikulin/parse5?sponsor=1" + "parse5": "^6.0.1" } }, - "node_modules/parse5-htmlparser2-tree-adapter/node_modules/domelementtype": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", - "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", + "node_modules/parse5-htmlparser2-tree-adapter/node_modules/parse5": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", + "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==", "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/fb55" - } - ], - "license": "BSD-2-Clause" - }, - "node_modules/parse5-htmlparser2-tree-adapter/node_modules/domhandler": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz", - "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "domelementtype": "^2.3.0" - }, - "engines": { - "node": ">= 4" - }, - "funding": { - "url": "https://github.com/fb55/domhandler?sponsor=1" - } + "license": "MIT" }, "node_modules/parse5-parser-stream": { "version": "7.1.2", @@ -14750,7 +15378,7 @@ "url": "https://github.com/inikulin/parse5?sponsor=1" } }, - "node_modules/parse5/node_modules/entities": { + "node_modules/parse5-parser-stream/node_modules/entities": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", @@ -14763,6 +15391,19 @@ "url": "https://github.com/fb55/entities?sponsor=1" } }, + "node_modules/parse5-parser-stream/node_modules/parse5": { + "version": "7.2.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.2.1.tgz", + "integrity": "sha512-BuBYQYlv1ckiPdQi/ohiivi9Sagc9JG+Ozs0r7b/0iK3sKmrb0b9FdWdBbOdx6hBCM/F9Ir82ofnBhtZOjCRPQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "entities": "^4.5.0" + }, + "funding": { + "url": "https://github.com/inikulin/parse5?sponsor=1" + } + }, "node_modules/path-browserify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz", @@ -14822,38 +15463,31 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/path-scurry/node_modules/lru-cache": { - "version": "10.4.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", - "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", - "dev": true, - "license": "ISC" - }, "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==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz", + "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==", "dev": true, "license": "MIT" }, "node_modules/path-type": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-5.0.0.tgz", - "integrity": "sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-6.0.0.tgz", + "integrity": "sha512-Vj7sf++t5pBD637NSfkxpHSMfWaeig5+DKWLhcqIYx6mWQz5hdJTGDVMQiJcw1ZYkhs7AazKDGpRVji1LJCZUQ==", "dev": true, "license": "MIT", "optional": true, "engines": { - "node": ">=12" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/pathe": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz", - "integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.2.tgz", + "integrity": "sha512-15Ztpk+nov8DR524R4BF7uEuzESgzUEAV4Ah7CUMNGXdE5ELuvxElxGXndBl32vMSsWa1jpNf22Z+Er3sKwq+w==", "dev": true, "license": "MIT" }, @@ -14900,20 +15534,20 @@ "optional": true }, "node_modules/picocolors": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz", - "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", "dev": true, "license": "ISC" }, "node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", + "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", "dev": true, "license": "MIT", "engines": { - "node": ">=8.6" + "node": ">=12" }, "funding": { "url": "https://github.com/sponsors/jonschlinkert" @@ -14999,15 +15633,15 @@ } }, "node_modules/pkg-types": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.2.0.tgz", - "integrity": "sha512-+ifYuSSqOQ8CqP4MbZA5hDpb97n3E8SVWdJe+Wms9kj745lmd3b7EZJiqvmLwAlmRfjrI7Hi5z3kdBJ93lFNPA==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.3.1.tgz", + "integrity": "sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==", "dev": true, "license": "MIT", "dependencies": { - "confbox": "^0.1.7", - "mlly": "^1.7.1", - "pathe": "^1.1.2" + "confbox": "^0.1.8", + "mlly": "^1.7.4", + "pathe": "^2.0.1" } }, "node_modules/pkginfo": { @@ -15041,9 +15675,9 @@ } }, "node_modules/possible-typed-array-names": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz", - "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz", + "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==", "dev": true, "license": "MIT", "engines": { @@ -15051,9 +15685,9 @@ } }, "node_modules/postcss": { - "version": "8.4.45", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.45.tgz", - "integrity": "sha512-7KTLTdzdZZYscUc65XmjFiB73vBhBfbPztCYdUNvlaso9PrzjzcmjqBPR0lNGkcVlcO4BjiO5rK/qNz+XAen1Q==", + "version": "8.5.1", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.1.tgz", + "integrity": "sha512-6oz2beyjc5VMn/KV1pPw8fliQkhBXrVn1Z3TVyqZxU8kZpzEKhBdmCFqI6ZbmGtamQvQGuU1sgPTk8ZrXDD7jQ==", "dev": true, "funding": [ { @@ -15071,33 +15705,14 @@ ], "license": "MIT", "dependencies": { - "nanoid": "^3.3.7", - "picocolors": "^1.0.1", - "source-map-js": "^1.2.0" + "nanoid": "^3.3.8", + "picocolors": "^1.1.1", + "source-map-js": "^1.2.1" }, "engines": { "node": "^10 || ^12 || >=14" } }, - "node_modules/postcss/node_modules/nanoid": { - "version": "3.3.7", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", - "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "license": "MIT", - "bin": { - "nanoid": "bin/nanoid.cjs" - }, - "engines": { - "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" - } - }, "node_modules/prelude-ls": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", @@ -15108,18 +15723,18 @@ } }, "node_modules/pretty-format": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", - "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==", + "version": "30.0.0-alpha.7", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-30.0.0-alpha.7.tgz", + "integrity": "sha512-2gg8UNJxO+v6IiWydXPTM2LvCuIBxT2RC53Ind6IW0Cu9zvxoCMKeAAVV9nfukZyK01GFdYXhoH2zW18PsA6MQ==", "dev": true, "license": "MIT", "dependencies": { - "@jest/schemas": "^29.6.3", + "@jest/schemas": "30.0.0-alpha.7", "ansi-styles": "^5.0.0", "react-is": "^18.0.0" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^16.10.0 || ^18.12.0 || >=20.0.0" } }, "node_modules/pretty-format/node_modules/ansi-styles": { @@ -15136,9 +15751,9 @@ } }, "node_modules/pretty-ms": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-9.1.0.tgz", - "integrity": "sha512-o1piW0n3tgKIKCwk2vpM/vOV13zjJzvP37Ioze54YlTHE06m4tjEbzg9WsKkvTuyYln2DHjo5pY4qrZGI0otpw==", + "version": "9.2.0", + "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-9.2.0.tgz", + "integrity": "sha512-4yf0QO/sllf/1zbZWYnvWw3NxCQwLXKzIj0G849LSufP15BXKM0rbD2Z3wVnkMfjdn/CB0Dpp444gYAACdsplg==", "dev": true, "license": "MIT", "dependencies": { @@ -15203,20 +15818,20 @@ } }, "node_modules/proxy-agent": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.4.0.tgz", - "integrity": "sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ==", + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.5.0.tgz", + "integrity": "sha512-TmatMXdr2KlRiA2CyDu8GqR8EjahTG3aY3nXjdzFyoZbmB8hrBsTyMezhULIXKnC0jpfjlmiZ3+EaCzoInSu/A==", "dev": true, "license": "MIT", "dependencies": { - "agent-base": "^7.0.2", + "agent-base": "^7.1.2", "debug": "^4.3.4", "http-proxy-agent": "^7.0.1", - "https-proxy-agent": "^7.0.3", + "https-proxy-agent": "^7.0.6", "lru-cache": "^7.14.1", - "pac-proxy-agent": "^7.0.1", + "pac-proxy-agent": "^7.1.0", "proxy-from-env": "^1.1.0", - "socks-proxy-agent": "^8.0.2" + "socks-proxy-agent": "^8.0.5" }, "engines": { "node": ">= 14" @@ -15258,13 +15873,6 @@ "dev": true, "license": "ISC" }, - "node_modules/psl": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz", - "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==", - "dev": true, - "license": "MIT" - }, "node_modules/public-encrypt": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz", @@ -15281,16 +15889,16 @@ } }, "node_modules/public-encrypt/node_modules/bn.js": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.1.tgz", + "integrity": "sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg==", "dev": true, "license": "MIT" }, "node_modules/pump": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", - "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz", + "integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==", "dev": true, "license": "MIT", "dependencies": { @@ -15318,13 +15926,13 @@ } }, "node_modules/qs": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", - "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz", + "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==", "dev": true, "license": "BSD-3-Clause", "dependencies": { - "side-channel": "^1.0.6" + "side-channel": "^1.1.0" }, "engines": { "node": ">=0.6" @@ -15349,17 +15957,11 @@ "node": ">=0.4.x" } }, - "node_modules/querystringify": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", - "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==", - "dev": true, - "license": "MIT" - }, "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==", + "dev": true, "funding": [ { "type": "github", @@ -15376,13 +15978,6 @@ ], "license": "MIT" }, - "node_modules/queue-tick": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz", - "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==", - "dev": true, - "license": "MIT" - }, "node_modules/quick-lru": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", @@ -15664,9 +16259,9 @@ } }, "node_modules/read-pkg-up/node_modules/type-fest": { - "version": "4.26.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.26.0.tgz", - "integrity": "sha512-OduNjVJsFbifKb57UqZ2EMP1i4u64Xwow3NYXUtBbD4vIwJdQd4+xl8YDou1dlm4DVrtwT/7Ky8z8WyCULVfxw==", + "version": "4.34.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.34.0.tgz", + "integrity": "sha512-Qcg88ZJsJvRcUijtD6supagRSDf0y1FPZh4NroJpwRkoPYj6gGNidREwTgDuC0Pmq0PVAAzL8C8BZW7xhx5Q4A==", "dev": true, "license": "(MIT OR CC0-1.0)", "engines": { @@ -15722,13 +16317,6 @@ "node": "^12.20.0 || ^14.13.1 || >=16.0.0" } }, - "node_modules/read-pkg/node_modules/lru-cache": { - "version": "10.4.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", - "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", - "dev": true, - "license": "ISC" - }, "node_modules/read-pkg/node_modules/normalize-package-data": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-6.0.2.tgz", @@ -15778,9 +16366,9 @@ } }, "node_modules/read-pkg/node_modules/type-fest": { - "version": "4.26.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.26.0.tgz", - "integrity": "sha512-OduNjVJsFbifKb57UqZ2EMP1i4u64Xwow3NYXUtBbD4vIwJdQd4+xl8YDou1dlm4DVrtwT/7Ky8z8WyCULVfxw==", + "version": "4.34.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.34.0.tgz", + "integrity": "sha512-Qcg88ZJsJvRcUijtD6supagRSDf0y1FPZh4NroJpwRkoPYj6gGNidREwTgDuC0Pmq0PVAAzL8C8BZW7xhx5Q4A==", "dev": true, "license": "(MIT OR CC0-1.0)", "engines": { @@ -15853,16 +16441,17 @@ } }, "node_modules/readdirp": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", - "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.1.tgz", + "integrity": "sha512-h80JrZu/MHUZCyHu5ciuoI0+WxsCxzxJTILn6Fs8rxSnFPh+UVHYfeIxK1nVGugMqkfC4vJcBOYbkfkwYK0+gw==", "dev": true, "license": "MIT", - "dependencies": { - "picomatch": "^2.2.1" - }, "engines": { - "node": ">=8.10.0" + "node": ">= 14.18.0" + }, + "funding": { + "type": "individual", + "url": "https://paulmillr.com/funding/" } }, "node_modules/recast": { @@ -15928,9 +16517,9 @@ "license": "MIT" }, "node_modules/regenerate-unicode-properties": { - "version": "10.1.1", - "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz", - "integrity": "sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==", + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.0.tgz", + "integrity": "sha512-DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA==", "dev": true, "license": "MIT", "dependencies": { @@ -15968,16 +16557,16 @@ } }, "node_modules/regexpu-core": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz", - "integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.2.0.tgz", + "integrity": "sha512-H66BPQMrv+V16t8xtmq+UC0CBpiTBA60V8ibS1QVReIp8T1z8hwFxqcGzm9K6lgsN7sB5edVH8a+ze6Fqm4weA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/regjsgen": "^0.8.0", "regenerate": "^1.4.2", - "regenerate-unicode-properties": "^10.1.0", - "regjsparser": "^0.9.1", + "regenerate-unicode-properties": "^10.2.0", + "regjsgen": "^0.8.0", + "regjsparser": "^0.12.0", "unicode-match-property-ecmascript": "^2.0.0", "unicode-match-property-value-ecmascript": "^2.1.0" }, @@ -15985,26 +16574,37 @@ "node": ">=4" } }, + "node_modules/regjsgen": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.8.0.tgz", + "integrity": "sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q==", + "dev": true, + "license": "MIT" + }, "node_modules/regjsparser": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz", - "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==", + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.12.0.tgz", + "integrity": "sha512-cnE+y8bz4NhMjISKbgeVJtqNbtf5QpjZP+Bslo+UqkIt9QPnX9q095eiRRASJG1/tz6dlNr6Z5NsBiWYokp6EQ==", "dev": true, "license": "BSD-2-Clause", "dependencies": { - "jsesc": "~0.5.0" + "jsesc": "~3.0.2" }, "bin": { "regjsparser": "bin/parser" } }, "node_modules/regjsparser/node_modules/jsesc": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", - "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz", + "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==", "dev": true, + "license": "MIT", "bin": { "jsesc": "bin/jsesc" + }, + "engines": { + "node": ">=6" } }, "node_modules/require-directory": { @@ -16017,27 +16617,33 @@ "node": ">=0.10.0" } }, - "node_modules/requires-port": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", - "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==", + "node_modules/require-from-string": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", + "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", "dev": true, - "license": "MIT" + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } }, "node_modules/resolve": { - "version": "1.22.8", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", - "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", + "version": "1.22.10", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz", + "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==", "dev": true, "license": "MIT", "dependencies": { - "is-core-module": "^2.13.0", + "is-core-module": "^2.16.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, "bin": { "resolve": "bin/resolve" }, + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -16156,6 +16762,7 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "dev": true, "license": "MIT", "engines": { "iojs": ">=1.0.0", @@ -16227,13 +16834,13 @@ } }, "node_modules/rollup": { - "version": "4.21.2", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.21.2.tgz", - "integrity": "sha512-e3TapAgYf9xjdLvKQCkQTnbTKd4a6jwlpQSJJFokHGaX2IVjoEqkIIhiQfqsi0cdwlOD+tQGuOd5AJkc5RngBw==", + "version": "4.34.6", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.34.6.tgz", + "integrity": "sha512-wc2cBWqJgkU3Iz5oztRkQbfVkbxoz5EhnCGOrnJvnLnQ7O0WhQUYyv18qQI79O8L7DdHrrlJNeCHd4VGpnaXKQ==", "dev": true, "license": "MIT", "dependencies": { - "@types/estree": "1.0.5" + "@types/estree": "1.0.6" }, "bin": { "rollup": "dist/bin/rollup" @@ -16243,22 +16850,25 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.21.2", - "@rollup/rollup-android-arm64": "4.21.2", - "@rollup/rollup-darwin-arm64": "4.21.2", - "@rollup/rollup-darwin-x64": "4.21.2", - "@rollup/rollup-linux-arm-gnueabihf": "4.21.2", - "@rollup/rollup-linux-arm-musleabihf": "4.21.2", - "@rollup/rollup-linux-arm64-gnu": "4.21.2", - "@rollup/rollup-linux-arm64-musl": "4.21.2", - "@rollup/rollup-linux-powerpc64le-gnu": "4.21.2", - "@rollup/rollup-linux-riscv64-gnu": "4.21.2", - "@rollup/rollup-linux-s390x-gnu": "4.21.2", - "@rollup/rollup-linux-x64-gnu": "4.21.2", - "@rollup/rollup-linux-x64-musl": "4.21.2", - "@rollup/rollup-win32-arm64-msvc": "4.21.2", - "@rollup/rollup-win32-ia32-msvc": "4.21.2", - "@rollup/rollup-win32-x64-msvc": "4.21.2", + "@rollup/rollup-android-arm-eabi": "4.34.6", + "@rollup/rollup-android-arm64": "4.34.6", + "@rollup/rollup-darwin-arm64": "4.34.6", + "@rollup/rollup-darwin-x64": "4.34.6", + "@rollup/rollup-freebsd-arm64": "4.34.6", + "@rollup/rollup-freebsd-x64": "4.34.6", + "@rollup/rollup-linux-arm-gnueabihf": "4.34.6", + "@rollup/rollup-linux-arm-musleabihf": "4.34.6", + "@rollup/rollup-linux-arm64-gnu": "4.34.6", + "@rollup/rollup-linux-arm64-musl": "4.34.6", + "@rollup/rollup-linux-loongarch64-gnu": "4.34.6", + "@rollup/rollup-linux-powerpc64le-gnu": "4.34.6", + "@rollup/rollup-linux-riscv64-gnu": "4.34.6", + "@rollup/rollup-linux-s390x-gnu": "4.34.6", + "@rollup/rollup-linux-x64-gnu": "4.34.6", + "@rollup/rollup-linux-x64-musl": "4.34.6", + "@rollup/rollup-win32-arm64-msvc": "4.34.6", + "@rollup/rollup-win32-ia32-msvc": "4.34.6", + "@rollup/rollup-win32-x64-msvc": "4.34.6", "fsevents": "~2.3.2" } }, @@ -16340,6 +16950,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "dev": true, "funding": [ { "type": "github", @@ -16370,11 +16981,14 @@ } }, "node_modules/safaridriver": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/safaridriver/-/safaridriver-0.1.2.tgz", - "integrity": "sha512-4R309+gWflJktzPXBQCobbWEHlzC4aK3a+Ov3tz2Ib2aBxiwd11phkdIBH1l0EO22x24CJMUQkpKFumRriCSRg==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/safaridriver/-/safaridriver-1.0.0.tgz", + "integrity": "sha512-J92IFbskyo7OYB3Dt4aTdyhag1GlInrfbPCmMteb7aBK7PwlnGz1HI0+oyNN97j7pV9DqUAVoVgkNRMrfY47mQ==", "dev": true, - "license": "MIT" + "license": "MIT", + "engines": { + "node": ">=18.0.0" + } }, "node_modules/safe-buffer": { "version": "5.2.1", @@ -16397,6 +17011,24 @@ ], "license": "MIT" }, + "node_modules/safe-regex-test": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz", + "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "is-regex": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/safe-stringify": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/safe-stringify/-/safe-stringify-1.1.1.tgz", @@ -16472,9 +17104,9 @@ } }, "node_modules/semver": { - "version": "7.6.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", - "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", + "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", "dev": true, "license": "ISC", "bin": { @@ -16521,9 +17153,9 @@ } }, "node_modules/serialize-javascript": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz", - "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", + "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -16756,16 +17388,73 @@ } }, "node_modules/side-channel": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", - "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", + "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", "dev": true, "license": "MIT", "dependencies": { - "call-bind": "^1.0.7", "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.4", - "object-inspect": "^1.13.1" + "object-inspect": "^1.13.3", + "side-channel-list": "^1.0.0", + "side-channel-map": "^1.0.1", + "side-channel-weakmap": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-list": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", + "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-map": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", + "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-weakmap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", + "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3", + "side-channel-map": "^1.0.1" }, "engines": { "node": ">= 0.4" @@ -16807,6 +17496,29 @@ "url": "https://opencollective.com/sinon" } }, + "node_modules/sinon/node_modules/diff": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz", + "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/skin-tone": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/skin-tone/-/skin-tone-2.0.0.tgz", + "integrity": "sha512-kUMbT1oBJCpgrnKoSr0o6wPtvRWT9W9UKvGLwfJYO2WuahZRHOpEyL1ckyMGgMWh0UdpmaoFqKKD29WTomNEGA==", + "dev": true, + "license": "MIT", + "dependencies": { + "unicode-emoji-modifier-base": "^1.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/slash": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz", @@ -16875,9 +17587,9 @@ } }, "node_modules/smol-toml": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.3.0.tgz", - "integrity": "sha512-tWpi2TsODPScmi48b/OQZGi2lgUmBCHy6SZrhi/FdnnHiU1GwebbCfuQuxsC3nHaLwtYeJGPrDZDIeodDOc4pA==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.3.1.tgz", + "integrity": "sha512-tEYNll18pPKHroYSmLLrksq233j021G0giwW7P3D24jC54pQ5W5BXMsQ/Mvw1OJCmEYDgY+lrzT+3nNUtoNfXQ==", "dev": true, "license": "BSD-3-Clause", "engines": { @@ -16903,13 +17615,13 @@ } }, "node_modules/socks-proxy-agent": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz", - "integrity": "sha512-GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw==", + "version": "8.0.5", + "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.5.tgz", + "integrity": "sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw==", "dev": true, "license": "MIT", "dependencies": { - "agent-base": "^7.1.1", + "agent-base": "^7.1.2", "debug": "^4.3.4", "socks": "^2.8.3" }, @@ -16928,9 +17640,9 @@ } }, "node_modules/source-map-js": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz", - "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", + "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", "dev": true, "license": "BSD-3-Clause", "engines": { @@ -16957,9 +17669,9 @@ "license": "MIT" }, "node_modules/spacetrim": { - "version": "0.11.39", - "resolved": "https://registry.npmjs.org/spacetrim/-/spacetrim-0.11.39.tgz", - "integrity": "sha512-S/baW29azJ7py5ausQRE2S6uEDQnlxgMHOEEq4V770ooBDD1/9kZnxRcco/tjZYuDuqYXblCk/r3N13ZmvHZ2g==", + "version": "0.11.59", + "resolved": "https://registry.npmjs.org/spacetrim/-/spacetrim-0.11.59.tgz", + "integrity": "sha512-lLYsktklSRKprreOm7NXReW8YiX2VBjbgmXYEziOoGf/qsJqAEACaDvoTtUOycwjpaSh+bT8eu0KrJn7UNxiCg==", "dev": true, "funding": [ { @@ -16971,7 +17683,7 @@ "url": "https://github.com/hejny/spacetrim/blob/main/README.md#%EF%B8%8F-contributing" } ], - "license": "SEE LICENSE IN LICENSE" + "license": "Apache-2.0" }, "node_modules/spdx-correct": { "version": "3.2.0", @@ -17003,9 +17715,9 @@ } }, "node_modules/spdx-license-ids": { - "version": "3.0.20", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.20.tgz", - "integrity": "sha512-jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw==", + "version": "3.0.21", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.21.tgz", + "integrity": "sha512-Bvg/8F5XephndSK3JffaRqdT+gyhfqIPwDHpX80tJrF8QQRYMo8sNMeaZ2Dp5+jhwKnUmIOyFFQfHRkjJm5nXg==", "dev": true, "license": "CC0-1.0" }, @@ -17063,9 +17775,9 @@ } }, "node_modules/std-env": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.7.0.tgz", - "integrity": "sha512-JPbdCEQLj1w5GilpiHAx3qJvFndqybBysA3qUOnznweH4QbNYUsW/ea8QzSrnh0vNsezMMw5bcVool8lM0gwzg==", + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.8.0.tgz", + "integrity": "sha512-Bc3YwwCB+OzldMxOXJIIvC6cPRWr/LxOp48CdQTOkPyk/t4JWWJbrilwBd7RJzKV8QW7tJkcgAmeuLLJugl5/w==", "dev": true, "license": "MIT", "optional": true @@ -17105,14 +17817,13 @@ } }, "node_modules/streamx": { - "version": "2.20.0", - "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.20.0.tgz", - "integrity": "sha512-ZGd1LhDeGFucr1CUCTBOS58ZhEendd0ttpGT3usTvosS4ntIwKN9LJFp+OeCSprsCPL14BXVRZlHGRY1V9PVzQ==", + "version": "2.22.0", + "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.22.0.tgz", + "integrity": "sha512-sLh1evHOzBy/iWRiR6d1zRcLao4gGZr3C1kzNz4fopCOKJb6xD9ub8Mpi9Mr1R6id5o43S+d93fI48UC5uM9aw==", "dev": true, "license": "MIT", "dependencies": { "fast-fifo": "^1.3.2", - "queue-tick": "^1.0.1", "text-decoder": "^1.1.0" }, "optionalDependencies": { @@ -17140,21 +17851,18 @@ } }, "node_modules/string-width": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "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, "license": "MIT", "dependencies": { - "eastasianwidth": "^0.2.0", - "emoji-regex": "^9.2.2", - "strip-ansi": "^7.0.1" + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" }, "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=8" } }, "node_modules/string-width-cjs": { @@ -17173,40 +17881,30 @@ "node": ">=8" } }, - "node_modules/string-width-cjs/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, - "license": "MIT" - }, - "node_modules/string-width/node_modules/ansi-regex": { + "node_modules/string-width-cjs/node_modules/strip-ansi": { "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/string-width/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, "license": "MIT", "dependencies": { - "ansi-regex": "^6.0.1" + "ansi-regex": "^5.0.1" }, "engines": { - "node": ">=12" + "node": ">=8" + } + }, + "node_modules/string-width/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, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" + "engines": { + "node": ">=8" } }, "node_modules/stringify-object": { @@ -17225,15 +17923,19 @@ } }, "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==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dev": true, "license": "MIT", "dependencies": { - "ansi-regex": "^5.0.1" + "ansi-regex": "^6.0.1" }, "engines": { - "node": ">=8" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" } }, "node_modules/strip-ansi-cjs": { @@ -17250,6 +17952,19 @@ "node": ">=8" } }, + "node_modules/strip-ansi/node_modules/ansi-regex": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", + "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, "node_modules/strip-bom-string": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz", @@ -17306,23 +18021,23 @@ } }, "node_modules/strip-literal": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-2.1.0.tgz", - "integrity": "sha512-Op+UycaUt/8FbN/Z2TWPBLge3jWrP3xj10f3fnYxf052bKuS3EKs1ZQcVGjnEMdsNVAM+plXRdmjrZ/KgG3Skw==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-2.1.1.tgz", + "integrity": "sha512-631UJ6O00eNGfMiWG78ck80dfBab8X6IVFB51jZK5Icd7XAs60Z5y7QdSd/wGIklnWvRbUNloVzhOKKmutxQ6Q==", "dev": true, "license": "MIT", "optional": true, "dependencies": { - "js-tokens": "^9.0.0" + "js-tokens": "^9.0.1" }, "funding": { "url": "https://github.com/sponsors/antfu" } }, "node_modules/strip-literal/node_modules/js-tokens": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-9.0.0.tgz", - "integrity": "sha512-WriZw1luRMlmV3LGJaR6QOJjWwgLUTf89OwT2lUOyjX2dJGBwgmIkbcz+7WFZjrZM635JOIR517++e/67CP9dQ==", + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-9.0.1.tgz", + "integrity": "sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ==", "dev": true, "license": "MIT", "optional": true @@ -17353,6 +18068,23 @@ "node": ">=8" } }, + "node_modules/supports-hyperlinks": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-3.2.0.tgz", + "integrity": "sha512-zFObLMyZeEwzAoKCyu1B91U79K2t7ApXuQfo8OuxwXLDgcKxuwM+YvcbIhm6QWqz7mHUH1TVytR1PwVVjEuMig==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0", + "supports-color": "^7.0.0" + }, + "engines": { + "node": ">=14.18" + }, + "funding": { + "url": "https://github.com/chalk/supports-hyperlinks?sponsor=1" + } + }, "node_modules/supports-preserve-symlinks-flag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", @@ -17374,9 +18106,9 @@ "license": "MIT" }, "node_modules/synckit": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.9.1.tgz", - "integrity": "sha512-7gr8p9TQP6RAHusBOSLs46F4564ZrjV8xFmw5zCmgmhGUcw2hxsShhJ6CEiHQMgPDwAQ1fWHPM0ypc4RMAig4A==", + "version": "0.9.2", + "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.9.2.tgz", + "integrity": "sha512-vrozgXDQwYO72vHjUb/HnFbQx1exDjoKzqx23aXEg2a9VIg2TSFZ8FmeZpTjUCFMYw7mpX4BE2SFu8wI7asYsw==", "dev": true, "license": "MIT", "dependencies": { @@ -17419,9 +18151,9 @@ } }, "node_modules/tar-fs": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.6.tgz", - "integrity": "sha512-iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.8.tgz", + "integrity": "sha512-ZoROL70jptorGAlgAYiLoBLItEKw/fUxg9BSYK/dF/GAGYFJOJJJMvjPAKDJraCXFwadD456FCuvLWgfhMsPwg==", "dev": true, "license": "MIT", "dependencies": { @@ -17429,8 +18161,8 @@ "tar-stream": "^3.1.5" }, "optionalDependencies": { - "bare-fs": "^2.1.1", - "bare-path": "^2.1.0" + "bare-fs": "^4.0.1", + "bare-path": "^3.0.0" } }, "node_modules/tar-stream": { @@ -17481,17 +18213,10 @@ "node": ">=8" } }, - "node_modules/tar/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true, - "license": "ISC" - }, "node_modules/terser": { - "version": "5.31.6", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.6.tgz", - "integrity": "sha512-PQ4DAriWzKj+qgehQ7LK5bQqCFNMmlhjR2PFFLuqGCpuCAauxemVBWwWOxo3UIwWQx8+Pr61Df++r76wDmkQBg==", + "version": "5.38.1", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.38.1.tgz", + "integrity": "sha512-GWANVlPM/ZfYzuPHjq0nxT+EbOEDDN3Jwhwdg1D8TU8oSkktp8w64Uq4auuGLxFSoNTRDncTq2hQHX1Ld9KHkA==", "dev": true, "license": "BSD-2-Clause", "dependencies": { @@ -17508,17 +18233,17 @@ } }, "node_modules/terser-webpack-plugin": { - "version": "5.3.10", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz", - "integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==", + "version": "5.3.11", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.11.tgz", + "integrity": "sha512-RVCsMfuD0+cTt3EwX8hSl2Ks56EbFHWmhluwcqoPKtBnfjiT6olaq7PRIRfhyU8nnC2MrnDrBLfrD/RGE+cVXQ==", "dev": true, "license": "MIT", "dependencies": { - "@jridgewell/trace-mapping": "^0.3.20", + "@jridgewell/trace-mapping": "^0.3.25", "jest-worker": "^27.4.5", - "schema-utils": "^3.1.1", - "serialize-javascript": "^6.0.1", - "terser": "^5.26.0" + "schema-utils": "^4.3.0", + "serialize-javascript": "^6.0.2", + "terser": "^5.31.1" }, "engines": { "node": ">= 10.13.0" @@ -17542,16 +18267,54 @@ } } }, - "node_modules/terser-webpack-plugin/node_modules/schema-utils": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", - "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", + "node_modules/terser-webpack-plugin/node_modules/ajv": { + "version": "8.17.1", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", + "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", "dev": true, "license": "MIT", "dependencies": { - "@types/json-schema": "^7.0.8", - "ajv": "^6.12.5", - "ajv-keywords": "^3.5.2" + "fast-deep-equal": "^3.1.3", + "fast-uri": "^3.0.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/terser-webpack-plugin/node_modules/ajv-keywords": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz", + "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-deep-equal": "^3.1.3" + }, + "peerDependencies": { + "ajv": "^8.8.2" + } + }, + "node_modules/terser-webpack-plugin/node_modules/json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "dev": true, + "license": "MIT" + }, + "node_modules/terser-webpack-plugin/node_modules/schema-utils": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz", + "integrity": "sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/json-schema": "^7.0.9", + "ajv": "^8.9.0", + "ajv-formats": "^2.1.1", + "ajv-keywords": "^5.1.0" }, "engines": { "node": ">= 10.13.0" @@ -17561,16 +18324,6 @@ "url": "https://opencollective.com/webpack" } }, - "node_modules/terser-webpack-plugin/node_modules/serialize-javascript": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", - "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "randombytes": "^2.1.0" - } - }, "node_modules/terser/node_modules/commander": { "version": "2.20.3", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", @@ -17616,9 +18369,9 @@ } }, "node_modules/text-decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.1.1.tgz", - "integrity": "sha512-8zll7REEv4GDD3x4/0pW+ppIxSNs7H1J10IKFZsuOMscumCdM2a+toDGLPA3T+1+fLBql4zbt5z83GEQGGV5VA==", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.3.tgz", + "integrity": "sha512-3/o9z3X0X0fTupwsYvR03pJ/DjWuqqrfwBgTQzdWDiQSm9KitAyz/9WqsT2JQW7KV2m+bC2ol/zqpW37NHxLaA==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -17629,8 +18382,32 @@ "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "dev": true, "license": "MIT" }, + "node_modules/thenify": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz", + "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==", + "dev": true, + "license": "MIT", + "dependencies": { + "any-promise": "^1.0.0" + } + }, + "node_modules/thenify-all": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz", + "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "thenify": ">= 3.1.0 < 4" + }, + "engines": { + "node": ">=0.8" + } + }, "node_modules/through": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", @@ -17651,6 +18428,20 @@ "node": ">=0.6.0" } }, + "node_modules/timers-ext": { + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.8.tgz", + "integrity": "sha512-wFH7+SEAcKfJpfLPkrgMPvvwnEtj8W4IurvEyrKsDleXnKLCDw71w8jltvfLa8Rm4qQxxT4jmDBYbJG/z7qoww==", + "dev": true, + "license": "ISC", + "dependencies": { + "es5-ext": "^0.10.64", + "next-tick": "^1.1.0" + }, + "engines": { + "node": ">=0.12" + } + }, "node_modules/tiny-invariant": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.3.tgz", @@ -17658,6 +18449,14 @@ "dev": true, "license": "MIT" }, + "node_modules/tinyexec": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-0.3.2.tgz", + "integrity": "sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==", + "dev": true, + "license": "MIT", + "optional": true + }, "node_modules/tinyrainbow": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-1.2.0.tgz", @@ -17669,9 +18468,9 @@ } }, "node_modules/tinyspy": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-3.0.0.tgz", - "integrity": "sha512-q5nmENpTHgiPVd1cJDDc9cVoYN5x4vCvwT3FMilvKPKneCBZAxn2YWQjDF0UMcE9k0Cay1gBiDfTMU0g+mPMQA==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-3.0.2.tgz", + "integrity": "sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q==", "dev": true, "license": "MIT", "engines": { @@ -17679,9 +18478,9 @@ } }, "node_modules/tlds": { - "version": "1.254.0", - "resolved": "https://registry.npmjs.org/tlds/-/tlds-1.254.0.tgz", - "integrity": "sha512-YY4ei7K7gPGifqNSrfMaPdqTqiHcwYKUJ7zhLqQOK2ildlGgti5TSwJiXXN1YqG17I2GYZh5cZqv2r5fwBUM+w==", + "version": "1.255.0", + "resolved": "https://registry.npmjs.org/tlds/-/tlds-1.255.0.tgz", + "integrity": "sha512-tcwMRIioTcF/FcxLev8MJWxCp+GUALRhFEqbDoZrnowmKSGqPrl5pqS+Sut2m8BgJ6S4FExCSSpGffZ0Tks6Aw==", "dev": true, "license": "MIT", "bin": { @@ -17689,22 +18488,22 @@ } }, "node_modules/tldts": { - "version": "6.1.43", - "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.43.tgz", - "integrity": "sha512-5J2v/CbNH8CkwsQV+igsuu0+3eeTfRDn1CFf38a24ZD6FIrbm3DZFu4UrrpoOSejhuP4N1PNDNUvJcw+f4nXNw==", + "version": "6.1.77", + "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.77.tgz", + "integrity": "sha512-lBpoWgy+kYmuXWQ83+R7LlJCnsd9YW8DGpZSHhrMl4b8Ly/1vzOie3OdtmUJDkKxcgRGOehDu5btKkty+JEe+g==", "dev": true, "license": "MIT", "dependencies": { - "tldts-core": "^6.1.43" + "tldts-core": "^6.1.77" }, "bin": { "tldts": "bin/cli.js" } }, "node_modules/tldts-core": { - "version": "6.1.43", - "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.43.tgz", - "integrity": "sha512-iO1G3F2NqtmJUYlTfcH2liSdaqDnjpYn6iGftbLRNx8DF6IRIjbknVt+q0ijwZ2KGZX3J8zeYGFoiI+ZtHT5MQ==", + "version": "6.1.77", + "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.77.tgz", + "integrity": "sha512-bCaqm24FPk8OgBkM0u/SrEWJgHnhBWYqeBo6yUmcZJDCHt/IfyWBb+14CXdGi4RInMv4v7eUAin15W0DoA+Ytg==", "dev": true, "license": "MIT" }, @@ -17721,16 +18520,6 @@ "node": ">=0.6.0" } }, - "node_modules/to-fast-properties": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, "node_modules/to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -17745,29 +18534,16 @@ } }, "node_modules/tough-cookie": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz", - "integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-5.1.1.tgz", + "integrity": "sha512-Ek7HndSVkp10hmHP9V4qZO1u+pn1RU5sI0Fw+jCU3lyvuMZcgqsNgc6CmJJZyByK4Vm/qotGRJlfgAX8q+4JiA==", "dev": true, "license": "BSD-3-Clause", "dependencies": { - "psl": "^1.1.33", - "punycode": "^2.1.1", - "universalify": "^0.2.0", - "url-parse": "^1.5.3" + "tldts": "^6.1.32" }, "engines": { - "node": ">=6" - } - }, - "node_modules/tough-cookie/node_modules/universalify": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", - "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 4.0.0" + "node": ">=16" } }, "node_modules/tr46": { @@ -17792,17 +18568,30 @@ "node": ">=0.6" } }, + "node_modules/ts-api-utils": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.0.1.tgz", + "integrity": "sha512-dnlgjFSVetynI8nzgJ+qF62efpglpWRk8isUEWZGWlJYySCTD6aKvbUDu+zbPeDakk3bg5H4XpitHukgfL1m9w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18.12" + }, + "peerDependencies": { + "typescript": ">=4.8.4" + } + }, "node_modules/tslib": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz", - "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==", + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", "dev": true, "license": "0BSD" }, "node_modules/tsx": { - "version": "4.19.0", - "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.19.0.tgz", - "integrity": "sha512-bV30kM7bsLZKZIOCHeMNVMJ32/LuJzLVajkQI/qf92J2Qr08ueLQvW00PUZGiuLPP760UINwupgUj8qrSCPUKg==", + "version": "4.19.2", + "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.19.2.tgz", + "integrity": "sha512-pOUl6Vo2LUq/bSa8S5q7b91cgNSjctn9ugq/+Mvow99qW6x/UZYwzxy/3NmqoT66eHYfCVvFvACC58UBPFf28g==", "dev": true, "license": "MIT", "dependencies": { @@ -18240,6 +19029,13 @@ "dev": true, "license": "MIT" }, + "node_modules/type": { + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/type/-/type-2.7.3.tgz", + "integrity": "sha512-8j+1QmAbPvLZow5Qpi6NCaN8FB60p/6x8/vfNqOk/hC+HuvFZhL4+WfekuhQLiqFZXOgQdrs3B+XxEmCc6b3FQ==", + "dev": true, + "license": "ISC" + }, "node_modules/type-check": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", @@ -18276,9 +19072,9 @@ } }, "node_modules/typescript": { - "version": "5.5.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", - "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", + "version": "5.7.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.3.tgz", + "integrity": "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==", "dev": true, "license": "Apache-2.0", "bin": { @@ -18303,62 +19099,18 @@ "dev": true, "license": "MIT" }, - "node_modules/unbzip2-stream": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz", - "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==", - "dev": true, - "license": "MIT", - "dependencies": { - "buffer": "^5.2.1", - "through": "^2.3.8" - } - }, - "node_modules/unbzip2-stream/node_modules/buffer": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", - "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", - "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" - } - ], - "license": "MIT", - "dependencies": { - "base64-js": "^1.3.1", - "ieee754": "^1.1.13" - } - }, - "node_modules/uncrypto": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/uncrypto/-/uncrypto-0.1.3.tgz", - "integrity": "sha512-Ql87qFHB3s/De2ClA9e0gsnS6zXG27SkTiSJwjCc9MebbfapQfuPzumMIUMi38ezPZVNFcHI9sUIepeQfw8J8Q==", - "dev": true, - "license": "MIT", - "optional": true - }, "node_modules/unctx": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/unctx/-/unctx-2.3.1.tgz", - "integrity": "sha512-PhKke8ZYauiqh3FEMVNm7ljvzQiph0Mt3GBRve03IJm7ukfaON2OBK795tLwhbyfzknuRRkW0+Ze+CQUmzOZ+A==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/unctx/-/unctx-2.4.1.tgz", + "integrity": "sha512-AbaYw0Nm4mK4qjhns67C+kgxR2YWiwlDBPzxrN8h8C6VtAdCgditAY5Dezu3IJy4XVqAnbrXt9oQJvsn3fyozg==", "dev": true, "license": "MIT", "optional": true, "dependencies": { - "acorn": "^8.8.2", + "acorn": "^8.14.0", "estree-walker": "^3.0.3", - "magic-string": "^0.30.0", - "unplugin": "^1.3.1" + "magic-string": "^0.30.17", + "unplugin": "^2.1.0" } }, "node_modules/unctx/node_modules/estree-walker": { @@ -18379,9 +19131,9 @@ "dev": true }, "node_modules/undici": { - "version": "6.19.8", - "resolved": "https://registry.npmjs.org/undici/-/undici-6.19.8.tgz", - "integrity": "sha512-U8uCCl2x9TK3WANvmBavymRzxbfFYG+tAu+fgx3zxQy3qdagQqBLwJVrdyO1TBfUXvfKveMKJZhpvUYoOjM+4g==", + "version": "6.21.1", + "resolved": "https://registry.npmjs.org/undici/-/undici-6.21.1.tgz", + "integrity": "sha512-q/1rj5D0/zayJB2FraXdaWxbhWiNKDvu8naDT2dl1yTlvJp4BLtOcp2a5BvgGNQpYYJzau7tf1WgKv3b+7mqpQ==", "dev": true, "license": "MIT", "engines": { @@ -18396,9 +19148,19 @@ "license": "MIT" }, "node_modules/unicode-canonical-property-names-ecmascript": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz", - "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.1.tgz", + "integrity": "sha512-dA8WbNeb2a6oQzAQ55YlT5vQAWGV9WXOsi3SskE3bcCdM0P4SDd+24zS/OCacdRq5BkdsRj9q3Pg6YyQoxIGqg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/unicode-emoji-modifier-base": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unicode-emoji-modifier-base/-/unicode-emoji-modifier-base-1.0.0.tgz", + "integrity": "sha512-yLSH4py7oFH3oG/9K+XWrz1pSi3dfUrWEnInbxMfArOfc1+33BlGPQtLsOYwvdMy11AwUBetYuaRxSPqgkq+8g==", "dev": true, "license": "MIT", "engines": { @@ -18430,9 +19192,9 @@ } }, "node_modules/unicode-match-property-value-ecmascript": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz", - "integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.2.0.tgz", + "integrity": "sha512-4IehN3V/+kkr5YeSSDDQG8QLqO26XpL2XP3GQtqwlT/QYSECAwFztxVHjlbh0+gjJ3XmNLS0zDsbgs9jWKExLg==", "dev": true, "license": "MIT", "engines": { @@ -18450,12 +19212,11 @@ } }, "node_modules/unicorn-magic": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.1.0.tgz", - "integrity": "sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==", + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.3.0.tgz", + "integrity": "sha512-+QBBXBCvifc56fsbuxZQ6Sic3wqqc3WWaqxs58gvJrcOuN83HGTCwz3oS5phzU9LthRNE9VrJCFCLUgHeeFnfA==", "dev": true, "license": "MIT", - "optional": true, "engines": { "node": ">=18" }, @@ -18464,26 +19225,27 @@ } }, "node_modules/unimport": { - "version": "3.11.1", - "resolved": "https://registry.npmjs.org/unimport/-/unimport-3.11.1.tgz", - "integrity": "sha512-DuB1Uoq01LrrXTScxnwOoMSlTXxyKcULguFxbLrMDFcE/CO0ZWHpEiyhovN0mycPt7K6luAHe8laqvwvuoeUPg==", + "version": "3.14.6", + "resolved": "https://registry.npmjs.org/unimport/-/unimport-3.14.6.tgz", + "integrity": "sha512-CYvbDaTT04Rh8bmD8jz3WPmHYZRG/NnvYVzwD6V1YAlvvKROlAeNDUBhkBGzNav2RKaeuXvlWYaa1V4Lfi/O0g==", "dev": true, "license": "MIT", "optional": true, "dependencies": { - "@rollup/pluginutils": "^5.1.0", - "acorn": "^8.12.1", + "@rollup/pluginutils": "^5.1.4", + "acorn": "^8.14.0", "escape-string-regexp": "^5.0.0", "estree-walker": "^3.0.3", - "fast-glob": "^3.3.2", - "local-pkg": "^0.5.0", - "magic-string": "^0.30.11", - "mlly": "^1.7.1", - "pathe": "^1.1.2", - "pkg-types": "^1.2.0", + "fast-glob": "^3.3.3", + "local-pkg": "^1.0.0", + "magic-string": "^0.30.17", + "mlly": "^1.7.4", + "pathe": "^2.0.1", + "picomatch": "^4.0.2", + "pkg-types": "^1.3.0", "scule": "^1.3.0", - "strip-literal": "^2.1.0", - "unplugin": "^1.12.2" + "strip-literal": "^2.1.1", + "unplugin": "^1.16.1" } }, "node_modules/unimport/node_modules/escape-string-regexp": { @@ -18512,15 +19274,15 @@ } }, "node_modules/unimport/node_modules/local-pkg": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.5.0.tgz", - "integrity": "sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-1.0.0.tgz", + "integrity": "sha512-bbgPw/wmroJsil/GgL4qjDzs5YLTBMQ99weRsok1XCDccQeehbHA/I1oRvk2NPtr7KGZgT/Y5tPRnAtMqeG2Kg==", "dev": true, "license": "MIT", "optional": true, "dependencies": { - "mlly": "^1.4.2", - "pkg-types": "^1.0.3" + "mlly": "^1.7.3", + "pkg-types": "^1.3.0" }, "engines": { "node": ">=14" @@ -18529,6 +19291,21 @@ "url": "https://github.com/sponsors/antfu" } }, + "node_modules/unimport/node_modules/unplugin": { + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-1.16.1.tgz", + "integrity": "sha512-4/u/j4FrCKdi17jaxuJA0jClGxB1AvU2hw/IuayPc4ay1XGaJs/rbb4v5WKwAjNifjmXK9PIFyuPiaK8azyR9w==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "acorn": "^8.14.0", + "webpack-virtual-modules": "^0.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, "node_modules/unique-filename": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz", @@ -18566,52 +19343,63 @@ } }, "node_modules/unplugin": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-1.13.1.tgz", - "integrity": "sha512-6Kq1iSSwg7KyjcThRUks9LuqDAKvtnioxbL9iEtB9ctTyBA5OmrB8gZd/d225VJu1w3UpUsKV7eGrvf59J7+VA==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-2.1.2.tgz", + "integrity": "sha512-Q3LU0e4zxKfRko1wMV2HmP8lB9KWislY7hxXpxd+lGx0PRInE4vhMBVEZwpdVYHvtqzhSrzuIfErsob6bQfCzw==", "dev": true, "license": "MIT", "optional": true, "dependencies": { - "acorn": "^8.12.1", + "acorn": "^8.14.0", "webpack-virtual-modules": "^0.6.2" }, "engines": { - "node": ">=14.0.0" - }, - "peerDependencies": { - "webpack-sources": "^3" - }, - "peerDependenciesMeta": { - "webpack-sources": { - "optional": true - } + "node": ">=18.12.0" } }, - "node_modules/untyped": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/untyped/-/untyped-1.4.2.tgz", - "integrity": "sha512-nC5q0DnPEPVURPhfPQLahhSTnemVtPzdx7ofiRxXpOB2SYnb3MfdU3DVGyJdS8Lx+tBWeAePO8BfU/3EgksM7Q==", + "node_modules/unplugin-utils": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/unplugin-utils/-/unplugin-utils-0.2.3.tgz", + "integrity": "sha512-unB2e2ogZwEoMw/X0Gq1vj2jaRKLmTh9wcSEJggESPllcrZI68uO7B8ykixbXqsSwG8r9T7qaHZudXIC/3qvhw==", "dev": true, "license": "MIT", "optional": true, "dependencies": { - "@babel/core": "^7.23.7", - "@babel/standalone": "^7.23.8", - "@babel/types": "^7.23.6", + "pathe": "^2.0.2", + "picomatch": "^4.0.2" + }, + "engines": { + "node": ">=18.12.0" + }, + "funding": { + "url": "https://github.com/sponsors/sxzz" + } + }, + "node_modules/untyped": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/untyped/-/untyped-1.5.2.tgz", + "integrity": "sha512-eL/8PlhLcMmlMDtNPKhyyz9kEBDS3Uk4yMu/ewlkT2WFbtzScjHWPJLdQLmaGPUKjXzwe9MumOtOgc4Fro96Kg==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "@babel/core": "^7.26.0", + "@babel/standalone": "^7.26.4", + "@babel/types": "^7.26.3", + "citty": "^0.1.6", "defu": "^6.1.4", - "jiti": "^1.21.0", - "mri": "^1.2.0", - "scule": "^1.2.0" + "jiti": "^2.4.1", + "knitwork": "^1.2.0", + "scule": "^1.3.0" }, "bin": { "untyped": "dist/cli.mjs" } }, "node_modules/update-browserslist-db": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz", - "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.2.tgz", + "integrity": "sha512-PPypAm5qvlD7XMZC3BujecnaOxwhrtoFR+Dqkk5Aa/6DssiH0ibKoketaj9w8LP7Bont1rYeoV5plxD7RTEPRg==", "dev": true, "funding": [ { @@ -18629,8 +19417,8 @@ ], "license": "MIT", "dependencies": { - "escalade": "^3.1.2", - "picocolors": "^1.0.1" + "escalade": "^3.2.0", + "picocolors": "^1.1.1" }, "bin": { "update-browserslist-db": "cli.js" @@ -18662,17 +19450,6 @@ "node": ">= 0.4" } }, - "node_modules/url-parse": { - "version": "1.5.10", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", - "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "querystringify": "^2.1.1", - "requires-port": "^1.0.0" - } - }, "node_modules/url-regex-safe": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/url-regex-safe/-/url-regex-safe-4.0.0.tgz", @@ -18710,10 +19487,11 @@ "license": "MIT" }, "node_modules/userhome": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/userhome/-/userhome-1.0.0.tgz", - "integrity": "sha512-ayFKY3H+Pwfy4W98yPdtH1VqH4psDeyW8lYYFzfecR9d6hqLpqhecktvYR3SEEXt7vG0S1JEpciI3g94pMErig==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/userhome/-/userhome-1.0.1.tgz", + "integrity": "sha512-5cnLm4gseXjAclKowC4IjByaGsjtAoV6PrOQOljplNB54ReUYJP8HdAFq2muHinSDAh09PPX/uXDPfdxRHvuSA==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.8.0" } @@ -18793,6 +19571,16 @@ "spdx-expression-parse": "^3.0.0" } }, + "node_modules/validate-npm-package-name": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz", + "integrity": "sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==", + "dev": true, + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, "node_modules/video-extensions": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/video-extensions/-/video-extensions-1.2.0.tgz", @@ -18807,9 +19595,9 @@ } }, "node_modules/vite": { - "version": "5.4.3", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.3.tgz", - "integrity": "sha512-IH+nl64eq9lJjFqU+/yrRnrHPVTlgy42/+IzbOdaFDVlyLgI/wDlf+FCobXLX1cT0X5+7LMyH1mIy2xJdLfo8Q==", + "version": "5.4.14", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.14.tgz", + "integrity": "sha512-EK5cY7Q1D8JNhSaPKVK4pwBFvaTmZxEnoKXLG/U9gmdDcihQGNzFlgIvaxezFR4glP1LsuiedwMBqCXH3wZccA==", "dev": true, "license": "MIT", "dependencies": { @@ -18867,29 +19655,28 @@ } }, "node_modules/vite-plugin-commonjs": { - "version": "0.10.1", - "resolved": "https://registry.npmjs.org/vite-plugin-commonjs/-/vite-plugin-commonjs-0.10.1.tgz", - "integrity": "sha512-taP8R9kYGlCW5OzkVR0UIWRCnG6rSxeWWuA7tnU5b9t5MniibOnDY219NhisTeDhJAeGT8cEnrhVWZ9A5yD+vg==", + "version": "0.10.4", + "resolved": "https://registry.npmjs.org/vite-plugin-commonjs/-/vite-plugin-commonjs-0.10.4.tgz", + "integrity": "sha512-eWQuvQKCcx0QYB5e5xfxBNjQKyrjEWZIR9UOkOV6JAgxVhtbZvCOF+FNC2ZijBJ3U3Px04ZMMyyMyFBVWIJ5+g==", "dev": true, "license": "MIT", "dependencies": { - "acorn": "^8.8.2", - "fast-glob": "^3.2.12", - "magic-string": "^0.30.1", - "vite-plugin-dynamic-import": "^1.5.0" + "acorn": "^8.12.1", + "magic-string": "^0.30.11", + "vite-plugin-dynamic-import": "^1.6.0" } }, "node_modules/vite-plugin-dynamic-import": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/vite-plugin-dynamic-import/-/vite-plugin-dynamic-import-1.5.0.tgz", - "integrity": "sha512-Qp85c+AVJmLa8MLni74U4BDiWpUeFNx7NJqbGZyR2XJOU7mgW0cb7nwlAMucFyM4arEd92Nfxp4j44xPi6Fu7g==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/vite-plugin-dynamic-import/-/vite-plugin-dynamic-import-1.6.0.tgz", + "integrity": "sha512-TM0sz70wfzTIo9YCxVFwS8OA9lNREsh+0vMHGSkWDTZ7bgd1Yjs5RV8EgB634l/91IsXJReg0xtmuQqP0mf+rg==", "dev": true, "license": "MIT", "dependencies": { - "acorn": "^8.8.2", - "es-module-lexer": "^1.2.1", - "fast-glob": "^3.2.12", - "magic-string": "^0.30.1" + "acorn": "^8.12.1", + "es-module-lexer": "^1.5.4", + "fast-glob": "^3.3.2", + "magic-string": "^0.30.11" } }, "node_modules/vite-plugin-istanbul": { @@ -19449,20 +20236,21 @@ } }, "node_modules/webdriver": { - "version": "9.0.8", - "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-9.0.8.tgz", - "integrity": "sha512-UnV0ANriSTUgypGk0pz8lApeQuHt+72WEDQG5hFwkkSvggtKLyWdT7+PQkNoXvDajTmiLIqUOq8XPI/Pm71rtw==", + "version": "9.7.3", + "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-9.7.3.tgz", + "integrity": "sha512-Mpi277WKw37Yg5xZ0MT2BcG/Q/5Y5reYA0wDXOMldVI1nLxA7eOzAvsBA8NpjPbi/+yZijZhNMrXRAtQ5Eu8NQ==", "dev": true, "license": "MIT", "dependencies": { "@types/node": "^20.1.0", "@types/ws": "^8.5.3", - "@wdio/config": "9.0.8", - "@wdio/logger": "9.0.8", - "@wdio/protocols": "9.0.8", - "@wdio/types": "9.0.8", - "@wdio/utils": "9.0.8", + "@wdio/config": "9.7.3", + "@wdio/logger": "9.4.4", + "@wdio/protocols": "9.7.0", + "@wdio/types": "9.6.3", + "@wdio/utils": "9.7.3", "deepmerge-ts": "^7.0.3", + "undici": "^6.20.1", "ws": "^8.8.0" }, "engines": { @@ -19470,27 +20258,27 @@ } }, "node_modules/webdriverio": { - "version": "9.0.9", - "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-9.0.9.tgz", - "integrity": "sha512-IwvKzhcJ9NjOL55xwj27uTTKkfxsg77dmAfqoKFSP5dQ70JzU+NgxiALEjjWQDybtt1yGIkHk7wjjxjboMU1uw==", + "version": "9.8.0", + "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-9.8.0.tgz", + "integrity": "sha512-30qTo27eNrqQTFGjzPYarAXD1aJ2fD5J+r+TUfLM3Ozlai6AuqbicLv4ysM8StfvN44jwyN+av/R3ul4SGaFjg==", "dev": true, "license": "MIT", "dependencies": { "@types/node": "^20.11.30", "@types/sinonjs__fake-timers": "^8.1.5", - "@wdio/config": "9.0.8", - "@wdio/logger": "9.0.8", - "@wdio/protocols": "9.0.8", - "@wdio/repl": "9.0.8", - "@wdio/types": "9.0.8", - "@wdio/utils": "9.0.8", + "@wdio/config": "9.7.3", + "@wdio/logger": "9.4.4", + "@wdio/protocols": "9.7.0", + "@wdio/repl": "9.4.4", + "@wdio/types": "9.6.3", + "@wdio/utils": "9.7.3", "archiver": "^7.0.1", "aria-query": "^5.3.0", "cheerio": "^1.0.0-rc.12", "css-shorthand-properties": "^1.1.1", "css-value": "^0.0.1", "grapheme-splitter": "^1.0.4", - "htmlfy": "^0.2.1", + "htmlfy": "^0.6.0", "import-meta-resolve": "^4.0.0", "is-plain-obj": "^4.1.0", "jszip": "^3.10.1", @@ -19502,7 +20290,7 @@ "rgb2hex": "0.2.5", "serialize-error": "^11.0.3", "urlpattern-polyfill": "^10.0.0", - "webdriver": "9.0.8" + "webdriver": "9.7.3" }, "engines": { "node": ">=18.20.0" @@ -19597,9 +20385,9 @@ } }, "node_modules/webdriverio/node_modules/domutils": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz", - "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.2.2.tgz", + "integrity": "sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==", "dev": true, "license": "BSD-2-Clause", "dependencies": { @@ -19660,6 +20448,33 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/webdriverio/node_modules/parse5": { + "version": "7.2.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.2.1.tgz", + "integrity": "sha512-BuBYQYlv1ckiPdQi/ohiivi9Sagc9JG+Ozs0r7b/0iK3sKmrb0b9FdWdBbOdx6hBCM/F9Ir82ofnBhtZOjCRPQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "entities": "^4.5.0" + }, + "funding": { + "url": "https://github.com/inikulin/parse5?sponsor=1" + } + }, + "node_modules/webdriverio/node_modules/parse5-htmlparser2-tree-adapter": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-7.1.0.tgz", + "integrity": "sha512-ruw5xyKs6lrpo9x9rCZqZZnIUntICjQAd0Wsmp396Ul9lN/h+ifgVV1x1gZHi8euej6wTfpqX8j+BFQxF0NS/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "domhandler": "^5.0.3", + "parse5": "^7.0.0" + }, + "funding": { + "url": "https://github.com/inikulin/parse5?sponsor=1" + } + }, "node_modules/webidl-conversions": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", @@ -19671,19 +20486,19 @@ } }, "node_modules/webpack": { - "version": "5.94.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz", - "integrity": "sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==", + "version": "5.97.1", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.97.1.tgz", + "integrity": "sha512-EksG6gFY3L1eFMROS/7Wzgrii5mBAFe4rIr3r2BTfo7bcc+DWwFZ4OJ/miOuHJO/A85HwyI4eQ0F6IKXesO7Fg==", "dev": true, "license": "MIT", "dependencies": { - "@types/estree": "^1.0.5", - "@webassemblyjs/ast": "^1.12.1", - "@webassemblyjs/wasm-edit": "^1.12.1", - "@webassemblyjs/wasm-parser": "^1.12.1", - "acorn": "^8.7.1", - "acorn-import-attributes": "^1.9.5", - "browserslist": "^4.21.10", + "@types/eslint-scope": "^3.7.7", + "@types/estree": "^1.0.6", + "@webassemblyjs/ast": "^1.14.1", + "@webassemblyjs/wasm-edit": "^1.14.1", + "@webassemblyjs/wasm-parser": "^1.14.1", + "acorn": "^8.14.0", + "browserslist": "^4.24.0", "chrome-trace-event": "^1.0.2", "enhanced-resolve": "^5.17.1", "es-module-lexer": "^1.2.1", @@ -19918,9 +20733,9 @@ } }, "node_modules/whatwg-url": { - "version": "14.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.0.0.tgz", - "integrity": "sha512-1lfMEm2IEr7RIV+f4lUNPOqfFL+pO+Xw3fJSqmjX9AbXcXcYOkCe1P6+9VBZB6n94af16NfZf+sSk0JCBZC9aw==", + "version": "14.1.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.1.0.tgz", + "integrity": "sha512-jlf/foYIKywAt3x/XWKZ/3rz8OSJPiWktjmk891alJUEjiVxKX9LEO92qH3hv4aJ0mN3MWPvGMCy8jQi95xK4w==", "dev": true, "license": "MIT", "dependencies": { @@ -19947,16 +20762,17 @@ } }, "node_modules/which-typed-array": { - "version": "1.1.15", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz", - "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==", + "version": "1.1.18", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.18.tgz", + "integrity": "sha512-qEcY+KJYlWyLH9vNbsr6/5j59AXk5ni5aakf8ldzBvGde6Iz4sxZGkJyWSAueTG7QhOvNRYb1lDdFmL5Td0QKA==", "dev": true, "license": "MIT", "dependencies": { "available-typed-arrays": "^1.0.7", - "call-bind": "^1.0.7", + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", "for-each": "^0.3.3", - "gopd": "^1.0.1", + "gopd": "^1.2.0", "has-tostringtag": "^1.0.2" }, "engines": { @@ -19967,102 +20783,15 @@ } }, "node_modules/whoops": { - "version": "4.1.7", - "resolved": "https://registry.npmjs.org/whoops/-/whoops-4.1.7.tgz", - "integrity": "sha512-weRPO7XE2Oko2/KQkddqvj6uAjLDOoiJdrXiE2ymgiV5Ugefi0/GJZPkeNr6OUUMfcqGAwUUPIZrG6UdSuBk2g==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/whoops/-/whoops-5.0.1.tgz", + "integrity": "sha512-H2sKu1asxnFE2mNUeRzNY0CQuvl+n6iyE6phvzOaBfZblItNKpC1EzKWy2Zx+woZ3qUFK/wbmmNiLeqXwzk+FA==", "dev": true, "license": "MIT", - "dependencies": { - "clean-stack": "~3.0.0", - "mimic-fn": "~3.1.0" - }, "engines": { "node": ">= 8" } }, - "node_modules/whoops/node_modules/clean-stack": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-3.0.1.tgz", - "integrity": "sha512-lR9wNiMRcVQjSB3a7xXGLuz4cr4wJuuXlaAEbRutGowQTmlp7R72/DOgN21e8jdwblMWl9UOJMJXarX94pzKdg==", - "dev": true, - "license": "MIT", - "dependencies": { - "escape-string-regexp": "4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/whoops/node_modules/mimic-fn": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.1.0.tgz", - "integrity": "sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/wide-align": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", - "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", - "dev": true, - "license": "ISC", - "dependencies": { - "string-width": "^1.0.2 || 2" - } - }, - "node_modules/wide-align/node_modules/ansi-regex": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz", - "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/wide-align/node_modules/is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/wide-align/node_modules/string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/wide-align/node_modules/strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/wildcard": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz", @@ -20090,9 +20819,9 @@ } }, "node_modules/workerpool": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.0.tgz", - "integrity": "sha512-toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg==", + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz", + "integrity": "sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==", "dev": true, "license": "Apache-2.0" }, @@ -20130,45 +20859,27 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, - "node_modules/wrap-ansi-cjs/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, - "license": "MIT" - }, - "node_modules/wrap-ansi-cjs/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==", + "node_modules/wrap-ansi-cjs/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, "license": "MIT", "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" + "ansi-regex": "^5.0.1" }, "engines": { "node": ">=8" } }, - "node_modules/wrap-ansi/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, - "license": "MIT" - }, - "node_modules/wrap-ansi/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==", + "node_modules/wrap-ansi/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, "license": "MIT", "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" + "ansi-regex": "^5.0.1" }, "engines": { "node": ">=8" @@ -20241,16 +20952,16 @@ } }, "node_modules/yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true, "license": "ISC" }, "node_modules/yaml": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.5.1.tgz", - "integrity": "sha512-bLQOjaX/ADgQ20isPJRvF0iRUHIxVhYvr53Of7wGcWlO2jvtUlH5m87DsmulFVxRpNLOnI4tB6p/oh8D7kpn9Q==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.7.0.tgz", + "integrity": "sha512-+hSoy/QHluxmC9kCIJyL/uyFmLmc+e5CFR5Wa+bpIhIj85LVb9ZH2nVnqrHoSvKogwODv0ClqZkmiSSaIH5LTA==", "dev": true, "license": "ISC", "bin": { @@ -20372,28 +21083,6 @@ "node": ">=8" } }, - "node_modules/yargs/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, - "license": "MIT" - }, - "node_modules/yargs/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, - "license": "MIT", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/yargs/node_modules/yargs-parser": { "version": "21.1.1", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", @@ -20641,9 +21330,9 @@ } }, "node_modules/zip-stream/node_modules/readable-stream": { - "version": "4.5.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.5.2.tgz", - "integrity": "sha512-yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g==", + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.7.0.tgz", + "integrity": "sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==", "dev": true, "license": "MIT", "dependencies": { @@ -20658,9 +21347,9 @@ } }, "node_modules/zod": { - "version": "3.23.8", - "resolved": "https://registry.npmjs.org/zod/-/zod-3.23.8.tgz", - "integrity": "sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==", + "version": "3.24.1", + "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.1.tgz", + "integrity": "sha512-muH7gBL9sI1nciMZV67X5fTKKBLtwpZ5VBp1vsOQzj1MhrBZ4wlVCm3gedKZWLp0Oyel8sIGfeiz54Su+OVT+A==", "dev": true, "license": "MIT", "funding": { @@ -20668,9 +21357,9 @@ } }, "node_modules/zod-validation-error": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/zod-validation-error/-/zod-validation-error-3.3.1.tgz", - "integrity": "sha512-uFzCZz7FQis256dqw4AhPQgD6f3pzNca/Zh62RNELavlumQB3nDIUFbF5JQfFLcMbO1s02Q7Xg/gpcOBlEnYZA==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/zod-validation-error/-/zod-validation-error-3.4.0.tgz", + "integrity": "sha512-ZOPR9SVY6Pb2qqO5XHt+MkkTRxGXb4EVtnjc9JpXUOtUB1T9Ru7mZOT361AN3MsetVe7R0a1KZshJDZdgp9miQ==", "dev": true, "license": "MIT", "engines": { @@ -20688,11 +21377,24 @@ "@eslint-community/eslint-plugin-eslint-comments": "^4.3.0", "@eslint/js": "^9.0.0", "eslint-plugin-jsdoc": "^48.2.3", - "eslint-plugin-n": "^17.2.0", + "eslint-plugin-n": "^17.11.1", "eslint-plugin-unicorn": "^52.0.0" }, + "devDependencies": { + "@arethetypeswrong/cli": "^0.17.0", + "eslint": "^9.16.0", + "typescript": "^5.7.2" + }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "peerDependencies": { + "eslint": "^9.10.0" + }, + "peerDependenciesMeta": { + "eslint": { + "optional": true + } } } } diff --git a/pkgs/by-name/es/eslint/package.nix b/pkgs/by-name/es/eslint/package.nix index 80e37e956e8f..efa2ae05cc2e 100644 --- a/pkgs/by-name/es/eslint/package.nix +++ b/pkgs/by-name/es/eslint/package.nix @@ -12,13 +12,13 @@ let in buildNpmPackage' rec { pname = "eslint"; - version = "9.10.0"; + version = "9.20.0"; src = fetchFromGitHub { owner = "eslint"; repo = "eslint"; tag = "v${version}"; - hash = "sha256-R5DO4xN3PkwGAIfyMkohs9SvFiLjWf1ddOwkY6wbsjA="; + hash = "sha256-ahERh5Io2J/Uz9fgY875ldPtzjiasqxZ0ppINwYNoB4="; }; # NOTE: Generating lock-file @@ -30,11 +30,16 @@ buildNpmPackage' rec { cp ${./package-lock.json} package-lock.json ''; - npmDepsHash = "sha256-Nrcld0ONfjdSh/ItdbDMp6dXVFKoj83aaoGXDgoNE60="; + npmDepsHash = "sha256-F3EUANBvniczR7QxNfo1LlksYPxXt16uqJDFzN6u64Y="; dontNpmBuild = true; dontNpmPrune = true; + postFixup = '' + # Remove broken symlink + rm $out/lib/node_modules/eslint/node_modules/eslint-config-eslint + ''; + meta = { description = "Find and fix problems in your JavaScript code"; homepage = "https://eslint.org"; From aa8f0c3da23ffd3481a38dedd3759d2159bb3963 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 10 Feb 2025 11:08:03 +0100 Subject: [PATCH 0912/2168] linux_testing: 6.14-rc1 -> 6.14-rc2 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 0b92473ba772..8078336c484f 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,7 +1,7 @@ { "testing": { - "version": "6.14-rc1", - "hash": "sha256:0schcgij7kdzj0zb6g3sjf32mq7s388hysrfzjzi5g1y3py21igk" + "version": "6.14-rc2", + "hash": "sha256:1i7zxjz0vckl31cb6anb0b9m0k7l3y2gk6r5y6in41p8mjf4rrpk" }, "6.1": { "version": "6.1.128", From 4ae67c716e56ba9e5dea42d91aae780b488dd254 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 10 Feb 2025 11:08:29 +0100 Subject: [PATCH 0913/2168] linux_latest-libre: 19707 -> 19712 --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 6dcf421c690f..f7892fb572c5 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -5,8 +5,8 @@ linux, scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "19707"; - sha256 = "1ixvavd9rhhwfnyvkdnyyjwckdijh02xppl0sjv1vw9i0jn1s1l2"; + rev = "19712"; + sha256 = "0km2iaicrz17ahklcjcmbjq87bfrcjj0ynsyi7jnwp0l9n95i8jc"; }, ... }@args: From 3f50bc0a4eac6630bbaf5d262a55f8296cfc0eba Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 10 Feb 2025 10:26:28 +0000 Subject: [PATCH 0914/2168] vimPlugins.mini-nvim: reduce closure size Before: ``` $ du -csh result/* 36K result/CHANGELOG.md 8.0K result/CODE_OF_CONDUCT.md 16K result/CONTRIBUTING.md 4.0K result/LICENSE 16K result/MAINTAINING.md 4.0K result/Makefile 20K result/README.md 36K result/TESTING.md 56K result/benchmarks 12K result/colors 1.1M result/doc 4.0K result/logo.png 2.4M result/lua 416K result/readmes 52K result/scripts 11M result/tests 15M total ``` After: ``` $ du -csh result/* 36K result/CHANGELOG.md 8.0K result/CODE_OF_CONDUCT.md 16K result/CONTRIBUTING.md 4.0K result/LICENSE 16K result/MAINTAINING.md 20K result/README.md 36K result/TESTING.md 12K result/colors 1.1M result/doc 4.0K result/logo.png 2.4M result/lua 3.6M total ``` --- pkgs/applications/editors/vim/plugins/overrides.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index b3e19e320ec4..7da6df0bdb35 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1761,6 +1761,13 @@ in dependencies = [ self.plenary-nvim ]; }; + mini-nvim = super.mini-nvim.overrideAttrs { + # reduce closure size + postInstall = '' + rm -rf $out/{Makefile,benchmarks,readmes,tests,scripts} + ''; + }; + git-conflict-nvim = super.git-conflict-nvim.overrideAttrs { # TODO: Remove after next fixed version # https://github.com/akinsho/git-conflict.nvim/issues/103 From d0e8b2ea0c5c683b48307d985aa87deaec588106 Mon Sep 17 00:00:00 2001 From: eyjhb Date: Sun, 9 Feb 2025 10:23:12 +0100 Subject: [PATCH 0915/2168] authelia: move web to arguments as authelia-web --- pkgs/servers/authelia/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/authelia/default.nix b/pkgs/servers/authelia/default.nix index 2c49c09b0550..364060ca90d2 100644 --- a/pkgs/servers/authelia/default.nix +++ b/pkgs/servers/authelia/default.nix @@ -7,6 +7,7 @@ installShellFiles, callPackage, nixosTests, + authelia-web ? callPackage ./web.nix { inherit nodejs pnpm fetchFromGitHub; }, }: let @@ -16,7 +17,8 @@ let src vendorHash ; - web = callPackage ./web.nix { inherit nodejs pnpm fetchFromGitHub; }; + + web = authelia-web; in buildGoModule rec { inherit From 9d735ba602b694b51832f5f4c0899cc798d472fa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 11:41:14 +0000 Subject: [PATCH 0916/2168] python312Packages.microsoft-kiota-serialization-text: 1.9.1 -> 1.9.2 --- .../microsoft-kiota-serialization-text/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix index b3ef5a841445..2fbc2c6212f6 100644 --- a/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "microsoft-kiota-serialization-text"; - version = "1.9.1"; + version = "1.9.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "kiota-python"; tag = "microsoft-kiota-serialization-text-v${version}"; - hash = "sha256-ESRnI8prXG1h5H5RVD4eOQ1sQYSEMMLVHSk8yhzFGVw="; + hash = "sha256-ribVfvKmDMxGmeqj30SDcnbNGdRBfs1DmqQGXP3EHCk="; }; sourceRoot = "source/packages/serialization/text/"; @@ -45,7 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Text serialization implementation for Kiota generated clients in Python"; homepage = "https://github.com/microsoft/kiota-python/tree/main/packages/serialization/text"; - changelog = "https://github.com/microsoft/kiota-python/releases/tag/microsoft-kiota-serialization-text-v${version}"; + changelog = "https://github.com/microsoft/kiota-python/releases/tag/microsoft-kiota-serialization-text-${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From 40e73443881e577305d560fc9dfae5a18dcaed86 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Sun, 9 Feb 2025 23:20:53 +0100 Subject: [PATCH 0917/2168] nixos/sway: restore list type of xdg.portal.config.sway.default This fixes a regression introduced in #348792, where the option type was changed from list to string. This commit reverts the type back to list. Fixes #352188 Closes #352193 --- nixos/modules/programs/wayland/sway.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/programs/wayland/sway.nix b/nixos/modules/programs/wayland/sway.nix index 83fc3825b819..8a068664c366 100644 --- a/nixos/modules/programs/wayland/sway.nix +++ b/nixos/modules/programs/wayland/sway.nix @@ -159,7 +159,7 @@ in # https://github.com/emersion/xdg-desktop-portal-wlr/pull/315 xdg.portal.config.sway = { # Use xdg-desktop-portal-gtk for every portal interface... - default = "gtk"; + default = [ "gtk" ]; # ... except for the ScreenCast, Screenshot and Secret "org.freedesktop.impl.portal.ScreenCast" = "wlr"; "org.freedesktop.impl.portal.Screenshot" = "wlr"; From 95e123c78346d0d483c2d2b3d968fbe559e03acb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Feb 2025 11:50:07 +0000 Subject: [PATCH 0918/2168] build(deps): bump actions/create-github-app-token from 1.11.1 to 1.11.3 Bumps [actions/create-github-app-token](https://github.com/actions/create-github-app-token) from 1.11.1 to 1.11.3. - [Release notes](https://github.com/actions/create-github-app-token/releases) - [Commits](https://github.com/actions/create-github-app-token/compare/c1a285145b9d317df6ced56c09f525b5c2b6f755...67e27a7eb7db372a1c61a7f9bdab8699e9ee57f7) --- updated-dependencies: - dependency-name: actions/create-github-app-token dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/backport.yml | 2 +- .github/workflows/codeowners-v2.yml | 4 ++-- .github/workflows/eval.yml | 2 +- .github/workflows/periodic-merge.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 8e95a9a21a97..7f4b38f06f2a 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -19,7 +19,7 @@ jobs: steps: # Use a GitHub App to create the PR so that CI gets triggered # The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs - - uses: actions/create-github-app-token@c1a285145b9d317df6ced56c09f525b5c2b6f755 # v1.11.1 + - uses: actions/create-github-app-token@67e27a7eb7db372a1c61a7f9bdab8699e9ee57f7 # v1.11.3 id: app-token with: app-id: ${{ vars.NIXPKGS_CI_APP_ID }} diff --git a/.github/workflows/codeowners-v2.yml b/.github/workflows/codeowners-v2.yml index a7afd41589f5..19bfdd4f9f79 100644 --- a/.github/workflows/codeowners-v2.yml +++ b/.github/workflows/codeowners-v2.yml @@ -63,7 +63,7 @@ jobs: - name: Build codeowners validator run: nix-build base/ci -A codeownersValidator - - uses: actions/create-github-app-token@c1a285145b9d317df6ced56c09f525b5c2b6f755 # v1.11.1 + - uses: actions/create-github-app-token@67e27a7eb7db372a1c61a7f9bdab8699e9ee57f7 # v1.11.3 id: app-token with: app-id: ${{ vars.OWNER_RO_APP_ID }} @@ -96,7 +96,7 @@ jobs: # This is intentional, because we need to request the review of owners as declared in the base branch. - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - uses: actions/create-github-app-token@c1a285145b9d317df6ced56c09f525b5c2b6f755 # v1.11.1 + - uses: actions/create-github-app-token@67e27a7eb7db372a1c61a7f9bdab8699e9ee57f7 # v1.11.3 id: app-token with: app-id: ${{ vars.OWNER_APP_ID }} diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index abf9b7c33704..a9fecb67b645 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -241,7 +241,7 @@ jobs: steps: # See ./codeowners-v2.yml, reuse the same App because we need the same permissions # Can't use the token received from permissions above, because it can't get enough permissions - - uses: actions/create-github-app-token@c1a285145b9d317df6ced56c09f525b5c2b6f755 # v1.11.1 + - uses: actions/create-github-app-token@67e27a7eb7db372a1c61a7f9bdab8699e9ee57f7 # v1.11.3 id: app-token with: app-id: ${{ vars.OWNER_APP_ID }} diff --git a/.github/workflows/periodic-merge.yml b/.github/workflows/periodic-merge.yml index 91ab0b25f146..12c6907f95e6 100644 --- a/.github/workflows/periodic-merge.yml +++ b/.github/workflows/periodic-merge.yml @@ -19,7 +19,7 @@ jobs: steps: # Use a GitHub App to create the PR so that CI gets triggered # The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs - - uses: actions/create-github-app-token@c1a285145b9d317df6ced56c09f525b5c2b6f755 # v1.11.1 + - uses: actions/create-github-app-token@67e27a7eb7db372a1c61a7f9bdab8699e9ee57f7 # v1.11.3 id: app-token with: app-id: ${{ vars.NIXPKGS_CI_APP_ID }} From 9f49de26057c35d916d4745dcba546f4355f3336 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 9 Feb 2025 10:34:04 +0000 Subject: [PATCH 0919/2168] xfce.xfce4-settings: 4.20.0 -> 4.20.1 https://gitlab.xfce.org/xfce/xfce4-settings/-/compare/xfce4-settings-4.20.0..xfce4-settings-4.20.1 --- pkgs/desktops/xfce/core/xfce4-settings/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/core/xfce4-settings/default.nix b/pkgs/desktops/xfce/core/xfce4-settings/default.nix index 53b026f8be4d..5e3713dc7393 100644 --- a/pkgs/desktops/xfce/core/xfce4-settings/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-settings/default.nix @@ -7,6 +7,8 @@ , gtk-layer-shell , glib , libnotify +, libX11 +, libXext , libxfce4ui , libxfce4util , libxklavier @@ -24,9 +26,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-settings"; - version = "4.20.0"; + version = "4.20.1"; - sha256 = "sha256-0fMuAucyxLr2VzQqAB0CL+HgkHNJctiVNZmUmTNzaPc="; + sha256 = "sha256-9BFO1cN0etDHJzkGHl5GKL2qzJTlpaP/qfvfz6KWaMI="; nativeBuildInputs = [ wayland-scanner @@ -39,6 +41,8 @@ mkXfceDerivation { gtk3 gtk-layer-shell libnotify + libX11 + libXext libxfce4ui libxfce4util libxklavier From d7c3d614aa7bb587d39939eaec260057b09ec7cd Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 10 Feb 2025 12:22:53 +0000 Subject: [PATCH 0920/2168] xfce.thunar: 4.20.1 -> 4.20.2 https://gitlab.xfce.org/xfce/thunar/-/compare/thunar-4.20.1...thunar-4.20.2 --- pkgs/desktops/xfce/core/thunar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/core/thunar/default.nix b/pkgs/desktops/xfce/core/thunar/default.nix index 23e6799845ca..c18dec46b46c 100644 --- a/pkgs/desktops/xfce/core/thunar/default.nix +++ b/pkgs/desktops/xfce/core/thunar/default.nix @@ -23,9 +23,9 @@ let unwrapped = mkXfceDerivation { category = "xfce"; pname = "thunar"; - version = "4.20.1"; + version = "4.20.2"; - sha256 = "sha256-+Iz9tkP8foEtor1HFBB1/fyMXdLm3mXCoP9j9bug8po="; + sha256 = "sha256-tuINIJ5r1BXAUJxlmLiYe2z3AFGkXqbITJBskSx5D4s="; nativeBuildInputs = [ docbook_xsl From 1e448535a76f848dbe14a10594203ed5b835265c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 12:33:27 +0000 Subject: [PATCH 0921/2168] bdf2psf: 1.233 -> 1.234 --- pkgs/by-name/bd/bdf2psf/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bd/bdf2psf/package.nix b/pkgs/by-name/bd/bdf2psf/package.nix index b5f4f7bb5146..4a36ba4d0e67 100644 --- a/pkgs/by-name/bd/bdf2psf/package.nix +++ b/pkgs/by-name/bd/bdf2psf/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "bdf2psf"; - version = "1.233"; + version = "1.234"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "sha256-DCP8kswoc/zQqf+C/S41f6LyuxoAkG39Oi5y9A56S3k="; + sha256 = "sha256-NML5KphZqTko6ez6NaTEXvbA1D9saPBYKGk8TD/HvRc="; }; nativeBuildInputs = [ dpkg ]; From 121aad353d069a7b720b0d7f83618880e73e85b8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 12:40:35 +0000 Subject: [PATCH 0922/2168] cloudlist: 1.1.0 -> 1.2.0 --- pkgs/by-name/cl/cloudlist/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cl/cloudlist/package.nix b/pkgs/by-name/cl/cloudlist/package.nix index 18fb694db7e0..0a7738c20a61 100644 --- a/pkgs/by-name/cl/cloudlist/package.nix +++ b/pkgs/by-name/cl/cloudlist/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "cloudlist"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "cloudlist"; tag = "v${version}"; - hash = "sha256-HV4qhQgeLKwkyrRFzRQibqjWRyjLBtoWVdliJ+iyyBc="; + hash = "sha256-6XgqhCL8ehK8k3k8fKLFZSmUz8G3MwqXhjEpA99F0K4="; }; - vendorHash = "sha256-6J9AWONLP/FvR0dXt5Zx4n+kTpmnxF79HcWVFp9OZ0g="; + vendorHash = "sha256-4vR03dC8ZfBM7Jw3JqGxZ/DGxfTx8279j7CzSOQKPkQ="; subPackages = [ "cmd/cloudlist/" ]; From 15fdb273b8f523e0742dd2a898713833ac549296 Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Mon, 10 Feb 2025 10:00:32 +0100 Subject: [PATCH 0923/2168] coq: align rocq-core version on overrides --- pkgs/applications/science/logic/coq/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 895d3fb2c9bf..fe8e77b1f1c3 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -95,6 +95,7 @@ let self = stdenv.mkDerivation { pname = "coq"; inherit (fetched) version src; + exact-version = args.version; passthru = { inherit coq-version; @@ -233,7 +234,8 @@ self = stdenv.mkDerivation { }; in if coqAtLeast "8.21" then self.overrideAttrs(o: { # coq-core is now a shim for rocq - propagatedBuildInputs = o.propagatedBuildInputs ++ [ rocq-core ]; + propagatedBuildInputs = o.propagatedBuildInputs + ++ [ (rocq-core.override { version = o.exact-version; }) ]; buildPhase = '' runHook preBuild dune build -p coq-core,coqide-server${lib.optionalString buildIde ",rocqide"} -j $NIX_BUILD_CORES From ac1ae5809bcaf713171de2c40afd75b8af0ec630 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 12:43:16 +0000 Subject: [PATCH 0924/2168] erofs-utils: 1.8.4 -> 1.8.5 --- pkgs/by-name/er/erofs-utils/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/er/erofs-utils/package.nix b/pkgs/by-name/er/erofs-utils/package.nix index 05968132a811..a544e91ec41b 100644 --- a/pkgs/by-name/er/erofs-utils/package.nix +++ b/pkgs/by-name/er/erofs-utils/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "erofs-utils"; - version = "1.8.4"; + version = "1.8.5"; outputs = [ "out" "man" @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/erofs-utils-${finalAttrs.version}.tar.gz"; - hash = "sha256-eRWHqgdLufn6IYx2LMH2CwFeL1G8ss6R9oLwQ4VqtJQ="; + hash = "sha256-zYYRJw6chv4GL2RxA8pq2p7XEORDD91ZYNUUd3kZIA0="; }; nativeBuildInputs = [ From c8c2d50415ce3531ba55494e8d424d53134c83a6 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 10 Feb 2025 14:06:47 +0100 Subject: [PATCH 0925/2168] ruff: 0.9.5 -> 0.9.6 Diff: https://github.com/astral-sh/ruff/compare/refs/tags/0.9.5...0.9.6 Changelog: https://github.com/astral-sh/ruff/releases/tag/0.9.6 --- pkgs/by-name/ru/ruff/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix index e1a6077365c0..86ab891ee860 100644 --- a/pkgs/by-name/ru/ruff/package.nix +++ b/pkgs/by-name/ru/ruff/package.nix @@ -17,17 +17,17 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.9.5"; + version = "0.9.6"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; tag = version; - hash = "sha256-VoYV13GsTaAWoLcSfuadLR2l8Xbn0MEd/Uh9EP/DgjE="; + hash = "sha256-xKlvj+8ox5UdkH3s9IOIMOVPCDQMLnGUKDOhKAZZgg4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-d6fLVmg7mbCQqDiNeXRwGHc/a0+RYlmqnkyiUJuM8xY="; + cargoHash = "sha256-m9U4OFefSumTT6heNz4qOdRBhsJvP3wcXeZcMVD+NqA="; nativeBuildInputs = [ installShellFiles ]; From feedcd9238c611513ffc2605101c27c20a4cf636 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 13:11:53 +0000 Subject: [PATCH 0926/2168] goat-cli: 1.3.0 -> 1.4.0 --- pkgs/by-name/go/goat-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/goat-cli/package.nix b/pkgs/by-name/go/goat-cli/package.nix index 36776314d6b7..3a2fc296436a 100644 --- a/pkgs/by-name/go/goat-cli/package.nix +++ b/pkgs/by-name/go/goat-cli/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "goat-cli"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { repo = "goat"; owner = "studio-b12"; rev = "v${version}"; - hash = "sha256-g5iS0XCRv97uX45BMqyFNodjjZ3Q9OeMJXAdsPwLCEg="; + hash = "sha256-7inoRBVR7zmt0jUFAGYjoYT2cdda0qgzyXLL+GiBFMg="; }; - vendorHash = "sha256-MOsxM8CSjK5j/guEwRFWHZ4+gdAHa5txVXw67jzwyLQ="; + vendorHash = "sha256-b/v27pHA9LcFe4TC/EpelJVSkAg4sq7b8p2gk0bWsQc="; ldflags = [ "-s" From b6e7bcd8ceb8220a7b5e36ec7af58db8ed1bc7b6 Mon Sep 17 00:00:00 2001 From: Adminy <22717869+adminy@users.noreply.github.com> Date: Mon, 10 Feb 2025 13:13:39 +0000 Subject: [PATCH 0927/2168] colloid-icon-theme: 2024-10-18 -> 2025-02-09 --- pkgs/by-name/co/colloid-icon-theme/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/colloid-icon-theme/package.nix b/pkgs/by-name/co/colloid-icon-theme/package.nix index 3b2ea4b9987a..03b93d6848cd 100644 --- a/pkgs/by-name/co/colloid-icon-theme/package.nix +++ b/pkgs/by-name/co/colloid-icon-theme/package.nix @@ -44,13 +44,13 @@ lib.checkListOfEnum "${pname}: scheme variants" stdenvNoCC.mkDerivation rec { inherit pname; - version = "2024-10-18"; + version = "2025-02-09"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - hash = "sha256-xpRgOt/FqZSbtOlZKlZS1ILQn6OAwqKAXX3hj41Wo+0="; + hash = "sha256-x2SSaIkKm1415avO7R6TPkpghM30HmMdjMFUUyPWZsk="; }; nativeBuildInputs = [ From 8e260adb6d42ff196366652e2bba994d53c9e9d3 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 10 Feb 2025 07:15:41 +0100 Subject: [PATCH 0928/2168] ocamlPackages.shell: disable tests of version 0.15 --- pkgs/development/ocaml-modules/janestreet/0.15.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/ocaml-modules/janestreet/0.15.nix b/pkgs/development/ocaml-modules/janestreet/0.15.nix index ddb4c3a1f8dc..49c28ae5381b 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.15.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.15.nix @@ -1276,6 +1276,7 @@ with self; buildInputs = [ jst-config ]; propagatedBuildInputs = [ textutils ]; checkInputs = [ ounit ]; + doCheck = false; # Does not build with GCC 14 }; shexp = janePackage { From 76320c89a8dca7477bd8e0ff9d4eae4eaf14752c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 10 Feb 2025 07:15:46 +0100 Subject: [PATCH 0929/2168] ocamlPackages.async_ssl: fix build of version 0.16.1 --- pkgs/development/ocaml-modules/janestreet/0.16.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/ocaml-modules/janestreet/0.16.nix b/pkgs/development/ocaml-modules/janestreet/0.16.nix index 30aa920fff24..74e8b2c9a62a 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.16.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.16.nix @@ -191,6 +191,10 @@ with self; version = "0.16.1"; pname = "async_ssl"; hash = "sha256-83YKxvVb/JwBnQG4R/R1Ztik9T/hO4cbiNTfFnErpG4="; + patches = fetchpatch { + url = "https://raw.githubusercontent.com/ocaml/opam-source-archives/d7f046579bfc7cfe77ce12f57fd11c206e7e9f30/patches/async_ssl/no-incompatible-pointer-types-0161.patch"; + hash = "sha256-NcQX9eZ97kaQCOVAuYgR8NlFD3ZrGbT/2QqCjYf9Xnw="; + }; meta.description = "Async wrappers for SSL"; buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ From 49e10c7b806b7fe9bdc8941fa29d2167238a9156 Mon Sep 17 00:00:00 2001 From: PerchunPak Date: Mon, 10 Feb 2025 11:22:26 +0100 Subject: [PATCH 0930/2168] luaPackages.nvim-dbee: init at 0.1.9-1 --- maintainers/scripts/luarocks-packages.csv | 1 + .../editors/vim/plugins/overrides.nix | 35 +------------------ .../lua-modules/generated-packages.nix | 23 ++++++++++++ 3 files changed, 25 insertions(+), 34 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 0ad3a2ee1d4b..8a973374a1a3 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -121,6 +121,7 @@ neotest,,,,,,mrcjkb nlua,,,,,,teto nui.nvim,,,,,,mrcjkb nvim-cmp,https://raw.githubusercontent.com/hrsh7th/nvim-cmp/main/nvim-cmp-scm-1.rockspec,,,,, +nvim-dbee,,,,,,perchun nvim-nio,,,,,,mrcjkb orgmode,,,,,, papis-nvim,,,,,,GaetanLepage diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index b3e19e320ec4..f738ddf52051 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -2396,40 +2396,6 @@ in passthru.python3Dependencies = [ python3.pkgs.mwclient ]; }; - nvim-dbee = super.nvim-dbee.overrideAttrs ( - oa: - let - dbee-go = buildGoModule { - name = "nvim-dbee"; - src = "${oa.src}/dbee"; - vendorHash = "sha256-U/3WZJ/+Bm0ghjeNUILsnlZnjIwk3ySaX3Rd4L9Z62A="; - buildInputs = [ - arrow-cpp - duckdb - ]; - }; - in - { - dependencies = [ self.nui-nvim ]; - - # nvim-dbee looks for the go binary in paths returned bu M.dir() and M.bin() defined in lua/dbee/install/init.lua - postPatch = '' - substituteInPlace lua/dbee/install/init.lua \ - --replace-fail 'return vim.fn.stdpath("data") .. "/dbee/bin"' 'return "${dbee-go}/bin"' - ''; - - preFixup = '' - mkdir $target/bin - ln -s ${dbee-go}/bin/dbee $target/bin/dbee - ''; - - meta.platforms = lib.platforms.linux; - } - ); - - nvim-impairative = super.nvim-impairative.overrideAttrs { - }; - nvim-navic = super.nvim-navic.overrideAttrs { dependencies = [ self.nvim-lspconfig ]; }; @@ -4040,6 +4006,7 @@ in "neotest" "nui-nvim" "nvim-cmp" + "nvim-dbee" "nvim-nio" "orgmode" "papis-nvim" diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 391fed541767..9c78f7931a36 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -2884,6 +2884,29 @@ buildLuarocksPackage { }; }) {}; +nvim-dbee = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, nui-nvim }: +buildLuarocksPackage { + pname = "nvim-dbee"; + version = "0.1.9-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/nvim-dbee-0.1.9-1.rockspec"; + sha256 = "1lmzy6ivnwvhzclkfbcswj2mznrpc4i8s3ivdrc78rr86i49mvpg"; + }).outPath; + src = fetchzip { + url = "https://github.com/kndndrj/nvim-dbee/archive/v0.1.9.zip"; + sha256 = "10xplksglyd8af8q1cl2lxcpn52b766g87gva9fd3l66idxsds00"; + }; + + disabled = luaOlder "5.1"; + propagatedBuildInputs = [ nui-nvim ]; + + meta = { + homepage = "https://github.com/kndndrj/nvim-dbee"; + description = "Interactive database client for neovim"; + license.fullName = "GPL-3.0"; + }; +}) {}; + nvim-nio = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "nvim-nio"; From 259b7b53f4af3a382840fa4c4057ec935408a555 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 10 Feb 2025 14:18:39 +0100 Subject: [PATCH 0931/2168] python312Packages.ruff-lsp: 0.0.61 -> 0.0.62 Diff: https://github.com/astral-sh/ruff-lsp/compare/refs/tags/v0.0.61...v0.0.62 Changelog: https://github.com/astral-sh/ruff-lsp/releases/tag/v0.0.62 --- pkgs/by-name/ru/ruff-lsp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ru/ruff-lsp/package.nix b/pkgs/by-name/ru/ruff-lsp/package.nix index e29469ca5c82..7b6bdc411aa8 100644 --- a/pkgs/by-name/ru/ruff-lsp/package.nix +++ b/pkgs/by-name/ru/ruff-lsp/package.nix @@ -12,14 +12,14 @@ python3Packages.buildPythonApplication rec { pname = "ruff-lsp"; - version = "0.0.61"; + version = "0.0.62"; pyproject = true; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff-lsp"; tag = "v${version}"; - hash = "sha256-gyrmustYJAwjO7YbBl76f/IvcEy2ffb9Se7idcyxsYg="; + hash = "sha256-aYhNvT4rcaEzuqwql7TpFkCoyH77uSG7r6uY5aIzhrk="; }; build-system = with python3Packages; [ hatchling ]; From 7b925c96f925402bdfd529bf70d734c61444ed76 Mon Sep 17 00:00:00 2001 From: PerchunPak Date: Mon, 10 Feb 2025 14:21:27 +0100 Subject: [PATCH 0932/2168] python3Packages.nixpkgs-updaters-library: 1.0.2 -> 1.1.0 --- .../python-modules/nixpkgs-updaters-library/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nixpkgs-updaters-library/default.nix b/pkgs/development/python-modules/nixpkgs-updaters-library/default.nix index 358c69181139..b4f706a4deae 100644 --- a/pkgs/development/python-modules/nixpkgs-updaters-library/default.nix +++ b/pkgs/development/python-modules/nixpkgs-updaters-library/default.nix @@ -29,7 +29,7 @@ }: buildPythonPackage rec { pname = "nixpkgs-updaters-library"; - version = "1.0.2"; + version = "1.1.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "PerchunPak"; repo = "nixpkgs-updaters-library"; tag = "v${version}"; - hash = "sha256-SzGbsHy3Pwpr92512y/R3JLtC01jAveFavRGOYyr81U="; + hash = "sha256-gg+y3w0d2GKJ56XZ4Xw9OYTJ5GwqGkTZ/fRXwDhTEDE="; }; postPatch = '' From da86067e1ffffa345d9fc4e3df8a704545a7aa59 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 13:29:37 +0000 Subject: [PATCH 0933/2168] lprobe: 0.1.4 -> 0.1.5 --- pkgs/by-name/lp/lprobe/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/lp/lprobe/package.nix b/pkgs/by-name/lp/lprobe/package.nix index e7ecb2869ed0..0e5ba650733d 100644 --- a/pkgs/by-name/lp/lprobe/package.nix +++ b/pkgs/by-name/lp/lprobe/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "lprobe"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "fivexl"; repo = "lprobe"; tag = "v${version}"; - hash = "sha256-WC0MDTyd5tRtSQ1LQsYJgV9CwJwtvnIO6tQnPrjpfcY="; + hash = "sha256-1VoZIZQDEYVQg8cMacpHPRUffu+1+bAt7O3MZSi6+2A="; }; - vendorHash = "sha256-Ot9eePv/bjOZJfOjTCOJGXCaM8hoO4ZUPrpec8lT/JY="; + vendorHash = "sha256-wrxIHb296YOszgK9GnCTpSHz2kSd89zT/90/CrPely8="; buildInputs = [ libpcap From 4391342df7be4c4d738611dd86a6b5d385651854 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20St=C3=A4ding?= Date: Mon, 10 Feb 2025 14:40:35 +0100 Subject: [PATCH 0934/2168] dafny: 4.9.1 -> 4.10.0 --- pkgs/by-name/da/dafny/deps.json | 39 +++++++++++++++++++++++++++++-- pkgs/by-name/da/dafny/package.nix | 13 +++-------- 2 files changed, 40 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/da/dafny/deps.json b/pkgs/by-name/da/dafny/deps.json index fe629403b62f..ce1545664768 100644 --- a/pkgs/by-name/da/dafny/deps.json +++ b/pkgs/by-name/da/dafny/deps.json @@ -244,6 +244,16 @@ "version": "1.1.0", "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" }, + { + "pname": "Microsoft.NETFramework.ReferenceAssemblies", + "version": "1.0.3", + "hash": "sha256-FBoJP5DHZF0QHM0xLm9yd4HJZVQOuSpSKA+VQRpphEE=" + }, + { + "pname": "Microsoft.NETFramework.ReferenceAssemblies.net452", + "version": "1.0.3", + "hash": "sha256-RTPuFG8D7gnwINEoEtAqmVm4oTW8K4Z87v1o4DDeLMI=" + }, { "pname": "Microsoft.TestPlatform.Extensions.TrxLogger", "version": "17.9.0", @@ -294,6 +304,11 @@ "version": "2.6.81", "hash": "sha256-0Zshmi1IMWj9/MKUieffpgJxKhJyVgBXPKMg9RSDkRs=" }, + { + "pname": "NETStandard.Library", + "version": "2.0.3", + "hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo=" + }, { "pname": "Newtonsoft.Json", "version": "11.0.2", @@ -529,6 +544,11 @@ "version": "4.3.0", "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk=" }, + { + "pname": "System.Buffers", + "version": "4.4.0", + "hash": "sha256-KTxAhYawFG2V5VX1jw3pzx3IrQXRgn1TsvgjPgxAbqA=" + }, { "pname": "System.Collections", "version": "4.3.0", @@ -624,11 +644,21 @@ "version": "4.1.0", "hash": "sha256-7zqB+FXgkvhtlBzpcZyd81xczWP0D3uWssyAGw3t7b4=" }, + { + "pname": "System.Memory", + "version": "4.5.3", + "hash": "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk=" + }, { "pname": "System.Net.WebSockets", "version": "4.3.0", "hash": "sha256-l3h3cF1cCC9zMhWLKSDnZBZvFADUd0Afe2+iAwBA0r0=" }, + { + "pname": "System.Numerics.Vectors", + "version": "4.4.0", + "hash": "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U=" + }, { "pname": "System.ObjectModel", "version": "4.0.12", @@ -724,6 +754,11 @@ "version": "4.4.0", "hash": "sha256-SeTI4+yVRO2SmAKgOrMni4070OD+Oo8L1YiEVeKDyig=" }, + { + "pname": "System.Runtime.CompilerServices.Unsafe", + "version": "4.5.2", + "hash": "sha256-8eUXXGWO2LL7uATMZye2iCpQOETn2jCcjUhG6coR5O8=" + }, { "pname": "System.Runtime.CompilerServices.Unsafe", "version": "4.7.1", @@ -841,7 +876,7 @@ }, { "pname": "Tomlyn", - "version": "0.16.2", - "hash": "sha256-ULW4n8s2lvTMG3I18rpsVfXtKXN7C8nPrMXQowxGIsU=" + "version": "0.17.0", + "hash": "sha256-pJHF7w8RJhV23wiI3qzm5el4qPlPlgYTmTKA8yGhzXY=" } ] diff --git a/pkgs/by-name/da/dafny/package.nix b/pkgs/by-name/da/dafny/package.nix index 1b5cdecb3404..9484b7aadf7f 100644 --- a/pkgs/by-name/da/dafny/package.nix +++ b/pkgs/by-name/da/dafny/package.nix @@ -38,18 +38,18 @@ let in buildDotnetModule rec { pname = "Dafny"; - version = "4.9.1"; + version = "4.10.0"; src = fetchFromGitHub { owner = "dafny-lang"; repo = "dafny"; tag = "v${version}"; - hash = "sha256-fCBaOF1mDrqJaUiATZAhzLjlK3NGVFnxdOwgHbOkkgY="; + hash = "sha256-aPOjt4bwalhJUTJm4+pGqN88LwDP5zrVtakF26b3K4s="; }; postPatch = let - runtimeJarVersion = "4.9.1"; + runtimeJarVersion = "4.10.0"; in '' cp ${writeScript "fake-gradlew-for-dafny" '' @@ -66,13 +66,6 @@ buildDotnetModule rec { substituteInPlace Source/DafnyRuntime/DafnyRuntime.csproj \ --replace-fail TargetFrameworks TargetFramework \ --replace-fail "netstandard2.0;net452" net8.0 - - for f in Source/**/*.csproj ; do - [[ "$f" == "Source/DafnyRuntime/DafnyRuntime.csproj" ]] && continue; - - substituteInPlace $f \ - --replace-fail net6.0 net8.0 - done ''; dotnet-sdk = dotnetCorePackages.sdk_8_0; From 9503c225e237bbab4fd94b716512d40230dee472 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 13:42:58 +0000 Subject: [PATCH 0935/2168] openterface-qt: 0.0.6 -> 0.1.0 --- pkgs/by-name/op/openterface-qt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/openterface-qt/package.nix b/pkgs/by-name/op/openterface-qt/package.nix index 86c13c0bc70e..d8ca38469218 100644 --- a/pkgs/by-name/op/openterface-qt/package.nix +++ b/pkgs/by-name/op/openterface-qt/package.nix @@ -9,12 +9,12 @@ }: stdenv.mkDerivation (final: { pname = "openterface-qt"; - version = "0.0.6"; + version = "0.1.0"; src = fetchFromGitHub { owner = "TechxArtisanStudio"; repo = "Openterface_QT"; rev = "v${final.version}"; - hash = "sha256-orSOEzyplV0d+faaaRpXeMOhwbnOFxir7DG3LdErCdI="; + hash = "sha256-hjiN7iA38lt7JLO+8OcO9YesX12r0SenBxjYCiObfOU="; }; nativeBuildInputs = [ copyDesktopItems From a89703a79755d6068767a4d359c5f1fb70fd6e66 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 13:57:29 +0000 Subject: [PATCH 0936/2168] protonmail-bridge: 3.16.0 -> 3.17.0 --- pkgs/by-name/pr/protonmail-bridge/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/protonmail-bridge/package.nix b/pkgs/by-name/pr/protonmail-bridge/package.nix index 4687df70901b..c88fcacfbecb 100644 --- a/pkgs/by-name/pr/protonmail-bridge/package.nix +++ b/pkgs/by-name/pr/protonmail-bridge/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "protonmail-bridge"; - version = "3.16.0"; + version = "3.17.0"; src = fetchFromGitHub { owner = "ProtonMail"; repo = "proton-bridge"; rev = "v${version}"; - hash = "sha256-uzAtoCQIkmCoQWsZbrQ/LycB3cT1ureqRGO8nKuvPEo="; + hash = "sha256-h3CMSnNS4c7b/WASVytW/lTv2VXvECUMZPXs6ZRAFvA="; }; - vendorHash = "sha256-RKAkdCTkUcUKO+eXvn/Sh52Un4DzvgUlF19MiGm/K0c="; + vendorHash = "sha256-ZDd36nrxi/BEuTitM3wmH5BOU3hjSlG403BX6vh5kn8="; nativeBuildInputs = [ pkg-config ]; From 3c911b2aca0599b15b9d58f7339d73666ffb394a Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Thu, 12 Dec 2024 16:17:19 +0100 Subject: [PATCH 0937/2168] lib.types: init mergeTypes --- lib/tests/misc.nix | 41 ++++++++++++++++++++++++++++++++++++++++ lib/types.nix | 47 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+) diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 62f231cc51fd..add76539ea31 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -2564,4 +2564,45 @@ runTests { }; expected = "c"; }; + + testMergeTypesSimple = + let + mergedType = types.mergeTypes types.str types.str; + in + { + expr = mergedType.name; + expected = "str"; + }; + + testMergeTypesFail = + let + mergedType = types.mergeTypes types.str types.int; + in + { + expr = types.isType "merge-error" mergedType; + expected = true; + }; + + testMergeTypesEnum = + let + enumAB = lib.types.enum ["A" "B"]; + enumXY = lib.types.enum ["X" "Y"]; + merged = lib.types.mergeTypes enumAB enumXY; # -> enum [ "A" "B" "X" "Y" ] + in + { + expr = { + checkA = merged.check "A"; + checkB = merged.check "B"; + checkX = merged.check "X"; + checkY = merged.check "Y"; + checkC = merged.check "C"; + }; + expected = { + checkA = true; + checkB = true; + checkX = true; + checkY = true; + checkC = false; + }; + }; } diff --git a/lib/types.nix b/lib/types.nix index 43ace4a3f6a5..35335bb81aad 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -1107,6 +1107,53 @@ rec { addCheck = elemType: check: elemType // { check = x: elemType.check x && check x; }; }; + + /** + Merges two option types together. + + :::{.note} + Uses the type merge function of the first type, to merge it with the second type. + + Usually types can only be merged if they are of the same type + ::: + + # Inputs + + : `a` (option type): The first option type. + : `b` (option type): The second option type. + + # Returns + + - The merged option type. + - `{ _type = "merge-error"; error = "Cannot merge types"; }` if the types can't be merged. + + # Examples + :::{.example} + ## `lib.types.mergeTypes` usage example + ```nix + let + enumAB = lib.types.enum ["A" "B"]; + enumXY = lib.types.enum ["X" "Y"]; + # This operation could be notated as: [ A ] | [ B ] -> [ A B ] + merged = lib.types.mergeTypes enumAB enumXY; # -> enum [ "A" "B" "X" "Y" ] + in + assert merged.check "A"; # true + assert merged.check "B"; # true + assert merged.check "X"; # true + assert merged.check "Y"; # true + merged.check "C" # false + ``` + ::: + */ + mergeTypes = a: b: + assert isOptionType a && isOptionType b; + let + merged = a.typeMerge b.functor; + in + if merged == null then + setType "merge-error" { error = "Cannot merge types"; } + else + merged; }; in outer_types // outer_types.types From 86f814fc41eb5ab804b6f2414a84c642e5cb901a Mon Sep 17 00:00:00 2001 From: JuliusFreudenberger Date: Sun, 9 Feb 2025 13:55:29 +0200 Subject: [PATCH 0938/2168] teleport_17: init at 17.2.1 --- nixos/tests/teleport.nix | 3 ++- pkgs/servers/teleport/17/default.nix | 11 +++++++++++ pkgs/servers/teleport/default.nix | 13 +++++++++++++ pkgs/top-level/all-packages.nix | 3 +-- 4 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 pkgs/servers/teleport/17/default.nix diff --git a/nixos/tests/teleport.nix b/nixos/tests/teleport.nix index 2fb372f6f419..0031986f7de8 100644 --- a/nixos/tests/teleport.nix +++ b/nixos/tests/teleport.nix @@ -9,8 +9,9 @@ with import ../lib/testing-python.nix { inherit system pkgs; }; let packages = with pkgs; { - "default" = teleport; "15" = teleport_15; + "16" = teleport_16; + "17" = teleport_17; }; minimal = package: { diff --git a/pkgs/servers/teleport/17/default.nix b/pkgs/servers/teleport/17/default.nix new file mode 100644 index 000000000000..c93f925af288 --- /dev/null +++ b/pkgs/servers/teleport/17/default.nix @@ -0,0 +1,11 @@ +{ wasm-bindgen-cli, ... }@args: +import ../generic.nix ( + args + // { + version = "17.2.1"; + hash = "sha256-QlBj3zGnELgQJMIMSZK1YVE3H2hO09Xgdtcw0BML7KQ="; + vendorHash = "sha256-Y3og6oifpQIZxkKR1qgD3l06YaCFpSlh/+jN3w0gq7M="; + pnpmHash = "sha256-ChRWq0acDzHhm6JK2W3V6LZHlq4vXMxa1AMqiCPIouc="; + cargoHash = "sha256-GDwH/2aiqvTbLC8/x/n0yLuU8IEBVpyacN2B+EGwBgE="; + } +) diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix index 26c3467c7973..980beffcb52f 100644 --- a/pkgs/servers/teleport/default.nix +++ b/pkgs/servers/teleport/default.nix @@ -3,6 +3,8 @@ lib, wasm-bindgen-cli_0_2_92, wasm-bindgen-cli_0_2_95, + buildGo122Module, + buildGo123Module, ... }@args: let @@ -12,15 +14,24 @@ let args // { wasm-bindgen-cli = wasm-bindgen-cli_0_2_92; + buildGoModule = buildGo122Module; } ); teleport_16 = import ./16 ( args // { wasm-bindgen-cli = wasm-bindgen-cli_0_2_95; + buildGoModule = buildGo122Module; } ); teleport = teleport_16; + teleport_17 = import ./17 ( + args + // { + wasm-bindgen-cli = wasm-bindgen-cli_0_2_95; + buildGoModule = buildGo123Module; + } + ); }; # Ensure the following callPackages invocation includes everything 'generic' needs. f' = lib.setFunctionArgs f (builtins.functionArgs (import ./generic.nix)); @@ -30,5 +41,7 @@ callPackages f' ( "callPackages" "wasm-bindgen-cli_0_2_92" "wasm-bindgen-cli_0_2_95" + "buildGo122Module" + "buildGo123Module" ] ) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dcacf936d9c1..995819227cca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5137,8 +5137,7 @@ with pkgs; inherit (callPackages ../servers/teleport { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit; - buildGoModule = buildGo122Module; - }) teleport_15 teleport_16 teleport; + }) teleport_15 teleport_16 teleport_17 teleport; telepresence = callPackage ../tools/networking/telepresence { pythonPackages = python3Packages; From a02b183b85d7147a03361226ffe984d43dba0544 Mon Sep 17 00:00:00 2001 From: Christoph Honal Date: Fri, 5 Jul 2024 02:46:13 +0200 Subject: [PATCH 0939/2168] linuxPackages.nxp-pn5xx: init at 0.4-unstable --- pkgs/os-specific/linux/nxp-pn5xx/default.nix | 40 ++++++++++++++++++++ pkgs/top-level/linux-kernels.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/os-specific/linux/nxp-pn5xx/default.nix diff --git a/pkgs/os-specific/linux/nxp-pn5xx/default.nix b/pkgs/os-specific/linux/nxp-pn5xx/default.nix new file mode 100644 index 000000000000..4ca9db16e847 --- /dev/null +++ b/pkgs/os-specific/linux/nxp-pn5xx/default.nix @@ -0,0 +1,40 @@ +{ + lib, + stdenv, + fetchFromGitHub, + kernel, + kernelModuleMakeFlags, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "nxp-pn5xx"; + version = "0.4-unstable-2025-02-08-${kernel.version}"; + + src = fetchFromGitHub { + owner = "jr64"; + repo = "nxp-pn5xx"; + rev = "07411e0ce3445e7dcb970df1837f0ad74b7b0a7a"; + hash = "sha256-jVkcvURFlihKW2vFvAaqzKdtexPXywRa2LkPkIhmdeU="; + }; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + makeFlags = kernelModuleMakeFlags ++ [ + "KERNELRELEASE=${kernel.modDirVersion}" + "BUILD_KERNEL_PATH=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "INSTALL_MOD_PATH=$(out)/lib/modules/${kernel.modDirVersion}" + ]; + + postInstall = '' + mkdir -p $out/etc/udev/rules.d + echo 'SUBSYSTEM=="misc", KERNEL=="pn544", MODE="0666", GROUP="dialout"' > $out/etc/udev/rules.d/99-nxp-pn5xx.rules + ''; + + meta = { + description = "NXP's NFC Open Source Kernel mode driver with ACPI configuration support"; + homepage = "https://github.com/jr64/nxp-pn5xx"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ stargate01 ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 3cabaec2c7b1..1f6dfd4f56d8 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -457,6 +457,8 @@ in { nvidia_x11_stable_open = nvidiaPackages.stable.open; nvidia_x11_vulkan_beta_open = nvidiaPackages.vulkan_beta.open; + nxp-pn5xx = callPackage ../os-specific/linux/nxp-pn5xx { }; + openrazer = callPackage ../os-specific/linux/openrazer/driver.nix { }; ply = callPackage ../os-specific/linux/ply { }; From 0d67f93d7ea0b459a6259555a0ab71a70c94ac0b Mon Sep 17 00:00:00 2001 From: Christoph Honal Date: Mon, 27 Jun 2022 06:49:15 +0200 Subject: [PATCH 0940/2168] libnfc-nci: init at 2.4.1-unstable --- pkgs/by-name/li/libnfc-nci/package.nix | 47 ++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 pkgs/by-name/li/libnfc-nci/package.nix diff --git a/pkgs/by-name/li/libnfc-nci/package.nix b/pkgs/by-name/li/libnfc-nci/package.nix new file mode 100644 index 000000000000..55e98b1f9be9 --- /dev/null +++ b/pkgs/by-name/li/libnfc-nci/package.nix @@ -0,0 +1,47 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + pkg-config, + config, + debug ? config.libnfc-nci.debug or false, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libnfc-nci"; + version = "2.4.1-unstable-2024-08-05"; + + src = fetchFromGitHub { + owner = "StarGate01"; + repo = "linux_libnfc-nci"; + rev = "7ce9c8aad0e37850a49b6d8dcc22ae5c783268e7"; + sha256 = "sha256-iSvDiae+A2hUok426Lj5TMn3Q9G+vH1G0jajP48PehQ="; + }; + + buildInputs = [ + pkg-config + autoreconfHook + ]; + + configureFlags = + [ + "--enable-i2c" + ] + ++ lib.optionals debug [ + "--enable-debug" + ]; + dontStrip = debug; + + postInstall = '' + rm -rf $out/etc + ''; + + meta = { + description = "Linux NFC stack for NCI based NXP NFC Controllers"; + homepage = "https://github.com/NXPNFCLinux/linux_libnfc-nci"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ stargate01 ]; + platforms = lib.platforms.linux; + }; +}) From f6e9c847439a95d916abc4eb5f83df7cefa166e9 Mon Sep 17 00:00:00 2001 From: Christoph Honal Date: Tue, 16 Jul 2024 01:00:55 +0200 Subject: [PATCH 0941/2168] ifdnfc-nci: init at 0.2.1 --- pkgs/by-name/if/ifdnfc-nci/package.nix | 39 ++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 pkgs/by-name/if/ifdnfc-nci/package.nix diff --git a/pkgs/by-name/if/ifdnfc-nci/package.nix b/pkgs/by-name/if/ifdnfc-nci/package.nix new file mode 100644 index 000000000000..e619b6514c02 --- /dev/null +++ b/pkgs/by-name/if/ifdnfc-nci/package.nix @@ -0,0 +1,39 @@ +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + cmake, + pcsclite, + libnfc-nci, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "ifdnfc-nci"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "StarGate01"; + repo = "ifdnfc-nci"; + tag = "v${finalAttrs.version}"; + sha256 = "sha256-I2MNzmaxQUh4bN3Uytf2bQRthByEaFWM7c79CKZJQZA="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + pcsclite + libnfc-nci + ]; + + meta = { + description = "PC/SC IFD Handler based on linux_libnfc-nci"; + homepage = "https://github.com/StarGate01/ifdnfc-nci"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ stargate01 ]; + }; +}) From 735f85e845803b8e6e8915d99e9bead9c18373a9 Mon Sep 17 00:00:00 2001 From: Christoph Honal Date: Tue, 9 Jul 2024 09:43:41 +0200 Subject: [PATCH 0942/2168] pcscd: allow multiple readerConfig entries --- nixos/modules/services/hardware/pcscd.nix | 54 ++++++++++++++++------- 1 file changed, 39 insertions(+), 15 deletions(-) diff --git a/nixos/modules/services/hardware/pcscd.nix b/nixos/modules/services/hardware/pcscd.nix index df98c1fd208d..2fdc115a07ed 100644 --- a/nixos/modules/services/hardware/pcscd.nix +++ b/nixos/modules/services/hardware/pcscd.nix @@ -1,11 +1,16 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let cfg = config.services.pcscd; - cfgFile = pkgs.writeText "reader.conf" config.services.pcscd.readerConfig; + cfgFile = pkgs.writeText "reader.conf" ( + builtins.concatStringsSep "\n\n" config.services.pcscd.readerConfigs + ); - package = if config.security.polkit.enable - then pkgs.pcscliteWithPolkit - else pkgs.pcsclite; + package = if config.security.polkit.enable then pkgs.pcscliteWithPolkit else pkgs.pcsclite; pluginEnv = pkgs.buildEnv { name = "pcscd-plugins"; @@ -14,6 +19,20 @@ let in { + imports = [ + (lib.mkChangedOptionModule + [ "services" "pcscd" "readerConfig" ] + [ "services" "pcscd" "readerConfigs" ] + ( + config: + let + readerConfig = lib.getAttrFromPath [ "services" "pcscd" "readerConfig" ] config; + in + [ readerConfig ] + ) + ) + ]; + options.services.pcscd = { enable = lib.mkEnableOption "PCSC-Lite daemon, to access smart cards using SCard API (PC/SC)"; @@ -24,15 +43,17 @@ in description = "Plugin packages to be used for PCSC-Lite."; }; - readerConfig = lib.mkOption { - type = lib.types.lines; - default = ""; - example = '' - FRIENDLYNAME "Some serial reader" - DEVICENAME /dev/ttyS0 - LIBPATH /path/to/serial_reader.so - CHANNELID 1 - ''; + readerConfigs = lib.mkOption { + type = lib.types.listOf lib.types.lines; + default = [ ]; + example = [ + '' + FRIENDLYNAME "Some serial reader" + DEVICENAME /dev/ttyS0 + LIBPATH /path/to/serial_reader.so + CHANNELID 1 + '' + ]; description = '' Configuration for devices that aren't hotpluggable. @@ -68,7 +89,10 @@ in # around it, we force the path to the cfgFile. # # https://github.com/NixOS/nixpkgs/issues/121088 - serviceConfig.ExecStart = [ "" "${lib.getExe package} -f -x -c ${cfgFile} ${lib.escapeShellArgs cfg.extraArgs}" ]; + serviceConfig.ExecStart = [ + "" + "${lib.getExe package} -f -x -c ${cfgFile} ${lib.escapeShellArgs cfg.extraArgs}" + ]; }; }; } From a05198804cdf53c214864a4b7e2eb0db5c25aa5c Mon Sep 17 00:00:00 2001 From: Christoph Honal Date: Mon, 8 Jul 2024 23:35:21 +0200 Subject: [PATCH 0943/2168] nixos/nfc-nci: init --- .../manual/release-notes/rl-2505.section.md | 2 + nixos/modules/hardware/nfc-nci.nix | 205 ++++++++++++++++++ nixos/modules/module-list.nix | 1 + 3 files changed, 208 insertions(+) create mode 100644 nixos/modules/hardware/nfc-nci.nix diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 1ca298c684fd..e9d5715ef689 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -111,6 +111,8 @@ - [waagent](https://github.com/Azure/WALinuxAgent), the Microsoft Azure Linux Agent (waagent) manages Linux provisioning and VM interaction with the Azure Fabric Controller. Available with [services.waagent](options.html#opt-services.waagent.enable). +- [nfc-nci](https://github.com/StarGate01/ifdnfc-nci), an alternative NFC stack and PC/SC driver for the NXP PN54x chipset, commonly found in Lenovo systems as NXP1001 (NPC300). Available as [hardware.nfc-nci](#opt-hardware.nfc-nci.enable). + - [duckdns](https://www.duckdns.org), free dynamic DNS. Available with [services.duckdns](options.html#opt-services.duckdns.enable) - [nostr-rs-relay](https://git.sr.ht/~gheartsfield/nostr-rs-relay/), This is a nostr relay, written in Rust. Available as [services.nostr-rs-relay](options.html#opt-services.nostr-rs-relay.enable). diff --git a/nixos/modules/hardware/nfc-nci.nix b/nixos/modules/hardware/nfc-nci.nix new file mode 100644 index 000000000000..bb2ce3a9dca0 --- /dev/null +++ b/nixos/modules/hardware/nfc-nci.nix @@ -0,0 +1,205 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.hardware.nfc-nci; + + # To understand these settings in more detail, refer to the upstream configuration templates + # available at https://github.com/NXPNFCLinux/linux_libnfc-nci/tree/master/conf . + # Settings in curly braces are NCI commands, the "NFC Controller Interface Specification" + # as well as the "NFC Digital Protocol Technical Specification" can be found online. + # These default settings have been specifically engineered for the Lenovo NXP1001 (NPC300) chipset. + defaultSettings = { + # This block will be emitted into /etc/libnfc-nci.conf + nci = { + # Set up general logging + APPL_TRACE_LEVEL = "0x01"; + PROTOCOL_TRACE_LEVEL = "0x01"; + # Set up which NFC technologies are enabled (due to e.g. local regulation or patent law) + HOST_LISTEN_TECH_MASK = "0x07"; + POLLING_TECH_MASK = "0xEF"; + P2P_LISTEN_TECH_MASK = "0xC5"; + }; + # This block will be emitted into /etc/libnfc-nxp-init.conf + init = { + # Setup logging of the individual userland library components + NXPLOG_GLOBAL_LOGLEVEL = "0x01"; + NXPLOG_EXTNS_LOGLEVEL = "0x01"; + NXPLOG_NCIHAL_LOGLEVEL = "0x01"; + NXPLOG_NCIX_LOGLEVEL = "0x01"; + NXPLOG_NCIR_LOGLEVEL = "0x01"; + NXPLOG_FWDNLD_LOGLEVEL = "0x00"; + NXPLOG_TML_LOGLEVEL = "0x01"; + # Where to find the kernel device node + NXP_NFC_DEV_NODE = ''"/dev/pn544"''; + # Enable the NXP proprietary features of the chip + NXP_ACT_PROP_EXTN = "{2F, 02, 00}"; + # Configure the NFC Forum profile: + # 0xA0 0x44: POLL_PROFILE_SEL_CFG = 0x00 (Use NFC Forum profile default configuration values. Specifically, not EMVCo.) + NXP_NFC_PROFILE_EXTN = '' + {20, 02, 05, 01, + A0, 44, 01, 00 + } + ''; + # Enable chip standby mode + NXP_CORE_STANDBY = "{2F, 00, 01, 01}"; + # Enable NCI packet fragmentation on the I2C bus + NXP_I2C_FRAGMENTATION_ENABLED = "0x01"; + }; + # This block will be emitted into /etc/libnfc-nxp-pn547.conf as well as /etc/libnfc-nxp-pn548.conf + # Which file is actually used is decided by the library at runtime depending on chip variant, both files are required. + pn54x = { + # Enable Mifare Classic reader functionality + MIFARE_READER_ENABLE = "0x01"; + # Configure clock source - use XTAL (hardware crystal) instead of PLL (synthetic clock) + NXP_SYS_CLK_SRC_SEL = "0x01"; + NXP_SYS_CLK_FREQ_SEL = "0x00"; + NXP_SYS_CLOCK_TO_CFG = "0x01"; + # Configure the non-propriety NCI settings in EEPROM: + # 0x28: PN_NFC_DEP_SPEED = 0x00 (Data exchange: Highest Available Bit Rates) + # 0x21: PI_BIT_RATE = 0x00 (Maximum allowed bit rate: 106 Kbit/s) + # 0x30: LA_BIT_FRAME_SDD = 0x08 (Bit Frame SDD value to be sent in Byte 1 of SENS_RES) + # 0x31: LA_PLATFORM_CONFIG = 0x03 (Platform Configuration value to be sent in Byte 2 of SENS_RES) + # 0x33: LA_NFCID1 = [ 0x04 0x03 0x02 0x01 ] ("Unique" NFCID1 ID in SENS_RES) + # 0x54: LF_CON_BITR_F = 0x06 (Bit rates to listen for: Both) + # 0x50: LF_PROTOCOL_TYPE = 0x02 (Protocols supported in Listen Mode for NFC-F: NFC-DEP) + # 0x5B: LI_BIT_RATE = 0x00 (Maximum supported bit rate: 106 Kbit/s) + # 0x60: LN_WT = 0x0E (Waiting Time NFC-DEP WT_MAX default for Initiator) + # 0x80: RF_FIELD_INFO = 0x01 (Chip is allowed to emit RF Field Information Notifications) + # 0x81: RF_NFCEE_ACTION = 0x01 (Chip should send trigger notification for the default set of NFCEE actions) + # 0x82: NFCDEP_OP = 0x0E (NFC-DEP protocol behavior: Default flags, but also enable RTOX requests) + # 0x18: PF_BIT_RATE = 0x01 (NFC-F discovery polling initial bit rate: 106 Kbit/s) + NXP_CORE_CONF = '' + {20, 02, 2B, 0D, + 28, 01, 00, + 21, 01, 00, + 30, 01, 08, + 31, 01, 03, + 33, 04, 04, 03, 02, 01, + 54, 01, 06, + 50, 01, 02, + 5B, 01, 00, + 60, 01, 0E, + 80, 01, 01, + 81, 01, 01, + 82, 01, 0E, + 18, 01, 01 + } + ''; + # Configure the proprietary NXP extension to the NCI standard in EEPROM: + # 0xA0 0x5E: JEWEL_RID_CFG = 0x01 (Enable sending RID to T1T on RF) + # 0xA0 0x40: TAG_DETECTOR_CFG = 0x00 (Tag detector: Disable both AGC based detection and trace mode) + # 0xA0 0x43: TAG_DETECTOR_FALLBACK_CNT_CFG = 0x00 (Tag detector: Disable hybrid mode, only use LPCD to initiate polling) + # 0xA0 0x0F: DH_EEPROM_AREA_1 = [ 32 bytes of opaque Lenovo data ] (Custom configuration for the Lenovo customized chip firmware) + # See also https://github.com/nfc-tools/libnfc/issues/455#issuecomment-2221979571 + NXP_CORE_CONF_EXTN = '' + {20, 02, 30, 04, + A0, 5E, 01, 01, + A0, 40, 01, 00, + A0, 43, 01, 00, + A0, 0F, 20, + 00, 03, 1D, 01, 03, 00, 02, 00, + 01, 00, 01, 00, 00, 00, 00, 00, + 00, 00, 00, 00, 00, 00, 00, 00, + 00, 00, 00, 00, 00, 00, 00, 00 + } + ''; + # Firmware-specific protocol configuration parameters (one byte per protocol) + NXP_NFC_PROPRIETARY_CFG = "{05:FF:FF:06:81:80:70:FF:FF}"; + # Configure power supply of chip, use Lenovo driver configuration, which deviates a bit from the spec: + # 0xA0 0x0E: PMU_CFG = [ 0x16, 0x09, 0x00 ] (VBAT1 connected to 5V, TVDD monitoring: 3.6V, TxLDO Voltage in reader and card mode: 3.3V) + NXP_EXT_TVDD_CFG = "0x01"; + NXP_EXT_TVDD_CFG_1 = '' + {20, 02, 07, 01, + A0, 0E, 03, 16, 09, 00 + } + ''; + # Use the default for NFA_EE_MAX_EE_SUPPORTED stack size (concerns HCI) + NXP_NFC_MAX_EE_SUPPORTED = "0x00"; + }; + }; + + generateSettings = + cfgName: + let + toKeyValueLines = + obj: builtins.concatStringsSep "\n" (map (key: "${key}=${obj.${key}}") (builtins.attrNames obj)); + in + toKeyValueLines (defaultSettings.${cfgName} // (cfg.settings.${cfgName} or { })); +in +{ + options.hardware.nfc-nci = { + enable = lib.mkEnableOption "PN5xx kernel module with udev rules, libnfc-nci userland, and optional ifdnfc-nci PC/SC driver"; + + settings = lib.mkOption { + default = defaultSettings; + description = '' + Configuration to be written to the libncf-nci configuration files. + To understand the configuration format, refer to https://github.com/NXPNFCLinux/linux_libnfc-nci/tree/master/conf. + ''; + type = lib.types.attrs; + }; + + enableIFD = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Register ifdnfc-nci as a serial reader with pcscd. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = + [ + pkgs.libnfc-nci + ] + ++ lib.optionals cfg.enableIFD [ + pkgs.ifdnfc-nci + ]; + + environment.etc = { + "libnfc-nci.conf".text = generateSettings "nci"; + "libnfc-nxp-init.conf".text = generateSettings "init"; + "libnfc-nxp-pn547.conf".text = generateSettings "pn54x"; + "libnfc-nxp-pn548.conf".text = generateSettings "pn54x"; + }; + + services.udev.packages = [ + config.boot.kernelPackages.nxp-pn5xx + ]; + + boot.blacklistedKernelModules = [ + "nxp_nci_i2c" + "nxp_nci" + ]; + + boot.extraModulePackages = [ + config.boot.kernelPackages.nxp-pn5xx + ]; + + boot.kernelModules = [ + "nxp-pn5xx" + ]; + + services.pcscd.readerConfigs = lib.mkIf cfg.enableIFD [ + '' + FRIENDLYNAME "NFC NCI" + LIBPATH ${pkgs.ifdnfc-nci}/lib/libifdnfc-nci.so + CHANNELID 0 + '' + ]; + + # NFC chip looses power when system goes to sleep / hibernate, + # and needs to be re-initialized upon wakeup + powerManagement.resumeCommands = lib.mkIf cfg.enableIFD '' + systemctl restart pcscd.service + ''; + }; + + meta.maintainers = with lib.maintainers; [ stargate01 ]; +} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 05c4785400fb..9f97ac965ed8 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -85,6 +85,7 @@ ./hardware/network/eg25-manager.nix ./hardware/network/intel-2200bg.nix ./hardware/new-lg4ff.nix + ./hardware/nfc-nci.nix ./hardware/nitrokey.nix ./hardware/onlykey/default.nix ./hardware/openrazer.nix From fbf4ceda086fc693fc8130864a73d6059e515e41 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Mon, 10 Feb 2025 16:04:24 +0100 Subject: [PATCH 0944/2168] nodejs_20: 20.18.2 -> 20.18.3 --- pkgs/development/web/nodejs/v20.nix | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix index 8cc82cea4e40..d0679570f048 100644 --- a/pkgs/development/web/nodejs/v20.nix +++ b/pkgs/development/web/nodejs/v20.nix @@ -18,8 +18,8 @@ let in buildNodejs { inherit enableNpm; - version = "20.18.2"; - sha256 = "69bf81b70f3a95ae0763459f02860c282d7e3a47567c8afaf126cc778176a882"; + version = "20.18.3"; + sha256 = "0674f16f3bc284c11724cd3f7c2a43f7c2c13d2eb7a872dd0db198f3d588c5f2"; patches = [ ./configure-emulator.patch ./configure-armv6-vfpv2.patch @@ -35,16 +35,6 @@ buildNodejs { stripLen = 1; hash = "sha256-WVxsoEcJu0WBTyelNrVQFTZxJhnekQb1GrueeRBRdnY="; }) - # Fix for https://github.com/NixOS/nixpkgs/issues/355919 - # FIXME: remove after a minor point release - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/a094a8166cd772f89e92b5deef168e5e599fa815.patch?full_index=1"; - hash = "sha256-5FZfozYWRa1ZI/f+e+xpdn974Jg2DbiHbua13XUQP5E="; - }) - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/f270462c09ddfd770291a7c8a2cd204b2c63d730.patch?full_index=1"; - hash = "sha256-Err0i5g7WtXcnhykKgrS3ocX7/3oV9UrT0SNeRtMZNU="; - }) # Backport V8 fixes for LLVM 19. (fetchpatch2 { url = "https://chromium.googlesource.com/v8/v8/+/182d9c05e78b1ddb1cb8242cd3628a7855a0336f%5E%21/?format=TEXT"; @@ -60,10 +50,5 @@ buildNodejs { stripLen = 1; hash = "sha256-6y3aEqxNC4iTQEv1oewodJrhOHxjp5xZMq1P1QL94Rg="; }) - # fixes test failure, remove when included in release - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/b6fe731c55eb4cb9d14042a23e5002ed39b7c8b7.patch?full_index=1"; - hash = "sha256-KoKsQBFKUji0GeEPTR8ixBflCiHBhPqd2cPVPuKyua8="; - }) ] ++ gypPatches; } From 2b36139fbe7feab5349e4b7b9d9e864c9f65a269 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 15:10:38 +0000 Subject: [PATCH 0945/2168] sipexer: 1.1.0 -> 1.2.0 --- pkgs/by-name/si/sipexer/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/sipexer/package.nix b/pkgs/by-name/si/sipexer/package.nix index 47933243e0dc..ca194801d204 100644 --- a/pkgs/by-name/si/sipexer/package.nix +++ b/pkgs/by-name/si/sipexer/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "sipexer"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "miconda"; repo = pname; rev = "v${version}"; - hash = "sha256-/AVOC8Tx5XMDiKmLBq2xUiJaA3K3TnWVXPE+Vzx862I="; + hash = "sha256-7L29nyFOc/5XAHpzGsFSngxMTwwIDkmwhIKIjHYGszc="; }; vendorHash = "sha256-q2uNqKZc6Zye7YimPDrg40o68Fo4ux4fygjVjJdhqQU="; From 45f3a21fe2a34cb4b9a65ab1d1a29e1c4da2b9e9 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Thu, 6 Feb 2025 11:33:06 +0000 Subject: [PATCH 0946/2168] autobrr: 1.57.0 -> 1.58.0 --- pkgs/by-name/au/autobrr/package.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/au/autobrr/package.nix b/pkgs/by-name/au/autobrr/package.nix index da1b503e874f..1ec76b96fd95 100644 --- a/pkgs/by-name/au/autobrr/package.nix +++ b/pkgs/by-name/au/autobrr/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildGoModule, fetchFromGitHub, stdenvNoCC, @@ -12,12 +13,12 @@ let pname = "autobrr"; - version = "1.57.0"; + version = "1.58.0"; src = fetchFromGitHub { owner = "autobrr"; repo = "autobrr"; tag = "v${version}"; - hash = "sha256-RVkeSrL3ZfEz+oCICi8JFJ6AaOBBumi5mnnQYE5Gjt8="; + hash = "sha256-NH3BVD/wZH5L6x6GcXZrynKFiirLRC6u434EBYQs4qQ="; }; autobrr-web = stdenvNoCC.mkDerivation { @@ -39,7 +40,7 @@ let src sourceRoot ; - hash = "sha256-mABHRuZfjq9qNanfGGv+xDhs3bSufaWRecJypic8SWo="; + hash = "sha256-ESMrd+2oqytC1dQDQvncoqHGAvIFlH/1sTLrUTuSyDg="; }; postBuild = '' @@ -59,7 +60,7 @@ buildGoModule rec { src ; - vendorHash = "sha256-rCtUE2/IwR6AnXQNgeH0TQ0BL7g6vi9L128xP0PwOXc="; + vendorHash = "sha256-ifi4KFectr4UC1e+VJKnAWsx0f19XN2T3Paf2ud2/To="; preBuild = '' cp -r ${autobrr-web}/* web/dist @@ -70,7 +71,10 @@ buildGoModule rec { "-X main.commit=${src.tag}" ]; - doInstallCheck = true; + # In darwin, tests try to access /etc/protocols, which is not permitted. + doCheck = !stdenv.hostPlatform.isDarwin; + doInstallCheck = !stdenv.hostPlatform.isDarwin; + nativeInstallCheckInputs = [ versionCheckHook ]; From f56ea4095bb4faf653ac33ea75d9371df7070db4 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 10 Feb 2025 16:17:44 +0100 Subject: [PATCH 0947/2168] python3Packages.tensorflow: fix typo --- pkgs/development/python-modules/tensorflow/bin.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index 2ca3c4c1dc61..b1767cb0eb22 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -64,7 +64,7 @@ buildPythonPackage rec { cuda = lib.optionalString cudaSupport (if isCudaJetson then "_jetson" else "_gpu"); key = "${platform}_${pyVerNoDot}${cuda}"; in - fetchurl (packages.${key} or (throw "tensoflow-bin: unsupported configuration: ${key}")); + fetchurl (packages.${key} or (throw "tensorflow-bin: unsupported configuration: ${key}")); buildInputs = [ llvmPackages.openmp ]; From eae985d14073118441213212e0ad8a119d5110a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 15:28:57 +0000 Subject: [PATCH 0948/2168] ventoy-full: 1.1.00 -> 1.1.01 --- pkgs/by-name/ve/ventoy/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ve/ventoy/package.nix b/pkgs/by-name/ve/ventoy/package.nix index 82b06dc9dd8b..97edd77d3a89 100644 --- a/pkgs/by-name/ve/ventoy/package.nix +++ b/pkgs/by-name/ve/ventoy/package.nix @@ -56,11 +56,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ventoy"; - version = "1.1.00"; + version = "1.1.01"; src = fetchurl { url = "https://github.com/ventoy/Ventoy/releases/download/v${finalAttrs.version}/ventoy-${finalAttrs.version}-linux.tar.gz"; - hash = "sha256-J6Krr/pTHGcwWRkJdUVdt6YVg/IhUo4G2h7jjR6lcC8="; + hash = "sha256-YR0/zet8EuhkWv4OsHD8yK4NvAVWJ3ExyPaV4t2PKvE="; }; patches = [ From f9ae842f5ab988bea846712d69db797a36581f2b Mon Sep 17 00:00:00 2001 From: chn Date: Mon, 10 Feb 2025 23:33:45 +0800 Subject: [PATCH 0949/2168] libvirt: fix shutdownTimeout not working, fix #171618 --- pkgs/development/libraries/libvirt/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 4de3f7887bc8..d5c6f1b6cf17 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -356,6 +356,7 @@ stdenv.mkDerivation rec { --replace 'ON_BOOT="start"' 'ON_BOOT=''${ON_BOOT:-start}' \ --replace 'ON_SHUTDOWN="suspend"' 'ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}' \ --replace 'PARALLEL_SHUTDOWN=0' 'PARALLEL_SHUTDOWN=''${PARALLEL_SHUTDOWN:-0}' \ + --replace 'SHUTDOWN_TIMEOUT=300' 'SHUTDOWN_TIMEOUT=''${SHUTDOWN_TIMEOUT:-300}' \ --replace "$out/bin" '${gettext}/bin' \ --replace 'lock/subsys' 'lock' \ --replace 'gettext.sh' 'gettext.sh From dde19949debe8b0fa3592fd0070301500033195c Mon Sep 17 00:00:00 2001 From: Pedro Mendes Date: Wed, 5 Feb 2025 13:32:58 -0300 Subject: [PATCH 0950/2168] iwe: init at 0.0.17 --- pkgs/by-name/iw/iwe/package.nix | 40 +++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 pkgs/by-name/iw/iwe/package.nix diff --git a/pkgs/by-name/iw/iwe/package.nix b/pkgs/by-name/iw/iwe/package.nix new file mode 100644 index 000000000000..57e377a17404 --- /dev/null +++ b/pkgs/by-name/iw/iwe/package.nix @@ -0,0 +1,40 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + versionCheckHook, + nix-update-script, +}: +rustPlatform.buildRustPackage rec { + pname = "iwe"; + version = "0.0.17"; + + src = fetchFromGitHub { + owner = "iwe-org"; + repo = "iwe"; + tag = "iwe-v${version}"; + hash = "sha256-eE84KzYJTJ39UDQt3VZpSIba/P+7VFR9K6+MSMlg0Wc="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-K8RxVYHh0pStQyHMiLLeUakAoK1IMoUtCNg70/NfDiI="; + + cargoBuildFlags = [ + "--package=iwe" + "--package=iwes" + ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Personal knowledge management system (editor plugin & command line utility)"; + homepage = "https://iwe.md/"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ phrmendes ]; + mainProgram = "iwe"; + }; +} From f94852ac7ce12449d3c1834ab8bd2d0f27b316fc Mon Sep 17 00:00:00 2001 From: Aniruddh Agarwal Date: Wed, 5 Feb 2025 07:50:46 -0500 Subject: [PATCH 0951/2168] stats: 2.11.26 -> 2.11.30 Changelog: https://github.com/exelban/stats/releases/tag/v2.11.30 Diff: https://github.com/exelban/stats/compare/v2.11.26...v2.11.30 --- pkgs/by-name/st/stats/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix index 4a9c31379d0d..ada8ab1d47b0 100644 --- a/pkgs/by-name/st/stats/package.nix +++ b/pkgs/by-name/st/stats/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "stats"; - version = "2.11.26"; + version = "2.11.30"; src = fetchurl { url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg"; - hash = "sha256-WRbBqgjNn9W9qRFlbuNAOr8L6lzI1DpTsTCgCQiKSnU="; + hash = "sha256-WkNiZZq2PfGp65d82YHupiczojSktDAe4p4WiUj5xWM="; }; sourceRoot = "."; From 7df3b3244756a6ee6b67411aa00cd22a90461058 Mon Sep 17 00:00:00 2001 From: Marco Desiderati Date: Mon, 10 Feb 2025 16:56:42 +0100 Subject: [PATCH 0952/2168] snx-rs: 2.9.0 -> 3.0.3 Changelog: https://github.com/ancwrd1/snx-rs/blob/v3.0.3/CHANGELOG.md --- pkgs/by-name/sn/snx-rs/Cargo.lock | 624 ++++++++++++++++++----------- pkgs/by-name/sn/snx-rs/package.nix | 8 +- 2 files changed, 402 insertions(+), 230 deletions(-) diff --git a/pkgs/by-name/sn/snx-rs/Cargo.lock b/pkgs/by-name/sn/snx-rs/Cargo.lock index 93695da0b1ec..ec3aa403b691 100644 --- a/pkgs/by-name/sn/snx-rs/Cargo.lock +++ b/pkgs/by-name/sn/snx-rs/Cargo.lock @@ -37,7 +37,7 @@ dependencies = [ "cfg-if", "once_cell", "version_check", - "zerocopy", + "zerocopy 0.7.35", ] [[package]] @@ -111,11 +111,12 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "3.0.6" +version = "3.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" +checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e" dependencies = [ "anstyle", + "once_cell", "windows-sys 0.59.0", ] @@ -206,7 +207,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -235,13 +236,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.85" +version = "0.1.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f934833b4b7233644e5848f235df3f57ed8c80f1528a26c3dfa13d2147fa056" +checksum = "644dd749086bf3771a2fbc5f256fdb982d53f011c7d5d560304eafeecebce79d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -308,9 +309,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.6.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36" dependencies = [ "serde", ] @@ -368,9 +369,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.16.0" +version = "3.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" +checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" [[package]] name = "byteorder" @@ -380,9 +381,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" +checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9" dependencies = [ "serde", ] @@ -434,7 +435,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -449,7 +450,7 @@ version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "cairo-sys-rs", "glib", "libc", @@ -479,9 +480,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.7" +version = "1.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a012a0df96dd6d06ba9a1b29d6402d1a5d77c6befd2566afdc26e10603dc93d7" +checksum = "755717a7de9ec452bf7f3f1a3099085deabd7f2962b861dae91ecd7a365903d2" dependencies = [ "shlex", ] @@ -535,9 +536,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.23" +version = "4.5.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84" +checksum = "3e77c3243bd94243c03672cb5154667347c457ca271254724f9f393aee1c05ff" dependencies = [ "clap_builder", "clap_derive", @@ -545,9 +546,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.23" +version = "4.5.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838" +checksum = "1b26884eb4b57140e4d2d93652abfa49498b938b3c9179f9fc487b0acc3edad7" dependencies = [ "anstream", "anstyle", @@ -557,14 +558,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.18" +version = "4.5.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" +checksum = "bf4ced95c6f4a675af3da73304b9ac4ed991640c36374e4b46795c49e17cf1ed" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -620,7 +621,7 @@ version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "core-foundation 0.10.0", "core-graphics-types", "foreign-types 0.5.0", @@ -633,16 +634,16 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "core-foundation 0.10.0", "libc", ] [[package]] name = "cpufeatures" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" +checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" dependencies = [ "libc", ] @@ -725,7 +726,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -736,7 +737,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -811,7 +812,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -850,14 +851,14 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] name = "enumflags2" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" +checksum = "ba2f4b465f5318854c6f8dd686ede6c0a9dc67d4b1ac241cf0eb51521a309147" dependencies = [ "enumflags2_derive", "serde", @@ -865,13 +866,13 @@ dependencies = [ [[package]] name = "enumflags2_derive" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" +checksum = "fc4caf64a58d7a6d65ab00639b046ff54399a39f5f2554728895ace4b297cd79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -892,9 +893,9 @@ dependencies = [ [[package]] name = "event-listener" -version = "5.3.1" +version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +checksum = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae" dependencies = [ "concurrent-queue", "parking", @@ -979,7 +980,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -1053,9 +1054,9 @@ checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-lite" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cef40d21ae2c515b51041df9ed313ed21e572df340ea58a922a0aefe7e8891a1" +checksum = "f5edaec856126859abb19ed65f39e90fea3a9574b9707f13539acf4abf7eb532" dependencies = [ "fastrand", "futures-core", @@ -1072,7 +1073,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -1181,7 +1182,19 @@ checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.13.3+wasi-0.2.2", + "windows-targets 0.52.6", ] [[package]] @@ -1228,7 +1241,7 @@ version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "futures-channel", "futures-core", "futures-executor", @@ -1256,7 +1269,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -1269,6 +1282,12 @@ dependencies = [ "system-deps", ] +[[package]] +name = "glob" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" + [[package]] name = "gobject-sys" version = "0.18.0" @@ -1329,7 +1348,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -1445,15 +1464,15 @@ dependencies = [ [[package]] name = "httparse" -version = "1.9.5" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" +checksum = "f2d708df4e7140240a16cd6ab0ab65c972d7433ab77819ea693fde9c43811e2a" [[package]] name = "hyper" -version = "1.5.2" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "256fb8d4bd6413123cc9d91832d78325c48ff41677595be797d90f42969beae0" +checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80" dependencies = [ "bytes", "futures-channel", @@ -1659,7 +1678,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -1691,9 +1710,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.7.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" +checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652" dependencies = [ "equivalent", "hashbrown 0.15.2", @@ -1711,9 +1730,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.10.1" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" +checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" dependencies = [ "serde", ] @@ -1727,22 +1746,27 @@ checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "isakmp" version = "0.1.0" -source = "git+https://github.com/ancwrd1/isakmp.git#c6360f5ac959fa386871b43ea49d92856deb0c73" +source = "git+https://github.com/ancwrd1/isakmp.git#d5f33e5605031429c474e61dfb8009953738bf01" dependencies = [ "anyhow", "async-trait", - "bitflags 2.6.0", + "bitflags 2.8.0", "byteorder", "bytes", "cryptoki", + "futures", "hex", "itertools", "openssl", "parking_lot", - "rand", + "pnet_macros", + "pnet_macros_support", + "pnet_packet", + "rand 0.9.0", "rmp-serde", "serde", "tokio", + "tokio-util", "tracing", ] @@ -1763,9 +1787,9 @@ checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" [[package]] name = "js-sys" -version = "0.3.76" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7" +checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" dependencies = [ "once_cell", "wasm-bindgen", @@ -1777,7 +1801,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "serde", "unicode-segmentation", ] @@ -1854,15 +1878,15 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "libc", ] [[package]] name = "linux-raw-sys" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" [[package]] name = "litemap" @@ -1882,9 +1906,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.22" +version = "0.4.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f" [[package]] name = "memchr" @@ -1909,9 +1933,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "miniz_oxide" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394" +checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924" dependencies = [ "adler2", "simd-adler32", @@ -1924,7 +1948,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" dependencies = [ "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.52.0", ] @@ -1949,9 +1973,9 @@ dependencies = [ [[package]] name = "native-tls" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" +checksum = "0dab59f8e050d5df8e4dd87d9206fb6f65a483e20ac9fda365ade4fab353196c" dependencies = [ "libc", "log", @@ -1970,13 +1994,19 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "cfg-if", "cfg_aliases", "libc", "memoffset", ] +[[package]] +name = "no-std-net" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43794a0ace135be66a25d3ae77d41b91615fb68ae937f904090203e81f755b65" + [[package]] name = "normpath" version = "1.3.0" @@ -2091,7 +2121,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "block2", "libc", "objc2", @@ -2107,7 +2137,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "block2", "objc2", "objc2-foundation", @@ -2127,9 +2157,9 @@ dependencies = [ [[package]] name = "objc2-encode" -version = "4.0.3" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" +checksum = "ef25abbcd74fb2609453eb695bd2f860d389e457f67dc17cafc8b8cbc89d0c33" [[package]] name = "objc2-foundation" @@ -2137,7 +2167,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "block2", "libc", "objc2", @@ -2149,7 +2179,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "block2", "objc2", "objc2-foundation", @@ -2161,7 +2191,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "block2", "objc2", "objc2-foundation", @@ -2197,11 +2227,11 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.68" +version = "0.10.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" +checksum = "61cfb4e166a8bb8c9b55c500bc2308550148ece889be90f609377e58140f42c6" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "cfg-if", "foreign-types 0.3.2", "libc", @@ -2218,23 +2248,33 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] name = "openssl-probe" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" + +[[package]] +name = "openssl-src" +version = "300.4.1+3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faa4eac4138c62414b5622d1b31c5c304f34b406b013c079c2bbc652fdd6678c" +dependencies = [ + "cc", +] [[package]] name = "openssl-sys" -version = "0.9.104" +version = "0.9.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" +checksum = "8b22d5b84be05a8d6947c7cb71f7c849aa0f112acd4bf51c2a7c1c988ac0a9dc" dependencies = [ "cc", "libc", + "openssl-src", "pkg-config", "vcpkg", ] @@ -2352,7 +2392,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b7cafe60d6cf8e62e1b9b2ea516a089c008945bb5a275416789e7db0bc199dc" dependencies = [ "memchr", - "thiserror 2.0.9", + "thiserror 2.0.11", "ucd-trie", ] @@ -2376,7 +2416,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -2419,6 +2459,48 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" +[[package]] +name = "pnet_base" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffc190d4067df16af3aba49b3b74c469e611cad6314676eaf1157f31aa0fb2f7" +dependencies = [ + "no-std-net", +] + +[[package]] +name = "pnet_macros" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13325ac86ee1a80a480b0bc8e3d30c25d133616112bb16e86f712dcf8a71c863" +dependencies = [ + "proc-macro2", + "quote", + "regex", + "syn 2.0.98", +] + +[[package]] +name = "pnet_macros_support" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eed67a952585d509dd0003049b1fc56b982ac665c8299b124b90ea2bdb3134ab" +dependencies = [ + "pnet_base", +] + +[[package]] +name = "pnet_packet" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c96ebadfab635fcc23036ba30a7d33a80c39e8461b8bd7dc7bb186acb96560f" +dependencies = [ + "glob", + "pnet_base", + "pnet_macros", + "pnet_macros_support", +] + [[package]] name = "png" version = "0.17.16" @@ -2453,7 +2535,7 @@ version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" dependencies = [ - "zerocopy", + "zerocopy 0.7.35", ] [[package]] @@ -2481,7 +2563,7 @@ version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.22.22", + "toml_edit 0.22.23", ] [[package]] @@ -2510,9 +2592,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.92" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99" dependencies = [ "unicode-ident", ] @@ -2533,8 +2615,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha", - "rand_core", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + +[[package]] +name = "rand" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94" +dependencies = [ + "rand_chacha 0.9.0", + "rand_core 0.9.0", + "zerocopy 0.8.16", ] [[package]] @@ -2544,7 +2637,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" +dependencies = [ + "ppv-lite86", + "rand_core 0.9.0", ] [[package]] @@ -2553,7 +2656,17 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom", + "getrandom 0.2.15", +] + +[[package]] +name = "rand_core" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b08f3c9802962f7e1b25113931d94f43ed9725bebc59db9d0c3e9a23b67e15ff" +dependencies = [ + "getrandom 0.3.1", + "zerocopy 0.8.16", ] [[package]] @@ -2562,7 +2675,7 @@ version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", ] [[package]] @@ -2571,7 +2684,7 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ - "getrandom", + "getrandom 0.2.15", "libredox", "thiserror 1.0.69", ] @@ -2657,7 +2770,7 @@ checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", "cfg-if", - "getrandom", + "getrandom 0.2.15", "libc", "spin", "untrusted", @@ -2703,11 +2816,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.42" +version = "0.38.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" +checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "errno", "libc", "linux-raw-sys", @@ -2716,9 +2829,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.20" +version = "0.23.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5065c3f250cbd332cd894be57c40fa52387247659b14a2d6041d121547903b1b" +checksum = "9fb9263ab4eb695e42321db096e3b8fbd715a59b154d5c88d82db2175b681ba7" dependencies = [ "once_cell", "rustls-pki-types", @@ -2738,9 +2851,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37" +checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c" [[package]] name = "rustls-webpki" @@ -2754,10 +2867,16 @@ dependencies = [ ] [[package]] -name = "ryu" -version = "1.0.18" +name = "rustversion" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" +checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4" + +[[package]] +name = "ryu" +version = "1.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd" [[package]] name = "schannel" @@ -2796,7 +2915,7 @@ dependencies = [ "hkdf", "num", "once_cell", - "rand", + "rand 0.8.5", "serde", "sha2", "zbus 4.4.0", @@ -2808,7 +2927,7 @@ version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "core-foundation 0.9.4", "core-foundation-sys", "libc", @@ -2817,9 +2936,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.13.0" +version = "2.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1863fd3768cd83c56a7f60faa4dc0d403f1b6df0a38c3c25f44b7894e45370d5" +checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32" dependencies = [ "core-foundation-sys", "libc", @@ -2827,9 +2946,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.24" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba" +checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03" [[package]] name = "serde" @@ -2848,14 +2967,14 @@ checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] name = "serde_json" -version = "1.0.135" +version = "1.0.138" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9" +checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949" dependencies = [ "itoa", "memchr", @@ -2871,7 +2990,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -2970,7 +3089,7 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "snx-rs" -version = "2.9.0" +version = "3.0.3" dependencies = [ "anyhow", "clap", @@ -2985,7 +3104,7 @@ dependencies = [ [[package]] name = "snx-rs-gui" -version = "2.9.0" +version = "3.0.3" dependencies = [ "anyhow", "async-channel", @@ -3001,12 +3120,12 @@ dependencies = [ "tracing", "tracing-subscriber", "tray-icon", - "zbus 5.2.0", + "zbus 5.3.1", ] [[package]] name = "snxcore" -version = "2.9.0" +version = "3.0.3" dependencies = [ "anyhow", "async-recursion", @@ -3027,11 +3146,13 @@ dependencies = [ "num-traits", "once_cell", "opener", + "openssl", + "openssl-sys", "parse_int", "passterm", "pest", "pest_derive", - "rand", + "rand 0.9.0", "regex", "reqwest", "secret-service", @@ -3044,12 +3165,12 @@ dependencies = [ "tracing", "tun", "uuid", - "zbus 5.2.0", + "zbus 5.3.1", ] [[package]] name = "snxctl" -version = "2.9.0" +version = "3.0.3" dependencies = [ "anyhow", "clap", @@ -3112,9 +3233,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.95" +version = "2.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" +checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1" dependencies = [ "proc-macro2", "quote", @@ -3138,7 +3259,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -3147,7 +3268,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "core-foundation 0.9.4", "system-configuration-sys", ] @@ -3183,13 +3304,13 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tempfile" -version = "3.15.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a8a559c81686f576e8cd0290cd2a24a2a9ad80c98b3478856500fcbd7acd704" +checksum = "38c246215d7d24f48ae091a2902398798e05d978b24315d6efbc00ede9a8bb91" dependencies = [ "cfg-if", "fastrand", - "getrandom", + "getrandom 0.3.1", "once_cell", "rustix", "windows-sys 0.59.0", @@ -3206,11 +3327,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.9" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc" +checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc" dependencies = [ - "thiserror-impl 2.0.9", + "thiserror-impl 2.0.11", ] [[package]] @@ -3221,18 +3342,18 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] name = "thiserror-impl" -version = "2.0.9" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4" +checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -3257,9 +3378,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.42.0" +version = "1.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" +checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e" dependencies = [ "backtrace", "bytes", @@ -3276,13 +3397,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -3327,7 +3448,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.22", + "toml_edit 0.22.23", ] [[package]] @@ -3363,15 +3484,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.22" +version = "0.22.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" +checksum = "02a8b472d1a3d7c18e2d61a489aee3453fd9031c33e4f55bd533f4a7adca1bee" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.22", + "winnow 0.7.1", ] [[package]] @@ -3420,7 +3541,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -3486,9 +3607,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tun" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b5ea2466ffcdd0be0831f7d3981daa0b953586c0062f6d33398cb374689b090" +checksum = "0df2e279123d6a96b1611b1d2bc126323900f970819fea3c5c2ed0c657fa2132" dependencies = [ "bytes", "cfg-if", @@ -3498,7 +3619,7 @@ dependencies = [ "libc", "log", "nix", - "thiserror 2.0.9", + "thiserror 2.0.11", "tokio", "tokio-util", "windows-sys 0.59.0", @@ -3530,9 +3651,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.14" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" +checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034" [[package]] name = "unicode-segmentation" @@ -3577,19 +3698,19 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.11.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" +checksum = "b3758f5e68192bb96cc8f9b7e2c2cfdabb435499a28499a42f8f984092adad4b" dependencies = [ - "getrandom", + "getrandom 0.2.15", "sha1_smol", ] [[package]] name = "valuable" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" +checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" [[package]] name = "vcpkg" @@ -3625,35 +3746,45 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] -name = "wasm-bindgen" -version = "0.2.99" +name = "wasi" +version = "0.13.3+wasi-0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396" +checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2" +dependencies = [ + "wit-bindgen-rt", +] + +[[package]] +name = "wasm-bindgen" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" dependencies = [ "cfg-if", "once_cell", + "rustversion", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" dependencies = [ "bumpalo", "log", "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.49" +version = "0.4.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2" +checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61" dependencies = [ "cfg-if", "js-sys", @@ -3664,9 +3795,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3674,28 +3805,31 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] [[package]] name = "web-sys" -version = "0.3.76" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc" +checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" dependencies = [ "js-sys", "wasm-bindgen", @@ -3931,18 +4065,27 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.22" +version = "0.6.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39281189af81c07ec09db316b302a3e67bf9bd7cbf6c820b50e35fee9c2fa980" +checksum = "1e90edd2ac1aa278a5c4599b1d89cf03074b610800f866d4026dc199d7929a28" dependencies = [ "memchr", ] [[package]] -name = "winreg2" -version = "0.53.1" +name = "winnow" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e25225e44ce2ac6b72befed6416b0857cf8663f9963dba572c39473062f0e625" +checksum = "86e376c75f4f43f44db463cf729e0d3acbf954d13e22c51e26e4c264b4ab545f" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.55.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb5a765337c50e9ec252c2069be9bf91c7df47afb103b642ba3a53bf8101be97" dependencies = [ "cfg-if", "windows-sys 0.59.0", @@ -3950,18 +4093,27 @@ dependencies = [ [[package]] name = "wintun-bindings" -version = "0.7.27" +version = "0.7.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e35d3911efde5ee25586385204127ff6a3f251477dcdd3b222775aaa4d95977" +checksum = "67a02981bed4592bcd271f9bfe154228ddbd2fd69e37a7d358da5d3a1251d696" dependencies = [ "blocking", "c2rust-bitfields", "futures", "libloading 0.8.6", "log", - "thiserror 2.0.9", + "thiserror 2.0.11", "windows-sys 0.59.0", - "winreg2", + "winreg", +] + +[[package]] +name = "wit-bindgen-rt" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c" +dependencies = [ + "bitflags 2.8.0", ] [[package]] @@ -4006,7 +4158,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", "synstructure", ] @@ -4028,7 +4180,7 @@ dependencies = [ "hex", "nix", "ordered-stream", - "rand", + "rand 0.8.5", "serde", "serde_repr", "sha1", @@ -4045,9 +4197,9 @@ dependencies = [ [[package]] name = "zbus" -version = "5.2.0" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb67eadba43784b6fb14857eba0d8fc518686d3ee537066eb6086dc318e2c8a1" +checksum = "2494e4b3f44d8363eef79a8a75fc0649efb710eef65a66b5e688a5eb4afe678a" dependencies = [ "async-broadcast", "async-recursion", @@ -4066,11 +4218,11 @@ dependencies = [ "tracing", "uds_windows", "windows-sys 0.59.0", - "winnow 0.6.22", + "winnow 0.6.26", "xdg-home", - "zbus_macros 5.2.0", - "zbus_names 4.1.0", - "zvariant 5.1.0", + "zbus_macros 5.3.1", + "zbus_names 4.1.1", + "zvariant 5.2.0", ] [[package]] @@ -4082,23 +4234,23 @@ dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", "zvariant_utils 2.1.0", ] [[package]] name = "zbus_macros" -version = "5.2.0" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d49ebc960ceb660f2abe40a5904da975de6986f2af0d7884b39eec6528c57" +checksum = "445efc01929302aee95e2b25bbb62a301ea8a6369466e4278e58e7d1dfb23631" dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.95", - "zbus_names 4.1.0", - "zvariant 5.1.0", - "zvariant_utils 3.0.2", + "syn 2.0.98", + "zbus_names 4.1.1", + "zvariant 5.2.0", + "zvariant_utils 3.1.0", ] [[package]] @@ -4114,14 +4266,14 @@ dependencies = [ [[package]] name = "zbus_names" -version = "4.1.0" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "856b7a38811f71846fd47856ceee8bccaec8399ff53fb370247e66081ace647b" +checksum = "519629a3f80976d89c575895b05677cbc45eaf9f70d62a364d819ba646409cc8" dependencies = [ "serde", "static_assertions", - "winnow 0.6.22", - "zvariant 5.1.0", + "winnow 0.6.26", + "zvariant 5.2.0", ] [[package]] @@ -4131,7 +4283,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "byteorder", - "zerocopy-derive", + "zerocopy-derive 0.7.35", +] + +[[package]] +name = "zerocopy" +version = "0.8.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b8c07a70861ce02bad1607b5753ecb2501f67847b9f9ada7c160fff0ec6300c" +dependencies = [ + "zerocopy-derive 0.8.16", ] [[package]] @@ -4142,7 +4303,18 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", +] + +[[package]] +name = "zerocopy-derive" +version = "0.8.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5226bc9a9a9836e7428936cde76bb6b22feea1a8bfdbc0d241136e4d13417e25" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.98", ] [[package]] @@ -4162,7 +4334,7 @@ checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", "synstructure", ] @@ -4191,7 +4363,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -4209,17 +4381,17 @@ dependencies = [ [[package]] name = "zvariant" -version = "5.1.0" +version = "5.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1200ee6ac32f1e5a312e455a949a4794855515d34f9909f4a3e082d14e1a56f" +checksum = "55e6b9b5f1361de2d5e7d9fd1ee5f6f7fcb6060618a1f82f3472f58f2b8d4be9" dependencies = [ "endi", "enumflags2", "serde", "static_assertions", - "winnow 0.6.22", - "zvariant_derive 5.1.0", - "zvariant_utils 3.0.2", + "winnow 0.6.26", + "zvariant_derive 5.2.0", + "zvariant_utils 3.1.0", ] [[package]] @@ -4231,21 +4403,21 @@ dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", "zvariant_utils 2.1.0", ] [[package]] name = "zvariant_derive" -version = "5.1.0" +version = "5.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "687e3b97fae6c9104fbbd36c73d27d149abf04fb874e2efbd84838763daa8916" +checksum = "573a8dd76961957108b10f7a45bac6ab1ea3e9b7fe01aff88325dc57bb8f5c8b" dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.95", - "zvariant_utils 3.0.2", + "syn 2.0.98", + "zvariant_utils 3.1.0", ] [[package]] @@ -4256,19 +4428,19 @@ checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] name = "zvariant_utils" -version = "3.0.2" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20d1d011a38f12360e5fcccceeff5e2c42a8eb7f27f0dcba97a0862ede05c9c6" +checksum = "ddd46446ea2a1f353bfda53e35f17633afa79f4fe290a611c94645c69fe96a50" dependencies = [ "proc-macro2", "quote", "serde", "static_assertions", - "syn 2.0.95", - "winnow 0.6.22", + "syn 2.0.98", + "winnow 0.6.26", ] diff --git a/pkgs/by-name/sn/snx-rs/package.nix b/pkgs/by-name/sn/snx-rs/package.nix index 73a5539193fc..dc36f8bd2c13 100644 --- a/pkgs/by-name/sn/snx-rs/package.nix +++ b/pkgs/by-name/sn/snx-rs/package.nix @@ -18,13 +18,13 @@ }: rustPlatform.buildRustPackage rec { pname = "snx-rs"; - version = "2.9.0"; + version = "3.0.3"; src = fetchFromGitHub { owner = "ancwrd1"; repo = "snx-rs"; - rev = "v2.9.0"; - hash = "sha256-9uTawt9Lk3YJbw8hzrP91bEaPGT1wZehrmCWDKYrw5w="; + tag = "v${version}"; + hash = "sha256-TrA0uwzBhITCQ0ql8z1og1iNbH4eJlmzXFPbOpnN5do="; }; passthru.updateScript = nix-update-script { }; @@ -59,7 +59,7 @@ rustPlatform.buildRustPackage rec { cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "isakmp-0.1.0" = "sha256-H8yLwIUzlaPA0kJEfdGn8jvSjs27zWeIFdHlF3HitRk="; + "isakmp-0.1.0" = "sha256-S34NN57l5MzyGXso01GSMCGPiYYEJc1mDluXoWQ0Y1k="; }; }; From ba5135dd8040ef300e515b46cf5992f8eb67e514 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 15:58:19 +0000 Subject: [PATCH 0953/2168] nezha-theme-nazhua: 0.5.6 -> 0.5.7 --- pkgs/by-name/ne/nezha-theme-nazhua/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/nezha-theme-nazhua/package.nix b/pkgs/by-name/ne/nezha-theme-nazhua/package.nix index ed654b29d954..addda09564c0 100644 --- a/pkgs/by-name/ne/nezha-theme-nazhua/package.nix +++ b/pkgs/by-name/ne/nezha-theme-nazhua/package.nix @@ -12,13 +12,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "nezha-theme-nazhua"; - version = "0.5.6"; + version = "0.5.7"; src = fetchFromGitHub { owner = "hi2shark"; repo = "nazhua"; tag = "v${finalAttrs.version}"; - hash = "sha256-HqNiXkj3GLw5MlQu2fREwUYpT35txopli9SZcFCM90w="; + hash = "sha256-DkM+BV0Qw8vpSjxiHFcYUauP9SaiSDhAgKz+13tEsDI="; }; yarnOfflineCache = fetchYarnDeps { From 1ba6c7754fb6278c15f9c68360e6bfa4b0381d14 Mon Sep 17 00:00:00 2001 From: tklk Date: Mon, 10 Feb 2025 16:02:49 +0000 Subject: [PATCH 0954/2168] flintlock: 0.8.0 -> 0.8.1 Diff: https://github.com/weaveworks/flintlock/compare/v0.8.0...v0.8.1 --- pkgs/by-name/fl/flintlock/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fl/flintlock/package.nix b/pkgs/by-name/fl/flintlock/package.nix index 8a2f29cfb4e5..dccfa5f33a5d 100644 --- a/pkgs/by-name/fl/flintlock/package.nix +++ b/pkgs/by-name/fl/flintlock/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "flintlock"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "weaveworks"; repo = "flintlock"; rev = "v${version}"; - sha256 = "sha256-dBwuguOSIc4+cdxfW91kdyprayYu2m2WjBg3qBnVM98="; + sha256 = "sha256-Kbk94sqj0aPsVonPsiu8kbjhIOURB1kX9Lt3NURL+jk="; }; vendorHash = "sha256-Iv1qHEQLgw6huCA/6PKNmm+dS2yHgOvY/oy2fKjwEpY="; From 32e09278844c1bdb22d191710da4e87e60d35a55 Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Mon, 10 Feb 2025 15:17:05 +0100 Subject: [PATCH 0955/2168] Revert "electrum: fixup Exec lines in .desktop" This reverts commit a879c725525b2321f505519ff0c71f182518f438. It is no longer needed, as electrum removed the PATH manipulation: https://github.com/spesmilo/electrum/commit/f15abd7cbd55c82833ad621754d3420895414f75 However, this commit also deviates from a plain revert, as it adds an additional replacement command to still substitute the `--testnet` command line, as it was done before. Note: Those `--replace` calls are removed here in order to stricten substitute calls with `--replace-fail` in a follow-up commit. --- pkgs/applications/misc/electrum/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 219046157cf8..a0aa8aa031e4 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -108,10 +108,8 @@ python3.pkgs.buildPythonApplication rec { postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace $out/share/applications/electrum.desktop \ - --replace 'Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum %u"' \ - "Exec=$out/bin/electrum %u" \ - --replace 'Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum --testnet %u"' \ - "Exec=$out/bin/electrum --testnet %u" + --replace "Exec=electrum %u" "Exec=$out/bin/electrum %u" \ + --replace "Exec=electrum --testnet %u" "Exec=$out/bin/electrum --testnet %u" ''; postFixup = lib.optionalString enableQt '' From b0c4f34b535c4400f60bc4aa568adb39d53e2620 Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Mon, 10 Feb 2025 15:32:09 +0100 Subject: [PATCH 0956/2168] electrum: substitute with `--replace-fail` The old `--replace` is deprecated, we use `--replace-fail` so changes in source code that might invalidate substitute invocations get noticed. Cf. commit e07a2fab7f065c3fa084027f07dcf8cafbd19394 . --- pkgs/applications/misc/electrum/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index a0aa8aa031e4..410cb3066189 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -87,18 +87,18 @@ python3.pkgs.buildPythonApplication rec { '' # make compatible with protobuf4 by easing dependencies ... substituteInPlace ./contrib/requirements/requirements.txt \ - --replace "protobuf>=3.20,<4" "protobuf>=3.20" + --replace-fail "protobuf>=3.20,<4" "protobuf>=3.20" # ... and regenerating the paymentrequest_pb2.py file protoc --python_out=. electrum/paymentrequest.proto substituteInPlace ./electrum/ecc_fast.py \ - --replace ${libsecp256k1_name} ${secp256k1}/lib/libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary} + --replace-fail ${libsecp256k1_name} ${secp256k1}/lib/libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary} '' + ( if enableQt then '' substituteInPlace ./electrum/qrscanner.py \ - --replace ${libzbar_name} ${zbar.lib}/lib/libzbar${stdenv.hostPlatform.extensions.sharedLibrary} + --replace-fail ${libzbar_name} ${zbar.lib}/lib/libzbar${stdenv.hostPlatform.extensions.sharedLibrary} '' else '' @@ -108,8 +108,8 @@ python3.pkgs.buildPythonApplication rec { postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace $out/share/applications/electrum.desktop \ - --replace "Exec=electrum %u" "Exec=$out/bin/electrum %u" \ - --replace "Exec=electrum --testnet %u" "Exec=$out/bin/electrum --testnet %u" + --replace-fail "Exec=electrum %u" "Exec=$out/bin/electrum %u" \ + --replace-fail "Exec=electrum --testnet %u" "Exec=$out/bin/electrum --testnet %u" ''; postFixup = lib.optionalString enableQt '' From e3d7bbab8b3bad048037823b6200ae17471225d5 Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Mon, 10 Feb 2025 15:39:10 +0100 Subject: [PATCH 0957/2168] electrum: patch for aiorpcx 0.24 compatibility electrum is quite strict about the aiorpcx version is accepts. With commit 4bbf5300d44ee9420a59650ba668f70e3f101bde , Upstream already has a patch to extend the range of aiorpcx versions it permits: https://github.com/spesmilo/electrum/commit/171aa5ee5ad4e25b9da10f757d9d398e905b4945 As the patch does not cleanly apply to the distribution tarball we're using, we instead apply the required changes "by hand", with `substituteInPlace`. On top of the changes adapted from the upstream commit, we have to change the file `./electrum/electrum`: It is not part of the upstream source repository, but it gets created from `./run_electrum` when upstream creates the distribution tarball. Note that the commit at hand is similar to 0e513f0435b2edb2c53412df873b46c583b0f9b5 . --- pkgs/applications/misc/electrum/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 410cb3066189..43defb195023 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -85,6 +85,17 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' + # fix compatibility with recent aiorpcx version + # (remove as soon as https://github.com/spesmilo/electrum/commit/171aa5ee5ad4e25b9da10f757d9d398e905b4945 is included in source tarball) + substituteInPlace ./contrib/requirements/requirements.txt \ + --replace-fail "aiorpcx>=0.22.0,<0.24" "aiorpcx>=0.22.0,<0.25" + substituteInPlace ./run_electrum \ + --replace-fail "if not ((0, 22, 0) <= aiorpcx._version < (0, 24)):" "if not ((0, 22, 0) <= aiorpcx._version < (0, 25)):" \ + --replace-fail "aiorpcX version {aiorpcx._version} does not match required: 0.22.0<=ver<0.24" "aiorpcX version {aiorpcx._version} does not match required: 0.22.0<=ver<0.25" + substituteInPlace ./electrum/electrum \ + --replace-fail "if not ((0, 22, 0) <= aiorpcx._version < (0, 24)):" "if not ((0, 22, 0) <= aiorpcx._version < (0, 25)):" \ + --replace-fail "aiorpcX version {aiorpcx._version} does not match required: 0.22.0<=ver<0.24" "aiorpcX version {aiorpcx._version} does not match required: 0.22.0<=ver<0.25" + # make compatible with protobuf4 by easing dependencies ... substituteInPlace ./contrib/requirements/requirements.txt \ --replace-fail "protobuf>=3.20,<4" "protobuf>=3.20" From c0001d1a78dc77b717f4d6576720c2cd37c20114 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 16:31:06 +0000 Subject: [PATCH 0958/2168] tela-icon-theme: 2024-09-04 -> 2025-02-10 --- pkgs/by-name/te/tela-icon-theme/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/te/tela-icon-theme/package.nix b/pkgs/by-name/te/tela-icon-theme/package.nix index fbf67aef18ac..c202c013adec 100644 --- a/pkgs/by-name/te/tela-icon-theme/package.nix +++ b/pkgs/by-name/te/tela-icon-theme/package.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation rec { pname = "tela-icon-theme"; - version = "2024-09-04"; + version = "2025-02-10"; src = fetchFromGitHub { owner = "vinceliuice"; repo = "tela-icon-theme"; rev = version; - hash = "sha256-ZzF4U/cTy/7oSDQs4+dezewgNzS5zroba8wpcfPciW4="; + hash = "sha256-ufjKFlKJnmNwD2m1w+7JSBQij6ltxXWCpUEvVxECS98="; }; nativeBuildInputs = [ From f7408d31489c6e19d165f15ca0a988618df9df65 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron <886074+teto@users.noreply.github.com> Date: Mon, 10 Feb 2025 17:41:54 +0100 Subject: [PATCH 0959/2168] =?UTF-8?q?vimPlugins.rocks-nvim:=20add=20initLu?= =?UTF-8?q?a=20for=20a=20working=20out=20of=20the=20box=20exper=E2=80=A6?= =?UTF-8?q?=20(#375083)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit vimPlugins.rocks-nvim: add initLua for a working out of the box experience added a test as well. Using NVIM_APPNAME to run "neovim.tests.nvim_with_rocks_nvim" in a minimal sandbox. --- .../editors/neovim/tests/default.nix | 12 ++++++++++++ .../editors/vim/plugins/overrides.nix | 18 +++++++++++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/neovim/tests/default.nix b/pkgs/applications/editors/neovim/tests/default.nix index c6579c9ad17b..14d9803ee2d9 100644 --- a/pkgs/applications/editors/neovim/tests/default.nix +++ b/pkgs/applications/editors/neovim/tests/default.nix @@ -103,6 +103,13 @@ let ${pkgs.perl}/bin/perl -pe "s|\Q$NIX_STORE\E/[a-z0-9]{32}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" < "$luarc" > "$luarcGeneric" '' + buildCommand); + nvim_with_rocks_nvim = ( + wrapNeovimUnstable neovim-unwrapped { + extraName = "with-rocks-nvim"; + wrapperArgs = "--set NVIM_APPNAME test-rocks-nvim"; + plugins = [ vimPlugins.rocks-nvim ]; + } + ); in pkgs.recurseIntoAttrs (rec { @@ -367,5 +374,10 @@ in ${nvim-with-luasnip}/bin/nvim -i NONE --cmd "lua require'jsregexp'" -e +quitall! ''; + inherit nvim_with_rocks_nvim; + rocks_install_plenary = runTest nvim_with_rocks_nvim '' + ${nvim_with_rocks_nvim}/bin/nvim -V3log.txt -i NONE +'Rocks install plenary.nvim' +quit! -e + ''; + inherit (vimPlugins) corePlugins; }) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index d4ce6ebd97c9..27e72add1390 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -4019,7 +4019,6 @@ in "papis-nvim" "rest-nvim" "rocks-config-nvim" - "rocks-nvim" "rtp-nvim" "telescope-manix" "telescope-nvim" @@ -4032,3 +4031,20 @@ in in lib.genAttrs luarocksPackageNames toVimPackage ) +// { + + rocks-nvim = + (neovimUtils.buildNeovimPlugin { + luaAttr = luaPackages.rocks-nvim; + }).overrideAttrs + (oa: { + passthru = oa.passthru // { + initLua = '' + vim.g.rocks_nvim = { + luarocks_binary = "${neovim-unwrapped.lua.pkgs.luarocks_bootstrap}/bin/luarocks" + } + ''; + }; + + }); +} From c1840294b5084b5bb616b5403925bd46dd5ac319 Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Mon, 10 Feb 2025 18:43:39 +0200 Subject: [PATCH 0960/2168] mattermost-desktop: fix version matching in the update script Avoid matching pre- and nightly releases. --- pkgs/by-name/ma/mattermost-desktop/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ma/mattermost-desktop/package.nix b/pkgs/by-name/ma/mattermost-desktop/package.nix index 8dc369dd08b9..ad141c593e89 100644 --- a/pkgs/by-name/ma/mattermost-desktop/package.nix +++ b/pkgs/by-name/ma/mattermost-desktop/package.nix @@ -86,7 +86,9 @@ buildNpmPackage rec { # Invoking with `--version` insists on being able to write to a log file. command = "env HOME=/tmp ${meta.mainProgram} --version"; }; - updateScript = nix-update-script { }; + updateScript = nix-update-script { + extraArgs = [ "--version-regex=^(\\d+\\.\\d+\\.\\d+)$" ]; + }; }; meta = { From e803927113c284a2faa76bb335f8989ad8d7c079 Mon Sep 17 00:00:00 2001 From: denast Date: Mon, 10 Feb 2025 11:45:21 -0500 Subject: [PATCH 0961/2168] fusuma: 3.5.0 -> 3.7.0 --- pkgs/by-name/fu/fusuma/Gemfile.lock | 2 +- pkgs/by-name/fu/fusuma/gemset.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fu/fusuma/Gemfile.lock b/pkgs/by-name/fu/fusuma/Gemfile.lock index b89e3c94971d..8b4fe181b2ec 100644 --- a/pkgs/by-name/fu/fusuma/Gemfile.lock +++ b/pkgs/by-name/fu/fusuma/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - fusuma (3.5.0) + fusuma (3.7.0) fusuma-plugin-appmatcher (0.7.1) fusuma (>= 3.0) rexml diff --git a/pkgs/by-name/fu/fusuma/gemset.nix b/pkgs/by-name/fu/fusuma/gemset.nix index f1664a2149cc..4361532705fc 100644 --- a/pkgs/by-name/fu/fusuma/gemset.nix +++ b/pkgs/by-name/fu/fusuma/gemset.nix @@ -4,10 +4,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0vxlfda4mgff9kindrmr47xvn6b591hzvzzsx2y88zq20sn340vy"; + sha256 = "1h8lj3g5q6cg6lf5axnbw4bpvml3xkf3ipbviw5mg1jh9r3apk5m"; type = "gem"; }; - version = "3.5.0"; + version = "3.7.0"; }; fusuma-plugin-appmatcher = { dependencies = [ From f62d221cda5b336434b665b9fb9ac276c942476c Mon Sep 17 00:00:00 2001 From: Levizor Date: Mon, 10 Feb 2025 15:43:30 +0100 Subject: [PATCH 0962/2168] hyprland-workspaces-tui: 1.0.2 -> 1.1.0 --- .../hy/hyprland-workspaces-tui/package.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/hy/hyprland-workspaces-tui/package.nix b/pkgs/by-name/hy/hyprland-workspaces-tui/package.nix index 7b90e5d252d8..b4ad6f1ad75c 100644 --- a/pkgs/by-name/hy/hyprland-workspaces-tui/package.nix +++ b/pkgs/by-name/hy/hyprland-workspaces-tui/package.nix @@ -4,27 +4,38 @@ fetchFromGitHub, makeWrapper, hyprland-workspaces, + installShellFiles, nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "hyprland-workspaces-tui"; - version = "1.0.2"; + version = "1.1.0"; src = fetchFromGitHub { owner = "Levizor"; repo = "hyprland-workspaces-tui"; tag = version; - hash = "sha256-3QmqoyWmtC4ps8dtIWEoLjzdzKAXOujyz+GgOlo172Q="; + hash = "sha256-QMwiBQGAybdL8FaUil6tFzSFg4nN/9mGVoqiDFwGZec="; }; useFetchCargoVendor = true; - cargoHash = "sha256-VjYLqRXJhR8MZD+qcwqgw36Xh0RafJeAnuHzO+pab4s="; + cargoHash = "sha256-aT8LfBVOEVUvzgPlBIOXTgT+WXEt3vHMDyCcl9jT5/E="; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + makeWrapper + installShellFiles + ]; buildInputs = [ hyprland-workspaces ]; + postInstall = '' + installShellCompletion --cmd hyprland-workspaces-tui \ + --bash <($out/bin/hyprland-workspaces-tui --completions bash) \ + --zsh <($out/bin/hyprland-workspaces-tui --completions zsh) \ + --fish <($out/bin/hyprland-workspaces-tui --completions fish) + ''; + postFixup = '' wrapProgram $out/bin/hyprland-workspaces-tui \ --suffix PATH : ${lib.makeBinPath [ hyprland-workspaces ]} From f8bd998b4e6926445ab0fd7c95e1e29687c8edcf Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 10 Feb 2025 17:52:33 +0100 Subject: [PATCH 0963/2168] python3Packages.jax-cuda12-pjrt: don't try to build on aarch64-linux --- .../python-modules/jax-cuda12-pjrt/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix b/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix index b22e6fc6350f..bb0a01b2af4f 100644 --- a/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix +++ b/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix @@ -29,16 +29,16 @@ let # When upgrading, you can get these hashes from jaxlib/prefetch.sh. See # https://github.com/google/jax/issues/12879 as to why this specific URL is the correct index. - # upstream does not distribute jax-cuda12-pjrt 0.4.38 binaries for aarch64-linux + # upstream does not distribute jax-cuda12-pjrt binaries for aarch64-linux srcs = { "x86_64-linux" = fetchurl { url = "https://storage.googleapis.com/jax-releases/cuda12_plugin/jax_cuda12_pjrt-${version}-py3-none-manylinux2014_x86_64.whl"; hash = "sha256-0jgzwbiF2WwnZAAOlQUvK1gnx31JLqaPZ+kDoTJlbbs="; }; - "aarch64-linux" = fetchurl { - url = "https://storage.googleapis.com/jax-releases/cuda12_plugin/jax_cuda12_pjrt-${version}-py3-none-manylinux2014_aarch64.whl"; - hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; - }; + # "aarch64-linux" = fetchurl { + # url = "https://storage.googleapis.com/jax-releases/cuda12_plugin/jax_cuda12_pjrt-${version}-py3-none-manylinux2014_aarch64.whl"; + # hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; + # }; }; in buildPythonPackage { From 36ad837a43f7565ff5e0f7c724fbf9b7d5c6ff8d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 16:55:45 +0000 Subject: [PATCH 0964/2168] q2pro: 0-unstable-2025-01-02 -> 0-unstable-2025-02-05 --- pkgs/by-name/q2/q2pro/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/q2/q2pro/package.nix b/pkgs/by-name/q2/q2pro/package.nix index bfbc24297da3..814414616190 100644 --- a/pkgs/by-name/q2/q2pro/package.nix +++ b/pkgs/by-name/q2/q2pro/package.nix @@ -30,18 +30,18 @@ stdenv.mkDerivation (finalAttrs: rec { pname = "q2pro"; - version = "0-unstable-2025-01-02"; + version = "0-unstable-2025-02-05"; src = fetchFromGitHub { owner = "skullernet"; repo = "q2pro"; - rev = "5b2d9f29aa9fb07cfe2b4ba9ee628a0153e759c2"; - hash = "sha256-vz7f6isv3pcMtr3hO96sV1G2F94/w431FxtB6DcpCVU="; + rev = "6e505b11f570c6f3fcce05959d789cec5da87c2d"; + hash = "sha256-ioqUCNulUs7oSQVc9ElJu72sY838bEFvAbFZV+2UFRU="; }; # build date and rev number is displayed in the game's console - revCount = "3660"; # git rev-list --count ${src.rev} - SOURCE_DATE_EPOCH = "1735838714"; # git show -s --format=%ct ${src.rev} + revCount = "3671"; # git rev-list --count ${src.rev} + SOURCE_DATE_EPOCH = "1738774402"; # git show -s --format=%ct ${src.rev} nativeBuildInputs = [ From 0d2649a0b83d58d9402254b1aebb4d4c9c72eae0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 17:00:45 +0000 Subject: [PATCH 0965/2168] cirrus-cli: 0.135.0 -> 0.137.3 --- pkgs/by-name/ci/cirrus-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ci/cirrus-cli/package.nix b/pkgs/by-name/ci/cirrus-cli/package.nix index 548a364c28b8..0a9feac0215d 100644 --- a/pkgs/by-name/ci/cirrus-cli/package.nix +++ b/pkgs/by-name/ci/cirrus-cli/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.135.0"; + version = "0.137.3"; src = fetchFromGitHub { owner = "cirruslabs"; repo = "cirrus-cli"; rev = "v${version}"; - hash = "sha256-s7nJ6fhmVZf/+uuN7rW+lq0Xvlz9p425yQNzoTRxTLo="; + hash = "sha256-7yI0dcE6hxfAZeZ5ylw5s6CBye1hTSW/nLtFZs4k/xw="; }; - vendorHash = "sha256-FMUBwrY5PJLsd507340PC+f0f9PzPblFYpnNi6hiNeM="; + vendorHash = "sha256-GjCwH0Xe9wyacfokI5EzF2TKUnSMKCdOljahChPBlso="; ldflags = [ "-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}" From 5156904c711d340e303ad800b94369b3a7085e42 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 11 Feb 2025 03:05:17 +1000 Subject: [PATCH 0966/2168] kubernetes-controller-tools: 0.17.1 -> 0.17.2 (#380899) Co-authored-by: Sandro --- .../by-name/ku/kubernetes-controller-tools/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ku/kubernetes-controller-tools/package.nix b/pkgs/by-name/ku/kubernetes-controller-tools/package.nix index 8fa94f902d1f..6d92be797503 100644 --- a/pkgs/by-name/ku/kubernetes-controller-tools/package.nix +++ b/pkgs/by-name/ku/kubernetes-controller-tools/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "controller-tools"; - version = "0.17.1"; + version = "0.17.2"; src = fetchFromGitHub { owner = "kubernetes-sigs"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-6tqUWsI8SJsBOUO9i+czilOJWlflZ8Sj/rdnZaLJeSQ="; + repo = "controller-tools"; + tag = "v${version}"; + sha256 = "sha256-AUYduzIEWCJDskoChXmQViR5ON4YZr4MKvFys03hBkY="; }; - vendorHash = "sha256-NX4e//77G+jTL2309x6+UEmFarsNWO/n0Pex2pJ+S/s="; + vendorHash = "sha256-Y7xYmD3fxAIo/NyLzBuSdbHIrduJ33SpK2I6LfOzNac="; ldflags = [ "-s" From 298a47d4af43e388dfc306753ef3d306802dc20e Mon Sep 17 00:00:00 2001 From: ash Date: Mon, 10 Feb 2025 17:06:39 +0000 Subject: [PATCH 0967/2168] vorta: fix icons --- pkgs/applications/backup/vorta/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix index 51991069e0c4..90fc8730176c 100644 --- a/pkgs/applications/backup/vorta/default.nix +++ b/pkgs/applications/backup/vorta/default.nix @@ -9,6 +9,7 @@ versionCheckHook, makeFontsConf, qtbase, + qtsvg, }: python3Packages.buildPythonApplication rec { @@ -27,9 +28,13 @@ python3Packages.buildPythonApplication rec { wrapQtAppsHook ]; - buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ - qtwayland - ]; + buildInputs = + [ + qtsvg + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + qtwayland + ]; build-system = with python3Packages; [ setuptools From dac41491e8329c92dbd9e46415660b988d19f437 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 10 Feb 2025 15:10:12 +0100 Subject: [PATCH 0968/2168] python313Packages.marshmallow: 3.21.1 -> 3.26.1 netapp-ontap requires at least 3.21.3 --- pkgs/development/python-modules/marshmallow/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix index f062aafee9e9..4b67ac402089 100644 --- a/pkgs/development/python-modules/marshmallow/default.nix +++ b/pkgs/development/python-modules/marshmallow/default.nix @@ -5,23 +5,19 @@ flit-core, packaging, pytestCheckHook, - pythonOlder, - pytz, simplejson, }: buildPythonPackage rec { pname = "marshmallow"; - version = "3.21.1"; + version = "3.26.1"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "marshmallow-code"; repo = "marshmallow"; tag = version; - hash = "sha256-KhXasYKooZRokRoFlWKOaQzSUe6tXDtUlrf65eGGUi8="; + hash = "sha256-l5pEhv8D6jRlU24SlsGQEkXda/b7KUdP9mAqrZCbl38="; }; nativeBuildInputs = [ flit-core ]; @@ -30,7 +26,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytz simplejson ]; From b22a08744b284084181fe6170c73369a3d2f73c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 10 Feb 2025 15:14:46 +0100 Subject: [PATCH 0969/2168] python313Packages.netapp-ontap: cleanup dependencies, update homepage --- pkgs/development/python-modules/netapp-ontap/default.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/netapp-ontap/default.nix b/pkgs/development/python-modules/netapp-ontap/default.nix index af38e04ce87e..f4d2e29a2396 100644 --- a/pkgs/development/python-modules/netapp-ontap/default.nix +++ b/pkgs/development/python-modules/netapp-ontap/default.nix @@ -1,11 +1,9 @@ { lib, buildPythonPackage, - cliche, fetchPypi, marshmallow, pythonOlder, - recline, requests, requests-toolbelt, setuptools, @@ -32,9 +30,6 @@ buildPythonPackage rec { requests requests-toolbelt urllib3 - # required for cli - cliche - recline ]; # No tests in sdist and no other download available @@ -44,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for working with ONTAP's REST APIs simply in Python"; - homepage = "https://devnet.netapp.com/restapi.php"; + homepage = "https://library.netapp.com/ecmdocs/ECMLP3331665/html/index.html"; license = licenses.bsd3; maintainers = with maintainers; [ SuperSandro2000 ]; mainProgram = "ontap-cli"; From 30d200056dccc0164f9420efe715b3f347527d6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 10 Feb 2025 17:54:19 +0100 Subject: [PATCH 0970/2168] ansible-doctor: fix build by removing outdated rm --- pkgs/tools/admin/ansible/doctor.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/tools/admin/ansible/doctor.nix b/pkgs/tools/admin/ansible/doctor.nix index 31468f7e9ffa..7f73118ba3db 100644 --- a/pkgs/tools/admin/ansible/doctor.nix +++ b/pkgs/tools/admin/ansible/doctor.nix @@ -46,10 +46,6 @@ python3.pkgs.buildPythonApplication rec { ruamel-yaml ]; - postInstall = '' - rm $out/lib/python*/site-packages/LICENSE - ''; - # Module has no tests doCheck = false; From 669ebb997857cb45bb2c1316eccf6a5f8c8f51cf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 17:15:45 +0000 Subject: [PATCH 0971/2168] vimPlugins.lsp_lines-nvim: unstable-2024-12-10 -> 3.0.0 --- .../vim/plugins/non-generated/lsp_lines-nvim/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vim/plugins/non-generated/lsp_lines-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/lsp_lines-nvim/default.nix index 34fa410f2b46..67d16f368e40 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/lsp_lines-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/lsp_lines-nvim/default.nix @@ -6,7 +6,7 @@ }: vimUtils.buildVimPlugin { pname = "lsp_lines.nvim"; - version = "unstable-2024-12-10"; + version = "3.0.0"; src = fetchFromSourcehut { owner = "~whynothugo"; From 9b112168a6882ba5d9ce94b62b4b581c2994da5c Mon Sep 17 00:00:00 2001 From: Arsenii Zorin Date: Mon, 10 Feb 2025 20:17:21 +0300 Subject: [PATCH 0972/2168] pulumi-bin: 3.148.0 -> 3.149.0 --- pkgs/tools/admin/pulumi-bin/data.nix | 178 +++++++++++++-------------- 1 file changed, 89 insertions(+), 89 deletions(-) diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix index ad564a240eaf..b796b0befec8 100644 --- a/pkgs/tools/admin/pulumi-bin/data.nix +++ b/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,12 +1,12 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.148.0"; + version = "3.149.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.148.0-linux-x64.tar.gz"; - sha256 = "1wjg4cilg3ycd95ajzsxdyaldz50paczbifar4xwnha6knsgd3j1"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.149.0-linux-x64.tar.gz"; + sha256 = "01q8q78q4f5d3nrv419lwsjrcvb1rbpjb2khwnrnijy808jgm5pz"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.33.0-linux-amd64.tar.gz"; @@ -25,12 +25,12 @@ sha256 = "105qpgq5kc1v82jks5v64i1jx9mw8spmj59dg74sil58lik5wpl8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.13.0-linux-amd64.tar.gz"; - sha256 = "047hxl4wnqi4w3mv2cadpmwl0p1y6z3dn8hmlxrwlg4lghqp7wsw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.14.0-linux-amd64.tar.gz"; + sha256 = "06kazf5r3r3cdr2cxk2afj1wjmjj0kda038j9vdpfirzpjyy47l3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.67.0-linux-amd64.tar.gz"; - sha256 = "072f3jlbdlvygbk5yzrjqxib0dr3gn779yi1ny64h63v9kzym3w8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.68.0-linux-amd64.tar.gz"; + sha256 = "0zg8vfqs8m87j6sp3hybzzx8ji6v3v404q5gpmfjrylfs7a4zw8w"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.2.0-linux-amd64.tar.gz"; @@ -41,8 +41,8 @@ sha256 = "0h3zym30gj8lyj294zj3dimdl2wdir2vmymvv6wr392f9i22m2yn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.17.0-linux-amd64.tar.gz"; - sha256 = "1xrbkml34hdz5jv1df6ljk3ikgrpqw3xc6cpywy1z8sk19hrzq0c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.18.0-linux-amd64.tar.gz"; + sha256 = "1brri4avf40fsa4374xil103mw9xm9s7vlcg6b44p9m3a9pczm5s"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.49.0-linux-amd64.tar.gz"; @@ -53,8 +53,8 @@ sha256 = "0fq1zzbr119zq8minj7rqw5y6552zqqf1lcgy0c059bvd633fxdq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.42.0-linux-amd64.tar.gz"; - sha256 = "0qvpbgs7pvx15h9zh4jw2l87qzpya5w0ydkvd1mg1k76cxsjl9c2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.43.0-linux-amd64.tar.gz"; + sha256 = "0dbvr0r7plvrh5yp03rsnjhhmnw7dl70pg29l216v4iz2ymrc5zk"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.39.1-linux-amd64.tar.gz"; @@ -69,12 +69,12 @@ sha256 = "0hnardid0kbzy65dmn7vz8ddy5hq78nf2871zz6srf2hfyiv7qa4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.13.1-linux-amd64.tar.gz"; - sha256 = "0kk8c2a20ckvgx1afh6n7sm9z5cb3r6gs2c23yaq61yd6bkwklx5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.14.0-linux-amd64.tar.gz"; + sha256 = "191j823pngyicvgvkjfik9n0nsws2zsqqzykzsad74w59i9cr90c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.16.0-linux-amd64.tar.gz"; - sha256 = "109chpv3s7cbwk5ga9n982kn1nzrrvd222h9w5j242pdhbw4pc31"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.18.0-linux-amd64.tar.gz"; + sha256 = "08irlwbwy3c41rl90i85a50d3xy4ygsv4bswh3xwd9jdc32rs6xh"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.6.0-linux-amd64.tar.gz"; @@ -121,16 +121,16 @@ sha256 = "1pgyrrlx1skl137qsx944n3f6scj10vpslfa6fdqg3zcdn2191np"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v1.1.1-linux-amd64.tar.gz"; - sha256 = "19sb2ik7zsc0n9hrwiwi0dm1r3wkfa38isnc2f7sim1gjvvaha3k"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v1.1.2-linux-amd64.tar.gz"; + sha256 = "147dmg9gv8b3pifmqwjz9skvidryb8wkayvghdd6pziyqncbqwzb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.109.0-linux-amd64.tar.gz"; - sha256 = "19bm0bx81dvjihv3z25la6f0aq9zb5z5pjvkhwhwjjr3rlrkk20v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.110.0-linux-amd64.tar.gz"; + sha256 = "124pag54vhis0j0b5f35h95ljs5xh2mbq85933vadmzsds7lb884"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.2-linux-amd64.tar.gz"; - sha256 = "1n1fvkp7ls6qhc0p0sxl0kdva6v5qsw4df72wbhgmp25pclcxgbj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.4-linux-amd64.tar.gz"; + sha256 = "0z0wggfg9s0x8wlvymsl030bby4id5rjhb3na0rmsjg3fjh71bsf"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.17.5-linux-amd64.tar.gz"; @@ -149,8 +149,8 @@ sha256 = "13v3vz76skral2lhv7ph9yb6im8zsiavis6qss6jzx8pdw8gq6a4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.13.0-linux-amd64.tar.gz"; - sha256 = "17v9215sr41rvf1cpgndzd58aqk4llizxshkg9kdpj2p47pj57ix"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.13.1-linux-amd64.tar.gz"; + sha256 = "0h5pca5kgyjwdj9m8fd0wmygxhvjm6r5wss00wprad383mwp3s7v"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.7-linux-amd64.tar.gz"; @@ -163,8 +163,8 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.148.0-darwin-x64.tar.gz"; - sha256 = "1f2i3pvmbmm3aga7am4m2lmrhnacmiw5g5815m0bdp5ighagi6xm"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.149.0-darwin-x64.tar.gz"; + sha256 = "17j0ilhqx08avrllkf72lfrzzhrv6k551a1vdag5xvkcsakcy9ik"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.33.0-darwin-amd64.tar.gz"; @@ -183,12 +183,12 @@ sha256 = "0gpk3imvizrxsp1j6w17dvzzgpk05i979159l0wlgg9vc0xkbf2q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.13.0-darwin-amd64.tar.gz"; - sha256 = "19ri539aify37qn35wlfr24171r151cnmmz88jgv3amb1fzb32f2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.14.0-darwin-amd64.tar.gz"; + sha256 = "1yclkdpmm8y92wbyhb87h3vdhcibhcvfppv1nvwhqd3bbx3zk1rb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.67.0-darwin-amd64.tar.gz"; - sha256 = "0vm0pifcajwbrawmz84snv514w4j8qrxvyv9i356hizk459c6y3s"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.68.0-darwin-amd64.tar.gz"; + sha256 = "1ck9377yshn8742k1757xmx2wkpybfdpbfq86nz7i83xnm67vwg4"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.2.0-darwin-amd64.tar.gz"; @@ -199,8 +199,8 @@ sha256 = "1j952sjqhp42a1s8fxn5li8mjfvl9as3ydhwdpslx8pzc8ykr2zj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.17.0-darwin-amd64.tar.gz"; - sha256 = "0rcdhz4ap6h9yry1ma7ay7ak7ws01d50rb719phgrm1wd0ybw4vs"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.18.0-darwin-amd64.tar.gz"; + sha256 = "0m7h5dgwh2bz14lmncxaa7n97vgrp0fy65ll5q8jjw49s5a7jrnh"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.49.0-darwin-amd64.tar.gz"; @@ -211,8 +211,8 @@ sha256 = "15ym540lhzwi5k2nplcsxgf1yxxndiznmjda38wwky9hxxvgc260"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.42.0-darwin-amd64.tar.gz"; - sha256 = "1b2smzqxvrjxwpgr2wlhplgqj5n4yf7mbi52y1sc0cg0i70p01kf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.43.0-darwin-amd64.tar.gz"; + sha256 = "16jmnc1mnxb652agd08qaqdzfqgnqd6al3wrvmac07gd4frq719k"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.39.1-darwin-amd64.tar.gz"; @@ -227,12 +227,12 @@ sha256 = "1m5lh59h7nck1flzxs9m4n0ag0klk3jmnpf7hc509vffxs89xnjq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.13.1-darwin-amd64.tar.gz"; - sha256 = "1gk5i030y4jsdzsj8nl90xf0403mlkq1lhc8nqw9a8iyc6m60g3w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.14.0-darwin-amd64.tar.gz"; + sha256 = "0qqzfdibgwzgnv79as3l6k8hh4nviq2i0xsgzsvjkklzf2szyh8k"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.16.0-darwin-amd64.tar.gz"; - sha256 = "1iaaiv58m6s45xhjdrzcnvw51wm92dknnl9sk3f0hq58bvapq9xy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.18.0-darwin-amd64.tar.gz"; + sha256 = "001s7nrmhsbrz49ilphr5882mk7lqq4w6qdfi2i24jjcbbij8v9w"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.6.0-darwin-amd64.tar.gz"; @@ -279,16 +279,16 @@ sha256 = "179lqrf9ma51ghr1jl5pzg0jpc217qazrj3wdbf702qghacl0xaq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v1.1.1-darwin-amd64.tar.gz"; - sha256 = "04v54852bwm54jiprkgpfkby5bxckw7rg09pqf8fw929hc59sw3g"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v1.1.2-darwin-amd64.tar.gz"; + sha256 = "02mq6mnjbfkhwfm9fsgixw8imnxyrgl3zjh2v7z6la0qn888k9yi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.109.0-darwin-amd64.tar.gz"; - sha256 = "1j16ny68wb0ljqzl0q62dzf8l4knszl08v3a58ja4m10mhlq9ilf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.110.0-darwin-amd64.tar.gz"; + sha256 = "17m6h1ign1b8rymidjk2lg0p43y0yzcgd8fvbjfmmxy6p4pcdjz4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.2-darwin-amd64.tar.gz"; - sha256 = "1zpy7wvyjjxr41jg02n4py7zc5xppxd5pms91cf1xpdw5n0hpfdl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.4-darwin-amd64.tar.gz"; + sha256 = "1rc717psnir7hpl9az29z232zgkp2dnzfjsph6v3lm44qd0yw9dq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.17.5-darwin-amd64.tar.gz"; @@ -307,8 +307,8 @@ sha256 = "1w3wqx96qv0m7n0grr5sr4qdwrj56cghl3rg2hg75cx5yj00677y"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.13.0-darwin-amd64.tar.gz"; - sha256 = "1rdfxp2zlb6b8z6pzhkiph3fbndyrlp6i6ga9im61wggn6gqcp7a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.13.1-darwin-amd64.tar.gz"; + sha256 = "1risgn050qs9yb0r7wx9z1xfw4ai50b5f6fzqchmaw4wpqj83j4h"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.7-darwin-amd64.tar.gz"; @@ -321,8 +321,8 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.148.0-linux-arm64.tar.gz"; - sha256 = "1jwxrdwp8vrg4rm3jfymzaqdi861pybx28z5ss0qb034dqi6sqmy"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.149.0-linux-arm64.tar.gz"; + sha256 = "09yvl92bxdnz1796rsqjw0dxkw84s4c0gv69acd358wc1lv6ff2m"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.33.0-linux-arm64.tar.gz"; @@ -341,12 +341,12 @@ sha256 = "1jbgwycdpixvz6cc8vm66akim9d2mlmbb7h241n3mjvdndhsjkab"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.13.0-linux-arm64.tar.gz"; - sha256 = "14z0zmmbcl0mxj599bffccyp7vb32sq4knx7mvzyx9qgisjip5hi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.14.0-linux-arm64.tar.gz"; + sha256 = "0xpfjwdhapyfc1562pxbvgmcmljvvsxdiymrwvcfhn08sdgpmas2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.67.0-linux-arm64.tar.gz"; - sha256 = "1hlr7adfarpay74iyi0qj4d924f55icdb8all31vsh36mml5xapr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.68.0-linux-arm64.tar.gz"; + sha256 = "013bjgdd5ih4cznxf6b3nfhm9r3ah9s2z0w247c7ad14paiw1l21"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.2.0-linux-arm64.tar.gz"; @@ -357,8 +357,8 @@ sha256 = "1d4a5xyx55mscqq4wqgvilfagk8mg49xnhwp5vx1i274kgdq7a7z"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.17.0-linux-arm64.tar.gz"; - sha256 = "1snc0kls8hl41m1cnnxjz7j0s72zh2m9j5bk9pqx22dqppc1rcsn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.18.0-linux-arm64.tar.gz"; + sha256 = "0m93phlw0ixxvlsnv3g425clh4bf0j14w409pgkzig23zjanxrr0"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.49.0-linux-arm64.tar.gz"; @@ -369,8 +369,8 @@ sha256 = "0i4hwjj4j4q9qrrzb47k243hgcs7rhdk2xir6af5h4nds9z0h4yh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.42.0-linux-arm64.tar.gz"; - sha256 = "0s3k3a0y60py8yy9frx98gwdm6p8sjjaq63kd2476dqsn6jrfg0p"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.43.0-linux-arm64.tar.gz"; + sha256 = "0jb7m7x7m330ijn7v4720qi1ldbj9blkj50qzpxivazwa5s42dgk"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.39.1-linux-arm64.tar.gz"; @@ -385,12 +385,12 @@ sha256 = "111pia2f5xwkwaqs6p90ri29l5b3ivmahsa1bji4fwyyjyp22h4r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.13.1-linux-arm64.tar.gz"; - sha256 = "12b7957wk70cw4miymav3asw7xddkx2ivk6v55d8izmiw2lkpfhm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.14.0-linux-arm64.tar.gz"; + sha256 = "1dyg5k7giny2d26yw222kahdnbfwmhr8d1nkrn3i1ycqsb1g573j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.16.0-linux-arm64.tar.gz"; - sha256 = "0z68qdrvfcxqd71rgz9zkcws5jqf8v4m5rin5mr03d000c7rv5lw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.18.0-linux-arm64.tar.gz"; + sha256 = "1db1va4mf5brc6lhf4sj89pr6c6va2m6gb77dqnk2x6xf6qnffvx"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.6.0-linux-arm64.tar.gz"; @@ -437,16 +437,16 @@ sha256 = "1hvnbp5ip2smxlmr4crjz2m4qjd85aacq8lkq0g01slfjicm26hf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v1.1.1-linux-arm64.tar.gz"; - sha256 = "1nyz5xpy82vzfiqps5qqaydpv300wqv9qvz97p5xjlb8szlk22xk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v1.1.2-linux-arm64.tar.gz"; + sha256 = "1qghb1kj1flr36hcpk2r85ly833hm3z80lvwdw8rh2gz8ch6wi21"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.109.0-linux-arm64.tar.gz"; - sha256 = "07p5b2i2gx7rkmmd7vy8z6qalg0qq5dr3yjq2pmanrgskq0hnhh0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.110.0-linux-arm64.tar.gz"; + sha256 = "0v70agspybl0qmcmhhjqr8k47vvvhvipfw17hm54pr4v4bi3irmz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.2-linux-arm64.tar.gz"; - sha256 = "12r90yr81mphmymlrmp5yz4csi871jc7h6k0wn2qjn9qx3v5qx9c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.4-linux-arm64.tar.gz"; + sha256 = "0f1zpcn0b0hd2kb1adigqp5zd2k7glxdav785yrg7zhq3gccmklw"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.17.5-linux-arm64.tar.gz"; @@ -465,8 +465,8 @@ sha256 = "0a0x7h17qxhh0wwn5b3a3p4caqjghax6y37hcxxxjy33r03l4ba4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.13.0-linux-arm64.tar.gz"; - sha256 = "0vf2mg4v5g4z27zkpfawlfnlrylgakjnpishsswl2abq21s9lj4q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.13.1-linux-arm64.tar.gz"; + sha256 = "1wkcrvyw9r0j4vy3nmgsypzak8ld2750rc3cd88m0q9qi22vi6hm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.7-linux-arm64.tar.gz"; @@ -479,8 +479,8 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.148.0-darwin-arm64.tar.gz"; - sha256 = "0nn0jq82b2lc7fzapdl7ywz5jpbkbrmza55hh1hgn8yfcrdkp7s8"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.149.0-darwin-arm64.tar.gz"; + sha256 = "0k01fdxydlw488wqvisxabp82z0a954g8zzjyavi06lik5qkab7y"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.33.0-darwin-arm64.tar.gz"; @@ -499,12 +499,12 @@ sha256 = "0rzyr14v0cwrvwh383snh6sxdspszk8yi391h0vm0x8wvaq1a5ba"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.13.0-darwin-arm64.tar.gz"; - sha256 = "0l50wf0wcaahj12dj9948swxwzxapcadzhzahbm5fnzys1if6dk2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.14.0-darwin-arm64.tar.gz"; + sha256 = "09ss5j92ra4bs5vmsqq2sgs30nalsb1bs3s0njn72fsc1cd6n0qz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.67.0-darwin-arm64.tar.gz"; - sha256 = "1awp05r9l0mq20sj0cnxh7rsbshpb99a993gff63w4s327vdyhqi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.68.0-darwin-arm64.tar.gz"; + sha256 = "1zs9vgmz9hwv1impdfibg0ks8i5mdc9pis676qcvs7phlbg3yvn4"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.2.0-darwin-arm64.tar.gz"; @@ -515,8 +515,8 @@ sha256 = "1x4ij8qv9jq39fbacirjvk96hc117da5ll3fzrmgpkvjc1mall01"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.17.0-darwin-arm64.tar.gz"; - sha256 = "1jngrwg1s27qizjpjfhjr6lw2jmra2nfb6h5zb1s3wvqc5j2fm32"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.18.0-darwin-arm64.tar.gz"; + sha256 = "095lx9kxhq564wlp4q7d58ma2llx3daiiq8q2svn25nc6gs527fx"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.49.0-darwin-arm64.tar.gz"; @@ -527,8 +527,8 @@ sha256 = "1ydh3yl29kpqxwsmrrrlghlpmww1s16rjc116wb000gnj60c0bx5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.42.0-darwin-arm64.tar.gz"; - sha256 = "1bwm86aj2ghaqasfymc41v7a93i0fmiwk5ayhjm25d0j79lmqb6l"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.43.0-darwin-arm64.tar.gz"; + sha256 = "1hh85s0fkybq9g5lzyh7qvb5sm3kwv5ma8lzzkrm10pqvf2jv01f"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.39.1-darwin-arm64.tar.gz"; @@ -543,12 +543,12 @@ sha256 = "12bzicm43l7yvh02v5fx3z8v46l9i7a9f677735xi5rjbmd2an4c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.13.1-darwin-arm64.tar.gz"; - sha256 = "02wcx7m64kifcd93bdfvbhw4fl7wakinwcr0bp739dqwywiz1bad"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.14.0-darwin-arm64.tar.gz"; + sha256 = "17cm719jsh6rc7lwd64kg7qdlxlclvwrky9598f85kbvnv6n0xa8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.16.0-darwin-arm64.tar.gz"; - sha256 = "054iwr00d0l35yisxsc5fgrdml4qvi52h2dnim9bg1j084k7ci7m"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.18.0-darwin-arm64.tar.gz"; + sha256 = "10vjyhk84phr632s1ns2d6vkzi415ris1sh8az6jwnp510cnqmin"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.6.0-darwin-arm64.tar.gz"; @@ -595,16 +595,16 @@ sha256 = "1yh8jkdf61526gab5p07h923k1i8ib98xh6hx0ql241lpxjzr5l5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v1.1.1-darwin-arm64.tar.gz"; - sha256 = "1cr5jqii0z3ifkml89s84z5gd28dhv4x7z0jximlk5grfij3g2xl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v1.1.2-darwin-arm64.tar.gz"; + sha256 = "022x01wxl7zj65n25slijnb0is266xrg26sbb1z408bipv4svxgk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.109.0-darwin-arm64.tar.gz"; - sha256 = "0idv97kp9n32fc89c9j82v2pqlwxvj1gfm06g4nb63cxybrxzany"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.110.0-darwin-arm64.tar.gz"; + sha256 = "1r2zcxm2lgxl7x7v7shmq6r2ain90shb53vxdgjcnzjh3mhi92f5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.2-darwin-arm64.tar.gz"; - sha256 = "1xi625scmsbk1f4ckg8fdnxrk2bf0zh0g67dgmamhcl4d2b1j2mc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.4-darwin-arm64.tar.gz"; + sha256 = "18iw3nkmygsdb0mjdgx5h2ny834vlnd5g1f5nm9gkrs5594sqgf3"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.17.5-darwin-arm64.tar.gz"; @@ -623,8 +623,8 @@ sha256 = "1jdgx5621xmhqcyfm4p85wbp23clv0ws2klk4dgfxkaqf27xhwva"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.13.0-darwin-arm64.tar.gz"; - sha256 = "019rsml6ywy336ldsy9dv2r31qms1hblf44v8g0hkmmg8zxasvrq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.13.1-darwin-arm64.tar.gz"; + sha256 = "0xw51rfh9vv0dbdzkjz6yrhj86f691cdg40ax085zk0g31x2g1cm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.7-darwin-arm64.tar.gz"; From 390fecc61dfac0bc690f205568fd5f5f971e23af Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 17:21:28 +0000 Subject: [PATCH 0973/2168] vimPlugins.gitlab-vim: unstable-2025-01-23 -> 0.1.1 --- .../editors/vim/plugins/non-generated/gitlab-vim/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vim/plugins/non-generated/gitlab-vim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/gitlab-vim/default.nix index e8908af5bf8e..58eb2a7fabff 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/gitlab-vim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/gitlab-vim/default.nix @@ -6,7 +6,7 @@ }: vimUtils.buildVimPlugin { pname = "gitlab.vim"; - version = "unstable-2025-01-23"; + version = "0.1.1"; src = fetchFromGitLab { owner = "gitlab-org/editor-extensions"; From 88ca6d28302146ab36cd0854c6e11176a0728265 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 17:21:34 +0000 Subject: [PATCH 0974/2168] lldap-cli: 0-unstable-2024-11-11 -> 0-unstable-2025-01-19 --- pkgs/by-name/ll/lldap-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ll/lldap-cli/package.nix b/pkgs/by-name/ll/lldap-cli/package.nix index 71872a916407..2679e08eb4bf 100644 --- a/pkgs/by-name/ll/lldap-cli/package.nix +++ b/pkgs/by-name/ll/lldap-cli/package.nix @@ -15,13 +15,13 @@ }: stdenv.mkDerivation { pname = "lldap-cli"; - version = "0-unstable-2024-11-11"; + version = "0-unstable-2025-01-19"; src = fetchFromGitHub { owner = "Zepmann"; repo = "lldap-cli"; - rev = "2a80dc47c334c88faf3000b45c631bc2cea09906"; - hash = "sha256-uk7SOiQmUYtoJnihSnPsu/7Er4wXX4xvPboJaNSMjkM="; + rev = "e383494b4dd89ae4e028958b268e200fd85a7a64"; + hash = "sha256-k6UDLOyP+EvKmC1TmbMObgAw2IIs7ekIZxJOWbwc+jg="; }; nativeBuildInputs = [ makeWrapper ]; From d7b808e6ebb2492c24be137424bf42f38295e8a7 Mon Sep 17 00:00:00 2001 From: emilylange Date: Mon, 10 Feb 2025 18:43:02 +0100 Subject: [PATCH 0975/2168] electron_33-bin: 33.3.2 -> 33.4.0 - Changelog: https://github.com/electron/electron/releases/tag/v33.4.0 - Diff: https://github.com/electron/electron/compare/refs/tags/v33.3.2...v33.4.0 --- pkgs/development/tools/electron/binary/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index 1b5b01a7d77f..2189577fa9db 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -78,14 +78,14 @@ }, "33": { "hashes": { - "aarch64-darwin": "4c7ffa4927aec31912ae2047d8d6c33e801501e4b576c724947866da9346110c", - "aarch64-linux": "c55b6b66fe8018e0e05953cd794735782f05b7e3b2a117a86413eafcedfda7ef", - "armv7l-linux": "2e7f915c71b11e6cc1ec46aee8f87c28fdd029a0a90a9196117a8f0c7aa81aa8", - "headers": "07m9p2nz0rzl3asq466kqzdq1bdmlvxb5slrr24dj9awijlyrrb6", - "x86_64-darwin": "fa451db2991506cacebd2a836e84ca7eff73770ed987d5b958f9854637c12d3d", - "x86_64-linux": "13b99da4a78dae9bf0960309cd1e9476faf5f7260bbf930bd302189d490ff77c" + "aarch64-darwin": "90044a7aa13f18ca4077a33131190b55fdf3ca5cb0704c537ca630fd0e06369e", + "aarch64-linux": "6542b3152ea9d8dd005a1b8f55b6971dee0f954b3b4e0bab4d625d501a946093", + "armv7l-linux": "95d79d2d2a154783fa6435d937a3e98b4408f2ce75f6706e5781d0d7e2e49d44", + "headers": "00v71c9fy3na040bnp5llp6951fsqls6hnlvbds5gckw3wfdcymc", + "x86_64-darwin": "d66a1400fe3c446f93eabf51b9520a300cdd25805a03d96a4528bda089f4988e", + "x86_64-linux": "f854ceb7362f7eeafdcdfc4a8898493adb72e3433595c59f072427912115d41b" }, - "version": "33.3.2" + "version": "33.4.0" }, "34": { "hashes": { From 5d383f65f173b15ad5c1e8333a7f9624d82f50bc Mon Sep 17 00:00:00 2001 From: emilylange Date: Mon, 10 Feb 2025 18:43:11 +0100 Subject: [PATCH 0976/2168] electron-source.electron_33: 33.3.2 -> 33.4.0 - Changelog: https://github.com/electron/electron/releases/tag/v33.4.0 - Diff: https://github.com/electron/electron/compare/refs/tags/v33.3.2...v33.4.0 --- pkgs/development/tools/electron/info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index dae5e44a5ef8..07190692cd02 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -988,10 +988,10 @@ }, "src/electron": { "fetcher": "fetchFromGitHub", - "hash": "sha256-20ggSgks8zVYsFeMRHzqpnQFE9UazwOY2BVQYhVo/Vk=", + "hash": "sha256-1Sl36LYp/tePk5ChWKv9ZCVcoEZECMEDKKiKvpO8ea8=", "owner": "electron", "repo": "electron", - "rev": "v33.3.2" + "rev": "v33.4.0" }, "src/media/cdm/api": { "fetcher": "fetchFromGitiles", @@ -1891,6 +1891,6 @@ "electron_yarn_hash": "0bzsswcg62b39xinq5vikk7qz7d15276s2vc15v1gcb5wvh05ff8", "modules": "130", "node": "20.18.1", - "version": "33.3.2" + "version": "33.4.0" } } From cd2b7bdda1908a600ce72398af9f66ff3bb85140 Mon Sep 17 00:00:00 2001 From: emilylange Date: Mon, 10 Feb 2025 18:43:13 +0100 Subject: [PATCH 0977/2168] electron-chromedriver_33: 33.3.2 -> 33.4.0 - Changelog: https://github.com/electron/electron/releases/tag/v33.4.0 - Diff: https://github.com/electron/electron/compare/refs/tags/v33.3.2...v33.4.0 --- .../tools/electron/chromedriver/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json index 96a57f01acd9..58e1f7e7ec33 100644 --- a/pkgs/development/tools/electron/chromedriver/info.json +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -45,14 +45,14 @@ }, "33": { "hashes": { - "aarch64-darwin": "96648a7aa64bff1b6fdce75da395451cca23aafdd06437c31544125962e25323", - "aarch64-linux": "a5bce192adbc7dfcb6134296c15409b8299a64b3ecc9c61d7d150a644a8187e6", - "armv7l-linux": "a921c696a7371712b14ed64e408a57ad874340fd8d61a447cbc83fcf79e599a3", - "headers": "07m9p2nz0rzl3asq466kqzdq1bdmlvxb5slrr24dj9awijlyrrb6", - "x86_64-darwin": "06ae393d176e8fdd67b1fb6a2b3f0771e3971de112e338d7d30d2ea1ffd0fe8c", - "x86_64-linux": "85e3d980a43f4792d1b6246a50dad745653c0e13b95dbc37adadc78078cfcc99" + "aarch64-darwin": "0b87f00cf22d2c73a795af554cf9548e0204769d22ffdc7f28183572d4f7fef0", + "aarch64-linux": "5387c7a22c93dfcac348ea5ec604fb8350926e8e2681ca189e0500ff993d58d0", + "armv7l-linux": "53e1fa127812bcfb5a095f781368ee2d9cceb4a91d83dcb32a7ecf072cf39034", + "headers": "00v71c9fy3na040bnp5llp6951fsqls6hnlvbds5gckw3wfdcymc", + "x86_64-darwin": "9a8ec97a21d41b146b010dfe7e4df71907a23bdf0500619036de623b4ddb1ce1", + "x86_64-linux": "ea57c5bafecd8502fa95df73c977efb2a061068eac965d97f99b824479d55de2" }, - "version": "33.3.2" + "version": "33.4.0" }, "34": { "hashes": { From 48d12773b57e9b77fe1c346991735437eeacf1cd Mon Sep 17 00:00:00 2001 From: emilylange Date: Mon, 10 Feb 2025 18:43:15 +0100 Subject: [PATCH 0978/2168] electron_34-bin: 34.0.2 -> 34.1.1 - Changelog: https://github.com/electron/electron/releases/tag/v34.1.1 - Changelog: https://github.com/electron/electron/releases/tag/v34.1.0 - Diff: https://github.com/electron/electron/compare/refs/tags/v34.0.2...v34.1.1 --- pkgs/development/tools/electron/binary/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index 2189577fa9db..f817e8020dec 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -89,13 +89,13 @@ }, "34": { "hashes": { - "aarch64-darwin": "604e5f6c706383dd7a86c3b9a59f60525c687f65907b60ccdabf43358dbb8661", - "aarch64-linux": "98e711d7678670572b873aec1e4df3a2fa0002b88bc6283dbff8fc13ac401670", - "armv7l-linux": "cc3bb0110fafbf5a9ef6576470b82864dacb6380cc312650d6b0cdf404ac9d9f", - "headers": "1zcm8j3qqvy6y5jgdj9aypbqa1sq4wkk9ynj0382wnk994bzjs86", - "x86_64-darwin": "3b34acc7908a311e05509cab9e1926604113e1f650b4dbe1ecfde1dbf4397c37", - "x86_64-linux": "74e55edc5d7cf9e63ba61f1a670134779109fcf33990e568f1992c46c1d31b89" + "aarch64-darwin": "a38a624bee92ee601777c20e6bdbf040d1b2a5506ba1ccac8be1447b1c6b0bfd", + "aarch64-linux": "37d68cef35888c8ca8bbe2002be0a122e8e8ccaf762b60ade1af5e71918e080b", + "armv7l-linux": "741374570bd9e435037f41b42aea7ab640f7ef1e75afb4705cc12344f43ed04c", + "headers": "0b0djna1bprfff0y1pb2wdzsx82v1c1zk20gl2vivgjhslxf0igl", + "x86_64-darwin": "a2ba4f91882819801da2d499de3426dbb191a22f2fe4a6ec92b756f1a0dc2de8", + "x86_64-linux": "9fbca20baea84800f7f50a9b245302dddbfab3425dd762c482d79e867a5a6dbe" }, - "version": "34.0.2" + "version": "34.1.1" } } From 66787fd6fb0cd49f3afdf950700139e60a085686 Mon Sep 17 00:00:00 2001 From: emilylange Date: Mon, 10 Feb 2025 18:43:16 +0100 Subject: [PATCH 0979/2168] electron-chromedriver_34: 34.0.2 -> 34.1.1 - Changelog: https://github.com/electron/electron/releases/tag/v34.1.1 - Changelog: https://github.com/electron/electron/releases/tag/v34.1.0 - Diff: https://github.com/electron/electron/compare/refs/tags/v34.0.2...v34.1.1 --- .../tools/electron/chromedriver/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json index 58e1f7e7ec33..58ff11fa1758 100644 --- a/pkgs/development/tools/electron/chromedriver/info.json +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -56,13 +56,13 @@ }, "34": { "hashes": { - "aarch64-darwin": "ae2ccc17a7f391869cf6cfe41d4b7c25013ccbf36861b5007fcdf62ac4db9eb0", - "aarch64-linux": "904c101b206e9d4de088c06ac6886563493e5abaac537cb55f129a8cfd2620c0", - "armv7l-linux": "0a295dc16833384dc51ac6baa0d7025f9767b587c30ac857d1461b41bc3246af", - "headers": "1zcm8j3qqvy6y5jgdj9aypbqa1sq4wkk9ynj0382wnk994bzjs86", - "x86_64-darwin": "f6419dca74fcd4affeb9c4a061abc343e52031cdc36d4abb01ece2b9ee731d7c", - "x86_64-linux": "fba4a47b7762142f4ca01f405746b99ddb36e0860316952c2118b4b90840897d" + "aarch64-darwin": "c2aa24978fbe0c3dfb8ae36816633a75f498b4af5052b059631a626925951e41", + "aarch64-linux": "df87d6f0b91a549996c764bb60eaf692c59e087496406562e3bcbb3f90a52d50", + "armv7l-linux": "74b53fff1d210066024476ebbfef7476b05c2c71cd141953b5b7e0a35d129a02", + "headers": "0b0djna1bprfff0y1pb2wdzsx82v1c1zk20gl2vivgjhslxf0igl", + "x86_64-darwin": "95239f35723eeca036ed1e29f7871a4de843c6eda16bccc04436402dddd938aa", + "x86_64-linux": "62734cb681a6da3c73b20504f49c7759c9dbb1c923e250d67c11888426e3cad0" }, - "version": "34.0.2" + "version": "34.1.1" } } From 829df5c4de86583d28ca050ac17650bd93655771 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 17:46:31 +0000 Subject: [PATCH 0980/2168] kustomize-sops: 4.3.2 -> 4.3.3 --- pkgs/development/tools/kustomize/kustomize-sops.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/kustomize/kustomize-sops.nix b/pkgs/development/tools/kustomize/kustomize-sops.nix index 704754d945a2..9db6c4d19ccf 100644 --- a/pkgs/development/tools/kustomize/kustomize-sops.nix +++ b/pkgs/development/tools/kustomize/kustomize-sops.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kustomize-sops"; - version = "4.3.2"; + version = "4.3.3"; src = fetchFromGitHub { owner = "viaduct-ai"; repo = pname; rev = "v${version}"; - hash = "sha256-FSRjPXS4Dk5oH8EO7TW6iHdGNvVhaQ7gZJ+qROXUU3U="; + hash = "sha256-qIYV0wDzBRPt6s6d2dL4FobBSMlmVm+Z0ogig3r0Q/c="; }; - vendorHash = "sha256-1qnNJltam04uLMhH8YftAl2jjEZP2UhVIMp9Vcy3jeg="; + vendorHash = "sha256-UyDW4WgDgEygMxrxbCATxlPk9KAuc9lO/ldSFyydZUA="; installPhase = '' mkdir -p $out/lib/viaduct.ai/v1/ksops/ From 721208e6cd96529aa53e139b1e91693bff5a8069 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 17:48:38 +0000 Subject: [PATCH 0981/2168] kubefirst: 2.8.0 -> 2.8.1 --- pkgs/by-name/ku/kubefirst/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ku/kubefirst/package.nix b/pkgs/by-name/ku/kubefirst/package.nix index 931a8037e435..36a693025c9c 100644 --- a/pkgs/by-name/ku/kubefirst/package.nix +++ b/pkgs/by-name/ku/kubefirst/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "kubefirst"; - version = "2.8.0"; + version = "2.8.1"; src = fetchFromGitHub { owner = "konstructio"; repo = "kubefirst"; tag = "v${version}"; - hash = "sha256-WggQdhMFbUbJ2bAj2oSveIHMg1HWPj0I14qiE3PTGqE="; + hash = "sha256-dNHHanoPR+U7WvjDSfEWOYbZAcWjt4fla8jMZAahJaE="; }; - vendorHash = "sha256-WjucnfiMxthygFaxseggMmlkF/Oih310O56Y7lW+11E="; + vendorHash = "sha256-tpg36+yiXAl2WD3JlfN9tPrTKk9B5aRpcx6dCAJNf70="; ldflags = [ "-s" From 2b88ff58b54ede83624d9fe538ab0d76c3e7c34d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 17:49:52 +0000 Subject: [PATCH 0982/2168] moonfire-nvr: 0.7.17 -> 0.7.20 --- pkgs/by-name/mo/moonfire-nvr/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mo/moonfire-nvr/package.nix b/pkgs/by-name/mo/moonfire-nvr/package.nix index 4d3f462d69d2..0d9e3bc642dd 100644 --- a/pkgs/by-name/mo/moonfire-nvr/package.nix +++ b/pkgs/by-name/mo/moonfire-nvr/package.nix @@ -15,12 +15,12 @@ let pname = "moonfire-nvr"; - version = "0.7.17"; + version = "0.7.20"; src = fetchFromGitHub { owner = "scottlamb"; repo = "moonfire-nvr"; tag = "v${version}"; - hash = "sha256-kh+SPM08pnVFxKSZ6Gb2LP7Wa8j0VopknZK2urMIFNk="; + hash = "sha256-0EaGqZUmYGxLHcJAhlbG2wZMDiVv8U1bcTQqMx0aTo0="; }; ui = stdenv.mkDerivation (finalAttrs: { inherit version src; @@ -51,7 +51,7 @@ rustPlatform.buildRustPackage { useFetchCargoVendor = true; - cargoHash = "sha256-fSzwA4R6Z/Awt52ZYhUvy2jhzrZiLU6IXTN8jvjmbTI="; + cargoHash = "sha256-+L4XofUFvhJDPGv4fAGYXFNpuNd01k/P63LH2tXXHE0="; env.VERSION = "v${version}"; From ac794b1c1338ad6ab3b2054a073f2c4ce2abd3a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 17:50:48 +0000 Subject: [PATCH 0983/2168] omnictl: 0.46.0 -> 0.46.3 --- pkgs/by-name/om/omnictl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/om/omnictl/package.nix b/pkgs/by-name/om/omnictl/package.nix index fd5e990e117e..333d7f0c7875 100644 --- a/pkgs/by-name/om/omnictl/package.nix +++ b/pkgs/by-name/om/omnictl/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "omnictl"; - version = "0.46.0"; + version = "0.46.3"; src = fetchFromGitHub { owner = "siderolabs"; repo = "omni"; rev = "v${version}"; - hash = "sha256-3ew/iyMR1BI5/4Rct+DqY0Tqy0lg1kv7rCTck7i+C70="; + hash = "sha256-pVi27A8U3+nDMMmVAV/7HXXXydWFxB8M/PiEJCnqdwo="; }; - vendorHash = "sha256-VR2k1r1bP9QSkcjwGnFUER+E3WIKrdCID4zewJyDd9A="; + vendorHash = "sha256-5+15d7QcjajZ6yOSQgN4D0Lzy2Bljk0ih/KKG1SGtX8="; ldflags = [ "-s" From 1f866cbd88b5b3cf5e0ad8613a91badea28dde8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 10 Feb 2025 19:03:50 +0100 Subject: [PATCH 0984/2168] python313Packages.webtest-aiohttp: fix build by replacing removed loop pytest fixture with event_loop --- pkgs/development/python-modules/webtest-aiohttp/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/webtest-aiohttp/default.nix b/pkgs/development/python-modules/webtest-aiohttp/default.nix index 228dab2dae80..4958b0d53ebc 100644 --- a/pkgs/development/python-modules/webtest-aiohttp/default.nix +++ b/pkgs/development/python-modules/webtest-aiohttp/default.nix @@ -32,6 +32,12 @@ buildPythonPackage rec { }) ]; + postPatch = '' + substituteInPlace test_webtest_aiohttp.py \ + --replace-fail '(app, loop)' '(app, event_loop)' \ + --replace-fail 'WebTestApp(app, loop=loop)' 'WebTestApp(app, loop=event_loop)' + ''; + propagatedBuildInputs = [ webtest ]; nativeCheckInputs = [ From 43a989e6b1c301e64c7224dd35d652cd14e95c8c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 18:11:05 +0000 Subject: [PATCH 0985/2168] saucectl: 0.192.0 -> 0.193.0 --- pkgs/by-name/sa/saucectl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sa/saucectl/package.nix b/pkgs/by-name/sa/saucectl/package.nix index 237935072cfd..83c5640d3c67 100644 --- a/pkgs/by-name/sa/saucectl/package.nix +++ b/pkgs/by-name/sa/saucectl/package.nix @@ -5,7 +5,7 @@ }: let pname = "saucectl"; - version = "0.192.0"; + version = "0.193.0"; in buildGoModule { inherit pname version; @@ -14,7 +14,7 @@ buildGoModule { owner = "saucelabs"; repo = "saucectl"; tag = "v${version}"; - hash = "sha256-p7NWIjiaXM96PfmBohkfc1PQ6ZtE0pEeBVLemJiowXg="; + hash = "sha256-f4OtXjqtqcMIIssXq5UjPX450Ji2objhOcgm82m52V0="; }; ldflags = [ From e963732983ed5ec07fde3516f4b50b6db007065f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 10 Feb 2025 09:48:49 -0800 Subject: [PATCH 0986/2168] python313Packages.holoviews: fix tests --- pkgs/development/python-modules/holoviews/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix index 6b9fb81cb3d4..15c610848a87 100644 --- a/pkgs/development/python-modules/holoviews/default.nix +++ b/pkgs/development/python-modules/holoviews/default.nix @@ -18,7 +18,7 @@ # tests pytestCheckHook, - pytest-cov, + pytest-asyncio, flaky, }: @@ -34,6 +34,11 @@ buildPythonPackage rec { hash = "sha256-KdGDBF+vo9hG3tqZnZaHuZuKvcGowGcS5Ur6V2uwKz4="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '"ignore:No data was collected:coverage.exceptions.CoverageWarning",' "" + ''; + build-system = [ hatch-vcs hatchling @@ -50,7 +55,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-asyncio flaky ]; From e512915e2a16762b1827e498ea35be4613762cd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 10 Feb 2025 19:10:49 +0100 Subject: [PATCH 0987/2168] python313Packages.aiohttp-apispec: fix build by replacing removed loop pytest fixture with event_loop --- pkgs/development/python-modules/aiohttp-apispec/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/aiohttp-apispec/default.nix b/pkgs/development/python-modules/aiohttp-apispec/default.nix index 95d1ee3d3010..f0aa60cd4028 100644 --- a/pkgs/development/python-modules/aiohttp-apispec/default.nix +++ b/pkgs/development/python-modules/aiohttp-apispec/default.nix @@ -26,6 +26,12 @@ buildPythonPackage rec { hash = "sha256-C+/M25oCLTNGGEUj2EyXn3UjcvPvDYFmmUW8IOoF1uU="; }; + postPatch = '' + substituteInPlace tests/conftest.py \ + --replace-fail 'aiohttp_app(loop,' 'aiohttp_app(event_loop,' \ + --replace-fail 'return loop.run_until_complete' 'return event_loop.run_until_complete' + ''; + propagatedBuildInputs = [ aiohttp apispec From 017ab730c842f3c458e0b46fa53632167dd1e043 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Jan 2025 18:43:37 +0000 Subject: [PATCH 0988/2168] _389-ds-base: 3.0.5 -> 3.1.2 --- pkgs/by-name/_3/_389-ds-base/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/_3/_389-ds-base/package.nix b/pkgs/by-name/_3/_389-ds-base/package.nix index 6eb041873cd8..9a3c4123bf86 100644 --- a/pkgs/by-name/_3/_389-ds-base/package.nix +++ b/pkgs/by-name/_3/_389-ds-base/package.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "389-ds-base"; - version = "3.0.5"; + version = "3.1.2"; src = fetchFromGitHub { owner = "389ds"; repo = "389-ds-base"; rev = "389-ds-base-${finalAttrs.version}"; - hash = "sha256-OPtyeF1D46X6DslP3NewbjVgqPXngWUz943UsTqgWRo="; + hash = "sha256-FIx+ZW3K5KevU+wAiwPbDAQ6q7rPFEHFa+5eKqtgzpQ="; }; cargoDeps = rustPlatform.fetchCargoVendor { From f580aca59ba9fbd25dc6515c382b4f56d5441347 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Thu, 6 Feb 2025 16:47:15 -0500 Subject: [PATCH 0989/2168] _389-ds-base: fix cargo deps vendoring --- pkgs/by-name/_3/_389-ds-base/package.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/by-name/_3/_389-ds-base/package.nix b/pkgs/by-name/_3/_389-ds-base/package.nix index 9a3c4123bf86..a31f30360c7c 100644 --- a/pkgs/by-name/_3/_389-ds-base/package.nix +++ b/pkgs/by-name/_3/_389-ds-base/package.nix @@ -97,8 +97,7 @@ stdenv.mkDerivation (finalAttrs: { ''; preBuild = '' - mkdir -p ./vendor - tar -xzf ${finalAttrs.cargoDeps} -C ./vendor --strip-components=1 + ln -s ${finalAttrs.cargoDeps} ./vendor ''; configureFlags = From e4849060bbe74728d7189312c78378416d26b6ae Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 6 Feb 2025 18:26:15 +0100 Subject: [PATCH 0990/2168] python312Packages.dalle-mini: fix build --- .../python-modules/dalle-mini/default.nix | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/dalle-mini/default.nix b/pkgs/development/python-modules/dalle-mini/default.nix index 2ea9b0c2d0c1..9c227162d351 100644 --- a/pkgs/development/python-modules/dalle-mini/default.nix +++ b/pkgs/development/python-modules/dalle-mini/default.nix @@ -3,13 +3,17 @@ buildPythonPackage, fetchPypi, fetchpatch, + + # dependencies einops, emoji, flax, ftfy, jax, jaxlib, + orbax-checkpoint, pillow, + pydantic, transformers, unidecode, wandb, @@ -18,7 +22,7 @@ buildPythonPackage rec { pname = "dalle-mini"; version = "0.1.5"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -34,14 +38,26 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ + pythonRelaxDeps = [ + "transformers" + "jax" + "flax" + ]; + + pythonRemoveDeps = [ + "orbax" + ]; + + dependencies = [ einops emoji flax ftfy jax jaxlib + orbax-checkpoint pillow + pydantic transformers unidecode wandb @@ -51,10 +67,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "dalle_mini" ]; - meta = with lib; { + meta = { description = "Generate images from a text prompt"; homepage = "https://github.com/borisdayma/dalle-mini"; - license = licenses.asl20; - maintainers = with maintainers; [ r-burns ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ r-burns ]; }; } From ac650b6399926f733f3db637d93228abe8776b7d Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 10 Feb 2025 19:31:22 +0100 Subject: [PATCH 0991/2168] python312Packages.moviepy: fix build on darwin --- .../python-modules/moviepy/default.nix | 63 +++++++++++-------- 1 file changed, 37 insertions(+), 26 deletions(-) diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix index 4665e1f9bca5..81b45f7fdeff 100644 --- a/pkgs/development/python-modules/moviepy/default.nix +++ b/pkgs/development/python-modules/moviepy/default.nix @@ -1,24 +1,32 @@ { lib, + stdenv, buildPythonPackage, - decorator, fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + decorator, imageio, imageio-ffmpeg, - matplotlib, numpy, proglog, python-dotenv, - pytest-timeout, - pytestCheckHook, - pythonOlder, requests, + tqdm, + + # optional-dependencies + matplotlib, scikit-image, scikit-learn, scipy, - setuptools, - tqdm, yt-dlp, + + # tests + pytest-timeout, + pytestCheckHook, }: buildPythonPackage rec { @@ -26,8 +34,6 @@ buildPythonPackage rec { version = "2.1.2"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "Zulko"; repo = "moviepy"; @@ -69,20 +75,25 @@ buildPythonPackage rec { pythonImportsCheck = [ "moviepy" ]; - disabledTests = [ - # stalls - "test_doc_examples" - # video orientation mismatch, 0 != 180 - "test_PR_529" - # video orientation [1920, 1080] != [1080, 1920] - "test_ffmpeg_parse_video_rotation" - "test_correct_video_rotation" - # media duration mismatch: assert 230.0 == 30.02 - "test_ffmpeg_parse_infos_decode_file" - # Failed: DID NOT RAISE - "test_ffmpeg_resize" - "test_ffmpeg_stabilize_video" - ]; + disabledTests = + [ + # stalls + "test_doc_examples" + # video orientation mismatch, 0 != 180 + "test_PR_529" + # video orientation [1920, 1080] != [1080, 1920] + "test_ffmpeg_parse_video_rotation" + "test_correct_video_rotation" + # media duration mismatch: assert 230.0 == 30.02 + "test_ffmpeg_parse_infos_decode_file" + # Failed: DID NOT RAISE + "test_ffmpeg_resize" + "test_ffmpeg_stabilize_video" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # Failed: Timeout >30.0s + "test_issue_1682" + ]; disabledTestPaths = [ "tests/test_compositing.py" @@ -93,11 +104,11 @@ buildPythonPackage rec { "tests/test_videotools.py" ]; - meta = with lib; { + meta = { description = "Video editing with Python"; homepage = "https://zulko.github.io/moviepy/"; - changelog = "https://github.com/Zulko/moviepy/blob/${src.tag}/CHANGELOG.md"; - license = licenses.mit; + changelog = "https://github.com/Zulko/moviepy/blob/v${version}/CHANGELOG.md"; + license = lib.licenses.mit; maintainers = [ ]; }; } From 8383c72f6bab0facb28e7e1f7569b073a68d9d56 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 10 Feb 2025 11:45:46 -0600 Subject: [PATCH 0992/2168] vimPlugins.vim-stationeers-ic10-syntax: fix update script --- .../non-generated/vim-stationeers-ic10-syntax/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/non-generated/vim-stationeers-ic10-syntax/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/vim-stationeers-ic10-syntax/default.nix index d6818ed03173..e78ad5e630f9 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/vim-stationeers-ic10-syntax/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/vim-stationeers-ic10-syntax/default.nix @@ -6,7 +6,7 @@ }: vimUtils.buildVimPlugin { pname = "vim-ic10"; - version = "unstable-2025-01-08"; + version = "0-unstable-2025-01-08"; src = fetchFromGitLab { owner = "LittleMorph"; @@ -15,7 +15,9 @@ vimUtils.buildVimPlugin { hash = "sha256-4Q1JiDA7PBUWNBNfCIZC6nImhe2FJzOqrslHazAOs18="; }; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; meta = { description = "Stationeers IC10 syntax highlighting for Vim"; From 7a90fea3a4370fcd3b4a86d55e0ca6ff70a1e82b Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 10 Feb 2025 11:52:05 -0600 Subject: [PATCH 0993/2168] vimPlugins.vim-clap: useFetchCargoVendor --- .../plugins/non-generated/vim-clap/Cargo.lock | 3900 ----------------- .../non-generated/vim-clap/default.nix | 49 +- 2 files changed, 23 insertions(+), 3926 deletions(-) delete mode 100644 pkgs/applications/editors/vim/plugins/non-generated/vim-clap/Cargo.lock diff --git a/pkgs/applications/editors/vim/plugins/non-generated/vim-clap/Cargo.lock b/pkgs/applications/editors/vim/plugins/non-generated/vim-clap/Cargo.lock deleted file mode 100644 index e089a2f24dcb..000000000000 --- a/pkgs/applications/editors/vim/plugins/non-generated/vim-clap/Cargo.lock +++ /dev/null @@ -1,3900 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[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 = "aho-corasick" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" -dependencies = [ - "memchr", -] - -[[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 = "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.81" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" - -[[package]] -name = "async-trait" -version = "0.1.77" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "axum" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" -dependencies = [ - "async-trait", - "axum-core", - "base64", - "bytes", - "futures-util", - "http 1.1.0", - "http-body 1.0.0", - "http-body-util", - "hyper 1.2.0", - "hyper-util", - "itoa", - "matchit", - "memchr", - "mime", - "percent-encoding", - "pin-project-lite", - "rustversion", - "serde", - "serde_json", - "serde_path_to_error", - "serde_urlencoded", - "sha1", - "sync_wrapper 1.0.0", - "tokio", - "tokio-tungstenite", - "tower", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "axum-core" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" -dependencies = [ - "async-trait", - "bytes", - "futures-util", - "http 1.1.0", - "http-body 1.0.0", - "http-body-util", - "mime", - "pin-project-lite", - "rustversion", - "sync_wrapper 0.1.2", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "axum-extra" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0be6ea09c9b96cb5076af0de2e383bd2bc0c18f827cf1967bdd353e0b910d733" -dependencies = [ - "axum", - "axum-core", - "bytes", - "futures-util", - "headers", - "http 1.1.0", - "http-body 1.0.0", - "http-body-util", - "mime", - "pin-project-lite", - "serde", - "tower", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "backtrace" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - -[[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.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" - -[[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 = "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 = "built" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96f9cdd34d6eb553f9ea20e5bf84abb7b13c729f113fc1d8e49dc00ad9fa8738" -dependencies = [ - "cargo-lock", - "git2 0.16.1", -] - -[[package]] -name = "bumpalo" -version = "3.15.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" - -[[package]] -name = "bytecount" -version = "0.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205" - -[[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 = "camino" -version = "1.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo-lock" -version = "8.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "031718ddb8f78aa5def78a09e90defe30151d1f6c672f937af4dd916429ed996" -dependencies = [ - "semver", - "serde", - "toml 0.5.11", - "url", -] - -[[package]] -name = "cargo-platform" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "694c8807f2ae16faecc43dc17d74b3eb042482789fd0eb64b39a2e04e087053f" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo_metadata" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" -dependencies = [ - "camino", - "cargo-platform", - "semver", - "serde", - "serde_json", - "thiserror", -] - -[[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.90" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" -dependencies = [ - "jobserver", - "libc", -] - -[[package]] -name = "cesu8" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" - -[[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.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "serde", - "wasm-bindgen", - "windows-targets 0.52.4", -] - -[[package]] -name = "chrono-humanize" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "799627e6b4d27827a814e837b9d8a504832086081806d45b1afa34dc982b023b" -dependencies = [ - "chrono", -] - -[[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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b230ab84b0ffdf890d5a10abdbc8b83ae1c4918275daea1ab8801f71536b2651" -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.0", -] - -[[package]] -name = "clap_derive" -version = "4.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47" -dependencies = [ - "heck", - "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 = "cli" -version = "0.1.54" -dependencies = [ - "anyhow", - "clap", - "criterion", - "filter", - "icon", - "itertools 0.10.5", - "maple_config", - "maple_core", - "matcher", - "num_cpus", - "printer", - "rayon", - "serde", - "serde_json", - "subprocess", - "tokio", - "tracing", - "tracing-appender", - "tracing-subscriber", - "types", - "utils", -] - -[[package]] -name = "clipboard-win" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fdf5e01086b6be750428ba4a40619f847eb2e95756eee84b18e06e5f0b50342" -dependencies = [ - "lazy-bytes-cast", - "winapi", -] - -[[package]] -name = "code_tools" -version = "0.1.54" -dependencies = [ - "cargo_metadata", - "maple_config", - "maple_lsp", - "once_cell", - "paths", - "regex", - "serde", - "serde_json", - "tokio", - "toml 0.8.12", - "tracing", - "which", -] - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "colors-transform" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9226dbc05df4fb986f48d730b001532580883c4c06c5d1c213f4b34c1c157178" - -[[package]] -name = "combine" -version = "4.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" -dependencies = [ - "bytes", - "memchr", -] - -[[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", - "windows-sys 0.52.0", -] - -[[package]] -name = "copypasta" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deb85422867ca93da58b7f95fb5c0c10f6183ed6e1ef8841568968a896d3a858" -dependencies = [ - "clipboard-win", - "objc", - "objc-foundation", - "objc_id", - "x11-clipboard", -] - -[[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 = "cpufeatures" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" -dependencies = [ - "libc", -] - -[[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", - "plotters", - "rayon", - "regex", - "serde", - "serde_derive", - "serde_json", - "tinytemplate", - "walkdir", -] - -[[package]] -name = "criterion-plot" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" -dependencies = [ - "cast", - "itertools 0.10.5", -] - -[[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-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-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[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 = "data-encoding" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" - -[[package]] -name = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", -] - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "crypto-common", -] - -[[package]] -name = "directories" -version = "4.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210" -dependencies = [ - "dirs-sys 0.3.7", -] - -[[package]] -name = "dirs" -version = "0.1.54" -dependencies = [ - "directories", -] - -[[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 = "doc_gen" -version = "0.1.0" -dependencies = [ - "inflections", - "itertools 0.12.1", - "maple_config", - "quote", - "syn", - "toml 0.8.12", - "toml_edit", -] - -[[package]] -name = "dunce" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" - -[[package]] -name = "either" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" - -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - -[[package]] -name = "encoding_rs" -version = "0.8.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "encoding_rs_io" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cc3c5651fb62ab8aa3103998dade57efdd028544bd300516baa31840c252a83" -dependencies = [ - "encoding_rs", -] - -[[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 = "extracted_fzy" -version = "0.1.54" - -[[package]] -name = "filter" -version = "0.1.54" -dependencies = [ - "icon", - "matcher", - "parking_lot", - "printer", - "rayon", - "serde_json", - "subprocess", - "thiserror", - "tracing", - "types", -] - -[[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 = "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", - "quote", - "syn", -] - -[[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 = "fuzzy-matcher" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94" -dependencies = [ - "thread_local", -] - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "gethostname" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" -dependencies = [ - "libc", - "windows-targets 0.48.5", -] - -[[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.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "gimli" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" - -[[package]] -name = "git2" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2994bee4a3a6a51eb90c218523be382fd7ea09b16380b9312e9dbe955ff7c7d1" -dependencies = [ - "bitflags 1.3.2", - "libc", - "libgit2-sys", - "log", - "openssl-probe", - "openssl-sys", - "url", -] - -[[package]] -name = "git2" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccf7f68c2995f392c49fffb4f95ae2c873297830eb25c6bc4c114ce8f4562acc" -dependencies = [ - "bitflags 1.3.2", - "libc", - "libgit2-sys", - "log", - "url", -] - -[[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.2", -] - -[[package]] -name = "grep-matcher" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47a3141a10a43acfedc7c98a60a834d7ba00dfe7bec9071cbfc19b55b292ac02" -dependencies = [ - "memchr", -] - -[[package]] -name = "grep-regex" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f748bb135ca835da5cbc67ca0e6955f968db9c5df74ca4f56b18e1ddbc68230d" -dependencies = [ - "bstr", - "grep-matcher", - "log", - "regex-automata 0.4.6", - "regex-syntax 0.8.2", -] - -[[package]] -name = "grep-searcher" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba536ae4f69bec62d8839584dd3153d3028ef31bb229f04e09fb5a9e5a193c54" -dependencies = [ - "bstr", - "encoding_rs", - "encoding_rs_io", - "grep-matcher", - "log", - "memchr", - "memmap2", -] - -[[package]] -name = "h2" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http 0.2.12", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "half" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" -dependencies = [ - "cfg-if", - "crunchy", -] - -[[package]] -name = "hashbrown" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" - -[[package]] -name = "headers" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322106e6bd0cba2d5ead589ddb8150a13d7c4217cf80d7c4f682ca994ccc6aa9" -dependencies = [ - "base64", - "bytes", - "headers-core", - "http 1.1.0", - "httpdate", - "mime", - "sha1", -] - -[[package]] -name = "headers-core" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54b4a22553d4242c49fddb9ba998a99962b5cc6f22cb5a3482bec22522403ce4" -dependencies = [ - "http 1.1.0", -] - -[[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.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - -[[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 = "http" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" -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.12", - "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.1.0", -] - -[[package]] -name = "http-body-util" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" -dependencies = [ - "bytes", - "futures-core", - "http 1.1.0", - "http-body 1.0.0", - "pin-project-lite", -] - -[[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 = "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", - "http 0.2.12", - "http-body 0.4.6", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "http 1.1.0", - "http-body 1.0.0", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "smallvec", - "tokio", -] - -[[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.12", - "hyper 0.14.28", - "rustls", - "tokio", - "tokio-rustls", -] - -[[package]] -name = "hyper-util" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" -dependencies = [ - "bytes", - "futures-util", - "http 1.1.0", - "http-body 1.0.0", - "hyper 1.2.0", - "pin-project-lite", - "socket2", - "tokio", -] - -[[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 = "icon" -version = "0.1.54" -dependencies = [ - "itertools 0.10.5", - "pattern", - "serde_json", -] - -[[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 = "indexmap" -version = "2.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" -dependencies = [ - "equivalent", - "hashbrown", -] - -[[package]] -name = "indicatif" -version = "0.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d207dc617c7a380ab07ff572a6e52fa202a2a8f355860ac9c38e23f8196be1b" -dependencies = [ - "console", - "lazy_static", - "number_prefix", - "regex", -] - -[[package]] -name = "inflections" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a257582fdcde896fd96463bf2d40eefea0580021c0712a0e2b028b60b47a837a" - -[[package]] -name = "ipnet" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" - -[[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 = "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.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" - -[[package]] -name = "jni" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" -dependencies = [ - "cesu8", - "cfg-if", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", - "windows-sys 0.45.0", -] - -[[package]] -name = "jni-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" - -[[package]] -name = "jobserver" -version = "0.1.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" -dependencies = [ - "libc", -] - -[[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 = "lazy-bytes-cast" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10257499f089cd156ad82d0a9cd57d9501fa2c989068992a97eb3c27836f206b" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.153" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" - -[[package]] -name = "libgit2-sys" -version = "0.14.2+1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f3d95f6b51075fe9810a7ae22c7095f12b98005ab364d8544797a825ce946a4" -dependencies = [ - "cc", - "libc", - "libssh2-sys", - "libz-sys", - "openssl-sys", - "pkg-config", -] - -[[package]] -name = "libredox" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" -dependencies = [ - "bitflags 2.4.2", - "libc", - "redox_syscall", -] - -[[package]] -name = "libredox" -version = "0.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" -dependencies = [ - "bitflags 2.4.2", - "libc", - "redox_syscall", -] - -[[package]] -name = "libssh2-sys" -version = "0.2.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b094a36eb4b8b8c8a7b4b8ae43b2944502be3e59cd87687595cf6b0a71b3f4ca" -dependencies = [ - "cc", - "libc", - "libz-sys", - "openssl-sys", - "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", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "line-wrap" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" -dependencies = [ - "safemem", -] - -[[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-types" -version = "0.94.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c66bfd44a06ae10647fe3f8214762e9369fd4248df1350924b4ef9e770a85ea1" -dependencies = [ - "bitflags 1.3.2", - "serde", - "serde_json", - "serde_repr", - "url", -] - -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - -[[package]] -name = "maple" -version = "0.1.51" -dependencies = [ - "built", - "chrono", - "clap", - "cli", - "tikv-jemallocator", - "tokio", - "upgrade", -] - -[[package]] -name = "maple_config" -version = "0.1.54" -dependencies = [ - "dirs 0.1.54", - "once_cell", - "paths", - "serde", - "serde_json", - "toml 0.8.12", - "types", -] - -[[package]] -name = "maple_core" -version = "0.1.54" -dependencies = [ - "async-trait", - "base64", - "chrono", - "chrono-humanize", - "clap", - "code_tools", - "colors-transform", - "copypasta", - "dirs 0.1.54", - "filter", - "futures", - "git2 0.15.0", - "grep-matcher", - "grep-searcher", - "icon", - "ignore", - "itertools 0.10.5", - "maple_config", - "maple_derive", - "maple_lsp", - "maple_markdown", - "matcher", - "once_cell", - "parking_lot", - "paths", - "pattern", - "printer", - "rayon", - "regex", - "rgb2ansi256", - "rpc", - "serde", - "serde_json", - "strsim 0.11.0", - "sublime_syntax", - "subprocess", - "thiserror", - "tokio", - "toml 0.8.12", - "tracing", - "tree_sitter", - "types", - "utils", - "webbrowser", -] - -[[package]] -name = "maple_derive" -version = "0.1.54" -dependencies = [ - "async-trait", - "darling", - "inflections", - "once_cell", - "proc-macro2", - "quote", - "syn", - "types", -] - -[[package]] -name = "maple_lsp" -version = "0.1.54" -dependencies = [ - "dirs 0.1.54", - "futures-util", - "lsp-types", - "parking_lot", - "paths", - "rpc", - "serde", - "serde_json", - "thiserror", - "tokio", - "toml 0.8.12", - "tracing", - "which", -] - -[[package]] -name = "maple_markdown" -version = "0.1.54" -dependencies = [ - "axum", - "axum-extra", - "once_cell", - "percent-encoding", - "pulldown-cmark", - "regex", - "serde_json", - "tokio", - "tracing", - "utils", - "webbrowser", -] - -[[package]] -name = "matcher" -version = "0.1.54" -dependencies = [ - "code_tools", - "extracted_fzy", - "fuzzy-matcher", - "grep-matcher", - "grep-regex", - "norm", - "nucleo-matcher", - "pattern", - "types", -] - -[[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 = "matchit" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" - -[[package]] -name = "memchr" -version = "2.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" - -[[package]] -name = "memmap2" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" -dependencies = [ - "libc", -] - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[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", - "wasi", - "windows-sys 0.48.0", -] - -[[package]] -name = "ndk-context" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" - -[[package]] -name = "norm" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed5725a3379c44dc0adf3437af87cf21c10df473ed858d654b12603dea102508" -dependencies = [ - "memchr", -] - -[[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 = "nucleo-matcher" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf33f538733d1a5a3494b836ba913207f14d9d4a1d3cd67030c5061bdd2cac85" -dependencies = [ - "memchr", - "unicode-segmentation", -] - -[[package]] -name = "num-conv" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" - -[[package]] -name = "num-traits" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - -[[package]] -name = "numtoa" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" - -[[package]] -name = "objc" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" -dependencies = [ - "malloc_buf", -] - -[[package]] -name = "objc-foundation" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" -dependencies = [ - "block", - "objc", - "objc_id", -] - -[[package]] -name = "objc_id" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" -dependencies = [ - "objc", -] - -[[package]] -name = "object" -version = "0.32.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" -dependencies = [ - "memchr", -] - -[[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 = "oorandom" -version = "11.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-sys" -version = "0.9.101" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - -[[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.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", - "libc", - "redox_syscall", - "smallvec", - "windows-targets 0.48.5", -] - -[[package]] -name = "paths" -version = "0.1.54" -dependencies = [ - "dirs 0.1.54", - "dunce", - "itertools 0.10.5", - "serde", - "shellexpand", -] - -[[package]] -name = "pattern" -version = "0.1.54" -dependencies = [ - "once_cell", - "regex", -] - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[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", -] - -[[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 = "pkg-config" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" - -[[package]] -name = "plist" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5699cc8a63d1aa2b1ee8e12b9ad70ac790d65788cd36101fa37f87ea46c4cef" -dependencies = [ - "base64", - "indexmap", - "line-wrap", - "quick-xml", - "serde", - "time", -] - -[[package]] -name = "plotters" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" -dependencies = [ - "num-traits", - "plotters-backend", - "plotters-svg", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "plotters-backend" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" - -[[package]] -name = "plotters-svg" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" -dependencies = [ - "plotters-backend", -] - -[[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 = "printer" -version = "0.1.54" -dependencies = [ - "filter", - "icon", - "pattern", - "rayon", - "serde", - "serde_json", - "termion", - "types", - "unicode-width", - "utils", -] - -[[package]] -name = "proc-macro2" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "pulldown-cmark" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0530d13d87d1f549b66a3e8d0c688952abe5994e204ed62615baaf25dc029c" -dependencies = [ - "bitflags 2.4.2", - "getopts", - "memchr", - "pulldown-cmark-escape", - "unicase", -] - -[[package]] -name = "pulldown-cmark-escape" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5d8f9aa0e3cbcfaf8bf00300004ee3b72f74770f9cbac93f6928771f613276b" - -[[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.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" -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 = "raw-window-handle" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" - -[[package]] -name = "rayon" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_termios" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20145670ba436b55d91fc92d25e71160fbfbdd57831631c8d7d36377a476f1cb" - -[[package]] -name = "redox_users" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" -dependencies = [ - "getrandom", - "libredox 0.0.1", - "thiserror", -] - -[[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.6", - "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.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" -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 = "reqwest" -version = "0.11.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78bf93c4af7a8bb7d879d51cebe797356ff10ae8516ace542b5182d9dcac10b2" -dependencies = [ - "base64", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.28", - "hyper-rustls", - "ipnet", - "js-sys", - "log", - "mime", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls", - "rustls-pemfile", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper 0.1.2", - "system-configuration", - "tokio", - "tokio-rustls", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "webpki-roots", - "winreg", -] - -[[package]] -name = "rgb2ansi256" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ebca96b1c05912d531790498048bab5b7b97a756a7bb9df71fa4ef7ef9814e1" - -[[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 = "rpc" -version = "0.1.54" -dependencies = [ - "serde", - "serde_json", - "thiserror", - "tokio", - "tracing", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[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", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustls" -version = "0.21.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" -dependencies = [ - "log", - "ring", - "rustls-webpki", - "sct", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" -dependencies = [ - "base64", -] - -[[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 = "rustversion" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" - -[[package]] -name = "ryu" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" - -[[package]] -name = "safemem" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" - -[[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 = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "semver" -version = "1.0.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" -dependencies = [ - "serde", -] - -[[package]] -name = "serde" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.114" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_path_to_error" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" -dependencies = [ - "itoa", - "serde", -] - -[[package]] -name = "serde_repr" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" -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_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 = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "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 = "shellexpand" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da03fa3b94cc19e3ebfc88c4229c49d8f08cdbd1228870a45f0ffdf84988e14b" -dependencies = [ - "dirs 5.0.1", -] - -[[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 = "simdutf8" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" - -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" - -[[package]] -name = "socket2" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" - -[[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 = "sublime_syntax" -version = "0.1.54" -dependencies = [ - "colors-transform", - "rgb2ansi256", - "serde", - "syntect", - "utils", -] - -[[package]] -name = "subprocess" -version = "0.2.10" -source = "git+https://github.com/hniksic/rust-subprocess#5e89ac093f378bcfc03c69bdb1b4bcacf4313ce4" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "syn" -version = "2.0.52" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - -[[package]] -name = "sync_wrapper" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "384595c11a4e2969895cad5a8c4029115f5ab956a9e5ef4de79d11a426e5f20c" - -[[package]] -name = "syntect" -version = "5.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "874dcfa363995604333cf947ae9f751ca3af4522c60886774c4963943b4746b1" -dependencies = [ - "bincode", - "bitflags 1.3.2", - "flate2", - "fnv", - "once_cell", - "onig", - "plist", - "regex-syntax 0.8.2", - "serde", - "serde_derive", - "serde_json", - "thiserror", - "walkdir", - "yaml-rust", -] - -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "termion" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "417813675a504dfbbf21bfde32c03e5bf9f2413999962b479023c02848c1c7a5" -dependencies = [ - "libc", - "libredox 0.0.2", - "numtoa", - "redox_termios", -] - -[[package]] -name = "thiserror" -version = "1.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" -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 = "time" -version = "0.3.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" -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.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" -dependencies = [ - "num-conv", - "time-core", -] - -[[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 = "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", - "quote", - "syn", -] - -[[package]] -name = "tokio-rustls" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" -dependencies = [ - "rustls", - "tokio", -] - -[[package]] -name = "tokio-tungstenite" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" -dependencies = [ - "futures-util", - "log", - "tokio", - "tungstenite", -] - -[[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-sink", - "pin-project-lite", - "tokio", - "tracing", -] - -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - -[[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 = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "pin-project", - "pin-project-lite", - "tokio", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-layer" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" - -[[package]] -name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[package]] -name = "tracing" -version = "0.1.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-appender" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf" -dependencies = [ - "crossbeam-channel", - "thiserror", - "time", - "tracing-subscriber", -] - -[[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-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 = "tree-sitter" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e747b1f9b7b931ed39a548c1fae149101497de3c1fc8d9e18c62c1a66c683d3d" -dependencies = [ - "cc", - "regex", -] - -[[package]] -name = "tree-sitter-bash" -version = "0.20.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da2032c37eb2ce29fd18df7d3b94355fec8d6d854d8f80934955df542b5906" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-c" -version = "0.20.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bbd5f3d8658c08581f8f2adac6c391c2e9fa00fe9246bf6c5f52213b9cc6b72" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-cpp" -version = "0.20.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46b04a5ada71059afb9895966a6cc1094acc8d2ea1971006db26573e7dfebb74" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-dockerfile" -version = "0.1.0" -source = "git+https://github.com/liuchengxu/tree-sitter-dockerfile?rev=be454233564871db713aab035e9cdc4c3ec572dc#be454233564871db713aab035e9cdc4c3ec572dc" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-go" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad6d11f19441b961af2fda7f12f5d0dac325f6d6de83836a1d3750018cc5114" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-highlight" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "042342584c5a7a0b833d9fc4e2bdab3f9868ddc6c4b339a1e01451c6720868bc" -dependencies = [ - "regex", - "thiserror", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-javascript" -version = "0.20.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d015c02ea98b62c806f7329ff71c383286dfc3a7a7da0cc484f6e42922f73c2c" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-json" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a9a38a9c679b55cc8d17350381ec08d69fa1a17a53fcf197f344516e485ed4d" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-md" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c20d3ef8d202430b644a307e6299d84bf8ed87fa1b796e4638f8805a595060c" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-python" -version = "0.20.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c93b1b1fbd0d399db3445f51fd3058e43d0b4dcff62ddbdb46e66550978aa5" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-rust" -version = "0.20.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0832309b0b2b6d33760ce5c0e818cb47e1d72b468516bfe4134408926fa7594" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-tags" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccb3f1376219530a37a809751ecf65aa35fd8b9c1c4ab6d4faf5f6a9eeda2c05" -dependencies = [ - "memchr", - "regex", - "thiserror", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-toml" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca517f578a98b23d20780247cc2688407fa81effad5b627a5a364ec3339b53e8" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-vim" -version = "0.3.1-dev.0" -source = "git+https://github.com/liuchengxu/tree-sitter-vim?rev=a001587c17ab24fdade5403eb6c4763460d6814c#a001587c17ab24fdade5403eb6c4763460d6814c" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree_sitter" -version = "0.1.54" -dependencies = [ - "cc", - "criterion", - "once_cell", - "rand", - "serde", - "toml 0.8.12", - "tracing", - "tree-sitter", - "tree-sitter-bash", - "tree-sitter-c", - "tree-sitter-cpp", - "tree-sitter-dockerfile", - "tree-sitter-go", - "tree-sitter-highlight", - "tree-sitter-javascript", - "tree-sitter-json", - "tree-sitter-md", - "tree-sitter-python", - "tree-sitter-rust", - "tree-sitter-tags", - "tree-sitter-toml", - "tree-sitter-vim", -] - -[[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.1.0", - "httparse", - "log", - "rand", - "sha1", - "thiserror", - "url", - "utf-8", -] - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "types" -version = "0.1.54" -dependencies = [ - "icon", - "pattern", -] - -[[package]] -name = "unicase" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check", -] - -[[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-normalization" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] - -[[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 = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - -[[package]] -name = "upgrade" -version = "0.1.54" -dependencies = [ - "indicatif", - "reqwest", - "serde", - "tokio", -] - -[[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 = "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 = "utils" -version = "0.1.54" -dependencies = [ - "bytecount", - "memchr", - "simdutf8", -] - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "walkdir" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" -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 = "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 = "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 = "webbrowser" -version = "0.8.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1b04c569c83a9bb971dd47ec6fd48753315f4bf989b9b04a2e7ca4d7f0dc950" -dependencies = [ - "core-foundation", - "home", - "jni", - "log", - "ndk-context", - "objc", - "raw-window-handle", - "url", - "web-sys", -] - -[[package]] -name = "webpki-roots" -version = "0.25.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" - -[[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 = "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-core" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" -dependencies = [ - "windows-targets 0.52.4", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - -[[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.4", -] - -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "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-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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" -dependencies = [ - "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.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.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.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.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 = "winnow" -version = "0.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14b9415ee827af173ebb3f15f9083df5a122eb93572ec28741fb153356ea2578" -dependencies = [ - "memchr", -] - -[[package]] -name = "winreg" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "write-json" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23f6174b2566cc4a74f95e1367ec343e7fa80c93cc8087f5c4a3d6a1088b2118" - -[[package]] -name = "x11-clipboard" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98785a09322d7446e28a13203d2cae1059a0dd3dfb32cb06d0a225f023d8286" -dependencies = [ - "libc", - "x11rb", -] - -[[package]] -name = "x11rb" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a" -dependencies = [ - "gethostname", - "rustix", - "x11rb-protocol", -] - -[[package]] -name = "x11rb-protocol" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34" - -[[package]] -name = "xshell" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce2107fe03e558353b4c71ad7626d58ed82efaf56c54134228608893c77023ad" -dependencies = [ - "xshell-macros", -] - -[[package]] -name = "xshell-macros" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e2c411759b501fb9501aac2b1b2d287a6e93e5bdcf13c25306b23e1b716dd0e" - -[[package]] -name = "xtask" -version = "0.1.54" -dependencies = [ - "anyhow", - "chrono", - "clap", - "serde", - "serde_json", - "write-json", - "xshell", -] - -[[package]] -name = "yaml-rust" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -dependencies = [ - "linked-hash-map", -] diff --git a/pkgs/applications/editors/vim/plugins/non-generated/vim-clap/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/vim-clap/default.nix index 391370c54efd..d450e197fc0f 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/vim-clap/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/vim-clap/default.nix @@ -1,13 +1,14 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, libgit2 -, zlib -, stdenv -, darwin -, vimUtils -, nix-update-script +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + libgit2, + zlib, + stdenv, + darwin, + vimUtils, + nix-update-script, }: let @@ -33,27 +34,23 @@ let pname = "maple"; inherit version src meta; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "subprocess-0.2.10" = "sha256-WcGrJ103ofGlQwi32kRGM3Z+uvKSCFBmFZbZXAtuWwM="; - "tree-sitter-dockerfile-0.1.0" = "sha256-K+duK3HcxlVgbLXBos3MUxyfnTywcHX6JM4Do0qAJO0="; - "tree-sitter-vim-0.3.1-dev.0" = "sha256-CWxZ28LdptiMNO2VIk+Ny/DhQXdN604EuqRIb9oaCmI="; - }; - }; + useFetchCargoVendor = true; + cargoHash = "sha256-FEeSwa8KmIyfhWAU9Dpric6uB2e0yK+Tig/k2zwq2Rg="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libgit2 - zlib - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = + [ + libgit2 + zlib + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.AppKit + darwin.apple_sdk.frameworks.CoreServices + darwin.apple_sdk.frameworks.SystemConfiguration + ]; }; in From 88de31f9e6a071d24f5373a3a1ab5cb87cf4e446 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 10 Feb 2025 12:08:54 -0600 Subject: [PATCH 0994/2168] vimPlugins.vim-clap: 0.54-unstable-2024-08-11 -> 0.54 We can pin to release and just patch in the rust 1.80 support so that updates happen as we'd like. --- .../plugins/non-generated/vim-clap/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/non-generated/vim-clap/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/vim-clap/default.nix index d450e197fc0f..1f19020e5b1e 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/vim-clap/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/vim-clap/default.nix @@ -2,6 +2,7 @@ lib, rustPlatform, fetchFromGitHub, + fetchpatch, pkg-config, libgit2, zlib, @@ -12,13 +13,13 @@ }: let - version = "0.54-unstable-2024-08-11"; + version = "0.54"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "3e8d001f5c9be10e4bb680a1d409326902c96c10"; - hash = "sha256-7bgbKYjJX2Tfprb69/imyvhsCsurrmPWBXVVLX+ZMnM="; + tag = "v${version}"; + hash = "sha256-rhCum59GCIAwdi5QgSaPfrALelAIMncNetu81i53Q8c="; }; meta = with lib; { @@ -41,6 +42,15 @@ let pkg-config ]; + # Remove after next release + cargoPatches = [ + (fetchpatch { + name = "rust-1.80"; + url = "https://github.com/liuchengxu/vim-clap/commit/3e8d001f5c9be10e4bb680a1d409326902c96c10.patch"; + hash = "sha256-qMflfQEssH4OGXmLFUcQwzbYWgPD0S/pClb35ZRUaPM="; + }) + ]; + buildInputs = [ libgit2 From 60c95f0556831c5c8254f028f3a1978bf1d6d868 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 10 Feb 2025 12:30:41 -0600 Subject: [PATCH 0995/2168] vimPlugins.nvim-julia-autotest: fix updateScript --- .../plugins/non-generated/nvim-julia-autotest/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/non-generated/nvim-julia-autotest/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/nvim-julia-autotest/default.nix index 2a0fc95ef84b..032705f8359b 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/nvim-julia-autotest/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/nvim-julia-autotest/default.nix @@ -6,7 +6,7 @@ }: vimUtils.buildVimPlugin { pname = "nvim-julia-autotest"; - version = "unstable-2022-10-31"; + version = "0-unstable-2022-10-31"; src = fetchFromGitLab { owner = "usmcamp0811"; @@ -15,7 +15,9 @@ vimUtils.buildVimPlugin { hash = "sha256-IaNsbBe5q7PB9Q/N/Z9nEnP6jlkQ6+xlkC0TCFnJpkk="; }; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; meta = { description = "Automatically run Julia tests when you save runtest.jl file"; From bd21b765cc0865b50d80ee759f906042a022f55a Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 10 Feb 2025 12:36:03 -0600 Subject: [PATCH 0996/2168] vimPlugins.vim-clap: clean up darwin Included in stdenv, don't need to provide. --- .../plugins/non-generated/vim-clap/default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/non-generated/vim-clap/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/vim-clap/default.nix index 1f19020e5b1e..4a9e6b976819 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/vim-clap/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/vim-clap/default.nix @@ -6,8 +6,6 @@ pkg-config, libgit2, zlib, - stdenv, - darwin, vimUtils, nix-update-script, }: @@ -51,16 +49,10 @@ let }) ]; - buildInputs = - [ - libgit2 - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + libgit2 + zlib + ]; }; in From c9e0a0b2c8b2ec99d77015846514c58a79b2c519 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 18:44:54 +0000 Subject: [PATCH 0997/2168] redpanda-client: 24.3.4 -> 24.3.5 --- pkgs/by-name/re/redpanda-client/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/redpanda-client/package.nix b/pkgs/by-name/re/redpanda-client/package.nix index 2fa9953df4ee..0b2a0b17e416 100644 --- a/pkgs/by-name/re/redpanda-client/package.nix +++ b/pkgs/by-name/re/redpanda-client/package.nix @@ -7,12 +7,12 @@ stdenv, }: let - version = "24.3.4"; + version = "24.3.5"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "redpanda"; rev = "v${version}"; - sha256 = "sha256-2VBichdsUM5cBAyRjMP2bECeMIQ60EYp832QNQ9UClk="; + sha256 = "sha256-Ev0eEZ3EHtSoNUr6MsYsd71riWq77+XrU5EPano08Rc="; }; in buildGoModule rec { @@ -20,7 +20,7 @@ buildGoModule rec { inherit doCheck src version; modRoot = "./src/go/rpk"; runVend = false; - vendorHash = "sha256-RoUrLJqGpXgFGMG5kLdwIxGTePiOFCM9QeX68vq/HrI="; + vendorHash = "sha256-D+hDDJb01LCyD6IjlycsRD5kqtQeavNbl4MaAVAVA14="; ldflags = [ ''-X "github.com/redpanda-data/redpanda/src/go/rpk/pkg/cli/cmd/version.version=${version}"'' From a8e9f113955e216c57e49a093142f287ea627963 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 18:47:44 +0000 Subject: [PATCH 0998/2168] python312Packages.bidsschematools: 1.0.0 -> 1.0.2 --- pkgs/development/python-modules/bidsschematools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bidsschematools/default.nix b/pkgs/development/python-modules/bidsschematools/default.nix index d9e75b998db7..4d9f19504a1f 100644 --- a/pkgs/development/python-modules/bidsschematools/default.nix +++ b/pkgs/development/python-modules/bidsschematools/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "bidsschematools"; - version = "1.0.0"; + version = "1.0.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "bidsschematools"; inherit version; - hash = "sha256-XqtCKtg3oqLCz5KihW9yk96fJ1uDcgag6qKCU9Bdqe4="; + hash = "sha256-JLm+iIyHPK0o1RtRM/Q1HNc6oCpPl/UaNhJO1xsXzT4="; }; build-system = [ From a1f5da8fc3a0ccc2b4617198d05563316f9d9ee8 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 10 Feb 2025 12:51:56 -0600 Subject: [PATCH 0999/2168] vimPlugins.lsp_lines-nvim: proper 3.0.0 update --- .../vim/plugins/non-generated/lsp_lines-nvim/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/non-generated/lsp_lines-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/lsp_lines-nvim/default.nix index 67d16f368e40..72d9495af2d2 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/lsp_lines-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/lsp_lines-nvim/default.nix @@ -4,15 +4,18 @@ fetchFromSourcehut, nix-update-script, }: +let + version = "3.0.0"; +in vimUtils.buildVimPlugin { pname = "lsp_lines.nvim"; - version = "3.0.0"; + inherit version; src = fetchFromSourcehut { owner = "~whynothugo"; repo = "lsp_lines.nvim"; - rev = "a92c755f182b89ea91bd8a6a2227208026f27b4d"; - hash = "sha256-jHiIZemneQACTDYZXBJqX2/PRTBoxq403ILvt1Ej1ZM="; + rev = "v${version}"; + hash = "sha256-QsvmPOer7JgO7Y+N/iaNJD7Kmy69gnlV4CeyaQesNvA="; }; passthru.updateScript = nix-update-script { }; From 78492482650e3a425091c3042d8abf6353a991ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 18:57:40 +0000 Subject: [PATCH 1000/2168] python312Packages.pylsqpack: 0.3.18 -> 0.3.19 --- pkgs/development/python-modules/pylsqpack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylsqpack/default.nix b/pkgs/development/python-modules/pylsqpack/default.nix index e36214b2206c..0febb5ed8065 100644 --- a/pkgs/development/python-modules/pylsqpack/default.nix +++ b/pkgs/development/python-modules/pylsqpack/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pylsqpack"; - version = "0.3.18"; + version = "0.3.19"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Ra5V5yGHdQX01czUlZHWk1PypUioZz36+yUdOFs8CX8="; + hash = "sha256-Up+j49bxsO7JK0NFA8DsVRy3FAI8wXEJEfZl+raobr0="; }; nativeBuildInputs = [ setuptools ]; From da0531911b6922d1cd5e9bded0ee9882eb58bb9c Mon Sep 17 00:00:00 2001 From: Alexis Praga Date: Sun, 9 Feb 2025 23:44:54 +0100 Subject: [PATCH 1001/2168] dragmap: fix compilation issue Missing include for Boost. Upstream PR: https://github.com/Illumina/DRAGMAP/pull/66 --- pkgs/by-name/dr/dragmap/boost-iterator-range.patch | 12 ++++++++++++ pkgs/by-name/dr/dragmap/package.nix | 14 ++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 pkgs/by-name/dr/dragmap/boost-iterator-range.patch diff --git a/pkgs/by-name/dr/dragmap/boost-iterator-range.patch b/pkgs/by-name/dr/dragmap/boost-iterator-range.patch new file mode 100644 index 000000000000..bd70eab43f49 --- /dev/null +++ b/pkgs/by-name/dr/dragmap/boost-iterator-range.patch @@ -0,0 +1,12 @@ +diff --git a/src/lib/map/Mapper.cpp b/src/lib/map/Mapper.cpp +index 6eaa2c5..781988c 100644 +--- a/src/lib/map/Mapper.cpp ++++ b/src/lib/map/Mapper.cpp +@@ -22,6 +22,7 @@ + //#include "common/Crc32Hw.hpp" + #include "common/DragenLogger.hpp" + #include "map/Mapper.hpp" ++#include + + namespace dragenos { + namespace map { diff --git a/pkgs/by-name/dr/dragmap/package.nix b/pkgs/by-name/dr/dragmap/package.nix index 9f61cbb3e5e4..2408b01be91d 100644 --- a/pkgs/by-name/dr/dragmap/package.nix +++ b/pkgs/by-name/dr/dragmap/package.nix @@ -33,6 +33,10 @@ stdenv.mkDerivation (finalAttrs: { # Add missing include cstdint. Upstream does not accept PR. Issue opened at # https://github.com/Illumina/DRAGMAP/issues/63 ./cstdint.patch + + # Missing import in Mapper.cpp + # Issue opened upstream https://github.com/Illumina/DRAGMAP/pull/66 + ./boost-iterator-range.patch ]; env = { @@ -53,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { # Tests are launched by default from makefile doCheck = false; - meta = with lib; { + meta = { description = "Open Source version of Dragen mapper for genomics"; mainProgram = "dragen-os"; longDescription = '' @@ -61,8 +65,10 @@ stdenv.mkDerivation (finalAttrs: { which the Illumina team created to procude the same results as their proprietary DRAGEN hardware. ''; - license = licenses.gpl3; - platforms = platforms.unix; - maintainers = with maintainers; [ apraga ]; + homepage = "https://github.com/Illumina/DRAGMAP"; + changelog = "https://github.com/Illumina/DRAGMAP/releases/tag/${finalAttrs.version}"; + license = lib.licenses.gpl3; + platforms = [ "x86_64-linux" ]; + maintainers = with lib.maintainers; [ apraga ]; }; }) From 35bbdb9f2dcb5665cf4ccc79479689529b664e67 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 19:08:40 +0000 Subject: [PATCH 1002/2168] repomix: 0.2.24 -> 0.2.25 --- pkgs/by-name/re/repomix/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/repomix/package.nix b/pkgs/by-name/re/repomix/package.nix index be56c6e68e75..6586d5c240d5 100644 --- a/pkgs/by-name/re/repomix/package.nix +++ b/pkgs/by-name/re/repomix/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "repomix"; - version = "0.2.24"; + version = "0.2.25"; src = fetchFromGitHub { owner = "yamadashy"; repo = "repomix"; tag = "v${version}"; - hash = "sha256-AP9wwx836AoIMnOc8JB06Kl9vfk9CQArLTsoYYdv3Rs="; + hash = "sha256-Iuf2BJjJGYLw8J2UQzbAK50BZPaMa/3E3gXswWVRxn0="; }; - npmDepsHash = "sha256-TYDqy2itdgCO0N3WyE56txLmiTE+ZhUeWRgxHf+mvec="; + npmDepsHash = "sha256-p/8/8o0BiHBsBaMtduEd1z6HYi3TerU6wuzOTq3oitg="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; From 64e75cd44acf21c7933d61d7721e812eac1b5a0a Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 10 Feb 2025 14:11:05 -0500 Subject: [PATCH 1003/2168] oh-my-zsh: Fix template (#380911) --- pkgs/by-name/oh/oh-my-zsh/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/oh/oh-my-zsh/package.nix b/pkgs/by-name/oh/oh-my-zsh/package.nix index a6042b18ed2a..9ad72a614144 100644 --- a/pkgs/by-name/oh/oh-my-zsh/package.nix +++ b/pkgs/by-name/oh/oh-my-zsh/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { chmod -R +w templates # Change the path to oh-my-zsh dir and disable auto-updating. - sed -i -e "s#ZSH=\$HOME/.oh-my-zsh#ZSH=$outdir#" \ + sed -i -e "s#ZSH=\"\$HOME/.oh-my-zsh\"#ZSH=\"$outdir\"#" \ -e 's/\# \(DISABLE_AUTO_UPDATE="true"\)/\1/' \ $template From 0c60920eb5ff9b8c30ad45495cb7610b53e6a2b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 10 Feb 2025 09:07:18 -0800 Subject: [PATCH 1004/2168] immich: 1.125.7 -> 1.126.1 Diff: https://github.com/immich-app/immich/compare/refs/tags/v1.125.7...v1.126.1 Changelog: https://github.com/immich-app/immich/releases/tag/v1.126.0 --- pkgs/by-name/im/immich/sources.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/im/immich/sources.json b/pkgs/by-name/im/immich/sources.json index 7e2d317c5608..01e73c01ac11 100644 --- a/pkgs/by-name/im/immich/sources.json +++ b/pkgs/by-name/im/immich/sources.json @@ -1,22 +1,22 @@ { - "version": "1.125.7", - "hash": "sha256-xXxLSfJgdBprDloJwjqLssux/M9+sOyyrzoqGp/dfOM=", + "version": "1.126.1", + "hash": "sha256-sUdnuO/FhTCpYEqeJ5DTL4AQZC1Li990M2viWPCxnFc=", "components": { "cli": { - "npmDepsHash": "sha256-rAL+0GxC/GrgWwc5Z0hsJwInpQ/Afk+O2Pwz+I8vtk0=", - "version": "2.2.48" + "npmDepsHash": "sha256-Al2cA4Fqn4IFMDyvoaRpxuAqbiwN9uP16RGapIQonps=", + "version": "2.2.50" }, "server": { - "npmDepsHash": "sha256-s20zBaB/uBDZe60OKtZkHte5AaYtsaKQtkObEl7SXDU=", - "version": "1.125.7" + "npmDepsHash": "sha256-qjSX8tu4HTYZneb7+hfPvcbU2raoeNuAbSXJlr0k0V4=", + "version": "1.126.1" }, "web": { - "npmDepsHash": "sha256-1zwtrFcs7mW2wMIQSwPU/CT3XxHZoIeh5KC/vZEPL4E=", - "version": "1.125.7" + "npmDepsHash": "sha256-LlOVgSrfSWIp8VSwKwUb/1sxLOjVqssXAyfVhVPtle4=", + "version": "1.126.1" }, "open-api/typescript-sdk": { - "npmDepsHash": "sha256-vjgalQXHOllSCkVAG6bm0jVM68V20WIFgV9L/mCkklU=", - "version": "1.125.7" + "npmDepsHash": "sha256-noStzQk2AGWDqDiRNBvfd+hWF+RXgwoh9s08vRMiK2w=", + "version": "1.126.1" }, "geonames": { "timestamp": "20250129185843", From bcba81b30add4ca395fef95dd87b34632243096c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 19:15:50 +0000 Subject: [PATCH 1005/2168] limbo: 0.0.13 -> 0.0.14 --- pkgs/by-name/li/limbo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/limbo/package.nix b/pkgs/by-name/li/limbo/package.nix index 9b1b7685905a..38f31582183f 100644 --- a/pkgs/by-name/li/limbo/package.nix +++ b/pkgs/by-name/li/limbo/package.nix @@ -7,17 +7,17 @@ }: rustPlatform.buildRustPackage rec { pname = "limbo"; - version = "0.0.13"; + version = "0.0.14"; src = fetchFromGitHub { owner = "tursodatabase"; repo = "limbo"; tag = "v${version}"; - hash = "sha256-zIjtuATXlqFh2IoM9cqWysZdRFaVgJTcZFWUsK+NtsQ="; + hash = "sha256-t3bIW+HuuZzj3NOw2lnTZw9qxj7lGWtR8RbZF0rVbQ4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Bb293Amn1S4QARtWrtRkWFHF5FisIcbrfJTsOV6aUQo="; + cargoHash = "sha256-DDUl/jojhDmSQY7iI/Dn+Lg4eNuNhj8jyakPtgg4d2k="; cargoBuildFlags = [ "-p" From c4708ef17b060378641ceb95c58ed9f7ce7bbfdb Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 10 Feb 2025 13:19:03 -0600 Subject: [PATCH 1006/2168] vimPlugins.gitlab-vim: proper 0.1.1 update --- .../vim/plugins/non-generated/gitlab-vim/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/non-generated/gitlab-vim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/gitlab-vim/default.nix index 58eb2a7fabff..824190179389 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/gitlab-vim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/gitlab-vim/default.nix @@ -4,15 +4,18 @@ fetchFromGitLab, nix-update-script, }: +let + version = "0.1.1"; +in vimUtils.buildVimPlugin { pname = "gitlab.vim"; - version = "0.1.1"; + inherit version; src = fetchFromGitLab { owner = "gitlab-org/editor-extensions"; repo = "gitlab.vim"; - rev = "62a60341df24ccecb73bc9ae34a198674bb12faf"; - hash = "sha256-9G5H3MUdE++hR7p8nsoxK5kuA84k8oJBMvOa01PZrsA="; + rev = "v${version}"; + hash = "sha256-W/FV+i/QJYX6A8uyxAQN4ov1kMd9UFCghFmSQp1kbnM="; }; passthru.updateScript = nix-update-script { }; From a228e8cb8266efbdac72544853f8f67be98527a6 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 10 Feb 2025 13:28:26 -0600 Subject: [PATCH 1007/2168] vimPlugins.cmp-async-path: fix updateScript --- .../vim/plugins/non-generated/cmp-async-path/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/non-generated/cmp-async-path/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/cmp-async-path/default.nix index 059e9c1733f3..2f5c42d5af2b 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/cmp-async-path/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/cmp-async-path/default.nix @@ -7,7 +7,7 @@ }: vimUtils.buildVimPlugin { pname = "cmp-async-path"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitea { domain = "codeberg.org"; @@ -19,7 +19,9 @@ vimUtils.buildVimPlugin { checkInputs = [ vimPlugins.nvim-cmp ]; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; meta = { description = "Nvim-cmp source for filesystem paths with async processing"; From 0cebbcb02b3d48424a07395595e59f71d74ddc45 Mon Sep 17 00:00:00 2001 From: Tobias Heinze Date: Sun, 2 Feb 2025 22:27:13 +0000 Subject: [PATCH 1008/2168] bitwarden-cli: 2024.12.0 -> 2025.1.2 Diff: https://github.com/bitwarden/clients/compare/cli-v2024.12.0...cli-v2025.1.2 Changelog: https://github.com/bitwarden/clients/releases/tag/cli-v2025.1.2 --- pkgs/by-name/bi/bitwarden-cli/package.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bi/bitwarden-cli/package.nix b/pkgs/by-name/bi/bitwarden-cli/package.nix index 5ce79f0e5f98..9a460216e6c4 100644 --- a/pkgs/by-name/bi/bitwarden-cli/package.nix +++ b/pkgs/by-name/bi/bitwarden-cli/package.nix @@ -13,13 +13,13 @@ buildNpmPackage rec { pname = "bitwarden-cli"; - version = "2024.12.0"; + version = "2025.1.2"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "cli-v${version}"; - hash = "sha256-3aN2t8/qhN0sjACvtip45efHQJl8nEMNre0+oBL1/go="; + hash = "sha256-Ibf25+aaEKFUCp5uiqmHySfdZq2JPAu2nBzfiS4Sc/k="; }; postPatch = '' @@ -29,7 +29,7 @@ buildNpmPackage rec { nodejs = nodejs_20; - npmDepsHash = "sha256-EtIcqbubAYN9I9wbw17oHiVshd3GtQayFtdgqWP7Pgg="; + npmDepsHash = "sha256-+LpF5zxC4TG5tF+RNgimLyEmGYyUfFDXHqs2RH9oQLY="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ cctools @@ -50,6 +50,14 @@ buildNpmPackage rec { npmFlags = [ "--legacy-peer-deps" ]; + # FIXME temporarily disable the symlink check as there are symlink after the build in the `node_modules/@bitwarden` directory linking to `../../`. + dontCheckForBrokenSymlinks = true; + + npmRebuildFlags = [ + # FIXME one of the esbuild versions fails to download @esbuild/linux-x64 + "--ignore-scripts" + ]; + postConfigure = '' # we want to build everything from source shopt -s globstar From 0b625dc5b854fd4a31157be6c458e880f02c78be Mon Sep 17 00:00:00 2001 From: Hendrik Sokolowski Date: Mon, 10 Feb 2025 19:38:12 +0000 Subject: [PATCH 1009/2168] python3Packages.ghome-foyer-api: init at 1.1.1 (#380790) * python-modules.ghome-foyer-api: init at 1.1.1 * Update pkgs/development/python-modules/ghome-foyer-api/default.nix --------- Co-authored-by: Sandro --- .../ghome-foyer-api/default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/python-modules/ghome-foyer-api/default.nix diff --git a/pkgs/development/python-modules/ghome-foyer-api/default.nix b/pkgs/development/python-modules/ghome-foyer-api/default.nix new file mode 100644 index 000000000000..d171953e2983 --- /dev/null +++ b/pkgs/development/python-modules/ghome-foyer-api/default.nix @@ -0,0 +1,42 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + grpcio, + hatchling, + hatch-vcs, + protobuf, +}: + +buildPythonPackage rec { + pname = "ghome-foyer-api"; + version = "1.1.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "KapJI"; + repo = "ghome-foyer-api"; + tag = "v${version}"; + hash = "sha256-sup+j9GFGTR+HimpkpvvAqtgYWtJt2qCPZzLvMG8hzI="; + }; + + buildInputs = [ + hatchling + hatch-vcs + ]; + + propagatedBuildInputs = [ + grpcio + protobuf + ]; + + meta = { + description = "Generated Python protobuf stubs for Google Home internal API"; + homepage = "https://github.com/KapJI/ghome-foyer-api"; + changelog = "https://github.com/KapJI/ghome-foyer-api/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + hensoko + ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ad9734cfcfd0..aa133fa125bc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5291,6 +5291,8 @@ self: super: with self; { ghdiff = callPackage ../development/python-modules/ghdiff { }; + ghome-foyer-api = callPackage ../development/python-modules/ghome-foyer-api { }; + ghp-import = callPackage ../development/python-modules/ghp-import { }; ghrepo-stats = callPackage ../development/python-modules/ghrepo-stats { }; From 789df15151d6876571884c2a69e0d2c8a4883663 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?W=C3=B6lfchen?= Date: Mon, 10 Feb 2025 19:40:50 +0000 Subject: [PATCH 1010/2168] obsidian: pin electron to 33 (#380617) obsidian: pin electron to v33 --- pkgs/top-level/all-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a58cf1edb0c..6cdb7c778357 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14639,6 +14639,10 @@ with pkgs; obs-studio-plugins = recurseIntoAttrs (callPackage ../applications/video/obs-studio/plugins {}); wrapOBS = callPackage ../applications/video/obs-studio/wrapper.nix { }; + obsidian = callPackage ../by-name/ob/obsidian/package.nix { + electron = electron_33; + }; + okms-cli = callPackage ../by-name/ok/okms-cli/package.nix { buildGoModule = buildGo123Module; }; From 6f95ea09266bf64898105d88577311e2fa8ea069 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20James?= Date: Mon, 10 Feb 2025 20:43:28 +0100 Subject: [PATCH 1011/2168] textualeffects: init at 0.1.3 textualeffects: integrate code-review comments textualeffects: integrate code-review comments --- .../python-modules/textualeffects/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/textualeffects/default.nix diff --git a/pkgs/development/python-modules/textualeffects/default.nix b/pkgs/development/python-modules/textualeffects/default.nix new file mode 100644 index 000000000000..889c7314859d --- /dev/null +++ b/pkgs/development/python-modules/textualeffects/default.nix @@ -0,0 +1,38 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + pythonOlder, + hatchling, + terminaltexteffects, +}: + +buildPythonPackage rec { + pname = "textualeffects"; + version = "0.1.3"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-s6LrsCJu/ubDIXQqxQlY2HVbzDc9+FtUE9oBSulUsm8="; + }; + + build-system = [ hatchling ]; + + dependencies = [ terminaltexteffects ]; + + pythonImportsCheck = [ "textualeffects" ]; + + # no tests implemented + doCheck = false; + + meta = { + description = "Visual effects for Textual, a TerminalTextEffects wrapper"; + homepage = "https://github.com/ggozad/textualeffects"; + changelog = "https://github.com/ggozad/textualeffects/blob/v${version}/CHANGES.txt"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ gaelj ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index aa133fa125bc..1ab3ea27b453 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16237,6 +16237,8 @@ self: super: with self; { textual-universal-directorytree = callPackage ../development/python-modules/textual-universal-directorytree { }; + textualeffects = callPackage ../development/python-modules/textualeffects { }; + textual-textarea = callPackage ../development/python-modules/textual-textarea { }; testbook = callPackage ../development/python-modules/testbook { }; From cc43fcb822a3616af4f5d3deb86cf40d0d3d16b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20James?= Date: Mon, 10 Feb 2025 20:43:28 +0100 Subject: [PATCH 1012/2168] oterm: fix runtime error: missing textualeffects (#366021) --- pkgs/by-name/ot/oterm/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ot/oterm/package.nix b/pkgs/by-name/ot/oterm/package.nix index c9cae817ef92..fa2d2a68036c 100644 --- a/pkgs/by-name/ot/oterm/package.nix +++ b/pkgs/by-name/ot/oterm/package.nix @@ -40,6 +40,7 @@ python3Packages.buildPythonApplication rec { python-dotenv rich-pixels textual + textualeffects typer ]; From 2439cd293aaef13649e90aea869dd884e99bab75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20James?= Date: Mon, 10 Feb 2025 20:43:28 +0100 Subject: [PATCH 1013/2168] maintainers: add gaelj --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index dda73802e1e0..49bbc5958207 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8204,6 +8204,12 @@ name = "Florian Brandes"; keys = [ { fingerprint = "0200 3EF8 8D2B CF2D 8F00 FFDC BBB3 E40E 5379 7FD9"; } ]; }; + gaelj = { + name = "Gaël James"; + email = "gaeljames@gmail.com"; + github = "gaelj"; + githubId = 8884632; + }; gaelreyrol = { email = "me@gaelreyrol.dev"; matrix = "@Zevran:matrix.org"; From 49bdffa7151f4a69758a36286a7d6bbd224b48d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20James?= Date: Mon, 10 Feb 2025 20:43:28 +0100 Subject: [PATCH 1014/2168] oterm: assign gaelj as maintainer --- pkgs/by-name/ot/oterm/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ot/oterm/package.nix b/pkgs/by-name/ot/oterm/package.nix index fa2d2a68036c..bb998fba57ce 100644 --- a/pkgs/by-name/ot/oterm/package.nix +++ b/pkgs/by-name/ot/oterm/package.nix @@ -54,7 +54,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/ggozad/oterm"; changelog = "https://github.com/ggozad/oterm/releases/tag/${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ suhr ]; + maintainers = with lib.maintainers; [ gaelj ]; mainProgram = "oterm"; }; } From 47a98549697263e82475b06fbaa240f1bbf99ddb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20James?= Date: Mon, 10 Feb 2025 20:43:29 +0100 Subject: [PATCH 1015/2168] oterm: 0.7.3 -> 0.8.0 --- pkgs/by-name/ot/oterm/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ot/oterm/package.nix b/pkgs/by-name/ot/oterm/package.nix index bb998fba57ce..bfa58eeb2bbd 100644 --- a/pkgs/by-name/ot/oterm/package.nix +++ b/pkgs/by-name/ot/oterm/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "oterm"; - version = "0.7.3"; + version = "0.8.0"; pyproject = true; src = fetchFromGitHub { owner = "ggozad"; repo = "oterm"; tag = version; - hash = "sha256-COIvnn6qDG9srv4ByWTBoRHfIva3a2dLS+yIZDguo+M="; + hash = "sha256-YKzC7GzRMFQ3zuVrbsiKCW9o8iCAR3PzSYP1ufRspDQ="; }; pythonRelaxDeps = [ @@ -33,6 +33,7 @@ python3Packages.buildPythonApplication rec { aiosql aiosqlite httpx + mcp ollama packaging pillow From f8a5af2c61adde372256194b4ef27f5dd71b41b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20James?= Date: Mon, 10 Feb 2025 20:43:29 +0100 Subject: [PATCH 1016/2168] oterm: 0.8.0 -> 0.8.1 --- pkgs/by-name/ot/oterm/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ot/oterm/package.nix b/pkgs/by-name/ot/oterm/package.nix index bfa58eeb2bbd..f923bcba7d05 100644 --- a/pkgs/by-name/ot/oterm/package.nix +++ b/pkgs/by-name/ot/oterm/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "oterm"; - version = "0.8.0"; + version = "0.8.1"; pyproject = true; src = fetchFromGitHub { owner = "ggozad"; repo = "oterm"; tag = version; - hash = "sha256-YKzC7GzRMFQ3zuVrbsiKCW9o8iCAR3PzSYP1ufRspDQ="; + hash = "sha256-JE9WgAtCDksfVq17LIDdfvjR9IW02vkH2JhY7eLOgF0="; }; pythonRelaxDeps = [ From 264fbf0c768df8b24d42b7e9ffbfceb8285c9c4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20James?= Date: Mon, 10 Feb 2025 20:43:29 +0100 Subject: [PATCH 1017/2168] oterm: 0.8.1 -> 0.8.3 --- pkgs/by-name/ot/oterm/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ot/oterm/package.nix b/pkgs/by-name/ot/oterm/package.nix index f923bcba7d05..726aa68b2b64 100644 --- a/pkgs/by-name/ot/oterm/package.nix +++ b/pkgs/by-name/ot/oterm/package.nix @@ -6,17 +6,18 @@ python3Packages.buildPythonApplication rec { pname = "oterm"; - version = "0.8.1"; + version = "0.8.3"; pyproject = true; src = fetchFromGitHub { owner = "ggozad"; repo = "oterm"; tag = version; - hash = "sha256-JE9WgAtCDksfVq17LIDdfvjR9IW02vkH2JhY7eLOgF0="; + hash = "sha256-QIvnGU1BHKsJ/UMcS9zS2v9rn51wKoXvx50rGBIAzm4="; }; pythonRelaxDeps = [ + "aiosql" "aiosqlite" "httpx" "ollama" From b6570625687dee219dceaaea8efba52c08839a61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joshua=20Kobsch=C3=A4tzki?= Date: Mon, 10 Feb 2025 20:54:06 +0100 Subject: [PATCH 1018/2168] squid: fix invalid url This resolves #380914. --- pkgs/by-name/sq/squid/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/sq/squid/package.nix b/pkgs/by-name/sq/squid/package.nix index 376621268646..5d2803944dcf 100644 --- a/pkgs/by-name/sq/squid/package.nix +++ b/pkgs/by-name/sq/squid/package.nix @@ -24,7 +24,9 @@ stdenv.mkDerivation (finalAttrs: { version = "6.13"; src = fetchurl { - url = "http://www.squid-cache.org/Versions/v6/squid-${finalAttrs.version}.tar.xz"; + url = "https://github.com/squid-cache/squid/releases/download/SQUID_${ + builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version + }/squid-${finalAttrs.version}.tar.xz"; hash = "sha256-Iy4FZ5RszAEVZTw8GPAeg/LZzEnEPZ3q2LMZrws1rVI="; }; From f9ea6d81eaccc9760ab151e5f3c7be0f834855ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ha=CC=88cker?= Date: Sun, 9 Feb 2025 22:12:01 +0100 Subject: [PATCH 1019/2168] ut1999: on darwin, move app bundle into Applications folder and add wrapper at bin/ut1999 so `nix run` can start the app --- pkgs/by-name/ut/ut1999/package.nix | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ut/ut1999/package.nix b/pkgs/by-name/ut/ut1999/package.nix index 2d86e22b8cbe..3301ac5668ec 100644 --- a/pkgs/by-name/ut/ut1999/package.nix +++ b/pkgs/by-name/ut/ut1999/package.nix @@ -6,6 +6,7 @@ undmg, fetchurl, makeDesktopItem, + makeWrapper, copyDesktopItems, libarchive, imagemagick, @@ -67,7 +68,7 @@ let } .${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}"); in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { name = "ut1999"; inherit version; sourceRoot = "."; @@ -91,23 +92,32 @@ stdenv.mkDerivation { autoPatchelfHook ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + makeWrapper undmg ]; installPhase = let outPrefix = - if stdenv.hostPlatform.isDarwin then "$out/UnrealTournament.app/Contents/MacOS" else "$out"; + if stdenv.hostPlatform.isDarwin then + "$out/Applications/UnrealTournament.app/Contents/MacOS" + else + "$out"; in '' runHook preInstall - mkdir -p $out - '' - + lib.optionalString (stdenv.hostPlatform.isLinux) '' mkdir -p $out/bin '' + + lib.optionalString (stdenv.hostPlatform.isLinux) '' + cp -r ./* $out + '' + + lib.optionalString (stdenv.hostPlatform.isDarwin) '' + mkdir -p $out/Applications/ + cp -r "UnrealTournament.app" $out/Applications/ + makeWrapper $out/Applications/UnrealTournament.app/Contents/MacOS/UnrealTournament \ + $out/bin/${finalAttrs.meta.mainProgram} + '' + '' - cp -r ${if stdenv.hostPlatform.isDarwin then "UnrealTournament.app" else "./*"} $out chmod -R 755 $out cd ${outPrefix} # NOTE: OldUnreal patch doesn't include these folders on linux but could in the future @@ -181,4 +191,4 @@ stdenv.mkDerivation { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; mainProgram = "ut1999"; }; -} +}) From 67b6ea8a964cb3e18ef78cd26a7afc5cd580c4d1 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 7 Feb 2025 22:46:54 +0000 Subject: [PATCH 1020/2168] diffoscope: 287 -> 288, use --replace-fail, drop old sed Changes: https://diffoscope.org/news/diffoscope-288-released/ --- pkgs/tools/misc/diffoscope/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 6f0efb5fc4ee..d2a46860416a 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -106,11 +106,11 @@ in # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python.pkgs.buildPythonApplication rec { pname = "diffoscope"; - version = "287"; + version = "288"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - hash = "sha256-0s7pT8pAMCE+csd9/+Dv4AbCK0qxDacQ9fNcMYCNDbw="; + hash = "sha256-HeJfqjmuduVc/C0kfaAsiQuoKrrwlW69lkfYDz1uFlg="; }; outputs = [ @@ -121,11 +121,11 @@ python.pkgs.buildPythonApplication rec { patches = [ ./ignore_links.patch ]; postPatch = '' - # Upstream doesn't provide a PKG-INFO file - sed -i setup.py -e "/'rpm-python',/d" - # When generating manpage, use the installed version - substituteInPlace doc/Makefile --replace "../bin" "$out/bin" + substituteInPlace doc/Makefile --replace-fail "../bin" "$out/bin" + + substituteInPlace diffoscope/comparators/apk.py \ + --replace-fail "from androguard.core.bytecodes import apk" "from androguard.core import apk" ''; nativeBuildInputs = [ From 536a11d94e0b7163847cfc0180b580afa13ebbb9 Mon Sep 17 00:00:00 2001 From: Tert0 Date: Mon, 10 Feb 2025 21:19:20 +0100 Subject: [PATCH 1021/2168] libreoffice-{collabora,fresh,still}-unwrapped: refactor package metadata and change licenses --- pkgs/applications/office/libreoffice/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 57227d4c23be..f13aa246866d 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -658,15 +658,15 @@ in stdenv.mkDerivation (finalAttrs: { requiredSystemFeatures = [ "big-parallel" ]; - meta = with lib; { + meta = { changelog = "https://wiki.documentfoundation.org/ReleaseNotes/${lib.versions.majorMinor version}"; description = "Comprehensive, professional-quality productivity suite, a variant of openoffice.org"; homepage = "https://libreoffice.org/"; # at least one jar in dependencies - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.lgpl3; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + license = with lib.licenses; [ mpl20 lgpl3Plus asl20 ]; + maintainers = with lib.maintainers; [ raskin ]; + platforms = lib.platforms.linux; mainProgram = "libreoffice"; }; }) From b8613fec1e8a22185b5c86033080ba418c713841 Mon Sep 17 00:00:00 2001 From: "Braian A. Diez" Date: Mon, 10 Feb 2025 17:01:08 -0300 Subject: [PATCH 1022/2168] whitesur-icon-theme: 2024-09-07 -> 2025-02-10 --- pkgs/by-name/wh/whitesur-icon-theme/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/wh/whitesur-icon-theme/package.nix b/pkgs/by-name/wh/whitesur-icon-theme/package.nix index 4eae52fabac3..33ea5180ba81 100644 --- a/pkgs/by-name/wh/whitesur-icon-theme/package.nix +++ b/pkgs/by-name/wh/whitesur-icon-theme/package.nix @@ -32,13 +32,13 @@ lib.checkListOfEnum "${pname}: theme variants" stdenvNoCC.mkDerivation rec { inherit pname; - version = "2024-09-07"; + version = "2025-02-10"; src = fetchFromGitHub { owner = "vinceliuice"; - repo = pname; - rev = version; - hash = "sha256-/cW/ymT9MjB07Sw7ifpr6x8oaaeI4PSyaOdLci7AncY="; + repo = "WhiteSur-icon-theme"; + tag = "v${version}"; + hash = "sha256-spTmS9Cn/HAnbgf6HppwME63cxWEbcKwWYMMj8ajFyY="; }; nativeBuildInputs = [ From ff33d5b17bf87e5a087cfd6161c009e239b31ba9 Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Mon, 10 Feb 2025 12:51:00 -0800 Subject: [PATCH 1023/2168] tela-cicle-icon-theme: 2024-11-15 -> 2025-02-10 --- pkgs/data/icons/tela-circle-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/tela-circle-icon-theme/default.nix b/pkgs/data/icons/tela-circle-icon-theme/default.nix index db58831f0624..e9226c205d0a 100644 --- a/pkgs/data/icons/tela-circle-icon-theme/default.nix +++ b/pkgs/data/icons/tela-circle-icon-theme/default.nix @@ -39,13 +39,13 @@ lib.checkListOfEnum "${pname}: color variants" stdenvNoCC.mkDerivation rec { inherit pname; - version = "2024-11-15"; + version = "2025-02-10"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - hash = "sha256-+eylAssnZK0H1ifBahnj+E+uCkukeGMXg00YT0Dg7dc="; + hash = "sha256-5Kqf6QNM+/JGGp2H3Vcl69Vh1iZYPq3HJxhvSH6k+eQ="; }; nativeBuildInputs = [ From 94af5ee5022b023bb1f2832065c40e519bce1cab Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 10 Feb 2025 21:43:06 +0100 Subject: [PATCH 1024/2168] vimPlugins.sniprun: 1.3.16 -> 1.3.17 Diff: https://github.com/michaelb/sniprun/compare/refs/tags/v1.3.16...v1.3.17 Changelog: https://github.com/michaelb/sniprun/blob/v1.3.17/CHANGELOG.md --- .../plugins/non-generated/sniprun/default.nix | 30 ++++++++++++------- .../non-generated/sniprun/fix-paths.patch | 4 +-- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/non-generated/sniprun/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/sniprun/default.nix index ac7643443ee8..4594b378744a 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/sniprun/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/sniprun/default.nix @@ -1,9 +1,9 @@ { lib, fetchFromGitHub, - nix-update-script, + + # sniprun-bin rustPlatform, - vimUtils, makeWrapper, bashInteractive, coreutils, @@ -11,21 +11,26 @@ gnugrep, gnused, procps, + + # sniprun + vimUtils, + substituteAll, + nix-update-script, }: let - version = "1.3.16"; + version = "1.3.17"; src = fetchFromGitHub { owner = "michaelb"; repo = "sniprun"; tag = "v${version}"; - hash = "sha256-2rVeBUkdLXUiHkd8slyiLTYQBKwgMQvIi/uyCToVBYA="; + hash = "sha256-o8U3GXg61dfEzQxrs9zCgRDWonhr628aSPd/l+HxS70="; }; sniprun-bin = rustPlatform.buildRustPackage { pname = "sniprun-bin"; inherit version src; useFetchCargoVendor = true; - cargoHash = "sha256-j3i86I5Lmt0+fQONikHnxfeLEbiyFSairgjHXmjZfTk="; + cargoHash = "sha256-HLPTt0JCmCM4SRmP8o435ilM1yxoxpAnf8hg3+8C54I="; nativeBuildInputs = [ makeWrapper ]; @@ -44,17 +49,20 @@ let ''; doCheck = false; + + meta.mainProgram = "sniprun"; }; in vimUtils.buildVimPlugin { pname = "sniprun"; inherit version src; - patches = [ ./fix-paths.patch ]; - - postPatch = '' - substituteInPlace lua/sniprun.lua --replace '@sniprun_bin@' ${sniprun-bin} - ''; + patches = [ + (substituteAll { + src = ./fix-paths.patch; + sniprun = lib.getExe sniprun-bin; + }) + ]; propagatedBuildInputs = [ sniprun-bin ]; @@ -69,7 +77,7 @@ vimUtils.buildVimPlugin { meta = { homepage = "https://github.com/michaelb/sniprun/"; - changelog = "https://github.com/michaelb/sniprun/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/michaelb/sniprun/blob/v${version}/CHANGELOG.md"; maintainers = with lib.maintainers; [ GaetanLepage ]; license = lib.licenses.mit; }; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/sniprun/fix-paths.patch b/pkgs/applications/editors/vim/plugins/non-generated/sniprun/fix-paths.patch index f444a80437bc..003a8014b598 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/sniprun/fix-paths.patch +++ b/pkgs/applications/editors/vim/plugins/non-generated/sniprun/fix-paths.patch @@ -1,5 +1,5 @@ diff --git a/lua/sniprun.lua b/lua/sniprun.lua -index 49be442..1834566 100644 +index 49be442..9342351 100644 --- a/lua/sniprun.lua +++ b/lua/sniprun.lua @@ -3,9 +3,7 @@ M.ping_anwsered = 0 @@ -9,7 +9,7 @@ index 49be442..1834566 100644 -local binary_path = vim.fn.fnamemodify( - vim.api.nvim_get_runtime_file("lua/sniprun.lua", false)[1], ":h:h") - .. "/target/release/sniprun" -+local binary_path = "@sniprun_bin@/bin/sniprun" ++local binary_path = "@sniprun@" local sniprun_path = vim.fn.fnamemodify(vim.api.nvim_get_runtime_file("lua/sniprun.lua", false)[1], ":p:h") .. "/.." From b38038f65e29860058382f1ee709ee3cbc4236ef Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 10 Feb 2025 21:55:18 +0100 Subject: [PATCH 1025/2168] fastfetch: 2.35.0 -> 2.36.0 Diff: https://github.com/fastfetch-cli/fastfetch/compare/refs/tags/2.35.0...2.36.0 Changelog: https://github.com/fastfetch-cli/fastfetch/releases/tag/2.36.0 --- pkgs/by-name/fa/fastfetch/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index e5bd1138f0fc..b2e09f04e23e 100644 --- a/pkgs/by-name/fa/fastfetch/package.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -45,13 +45,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.35.0"; + version = "2.36.0"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; tag = finalAttrs.version; - hash = "sha256-ChuK5DHRj1qJIjRo3oB5gdCxox2mDffCVM0wRGc5t1o="; + hash = "sha256-pSPXSvomvQBps8ctF/PXaOP+7xBIRxNlRVIFVy8nxwY="; }; outputs = [ From db5ba327e1a49b98ae2e347246b23b8a8452dfda Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 21 Oct 2024 18:39:43 +0200 Subject: [PATCH 1026/2168] python312Packages.tensordict: 0.6.2 -> 0.7.0 Diff: https://github.com/pytorch/tensordict/compare/refs/tags/v0.6.2...v0.7.0 Changelog: https://github.com/pytorch/tensordict/releases/tag/v0.7.0 --- .../python-modules/tensordict/default.nix | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/tensordict/default.nix b/pkgs/development/python-modules/tensordict/default.nix index 2f68c637ede6..391142bc00f5 100644 --- a/pkgs/development/python-modules/tensordict/default.nix +++ b/pkgs/development/python-modules/tensordict/default.nix @@ -1,18 +1,17 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system setuptools, torch, - which, # dependencies cloudpickle, numpy, orjson, + packaging, # checks h5py, @@ -23,28 +22,26 @@ buildPythonPackage rec { pname = "tensordict"; - version = "0.6.2"; + version = "0.7.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "pytorch"; repo = "tensordict"; tag = "v${version}"; - hash = "sha256-dsbpk0O5Gs5WUfi3ENqHdpy4rWoBjm1i44+ycp0jDJ0="; + hash = "sha256-KbCNBFewMx4kaWMoV+zREj6XTZiwmR4/I3zpf55wuOQ="; }; build-system = [ setuptools torch - which ]; dependencies = [ cloudpickle numpy orjson + packaging torch ]; @@ -62,6 +59,10 @@ buildPythonPackage rec { disabledTests = [ + # FileNotFoundError: [Errno 2] No such file or directory: '/build/source/tensordict/tensorclass.pyi + "test_tensorclass_instance_methods" + "test_tensorclass_stub_methods" + # Hangs forever "test_copy_onto" @@ -86,14 +87,15 @@ buildPythonPackage rec { "test_isend" ]; - disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ - # torch._dynamo.exc.BackendCompilerFailed: backend='inductor' raised: - # OpenMP support not found. - "test/test_compile.py" - - # ModuleNotFoundError: No module named 'torch._C._distributed_c10d'; 'torch._C' is not a package - "test/test_distributed.py" - ]; + disabledTestPaths = + [ + # torch._dynamo.exc.Unsupported: Graph break due to unsupported builtin None.ReferenceType.__new__. + "test/test_compile.py" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # ModuleNotFoundError: No module named 'torch._C._distributed_c10d'; 'torch._C' is not a package + "test/test_distributed.py" + ]; meta = { description = "Pytorch dedicated tensor container"; From 585da4dd7784e17a0306860abf47a1e7aafff037 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 10 Feb 2025 21:14:44 +0000 Subject: [PATCH 1027/2168] wezterm: 0-unstable-2025-01-24 -> 0-unstable-2025-02-10 --- pkgs/by-name/we/wezterm/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/we/wezterm/package.nix b/pkgs/by-name/we/wezterm/package.nix index 06e6d8e241d0..84e0843ee523 100644 --- a/pkgs/by-name/we/wezterm/package.nix +++ b/pkgs/by-name/we/wezterm/package.nix @@ -29,14 +29,14 @@ rustPlatform.buildRustPackage rec { pname = "wezterm"; - version = "0-unstable-2025-01-24"; + version = "0-unstable-2025-02-10"; src = fetchFromGitHub { owner = "wez"; repo = "wezterm"; - rev = "4bf0007cefff7f1ad139d89b54f074d5ad7d2184"; + rev = "52c1ca749552af4d8a2f18ec10fe8f14b6622519"; fetchSubmodules = true; - hash = "sha256-YN1C+cgF2T/dUljCZO5RMdbJsun+7lgqLN7BW+IMZsg="; + hash = "sha256-4dIu0WczmjfCfYe2/fZybMWfgYd4XezIHUUPVb3ou28="; }; postPatch = '' @@ -53,7 +53,7 @@ rustPlatform.buildRustPackage rec { --replace-fail 'hash hostnamectl 2>/dev/null' 'command type -P hostnamectl &>/dev/null' ''; - cargoHash = "sha256-UagPKPH/PRXk3EFe+rDbkSTSnHdi/Apz0Qek8YlNMxo="; + cargoHash = "sha256-2PJBd3nouxK0iIDOKIS9rrXbbts6zTYdrzxxokSiNwo="; useFetchCargoVendor = true; nativeBuildInputs = [ From e23bdb6d3e08c65a06815ca62989f6a0937781b4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 21:32:21 +0000 Subject: [PATCH 1028/2168] python312Packages.verlib2: 0.2.0 -> 0.2.1 --- pkgs/development/python-modules/verlib2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/verlib2/default.nix b/pkgs/development/python-modules/verlib2/default.nix index 178568e87b00..47c9d5f21aa2 100644 --- a/pkgs/development/python-modules/verlib2/default.nix +++ b/pkgs/development/python-modules/verlib2/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "verlib2"; - version = "0.2.0"; + version = "0.2.1"; pyproject = true; # This tarball doesn't include tests unfortuneatly, and the GitHub tarball @@ -19,7 +19,7 @@ buildPythonPackage rec { # should work for us as well. src = fetchPypi { inherit pname version; - hash = "sha256-CrlAh8CU4nFjlI36gXyY1itr3QEibM5RiPjMPNaDRbk="; + hash = "sha256-0+JmanzxCUK/E0dNdQkuuNdavUGqZ6p5UAQ/WUGdnT8="; }; nativeBuildInputs = [ From 31474e87774831a7975d2e345d94468f7812c9d3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 21:38:53 +0000 Subject: [PATCH 1029/2168] python312Packages.pyxnat: 1.6.2 -> 1.6.3 --- pkgs/development/python-modules/pyxnat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyxnat/default.nix b/pkgs/development/python-modules/pyxnat/default.nix index 1668987bb258..3c7a50805264 100644 --- a/pkgs/development/python-modules/pyxnat/default.nix +++ b/pkgs/development/python-modules/pyxnat/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyxnat"; - version = "1.6.2"; + version = "1.6.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "pyxnat"; repo = "pyxnat"; tag = version; - hash = "sha256-21nTIYbIYlFWNJTxqsuijamqRunpdc7/VBawvrWadWI="; + hash = "sha256-peyQQ1fc+0O1I9LztYSgk2VBC17Y3UlOZGR2WSYKVTk="; }; build-system = [ setuptools ]; @@ -77,7 +77,7 @@ buildPythonPackage rec { homepage = "https://pyxnat.github.io/pyxnat"; description = "Python API to XNAT"; mainProgram = "sessionmirror.py"; - changelog = "https://github.com/pyxnat/pyxnat/releases/tag/${version}"; + changelog = "https://github.com/pyxnat/pyxnat/releases/tag/${src.tag}"; license = licenses.bsd3; maintainers = with maintainers; [ bcdarwin ]; }; From b8c6de64ab9f64574bf21aac1084f519551416f3 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Mon, 10 Feb 2025 17:42:39 -0300 Subject: [PATCH 1030/2168] docker-init: remove "v" prefix from version The version string must start with a digit per nixpkgs versioning guidelines. --- pkgs/by-name/do/docker-init/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/do/docker-init/package.nix b/pkgs/by-name/do/docker-init/package.nix index 46b951515d91..279f533da8ab 100644 --- a/pkgs/by-name/do/docker-init/package.nix +++ b/pkgs/by-name/do/docker-init/package.nix @@ -6,7 +6,8 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "docker-init"; - version = "v1.4.0"; + version = "1.4.0"; + tag = "175267"; src = fetchurl { From fc024b25c5f0f617aabee11e62cb35359545ec5f Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Mon, 10 Feb 2025 17:45:41 -0300 Subject: [PATCH 1031/2168] influxdb2: remove "v" prefix from version in libflux The version string must start with a digit per nixpkgs versioning guidelines. --- pkgs/servers/nosql/influxdb2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/nosql/influxdb2/default.nix b/pkgs/servers/nosql/influxdb2/default.nix index 7fcb072926f6..c90a77f4af36 100644 --- a/pkgs/servers/nosql/influxdb2/default.nix +++ b/pkgs/servers/nosql/influxdb2/default.nix @@ -32,7 +32,7 @@ let flux = rustPlatform.buildRustPackage { pname = "libflux"; - version = "v${libflux_version}"; + version = libflux_version; src = fetchFromGitHub { owner = "influxdata"; repo = "flux"; From c70b85d5e045c065ce0de0e603f3e4a8623ff859 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Mon, 10 Feb 2025 17:47:21 -0300 Subject: [PATCH 1032/2168] lora: remove "v" prefix from version The version string must start with a digit per nixpkgs versioning guidelines --- pkgs/by-name/lo/lora/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lo/lora/package.nix b/pkgs/by-name/lo/lora/package.nix index a062c11e04d0..fa2389de0f91 100644 --- a/pkgs/by-name/lo/lora/package.nix +++ b/pkgs/by-name/lo/lora/package.nix @@ -7,12 +7,12 @@ stdenvNoCC.mkDerivation rec { pname = "lora"; - version = "v3.005"; + version = "3.005"; src = fetchFromGitHub { owner = "cyrealtype"; repo = "lora"; - rev = version; + rev = "v${version}"; hash = "sha256-EHa8DUPFRvdYBdCY41gfjKGtTHwGIXCwD9Qc+Npmt1s="; }; From 41d706f5e2289c2465e9b4d4a3f4ef69ccfe1d88 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Mon, 10 Feb 2025 17:48:06 -0300 Subject: [PATCH 1033/2168] lora: use `tag` in fetchFromGitHub --- pkgs/by-name/lo/lora/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/lo/lora/package.nix b/pkgs/by-name/lo/lora/package.nix index fa2389de0f91..63bd4b81fa05 100644 --- a/pkgs/by-name/lo/lora/package.nix +++ b/pkgs/by-name/lo/lora/package.nix @@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation rec { src = fetchFromGitHub { owner = "cyrealtype"; repo = "lora"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-EHa8DUPFRvdYBdCY41gfjKGtTHwGIXCwD9Qc+Npmt1s="; }; From abc4b21161a6841d75efbcd65c4573d4023a1f31 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Mon, 10 Feb 2025 17:49:27 -0300 Subject: [PATCH 1034/2168] lora: use `finalAttrs` instead of `rec` --- pkgs/by-name/lo/lora/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/lo/lora/package.nix b/pkgs/by-name/lo/lora/package.nix index 63bd4b81fa05..711760bf474d 100644 --- a/pkgs/by-name/lo/lora/package.nix +++ b/pkgs/by-name/lo/lora/package.nix @@ -5,14 +5,14 @@ nix-update-script, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "lora"; version = "3.005"; src = fetchFromGitHub { owner = "cyrealtype"; repo = "lora"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-EHa8DUPFRvdYBdCY41gfjKGtTHwGIXCwD9Qc+Npmt1s="; }; @@ -37,4 +37,4 @@ stdenvNoCC.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ ofalvai ]; }; -} +}) From 4346407a05d2c0b30b1be73edadf722f6a73c652 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Mon, 10 Feb 2025 17:50:35 -0300 Subject: [PATCH 1035/2168] lora: remove `with lib` from meta --- pkgs/by-name/lo/lora/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/lo/lora/package.nix b/pkgs/by-name/lo/lora/package.nix index 711760bf474d..590d32405d66 100644 --- a/pkgs/by-name/lo/lora/package.nix +++ b/pkgs/by-name/lo/lora/package.nix @@ -30,11 +30,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; - meta = with lib; { + meta = { description = "Lora is a well-balanced contemporary serif with roots in calligraphy"; homepage = "https://github.com/cyrealtype/lora"; - license = licenses.ofl; - platforms = platforms.all; - maintainers = with maintainers; [ ofalvai ]; + license = lib.licenses.ofl; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ ofalvai ]; }; }) From 6600f70b44e003aa93a6e25f53a72a3df141e253 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Mon, 10 Feb 2025 17:53:04 -0300 Subject: [PATCH 1036/2168] phpExtensions.uuid: remove "v" prefix in version The version string must start with a digit per nixpkgs versioning guidelines. --- pkgs/development/php-packages/uuid/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/php-packages/uuid/default.nix b/pkgs/development/php-packages/uuid/default.nix index f3efc0e8792c..0d54c7d07f6f 100644 --- a/pkgs/development/php-packages/uuid/default.nix +++ b/pkgs/development/php-packages/uuid/default.nix @@ -6,7 +6,7 @@ }: let - version = "v1.2.1"; + version = "1.2.1"; in buildPecl { inherit version; @@ -15,7 +15,7 @@ buildPecl { src = fetchFromGitHub { owner = "php"; repo = "pecl-networking-uuid"; - tag = version; + tag = "v${version}"; hash = "sha256-C4SoSKkCTQOLKM1h47vbBgiHTG+ChocDB9tzhWfKUsw="; }; @@ -26,7 +26,7 @@ buildPecl { env.PHP_UUID_DIR = libuuid; meta = { - changelog = "https://github.com/php/pecl-networking-uuid/releases/tag/${version}"; + changelog = "https://github.com/php/pecl-networking-uuid/releases/tag/v${version}"; description = "A wrapper around Universally Unique IDentifier library (libuuid)."; license = lib.licenses.php301; homepage = "https://github.com/php/pecl-networking-uuid"; From ce3377bf570dd1691e98950c80fba38b5d7df4a7 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Mon, 10 Feb 2025 18:03:51 -0300 Subject: [PATCH 1037/2168] msgraph-cli: remove "v" prefix in version The version string must start with a digit per nixpkgs versioning guidelines. --- pkgs/by-name/ms/msgraph-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ms/msgraph-cli/package.nix b/pkgs/by-name/ms/msgraph-cli/package.nix index e874a2706c7b..b2e3711a189e 100644 --- a/pkgs/by-name/ms/msgraph-cli/package.nix +++ b/pkgs/by-name/ms/msgraph-cli/package.nix @@ -7,12 +7,12 @@ }: buildDotnetModule rec { pname = "msgraph-cli"; - version = "v1.9.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "microsoftgraph"; repo = "msgraph-cli"; - rev = version; + tag = "v${version}"; hash = "sha256-bpdxzVlQWQLNYTZHN25S6qa3NKHhDc+xV6NvzSNMVnQ="; }; From f4b56e7f60bcca958f330a3963281c1d21157fa1 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Mon, 10 Feb 2025 18:05:59 -0300 Subject: [PATCH 1038/2168] pythonPackages.falconpy: remove "v" prefix from version The version string must start with a digit per nixpkgs versioning guideline. --- pkgs/development/python-modules/falconpy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/falconpy/default.nix b/pkgs/development/python-modules/falconpy/default.nix index 3b44df20b090..161ec4a7730e 100644 --- a/pkgs/development/python-modules/falconpy/default.nix +++ b/pkgs/development/python-modules/falconpy/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "falconpy"; - version = "v1.4.6"; + version = "1.4.6"; pyproject = true; src = fetchFromGitHub { owner = "CrowdStrike"; repo = "falconpy"; - tag = version; + tag = "v${version}"; hash = "sha256-boebQI//NenEqctQbEdxiXKU3/07C6jVzWVHecmJjPk="; }; @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = { description = "The CrowdStrike Falcon SDK for Python"; homepage = "https://github.com/CrowdStrike/falconpy"; - changelog = "https://github.com/CrowdStrike/falconpy/releases/tag/${version}"; + changelog = "https://github.com/CrowdStrike/falconpy/releases/tag/v${version}"; license = lib.licenses.unlicense; maintainers = with lib.maintainers; [ levigross ]; }; From 9b40045dfbd3bad7acc85c4bbfb65aa63dc8b387 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Mon, 10 Feb 2025 18:08:42 -0300 Subject: [PATCH 1039/2168] hullcaster: remove "v" prefix from version The version string must start with a digit per nixpkgs versioning guideline. --- pkgs/by-name/hu/hullcaster/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hu/hullcaster/package.nix b/pkgs/by-name/hu/hullcaster/package.nix index 268556d544bb..1fe9c515b884 100644 --- a/pkgs/by-name/hu/hullcaster/package.nix +++ b/pkgs/by-name/hu/hullcaster/package.nix @@ -6,12 +6,12 @@ rustPlatform.buildRustPackage rec { pname = "hullcaster"; - version = "v0.1.2"; + version = "0.1.2"; src = fetchFromGitHub { owner = "gilcu3"; repo = "hullcaster"; - rev = version; + tag = "v${version}"; hash = "sha256-TaELX/xMxm7OTmVnvkgEmdhnVrIlxSNqlE73+I5qxCc="; }; From 9cb6a2b262f296304eced767a35f2edbf25d87ef Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Mon, 10 Feb 2025 18:11:14 -0300 Subject: [PATCH 1040/2168] git-together: remove "v" prefix from version The version string must start with a digit per nixpkgs versioning guideline. --- pkgs/by-name/gi/git-together/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/git-together/package.nix b/pkgs/by-name/gi/git-together/package.nix index 2ecb8afd8129..8b56b68280a0 100644 --- a/pkgs/by-name/gi/git-together/package.nix +++ b/pkgs/by-name/gi/git-together/package.nix @@ -10,12 +10,12 @@ rustPlatform.buildRustPackage rec { pname = "git-together"; - version = "v0.1.0-alpha.26"; + version = "0.1.0-alpha.26"; src = fetchFromGitHub { owner = "kejadlen"; repo = "git-together"; - rev = version; + tag = "v${version}"; hash = "sha256-2HgOaqlX0mmmvRlALHm90NAdIhby/jWUJO63bQFqc+4="; }; @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-5LKKjHzIlXw0bUmF7GDCVW0cptCxohq6CNPIrMZKorM="; meta = with lib; { - changelog = "https://github.com/kejadlen/git-together/releases/tag/${src.rev}"; + changelog = "https://github.com/kejadlen/git-together/releases/tag/v${version}"; description = "Better commit attribution while pairing without messing with your git workflow"; homepage = "https://github.com/kejadlen/git-together"; license = licenses.mit; From a84b1a09e2d448ed5b068f39273b422552883cac Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Mon, 10 Feb 2025 18:13:07 -0300 Subject: [PATCH 1041/2168] ncps: remove "v" prefix from version The version string must start with a digit per nixpkgs versioning guideline. --- pkgs/by-name/nc/ncps/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/nc/ncps/package.nix b/pkgs/by-name/nc/ncps/package.nix index b66c1d3ae1f2..be29560ce1a9 100644 --- a/pkgs/by-name/nc/ncps/package.nix +++ b/pkgs/by-name/nc/ncps/package.nix @@ -8,17 +8,17 @@ let finalAttrs = { pname = "ncps"; - version = "v0.1.1"; + version = "0.1.1"; src = fetchFromGitHub { owner = "kalbasit"; repo = "ncps"; - rev = finalAttrs.version; + tag = "v${finalAttrs.version}"; hash = "sha256-Vr/thppCABdZDl1LEc7l7c7Ih55U/EFwJInWSUWoLJA"; }; ldflags = [ - "-X github.com/kalbasit/ncps/cmd.Version=${finalAttrs.version}" + "-X github.com/kalbasit/ncps/cmd.Version=v${finalAttrs.version}" ]; subPackages = [ "." ]; From c24c2a6e043b812ccd0a459a1fb00ee5cd786c1b Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Mon, 10 Feb 2025 18:14:53 -0300 Subject: [PATCH 1042/2168] gede: remove "v" prefix from version The version string must start with a digit per nixpkgs versioning guideline. --- pkgs/development/tools/misc/gede/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/gede/default.nix b/pkgs/development/tools/misc/gede/default.nix index dbe1c51b7b1c..f56769a9220b 100644 --- a/pkgs/development/tools/misc/gede/default.nix +++ b/pkgs/development/tools/misc/gede/default.nix @@ -13,12 +13,12 @@ mkDerivation rec { pname = "gede"; - version = "v2.22.1"; + version = "2.22.1"; src = fetchFromGitHub { owner = "jhn98032"; repo = "gede"; - rev = version; + tag = "v${version}"; hash = "sha256-6YSrqLDuV4G/uvtYy4vzbwqrMFftMvZdp3kr3R436rs="; }; From 6e37a9a488f4eb2fe3cda635877b82d90b4fa467 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Mon, 10 Feb 2025 18:16:26 -0300 Subject: [PATCH 1043/2168] vmctl: remove "v" prefix from version The version string must start with a digit per nixpkgs versioning guideline. --- pkgs/by-name/vm/vmctl/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/vm/vmctl/package.nix b/pkgs/by-name/vm/vmctl/package.nix index 910ecd5f9d6d..fd6f7a145da6 100644 --- a/pkgs/by-name/vm/vmctl/package.nix +++ b/pkgs/by-name/vm/vmctl/package.nix @@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation { pname = "vmctl"; - version = "v0.99-unstable-2024-05-14"; + version = "0.99-unstable-2024-05-14"; src = fetchFromGitHub { owner = "SamsungDS"; From c4ea434f1bc038dce4764841f2bce65b23bf9e26 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Mon, 10 Feb 2025 18:18:50 -0300 Subject: [PATCH 1044/2168] criterion: remove "v" prefix from version of test derivation The version string must start with a digit per nixpkgs versioning guideline. --- pkgs/by-name/cr/criterion/tests/001-version.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/cr/criterion/tests/001-version.nix b/pkgs/by-name/cr/criterion/tests/001-version.nix index 25a98b5a0c30..e9cf7278a370 100644 --- a/pkgs/by-name/cr/criterion/tests/001-version.nix +++ b/pkgs/by-name/cr/criterion/tests/001-version.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { name = "version-tester"; - version = "v${criterion.version}"; + inherit (criterion) version; src = ./test_dummy.c; dontUnpack = true; From 9a9523f75e046db42e33a730d2c90cf17144d83a Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Mon, 10 Feb 2025 18:31:51 -0300 Subject: [PATCH 1045/2168] gnomeExtensions.pano: remove "v" prefix in version The version string must start with a digit per nixpkgs versioning guideline. --- pkgs/desktops/gnome/extensions/extensionOverrides.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/extensionOverrides.nix b/pkgs/desktops/gnome/extensions/extensionOverrides.nix index b3f1929c3cef..9b3ca5cd3c5a 100644 --- a/pkgs/desktops/gnome/extensions/extensionOverrides.nix +++ b/pkgs/desktops/gnome/extensions/extensionOverrides.nix @@ -144,9 +144,9 @@ super: lib.trivial.pipe super [ })) (patchExtension "pano@elhan.io" (final: prev: { - version = "v23-alpha3"; + version = "23-alpha3"; src = fetchzip { - url = "https://github.com/oae/gnome-shell-pano/releases/download/${final.version}/pano@elhan.io.zip"; + url = "https://github.com/oae/gnome-shell-pano/releases/download/v${final.version}/pano@elhan.io.zip"; hash = "sha256-LYpxsl/PC8hwz0ZdH5cDdSZPRmkniBPUCqHQxB4KNhc="; stripRoot = false; }; From 72395f05c53ea93ddebadbc2433f278ea740592a Mon Sep 17 00:00:00 2001 From: Benjamin Sparks Date: Sun, 2 Feb 2025 21:51:04 +0100 Subject: [PATCH 1046/2168] python3Packages.torcheval: init at 0.0.7 --- .../python-modules/torcheval/default.nix | 113 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 115 insertions(+) create mode 100644 pkgs/development/python-modules/torcheval/default.nix diff --git a/pkgs/development/python-modules/torcheval/default.nix b/pkgs/development/python-modules/torcheval/default.nix new file mode 100644 index 000000000000..0e696603fdae --- /dev/null +++ b/pkgs/development/python-modules/torcheval/default.nix @@ -0,0 +1,113 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + typing-extensions, + + # tests + cython, + numpy, + pytest-timeout, + pytest-xdist, + pytestCheckHook, + scikit-image, + scikit-learn, + torchtnt-nightly, + torchvision, +}: +let + pname = "torcheval"; + version = "0.0.7"; +in +buildPythonPackage { + inherit pname version; + pyproject = true; + + src = fetchFromGitHub { + owner = "pytorch"; + repo = "torcheval"; + # Upstream has not created a tag for this version + # https://github.com/pytorch/torcheval/issues/215 + rev = "f1bc22fc67ec2c77ee519aa4af8079f4fdaa41bb"; + hash = "sha256-aVr4qKKE+dpBcJEi1qZJBljFLUl8d7D306Dy8uOojJE="; + }; + + # Patches are only applied to usages of numpy within tests, + # which are only used for testing purposes (see dev-requirements.txt) + postPatch = + # numpy's `np.NAN` was changed to `np.nan` when numpy 2 was released + '' + substituteInPlace tests/metrics/classification/test_accuracy.py tests/metrics/functional/classification/test_accuracy.py \ + --replace-fail "np.NAN" "np.nan" + '' + + # `unittest.TestCase.assertEquals` does not exist; + # the correct symbol is `unittest.TestCase.assertEqual` + + '' + substituteInPlace tests/metrics/test_synclib.py \ + --replace-fail "tc.assertEquals" "tc.assertEqual" + ''; + + build-system = [ setuptools ]; + + dependencies = [ typing-extensions ]; + + pythonImportsCheck = [ "torcheval" ]; + + nativeCheckInputs = [ + cython + numpy + pytest-timeout + pytest-xdist + pytestCheckHook + scikit-image + scikit-learn + torchtnt-nightly + torchvision + ]; + + pytestFlagsArray = [ + "-v" + "tests/" + + # -- tests/metrics/audio/test_fad.py -- + # Touch filesystem and require network access. + # torchaudio.utils.download_asset("models/vggish.pt") -> PermissionError: [Errno 13] Permission denied: '/homeless-shelter' + "--deselect=tests/metrics/audio/test_fad.py::TestFAD::test_vggish_fad" + "--deselect=tests/metrics/audio/test_fad.py::TestFAD::test_vggish_fad_merge" + + # -- tests/metrics/image/test_fid.py -- + # Touch filesystem and require network access. + # models.inception_v3(weights=weights) -> PermissionError: [Errno 13] Permission denied: '/homeless-shelter' + "--deselect=tests/metrics/image/test_fid.py::TestFrechetInceptionDistance::test_fid_invalid_input" + "--deselect=tests/metrics/image/test_fid.py::TestFrechetInceptionDistance::test_fid_random_data_custom_model" + "--deselect=tests/metrics/image/test_fid.py::TestFrechetInceptionDistance::test_fid_random_data_default_model" + "--deselect=tests/metrics/image/test_fid.py::TestFrechetInceptionDistance::test_fid_with_dissimilar_inputs" + "--deselect=tests/metrics/image/test_fid.py::TestFrechetInceptionDistance::test_fid_with_similar_inputs" + + # -- tests/metrics/functional/text/test_perplexity.py -- + # AssertionError: Scalars are not close! + # Expected 3.537154912949 but got 3.53715443611145 + "--deselect=tests/metrics/functional/text/test_perplexity.py::Perplexity::test_perplexity_with_ignore_index" + + # -- tests/metrics/image/test_psnr.py -- + # AssertionError: Scalars are not close! + # Expected 7.781850814819336 but got 7.781772613525391 + "--deselect=tests/metrics/image/test_psnr.py::TestPeakSignalNoiseRatio::test_psnr_with_random_data" + ]; + + meta = { + description = "Rich collection of performant PyTorch model metrics and tools for PyTorch model evaluations"; + homepage = "https://pytorch.org/torcheval"; + changelog = "https://github.com/pytorch/torcheval/releases/tag/${version}"; + + platforms = lib.platforms.linux; + license = with lib.licenses; [ bsd3 ]; + maintainers = with lib.maintainers; [ bengsparks ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ad9734cfcfd0..fbbbdab78daa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16514,6 +16514,8 @@ self: super: with self; { torchdiffeq = callPackage ../development/python-modules/torchdiffeq { }; + torcheval = callPackage ../development/python-modules/torcheval { }; + torchmetrics = callPackage ../development/python-modules/torchmetrics { }; torchio = callPackage ../development/python-modules/torchio { }; From f61ee035c46008e0ddbae7bcb08ed9bddc330108 Mon Sep 17 00:00:00 2001 From: arminius-smh Date: Mon, 10 Feb 2025 18:20:16 +0100 Subject: [PATCH 1047/2168] simple-scan: install missing icons --- pkgs/by-name/si/simple-scan/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/si/simple-scan/package.nix b/pkgs/by-name/si/simple-scan/package.nix index 6ee79585d4a8..03059cf0ab0f 100644 --- a/pkgs/by-name/si/simple-scan/package.nix +++ b/pkgs/by-name/si/simple-scan/package.nix @@ -64,6 +64,11 @@ stdenv.mkDerivation rec { patchShebangs data/meson_compile_gschema.py ''; + postInstall = '' + mkdir -p $out/share/icons/hicolor/scalable/actions/ + install -m 444 ../data/icons/scalable/actions/* $out/share/icons/hicolor/scalable/actions/ + ''; + doCheck = true; passthru = { From a56132a598714a105a0412ec99e6915dae8a9ca0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 10 Feb 2025 23:01:48 +0100 Subject: [PATCH 1048/2168] python313Packages.habiticalib: 0.3.5 -> 0.3.7 https://github.com/tr4nt0r/habiticalib/releases/tag/v0.3.7 --- pkgs/development/python-modules/habiticalib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/habiticalib/default.nix b/pkgs/development/python-modules/habiticalib/default.nix index 8f6ec569a7d4..d10e2ca5760e 100644 --- a/pkgs/development/python-modules/habiticalib/default.nix +++ b/pkgs/development/python-modules/habiticalib/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "habiticalib"; - version = "0.3.5"; + version = "0.3.7"; pyproject = true; disabled = pythonOlder "3.12"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "tr4nt0r"; repo = "habiticalib"; tag = "v${version}"; - hash = "sha256-r0wpWd6hFPwo5S0ft0srL1a74rODWDH0elkY1BN74Gs="; + hash = "sha256-i2yGPTZiinErWK7vX/3mwBtO4rjUhoEORhnXkFplUcM="; }; build-system = [ From 66e412c31f1c86ef9962594acd3c3109265471ec Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 10 Feb 2025 23:02:21 +0100 Subject: [PATCH 1049/2168] python313Packages.ohme: 1.2.8 -> 1.2.9 https://github.com/dan-r/ohmepy/releases/tag/v1.2.9 --- pkgs/development/python-modules/ohme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ohme/default.nix b/pkgs/development/python-modules/ohme/default.nix index 37e3938493f1..8e66c9b1f6c9 100644 --- a/pkgs/development/python-modules/ohme/default.nix +++ b/pkgs/development/python-modules/ohme/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ohme"; - version = "1.2.8"; + version = "1.2.9"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "dan-r"; repo = "ohmepy"; tag = "v${version}"; - hash = "sha256-T9xULo1kN/JZGlYKTbTue8/RH2CFOAzuFeDGM6+76rE="; + hash = "sha256-wsYANCe32LG2rAWhMt8x51pHVTZVcgR+0aBTjY56tnE="; }; build-system = [ setuptools ]; From 51187883cfde0877178976aeab1ec77228966438 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 10 Feb 2025 23:02:50 +0100 Subject: [PATCH 1050/2168] python313Packages.onedrive-personal-sdk: 0.0.8 -> 0.0.10 https://github.com/zweckj/onedrive-personal-sdk/releases/tag/v0.0.10 --- .../python-modules/onedrive-personal-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/onedrive-personal-sdk/default.nix b/pkgs/development/python-modules/onedrive-personal-sdk/default.nix index ef227f1b993c..b65780d601b8 100644 --- a/pkgs/development/python-modules/onedrive-personal-sdk/default.nix +++ b/pkgs/development/python-modules/onedrive-personal-sdk/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "onedrive-personal-sdk"; - version = "0.0.8"; + version = "0.0.10"; pyproject = true; src = fetchFromGitHub { owner = "zweckj"; repo = "onedrive-personal-sdk"; tag = "v${version}"; - hash = "sha256-sA+1yqRcx7WUJFuMIIuPQm7ggVbrlSCufqq0jyhDDdA="; + hash = "sha256-8enxmHc4s6bfxeIqOqc9DpT3pKIwocIsO3hYrK3G7CM="; }; build-system = [ setuptools ]; From d192344bf0f7b86c27d81ea527c7f4b5ae949a5e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 10 Feb 2025 23:03:38 +0100 Subject: [PATCH 1051/2168] python313Packages.py-synologydsm-api: 2.6.0 -> 2.6.2 https://github.com/mib1185/py-synologydsm-api/releases/tag/v2.6.2 --- .../python-modules/py-synologydsm-api/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/py-synologydsm-api/default.nix b/pkgs/development/python-modules/py-synologydsm-api/default.nix index 741942f12a4b..2d5b39a48fc2 100644 --- a/pkgs/development/python-modules/py-synologydsm-api/default.nix +++ b/pkgs/development/python-modules/py-synologydsm-api/default.nix @@ -1,5 +1,6 @@ { lib, + aiofiles, aiohttp, buildPythonPackage, fetchFromGitHub, @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "py-synologydsm-api"; - version = "2.6.0"; + version = "2.6.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,12 +21,15 @@ buildPythonPackage rec { owner = "mib1185"; repo = "py-synologydsm-api"; tag = "v${version}"; - hash = "sha256-CjsSn9kbSOSiia47gDHUbMCgJs3pDJaJfQOwMPP+5WI="; + hash = "sha256-mkwHw10IzVWtuLGbpY/v7yCJgI6TBIJEo1XSB/NlZKs="; }; build-system = [ setuptools ]; - dependencies = [ aiohttp ]; + dependencies = [ + aiofiles + aiohttp + ]; nativeCheckInputs = [ pytest-asyncio From 5934f7eade08d0e8d8171df665329f2993fece87 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 10 Feb 2025 23:03:55 +0100 Subject: [PATCH 1052/2168] python313Packages.pyheos: 1.0.1 -> 1.02 https://github.com/andrewsayre/pyheos/releases/tag/1.02 --- pkgs/development/python-modules/pyheos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyheos/default.nix b/pkgs/development/python-modules/pyheos/default.nix index 3f71351530e4..33f4de33833a 100644 --- a/pkgs/development/python-modules/pyheos/default.nix +++ b/pkgs/development/python-modules/pyheos/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyheos"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; src = fetchFromGitHub { owner = "andrewsayre"; repo = "pyheos"; - tag = version; - hash = "sha256-2hrWK3nRFnRtv4dfXXELOxKwttG9Oo2I2+eSXcfgUi8="; + tag = "1.02"; # TODO: https://github.com/andrewsayre/pyheos/issues/104 + hash = "sha256-1JybtE5wweuIgZ8eFUX9XYPji7FzxbRFPKy75Fp1nw0="; }; build-system = [ setuptools ]; From 9f6a82d4e5440e3327a6bc42365aa6fbc4580832 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 10 Feb 2025 23:07:26 +0100 Subject: [PATCH 1053/2168] python313Packages.python-google-drive-api: 0.0.2 -> 0.1.0 https://github.com/tronikos/python-google-drive-api/compare/refs/tags/v0.0.2...v0.1.0 --- .../python-modules/python-google-drive-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-google-drive-api/default.nix b/pkgs/development/python-modules/python-google-drive-api/default.nix index 1cb239fb79ba..2bc002671006 100644 --- a/pkgs/development/python-modules/python-google-drive-api/default.nix +++ b/pkgs/development/python-modules/python-google-drive-api/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "python-google-drive-api"; - version = "0.0.2"; + version = "0.1.0"; pyproject = true; src = fetchFromGitHub { owner = "tronikos"; repo = "python-google-drive-api"; tag = "v${version}"; - hash = "sha256-JvPaMD7UHDqCQCoh1Q8jNFw4R7Jbp2YQDBI3xVp1L1g="; + hash = "sha256-3es2rmndahH+DMEEwjBxyZKd27qDZIocPbzScF7B5fA="; }; build-system = [ setuptools ]; From 076ab9ca4b159065960f653bb21c2fdfed3eb672 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 10 Feb 2025 23:07:39 +0100 Subject: [PATCH 1054/2168] home-assistant: 2025.2.1 -> 2025.2.2 https://github.com/home-assistant/core/releases/tag/2025.2.2 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 6 +++--- pkgs/servers/home-assistant/frontend.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index ff0cca567b1f..85b12d7e2ac3 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2025.2.1"; + version = "2025.2.2"; components = { "3_day_blinds" = ps: with ps; [ diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 23f28b18597d..ba8028397562 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -369,7 +369,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2025.2.1"; + hassVersion = "2025.2.2"; in python.pkgs.buildPythonApplication rec { @@ -390,13 +390,13 @@ python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-iWOrBIKsN+fi5pzMzekmTBIk2FoM2HOsWujkuZ45lHE="; + hash = "sha256-aCGfxWJnDJ4V5FjrFV3TLHBtPQDyNh1qjDKFL/bHBz0="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-GToOHfDOWrjiQEcxgX9h2tCYqGUv3mXxVh1/GchiNRU="; + hash = "sha256-9bdkcDMTQtaRlyLK65fwVDlV4s1GpxqbTYDNxstST4w="; }; build-system = with python.pkgs; [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 79914ed854f3..b9a0224adc46 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20250205.0"; + version = "20250210.0"; format = "wheel"; src = fetchPypi { @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-9P2OqnPNPydBi4k9iN0hSyGTyBW4PohdgJwQqa8MlYg="; + hash = "sha256-Pm9lnD+3ywHtLWPbuIm7brWzY+804+V84pH6g561LAU="; }; # there is nothing to strip in this package From eeb8d6421ec4eeb8ff7c44cd7a923a563b3e1002 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Mon, 10 Feb 2025 23:18:36 +0100 Subject: [PATCH 1055/2168] sourcegit: 2025.03 -> 2025.04 --- pkgs/by-name/so/sourcegit/deps.json | 82 +++++++++++++++++++++++++-- pkgs/by-name/so/sourcegit/package.nix | 4 +- 2 files changed, 78 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/so/sourcegit/deps.json b/pkgs/by-name/so/sourcegit/deps.json index f5d19193563b..81ebf7f068aa 100644 --- a/pkgs/by-name/so/sourcegit/deps.json +++ b/pkgs/by-name/so/sourcegit/deps.json @@ -99,6 +99,16 @@ "version": "11.1.0", "hash": "sha256-Nv52bUxA02VcsKCbMqEAkNBl46gznSivRZ3llLHrhkM=" }, + { + "pname": "Azure.AI.OpenAI", + "version": "2.2.0-beta.1", + "hash": "sha256-H173lh1HdNB2x7SjrvLPcQKUmxn8PKOJ8aa2HM07w/w=" + }, + { + "pname": "Azure.Core", + "version": "1.44.1", + "hash": "sha256-0su/ylZ68+FDZ6mgfp3qsm7qpfPtD5SW75HXbVhs5qk=" + }, { "pname": "CommunityToolkit.Mvvm", "version": "8.3.2", @@ -131,29 +141,39 @@ }, { "pname": "LiveChartsCore", - "version": "2.0.0-rc5", - "hash": "sha256-NHgYbeIdAoZlrC6QgVb1oLo3dlo17R8yTbPgiHMmJZc=" + "version": "2.0.0-rc5.1", + "hash": "sha256-B0cMspfPvhDTbzyZhL9Ntn9/wTYjP/JcWAlM8MxfcEQ=" }, { "pname": "LiveChartsCore.SkiaSharpView", - "version": "2.0.0-rc5", - "hash": "sha256-zppOFKHGn2HJMP8AAuk6mxJXqvgjfN7o8f0sInUWZGc=" + "version": "2.0.0-rc5.1", + "hash": "sha256-lgePmk/Fqk7c4eq5z9JhmrfQhCUBYPxga1NcKmSE9nc=" }, { "pname": "LiveChartsCore.SkiaSharpView.Avalonia", - "version": "2.0.0-rc5", - "hash": "sha256-xyFEZWWkRlBi8GNCDpyOUzt6aEe+9sR1+VN2yY59mhg=" + "version": "2.0.0-rc5.1", + "hash": "sha256-IMJ09v5dsN5wvlhjsPKOfOG0vTDCwJ9QuZEMWyvoxH8=" }, { "pname": "MicroCom.Runtime", "version": "0.11.0", "hash": "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0=" }, + { + "pname": "Microsoft.Bcl.AsyncInterfaces", + "version": "6.0.0", + "hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU=" + }, { "pname": "Onigwrap", "version": "1.0.6", "hash": "sha256-p+dhMfIH4C6xLKRUREnUpC0DZwFazjvI+30KRT8TWnU=" }, + { + "pname": "OpenAI", + "version": "2.2.0-beta.1", + "hash": "sha256-XtzTi7K+wIOvqzhN5qdHj+M5tcIASJpYtd5cpx/M3Gw=" + }, { "pname": "SkiaSharp", "version": "2.88.9", @@ -184,16 +204,66 @@ "version": "2.88.9", "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4=" }, + { + "pname": "System.ClientModel", + "version": "1.1.0", + "hash": "sha256-FiueWJawZGar++OztDFWxU2nQE5Vih9iYsc3uEx0thM=" + }, + { + "pname": "System.ClientModel", + "version": "1.2.1", + "hash": "sha256-MNFNrCAhD+vj97gVXdJIm3QmY++y25zBZtiIXrGdQ2c=" + }, + { + "pname": "System.Diagnostics.DiagnosticSource", + "version": "6.0.1", + "hash": "sha256-Xi8wrUjVlioz//TPQjFHqcV/QGhTqnTfUcltsNlcCJ4=" + }, { "pname": "System.IO.Pipelines", "version": "8.0.0", "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE=" }, + { + "pname": "System.Memory.Data", + "version": "6.0.0", + "hash": "sha256-83/bxn3vyv17dQDDqH1L3yDpluhOxIS5XR27f4OnCEo=" + }, + { + "pname": "System.Numerics.Vectors", + "version": "4.5.0", + "hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8=" + }, + { + "pname": "System.Runtime.CompilerServices.Unsafe", + "version": "6.0.0", + "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I=" + }, + { + "pname": "System.Text.Encodings.Web", + "version": "6.0.0", + "hash": "sha256-UemDHGFoQIG7ObQwRluhVf6AgtQikfHEoPLC6gbFyRo=" + }, + { + "pname": "System.Text.Json", + "version": "6.0.0", + "hash": "sha256-9AE/5ds4DqEfb0l+27fCBTSeYCdRWhxh2Bhg8IKvIuo=" + }, + { + "pname": "System.Text.Json", + "version": "6.0.10", + "hash": "sha256-UijYh0dxFjFinMPSTJob96oaRkNm+Wsa+7Ffg6mRnsc=" + }, { "pname": "System.Text.Json", "version": "8.0.5", "hash": "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68=" }, + { + "pname": "System.Threading.Tasks.Extensions", + "version": "4.5.4", + "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng=" + }, { "pname": "TextMateSharp", "version": "1.0.59", diff --git a/pkgs/by-name/so/sourcegit/package.nix b/pkgs/by-name/so/sourcegit/package.nix index 7fda0cafd624..a6beac1464b5 100644 --- a/pkgs/by-name/so/sourcegit/package.nix +++ b/pkgs/by-name/so/sourcegit/package.nix @@ -19,13 +19,13 @@ buildDotnetModule (finalAttrs: { pname = "sourcegit"; - version = "2025.03"; + version = "2025.04"; src = fetchFromGitHub { owner = "sourcegit-scm"; repo = "sourcegit"; tag = "v${finalAttrs.version}"; - hash = "sha256-l1M3ix0HY87y2ES/iwT2Ju/Mwb8CCmnz95amHlYKFS4="; + hash = "sha256-PyJvmWTZPOJcejD23zGJ28RCEnpXqWcqxuHBlAkRTcQ="; }; patches = [ ./fix-darwin-git-path.patch ]; From 05afb9a3af4b3c698b59529e9db614d2aace0afa Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Mon, 10 Feb 2025 23:19:44 +0100 Subject: [PATCH 1056/2168] gale: 1.2.2 -> 1.3.1 --- pkgs/by-name/ga/gale/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ga/gale/package.nix b/pkgs/by-name/ga/gale/package.nix index af74f730976a..bdfb42a3605d 100644 --- a/pkgs/by-name/ga/gale/package.nix +++ b/pkgs/by-name/ga/gale/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gale"; - version = "1.2.2"; + version = "1.3.1"; src = fetchFromGitHub { owner = "Kesomannen"; repo = "gale"; tag = finalAttrs.version; - hash = "sha256-bpeRbsbC1x1AXSyEPs1pUqwMouHQqJ/OtXXlNOVYcEA="; + hash = "sha256-cIholTqWxDb3CkKCY8qRhevxd7CQxBlBGmhJ/91K1g4="; }; postPatch = '' @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { npmDeps = fetchNpmDeps { name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; inherit (finalAttrs) src; - hash = "sha256-xKg/ABUdtylFpT3EisXVvyv38++KjucrZ+s3/fFjzmM="; + hash = "sha256-qhH8jeRQZgx6DELzxczt6AmoILxZHUkVpVkYZoDQPRQ="; }; cargoDeps = rustPlatform.fetchCargoVendor { @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { src cargoRoot ; - hash = "sha256-OocLkYAdmnAwvojzywNlg6BirkItoopX36aDYfqeeTA="; + hash = "sha256-RtTqdbMZlsLNEoxdwjUd0B/3TkdbDpcjOMhH8BlshfE="; }; cargoRoot = "src-tauri"; From 836724ed64a6fff73cec192949418bcd656d1668 Mon Sep 17 00:00:00 2001 From: Bradley Cooley Date: Mon, 10 Feb 2025 08:36:33 -0700 Subject: [PATCH 1057/2168] maintainers: add bcooley --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index dda73802e1e0..6a9daff96cd9 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2747,6 +2747,12 @@ githubId = 34620799; name = "Jacob Bachmann"; }; + bcooley = { + email = "bradley.m.cooley@gmail.com"; + github = "Bradley-Cooley"; + githubId = 5409401; + name = "Bradley Cooley"; + }; bcyran = { email = "bazyli@cyran.dev"; github = "bcyran"; From 1fcccc40f272fa4f645a0298e40c4f35ac41b90e Mon Sep 17 00:00:00 2001 From: Bradley Cooley Date: Mon, 10 Feb 2025 08:37:22 -0700 Subject: [PATCH 1058/2168] vscode-extensions.marus25.cortex-debug: init at 1.6.10 Release: https://github.com/Marus/cortex-debug/releases/tag/v1.6.10 --- .../editors/vscode/extensions/default.nix | 2 ++ .../marus25.cortex-debug/default.nix | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/applications/editors/vscode/extensions/marus25.cortex-debug/default.nix diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 4ca91ebe85bf..a0b59e0362a9 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3126,6 +3126,8 @@ let }; }; + marus25.cortex-debug = callPackage ./marus25.cortex-debug { }; + matangover.mypy = buildVscodeMarketplaceExtension { mktplcRef = { name = "mypy"; diff --git a/pkgs/applications/editors/vscode/extensions/marus25.cortex-debug/default.nix b/pkgs/applications/editors/vscode/extensions/marus25.cortex-debug/default.nix new file mode 100644 index 000000000000..e0fcee449198 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/marus25.cortex-debug/default.nix @@ -0,0 +1,18 @@ +{ lib, vscode-utils }: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "cortex-debug"; + publisher = "marus25"; + version = "1.6.10"; + hash = "sha256-6b3JDkX6Xd91VE1h7gYyeukxLsBkn/nNzDQgBm0axRA="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/marus25.cortex-debug/changelog"; + description = "Visual Studio Code extension for enhancing debug capabilities for Cortex-M Microcontrollers"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=marus25.cortex-debug"; + homepage = "https://github.com/Marus/cortex-debug"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.bcooley ]; + }; +} From cef2ebc514c41e95d403328ebcdafe03ef0fc618 Mon Sep 17 00:00:00 2001 From: dylan madisetti Date: Mon, 10 Feb 2025 17:23:26 -0500 Subject: [PATCH 1059/2168] marimo: 0.10.14 -> 0.11.2 --- pkgs/development/python-modules/marimo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix index 75dddd820fd5..8caf58e83281 100644 --- a/pkgs/development/python-modules/marimo/default.nix +++ b/pkgs/development/python-modules/marimo/default.nix @@ -33,13 +33,13 @@ buildPythonPackage rec { pname = "marimo"; - version = "0.10.14"; + version = "0.11.2"; pyproject = true; # The github archive does not include the static assets src = fetchPypi { inherit pname version; - hash = "sha256-Af8KNgKBhgm2AwCrCrSRYWutarm4Z+ftdt0mFgApcsk="; + hash = "sha256-E6mEYTigSPgTC9pNfDpsIbOBagYOL5sc9CpYPMfNtfI="; }; build-system = [ hatchling ]; From 1e6d5deb88ae200cfa2f36a5d4d3ec07fc8515ff Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Mon, 10 Feb 2025 23:38:10 +0100 Subject: [PATCH 1060/2168] ofono: 2.3 -> 2.14 --- pkgs/by-name/of/ofono/package.nix | 59 ++++++++++++++++++++++++------- 1 file changed, 46 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/of/ofono/package.nix b/pkgs/by-name/of/ofono/package.nix index 52dc76dafc4f..29b8dc83cb71 100644 --- a/pkgs/by-name/of/ofono/package.nix +++ b/pkgs/by-name/of/ofono/package.nix @@ -2,6 +2,8 @@ lib, stdenv, fetchzip, + fetchpatch, + testers, autoreconfHook, pkg-config, glib, @@ -10,11 +12,12 @@ systemd, bluez, mobile-broadband-provider-info, + python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ofono"; - version = "2.3"; + version = "2.14"; outputs = [ "out" @@ -22,17 +25,42 @@ stdenv.mkDerivation rec { ]; src = fetchzip { - url = "https://git.kernel.org/pub/scm/network/ofono/ofono.git/snapshot/ofono-${version}.tar.gz"; - sha256 = "sha256-rX3ngXoW7YISyytpRPLX/lGmQa5LPtFxeA2XdtU1gV0="; + url = "https://git.kernel.org/pub/scm/network/ofono/ofono.git/snapshot/ofono-${finalAttrs.version}.tar.gz"; + sha256 = "sha256-7hYGSU8mEu9MfKAA0vR1tm/l46hHQmpZSYfMNkces5c="; }; patches = [ + (fetchpatch { + name = "0001-ofono-CVE-2024-7539.patch"; + url = "https://git.kernel.org/pub/scm/network/ofono/ofono.git/patch/?id=389e2344f86319265fb72ae590b470716e038fdc"; + hash = "sha256-jaZswtkWa8A9WlmjUxcwWtU2uUX5+g8m2Y/60Lb9C5Q="; + }) + + (fetchpatch { + name = "0002-ofono-CVE-2024-7540-through-7542.patch"; + url = "https://git.kernel.org/pub/scm/network/ofono/ofono.git/patch/?id=29ff6334b492504ace101be748b256e6953d2c2f"; + hash = "sha256-3iKG+5AQUVO4alZd3stTpyanwI2IfKbVTzatflMsurY="; + }) + + (fetchpatch { + name = "0003-ofono-Ensure-decode_hex_own_buf-valid-buffer.patch"; + url = "https://git.kernel.org/pub/scm/network/ofono/ofono.git/patch/?id=1e2a768445aecfa0a0e9c788651a9205cfd3744f"; + hash = "sha256-MD+LMnVK1JcVU47jQ+X0AHe8c/WqjsFycDroONE9ZLM="; + }) + ./0001-Search-connectors-in-OFONO_PLUGIN_PATH.patch ]; + postPatch = '' + patchShebangs tools/provisiontool + ''; + + strictDeps = true; + nativeBuildInputs = [ autoreconfHook pkg-config + python3 ]; buildInputs = [ @@ -45,9 +73,9 @@ stdenv.mkDerivation rec { ]; configureFlags = [ - "--with-dbusconfdir=${placeholder "out"}/share" - "--with-systemdunitdir=${placeholder "out"}/lib/systemd/system" - "--enable-external-ell" + (lib.strings.withFeatureAs true "dbusconfdir" "${placeholder "out"}/share") + (lib.strings.withFeatureAs true "systemdunitdir" "${placeholder "out"}/lib/systemd/system") + (lib.strings.enableFeature true "external-ell") "--sysconfdir=/etc" ]; @@ -58,15 +86,20 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; enableParallelChecking = false; - doCheck = true; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; - meta = with lib; { + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + + meta = { description = "Infrastructure for building mobile telephony (GSM/UMTS) applications"; homepage = "https://git.kernel.org/pub/scm/network/ofono/ofono.git"; - changelog = "https://git.kernel.org/pub/scm/network/ofono/ofono.git/plain/ChangeLog?h=${version}"; - license = licenses.gpl2Only; + changelog = "https://git.kernel.org/pub/scm/network/ofono/ofono.git/plain/ChangeLog?h=${finalAttrs.version}"; + license = lib.licenses.gpl2Only; maintainers = [ ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; mainProgram = "ofonod"; + pkgConfigModules = [ + "ofono" + ]; }; -} +}) From 76e0aadbbc655c187b80d3234e8b5a9bf93f37bf Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Mon, 10 Feb 2025 17:49:32 -0500 Subject: [PATCH 1061/2168] sssd: build with python3.12 --- pkgs/os-specific/linux/sssd/default.nix | 9 ++++++--- pkgs/top-level/all-packages.nix | 5 ++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index c6287084d57f..fef42f0b48ab 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -83,7 +83,6 @@ stdenv.mkDerivation (finalAttrs: { preConfigure = '' export SGML_CATALOG_FILES="${docbookFiles}" - export PYTHONPATH=$(find ${python3.pkgs.python-ldap} -type d -name site-packages) export PATH=$PATH:${openldap}/libexec configureFlagsArray=( @@ -129,7 +128,12 @@ stdenv.mkDerivation (finalAttrs: { samba nfs-utils p11-kit - python3 + (python3.withPackages ( + p: with p; [ + distutils + python-ldap + ] + )) popt talloc tdb @@ -147,7 +151,6 @@ stdenv.mkDerivation (finalAttrs: { libxslt libxml2 libuuid - python3.pkgs.python-ldap systemd nspr check diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6cdb7c778357..715c84193ad2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5325,10 +5325,8 @@ with pkgs; globalprotect-openconnect = libsForQt5.callPackage ../tools/networking/globalprotect-openconnect { }; sssd = callPackage ../os-specific/linux/sssd { + # NOTE: freeipa and sssd need to be built with the same version of python inherit (perlPackages) Po4a; - # python312Packages.python-ldap is broken - # https://github.com/NixOS/nixpkgs/issues/326296 - python3 = python311; }; sentry-cli = callPackage ../development/tools/sentry-cli { @@ -8819,6 +8817,7 @@ with pkgs; }; freeipa = callPackage ../os-specific/linux/freeipa { + # NOTE: freeipa and sssd need to be built with the same version of python kerberos = krb5.override { withVerto = true; }; From df198feb81c109cbafe36fc9cf20f7dc71187cc3 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Mon, 10 Feb 2025 19:49:47 -0300 Subject: [PATCH 1062/2168] influxdb: remove "v" prefix in version in libflux The version string must start with a digit per nixpkgs versioning guidelines. --- pkgs/servers/nosql/influxdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix index d60d167e4d9f..a6f053467a5b 100644 --- a/pkgs/servers/nosql/influxdb/default.nix +++ b/pkgs/servers/nosql/influxdb/default.nix @@ -16,11 +16,11 @@ let # This is copied from influxdb2 with the required flux version flux = rustPlatform.buildRustPackage rec { pname = "libflux"; - version = "v${libflux_version}"; + version = libflux_version; src = fetchFromGitHub { owner = "influxdata"; repo = "flux"; - rev = "v${libflux_version}"; + tag = "v${libflux_version}"; hash = "sha256-XHT/+JMu5q1cPjZT2x/OKEPgxFJcnjrQKqn8w9/Mb3s="; }; patches = [ From aa8014b520eb0bf766e02f669cb8a48387191746 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 19 Nov 2024 22:55:49 +0100 Subject: [PATCH 1063/2168] python312Packages.flax: 0.10.1 -> 0.10.3 Diff: https://github.com/google/flax/compare/refs/tags/v0.10.1...v0.10.3 Changelog: https://github.com/google/flax/releases/tag/v0.10.3 --- .../python-modules/flax/default.nix | 49 ++++++-------- .../python-modules/flaxlib/default.nix | 64 +++++++++++-------- .../flaxlib/nanobind-wrapper/CMakeLists.txt | 9 +++ 3 files changed, 66 insertions(+), 56 deletions(-) create mode 100644 pkgs/development/python-modules/flaxlib/nanobind-wrapper/CMakeLists.txt diff --git a/pkgs/development/python-modules/flax/default.nix b/pkgs/development/python-modules/flax/default.nix index 9eb4a8a242fb..fbd65915f72b 100644 --- a/pkgs/development/python-modules/flax/default.nix +++ b/pkgs/development/python-modules/flax/default.nix @@ -5,7 +5,7 @@ fetchFromGitHub, # build-system - jaxlib, + setuptools, setuptools-scm, # dependencies @@ -19,42 +19,43 @@ tensorstore, typing-extensions, - # checks + # optional-dependencies + matplotlib, + + # dependencies cloudpickle, + keras, einops, flaxlib, - keras, pytestCheckHook, pytest-xdist, sphinx, tensorflow, treescope, - # optional-dependencies - matplotlib, - writeScript, tomlq, }: buildPythonPackage rec { pname = "flax"; - version = "0.10.1"; + version = "0.10.3"; pyproject = true; src = fetchFromGitHub { owner = "google"; repo = "flax"; tag = "v${version}"; - hash = "sha256-+URbQGnmqmSNgucEyWvI5DMnzXjpmJzLA+Pho2lX+S4="; + hash = "sha256-PRKdtltiBVX9p6Sjw4sCDghqxYRxq4L9TLle1vy5dkk="; }; build-system = [ - jaxlib + setuptools setuptools-scm ]; dependencies = [ + flaxlib jax msgpack numpy @@ -63,6 +64,7 @@ buildPythonPackage rec { pyyaml rich tensorstore + treescope typing-extensions ]; @@ -74,24 +76,18 @@ buildPythonPackage rec { nativeCheckInputs = [ cloudpickle - einops - flaxlib keras + einops pytestCheckHook pytest-xdist sphinx tensorflow - treescope - ]; - - pytestFlagsArray = [ - "-W ignore::FutureWarning" - "-W ignore::DeprecationWarning" ]; disabledTestPaths = [ # Docs test, needs extra deps + we're not interested in it. "docs/_ext/codediff_test.py" + # The tests in `examples` are not designed to be executed from a single test # session and thus either have the modules that conflict with each other or # wrong import paths, depending on how they're invoked. Many tests also have @@ -99,23 +95,16 @@ buildPythonPackage rec { # `tensorflow_datasets`, `vocabulary`) so the benefits of trying to run them # would be limited anyway. "examples/*" + # See https://github.com/google/flax/issues/3232. "tests/jax_utils_test.py" ]; - disabledTests = - [ - # Failing with AssertionError since the jax update to 0.5.0 - "test_basic_demo_single" - "test_batch_norm_multi_init" - "test_multimetric" - "test_split_merge" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # SystemError: nanobind::detail::nb_func_error_except(): exception could not be translated! - "test_ref_changed" - "test_structure_changed" - ]; + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ + # SystemError: nanobind::detail::nb_func_error_except(): exception could not be translated! + "test_ref_changed" + "test_structure_changed" + ]; passthru = { updateScript = writeScript "update.sh" '' diff --git a/pkgs/development/python-modules/flaxlib/default.nix b/pkgs/development/python-modules/flaxlib/default.nix index 30c8e7617e76..9c9dec53fc03 100644 --- a/pkgs/development/python-modules/flaxlib/default.nix +++ b/pkgs/development/python-modules/flaxlib/default.nix @@ -1,12 +1,37 @@ { lib, + stdenv, buildPythonPackage, flax, tomlq, - rustPlatform, - pytestCheckHook, + python, + + # build-system + meson-python, + nanobind, + ninja, + + # nativeBuildInputs + cmake, + pkg-config, }: +let + nanobind-wrapper = stdenv.mkDerivation { + pname = "nanobind-wrapper"; + inherit (nanobind) version; + + src = ./nanobind-wrapper; + + nativeBuildInputs = [ + cmake + ]; + + buildFlags = [ "nanobind-static" ]; + + env.CMAKE_PREFIX_PATH = "${nanobind}/${python.sitePackages}/nanobind"; + }; +in buildPythonPackage rec { pname = "flaxlib"; version = "0.0.1-a1"; @@ -14,7 +39,7 @@ buildPythonPackage rec { inherit (flax) src; - sourceRoot = "${src.name}/flaxlib"; + sourceRoot = "${src.name}/flaxlib_src"; postPatch = '' expected_version="$version" @@ -28,34 +53,21 @@ buildPythonPackage rec { fi ''; - cargoDeps = rustPlatform.fetchCargoVendor { - inherit - pname - version - src - sourceRoot - ; - hash = "sha256-CN/ZbDxdCQPEuLfxPh/m+JtlFDkerO8aWgAaUwhixjQ="; - }; + dontUseCmakeConfigure = true; - nativeBuildInputs = [ - rustPlatform.maturinBuildHook - rustPlatform.cargoSetupHook + build-system = [ + meson-python + nanobind + ninja ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; + buildInputs = [ nanobind-wrapper ]; pythonImportsCheck = [ "flaxlib" ]; - nativeCheckInputs = [ - pytestCheckHook - ]; - - env = { - # https://github.com/google/flax/issues/4491 - # Upstream should update Cargo.lock - # Enabling `PYO3_USE_ABI3_FORWARD_COMPATIBILITY` allows us to temporarily avoid the issue - PYO3_USE_ABI3_FORWARD_COMPATIBILITY = true; - }; - # This package does not have tests (yet ?) doCheck = false; diff --git a/pkgs/development/python-modules/flaxlib/nanobind-wrapper/CMakeLists.txt b/pkgs/development/python-modules/flaxlib/nanobind-wrapper/CMakeLists.txt new file mode 100644 index 000000000000..17c59239ce08 --- /dev/null +++ b/pkgs/development/python-modules/flaxlib/nanobind-wrapper/CMakeLists.txt @@ -0,0 +1,9 @@ +cmake_minimum_required(VERSION 3.31) +project(nanobind-wrapper) + +find_package(Python COMPONENTS Interpreter Development REQUIRED) +find_package(nanobind CONFIG REQUIRED) +nanobind_build_library(nanobind-static) +set_property(TARGET nanobind-static PROPERTY EXPORT_NAME nanobind) +install(TARGETS nanobind-static EXPORT nanobind-static) +install(EXPORT nanobind-static FILE nanobindConfig.cmake DESTINATION lib/nanobind/cmake) From aa82fd9491a5ae509c9cc0224e5ac0ec26ce3e58 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 25 Oct 2024 23:13:07 +0200 Subject: [PATCH 1064/2168] python312Packages.torchrl: 0.6.0 -> 0.7.0; mark as broken Diff: https://github.com/pytorch/rl/compare/refs/tags/v0.6.0...v0.7.0 Changelog: https://github.com/pytorch/rl/releases/tag/v0.7.0 --- pkgs/development/python-modules/torchrl/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/torchrl/default.nix b/pkgs/development/python-modules/torchrl/default.nix index d06fa6db8884..1e249d4d255d 100644 --- a/pkgs/development/python-modules/torchrl/default.nix +++ b/pkgs/development/python-modules/torchrl/default.nix @@ -48,14 +48,14 @@ buildPythonPackage rec { pname = "torchrl"; - version = "0.6.0"; + version = "0.7.0"; pyproject = true; src = fetchFromGitHub { owner = "pytorch"; repo = "rl"; tag = "v${version}"; - hash = "sha256-2jxvxhhKZQVy1aU0G9PE8nPlg8yp+/+EUACkLNLRpMQ="; + hash = "sha256-SMVm1XfHHqSkWTDVSqqO3kIxMBgV9A+XrEpJ56AyaBE="; }; build-system = [ @@ -186,5 +186,8 @@ buildPythonPackage rec { changelog = "https://github.com/pytorch/rl/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ GaetanLepage ]; + # torhcrl is not compatible with our current version of gymnasium (>=1.0) + # https://github.com/pytorch/rl/pull/2473 + broken = true; }; } From 8a4fbb9582466e8abbe9f4cc4fd455bbcc0861ba Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sat, 8 Feb 2025 07:39:55 +0800 Subject: [PATCH 1065/2168] rustdesk-flutter: 1.3.2 -> 1.3.7 --- pkgs/by-name/ru/rustdesk-flutter/Cargo.lock | 8202 ----------------- .../ru/rustdesk-flutter/build-runner.sh | 56 + .../ru/rustdesk-flutter/ffigen/default.nix | 30 + .../ffigen/ffigen.pubspec.lock.json | 527 ++ pkgs/by-name/ru/rustdesk-flutter/package.nix | 117 +- .../ru/rustdesk-flutter/pubspec.lock.json | 107 +- .../rustdesk-flutter/update-cargo-lock.patch | 40 + .../update-flutter-dev-path.patch | 25 + pkgs/top-level/all-packages.nix | 4 + 9 files changed, 783 insertions(+), 8325 deletions(-) delete mode 100644 pkgs/by-name/ru/rustdesk-flutter/Cargo.lock create mode 100644 pkgs/by-name/ru/rustdesk-flutter/build-runner.sh create mode 100644 pkgs/by-name/ru/rustdesk-flutter/ffigen/default.nix create mode 100644 pkgs/by-name/ru/rustdesk-flutter/ffigen/ffigen.pubspec.lock.json create mode 100644 pkgs/by-name/ru/rustdesk-flutter/update-cargo-lock.patch create mode 100644 pkgs/by-name/ru/rustdesk-flutter/update-flutter-dev-path.patch diff --git a/pkgs/by-name/ru/rustdesk-flutter/Cargo.lock b/pkgs/by-name/ru/rustdesk-flutter/Cargo.lock deleted file mode 100644 index fb924be286cf..000000000000 --- a/pkgs/by-name/ru/rustdesk-flutter/Cargo.lock +++ /dev/null @@ -1,8202 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "aes" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" -dependencies = [ - "cfg-if 1.0.0", - "cipher", - "cpufeatures", -] - -[[package]] -name = "ahash" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - -[[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if 1.0.0", - "once_cell", - "version_check", - "zerocopy 0.7.34", -] - -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - -[[package]] -name = "allo-isolate" -version = "0.1.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b6d794345b06592d0ebeed8e477e41b71e5a0a49df4fc0e4184d5938b99509" -dependencies = [ - "anyhow", - "atomic", - "chrono", - "uuid", -] - -[[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.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" - -[[package]] -name = "alsa" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37fe60779335388a88c01ac6c3be40304d1e349de3ada3b15f7808bb90fa9dce" -dependencies = [ - "alsa-sys", - "bitflags 2.6.0", - "libc", -] - -[[package]] -name = "alsa-sys" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527" -dependencies = [ - "libc", - "pkg-config", -] - -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android-wakelock" -version = "0.1.0" -source = "git+https://github.com/rustdesk-org/android-wakelock#d0292e5a367e627c4fa6f1ca6bdfad005dca7d90" -dependencies = [ - "jni 0.21.1", - "log", - "ndk-context", -] - -[[package]] -name = "android_log-sys" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ecc8056bf6ab9892dcd53216c83d1597487d7dacac16c8df6b877d127df9937" - -[[package]] -name = "android_logger" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c494134f746c14dc653a35a4ea5aca24ac368529da5370ecf41fe0341c35772f" -dependencies = [ - "android_log-sys", - "env_logger 0.10.2", - "log", - "once_cell", -] - -[[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 0.3.9", -] - -[[package]] -name = "anstream" -version = "0.6.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "is_terminal_polyfill", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" - -[[package]] -name = "anstyle-parse" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" -dependencies = [ - "anstyle", - "windows-sys 0.52.0", -] - -[[package]] -name = "anyhow" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" - -[[package]] -name = "arboard" -version = "3.4.0" -source = "git+https://github.com/rustdesk-org/arboard#747ab2d9b40a5c9c5102051cf3b0bb38b4845e60" -dependencies = [ - "clipboard-win", - "core-graphics 0.23.2", - "image 0.25.1", - "log", - "objc2 0.5.2", - "objc2-app-kit", - "objc2-foundation", - "parking_lot", - "serde 1.0.203", - "serde_derive", - "windows-sys 0.48.0", - "wl-clipboard-rs", - "x11rb 0.13.1", -] - -[[package]] -name = "async-broadcast" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" -dependencies = [ - "event-listener 2.5.3", - "futures-core", -] - -[[package]] -name = "async-channel" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" -dependencies = [ - "concurrent-queue", - "event-listener-strategy", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-compression" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd066d0b4ef8ecb03a55319dc13aa6910616d0f44008a045bb1835af830abff5" -dependencies = [ - "flate2", - "futures-core", - "memchr", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "async-executor" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" -dependencies = [ - "async-task", - "concurrent-queue", - "fastrand 2.1.0", - "futures-lite 2.3.0", - "slab", -] - -[[package]] -name = "async-fs" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" -dependencies = [ - "async-lock 2.8.0", - "autocfg 1.3.0", - "blocking", - "futures-lite 1.13.0", -] - -[[package]] -name = "async-io" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" -dependencies = [ - "async-lock 2.8.0", - "autocfg 1.3.0", - "cfg-if 1.0.0", - "concurrent-queue", - "futures-lite 1.13.0", - "log", - "parking", - "polling 2.8.0", - "rustix 0.37.27", - "slab", - "socket2 0.4.10", - "waker-fn", -] - -[[package]] -name = "async-io" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" -dependencies = [ - "async-lock 3.4.0", - "cfg-if 1.0.0", - "concurrent-queue", - "futures-io", - "futures-lite 2.3.0", - "parking", - "polling 3.7.2", - "rustix 0.38.34", - "slab", - "tracing", - "windows-sys 0.52.0", -] - -[[package]] -name = "async-lock" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" -dependencies = [ - "event-listener 2.5.3", -] - -[[package]] -name = "async-lock" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" -dependencies = [ - "event-listener 5.3.1", - "event-listener-strategy", - "pin-project-lite", -] - -[[package]] -name = "async-process" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" -dependencies = [ - "async-io 1.13.0", - "async-lock 2.8.0", - "async-signal", - "blocking", - "cfg-if 1.0.0", - "event-listener 3.1.0", - "futures-lite 1.13.0", - "rustix 0.38.34", - "windows-sys 0.48.0", -] - -[[package]] -name = "async-recursion" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" -dependencies = [ - "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.68", -] - -[[package]] -name = "async-signal" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d" -dependencies = [ - "async-io 2.3.3", - "async-lock 3.4.0", - "atomic-waker", - "cfg-if 1.0.0", - "futures-core", - "futures-io", - "rustix 0.38.34", - "signal-hook-registry", - "slab", - "windows-sys 0.52.0", -] - -[[package]] -name = "async-task" -version = "4.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" - -[[package]] -name = "async-trait" -version = "0.1.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" -dependencies = [ - "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.68", -] - -[[package]] -name = "atk" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4af014b17dd80e8af9fa689b2d4a211ddba6eb583c1622f35d0cb543f6b17e4" -dependencies = [ - "atk-sys", - "glib 0.18.5", - "libc", -] - -[[package]] -name = "atk-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "251e0b7d90e33e0ba930891a505a9a35ece37b2dd37a14f3ffc306c13b980009" -dependencies = [ - "glib-sys 0.18.1", - "gobject-sys 0.18.0", - "libc", - "system-deps 6.2.2", -] - -[[package]] -name = "atomic" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba" - -[[package]] -name = "atomic-waker" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" - -[[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 0.3.9", -] - -[[package]] -name = "autocfg" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" -dependencies = [ - "autocfg 1.3.0", -] - -[[package]] -name = "autocfg" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" - -[[package]] -name = "backtrace" -version = "0.3.73" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" -dependencies = [ - "addr2line", - "cc", - "cfg-if 1.0.0", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base32" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa" - -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - -[[package]] -name = "base64" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" - -[[package]] -name = "base64ct" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" - -[[package]] -name = "bindgen" -version = "0.59.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" -dependencies = [ - "bitflags 1.3.2", - "cexpr", - "clang-sys", - "clap 2.34.0", - "env_logger 0.9.3", - "lazy_static", - "lazycell", - "log", - "peeking_take_while", - "proc-macro2 1.0.86", - "quote 1.0.36", - "regex", - "rustc-hash", - "shlex", - "which", -] - -[[package]] -name = "bindgen" -version = "0.65.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5" -dependencies = [ - "bitflags 1.3.2", - "cexpr", - "clang-sys", - "lazy_static", - "lazycell", - "log", - "peeking_take_while", - "prettyplease", - "proc-macro2 1.0.86", - "quote 1.0.36", - "regex", - "rustc-hash", - "shlex", - "syn 2.0.68", - "which", -] - -[[package]] -name = "bindgen" -version = "0.69.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" -dependencies = [ - "bitflags 2.6.0", - "cexpr", - "clang-sys", - "itertools 0.12.1", - "lazy_static", - "lazycell", - "proc-macro2 1.0.86", - "quote 1.0.36", - "regex", - "rustc-hash", - "shlex", - "syn 2.0.68", -] - -[[package]] -name = "bit_field" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" -dependencies = [ - "serde 1.0.203", -] - -[[package]] -name = "bitmask-enum" -version = "2.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afb15541e888071f64592c0b4364fdff21b7cb0a247f984296699351963a8721" -dependencies = [ - "quote 1.0.36", - "syn 2.0.68", -] - -[[package]] -name = "bitvec" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] - -[[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-sys" -version = "0.1.0-beta.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa55741ee90902547802152aaf3f8e5248aab7e21468089560d4c8840561146" -dependencies = [ - "objc-sys 0.2.0-beta.2", -] - -[[package]] -name = "block2" -version = "0.2.0-alpha.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dd9e63c1744f755c2f60332b88de39d341e5e86239014ad839bd71c106dec42" -dependencies = [ - "block-sys", - "objc2-encode 2.0.0-pre.2", -] - -[[package]] -name = "block2" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" -dependencies = [ - "objc2 0.5.2", -] - -[[package]] -name = "blocking" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" -dependencies = [ - "async-channel", - "async-task", - "futures-io", - "futures-lite 2.3.0", - "piper", -] - -[[package]] -name = "brotli" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391" -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 = "build-target" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "832133bbabbbaa9fbdba793456a2827627a7d2b8fb96032fa1e7666d7895832b" - -[[package]] -name = "bumpalo" -version = "3.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" - -[[package]] -name = "bytemuck" -version = "1.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "bytes" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" -dependencies = [ - "serde 1.0.203", -] - -[[package]] -name = "bzip2" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" -dependencies = [ - "bzip2-sys", - "libc", -] - -[[package]] -name = "bzip2-sys" -version = "0.1.11+1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - -[[package]] -name = "cacao" -version = "0.4.0-beta2" -source = "git+https://github.com/clslaid/cacao?branch=feat/set-file-urls#05e1536b0b43aaae308ec72c0eed703e875b7b95" -dependencies = [ - "bitmask-enum", - "block2 0.2.0-alpha.6", - "core-foundation 0.9.3", - "core-graphics 0.23.1", - "dispatch", - "lazy_static", - "libc", - "objc2 0.3.0-beta.2", - "os_info", - "percent-encoding", - "url", -] - -[[package]] -name = "cairo-rs" -version = "0.18.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2" -dependencies = [ - "bitflags 2.6.0", - "cairo-sys-rs", - "glib 0.18.5", - "libc", - "once_cell", - "thiserror", -] - -[[package]] -name = "cairo-sys-rs" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51" -dependencies = [ - "glib-sys 0.18.1", - "libc", - "system-deps 6.2.2", -] - -[[package]] -name = "cc" -version = "1.0.102" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "779e6b7d17797c0b42023d417228c02889300190e700cb074c3438d9c541d332" -dependencies = [ - "jobserver", - "libc", - "once_cell", -] - -[[package]] -name = "cesu8" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" - -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - -[[package]] -name = "cfg-expr" -version = "0.15.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" -dependencies = [ - "smallvec", - "target-lexicon", -] - -[[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 = "cfg_aliases" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" - -[[package]] -name = "cfg_aliases" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" - -[[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", - "js-sys", - "num-traits 0.2.19", - "wasm-bindgen", - "windows-targets 0.52.5", -] - -[[package]] -name = "cidr-utils" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2315f7119b7146d6a883de6acd63ddf96071b5f79d9d98d2adaa84d749f6abf1" -dependencies = [ - "debug-helper", - "num-bigint", - "num-traits 0.2.19", - "once_cell", - "regex", -] - -[[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 = "clang-sys" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" -dependencies = [ - "glob", - "libc", - "libloading 0.8.4", -] - -[[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", - "textwrap", - "unicode-width", - "vec_map", -] - -[[package]] -name = "clap" -version = "4.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84b3edb18336f4df585bc9aa31dd99c036dfa5dc5e9a2939a722a188f3a8970d" -dependencies = [ - "clap_builder", -] - -[[package]] -name = "clap_builder" -version = "4.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1c09dd5ada6c6c78075d6fd0da3f90d8080651e2d6cc8eb2f1aaa4034ced708" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim 0.11.1", -] - -[[package]] -name = "clap_lex" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" - -[[package]] -name = "clipboard" -version = "0.1.0" -dependencies = [ - "cacao", - "cc", - "dashmap", - "fuser", - "hbb_common", - "lazy_static", - "libc", - "once_cell", - "parking_lot", - "percent-encoding", - "rand 0.8.5", - "serde 1.0.203", - "serde_derive", - "thiserror", - "utf16string", - "x11-clipboard 0.8.1", - "x11rb 0.12.0", -] - -[[package]] -name = "clipboard-master" -version = "4.0.0-beta.6" -source = "git+https://github.com/rustdesk-org/clipboard-master#4fb62e5b62fb6350d82b571ec7ba94b3cd466695" -dependencies = [ - "objc", - "objc-foundation", - "objc_id", - "wayland-client", - "wayland-protocols", - "wayland-protocols-wlr", - "windows-win", - "wl-clipboard-rs", - "x11-clipboard 0.9.2", - "x11rb 0.13.1", -] - -[[package]] -name = "clipboard-win" -version = "5.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892" -dependencies = [ - "error-code", -] - -[[package]] -name = "cloudabi" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "cmake" -version = "0.1.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" -dependencies = [ - "cc", -] - -[[package]] -name = "cocoa" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" -dependencies = [ - "bitflags 1.3.2", - "block", - "cocoa-foundation", - "core-foundation 0.9.4", - "core-graphics 0.22.3", - "foreign-types 0.3.2", - "libc", - "objc", -] - -[[package]] -name = "cocoa" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" -dependencies = [ - "bitflags 1.3.2", - "block", - "cocoa-foundation", - "core-foundation 0.9.4", - "core-graphics 0.23.2", - "foreign-types 0.5.0", - "libc", - "objc", -] - -[[package]] -name = "cocoa-foundation" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" -dependencies = [ - "bitflags 1.3.2", - "block", - "core-foundation 0.9.4", - "core-graphics-types 0.1.3", - "libc", - "objc", -] - -[[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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" - -[[package]] -name = "combine" -version = "4.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" -dependencies = [ - "bytes", - "memchr", -] - -[[package]] -name = "concurrent-queue" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "confy" -version = "0.4.0-2" -source = "git+https://github.com/rustdesk-org/confy#83db9ec19a2f97e9718aef69e4fc5611bb382479" -dependencies = [ - "directories-next", - "serde 1.0.203", - "thiserror", - "toml 0.5.11", -] - -[[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 1.0.0", - "wasm-bindgen", -] - -[[package]] -name = "const_fn" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "373e9fafaa20882876db20562275ff58d50e0caa2590077fe7ce7bef90211d0d" - -[[package]] -name = "const_format" -version = "0.2.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673" -dependencies = [ - "const_format_proc_macros", -] - -[[package]] -name = "const_format_proc_macros" -version = "0.2.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500" -dependencies = [ - "proc-macro2 1.0.86", - "quote 1.0.36", - "unicode-xid 0.2.4", -] - -[[package]] -name = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - -[[package]] -name = "constant_time_eq" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21a53c0a4d288377e7415b53dcfc3c04da5cdc2cc95c8d5ac178b58f0b861ad6" - -[[package]] -name = "core-foundation" -version = "0.9.3" -source = "git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd#7d593d016175755e492a92ef89edca68ac3bd5cd" -dependencies = [ - "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", - "libc", -] - -[[package]] -name = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -dependencies = [ - "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", - "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" -version = "0.22.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" -dependencies = [ - "bitflags 1.3.2", - "core-foundation 0.9.4", - "core-graphics-types 0.1.3", - "foreign-types 0.3.2", - "libc", -] - -[[package]] -name = "core-graphics" -version = "0.23.1" -source = "git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd#7d593d016175755e492a92ef89edca68ac3bd5cd" -dependencies = [ - "bitflags 1.3.2", - "core-foundation 0.9.3", - "core-graphics-types 0.1.2", - "foreign-types 0.5.0", - "libc", - "objc2-encode 2.0.0-pre.2", -] - -[[package]] -name = "core-graphics" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" -dependencies = [ - "bitflags 1.3.2", - "core-foundation 0.9.4", - "core-graphics-types 0.1.3", - "foreign-types 0.5.0", - "libc", -] - -[[package]] -name = "core-graphics-types" -version = "0.1.2" -source = "git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd#7d593d016175755e492a92ef89edca68ac3bd5cd" -dependencies = [ - "bitflags 1.3.2", - "core-foundation 0.9.3", - "libc", - "objc2-encode 2.0.0-pre.2", -] - -[[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 0.9.4", - "libc", -] - -[[package]] -name = "coreaudio-rs" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "321077172d79c662f64f5071a03120748d5bb652f5231570141be24cfcd2bace" -dependencies = [ - "bitflags 1.3.2", - "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", - "coreaudio-sys", -] - -[[package]] -name = "coreaudio-sys" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f01585027057ff5f0a5bf276174ae4c1594a2c5bde93d5f46a016d76270f5a9" -dependencies = [ - "bindgen 0.69.4", -] - -[[package]] -name = "cpal" -version = "0.15.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "873dab07c8f743075e57f524c583985fbaf745602acbe916a01539364369a779" -dependencies = [ - "alsa", - "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", - "coreaudio-rs", - "dasp_sample", - "jni 0.21.1", - "js-sys", - "libc", - "mach2", - "ndk 0.8.0", - "ndk-context", - "oboe", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "windows 0.54.0", -] - -[[package]] -name = "cpufeatures" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" -dependencies = [ - "libc", -] - -[[package]] -name = "crc32fast" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" -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.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" - -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "ctrlc" -version = "3.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345" -dependencies = [ - "nix 0.28.0", - "windows-sys 0.52.0", -] - -[[package]] -name = "dart-sys" -version = "4.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57967e4b200d767d091b961d6ab42cc7d0cc14fe9e052e75d0d3cf9eb732d895" -dependencies = [ - "cc", -] - -[[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.5", - "lock_api", - "once_cell", - "parking_lot_core", -] - -[[package]] -name = "dasp" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7381b67da416b639690ac77c73b86a7b5e64a29e31d1f75fb3b1102301ef355a" -dependencies = [ - "dasp_envelope", - "dasp_frame", - "dasp_interpolate", - "dasp_peak", - "dasp_ring_buffer", - "dasp_rms", - "dasp_sample", - "dasp_signal", - "dasp_slice", - "dasp_window", -] - -[[package]] -name = "dasp_envelope" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ec617ce7016f101a87fe85ed44180839744265fae73bb4aa43e7ece1b7668b6" -dependencies = [ - "dasp_frame", - "dasp_peak", - "dasp_ring_buffer", - "dasp_rms", - "dasp_sample", -] - -[[package]] -name = "dasp_frame" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2a3937f5fe2135702897535c8d4a5553f8b116f76c1529088797f2eee7c5cd6" -dependencies = [ - "dasp_sample", -] - -[[package]] -name = "dasp_interpolate" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc975a6563bb7ca7ec0a6c784ead49983a21c24835b0bc96eea11ee407c7486" -dependencies = [ - "dasp_frame", - "dasp_ring_buffer", - "dasp_sample", -] - -[[package]] -name = "dasp_peak" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cf88559d79c21f3d8523d91250c397f9a15b5fc72fbb3f87fdb0a37b79915bf" -dependencies = [ - "dasp_frame", - "dasp_sample", -] - -[[package]] -name = "dasp_ring_buffer" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07d79e19b89618a543c4adec9c5a347fe378a19041699b3278e616e387511ea1" - -[[package]] -name = "dasp_rms" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6c5dcb30b7e5014486e2822537ea2beae50b19722ffe2ed7549ab03774575aa" -dependencies = [ - "dasp_frame", - "dasp_ring_buffer", - "dasp_sample", -] - -[[package]] -name = "dasp_sample" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f" - -[[package]] -name = "dasp_signal" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa1ab7d01689c6ed4eae3d38fe1cea08cba761573fbd2d592528d55b421077e7" -dependencies = [ - "dasp_envelope", - "dasp_frame", - "dasp_interpolate", - "dasp_peak", - "dasp_ring_buffer", - "dasp_rms", - "dasp_sample", - "dasp_window", -] - -[[package]] -name = "dasp_slice" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e1c7335d58e7baedafa516cb361360ff38d6f4d3f9d9d5ee2a2fc8e27178fa1" -dependencies = [ - "dasp_frame", - "dasp_sample", -] - -[[package]] -name = "dasp_window" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99ded7b88821d2ce4e8b842c9f1c86ac911891ab89443cc1de750cae764c5076" -dependencies = [ - "dasp_sample", -] - -[[package]] -name = "dbus" -version = "0.9.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b" -dependencies = [ - "libc", - "libdbus-sys", - "winapi 0.3.9", -] - -[[package]] -name = "dbus-crossroads" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a4c83437187544ba5142427746835061b330446ca8902eabd70e4afb8f76de0" -dependencies = [ - "dbus", -] - -[[package]] -name = "debug-helper" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f578e8e2c440e7297e008bb5486a3a8a194775224bbc23729b0dbdfaeebf162e" - -[[package]] -name = "default-net" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4898b43aed56499fad6b294d15b3e76a51df68079bf492e5daae38ca084e003" -dependencies = [ - "dlopen2", - "libc", - "memalloc", - "netlink-packet-core", - "netlink-packet-route", - "netlink-sys", - "once_cell", - "system-configuration", - "windows 0.32.0", -] - -[[package]] -name = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", -] - -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2 1.0.86", - "quote 1.0.36", - "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", - "crypto-common", - "subtle", -] - -[[package]] -name = "directories-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc" -dependencies = [ - "cfg-if 1.0.0", - "dirs-sys-next", -] - -[[package]] -name = "dirs" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" -dependencies = [ - "cfg-if 0.1.10", - "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-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if 1.0.0", - "dirs-sys-next", -] - -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi 0.3.9", -] - -[[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 = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi 0.3.9", -] - -[[package]] -name = "dispatch" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" - -[[package]] -name = "dlib" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" -dependencies = [ - "libloading 0.8.4", -] - -[[package]] -name = "dlopen" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e80ad39f814a9abe68583cd50a2d45c8a67561c3361ab8da240587dda80937" -dependencies = [ - "dlopen_derive", - "lazy_static", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "dlopen2" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b121caccfc363e4d9a4589528f3bef7c71b83c6ed01c8dc68cbeeb7fd29ec698" -dependencies = [ - "dlopen2_derive", - "libc", - "once_cell", - "winapi 0.3.9", -] - -[[package]] -name = "dlopen2_derive" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a09ac8bb8c16a282264c379dffba707b9c998afc7506009137f3c6136888078" -dependencies = [ - "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 1.0.109", -] - -[[package]] -name = "dlopen_derive" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f236d9e1b1fbd81cea0f9cbdc8dcc7e8ebcd80e6659cd7cb2ad5f6c05946c581" -dependencies = [ - "libc", - "quote 0.6.13", - "syn 0.15.44", -] - -[[package]] -name = "dlv-list" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257" - -[[package]] -name = "docopt" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f3f119846c823f9eafcf953a8f6ffb6ed69bf6240883261a7f13b634579a51f" -dependencies = [ - "lazy_static", - "regex", - "serde 1.0.203", - "strsim 0.10.0", -] - -[[package]] -name = "downcast-rs" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" - -[[package]] -name = "dpi" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53" - -[[package]] -name = "dtoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" - -[[package]] -name = "dylib_virtual_display" -version = "0.1.0" -dependencies = [ - "cc", - "hbb_common", - "lazy_static", - "serde 1.0.203", - "serde_derive", - "thiserror", -] - -[[package]] -name = "ed25519" -version = "1.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" -dependencies = [ - "signature", -] - -[[package]] -name = "either" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" - -[[package]] -name = "encoding_rs" -version = "0.8.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "enigo" -version = "0.0.14" -dependencies = [ - "core-graphics 0.22.3", - "hbb_common", - "log", - "objc", - "pkg-config", - "rdev", - "serde 1.0.203", - "serde_derive", - "tfc", - "unicode-segmentation", - "winapi 0.3.9", -] - -[[package]] -name = "enquote" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06c36cb11dbde389f4096111698d8b567c0720e3452fd5ac3e6b4e47e1939932" -dependencies = [ - "thiserror", -] - -[[package]] -name = "enum-map" -version = "2.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6866f3bfdf8207509a033af1a75a7b08abda06bbaaeae6669323fd5a097df2e9" -dependencies = [ - "enum-map-derive", -] - -[[package]] -name = "enum-map-derive" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" -dependencies = [ - "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.68", -] - -[[package]] -name = "enumflags2" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" -dependencies = [ - "enumflags2_derive", - "serde 1.0.203", -] - -[[package]] -name = "enumflags2_derive" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" -dependencies = [ - "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.68", -] - -[[package]] -name = "env_logger" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" -dependencies = [ - "atty", - "humantime", - "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", - "is-terminal", - "log", - "regex", - "termcolor", -] - -[[package]] -name = "epoll" -version = "4.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74351c3392ea1ff6cd2628e0042d268ac2371cb613252ff383b6dfa50d22fa79" -dependencies = [ - "bitflags 2.6.0", - "libc", -] - -[[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.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "error-code" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" - -[[package]] -name = "evdev" -version = "0.11.5" -source = "git+https://github.com/rustdesk-org/evdev#cec616e37790293d2cd2aa54a96601ed6b1b35a9" -dependencies = [ - "bitvec", - "libc", - "nix 0.23.2", -] - -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[package]] -name = "event-listener" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener" -version = "5.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener-strategy" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" -dependencies = [ - "event-listener 5.3.1", - "pin-project-lite", -] - -[[package]] -name = "exr" -version = "1.72.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4" -dependencies = [ - "bit_field", - "flume", - "half", - "lebe", - "miniz_oxide", - "rayon-core", - "smallvec", - "zune-inflate", -] - -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "fastrand" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" - -[[package]] -name = "fdeflate" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" -dependencies = [ - "simd-adler32", -] - -[[package]] -name = "field-offset" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" -dependencies = [ - "memoffset 0.9.1", - "rustc_version", -] - -[[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 0.4.1", - "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.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "flexi_logger" -version = "0.27.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469e584c031833564840fb0cdbce99bdfe946fd45480a188545e73a76f45461c" -dependencies = [ - "chrono", - "crossbeam-channel", - "crossbeam-queue", - "glob", - "is-terminal", - "lazy_static", - "log", - "nu-ansi-term", - "regex", - "thiserror", -] - -[[package]] -name = "flume" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" -dependencies = [ - "spin", -] - -[[package]] -name = "flutter_rust_bridge" -version = "1.80.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd0305ebc9f097d9826530a55fc2acd63222e912c663f7adce3ab641ecc0f346" -dependencies = [ - "allo-isolate", - "anyhow", - "build-target", - "bytemuck", - "cc", - "chrono", - "console_error_panic_hook", - "dart-sys", - "flutter_rust_bridge_macros", - "js-sys", - "lazy_static", - "libc", - "log", - "parking_lot", - "threadpool", - "uuid", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "flutter_rust_bridge_macros" -version = "1.82.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7fe743d921bedf4578b9472346d03a9643a01cd565ca7df7961baebad534ba5" - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "fon" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad46a0e6c9bc688823a742aa969b5c08fdc56c2a436ee00d5c6fbcb5982c55c4" -dependencies = [ - "libm", -] - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared 0.1.1", -] - -[[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 0.3.1", -] - -[[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.86", - "quote 1.0.36", - "syn 2.0.68", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[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 = "fruitbasket" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "898289b8e0528c84fb9b88f15ac9d5109bcaf23e0e49bb6f64deee0d86b6a351" -dependencies = [ - "dirs 2.0.2", - "objc", - "objc-foundation", - "objc_id", - "time 0.1.45", -] - -[[package]] -name = "fuchsia-cprng" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" - -[[package]] -name = "funty" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" - -[[package]] -name = "fuser" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21370f84640642c8ea36dfb2a6bfc4c55941f476fcf431f6fef25a5ddcf0169b" -dependencies = [ - "libc", - "log", - "memchr", - "page_size", - "pkg-config", - "smallvec", - "zerocopy 0.6.6", -] - -[[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-lite" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" -dependencies = [ - "fastrand 1.9.0", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] - -[[package]] -name = "futures-lite" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" -dependencies = [ - "fastrand 2.1.0", - "futures-core", - "futures-io", - "parking", - "pin-project-lite", -] - -[[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.86", - "quote 1.0.36", - "syn 2.0.68", -] - -[[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 = "gdk" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5ba081bdef3b75ebcdbfc953699ed2d7417d6bd853347a42a37d76406a33646" -dependencies = [ - "cairo-rs", - "gdk-pixbuf", - "gdk-sys", - "gio", - "glib 0.18.5", - "libc", - "pango", -] - -[[package]] -name = "gdk-pixbuf" -version = "0.18.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50e1f5f1b0bfb830d6ccc8066d18db35c487b1b2b1e8589b5dfe9f07e8defaec" -dependencies = [ - "gdk-pixbuf-sys", - "gio", - "glib 0.18.5", - "libc", - "once_cell", -] - -[[package]] -name = "gdk-pixbuf-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" -dependencies = [ - "gio-sys", - "glib-sys 0.18.1", - "gobject-sys 0.18.0", - "libc", - "system-deps 6.2.2", -] - -[[package]] -name = "gdk-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31ff856cb3386dae1703a920f803abafcc580e9b5f711ca62ed1620c25b51ff2" -dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gio-sys", - "glib-sys 0.18.1", - "gobject-sys 0.18.0", - "libc", - "pango-sys", - "pkg-config", - "system-deps 6.2.2", -] - -[[package]] -name = "gdkwayland-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a90fbf5c033c65d93792192a49a8efb5bb1e640c419682a58bb96f5ae77f3d4a" -dependencies = [ - "gdk-sys", - "glib-sys 0.18.1", - "gobject-sys 0.18.0", - "libc", - "pkg-config", - "system-deps 6.2.2", -] - -[[package]] -name = "gdkx11-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fee8f00f4ee46cad2939b8990f5c70c94ff882c3028f3cc5abf950fa4ab53043" -dependencies = [ - "gdk-sys", - "glib-sys 0.18.1", - "libc", - "system-deps 6.2.2", - "x11 2.21.0", -] - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "gethostname" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb65d4ba3173c56a500b555b532f72c42e8d1fe64962b518897f8959fae2c177" -dependencies = [ - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "gethostname" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" -dependencies = [ - "libc", - "windows-targets 0.48.5", -] - -[[package]] -name = "getrandom" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", -] - -[[package]] -name = "gif" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" -dependencies = [ - "color_quant", - "weezl", -] - -[[package]] -name = "gimli" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" - -[[package]] -name = "gio" -version = "0.18.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fc8f532f87b79cbc51a79748f16a6828fb784be93145a322fa14d06d354c73" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "gio-sys", - "glib 0.18.5", - "libc", - "once_cell", - "pin-project-lite", - "smallvec", - "thiserror", -] - -[[package]] -name = "gio-sys" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" -dependencies = [ - "glib-sys 0.18.1", - "gobject-sys 0.18.0", - "libc", - "system-deps 6.2.2", - "winapi 0.3.9", -] - -[[package]] -name = "git2" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccf7f68c2995f392c49fffb4f95ae2c873297830eb25c6bc4c114ce8f4562acc" -dependencies = [ - "bitflags 1.3.2", - "libc", - "libgit2-sys", - "log", - "url", -] - -[[package]] -name = "glib" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c685013b7515e668f1b57a165b009d4d28cb139a8a989bbd699c10dad29d0c5" -dependencies = [ - "bitflags 1.3.2", - "futures-channel", - "futures-core", - "futures-executor", - "futures-task", - "futures-util", - "glib-macros 0.10.1", - "glib-sys 0.10.1", - "gobject-sys 0.10.0", - "libc", - "once_cell", -] - -[[package]] -name = "glib" -version = "0.18.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5" -dependencies = [ - "bitflags 2.6.0", - "futures-channel", - "futures-core", - "futures-executor", - "futures-task", - "futures-util", - "gio-sys", - "glib-macros 0.18.5", - "glib-sys 0.18.1", - "gobject-sys 0.18.0", - "libc", - "memchr", - "once_cell", - "smallvec", - "thiserror", -] - -[[package]] -name = "glib-macros" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41486a26d1366a8032b160b59065a59fb528530a46a49f627e7048fb8c064039" -dependencies = [ - "anyhow", - "heck 0.3.3", - "itertools 0.9.0", - "proc-macro-crate 0.1.5", - "proc-macro-error", - "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 1.0.109", -] - -[[package]] -name = "glib-macros" -version = "0.18.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb0228f477c0900c880fd78c8759b95c7636dbd7842707f49e132378aa2acdc" -dependencies = [ - "heck 0.4.1", - "proc-macro-crate 2.0.2", - "proc-macro-error", - "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.68", -] - -[[package]] -name = "glib-sys" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7e9b997a66e9a23d073f2b1abb4dbfc3925e0b8952f67efd8d9b6e168e4cdc1" -dependencies = [ - "libc", - "system-deps 1.3.2", -] - -[[package]] -name = "glib-sys" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" -dependencies = [ - "libc", - "system-deps 6.2.2", -] - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "gobject-sys" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "952133b60c318a62bf82ee75b93acc7e84028a093e06b9e27981c2b6fe68218c" -dependencies = [ - "glib-sys 0.10.1", - "libc", - "system-deps 1.3.2", -] - -[[package]] -name = "gobject-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" -dependencies = [ - "glib-sys 0.18.1", - "libc", - "system-deps 6.2.2", -] - -[[package]] -name = "gstreamer" -version = "0.16.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ff5d0f7ff308ae37e6eb47b6ded17785bdea06e438a708cd09e0288c1862f33" -dependencies = [ - "bitflags 1.3.2", - "cfg-if 1.0.0", - "futures-channel", - "futures-core", - "futures-util", - "glib 0.10.3", - "glib-sys 0.10.1", - "gobject-sys 0.10.0", - "gstreamer-sys", - "libc", - "muldiv", - "num-rational", - "once_cell", - "paste", - "pretty-hex", - "thiserror", -] - -[[package]] -name = "gstreamer-app" -version = "0.16.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc80888271338c3ede875d8cafc452eb207476ff5539dcbe0018a8f5b827af0e" -dependencies = [ - "bitflags 1.3.2", - "futures-core", - "futures-sink", - "glib 0.10.3", - "glib-sys 0.10.1", - "gobject-sys 0.10.0", - "gstreamer", - "gstreamer-app-sys", - "gstreamer-base", - "gstreamer-sys", - "libc", - "once_cell", -] - -[[package]] -name = "gstreamer-app-sys" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "813f64275c9e7b33b828b9efcf9dfa64b95996766d4de996e84363ac65b87e3d" -dependencies = [ - "glib-sys 0.10.1", - "gstreamer-base-sys", - "gstreamer-sys", - "libc", - "system-deps 1.3.2", -] - -[[package]] -name = "gstreamer-base" -version = "0.16.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bafd01c56f59cb10f4b5a10f97bb4bdf8c2b2784ae5b04da7e2d400cf6e6afcf" -dependencies = [ - "bitflags 1.3.2", - "glib 0.10.3", - "glib-sys 0.10.1", - "gobject-sys 0.10.0", - "gstreamer", - "gstreamer-base-sys", - "gstreamer-sys", - "libc", -] - -[[package]] -name = "gstreamer-base-sys" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4b7b6dc2d6e160a1ae28612f602bd500b3fa474ce90bf6bb2f08072682beef5" -dependencies = [ - "glib-sys 0.10.1", - "gobject-sys 0.10.0", - "gstreamer-sys", - "libc", - "system-deps 1.3.2", -] - -[[package]] -name = "gstreamer-sys" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc1f154082d01af5718c5f8a8eb4f565a4ea5586ad8833a8fc2c2aa6844b601d" -dependencies = [ - "glib-sys 0.10.1", - "gobject-sys 0.10.0", - "libc", - "system-deps 1.3.2", -] - -[[package]] -name = "gstreamer-video" -version = "0.16.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7bbb1485d87469849ec45c08e03c2f280d3ea20ff3c439d03185be54e3ce98e" -dependencies = [ - "bitflags 1.3.2", - "futures-channel", - "futures-util", - "glib 0.10.3", - "glib-sys 0.10.1", - "gobject-sys 0.10.0", - "gstreamer", - "gstreamer-base", - "gstreamer-base-sys", - "gstreamer-sys", - "gstreamer-video-sys", - "libc", - "once_cell", -] - -[[package]] -name = "gstreamer-video-sys" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92347e46438007d6a2386302125f62cb9df6769cdacb931af5c0f12c1ee21de4" -dependencies = [ - "glib-sys 0.10.1", - "gobject-sys 0.10.0", - "gstreamer-base-sys", - "gstreamer-sys", - "libc", - "system-deps 1.3.2", -] - -[[package]] -name = "gtk" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93c4f5e0e20b60e10631a5f06da7fe3dda744b05ad0ea71fee2f47adf865890c" -dependencies = [ - "atk", - "cairo-rs", - "field-offset", - "futures-channel", - "gdk", - "gdk-pixbuf", - "gio", - "glib 0.18.5", - "gtk-sys", - "gtk3-macros", - "libc", - "pango", - "pkg-config", -] - -[[package]] -name = "gtk-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771437bf1de2c1c0b496c11505bdf748e26066bbe942dfc8f614c9460f6d7722" -dependencies = [ - "atk-sys", - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gdk-sys", - "gio-sys", - "glib-sys 0.18.1", - "gobject-sys 0.18.0", - "libc", - "pango-sys", - "system-deps 6.2.2", -] - -[[package]] -name = "gtk3-macros" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6063efb63db582968fb7df72e1ae68aa6360dcfb0a75143f34fc7d616bad75e" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro-error", - "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.68", -] - -[[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", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "half" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" -dependencies = [ - "cfg-if 1.0.0", - "crunchy", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.8", -] - -[[package]] -name = "hashbrown" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" -dependencies = [ - "ahash 0.8.11", - "allocator-api2", -] - -[[package]] -name = "hbb_common" -version = "0.1.0" -dependencies = [ - "anyhow", - "backtrace", - "base64 0.22.1", - "bytes", - "chrono", - "confy", - "directories-next", - "dirs-next", - "dlopen", - "env_logger 0.10.2", - "filetime", - "flexi_logger", - "futures", - "futures-util", - "httparse", - "lazy_static", - "libc", - "log", - "mac_address", - "machine-uid", - "osascript", - "protobuf", - "protobuf-codegen", - "rand 0.8.5", - "regex", - "rustls-pki-types", - "rustls-platform-verifier", - "serde 1.0.203", - "serde_derive", - "serde_json 1.0.118", - "socket2 0.3.19", - "sodiumoxide", - "sysinfo", - "thiserror", - "tokio", - "tokio-native-tls", - "tokio-rustls 0.26.0", - "tokio-socks 0.5.2-1", - "tokio-util", - "toml 0.7.8", - "url", - "uuid", - "winapi 0.3.9", - "zstd 0.13.1", -] - -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - -[[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.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - -[[package]] -name = "hermit-abi" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[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 = "hound" -version = "3.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62adaabb884c94955b19907d60019f4e145d091c75345379e70d1ee696f7854f" - -[[package]] -name = "html-escape" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1ad449764d627e22bfd7cd5e8868264fc9236e07c752972b4080cd351cb476" -dependencies = [ - "utf8-width", -] - -[[package]] -name = "http" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" -dependencies = [ - "bytes", - "fnv", - "itoa 1.0.11", -] - -[[package]] -name = "http-body" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" -dependencies = [ - "bytes", - "http", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" - -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "hwcodec" -version = "0.7.0" -source = "git+https://github.com/rustdesk-org/hwcodec#8bbd05bb300ad07cc345356ad85570f9ea99fbfa" -dependencies = [ - "bindgen 0.59.2", - "cc", - "log", - "serde 1.0.203", - "serde_derive", - "serde_json 1.0.118", -] - -[[package]] -name = "hyper" -version = "0.14.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa 1.0.11", - "pin-project-lite", - "socket2 0.5.7", - "tokio", - "tower-service", - "tracing", - "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", - "hyper", - "rustls 0.21.12", - "tokio", - "tokio-rustls 0.24.1", -] - -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper", - "native-tls", - "tokio", - "tokio-native-tls", -] - -[[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 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", - "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 = "idna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "image" -version = "0.24.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "exr", - "gif", - "jpeg-decoder", - "num-traits 0.2.19", - "png", - "qoi", - "tiff", -] - -[[package]] -name = "image" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" -dependencies = [ - "bytemuck", - "byteorder", - "num-traits 0.2.19", - "png", - "tiff", -] - -[[package]] -name = "impersonate_system" -version = "0.1.0" -source = "git+https://github.com/rustdesk-org/impersonate-system#2f429010a5a10b1fe5eceb553c6672fd53d20167" -dependencies = [ - "cc", -] - -[[package]] -name = "include_dir" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "923d117408f1e49d914f1a379a309cffe4f18c05cf4e3d12e613a15fc81bd0dd" -dependencies = [ - "include_dir_macros", -] - -[[package]] -name = "include_dir_macros" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cab85a7ed0bd5f0e76d93846e0147172bed2e2d3f859bcc33a8d9699cad1a75" -dependencies = [ - "proc-macro2 1.0.86", - "quote 1.0.36", -] - -[[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", -] - -[[package]] -name = "inotify" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdd168d97690d0b8c412d6b6c10360277f4d7ee495c5d0d5d5fe0854923255cc" -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 = [ - "generic-array", -] - -[[package]] -name = "instant" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.9", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "ipnet" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" - -[[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.9", - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "is_debug" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06d198e9919d9822d5f7083ba8530e04de87841eaf21ead9af8f2304efd57c89" - -[[package]] -name = "is_terminal_polyfill" -version = "1.70.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" - -[[package]] -name = "itertools" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" -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 = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8324a32baf01e2ae060e9de58ed0bc2320c9a2833491ee36cd3b4c414de4db8c" - -[[package]] -name = "itoa" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - -[[package]] -name = "jni" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" -dependencies = [ - "cesu8", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", -] - -[[package]] -name = "jni" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" -dependencies = [ - "cesu8", - "cfg-if 1.0.0", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", - "windows-sys 0.45.0", -] - -[[package]] -name = "jni-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" - -[[package]] -name = "jobserver" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" -dependencies = [ - "libc", -] - -[[package]] -name = "jpeg-decoder" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" -dependencies = [ - "rayon", -] - -[[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 = "keepawake" -version = "0.4.3" -source = "git+https://github.com/rustdesk-org/keepawake-rs#64d568586dd16551d02120e19668d2b0fec8e3c9" -dependencies = [ - "anyhow", - "cfg-if 1.0.0", - "core-foundation 0.9.4", - "shadow-rs", - "windows 0.48.0", - "winres", - "zbus", -] - -[[package]] -name = "kernel32-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - -[[package]] -name = "keyboard-types" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a" -dependencies = [ - "bitflags 2.6.0", - "serde 1.0.203", - "unicode-segmentation", -] - -[[package]] -name = "lazy_static" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" - -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] -name = "lebe" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" - -[[package]] -name = "libappindicator" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03589b9607c868cc7ae54c0b2a22c8dc03dd41692d48f2d7df73615c6a95dc0a" -dependencies = [ - "glib 0.18.5", - "gtk", - "gtk-sys", - "libappindicator-sys", - "log", -] - -[[package]] -name = "libappindicator-sys" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e9ec52138abedcc58dc17a7c6c0c00a2bdb4f3427c7f63fa97fd0d859155caf" -dependencies = [ - "gtk-sys", - "libloading 0.7.4", - "once_cell", -] - -[[package]] -name = "libc" -version = "0.2.155" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" - -[[package]] -name = "libdbus-sys" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72" -dependencies = [ - "pkg-config", -] - -[[package]] -name = "libgit2-sys" -version = "0.14.2+1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f3d95f6b51075fe9810a7ae22c7095f12b98005ab364d8544797a825ce946a4" -dependencies = [ - "cc", - "libc", - "libz-sys", - "pkg-config", -] - -[[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 0.3.9", -] - -[[package]] -name = "libloading" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" -dependencies = [ - "cfg-if 1.0.0", - "windows-targets 0.52.5", -] - -[[package]] -name = "libm" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" - -[[package]] -name = "libpulse-binding" -version = "2.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed3557a2dfc380c8f061189a01c6ae7348354e0c9886038dc6c171219c08eaff" -dependencies = [ - "bitflags 1.3.2", - "libc", - "libpulse-sys", - "num-derive 0.3.3", - "num-traits 0.2.19", - "winapi 0.3.9", -] - -[[package]] -name = "libpulse-simple-binding" -version = "2.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05fd6b68f33f6a251265e6ed1212dc3107caad7c5c6fdcd847b2e65ef58c308d" -dependencies = [ - "libpulse-binding", - "libpulse-simple-sys", - "libpulse-sys", -] - -[[package]] -name = "libpulse-simple-sys" -version = "1.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6613b4199d8b9f0edcfb623e020cb17bbd0bee8dd21f3c7cc938de561c4152" -dependencies = [ - "libpulse-sys", - "pkg-config", -] - -[[package]] -name = "libpulse-sys" -version = "1.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc19e110fbf42c17260d30f6d3dc545f58491c7830d38ecb9aaca96e26067a9b" -dependencies = [ - "libc", - "num-derive 0.3.3", - "num-traits 0.2.19", - "pkg-config", - "winapi 0.3.9", -] - -[[package]] -name = "libredox" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" -dependencies = [ - "bitflags 2.6.0", - "libc", -] - -[[package]] -name = "libsamplerate-sys" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28853b399f78f8281cd88d333b54a63170c4275f6faea66726a2bea5cca72e0d" -dependencies = [ - "cmake", -] - -[[package]] -name = "libsodium-sys" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b779387cd56adfbc02ea4a668e704f729be8d6a6abd2c27ca5ee537849a92fd" -dependencies = [ - "cc", - "libc", - "pkg-config", - "walkdir", -] - -[[package]] -name = "libxdo" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00333b8756a3d28e78def82067a377de7fa61b24909000aeaa2b446a948d14db" -dependencies = [ - "libxdo-sys", -] - -[[package]] -name = "libxdo-sys" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db23b9e7e2b7831bbd8aac0bbeeeb7b68cbebc162b227e7052e8e55829a09212" -dependencies = [ - "libc", - "x11 2.21.0", -] - -[[package]] -name = "libz-sys" -version = "1.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "line-wrap" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd1bc4d24ad230d21fb898d1116b1801d7adfc449d42026475862ab48b11e70e" - -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "linux-raw-sys" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" - -[[package]] -name = "lock_api" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" -dependencies = [ - "autocfg 1.3.0", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" - -[[package]] -name = "mac_address" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8836fae9d0d4be2c8b4efcdd79e828a2faa058a90d005abf42f91cac5493a08e" -dependencies = [ - "nix 0.28.0", - "winapi 0.3.9", -] - -[[package]] -name = "mach2" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" -dependencies = [ - "libc", -] - -[[package]] -name = "machine-uid" -version = "0.3.0" -source = "git+https://github.com/rustdesk-org/machine-uid#381ff579c1dc3a6c54db9dfec47c44bcb0246542" -dependencies = [ - "bindgen 0.59.2", - "cc", - "winreg 0.11.0", -] - -[[package]] -name = "magnum-opus" -version = "0.4.0" -source = "git+https://github.com/rustdesk-org/magnum-opus#5cd2bf989c148662fa3a2d9d539a71d71fd1d256" -dependencies = [ - "bindgen 0.59.2", - "pkg-config", - "target_build_utils", -] - -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - -[[package]] -name = "md5" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" - -[[package]] -name = "memalloc" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df39d232f5c40b0891c10216992c2f250c054105cb1e56f0fc9032db6203ecc1" - -[[package]] -name = "memchr" -version = "2.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" - -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg 1.3.0", -] - -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg 1.3.0", -] - -[[package]] -name = "memoffset" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" -dependencies = [ - "autocfg 1.3.0", -] - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" -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 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", -] - -[[package]] -name = "muda" -version = "0.13.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b959f97c97044e4c96e32e1db292a7d594449546a3c6b77ae613dc3a5b5145" -dependencies = [ - "cocoa 0.25.0", - "crossbeam-channel", - "dpi", - "gtk", - "keyboard-types", - "libxdo", - "objc", - "once_cell", - "png", - "thiserror", - "windows-sys 0.52.0", -] - -[[package]] -name = "muldiv" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0419348c027fa7be448d2ae7ea0e4e04c2334c31dc4e74ab29f00a2a7ca69204" - -[[package]] -name = "native-tls" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" -dependencies = [ - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "native-windows-gui" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f7003a669f68deb6b7c57d74fff4f8e533c44a3f0b297492440ef4ff5a28454" -dependencies = [ - "bitflags 1.3.2", - "lazy_static", - "winapi 0.3.9", - "winapi-build", -] - -[[package]] -name = "ndk" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" -dependencies = [ - "bitflags 1.3.2", - "jni-sys", - "ndk-sys 0.4.1+23.1.7779620", - "num_enum 0.5.11", - "raw-window-handle 0.5.2", - "thiserror", -] - -[[package]] -name = "ndk" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" -dependencies = [ - "bitflags 2.6.0", - "jni-sys", - "log", - "ndk-sys 0.5.0+25.2.9519653", - "num_enum 0.7.2", - "thiserror", -] - -[[package]] -name = "ndk-context" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" - -[[package]] -name = "ndk-sys" -version = "0.4.1+23.1.7779620" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3" -dependencies = [ - "jni-sys", -] - -[[package]] -name = "ndk-sys" -version = "0.5.0+25.2.9519653" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" -dependencies = [ - "jni-sys", -] - -[[package]] -name = "netlink-packet-core" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e5cf0b54effda4b91615c40ff0fd12d0d4c9a6e0f5116874f03941792ff535a" -dependencies = [ - "anyhow", - "byteorder", - "libc", - "netlink-packet-utils", -] - -[[package]] -name = "netlink-packet-route" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea993e32c77d87f01236c38f572ecb6c311d592e56a06262a007fd2a6e31253c" -dependencies = [ - "anyhow", - "bitflags 1.3.2", - "byteorder", - "libc", - "netlink-packet-core", - "netlink-packet-utils", -] - -[[package]] -name = "netlink-packet-utils" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ede8a08c71ad5a95cdd0e4e52facd37190977039a4704eb82a283f713747d34" -dependencies = [ - "anyhow", - "byteorder", - "paste", - "thiserror", -] - -[[package]] -name = "netlink-sys" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "416060d346fbaf1f23f9512963e3e878f1a78e707cb699ba9215761754244307" -dependencies = [ - "bytes", - "libc", - "log", -] - -[[package]] -name = "nix" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" -dependencies = [ - "bitflags 1.3.2", - "cc", - "cfg-if 1.0.0", - "libc", - "memoffset 0.6.5", -] - -[[package]] -name = "nix" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" -dependencies = [ - "bitflags 1.3.2", - "cfg-if 1.0.0", - "libc", - "memoffset 0.7.1", -] - -[[package]] -name = "nix" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" -dependencies = [ - "bitflags 2.6.0", - "cfg-if 1.0.0", - "cfg_aliases 0.1.1", - "libc", - "memoffset 0.9.1", -] - -[[package]] -name = "nix" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" -dependencies = [ - "bitflags 2.6.0", - "cfg-if 1.0.0", - "cfg_aliases 0.2.1", - "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 = "ntapi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" -dependencies = [ - "winapi 0.3.9", -] - -[[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-bigint" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" -dependencies = [ - "num-integer", - "num-traits 0.2.19", -] - -[[package]] -name = "num-complex" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" -dependencies = [ - "num-traits 0.2.19", -] - -[[package]] -name = "num-conv" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" - -[[package]] -name = "num-derive" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" -dependencies = [ - "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 1.0.109", -] - -[[package]] -name = "num-derive" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" -dependencies = [ - "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.68", -] - -[[package]] -name = "num-integer" -version = "0.1.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" -dependencies = [ - "num-traits 0.2.19", -] - -[[package]] -name = "num-rational" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" -dependencies = [ - "autocfg 1.3.0", - "num-integer", - "num-traits 0.2.19", -] - -[[package]] -name = "num-traits" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" -dependencies = [ - "num-traits 0.2.19", -] - -[[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -dependencies = [ - "autocfg 1.3.0", -] - -[[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.9", - "libc", -] - -[[package]] -name = "num_enum" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" -dependencies = [ - "num_enum_derive 0.5.11", -] - -[[package]] -name = "num_enum" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" -dependencies = [ - "num_enum_derive 0.7.2", -] - -[[package]] -name = "num_enum_derive" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 1.0.109", -] - -[[package]] -name = "num_enum_derive" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" -dependencies = [ - "proc-macro-crate 2.0.2", - "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.68", -] - -[[package]] -name = "num_threads" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" -dependencies = [ - "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-foundation" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" -dependencies = [ - "block", - "objc", - "objc_id", -] - -[[package]] -name = "objc-sys" -version = "0.2.0-beta.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7" - -[[package]] -name = "objc-sys" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" - -[[package]] -name = "objc2" -version = "0.3.0-beta.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a49f420f16c8814efdcd6b4258664de9d9920cbc26b6f95d034a1ca9850ccc2c" -dependencies = [ - "block2 0.2.0-alpha.6", - "objc-sys 0.2.0-beta.2", - "objc2-encode 2.0.0-pre.2", -] - -[[package]] -name = "objc2" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" -dependencies = [ - "objc-sys 0.3.5", - "objc2-encode 4.0.3", -] - -[[package]] -name = "objc2-app-kit" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" -dependencies = [ - "bitflags 2.6.0", - "block2 0.5.1", - "libc", - "objc2 0.5.2", - "objc2-core-data", - "objc2-core-image", - "objc2-foundation", - "objc2-quartz-core", -] - -[[package]] -name = "objc2-core-data" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" -dependencies = [ - "bitflags 2.6.0", - "block2 0.5.1", - "objc2 0.5.2", - "objc2-foundation", -] - -[[package]] -name = "objc2-core-image" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" -dependencies = [ - "block2 0.5.1", - "objc2 0.5.2", - "objc2-foundation", - "objc2-metal", -] - -[[package]] -name = "objc2-encode" -version = "2.0.0-pre.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512" -dependencies = [ - "objc-sys 0.2.0-beta.2", -] - -[[package]] -name = "objc2-encode" -version = "4.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" - -[[package]] -name = "objc2-foundation" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" -dependencies = [ - "bitflags 2.6.0", - "block2 0.5.1", - "libc", - "objc2 0.5.2", -] - -[[package]] -name = "objc2-metal" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" -dependencies = [ - "bitflags 2.6.0", - "block2 0.5.1", - "objc2 0.5.2", - "objc2-foundation", -] - -[[package]] -name = "objc2-quartz-core" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" -dependencies = [ - "bitflags 2.6.0", - "block2 0.5.1", - "objc2 0.5.2", - "objc2-foundation", - "objc2-metal", -] - -[[package]] -name = "objc_exception" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" -dependencies = [ - "cc", -] - -[[package]] -name = "objc_id" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" -dependencies = [ - "objc", -] - -[[package]] -name = "object" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" -dependencies = [ - "memchr", -] - -[[package]] -name = "oboe" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8b61bebd49e5d43f5f8cc7ee2891c16e0f41ec7954d36bcb6c14c5e0de867fb" -dependencies = [ - "jni 0.21.1", - "ndk 0.8.0", - "ndk-context", - "num-derive 0.4.2", - "num-traits 0.2.19", - "oboe-sys", -] - -[[package]] -name = "oboe-sys" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8bb09a4a2b1d668170cfe0a7d5bc103f8999fb316c98099b6a9939c9f2e79d" -dependencies = [ - "cc", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "openssl" -version = "0.10.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" -dependencies = [ - "bitflags 2.6.0", - "cfg-if 1.0.0", - "foreign-types 0.3.2", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.68", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-sys" -version = "0.9.102" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - -[[package]] -name = "ordered-multimap" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a" -dependencies = [ - "dlv-list", - "hashbrown 0.12.3", -] - -[[package]] -name = "ordered-stream" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" -dependencies = [ - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "os-version" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a8a1fed76ac765e39058ca106b6229a93c5a60292a1bd4b602ce2be11e1c020" -dependencies = [ - "anyhow", - "plist", - "uname", - "winapi 0.3.9", -] - -[[package]] -name = "os_info" -version = "3.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092" -dependencies = [ - "log", - "serde 1.0.203", - "windows-sys 0.52.0", -] - -[[package]] -name = "os_pipe" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29d73ba8daf8fac13b0501d1abeddcfe21ba7401ada61a819144b6c2a4f32209" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "osascript" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38731fa859ef679f1aec66ca9562165926b442f298467f76f5990f431efe87dc" -dependencies = [ - "serde 1.0.203", - "serde_derive", - "serde_json 1.0.118", -] - -[[package]] -name = "page_size" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b7663cbd190cfd818d08efa8497f6cd383076688c49a391ef7c0d03cd12b561" -dependencies = [ - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "pam" -version = "0.7.0" -source = "git+https://github.com/rustdesk-org/pam#7bfd25510202cd269292cbdd7c71f3977a6fd762" -dependencies = [ - "libc", - "pam-macros", - "pam-sys", - "users 0.10.0", -] - -[[package]] -name = "pam-macros" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c94f3b9b97df3c6d4e51a14916639b24e02c7d15d1dba686ce9b1118277cb811" -dependencies = [ - "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 1.0.109", -] - -[[package]] -name = "pam-sys" -version = "1.0.0-alpha4" -source = "git+https://github.com/rustdesk-org/pam-sys?branch=fix/v1.0.0-alpha4_gnuc_va_list#3337c9bb9a9c68d7497ec8c93cad2368c26091b7" -dependencies = [ - "bindgen 0.59.2", - "libc", -] - -[[package]] -name = "pango" -version = "0.18.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ca27ec1eb0457ab26f3036ea52229edbdb74dee1edd29063f5b9b010e7ebee4" -dependencies = [ - "gio", - "glib 0.18.5", - "libc", - "once_cell", - "pango-sys", -] - -[[package]] -name = "pango-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" -dependencies = [ - "glib-sys 0.18.1", - "gobject-sys 0.18.0", - "libc", - "system-deps 6.2.2", -] - -[[package]] -name = "parity-tokio-ipc" -version = "0.7.3-4" -source = "git+https://github.com/rustdesk-org/parity-tokio-ipc#3623ec9ebef50c9b118e03b03df831008a4d1441" -dependencies = [ - "futures", - "libc", - "log", - "rand 0.8.5", - "tokio", - "winapi 0.3.9", -] - -[[package]] -name = "parking" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" - -[[package]] -name = "parking_lot" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "redox_syscall 0.5.2", - "smallvec", - "windows-targets 0.52.5", -] - -[[package]] -name = "password-hash" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" -dependencies = [ - "base64ct", - "rand_core 0.6.4", - "subtle", -] - -[[package]] -name = "paste" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" - -[[package]] -name = "pbkdf2" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" -dependencies = [ - "digest", - "hmac", - "password-hash", - "sha2", -] - -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "petgraph" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" -dependencies = [ - "fixedbitset", - "indexmap", -] - -[[package]] -name = "phf" -version = "0.7.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18" -dependencies = [ - "phf_shared", -] - -[[package]] -name = "phf_codegen" -version = "0.7.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e" -dependencies = [ - "phf_generator", - "phf_shared", -] - -[[package]] -name = "phf_generator" -version = "0.7.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662" -dependencies = [ - "phf_shared", - "rand 0.6.5", -] - -[[package]] -name = "phf_shared" -version = "0.7.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0" -dependencies = [ - "siphasher", -] - -[[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 1.0.86", - "quote 1.0.36", - "syn 2.0.68", -] - -[[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" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "piper" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" -dependencies = [ - "atomic-waker", - "fastrand 2.1.0", - "futures-io", -] - -[[package]] -name = "pkg-config" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" - -[[package]] -name = "plist" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9d34169e64b3c7a80c8621a48adaf44e0cf62c78a9b25dd9dd35f1881a17cf9" -dependencies = [ - "base64 0.21.7", - "indexmap", - "line-wrap", - "quick-xml 0.31.0", - "serde 1.0.203", - "time 0.3.36", -] - -[[package]] -name = "png" -version = "0.17.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" -dependencies = [ - "bitflags 1.3.2", - "crc32fast", - "fdeflate", - "flate2", - "miniz_oxide", -] - -[[package]] -name = "polling" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" -dependencies = [ - "autocfg 1.3.0", - "bitflags 1.3.2", - "cfg-if 1.0.0", - "concurrent-queue", - "libc", - "log", - "pin-project-lite", - "windows-sys 0.48.0", -] - -[[package]] -name = "polling" -version = "3.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" -dependencies = [ - "cfg-if 1.0.0", - "concurrent-queue", - "hermit-abi 0.4.0", - "pin-project-lite", - "rustix 0.38.34", - "tracing", - "windows-sys 0.52.0", -] - -[[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 = "pretty-hex" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5c99d529f0d30937f6f4b8a86d988047327bb88d04d2c4afc356de74722131" - -[[package]] -name = "prettyplease" -version = "0.2.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" -dependencies = [ - "proc-macro2 1.0.86", - "syn 2.0.68", -] - -[[package]] -name = "primal-check" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc0d895b311e3af9902528fbb8f928688abbd95872819320517cc24ca6b2bd08" -dependencies = [ - "num-integer", -] - -[[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-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit 0.19.15", -] - -[[package]] -name = "proc-macro-crate" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b00f26d3400549137f92511a46ac1cd8ce37cb5598a96d382381458b992a5d24" -dependencies = [ - "toml_datetime", - "toml_edit 0.20.2", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2 1.0.86", - "quote 1.0.36", - "version_check", -] - -[[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.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "protobuf" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df67496db1a89596beaced1579212e9b7c53c22dca1d9745de00ead76573d514" -dependencies = [ - "bytes", - "once_cell", - "protobuf-support", - "thiserror", -] - -[[package]] -name = "protobuf-codegen" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eab09155fad2d39333d3796f67845d43e29b266eea74f7bc93f153f707f126dc" -dependencies = [ - "anyhow", - "once_cell", - "protobuf", - "protobuf-parse", - "regex", - "tempfile", - "thiserror", -] - -[[package]] -name = "protobuf-parse" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a16027030d4ec33e423385f73bb559821827e9ec18c50e7874e4d6de5a4e96f" -dependencies = [ - "anyhow", - "indexmap", - "log", - "protobuf", - "protobuf-support", - "tempfile", - "thiserror", - "which", -] - -[[package]] -name = "protobuf-support" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70e2d30ab1878b2e72d1e2fc23ff5517799c9929e2cf81a8516f9f4dcf2b9cf3" -dependencies = [ - "thiserror", -] - -[[package]] -name = "qoi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" -dependencies = [ - "bytemuck", -] - -[[package]] -name = "qrcode-generator" -version = "4.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d06cb9646c7a14096231a2474d7f21e5e8c13de090c68d13bde6157cfe7f159" -dependencies = [ - "html-escape", - "image 0.24.9", - "qrcodegen", -] - -[[package]] -name = "qrcodegen" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4339fc7a1021c9c1621d87f5e3505f2805c8c105420ba2f2a4df86814590c142" - -[[package]] -name = "quest" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "556af5f5c953a2ee13f45753e581a38f9778e6551bc3ccc56d90b14628fe59d8" -dependencies = [ - "cfg-if 0.1.10", - "rpassword 2.1.0", - "tempfile", - "termios", - "winapi 0.3.9", -] - -[[package]] -name = "quick-xml" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" -dependencies = [ - "memchr", -] - -[[package]] -name = "quick-xml" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" -dependencies = [ - "memchr", -] - -[[package]] -name = "quick-xml" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f24d770aeca0eacb81ac29dfbc55ebcc09312fdd1f8bbecdc7e4a84e000e3b4" -dependencies = [ - "memchr", -] - -[[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.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" -dependencies = [ - "proc-macro2 1.0.86", -] - -[[package]] -name = "radium" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" - -[[package]] -name = "rand" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" -dependencies = [ - "autocfg 0.1.8", - "libc", - "rand_chacha 0.1.1", - "rand_core 0.4.2", - "rand_hc", - "rand_isaac", - "rand_jitter", - "rand_os", - "rand_pcg", - "rand_xorshift", - "winapi 0.3.9", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" -dependencies = [ - "autocfg 0.1.8", - "rand_core 0.3.1", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -dependencies = [ - "rand_core 0.4.2", -] - -[[package]] -name = "rand_core" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rand_hc" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "rand_isaac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "rand_jitter" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" -dependencies = [ - "libc", - "rand_core 0.4.2", - "winapi 0.3.9", -] - -[[package]] -name = "rand_os" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" -dependencies = [ - "cloudabi", - "fuchsia-cprng", - "libc", - "rand_core 0.4.2", - "rdrand", - "winapi 0.3.9", -] - -[[package]] -name = "rand_pcg" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" -dependencies = [ - "autocfg 0.1.8", - "rand_core 0.4.2", -] - -[[package]] -name = "rand_xorshift" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "raw-window-handle" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" - -[[package]] -name = "raw-window-handle" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" - -[[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 = "rdev" -version = "0.5.0-2" -source = "git+https://github.com/rustdesk-org/rdev#961d25cc00c6b3ef80f444e6a7bed9872e2c35ea" -dependencies = [ - "cocoa 0.24.1", - "core-foundation 0.9.4", - "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.22.3", - "dispatch", - "enum-map", - "epoll", - "inotify", - "lazy_static", - "libc", - "log", - "mio", - "strum 0.24.1", - "strum_macros 0.24.3", - "widestring", - "winapi 0.3.9", - "x11 2.21.0", -] - -[[package]] -name = "rdrand" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "realfft" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953d9f7e5cdd80963547b456251296efc2626ed4e3cbf36c869d9564e0220571" -dependencies = [ - "rustfft", -] - -[[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_syscall" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" -dependencies = [ - "bitflags 2.6.0", -] - -[[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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" - -[[package]] -name = "repng" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd57cd2cb5cc699b3eb4824d654e5a32f3bc013766da4966f71fe94805abbda" -dependencies = [ - "byteorder", - "flate2", -] - -[[package]] -name = "reqwest" -version = "0.11.23" -source = "git+https://github.com/rustdesk-org/reqwest#9cb758c9fb2f4edc62eb790acfd45a6a3da21ed3" -dependencies = [ - "async-compression", - "base64 0.21.7", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-rustls", - "hyper-tls", - "ipnet", - "js-sys", - "log", - "mime", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls 0.21.12", - "rustls-native-certs 0.6.3", - "rustls-pemfile 1.0.4", - "serde 1.0.203", - "serde_json 1.0.118", - "serde_urlencoded", - "sync_wrapper", - "system-configuration", - "tokio", - "tokio-native-tls", - "tokio-rustls 0.24.1", - "tokio-socks 0.5.1", - "tokio-util", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "webpki-roots 0.25.4", - "winreg 0.50.0", -] - -[[package]] -name = "ring" -version = "0.17.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" -dependencies = [ - "cc", - "cfg-if 1.0.0", - "getrandom", - "libc", - "spin", - "untrusted", - "windows-sys 0.52.0", -] - -[[package]] -name = "ringbuf" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79abed428d1fd2a128201cec72c5f6938e2da607c6f3745f769fabea399d950a" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "rpassword" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d37473170aedbe66ffa3ad3726939ba677d83c646ad4fd99e5b4bc38712f45ec" -dependencies = [ - "kernel32-sys", - "libc", - "winapi 0.2.8", -] - -[[package]] -name = "rpassword" -version = "7.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80472be3c897911d0137b2d2b9055faf6eeac5b14e324073d83bc17b191d7e3f" -dependencies = [ - "libc", - "rtoolbox", - "windows-sys 0.48.0", -] - -[[package]] -name = "rtoolbox" -version = "0.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c247d24e63230cdb56463ae328478bd5eac8b8faa8c69461a77e8e323afac90e" -dependencies = [ - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "rubato" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd70209c27d5b08f5528bdc779ea3ffb418954e28987f9f9775c6eac41003f9c" -dependencies = [ - "num-complex", - "num-integer", - "num-traits 0.2.19", - "realfft", -] - -[[package]] -name = "runas" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b96d6b6c505282b007a9b009f2aa38b2fd0359b81a0430ceacc60f69ade4c6a0" -dependencies = [ - "libc", - "security-framework-sys", - "which", - "windows-sys 0.48.0", -] - -[[package]] -name = "rust-ini" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df" -dependencies = [ - "cfg-if 1.0.0", - "ordered-multimap", -] - -[[package]] -name = "rust-pulsectl" -version = "0.2.12" -source = "git+https://github.com/open-trade/pulsectl#5e68f4c2b7c644fa321984688602d71e8ad0bba3" -dependencies = [ - "libpulse-binding", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" - -[[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.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] -name = "rustdesk" -version = "1.3.2" -dependencies = [ - "android-wakelock", - "android_logger", - "arboard", - "async-process", - "async-trait", - "bytes", - "cc", - "cfg-if 1.0.0", - "chrono", - "cidr-utils", - "clap 4.5.8", - "clipboard", - "clipboard-master", - "cocoa 0.24.1", - "core-foundation 0.9.4", - "core-graphics 0.22.3", - "cpal", - "crossbeam-queue", - "ctrlc", - "dasp", - "dbus", - "dbus-crossroads", - "default-net", - "dispatch", - "enigo", - "errno", - "evdev", - "flutter_rust_bridge", - "fon", - "fruitbasket", - "gtk", - "hbb_common", - "hex", - "hound", - "image 0.24.9", - "impersonate_system", - "include_dir", - "jni 0.21.1", - "keepawake", - "lazy_static", - "libloading 0.8.4", - "libpulse-binding", - "libpulse-simple-binding", - "mac_address", - "magnum-opus", - "nix 0.29.0", - "num_cpus", - "objc", - "objc_id", - "once_cell", - "os-version", - "pam", - "parity-tokio-ipc", - "percent-encoding", - "qrcode-generator", - "rdev", - "repng", - "reqwest", - "ringbuf", - "rpassword 7.3.1", - "rubato", - "runas", - "rust-pulsectl", - "samplerate", - "sciter-rs", - "scrap", - "serde 1.0.203", - "serde_derive", - "serde_json 1.0.118", - "serde_repr", - "sha2", - "shared_memory", - "shutdown_hooks", - "sys-locale", - "system_shutdown", - "tao", - "tauri-winrt-notification", - "termios", - "totp-rs", - "tray-icon", - "url", - "users 0.11.0", - "uuid", - "virtual_display", - "wallpaper", - "whoami", - "winapi 0.3.9", - "windows-service", - "winreg 0.11.0", - "winres", - "wol-rs", - "x11-clipboard 0.8.1", - "x11rb 0.12.0", - "zip", -] - -[[package]] -name = "rustdesk-portable-packer" -version = "1.3.2" -dependencies = [ - "brotli", - "dirs 5.0.1", - "md5", - "native-windows-gui", - "winapi 0.3.9", - "winres", -] - -[[package]] -name = "rustfft" -version = "6.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43806561bc506d0c5d160643ad742e3161049ac01027b5e6d7524091fd401d86" -dependencies = [ - "num-complex", - "num-integer", - "num-traits 0.2.19", - "primal-check", - "strength_reduce", - "transpose", - "version_check", -] - -[[package]] -name = "rustix" -version = "0.37.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustix" -version = "0.38.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" -dependencies = [ - "bitflags 2.6.0", - "errno", - "libc", - "linux-raw-sys 0.4.14", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustls" -version = "0.21.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" -dependencies = [ - "log", - "ring", - "rustls-webpki 0.101.7", - "sct", -] - -[[package]] -name = "rustls" -version = "0.23.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402" -dependencies = [ - "log", - "once_cell", - "ring", - "rustls-pki-types", - "rustls-webpki 0.102.4", - "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-native-certs" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" -dependencies = [ - "openssl-probe", - "rustls-pemfile 2.1.2", - "rustls-pki-types", - "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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" -dependencies = [ - "base64 0.22.1", - "rustls-pki-types", -] - -[[package]] -name = "rustls-pki-types" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" - -[[package]] -name = "rustls-platform-verifier" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e3beb939bcd33c269f4bf946cc829fcd336370267c4a927ac0399c84a3151a1" -dependencies = [ - "core-foundation 0.9.4", - "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", - "jni 0.19.0", - "log", - "once_cell", - "rustls 0.23.10", - "rustls-native-certs 0.7.0", - "rustls-platform-verifier-android", - "rustls-webpki 0.102.4", - "security-framework", - "security-framework-sys", - "webpki-roots 0.26.3", - "winapi 0.3.9", -] - -[[package]] -name = "rustls-platform-verifier-android" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84e217e7fdc8466b5b35d30f8c0a30febd29173df4a3a0c2115d306b9c4117ad" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" -dependencies = [ - "ring", - "rustls-pki-types", - "untrusted", -] - -[[package]] -name = "rustversion" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" - -[[package]] -name = "ryu" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" - -[[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 = "samplerate" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e032b2b24715c4f982f483ea3abdb3c9ba444d9f63e87b2843d6f998f5ba2698" -dependencies = [ - "libsamplerate-sys", -] - -[[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 = "sciter-rs" -version = "0.5.57" -source = "git+https://github.com/open-trade/rust-sciter?branch=dyn#5322f3a755a0e6bf999fbc60d1efc35246c0f821" -dependencies = [ - "lazy_static", - "libc", - "objc", - "objc-foundation", -] - -[[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 = "scrap" -version = "0.5.0" -dependencies = [ - "android_logger", - "bindgen 0.65.1", - "block", - "cfg-if 1.0.0", - "dbus", - "docopt", - "gstreamer", - "gstreamer-app", - "gstreamer-video", - "hbb_common", - "hwcodec", - "jni 0.21.1", - "lazy_static", - "log", - "ndk 0.7.0", - "ndk-context", - "num_cpus", - "pkg-config", - "quest", - "repng", - "serde 1.0.203", - "serde_json 1.0.118", - "target_build_utils", - "tracing", - "webm", - "winapi 0.3.9", -] - -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "security-framework" -version = "2.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" -dependencies = [ - "bitflags 1.3.2", - "core-foundation 0.9.4", - "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", - "libc", - "num-bigint", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" -dependencies = [ - "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", - "libc", -] - -[[package]] -name = "semver" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" - -[[package]] -name = "serde" -version = "0.9.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af" - -[[package]] -name = "serde" -version = "1.0.203" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.203" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" -dependencies = [ - "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.68", -] - -[[package]] -name = "serde_json" -version = "0.9.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8bcf487be7d2e15d3d543f04312de991d631cfe1b43ea0ade69e6a8a5b16a1" -dependencies = [ - "dtoa", - "itoa 0.3.4", - "num-traits 0.1.43", - "serde 0.9.15", -] - -[[package]] -name = "serde_json" -version = "1.0.118" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d947f6b3163d8857ea16c4fa0dd4840d52f3041039a85decd46867eb1abef2e4" -dependencies = [ - "itoa 1.0.11", - "ryu", - "serde 1.0.203", -] - -[[package]] -name = "serde_repr" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" -dependencies = [ - "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.68", -] - -[[package]] -name = "serde_spanned" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" -dependencies = [ - "serde 1.0.203", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa 1.0.11", - "ryu", - "serde 1.0.203", -] - -[[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 = "shadow-rs" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427f07ab5f873000cf55324882e12a88c0a7ea7025df4fc1e7e35e688877a583" -dependencies = [ - "const_format", - "git2", - "is_debug", - "time 0.3.36", - "tzdb 0.5.10", -] - -[[package]] -name = "shared_memory" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba8593196da75d9dc4f69349682bd4c2099f8cde114257d1ef7ef1b33d1aba54" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "nix 0.23.2", - "rand 0.8.5", - "win-sys", -] - -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[package]] -name = "shutdown_hooks" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6057adedbec913419c92996f395ba69931acbd50b7d56955394cd3f7bedbfa45" - -[[package]] -name = "signal-hook-registry" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" -dependencies = [ - "libc", -] - -[[package]] -name = "signature" -version = "1.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" - -[[package]] -name = "simd-adler32" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" - -[[package]] -name = "siphasher" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" - -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg 1.3.0", -] - -[[package]] -name = "smallvec" -version = "1.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - -[[package]] -name = "socket2" -version = "0.3.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "socket2" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "socket2" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "sodiumoxide" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e26be3acb6c2d9a7aac28482586a7856436af4cfe7100031d219de2d2ecb0028" -dependencies = [ - "ed25519", - "libc", - "libsodium-sys", - "serde 1.0.203", -] - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "strength_reduce" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe895eb47f22e2ddd4dabc02bce419d2e643c8e3b585c78158b349195bc24d82" - -[[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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - -[[package]] -name = "strum" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bd81eb48f4c437cadc685403cad539345bf703d78e63707418431cecd4522b" - -[[package]] -name = "strum" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" - -[[package]] -name = "strum_macros" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87c85aa3f8ea653bfd3ddf25f7ee357ee4d204731f6aa9ad04002306f6e2774c" -dependencies = [ - "heck 0.3.3", - "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 1.0.109", -] - -[[package]] -name = "strum_macros" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" -dependencies = [ - "heck 0.4.1", - "proc-macro2 1.0.86", - "quote 1.0.36", - "rustversion", - "syn 1.0.109", -] - -[[package]] -name = "subtle" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" - -[[package]] -name = "syn" -version = "0.15.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "unicode-xid 0.1.0", -] - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2 1.0.86", - "quote 1.0.36", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" -dependencies = [ - "proc-macro2 1.0.86", - "quote 1.0.36", - "unicode-ident", -] - -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - -[[package]] -name = "sys-locale" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0" -dependencies = [ - "libc", -] - -[[package]] -name = "sysinfo" -version = "0.29.10" -source = "git+https://github.com/rustdesk-org/sysinfo?branch=rlim_max#90b1705d909a4902dbbbdea37ee64db17841077d" -dependencies = [ - "cfg-if 1.0.0", - "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", - "libc", - "ntapi", - "once_cell", - "rayon", - "windows 0.51.1", -] - -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation 0.9.4", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", - "libc", -] - -[[package]] -name = "system-deps" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3ecc17269a19353b3558b313bba738b25d82993e30d62a18406a24aba4649b" -dependencies = [ - "heck 0.3.3", - "pkg-config", - "strum 0.18.0", - "strum_macros 0.18.0", - "thiserror", - "toml 0.5.11", - "version-compare 0.0.10", -] - -[[package]] -name = "system-deps" -version = "6.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" -dependencies = [ - "cfg-expr", - "heck 0.5.0", - "pkg-config", - "toml 0.8.2", - "version-compare 0.2.0", -] - -[[package]] -name = "system_shutdown" -version = "4.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7567f71160af5e9abfb4f5a21532cf2174cefe91ac5c336419295685a695cc66" -dependencies = [ - "windows 0.44.0", - "zbus", -] - -[[package]] -name = "tao" -version = "0.25.0" -source = "git+https://github.com/rustdesk-org/tao?branch=dev#288c219cb0527e509590c2b2d8e7072aa9feb2d3" -dependencies = [ - "bitflags 1.3.2", - "cc", - "cocoa 0.25.0", - "core-foundation 0.9.4", - "core-graphics 0.23.2", - "crossbeam-channel", - "dispatch", - "gdkwayland-sys", - "gdkx11-sys", - "gtk", - "image 0.24.9", - "instant", - "jni 0.21.1", - "lazy_static", - "libc", - "log", - "ndk 0.7.0", - "ndk-context", - "ndk-sys 0.4.1+23.1.7779620", - "objc", - "once_cell", - "parking_lot", - "png", - "raw-window-handle 0.6.2", - "scopeguard", - "tao-macros", - "unicode-segmentation", - "url", - "windows 0.52.0", - "windows-implement", - "windows-version", - "x11-dl", - "zbus", -] - -[[package]] -name = "tao-macros" -version = "0.1.2" -source = "git+https://github.com/rustdesk-org/tao?branch=dev#288c219cb0527e509590c2b2d8e7072aa9feb2d3" -dependencies = [ - "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 1.0.109", -] - -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - -[[package]] -name = "target-lexicon" -version = "0.12.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" - -[[package]] -name = "target_build_utils" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "013d134ae4a25ee744ad6129db589018558f620ddfa44043887cdd45fa08e75c" -dependencies = [ - "phf", - "phf_codegen", - "serde_json 0.9.10", -] - -[[package]] -name = "tauri-winrt-notification" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006851c9ccefa3c38a7646b8cec804bb429def3da10497bfa977179869c3e8e2" -dependencies = [ - "quick-xml 0.30.0", - "windows 0.51.1", -] - -[[package]] -name = "tempfile" -version = "3.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" -dependencies = [ - "cfg-if 1.0.0", - "fastrand 2.1.0", - "rustix 0.38.34", - "windows-sys 0.52.0", -] - -[[package]] -name = "termcolor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "termios" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "411c5bf740737c7918b8b1fe232dca4dc9f8e754b8ad5e20966814001ed0ac6b" -dependencies = [ - "libc", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "tfc" -version = "0.7.0" -source = "git+https://github.com/rustdesk-org/The-Fat-Controller?branch=history/rebase_upstream_20240722#de9c8ba480f166a9fc90aaa47bb0e84b443ea9c6" -dependencies = [ - "anyhow", - "core-graphics 0.23.2", - "unicode-segmentation", - "winapi 0.3.9", - "x11 2.19.0", -] - -[[package]] -name = "thiserror" -version = "1.0.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" -dependencies = [ - "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.68", -] - -[[package]] -name = "threadpool" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" -dependencies = [ - "num_cpus", -] - -[[package]] -name = "tiff" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" -dependencies = [ - "flate2", - "jpeg-decoder", - "weezl", -] - -[[package]] -name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi 0.3.9", -] - -[[package]] -name = "time" -version = "0.3.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" -dependencies = [ - "deranged", - "itoa 1.0.11", - "libc", - "num-conv", - "num_threads", - "powerfmt", - "serde 1.0.203", - "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.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" -dependencies = [ - "num-conv", - "time-core", -] - -[[package]] -name = "tinyvec" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82" -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 = "tokio" -version = "1.38.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "num_cpus", - "parking_lot", - "pin-project-lite", - "signal-hook-registry", - "socket2 0.5.7", - "tokio-macros", - "windows-sys 0.48.0", -] - -[[package]] -name = "tokio-macros" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" -dependencies = [ - "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.68", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-rustls" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" -dependencies = [ - "rustls 0.21.12", - "tokio", -] - -[[package]] -name = "tokio-rustls" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" -dependencies = [ - "rustls 0.23.10", - "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-socks" -version = "0.5.2-1" -source = "git+https://github.com/rustdesk-org/tokio-socks#94e97c6d7c93b0bcbfa54f2dc397c1da0a6e43d3" -dependencies = [ - "bytes", - "either", - "futures-core", - "futures-sink", - "futures-util", - "pin-project", - "thiserror", - "tokio", - "tokio-util", -] - -[[package]] -name = "tokio-util" -version = "0.7.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" -dependencies = [ - "bytes", - "futures-core", - "futures-io", - "futures-sink", - "futures-util", - "hashbrown 0.14.5", - "pin-project-lite", - "slab", - "tokio", -] - -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde 1.0.203", -] - -[[package]] -name = "toml" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" -dependencies = [ - "serde 1.0.203", - "serde_spanned", - "toml_datetime", - "toml_edit 0.19.15", -] - -[[package]] -name = "toml" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" -dependencies = [ - "serde 1.0.203", - "serde_spanned", - "toml_datetime", - "toml_edit 0.20.2", -] - -[[package]] -name = "toml_datetime" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" -dependencies = [ - "serde 1.0.203", -] - -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap", - "serde 1.0.203", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "toml_edit" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" -dependencies = [ - "indexmap", - "serde 1.0.203", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "totp-rs" -version = "5.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c4ae9724c5888c0417d2396037ed3b60665925624766416e3e342b6ba5dbd3f" -dependencies = [ - "base32", - "constant_time_eq 0.2.6", - "hmac", - "rand 0.8.5", - "sha1", - "sha2", - "url", - "urlencoding", -] - -[[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.86", - "quote 1.0.36", - "syn 2.0.68", -] - -[[package]] -name = "tracing-core" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", -] - -[[package]] -name = "transpose" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad61aed86bc3faea4300c7aee358b4c6d0c8d6ccc36524c96e4c92ccf26e77e" -dependencies = [ - "num-integer", - "strength_reduce", -] - -[[package]] -name = "tray-icon" -version = "0.14.3" -source = "git+https://github.com/tauri-apps/tray-icon#d4078696edba67b0ab42cef67e6a421a0332c96f" -dependencies = [ - "core-graphics 0.23.2", - "crossbeam-channel", - "dirs 5.0.1", - "libappindicator", - "muda", - "objc2 0.5.2", - "objc2-app-kit", - "objc2-foundation", - "once_cell", - "png", - "thiserror", - "windows-sys 0.52.0", -] - -[[package]] -name = "tree_magic_mini" -version = "3.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469a727cac55b41448315cc10427c069c618ac59bb6a4480283fcd811749bdc2" -dependencies = [ - "fnv", - "home", - "memchr", - "nom", - "once_cell", - "petgraph", -] - -[[package]] -name = "try-lock" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "tz-rs" -version = "0.6.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33851b15c848fad2cf4b105c6bb66eb9512b6f6c44a4b13f57c53c73c707e2b4" -dependencies = [ - "const_fn", -] - -[[package]] -name = "tzdb" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a18ee5bde3433d683d41859650804a5ad89cad17f153a53f1e6a96e0da2d969" -dependencies = [ - "iana-time-zone", - "tz-rs", - "tzdb 0.6.1", -] - -[[package]] -name = "tzdb" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b580f6b365fa89f5767cdb619a55d534d04a4e14c2d7e5b9a31e94598687fb1" -dependencies = [ - "iana-time-zone", - "tz-rs", - "tzdb_data", -] - -[[package]] -name = "tzdb_data" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1889fdffac09d65c1d95c42d5202e9b21ad8c758f426e9fe09088817ea998d6" -dependencies = [ - "tz-rs", -] - -[[package]] -name = "uds_windows" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" -dependencies = [ - "memoffset 0.9.1", - "tempfile", - "winapi 0.3.9", -] - -[[package]] -name = "uname" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b72f89f0ca32e4db1c04e2a72f5345d59796d4866a1ee0609084569f73683dc8" -dependencies = [ - "libc", -] - -[[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-normalization" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] - -[[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.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" - -[[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 = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - -[[package]] -name = "url" -version = "2.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", - "serde 1.0.203", -] - -[[package]] -name = "urlencoding" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" - -[[package]] -name = "users" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4227e95324a443c9fcb06e03d4d85e91aabe9a5a02aa818688b6918b6af486" -dependencies = [ - "libc", - "log", -] - -[[package]] -name = "users" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24cc0f6d6f267b73e5a2cadf007ba8f9bc39c6a6f9666f8cf25ea809a153b032" -dependencies = [ - "libc", - "log", -] - -[[package]] -name = "utf16string" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b62a1e85e12d5d712bf47a85f426b73d303e2d00a90de5f3004df3596e9d216" -dependencies = [ - "byteorder", -] - -[[package]] -name = "utf8-width" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" - -[[package]] -name = "utf8parse" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" - -[[package]] -name = "uuid" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" -dependencies = [ - "getrandom", -] - -[[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-compare" -version = "0.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d63556a25bae6ea31b52e640d7c41d1ab27faba4ccb600013837a3d0b3994ca1" - -[[package]] -name = "version-compare" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "virtual_display" -version = "0.1.0" -dependencies = [ - "hbb_common", - "lazy_static", -] - -[[package]] -name = "waker-fn" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" - -[[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 = "wallpaper" -version = "3.2.0" -source = "git+https://github.com/rustdesk-org/wallpaper.rs#ce4a0cd3f58327c7cc44d15a63706fb0c022bacf" -dependencies = [ - "dirs 5.0.1", - "enquote", - "rust-ini", - "thiserror", - "winapi 0.3.9", - "winreg 0.11.0", -] - -[[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.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 = "wasite" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" - -[[package]] -name = "wasm-bindgen" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" -dependencies = [ - "cfg-if 1.0.0", - "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 1.0.86", - "quote 1.0.36", - "syn 2.0.68", - "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 1.0.0", - "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 1.0.36", - "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 1.0.86", - "quote 1.0.36", - "syn 2.0.68", - "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 = "wayland-backend" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f90e11ce2ca99c97b940ee83edbae9da2d56a08f9ea8158550fd77fa31722993" -dependencies = [ - "cc", - "downcast-rs", - "rustix 0.38.34", - "scoped-tls", - "smallvec", - "wayland-sys", -] - -[[package]] -name = "wayland-client" -version = "0.31.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e321577a0a165911bdcfb39cf029302479d7527b517ee58ab0f6ad09edf0943" -dependencies = [ - "bitflags 2.6.0", - "rustix 0.38.34", - "wayland-backend", - "wayland-scanner", -] - -[[package]] -name = "wayland-protocols" -version = "0.32.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62989625a776e827cc0f15d41444a3cea5205b963c3a25be48ae1b52d6b4daaa" -dependencies = [ - "bitflags 2.6.0", - "wayland-backend", - "wayland-client", - "wayland-scanner", -] - -[[package]] -name = "wayland-protocols-wlr" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd993de54a40a40fbe5601d9f1fbcaef0aebcc5fda447d7dc8f6dcbaae4f8953" -dependencies = [ - "bitflags 2.6.0", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-scanner", -] - -[[package]] -name = "wayland-scanner" -version = "0.31.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7b56f89937f1cf2ee1f1259cf2936a17a1f45d8f0aa1019fae6d470d304cfa6" -dependencies = [ - "proc-macro2 1.0.86", - "quick-xml 0.34.0", - "quote 1.0.36", -] - -[[package]] -name = "wayland-sys" -version = "0.31.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43676fe2daf68754ecf1d72026e4e6c15483198b5d24e888b74d3f22f887a148" -dependencies = [ - "dlib", - "log", - "pkg-config", -] - -[[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 = "webm" -version = "1.1.0" -source = "git+https://github.com/rustdesk-org/rust-webm#d2c4d3ac133c7b0e4c0f656da710b48391981e64" -dependencies = [ - "webm-sys", -] - -[[package]] -name = "webm-sys" -version = "1.0.4" -source = "git+https://github.com/rustdesk-org/rust-webm#d2c4d3ac133c7b0e4c0f656da710b48391981e64" -dependencies = [ - "cc", -] - -[[package]] -name = "webpki-roots" -version = "0.25.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" - -[[package]] -name = "webpki-roots" -version = "0.26.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" -dependencies = [ - "rustls-pki-types", -] - -[[package]] -name = "weezl" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" - -[[package]] -name = "which" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" -dependencies = [ - "either", - "home", - "once_cell", - "rustix 0.38.34", -] - -[[package]] -name = "whoami" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" -dependencies = [ - "redox_syscall 0.4.1", - "wasite", - "web-sys", -] - -[[package]] -name = "widestring" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" - -[[package]] -name = "win-sys" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b7b128a98c1cfa201b09eb49ba285887deb3cbe7466a98850eb1adabb452be5" -dependencies = [ - "windows 0.34.0", -] - -[[package]] -name = "winapi" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" - -[[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-build" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" - -[[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-wsapoll" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1eafc5f679c576995526e81635d0cf9695841736712b4e892f87abbe6fed3f28" -dependencies = [ - "winapi 0.3.9", -] - -[[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.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbedf6db9096bc2364adce0ae0aa636dcd89f3c3f2cd67947062aaf0ca2a10ec" -dependencies = [ - "windows_aarch64_msvc 0.32.0", - "windows_i686_gnu 0.32.0", - "windows_i686_msvc 0.32.0", - "windows_x86_64_gnu 0.32.0", - "windows_x86_64_msvc 0.32.0", -] - -[[package]] -name = "windows" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45296b64204227616fdbf2614cefa4c236b98ee64dfaaaa435207ed99fe7829f" -dependencies = [ - "windows_aarch64_msvc 0.34.0", - "windows_i686_gnu 0.34.0", - "windows_i686_msvc 0.34.0", - "windows_x86_64_gnu 0.34.0", - "windows_x86_64_msvc 0.34.0", -] - -[[package]] -name = "windows" -version = "0.44.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" -dependencies = [ - "windows-targets 0.42.2", -] - -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets 0.48.5", -] - -[[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" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" -dependencies = [ - "windows-core 0.52.0", - "windows-implement", - "windows-interface", - "windows-targets 0.52.5", -] - -[[package]] -name = "windows" -version = "0.54.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" -dependencies = [ - "windows-core 0.54.0", - "windows-targets 0.52.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.5", -] - -[[package]] -name = "windows-core" -version = "0.54.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" -dependencies = [ - "windows-result", - "windows-targets 0.52.5", -] - -[[package]] -name = "windows-implement" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12168c33176773b86799be25e2a2ba07c7aab9968b37541f1094dbd7a60c8946" -dependencies = [ - "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.68", -] - -[[package]] -name = "windows-interface" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d8dc32e0095a7eeccebd0e3f09e9509365ecb3fc6ac4d6f5f14a3f6392942d1" -dependencies = [ - "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.68", -] - -[[package]] -name = "windows-result" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" -dependencies = [ - "windows-targets 0.52.5", -] - -[[package]] -name = "windows-service" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd9db37ecb5b13762d95468a2fc6009d4b2c62801243223aabd44fca13ad13c8" -dependencies = [ - "bitflags 1.3.2", - "widestring", - "windows-sys 0.45.0", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - -[[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.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "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-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-version" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6998aa457c9ba8ff2fb9f13e9d2a930dabcea28f1d0ab94d687d8b3654844515" -dependencies = [ - "windows-targets 0.52.5", -] - -[[package]] -name = "windows-win" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58e23e33622b3b52f948049acbec9bcc34bf6e26d74176b88941f213c75cf2dc" -dependencies = [ - "error-code", -] - -[[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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" - -[[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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" - -[[package]] -name = "windows_i686_gnu" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615" - -[[package]] -name = "windows_i686_gnu" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" - -[[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.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.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172" - -[[package]] -name = "windows_i686_msvc" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" - -[[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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" - -[[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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" - -[[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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" - -[[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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" - -[[package]] -name = "winnow" -version = "0.5.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] - -[[package]] -name = "winreg" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a1a57ff50e9b408431e8f97d5456f2807f8eb2a2cd79b06068fc87f8ecf189" -dependencies = [ - "cfg-if 1.0.0", - "winapi 0.3.9", -] - -[[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 = "winres" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c" -dependencies = [ - "toml 0.5.11", -] - -[[package]] -name = "wl-clipboard-rs" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4de22eebb1d1e2bad2d970086e96da0e12cde0b411321e5b0f7b2a1f876aa26f" -dependencies = [ - "libc", - "log", - "os_pipe", - "rustix 0.38.34", - "tempfile", - "thiserror", - "tree_magic_mini", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-protocols-wlr", -] - -[[package]] -name = "wol-rs" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5a8a033ef9b208ec8b5946761958ed2b2693ac49b04f647fdc013000870b8f" - -[[package]] -name = "wyz" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" -dependencies = [ - "tap", -] - -[[package]] -name = "x11" -version = "2.19.0" -source = "git+https://github.com/bjornsnoen/x11-rs#c2e9bfaa7b196938f8700245564d8ac5d447786a" -dependencies = [ - "libc", - "pkg-config", -] - -[[package]] -name = "x11" -version = "2.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e" -dependencies = [ - "libc", - "pkg-config", -] - -[[package]] -name = "x11-clipboard" -version = "0.8.1" -source = "git+https://github.com/clslaid/x11-clipboard?branch=feat/store-batch#5fc2e73bc01ada3681159b34cf3ea8f0d14cd904" -dependencies = [ - "x11rb 0.12.0", -] - -[[package]] -name = "x11-clipboard" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98785a09322d7446e28a13203d2cae1059a0dd3dfb32cb06d0a225f023d8286" -dependencies = [ - "libc", - "x11rb 0.13.1", -] - -[[package]] -name = "x11-dl" -version = "2.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" -dependencies = [ - "libc", - "once_cell", - "pkg-config", -] - -[[package]] -name = "x11rb" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1641b26d4dec61337c35a1b1aaf9e3cba8f46f0b43636c609ab0291a648040a" -dependencies = [ - "gethostname 0.3.0", - "nix 0.26.4", - "winapi 0.3.9", - "winapi-wsapoll", - "x11rb-protocol 0.12.0", -] - -[[package]] -name = "x11rb" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" -dependencies = [ - "gethostname 0.4.3", - "rustix 0.38.34", - "x11rb-protocol 0.13.1", -] - -[[package]] -name = "x11rb-protocol" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82d6c3f9a0fb6701fab8f6cea9b0c0bd5d6876f1f89f7fada07e558077c344bc" -dependencies = [ - "nix 0.26.4", -] - -[[package]] -name = "x11rb-protocol" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" - -[[package]] -name = "xdg-home" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "zbus" -version = "3.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" -dependencies = [ - "async-broadcast", - "async-executor", - "async-fs", - "async-io 1.13.0", - "async-lock 2.8.0", - "async-process", - "async-recursion", - "async-task", - "async-trait", - "blocking", - "byteorder", - "derivative", - "enumflags2", - "event-listener 2.5.3", - "futures-core", - "futures-sink", - "futures-util", - "hex", - "nix 0.26.4", - "once_cell", - "ordered-stream", - "rand 0.8.5", - "serde 1.0.203", - "serde_repr", - "sha1", - "static_assertions", - "tracing", - "uds_windows", - "winapi 0.3.9", - "xdg-home", - "zbus_macros", - "zbus_names", - "zvariant", -] - -[[package]] -name = "zbus_macros" -version = "3.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2 1.0.86", - "quote 1.0.36", - "regex", - "syn 1.0.109", - "zvariant_utils", -] - -[[package]] -name = "zbus_names" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" -dependencies = [ - "serde 1.0.203", - "static_assertions", - "zvariant", -] - -[[package]] -name = "zerocopy" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854e949ac82d619ee9a14c66a1b674ac730422372ccb759ce0c39cabcf2bf8e6" -dependencies = [ - "byteorder", - "zerocopy-derive 0.6.6", -] - -[[package]] -name = "zerocopy" -version = "0.7.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" -dependencies = [ - "zerocopy-derive 0.7.34", -] - -[[package]] -name = "zerocopy-derive" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "125139de3f6b9d625c39e2efdd73d41bdac468ccd556556440e322be0e1bbd91" -dependencies = [ - "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.68", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" -dependencies = [ - "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.68", -] - -[[package]] -name = "zeroize" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" - -[[package]] -name = "zip" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" -dependencies = [ - "aes", - "byteorder", - "bzip2", - "constant_time_eq 0.1.5", - "crc32fast", - "crossbeam-utils", - "flate2", - "hmac", - "pbkdf2", - "sha1", - "time 0.3.36", - "zstd 0.11.2+zstd.1.5.2", -] - -[[package]] -name = "zstd" -version = "0.11.2+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" -dependencies = [ - "zstd-safe 5.0.2+zstd.1.5.2", -] - -[[package]] -name = "zstd" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a" -dependencies = [ - "zstd-safe 7.1.0", -] - -[[package]] -name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" -dependencies = [ - "libc", - "zstd-sys", -] - -[[package]] -name = "zstd-safe" -version = "7.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a" -dependencies = [ - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "2.0.11+zstd.1.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75652c55c0b6f3e6f12eb786fe1bc960396bf05a1eb3bf1f3691c3610ac2e6d4" -dependencies = [ - "cc", - "pkg-config", -] - -[[package]] -name = "zune-inflate" -version = "0.2.54" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" -dependencies = [ - "simd-adler32", -] - -[[package]] -name = "zvariant" -version = "3.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db" -dependencies = [ - "byteorder", - "enumflags2", - "libc", - "serde 1.0.203", - "static_assertions", - "zvariant_derive", -] - -[[package]] -name = "zvariant_derive" -version = "3.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 1.0.109", - "zvariant_utils", -] - -[[package]] -name = "zvariant_utils" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" -dependencies = [ - "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 1.0.109", -] diff --git a/pkgs/by-name/ru/rustdesk-flutter/build-runner.sh b/pkgs/by-name/ru/rustdesk-flutter/build-runner.sh new file mode 100644 index 000000000000..901372b22d45 --- /dev/null +++ b/pkgs/by-name/ru/rustdesk-flutter/build-runner.sh @@ -0,0 +1,56 @@ +#!@bash@ +packagePath() { + jq --raw-output --arg name "$1" '.packages.[] | select(.name == $name) .rootUri | sub("file://"; "")' .dart_tool/package_config.json +} + +# Runs a Dart executable from a package with a custom path. +# +# Usage: +# packageRunCustom [executable] [bin_dir] +# +# By default, [bin_dir] is "bin", and [executable] is . +# i.e. `packageRunCustom build_runner` is equivalent to `packageRunCustom build_runner build_runner bin`, which runs `bin/build_runner.dart` from the build_runner package. +packageRunCustom() { + local args=() + local passthrough=() + + while [ $# -gt 0 ]; do + if [ "$1" != "--" ]; then + args+=("$1") + shift + else + shift + passthrough=("$@") + break + fi + done + + local name="${args[0]}" + local path="${args[1]:-$name}" + local prefix="${args[2]:-bin}" + + dart --packages=.dart_tool/package_config.json "$(packagePath "$name")/$prefix/$path.dart" "${passthrough[@]}" +} + +# Runs a Dart executable from a package. +# +# Usage: +# packageRun [-e executable] [...] +# +# To run an executable from an unconventional location, use packageRunCustom. +packageRun() { + local name="build_runner" + shift + + local executableName="$name" + if [ "build_runner" = "-e" ]; then + shift + executableName="build_runner" + shift + fi + + fileName="$(yq --raw-output --arg name "$executableName" '.executables.[$name] // $name' "$(packagePath "$name")/pubspec.yaml")" + packageRunCustom "$name" "$fileName" -- "$@" +} + +packageRun build_runner "$@" diff --git a/pkgs/by-name/ru/rustdesk-flutter/ffigen/default.nix b/pkgs/by-name/ru/rustdesk-flutter/ffigen/default.nix new file mode 100644 index 000000000000..13f2a078c34a --- /dev/null +++ b/pkgs/by-name/ru/rustdesk-flutter/ffigen/default.nix @@ -0,0 +1,30 @@ +{ + buildDartApplication, + fetchFromGitHub, + lib, + flutter, +}: + +buildDartApplication rec { + pname = "ffigen"; + version = "8.0.2"; # According to https://github.com/rustdesk/rustdesk/blob/master/build.py#L173. We should use 5.0.1. But It can't run on flutter324. So I found another old version. + + src = fetchFromGitHub { + owner = "dart-lang"; + repo = "native"; + tag = "ffigen-v${version}"; + hash = "sha256-TUtgdT8huyo9sharIMHZ998UzzfMq2gj9Q9aspXYumU="; + }; + + postBuild = '' + mkdir -p $out/bin + ln -s ${flutter}/bin/dart $out/bin/dart + ''; + + sourceRoot = "${src.name}/pkgs/ffigen"; + pubspecLock = lib.importJSON ./ffigen.pubspec.lock.json; + dartEntryPoints."bin/ffigen" = "bin/ffigen.dart"; + + meta.mainProgram = "ffigen"; + meta.license = lib.licenses.bsd3; +} diff --git a/pkgs/by-name/ru/rustdesk-flutter/ffigen/ffigen.pubspec.lock.json b/pkgs/by-name/ru/rustdesk-flutter/ffigen/ffigen.pubspec.lock.json new file mode 100644 index 000000000000..82d05e5241b5 --- /dev/null +++ b/pkgs/by-name/ru/rustdesk-flutter/ffigen/ffigen.pubspec.lock.json @@ -0,0 +1,527 @@ +{ + "packages": { + "_fe_analyzer_shared": { + "dependency": "transitive", + "description": { + "name": "_fe_analyzer_shared", + "sha256": "dc27559385e905ad30838356c5f5d574014ba39872d732111cd07ac0beff4c57", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "80.0.0" + }, + "analyzer": { + "dependency": "transitive", + "description": { + "name": "analyzer", + "sha256": "192d1c5b944e7e53b24b5586db760db934b177d4147c42fbca8c8c5f1eb8d11e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.3.0" + }, + "args": { + "dependency": "direct main", + "description": { + "name": "args", + "sha256": "bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.0" + }, + "async": { + "dependency": "transitive", + "description": { + "name": "async", + "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.13.0" + }, + "boolean_selector": { + "dependency": "transitive", + "description": { + "name": "boolean_selector", + "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "cli_util": { + "dependency": "direct main", + "description": { + "name": "cli_util", + "sha256": "ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.2" + }, + "collection": { + "dependency": "transitive", + "description": { + "name": "collection", + "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.19.1" + }, + "convert": { + "dependency": "transitive", + "description": { + "name": "convert", + "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "coverage": { + "dependency": "transitive", + "description": { + "name": "coverage", + "sha256": "e3493833ea012784c740e341952298f1cc77f1f01b1bbc3eb4eecf6984fb7f43", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.11.1" + }, + "crypto": { + "dependency": "transitive", + "description": { + "name": "crypto", + "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.6" + }, + "ffi": { + "dependency": "direct main", + "description": { + "name": "ffi", + "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.3" + }, + "file": { + "dependency": "direct main", + "description": { + "name": "file", + "sha256": "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.4" + }, + "frontend_server_client": { + "dependency": "transitive", + "description": { + "name": "frontend_server_client", + "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "glob": { + "dependency": "direct main", + "description": { + "name": "glob", + "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.3" + }, + "http_multi_server": { + "dependency": "transitive", + "description": { + "name": "http_multi_server", + "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.2" + }, + "http_parser": { + "dependency": "transitive", + "description": { + "name": "http_parser", + "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.2" + }, + "io": { + "dependency": "transitive", + "description": { + "name": "io", + "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.5" + }, + "js": { + "dependency": "transitive", + "description": { + "name": "js", + "sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.1" + }, + "lints": { + "dependency": "direct dev", + "description": { + "name": "lints", + "sha256": "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "logging": { + "dependency": "direct main", + "description": { + "name": "logging", + "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "matcher": { + "dependency": "transitive", + "description": { + "name": "matcher", + "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.17" + }, + "meta": { + "dependency": "transitive", + "description": { + "name": "meta", + "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.16.0" + }, + "mime": { + "dependency": "transitive", + "description": { + "name": "mime", + "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "node_preamble": { + "dependency": "transitive", + "description": { + "name": "node_preamble", + "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "package_config": { + "dependency": "direct main", + "description": { + "name": "package_config", + "sha256": "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "path": { + "dependency": "direct main", + "description": { + "name": "path", + "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.1" + }, + "pool": { + "dependency": "transitive", + "description": { + "name": "pool", + "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.1" + }, + "pub_semver": { + "dependency": "transitive", + "description": { + "name": "pub_semver", + "sha256": "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.5" + }, + "quiver": { + "dependency": "direct main", + "description": { + "name": "quiver", + "sha256": "ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.2" + }, + "shelf": { + "dependency": "transitive", + "description": { + "name": "shelf", + "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.2" + }, + "shelf_packages_handler": { + "dependency": "transitive", + "description": { + "name": "shelf_packages_handler", + "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "shelf_static": { + "dependency": "transitive", + "description": { + "name": "shelf_static", + "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.3" + }, + "shelf_web_socket": { + "dependency": "transitive", + "description": { + "name": "shelf_web_socket", + "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "source_map_stack_trace": { + "dependency": "transitive", + "description": { + "name": "source_map_stack_trace", + "sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "source_maps": { + "dependency": "transitive", + "description": { + "name": "source_maps", + "sha256": "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.13" + }, + "source_span": { + "dependency": "transitive", + "description": { + "name": "source_span", + "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.10.1" + }, + "stack_trace": { + "dependency": "transitive", + "description": { + "name": "stack_trace", + "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.12.1" + }, + "stream_channel": { + "dependency": "transitive", + "description": { + "name": "stream_channel", + "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "string_scanner": { + "dependency": "transitive", + "description": { + "name": "string_scanner", + "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.1" + }, + "term_glyph": { + "dependency": "transitive", + "description": { + "name": "term_glyph", + "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.2" + }, + "test": { + "dependency": "direct dev", + "description": { + "name": "test", + "sha256": "301b213cd241ca982e9ba50266bd3f5bd1ea33f1455554c5abb85d1be0e2d87e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.25.15" + }, + "test_api": { + "dependency": "transitive", + "description": { + "name": "test_api", + "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.4" + }, + "test_core": { + "dependency": "transitive", + "description": { + "name": "test_core", + "sha256": "84d17c3486c8dfdbe5e12a50c8ae176d15e2a771b96909a9442b40173649ccaa", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.8" + }, + "typed_data": { + "dependency": "transitive", + "description": { + "name": "typed_data", + "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "vm_service": { + "dependency": "transitive", + "description": { + "name": "vm_service", + "sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "15.0.0" + }, + "watcher": { + "dependency": "transitive", + "description": { + "name": "watcher", + "sha256": "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "web": { + "dependency": "transitive", + "description": { + "name": "web", + "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "web_socket": { + "dependency": "transitive", + "description": { + "name": "web_socket", + "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.6" + }, + "web_socket_channel": { + "dependency": "transitive", + "description": { + "name": "web_socket_channel", + "sha256": "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "webkit_inspection_protocol": { + "dependency": "transitive", + "description": { + "name": "webkit_inspection_protocol", + "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "yaml": { + "dependency": "direct main", + "description": { + "name": "yaml", + "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.3" + }, + "yaml_edit": { + "dependency": "direct main", + "description": { + "name": "yaml_edit", + "sha256": "fb38626579fb345ad00e674e2af3a5c9b0cc4b9bfb8fd7f7ff322c7c9e62aef5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.2" + } + }, + "sdks": { + "dart": ">=3.5.0 <4.0.0" + } +} diff --git a/pkgs/by-name/ru/rustdesk-flutter/package.nix b/pkgs/by-name/ru/rustdesk-flutter/package.nix index 6004513d2f4f..f919fa3fc252 100644 --- a/pkgs/by-name/ru/rustdesk-flutter/package.nix +++ b/pkgs/by-name/ru/rustdesk-flutter/package.nix @@ -4,7 +4,7 @@ cargo, copyDesktopItems, fetchFromGitHub, - flutter319, + flutter, ffmpeg, gst_all_1, fuse3, @@ -25,9 +25,11 @@ rustfmt, xdotool, pipewire, + cargo-expand, + yq, + callPackage, }: let - flutterRustBridge = rustPlatform.buildRustPackage rec { pname = "flutter_rust_bridge_codegen"; version = "1.80.1"; # https://github.com/rustdesk/rustdesk/blob/1.3.2/.github/workflows/bridge.yml#L10 @@ -39,6 +41,10 @@ let hash = "sha256-SbwqWapJbt6+RoqRKi+wkSH1D+Wz7JmnVbfcfKkjt8Q="; }; + patches = [ + ./update-flutter-dev-path.patch + ]; + useFetchCargoVendor = true; cargoHash = "sha256-4khuq/DK4sP98AMHyr/lEo1OJdqLujOIi8IgbKBY60Y="; cargoBuildFlags = [ @@ -48,17 +54,22 @@ let doCheck = false; }; + ffigen = callPackage ./ffigen { + inherit flutter; + }; + sharedLibraryExt = rustc.stdenv.hostPlatform.extensions.sharedLibrary; in -flutter319.buildFlutterApplication rec { +flutter.buildFlutterApplication rec { pname = "rustdesk"; - version = "1.3.2"; + version = "1.3.7"; src = fetchFromGitHub { owner = "rustdesk"; repo = "rustdesk"; - rev = version; - hash = "sha256-SvK11IuuTkO8sxLVnYyyRtYyzV6R9NwMtyY5UCdw/P8="; + tag = version; + fetchSubmodules = true; + hash = "sha256-LDQRJRWqRSJmA3HqfTyFraDhBAvhlbed+Q6ejxwytgU="; }; strictDeps = true; @@ -66,55 +77,31 @@ flutter319.buildFlutterApplication rec { # Configure the Flutter/Dart build sourceRoot = "${src.name}/flutter"; - # curl https://raw.githubusercontent.com/rustdesk/rustdesk/1.3.2/flutter/pubspec.lock | yq > pubspec.lock.json + # curl https://raw.githubusercontent.com/rustdesk/rustdesk/1.3.6/flutter/pubspec.lock | yq > pubspec.lock.json pubspecLock = lib.importJSON ./pubspec.lock.json; gitHashes = { dash_chat_2 = "sha256-J5Bc6CeCoRGN870aNEVJ2dkQNb+LOIZetfG2Dsfz5Ow="; - desktop_multi_window = "sha256-yIhcsTb3/mynUDE05c7dANj32O2tcZl8m0Tw8d36J/4="; + desktop_multi_window = "sha256-NOe0jMcH02c0TDTtv62OMTR/qDPnRQrRe73vXDuEq8Q="; dynamic_layouts = "sha256-eFp1YVI6vI2HRgtE5nTqGZIylB226H0O8kuxy9ypuf8="; flutter_gpu_texture_renderer = "sha256-6m34FB9Zi4wWbpQQ7uwtMnjUBvdCQnqlkHtWcZddtqU="; - flutter_improved_scrolling = "sha256-fKs1+JmhDVVfjyhr6Fl17pc6n++mCTjBo1PT3l/DUnc="; - window_manager = "sha256-CUTcSl+W7Wz/Og5k9ujOdAlhKWv/gIYe58wurf9CJH4="; - window_size = "sha256-+lqY46ZURT0qcqPvHFXUnd83Uvfq79Xr+rw1AHqrpak="; + window_manager = "sha256-40mwj4D8W2xW8C7RshTjOhelOiLPM7uU9rsF4NvQn8c="; + window_size = "sha256-XelNtp7tpZ91QCEcvewVphNUtgQX7xrp5QP0oFo6DgM="; + texture_rgba_renderer = "sha256-V/bmT/5x+Bt7kdjLTkgkoXdBcFVXxPyp9kIUhf+Rnt4="; + uni_links = "sha256-O2BgNwu5HFRQyaNkskWHORx8pZhdwEjtljvw1+zFzfo="; }; # Configure the Rust build cargoRoot = ".."; - cargoDeps = rustPlatform.importCargoLock { - # Upstream lock file after removing the registry variant of core-foundation-sys - # and fixing the resulting errors by removing the other registry deps. - lockFile = ./Cargo.lock; - outputHashes = { - "android-wakelock-0.1.0" = "sha256-09EH/U1BBs3l4galQOrTKmPUYBgryUjfc/rqPZhdYc4="; - "arboard-3.4.0" = "sha256-xuMfMakHVj/zjiUr6PVFy+aNQxwsXtAAFlTYxUt12fU="; - "cacao-0.4.0-beta2" = "sha256-U5tCLeVxjmZCm7ti1u71+i116xmozPaR69pCsA4pxrM="; - "clipboard-master-4.0.0-beta.6" = "sha256-GZyzGMQOZ0iwGNZa/ZzFp8gU2tQVWZBpAbim8yb6yZA="; - "confy-0.4.0-2" = "sha256-V7BCKISrkJIxWC3WT5+B5Vav86YTQvdO9TO6A++47FU="; - "core-foundation-0.9.3" = "sha256-iB4OVmWZhuWbs9RFWvNc+RNut6rip2/50o5ZM6c0c3g="; - "evdev-0.11.5" = "sha256-aoPmjGi/PftnH6ClEWXHvIj0X3oh15ZC1q7wPC1XPr0="; - "hwcodec-0.7.0" = "sha256-JdpaKIzI6AOaHPB4SeWIccpP7FuDLP00fOFnbA9DIEc="; - "impersonate_system-0.1.0" = "sha256-pIV7s2qGoCIUrhaRovBDCJaGQ/pMdJacDXJmeBpkcyI="; - "keepawake-0.4.3" = "sha256-cqSpkq/PCz+5+ZUyPy5hF6rP3fBzuZDywyxMUQ50Rk4="; - "machine-uid-0.3.0" = "sha256-rEOyNThg6p5oqE9URnxSkPtzyW8D4zKzLi9pAnzTElE="; - "magnum-opus-0.4.0" = "sha256-T4qaYOl8lCK1h9jWa9KqGvnVfDViT9Ob5R+YgnSw2tg="; - "pam-0.7.0" = "sha256-o47tVoFlW9RiL7O8Lvuwz7rMYQHO+5TG27XxkAdHEOE="; - "pam-sys-1.0.0-alpha4" = "sha256-5HIErVWnanLo5054NgU+DEKC2wwyiJ8AHvbx0BGbyWo="; - "parity-tokio-ipc-0.7.3-4" = "sha256-PKw2Twd2ap+tRrQxqg8T1FvpoeKn0hvBqn1Z44F1LcY="; - "rdev-0.5.0-2" = "sha256-0e8NMPMlzkmghe/E4SssoRzbGG2jWMKwxzVpiJ8MnDo="; - "reqwest-0.11.23" = "sha256-kEUT+gs4ziknDiGdPMLnj5pmxC5SBpLopZ8jZ34GDWc="; - "rust-pulsectl-0.2.12" = "sha256-8jXTspWvjONFcvw9/Z8C43g4BuGZ3rsG32tvLMQbtbM="; - "sciter-rs-0.5.57" = "sha256-5Nd9npdx8yQJEczHv7WmSmrE1lBfvp5z7BubTbYBg3E="; - "sysinfo-0.29.10" = "sha256-/UsFAvlWs/F7X1xT+97Fx+pnpCguoPHU3hTynqYMEs4="; - "tao-0.25.0" = "sha256-kLmx1z9Ybn/hDt2OcszEjtZytQIE+NKTIn9zNr9oEQk="; - "tfc-0.7.0" = "sha256-4plK8ttbHsBPat3/rS+4RhGzirq2Ked2wrU8cQEU1zo="; - "tokio-socks-0.5.2-1" = "sha256-i1dfNatqN4dinMcyAdLhj9hJWVsT10OWpCXsxl7pifI="; - "tray-icon-0.14.3" = "sha256-dSX7LucZaLplRrh6zLwmFzyZN4ZtwIXzAEdZzlu3gQg="; - "wallpaper-3.2.0" = "sha256-p9NRmusdA0wvF6onp1UTL0/4t7XnEAc19sqyGDnfg/Q="; - "webm-1.1.0" = "sha256-p4BMej7yvb8c/dJynRWZmwo2hxAAY96Qx6Qx2DbT8hE="; - "x11-2.19.0" = "sha256-GDCeKzUtvaLeBDmPQdyr499EjEfT6y4diBMzZVEptzc="; - "x11-clipboard-0.8.1" = "sha256-PtqmSD2MwkbLVWbfTSXZW3WEvEnUlo04qieUTjN2whE="; - }; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit + pname + version + src + patches + ; + hash = "sha256-1hipDx/xKOkqLj3JvguMZxseEBSSIwdJrT6LSOiEJp4="; }; + dontCargoBuild = true; cargoBuildFlags = "--lib"; cargoBuildType = "release"; @@ -132,7 +119,10 @@ flutter319.buildFlutterApplication rec { # Rust rustPlatform.cargoSetupHook rustPlatform.cargoBuildHook + cargo-expand rustPlatform.bindgenHook + ffigen + yq ]; buildInputs = [ @@ -156,31 +146,36 @@ flutter319.buildFlutterApplication rec { prePatch = '' chmod -R +w .. + cd .. ''; - patchFlags = [ - "-p1" - "-d" - ".." + + patches = [ + ./make-build-reproducible.patch + # Multiple version of core-foundation-sys will make fetchCargoVendor unhappy. Keep one of it. + ./update-cargo-lock.patch ]; - patches = [ ./make-build-reproducible.patch ]; + prepareBuildRunner = '' + cp ${./build-runner.sh} build_runner + substituteInPlace build_runner \ + --replace-fail "@bash@" "$SHELL" + chmod +x build_runner + export PATH=$PATH:$PWD + ''; postPatch = '' + cd flutter if [ $cargoDepsCopy ]; then # That will be inherited to buildDartPackage and it doesn't have cargoDepsCopy substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ --replace-fail "libayatana-appindicator3.so.1" "${lib.getLib libayatana-appindicator}/lib/libayatana-appindicator3.so.1" + # Disable static linking of ffmpeg since https://github.com/21pages/hwcodec/commit/1873c34e3da070a462540f61c0b782b7ab15dc84 + sed -i 's/static=//g' $cargoDepsCopy/hwcodec-*/build.rs fi substituteInPlace ../Cargo.toml --replace-fail ", \"staticlib\", \"rlib\"" "" - # The supplied Cargo.lock doesn't work with our fetcher so copy over the fixed version - cp ${./Cargo.lock} ../Cargo.lock - chmod +w ../Cargo.lock ''; preBuild = '' - # Disable static linking of ffmpeg since https://github.com/21pages/hwcodec/commit/1873c34e3da070a462540f61c0b782b7ab15dc84 - sed -i 's/static=//g' /build/cargo-vendor-dir/hwcodec-*/build.rs - # Build the Flutter/Rust bridge bindings cat < bridge.yml rust_input: @@ -192,6 +187,7 @@ flutter319.buildFlutterApplication rec { dart_format_line_length: 80 llvm_compiler_opts: "-I ${lib.getLib clangStdenv.cc.cc}/lib/clang/${lib.versions.major clangStdenv.cc.version}/include -I ${clangStdenv.cc.libc_dev}/include" EOF + runHook prepareBuildRunner RUST_LOG=info ${flutterRustBridge}/bin/flutter_rust_bridge_codegen bridge.yml # Build the Rust shared library @@ -244,12 +240,13 @@ flutter319.buildFlutterApplication rec { }) ]; - meta = with lib; { + meta = { description = "Virtual / remote desktop infrastructure for everyone! Open source TeamViewer / Citrix alternative"; homepage = "https://rustdesk.com"; - license = licenses.agpl3Only; - maintainers = teams.helsinki-systems.members; + changelog = "https://github.com/rustdesk/rustdesk/releases/${version}"; + license = lib.licenses.agpl3Only; + maintainers = lib.teams.helsinki-systems.members; mainProgram = "rustdesk"; - platforms = platforms.linux; # should work on darwin as well but I have no machine to test with + platforms = lib.platforms.linux; # should work on darwin as well but I have no machine to test with }; } diff --git a/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json b/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json index 4ca542e41794..d3678c9dea0e 100644 --- a/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json +++ b/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json @@ -44,11 +44,11 @@ "dependency": "transitive", "description": { "name": "archive", - "sha256": "22600aa1e926be775fa5fe7e6894e7fb3df9efda8891c73f70fb3262399a432d", + "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.4.10" + "version": "3.6.1" }, "args": { "dependency": "transitive", @@ -416,7 +416,7 @@ "description": { "path": ".", "ref": "HEAD", - "resolved-ref": "519350f1f40746798299e94786197d058353bac9", + "resolved-ref": "4f562ab49d289cfa36bfda7cff12746ec0200033", "url": "https://github.com/rustdesk-org/rustdesk_desktop_multi_window" }, "source": "git", @@ -477,11 +477,11 @@ "dependency": "direct main", "description": { "name": "extended_text", - "sha256": "7f382de3af12992e34bd72ddd36becf90c4720900af126cb9859f0189af71ffe", + "sha256": "38c1cac571d6eaf406f4b80040c1f88561e7617ad90795aac6a1be0a8d0bb676", "url": "https://pub.dev" }, "source": "hosted", - "version": "13.0.0" + "version": "14.0.0" }, "extended_text_library": { "dependency": "transitive", @@ -507,11 +507,11 @@ "dependency": "direct main", "description": { "name": "ffi", - "sha256": "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878", + "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "2.1.3" }, "ffigen": { "dependency": "direct dev", @@ -660,17 +660,6 @@ "source": "git", "version": "0.0.1" }, - "flutter_improved_scrolling": { - "dependency": "direct main", - "description": { - "path": ".", - "ref": "HEAD", - "resolved-ref": "62f09545149f320616467c306c8c5f71714a18e6", - "url": "https://github.com/rustdesk-org/flutter_improved_scrolling" - }, - "source": "git", - "version": "0.0.3" - }, "flutter_keyboard_visibility": { "dependency": "direct main", "description": { @@ -824,14 +813,14 @@ "version": "2.4.1" }, "frontend_server_client": { - "dependency": "transitive", + "dependency": "direct overridden", "description": { "name": "frontend_server_client", - "sha256": "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612", + "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.0" + "version": "4.0.0" }, "get": { "dependency": "direct main", @@ -927,11 +916,11 @@ "dependency": "direct main", "description": { "name": "image_picker", - "sha256": "b6951e25b795d053a6ba03af5f710069c99349de9341af95155d52665cb4607c", + "sha256": "021834d9c0c3de46bf0fe40341fa07168407f694d9b2bb18d532dc1261867f7a", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.8.9" + "version": "1.1.2" }, "image_picker_android": { "dependency": "transitive", @@ -987,11 +976,11 @@ "dependency": "transitive", "description": { "name": "image_picker_platform_interface", - "sha256": "fa4e815e6fcada50e35718727d83ba1c92f1edf95c0b4436554cec301b56233b", + "sha256": "9ec26d410ff46f483c5519c29c02ef0e02e13a543f882b152d4bfd2f06802f80", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.9.3" + "version": "2.10.0" }, "image_picker_windows": { "dependency": "transitive", @@ -1077,21 +1066,21 @@ "dependency": "transitive", "description": { "name": "material_color_utilities", - "sha256": "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a", + "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.8.0" + "version": "0.11.1" }, "meta": { "dependency": "transitive", "description": { "name": "meta", - "sha256": "d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04", + "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.11.0" + "version": "1.15.0" }, "mime": { "dependency": "transitive", @@ -1293,16 +1282,6 @@ "source": "hosted", "version": "2.1.8" }, - "pointycastle": { - "dependency": "transitive", - "description": { - "name": "pointycastle", - "sha256": "43ac87de6e10afabc85c445745a7b799e04de84cebaa4fd7bf55a5e1e9604d29", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.7.4" - }, "pool": { "dependency": "transitive", "description": { @@ -1602,11 +1581,12 @@ "texture_rgba_renderer": { "dependency": "direct main", "description": { - "name": "texture_rgba_renderer", - "sha256": "cb048abdd800468ca40749ca10d1db9d1e6a055d1cde6234c05191293f0c7d61", - "url": "https://pub.dev" + "path": ".", + "ref": "42797e0f03141dc2b585f76c64a13974508058b4", + "resolved-ref": "42797e0f03141dc2b585f76c64a13974508058b4", + "url": "https://github.com/rustdesk-org/flutter_texture_rgba_renderer" }, - "source": "hosted", + "source": "git", "version": "0.0.16" }, "timing": { @@ -1652,11 +1632,12 @@ "uni_links": { "dependency": "direct main", "description": { - "name": "uni_links", - "sha256": "051098acfc9e26a9fde03b487bef5d3d228ca8f67693480c6f33fd4fbb8e2b6e", - "url": "https://pub.dev" + "path": "uni_links", + "ref": "f416118d843a7e9ed117c7bb7bdc2deda5a9e86f", + "resolved-ref": "f416118d843a7e9ed117c7bb7bdc2deda5a9e86f", + "url": "https://github.com/rustdesk-org/uni_links" }, - "source": "hosted", + "source": "git", "version": "0.5.1" }, "uni_links_desktop": { @@ -1703,31 +1684,31 @@ "dependency": "direct main", "description": { "name": "url_launcher", - "sha256": "c512655380d241a337521703af62d2c122bf7b77a46ff7dd750092aa9433499c", + "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.2.4" + "version": "6.3.1" }, "url_launcher_android": { "dependency": "transitive", "description": { "name": "url_launcher_android", - "sha256": "507dc655b1d9cb5ebc756032eb785f114e415f91557b73bf60b7e201dfedeb2f", + "sha256": "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.2.2" + "version": "6.3.14" }, "url_launcher_ios": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "url_launcher_ios", - "sha256": "75bb6fe3f60070407704282a2d295630cab232991eb52542b18347a8a941df03", + "sha256": "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.2.4" + "version": "6.3.2" }, "url_launcher_linux": { "dependency": "transitive", @@ -1943,28 +1924,28 @@ "dependency": "direct main", "description": { "name": "win32", - "sha256": "464f5674532865248444b4c3daca12bd9bf2d7c47f759ce2617986e7229494a8", + "sha256": "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.2.0" + "version": "5.5.4" }, "win32_registry": { "dependency": "transitive", "description": { "name": "win32_registry", - "sha256": "41fd8a189940d8696b1b810efb9abcf60827b6cbfab90b0c43e8439e3a39d85a", + "sha256": "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.2" + "version": "1.1.5" }, "window_manager": { "dependency": "direct main", "description": { "path": ".", "ref": "HEAD", - "resolved-ref": "f19acdb008645366339444a359a45c3257c8b32e", + "resolved-ref": "85789bfe6e4cfaf4ecc00c52857467fdb7f26879", "url": "https://github.com/rustdesk-org/window_manager" }, "source": "git", @@ -1974,8 +1955,8 @@ "dependency": "direct main", "description": { "path": "plugins/window_size", - "ref": "a738913c8ce2c9f47515382d40827e794a334274", - "resolved-ref": "a738913c8ce2c9f47515382d40827e794a334274", + "ref": "eb3964990cf19629c89ff8cb4a37640c7b3d5601", + "resolved-ref": "eb3964990cf19629c89ff8cb4a37640c7b3d5601", "url": "https://github.com/google/flutter-desktop-embedding.git" }, "source": "git", @@ -2033,7 +2014,7 @@ } }, "sdks": { - "dart": ">=3.3.0 <4.0.0", - "flutter": ">=3.19.0" + "dart": ">=3.5.0 <4.0.0", + "flutter": ">=3.24.0" } } diff --git a/pkgs/by-name/ru/rustdesk-flutter/update-cargo-lock.patch b/pkgs/by-name/ru/rustdesk-flutter/update-cargo-lock.patch new file mode 100644 index 000000000000..d78e8e76ac3e --- /dev/null +++ b/pkgs/by-name/ru/rustdesk-flutter/update-cargo-lock.patch @@ -0,0 +1,40 @@ +diff --git a/Cargo.lock b/Cargo.lock +index e8ed6c42e..3e90da8fc 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1178,7 +1178,7 @@ name = "core-foundation" + version = "0.9.3" + source = "git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd#7d593d016175755e492a92ef89edca68ac3bd5cd" + dependencies = [ +- "core-foundation-sys 0.8.6 (git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd)", ++ "core-foundation-sys", + "libc", + ] + +@@ -1188,7 +1188,7 @@ version = "0.9.4" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" + dependencies = [ +- "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "core-foundation-sys", + "libc", + ] + +@@ -1198,14 +1198,6 @@ version = "0.8.6" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +-[[package]] +-name = "core-foundation-sys" +-version = "0.8.6" +-source = "git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd#7d593d016175755e492a92ef89edca68ac3bd5cd" +-dependencies = [ +- "objc2-encode 2.0.0-pre.2", +-] +- + [[package]] + name = "core-graphics" + version = "0.22.3" +-- +2.47.2 + diff --git a/pkgs/by-name/ru/rustdesk-flutter/update-flutter-dev-path.patch b/pkgs/by-name/ru/rustdesk-flutter/update-flutter-dev-path.patch new file mode 100644 index 000000000000..ce4763c25b5e --- /dev/null +++ b/pkgs/by-name/ru/rustdesk-flutter/update-flutter-dev-path.patch @@ -0,0 +1,25 @@ +diff --git a/frb_codegen/src/commands.rs b/frb_codegen/src/commands.rs +index 91b05ca..41aba36 100644 +--- a/frb_codegen/src/commands.rs ++++ b/frb_codegen/src/commands.rs +@@ -174,8 +174,6 @@ fn ffigen( + let repo = DartRepository::from_str(dart_root).unwrap(); + let res = command_run!( + call_shell[Some(dart_root)], +- *repo.toolchain.as_run_command(), +- "run", + "ffigen", + "--config", + config_file.path() +@@ -229,8 +227,6 @@ pub fn build_runner(dart_root: &str) -> Result { + let repo = DartRepository::from_str(dart_root).unwrap(); + let out = command_run!( + call_shell[Some(dart_root)], +- *repo.toolchain.as_run_command(), +- "run", + "build_runner", + "build", + "--delete-conflicting-outputs", +-- +2.47.1 + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a58cf1edb0c..6ba41ae97098 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18351,4 +18351,8 @@ with pkgs; wings = callPackage ../by-name/wi/wings/package.nix { erlang = erlang_25; }; + + rustdesk-flutter = callPackage ../by-name/ru/rustdesk-flutter/package.nix { + flutter = flutter324; + }; } From 66361afa793ac6d55f2500256898942f0c89a7ff Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Mon, 10 Feb 2025 18:14:05 -0500 Subject: [PATCH 1066/2168] zed-editor: 0.172.10 -> 0.172.11 --- pkgs/by-name/ze/zed-editor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index a9063b74d076..b735dd0146ee 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -96,7 +96,7 @@ let in rustPlatform.buildRustPackage rec { pname = "zed-editor"; - version = "0.172.10"; + version = "0.172.11"; outputs = [ "out" ] ++ lib.optional buildRemoteServer "remote_server"; @@ -104,7 +104,7 @@ rustPlatform.buildRustPackage rec { owner = "zed-industries"; repo = "zed"; tag = "v${version}"; - hash = "sha256-4R7s+575ofL9JK1Axvvk2Z9QgHPxvJrgl9zCv3m+sZY="; + hash = "sha256-ozPARaFIPJZHsxB9e9c12nVuV/jGBRBXQJ1M+/luExY="; }; patches = [ @@ -124,7 +124,7 @@ rustPlatform.buildRustPackage rec { ''; useFetchCargoVendor = true; - cargoHash = "sha256-yzShyOn90U79Ts+sKLhAK6SYiqPX7MKT/9fgF2plgI4="; + cargoHash = "sha256-3xpsTAj4jrttMZIbZCZc2Qf7g3Q4B6FBSUYEHf0u2+w="; nativeBuildInputs = [ From 3d0db58f9436a9f6a7cb63e8df778718a060aea8 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Mon, 10 Feb 2025 23:27:01 +0000 Subject: [PATCH 1067/2168] arc-browser: 1.79.1-58230 -> 1.81.0-58533 Changelog: https://arc.net/e/DC6EB581-A8A6-4E17-80E8-010EF9CEB696 --- pkgs/by-name/ar/arc-browser/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ar/arc-browser/package.nix b/pkgs/by-name/ar/arc-browser/package.nix index 35ddef88b01f..7549aa197695 100644 --- a/pkgs/by-name/ar/arc-browser/package.nix +++ b/pkgs/by-name/ar/arc-browser/package.nix @@ -10,11 +10,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "arc-browser"; - version = "1.79.1-58230"; + version = "1.81.0-58533"; src = fetchurl { url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg"; - hash = "sha256-BYlKiDcgVviKeKI++qjTALRblI+kFNq7gm5EFmaa3sM="; + hash = "sha256-FrgarnGFxaB+R9BGRTAIVr8W8GmNHZeVyBxs2mHpU2I="; }; nativeBuildInputs = [ undmg ]; From 5b56834dc5a52c2e81a4e2559db530a3c231bf1f Mon Sep 17 00:00:00 2001 From: Marcus Ramberg Date: Mon, 10 Feb 2025 23:53:56 +0100 Subject: [PATCH 1068/2168] cloudflare-warp: include desktop-file-util to allow browser to open --- pkgs/by-name/cl/cloudflare-warp/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/cl/cloudflare-warp/package.nix b/pkgs/by-name/cl/cloudflare-warp/package.nix index b476cbd63f49..d340ca8061c2 100644 --- a/pkgs/by-name/cl/cloudflare-warp/package.nix +++ b/pkgs/by-name/cl/cloudflare-warp/package.nix @@ -4,6 +4,7 @@ autoPatchelfHook, versionCheckHook, copyDesktopItems, + desktop-file-utils, dbus, dpkg, fetchurl, @@ -43,6 +44,7 @@ stdenv.mkDerivation rec { versionCheckHook makeWrapper copyDesktopItems + desktop-file-utils ]; buildInputs = [ From b01556409201d0b1a2efaf5ea3cb0719b0ae7b26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 10 Feb 2025 15:47:04 -0800 Subject: [PATCH 1069/2168] python313Packages.spectral-cube: fix src url --- pkgs/development/python-modules/spectral-cube/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/spectral-cube/default.nix b/pkgs/development/python-modules/spectral-cube/default.nix index 63889875708b..12ccf31e64ca 100644 --- a/pkgs/development/python-modules/spectral-cube/default.nix +++ b/pkgs/development/python-modules/spectral-cube/default.nix @@ -30,7 +30,8 @@ buildPythonPackage rec { disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; + pname = "spectral_cube"; + inherit version; hash = "sha256-bjBghr5WrfC4NH5cyiy9RUiCmJSUHBtyD61bd1i/4kM="; }; From 83820d328005ce865644ddb9ad7a46bdf38a6f40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 10 Feb 2025 15:49:14 -0800 Subject: [PATCH 1070/2168] python313Packages.pyregion: 2.2.0 -> 2.3.0 Diff: https://github.com/astropy/pyregion/compare/2.2.0...v2.3.0 Changelog: https://github.com/astropy/pyregion/blob/v2.3.0/CHANGES.rst --- .../python-modules/pyregion/default.nix | 24 +++++++------------ 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/pyregion/default.nix b/pkgs/development/python-modules/pyregion/default.nix index d096a5d0c7b8..0e2c540b95fa 100644 --- a/pkgs/development/python-modules/pyregion/default.nix +++ b/pkgs/development/python-modules/pyregion/default.nix @@ -5,10 +5,10 @@ fetchFromGitHub, # needed to build cython, + extension-helpers, oldest-supported-numpy, setuptools, setuptools-scm, - wheel, # needed to run astropy, numpy, @@ -20,36 +20,30 @@ buildPythonPackage rec { pname = "pyregion"; - version = "2.2.0"; + version = "2.3.0"; pyproject = true; # pypi src contains cython-produced .c files which don't compile # with python3.9 src = fetchFromGitHub { owner = "astropy"; - repo = pname; - rev = version; - hash = "sha256-r2STKnZwNvonXATrQ5q9NVD9QftlWI1RWl4F+GZSxVg="; + repo = "pyregion"; + tag = "v${version}"; + hash = "sha256-mEO2PbUSTVy7Qmm723/lGL6PYQzbRazIPZH51SWebvs="; }; - env = lib.optionalAttrs stdenv.cc.isClang { - # Try to remove on next update. generated code returns a NULL in a - # function where an int is expected. - NIX_CFLAGS_COMPILE = "-Wno-error=int-conversion"; - }; - - propagatedBuildInputs = [ + dependencies = [ astropy numpy pyparsing ]; - nativeBuildInputs = [ + build-system = [ cython + extension-helpers oldest-supported-numpy setuptools setuptools-scm - wheel ]; nativeCheckInputs = [ @@ -66,7 +60,7 @@ buildPythonPackage rec { ''; meta = with lib; { - changelog = "https://github.com/astropy/pyregion/blob/${version}/CHANGES.rst"; + changelog = "https://github.com/astropy/pyregion/blob/${src.tag}/CHANGES.rst"; description = "Python parser for ds9 region files"; homepage = "https://github.com/astropy/pyregion"; license = licenses.mit; From f804be29f971dae745c8fd61ba6a9f3205b98b75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 10 Feb 2025 15:54:36 -0800 Subject: [PATCH 1071/2168] python313Packages.aplpy: drop superfluous patches --- .../python-modules/aplpy/default.nix | 34 ++----------------- 1 file changed, 3 insertions(+), 31 deletions(-) diff --git a/pkgs/development/python-modules/aplpy/default.nix b/pkgs/development/python-modules/aplpy/default.nix index 3b7f0a06ec8f..1be5e674d1e6 100644 --- a/pkgs/development/python-modules/aplpy/default.nix +++ b/pkgs/development/python-modules/aplpy/default.nix @@ -17,15 +17,12 @@ setuptools, setuptools-scm, shapely, - wheel, }: buildPythonPackage rec { pname = "aplpy"; version = "2.2.0"; - format = "pyproject"; - - disabled = pythonOlder "3.6"; + pyproject = true; src = fetchPypi { pname = "aplpy"; @@ -33,37 +30,12 @@ buildPythonPackage rec { hash = "sha256-oUylUM7/6OyEJFrpkr9MjXilXC/ZIdBQ5au4cvyZiA0="; }; - # Fix build with Astropy 6.1, Python 3.12 and matplotlib 3.9 - patches = [ - # https://github.com/aplpy/aplpy/pull/496 - (fetchpatch { - url = "https://github.com/aplpy/aplpy/commit/d232a4984bc6a83ec86dfdc3ab3bc1b05de44c48.patch"; - hash = "sha256-jGUTzIrVdGNPy0BV8w46jzz045fDXBisiwIn90bn7oY="; - }) - # https://github.com/aplpy/aplpy/pull/497 - (fetchpatch { - url = "https://github.com/aplpy/aplpy/commit/468be394970b39f1aaa6debef51eb674e2dd86d8.patch"; - hash = "sha256-/ovLrFOKb3RQ8TZSviuOV6EYNgz0gtrhVWZLFJBrzFg="; - }) - # https://github.com/aplpy/aplpy/pull/500 - (fetchpatch { - url = "https://github.com/aplpy/aplpy/commit/c9049261b3724821f4d309d85fe73cabcc04d890.patch"; - hash = "sha256-ivdXLh1Z+WG3EL5u1wO+lqz6X1AP6WpyoZix5YiqW0w="; - }) - # https://github.com/aplpy/aplpy/pull/503 - (fetchpatch { - url = "https://github.com/aplpy/aplpy/commit/edc2aa9770b72bd3ac42db95a6e027b276be9c31.patch"; - hash = "sha256-QUZenY3XQ/T2tl5apxZUqjf4ACjOzJWb+1AUp5limi4="; - }) - ]; - - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm - wheel ]; - propagatedBuildInputs = [ + dependencies = [ astropy matplotlib numpy From b39b615d2e41d10d62998965b684d84d54573127 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 10 Feb 2025 15:55:44 -0800 Subject: [PATCH 1072/2168] python313Packages.spectral-cube: fix build --- .../python-modules/spectral-cube/default.nix | 14 +- .../distutils-looseversion.patch | 152 ------------------ 2 files changed, 7 insertions(+), 159 deletions(-) delete mode 100644 pkgs/development/python-modules/spectral-cube/distutils-looseversion.patch diff --git a/pkgs/development/python-modules/spectral-cube/default.nix b/pkgs/development/python-modules/spectral-cube/default.nix index 12ccf31e64ca..ec7781c50b45 100644 --- a/pkgs/development/python-modules/spectral-cube/default.nix +++ b/pkgs/development/python-modules/spectral-cube/default.nix @@ -13,8 +13,10 @@ casa-formats-io, dask, joblib, - looseversion, + numpy, + packaging, radio-beam, + tqdm, # checks aplpy, @@ -27,16 +29,12 @@ buildPythonPackage rec { version = "0.6.6"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchPypi { pname = "spectral_cube"; inherit version; hash = "sha256-bjBghr5WrfC4NH5cyiy9RUiCmJSUHBtyD61bd1i/4kM="; }; - patches = [ ./distutils-looseversion.patch ]; - build-system = [ setuptools-scm ]; dependencies = [ @@ -44,9 +42,11 @@ buildPythonPackage rec { casa-formats-io dask joblib - looseversion + numpy + packaging radio-beam - ]; + tqdm + ] ++ dask.optional-dependencies.array; nativeCheckInputs = [ aplpy diff --git a/pkgs/development/python-modules/spectral-cube/distutils-looseversion.patch b/pkgs/development/python-modules/spectral-cube/distutils-looseversion.patch deleted file mode 100644 index 857d37a1a88a..000000000000 --- a/pkgs/development/python-modules/spectral-cube/distutils-looseversion.patch +++ /dev/null @@ -1,152 +0,0 @@ -diff --git a/spectral_cube/conftest.py b/spectral_cube/conftest.py -index 0d7c158..6fac9b4 100644 ---- a/spectral_cube/conftest.py -+++ b/spectral_cube/conftest.py -@@ -4,7 +4,7 @@ - from __future__ import print_function, absolute_import, division - - import os --from distutils.version import LooseVersion -+from looseversion import LooseVersion - from astropy.units.equivalencies import pixel_scale - - # Import casatools and casatasks here if available as they can otherwise -diff --git a/spectral_cube/lower_dimensional_structures.py b/spectral_cube/lower_dimensional_structures.py -index f0e3745..1b1e1f8 100644 ---- a/spectral_cube/lower_dimensional_structures.py -+++ b/spectral_cube/lower_dimensional_structures.py -@@ -526,7 +526,7 @@ class Projection(LowerDimensionalObject, SpatialCoordMixinClass, - " installed.") - - # Need version > 0.2 to work with cubes -- from distutils.version import LooseVersion -+ from looseversion import LooseVersion - if LooseVersion(version) < "0.3": - raise Warning("Requires version >=0.3 of reproject. The current " - "version is: {}".format(version)) -diff --git a/spectral_cube/np_compat.py b/spectral_cube/np_compat.py -index ed4a134..39aa320 100644 ---- a/spectral_cube/np_compat.py -+++ b/spectral_cube/np_compat.py -@@ -1,7 +1,7 @@ - from __future__ import print_function, absolute_import, division - - import numpy as np --from distutils.version import LooseVersion -+from looseversion import LooseVersion - - def allbadtonan(function): - """ -diff --git a/spectral_cube/spectral_cube.py b/spectral_cube/spectral_cube.py -index 771a2d4..af752b4 100644 ---- a/spectral_cube/spectral_cube.py -+++ b/spectral_cube/spectral_cube.py -@@ -57,7 +57,7 @@ from .spectral_axis import (determine_vconv_from_ctype, get_rest_value_from_wcs, - doppler_beta, doppler_gamma, doppler_z) - from .io.core import SpectralCubeRead, SpectralCubeWrite - --from distutils.version import LooseVersion -+from looseversion import LooseVersion - - - __all__ = ['BaseSpectralCube', 'SpectralCube', 'VaryingResolutionSpectralCube'] -@@ -2659,7 +2659,7 @@ class BaseSpectralCube(BaseNDClass, MaskableArrayMixinClass, - - reproj_kwargs = kwargs - # Need version > 0.2 to work with cubes, >= 0.5 for memmap -- from distutils.version import LooseVersion -+ from looseversion import LooseVersion - if LooseVersion(version) < "0.5": - raise Warning("Requires version >=0.5 of reproject. The current " - "version is: {}".format(version)) -diff --git a/spectral_cube/tests/test_masks.py b/spectral_cube/tests/test_masks.py -index c38ba27..1d6895d 100644 ---- a/spectral_cube/tests/test_masks.py -+++ b/spectral_cube/tests/test_masks.py -@@ -14,7 +14,7 @@ from .. import (BooleanArrayMask, LazyMask, LazyComparisonMask, - FunctionMask, CompositeMask) - from ..masks import is_broadcastable_and_smaller, dims_to_skip, view_of_subset - --from distutils.version import LooseVersion -+from looseversion import LooseVersion - - - def test_spectral_cube_mask(): -diff --git a/spectral_cube/tests/test_moments.py b/spectral_cube/tests/test_moments.py -index 3043dd5..7e05c5b 100644 ---- a/spectral_cube/tests/test_moments.py -+++ b/spectral_cube/tests/test_moments.py -@@ -1,7 +1,7 @@ - from __future__ import print_function, absolute_import, division - - import warnings --from distutils.version import LooseVersion -+from looseversion import LooseVersion - - import pytest - import numpy as np -diff --git a/spectral_cube/tests/test_performance.py b/spectral_cube/tests/test_performance.py -index bdee040..a778abc 100644 ---- a/spectral_cube/tests/test_performance.py -+++ b/spectral_cube/tests/test_performance.py -@@ -20,7 +20,7 @@ except ImportError: - - # The comparison of Quantities in test_memory_usage - # fail with older versions of numpy --from distutils.version import LooseVersion -+from looseversion import LooseVersion - - NPY_VERSION_CHECK = LooseVersion(np.version.version) >= "1.13" - -diff --git a/spectral_cube/tests/test_regrid.py b/spectral_cube/tests/test_regrid.py -index 496ddd5..5b1fec7 100644 ---- a/spectral_cube/tests/test_regrid.py -+++ b/spectral_cube/tests/test_regrid.py -@@ -18,7 +18,7 @@ except ImportError: - - # The comparison of Quantities in test_memory_usage - # fail with older versions of numpy --from distutils.version import LooseVersion -+from looseversion import LooseVersion - - NPY_VERSION_CHECK = LooseVersion(np.version.version) >= "1.13" - -diff --git a/spectral_cube/tests/test_spectral_cube.py b/spectral_cube/tests/test_spectral_cube.py -index 9ebeb7d..93e5647 100644 ---- a/spectral_cube/tests/test_spectral_cube.py -+++ b/spectral_cube/tests/test_spectral_cube.py -@@ -6,7 +6,7 @@ import operator - import itertools - import warnings - import mmap --from distutils.version import LooseVersion -+from looseversion import LooseVersion - import sys - - import pytest -diff --git a/spectral_cube/tests/test_subcubes.py b/spectral_cube/tests/test_subcubes.py -index 6f74f68..217c324 100644 ---- a/spectral_cube/tests/test_subcubes.py -+++ b/spectral_cube/tests/test_subcubes.py -@@ -1,7 +1,7 @@ - from __future__ import print_function, absolute_import, division - - import pytest --from distutils.version import LooseVersion -+from looseversion import LooseVersion - - from astropy import units as u - from astropy import wcs -diff --git a/spectral_cube/tests/test_visualization.py b/spectral_cube/tests/test_visualization.py -index 85ea038..0ac8d58 100644 ---- a/spectral_cube/tests/test_visualization.py -+++ b/spectral_cube/tests/test_visualization.py -@@ -1,7 +1,7 @@ - from __future__ import print_function, absolute_import, division - - import pytest --from distutils.version import LooseVersion -+from looseversion import LooseVersion - - from .test_spectral_cube import cube_and_raw - From 7bbd7d8a4b6f3e9a4f14fb18cb7573e3ed51f99a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 00:05:55 +0000 Subject: [PATCH 1073/2168] python312Packages.pyipma: 3.0.8 -> 3.0.9 --- pkgs/development/python-modules/pyipma/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyipma/default.nix b/pkgs/development/python-modules/pyipma/default.nix index 7d15c93d5ab8..d3e6460c7ded 100644 --- a/pkgs/development/python-modules/pyipma/default.nix +++ b/pkgs/development/python-modules/pyipma/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyipma"; - version = "3.0.8"; + version = "3.0.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "dgomes"; repo = pname; tag = version; - hash = "sha256-iz47BeBiSXIN/rZNOjuZYTFTIm0WAUg8cy0xV20gdwk="; + hash = "sha256-1EUOkNwNoZQEetJ5v6httas0S0a3bHLv/lDRXQsT/Ds="; }; propagatedBuildInputs = [ @@ -51,7 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to retrieve information from Instituto Português do Mar e Atmosfera"; homepage = "https://github.com/dgomes/pyipma"; - changelog = "https://github.com/dgomes/pyipma/releases/tag/${version}"; + changelog = "https://github.com/dgomes/pyipma/releases/tag/${src.tag}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From a1818584ade4666b74a52230ed5d8f9eae9e6427 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 11 Feb 2025 10:18:32 +1000 Subject: [PATCH 1074/2168] home-assistant-custom-components.versatile_thermostat: 7.1.5 -> 7.2.1 (#380953) https://github.com/jmcollin78/versatile_thermostat/releases/tag/7.2.0 https://github.com/jmcollin78/versatile_thermostat/releases/tag/7.2.1 --- .../custom-components/versatile_thermostat/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix b/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix index 8c124a29aee6..5dffbcad5881 100644 --- a/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix +++ b/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "jmcollin78"; domain = "versatile_thermostat"; - version = "7.1.5"; + version = "7.2.1"; src = fetchFromGitHub { inherit owner; repo = domain; rev = "refs/tags/${version}"; - hash = "sha256-XCDWByw/2xUjub/fNGvpIGzDyn3rq+JMI7syI1oPus0="; + hash = "sha256-KdDeY1hTCWEy5l9mq2HdCrmVfLV6NkO43lC2QigOXeo="; }; passthru.updateScript = gitUpdater { ignoredVersions = "(Alpha|Beta|alpha|beta).*"; }; From 02a1f0c1ff0e51fcde89115f433d403a76352419 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 00:36:05 +0000 Subject: [PATCH 1075/2168] exiv2: 0.28.3 -> 0.28.4 --- pkgs/by-name/ex/exiv2/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ex/exiv2/package.nix b/pkgs/by-name/ex/exiv2/package.nix index a702df62ea0e..d74d5fbfc35e 100644 --- a/pkgs/by-name/ex/exiv2/package.nix +++ b/pkgs/by-name/ex/exiv2/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "exiv2"; - version = "0.28.3"; + version = "0.28.4"; outputs = [ "out" @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "exiv2"; repo = "exiv2"; rev = "v${version}"; - hash = "sha256-KD3kkIQXPcjCVZZrmbn93xYbJ8ryG0mLFbkO5AVqnTw="; + hash = "sha256-3xSN1erwNn//jrpO3fAG/jVb2jOSIBQNDd7HHKecJQg="; }; nativeBuildInputs = [ From 789dfdd6ef444ff08047b1e86a343da7416998e7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 00:37:03 +0000 Subject: [PATCH 1076/2168] aardvark-dns: 1.13.1 -> 1.14.0 --- pkgs/by-name/aa/aardvark-dns/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/aa/aardvark-dns/package.nix b/pkgs/by-name/aa/aardvark-dns/package.nix index efb858752c7f..fca5e9106500 100644 --- a/pkgs/by-name/aa/aardvark-dns/package.nix +++ b/pkgs/by-name/aa/aardvark-dns/package.nix @@ -7,17 +7,17 @@ rustPlatform.buildRustPackage rec { pname = "aardvark-dns"; - version = "1.13.1"; + version = "1.14.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-VXuTHc/t+5QidTqMptoQqircHTtYzeEXfFFII8jeOrI="; + hash = "sha256-mWaB1E/n/N2Tb5bqrMJX2XfPvZBCG+dxar3kGCHgv0I="; }; useFetchCargoVendor = true; - cargoHash = "sha256-ydvvV3w8VmfdSTXeJvMuN0oqkkZdWs6/9KocalRGWpg="; + cargoHash = "sha256-t9qfPz4Jy1RueiDEY2fB3Y1uty0i/Wf0ElsR+nSVF5g="; passthru.tests = { inherit (nixosTests) podman; }; From f4748e6472858a26ace6f75e097051d4311fa056 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 00:39:38 +0000 Subject: [PATCH 1077/2168] slirp4netns: 1.3.1 -> 1.3.2 --- pkgs/by-name/sl/slirp4netns/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sl/slirp4netns/package.nix b/pkgs/by-name/sl/slirp4netns/package.nix index f44dd73b4515..91849a956cca 100644 --- a/pkgs/by-name/sl/slirp4netns/package.nix +++ b/pkgs/by-name/sl/slirp4netns/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "slirp4netns"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "rootless-containers"; repo = "slirp4netns"; rev = "v${version}"; - sha256 = "sha256-dXz5gNALrVjaFGUgEFp0k47c7aWDzwLMflphe6R6GaM="; + sha256 = "sha256-1OiomraQ4wfrBPihGrf9sq8hPJUB45gvf7Y5j7iN8/E="; }; nativeBuildInputs = [ From 725629414c15b5cddc861decf7446c7bf3db6346 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 00:56:56 +0000 Subject: [PATCH 1078/2168] crocoddyl: 2.1.0 -> 2.2.0 --- pkgs/by-name/cr/crocoddyl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cr/crocoddyl/package.nix b/pkgs/by-name/cr/crocoddyl/package.nix index a1a283727743..9b91fd7cb5d7 100644 --- a/pkgs/by-name/cr/crocoddyl/package.nix +++ b/pkgs/by-name/cr/crocoddyl/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "crocoddyl"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "loco-3d"; repo = "crocoddyl"; rev = "v${finalAttrs.version}"; - hash = "sha256-SVV9sleDXLm2QJmNgL25XLHC3y5bfKab4GSlE8jbT8w="; + hash = "sha256-j3TL5TpIdTkTO32Fuu+LyiieiXoOMvShi/LbBL5YYzA="; }; outputs = [ From 0a0c45fb98845bfda006d192ff2b3c7340c5b75d Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Mon, 10 Feb 2025 13:53:31 -0500 Subject: [PATCH 1079/2168] kanidm_1_5: init at 1.5.0 https://github.com/kanidm/kanidm/releases/tag/v1.5.0 --- pkgs/by-name/ka/kanidm/1_5.nix | 6 + pkgs/by-name/ka/kanidm/README.md | 47 +++ pkgs/by-name/ka/kanidm/generic.nix | 21 +- .../1_5/oauth2-basic-secret-modify.patch | 308 ++++++++++++++++++ .../kanidm/patches/1_5/recover-account.patch | 173 ++++++++++ pkgs/top-level/all-packages.nix | 5 + 6 files changed, 559 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/ka/kanidm/1_5.nix create mode 100644 pkgs/by-name/ka/kanidm/README.md create mode 100644 pkgs/by-name/ka/kanidm/patches/1_5/oauth2-basic-secret-modify.patch create mode 100644 pkgs/by-name/ka/kanidm/patches/1_5/recover-account.patch diff --git a/pkgs/by-name/ka/kanidm/1_5.nix b/pkgs/by-name/ka/kanidm/1_5.nix new file mode 100644 index 000000000000..93afad5ee0f8 --- /dev/null +++ b/pkgs/by-name/ka/kanidm/1_5.nix @@ -0,0 +1,6 @@ +import ./generic.nix { + version = "1.5.0"; + hash = "sha256-swrqyjA7Wgq17vd+753LDFcXrSFixVNLhTvj1bhG3DU="; + cargoHash = "sha256-72IwS8Nk1y6xDH9y8JW2LpbhFWaq0tpORx7JQSCF5/M="; + patchDir = ./patches/1_5; +} diff --git a/pkgs/by-name/ka/kanidm/README.md b/pkgs/by-name/ka/kanidm/README.md new file mode 100644 index 000000000000..34a354596218 --- /dev/null +++ b/pkgs/by-name/ka/kanidm/README.md @@ -0,0 +1,47 @@ +# Kanidm release guide + +Kanidm supports one release at any given time, with a 30-day overlap to allow for upgrades from old to new version. +Version upgrades are only supported on adjacent releases, with no support for jumping versions. + +To ensure we provide sufficient coverage for upgrading, we will aim to have two or three releases in tree at any given time. +Unsupported versions will be marked as vulnerable (lacking an "unsupported" mechanism), but built by hydra to avoid pushing the very large rebuild on users. + +The default version will be updated with each new version, but the default will not be backported. +It is expected that stable users will have to manually specify the version, and update that version, throughout the lifecycle of a NixOS release. + +## New release + +For example, when upgrading from 1.4 -> 1.5 + +### Init new version + +1. `cp pkgs/by-name/ka/kanidm/1_4.nix pkgs/by-name/ka/kanidm/1_5.nix` +1. `cp -r pkgs/by-name/ka/kanidm/patches/1_4 pkgs/by-name/ka/kanidm/patches/1_5` +1. Update `1_5.nix` hashes/paths, and as needed for upstream changes, `generic.nix` +1. Update `all-packages.nix` to add `kanidm_1_5` and `kanidmWithSecretProvisioning_1_5`, leave default +1. Create commit, `kanidm_1_5: init at 1.5.0` - this is the only commit that will be backported + +### Mark previous version deprecated + +1. Update `pkgs/by-name/ka/kanidm/1_4.nix` by adding `deprecated = true;` +1. Create commit `kanidm_1_4: update default to 1.5.0, deprecate 1.4.0` + +### Update default and mark deprecation + +1. `sed -i 's/1_4/1_5/' pkgs/by-name/ka/kanidm/package.nix` +1. Update `all-packages.nix` and set `kanidmWithSecretProvisioning = kanidmWithSecretProvisioning_1_5;` +1. Create commit `kanidm: update default to 1.5.0` + +### Backport to stable + +1. Manually create a backport using _only_ the init commit + +## Remove release + +Kanidm versions are supported for 30 days after the release of new versions. Following the example above, 1.5.x superseding 1.4.x in 30 days, do the following near the end of the 30 day window + +1. Update `pkgs/top-level/release.nix` and add `kanidm_1_4-1.4.6` to `permittedInsecurePackages` +1. Update `pkgs/top-level/release.nix` and remove `kanidm_1_3-1.3.3` from `permittedInsecurePackages` +1. Remove the third oldest release from `all-packages.nix`, e.g. 1.3.x continuing the example. Remove `kanidm_1_3` and `kanidmWithSecretProvisioning_1_3` +1. Update `pkgs/by-name/ka/kanidm/1_4.nix` by adding `unsupported = true;` +1. Open a PR and backport it to stable diff --git a/pkgs/by-name/ka/kanidm/generic.nix b/pkgs/by-name/ka/kanidm/generic.nix index 8512f1fc357c..ddaaba190fff 100644 --- a/pkgs/by-name/ka/kanidm/generic.nix +++ b/pkgs/by-name/ka/kanidm/generic.nix @@ -4,6 +4,7 @@ cargoHash, patchDir, extraMeta ? { }, + unsupported ? false, }: { @@ -60,8 +61,18 @@ rustPlatform.buildRustPackage rec { format = (formats.toml { }).generate "${KANIDM_BUILD_PROFILE}.toml"; profile = { - admin_bind_path = "/run/kanidmd/sock"; cpu_flags = if stdenv.hostPlatform.isx86_64 then "x86_64_legacy" else "none"; + } + // lib.optionalAttrs (lib.versionAtLeast version "1.5") { + client_config_path = "/etc/kanidm/config"; + resolver_config_path = "/etc/kanidm/unixd"; + resolver_unix_shell_path = "${lib.getBin bashInteractive}/bin/bash"; + server_admin_bind_path = "/run/kanidmd/sock"; + server_config_path = "/etc/kanidm/server.toml"; + server_ui_pkg_path = "@htmx_ui_pkg_path@"; + } + // lib.optionalAttrs (lib.versionOlder version "1.5") { + admin_bind_path = "/run/kanidmd/sock"; default_config_path = "/etc/kanidm/server.toml"; default_unix_shell_path = "${lib.getBin bashInteractive}/bin/bash"; htmx_ui_pkg_path = "@htmx_ui_pkg_path@"; @@ -160,6 +171,14 @@ rustPlatform.buildRustPackage rec { adamcstephens Flakebi ]; + knownVulnerabilities = lib.optionals unsupported [ + '' + kanidm ${version} has reached EOL. + + Please upgrade by verifying `kanidmd domain upgrade-check` and choosing the next version with `services.kanidm.package = pkgs.kanidm_1_x;` + See upgrade guide at https://kanidm.github.io/kanidm/master/server_updates.html + '' + ]; } // extraMeta; } diff --git a/pkgs/by-name/ka/kanidm/patches/1_5/oauth2-basic-secret-modify.patch b/pkgs/by-name/ka/kanidm/patches/1_5/oauth2-basic-secret-modify.patch new file mode 100644 index 000000000000..80bd4c16bd9b --- /dev/null +++ b/pkgs/by-name/ka/kanidm/patches/1_5/oauth2-basic-secret-modify.patch @@ -0,0 +1,308 @@ +From e9dfca73e6fb80faf6fc106e7aee6b93c0908525 Mon Sep 17 00:00:00 2001 +From: oddlama +Date: Fri, 1 Nov 2024 12:26:17 +0100 +Subject: [PATCH 1/2] oauth2 basic secret modify + +--- + server/core/src/actors/v1_write.rs | 42 ++++++++++++++++++++++++++++++ + server/core/src/https/v1.rs | 6 ++++- + server/core/src/https/v1_oauth2.rs | 29 +++++++++++++++++++++ + server/lib/src/constants/acp.rs | 6 +++++ + 4 files changed, 82 insertions(+), 1 deletion(-) + +diff --git a/server/core/src/actors/v1_write.rs b/server/core/src/actors/v1_write.rs +index 732e826c8..0fe66503f 100644 +--- a/server/core/src/actors/v1_write.rs ++++ b/server/core/src/actors/v1_write.rs +@@ -317,20 +317,62 @@ impl QueryServerWriteV1 { + }; + + trace!(?del, "Begin delete event"); + + idms_prox_write + .qs_write + .delete(&del) + .and_then(|_| idms_prox_write.commit().map(|_| ())) + } + ++ #[instrument( ++ level = "info", ++ skip_all, ++ fields(uuid = ?eventid) ++ )] ++ pub async fn handle_oauth2_basic_secret_write( ++ &self, ++ client_auth_info: ClientAuthInfo, ++ filter: Filter, ++ new_secret: String, ++ eventid: Uuid, ++ ) -> Result<(), OperationError> { ++ // Given a protoEntry, turn this into a modification set. ++ let ct = duration_from_epoch_now(); ++ let mut idms_prox_write = self.idms.proxy_write(ct).await?; ++ let ident = idms_prox_write ++ .validate_client_auth_info_to_ident(client_auth_info, ct) ++ .map_err(|e| { ++ admin_error!(err = ?e, "Invalid identity"); ++ e ++ })?; ++ ++ let modlist = ModifyList::new_purge_and_set( ++ Attribute::OAuth2RsBasicSecret, ++ Value::SecretValue(new_secret), ++ ); ++ ++ let mdf = ++ ModifyEvent::from_internal_parts(ident, &modlist, &filter, &idms_prox_write.qs_write) ++ .map_err(|e| { ++ admin_error!(err = ?e, "Failed to begin modify during handle_oauth2_basic_secret_write"); ++ e ++ })?; ++ ++ trace!(?mdf, "Begin modify event"); ++ ++ idms_prox_write ++ .qs_write ++ .modify(&mdf) ++ .and_then(|_| idms_prox_write.commit()) ++ } ++ + #[instrument( + level = "info", + skip_all, + fields(uuid = ?eventid) + )] + pub async fn handle_reviverecycled( + &self, + client_auth_info: ClientAuthInfo, + filter: Filter, + eventid: Uuid, +diff --git a/server/core/src/https/v1.rs b/server/core/src/https/v1.rs +index c410a4b5d..cc67cac6c 100644 +--- a/server/core/src/https/v1.rs ++++ b/server/core/src/https/v1.rs +@@ -1,17 +1,17 @@ + //! The V1 API things! + + use axum::extract::{Path, State}; + use axum::http::{HeaderMap, HeaderValue}; + use axum::middleware::from_fn; + use axum::response::{IntoResponse, Response}; +-use axum::routing::{delete, get, post, put}; ++use axum::routing::{delete, get, post, put, patch}; + use axum::{Extension, Json, Router}; + use axum_extra::extract::cookie::{Cookie, CookieJar, SameSite}; + use compact_jwt::{Jwk, Jws, JwsSigner}; + use kanidm_proto::constants::uri::V1_AUTH_VALID; + use std::net::IpAddr; + use uuid::Uuid; + + use kanidm_proto::internal::{ + ApiToken, AppLink, CUIntentToken, CURequest, CUSessionToken, CUStatus, CreateRequest, + CredentialStatus, DeleteRequest, IdentifyUserRequest, IdentifyUserResponse, ModifyRequest, +@@ -3120,20 +3120,24 @@ pub(crate) fn route_setup(state: ServerState) -> Router { + ) + .route( + "/v1/oauth2/:rs_name/_image", + post(super::v1_oauth2::oauth2_id_image_post) + .delete(super::v1_oauth2::oauth2_id_image_delete), + ) + .route( + "/v1/oauth2/:rs_name/_basic_secret", + get(super::v1_oauth2::oauth2_id_get_basic_secret), + ) ++ .route( ++ "/v1/oauth2/:rs_name/_basic_secret", ++ patch(super::v1_oauth2::oauth2_id_patch_basic_secret), ++ ) + .route( + "/v1/oauth2/:rs_name/_scopemap/:group", + post(super::v1_oauth2::oauth2_id_scopemap_post) + .delete(super::v1_oauth2::oauth2_id_scopemap_delete), + ) + .route( + "/v1/oauth2/:rs_name/_sup_scopemap/:group", + post(super::v1_oauth2::oauth2_id_sup_scopemap_post) + .delete(super::v1_oauth2::oauth2_id_sup_scopemap_delete), + ) +diff --git a/server/core/src/https/v1_oauth2.rs b/server/core/src/https/v1_oauth2.rs +index d3966a7ad..f89c02c69 100644 +--- a/server/core/src/https/v1_oauth2.rs ++++ b/server/core/src/https/v1_oauth2.rs +@@ -144,20 +144,49 @@ pub(crate) async fn oauth2_id_get_basic_secret( + ) -> Result>, WebError> { + let filter = oauth2_id(&rs_name); + state + .qe_r_ref + .handle_oauth2_basic_secret_read(client_auth_info, filter, kopid.eventid) + .await + .map(Json::from) + .map_err(WebError::from) + } + ++#[utoipa::path( ++ patch, ++ path = "/v1/oauth2/{rs_name}/_basic_secret", ++ request_body=ProtoEntry, ++ responses( ++ DefaultApiResponse, ++ ), ++ security(("token_jwt" = [])), ++ tag = "v1/oauth2", ++ operation_id = "oauth2_id_patch_basic_secret" ++)] ++/// Overwrite the basic secret for a given OAuth2 Resource Server. ++#[instrument(level = "info", skip(state, new_secret))] ++pub(crate) async fn oauth2_id_patch_basic_secret( ++ State(state): State, ++ Extension(kopid): Extension, ++ VerifiedClientInformation(client_auth_info): VerifiedClientInformation, ++ Path(rs_name): Path, ++ Json(new_secret): Json, ++) -> Result, WebError> { ++ let filter = oauth2_id(&rs_name); ++ state ++ .qe_w_ref ++ .handle_oauth2_basic_secret_write(client_auth_info, filter, new_secret, kopid.eventid) ++ .await ++ .map(Json::from) ++ .map_err(WebError::from) ++} ++ + #[utoipa::path( + patch, + path = "/v1/oauth2/{rs_name}", + request_body=ProtoEntry, + responses( + DefaultApiResponse, + ), + security(("token_jwt" = [])), + tag = "v1/oauth2", + operation_id = "oauth2_id_patch" +diff --git a/server/lib/src/constants/acp.rs b/server/lib/src/constants/acp.rs +index be1836345..ebf4445be 100644 +--- a/server/lib/src/constants/acp.rs ++++ b/server/lib/src/constants/acp.rs +@@ -658,36 +658,38 @@ lazy_static! { + Attribute::Image, + ], + modify_present_attrs: vec![ + Attribute::Description, + Attribute::DisplayName, + Attribute::OAuth2RsName, + Attribute::OAuth2RsOrigin, + Attribute::OAuth2RsOriginLanding, + Attribute::OAuth2RsSupScopeMap, + Attribute::OAuth2RsScopeMap, ++ Attribute::OAuth2RsBasicSecret, + Attribute::OAuth2AllowInsecureClientDisablePkce, + Attribute::OAuth2JwtLegacyCryptoEnable, + Attribute::OAuth2PreferShortUsername, + Attribute::OAuth2AllowLocalhostRedirect, + Attribute::OAuth2RsClaimMap, + Attribute::Image, + ], + create_attrs: vec![ + Attribute::Class, + Attribute::Description, + Attribute::DisplayName, + Attribute::OAuth2RsName, + Attribute::OAuth2RsOrigin, + Attribute::OAuth2RsOriginLanding, + Attribute::OAuth2RsSupScopeMap, + Attribute::OAuth2RsScopeMap, ++ Attribute::OAuth2RsBasicSecret, + Attribute::OAuth2AllowInsecureClientDisablePkce, + Attribute::OAuth2JwtLegacyCryptoEnable, + Attribute::OAuth2PreferShortUsername, + Attribute::OAuth2AllowLocalhostRedirect, + Attribute::OAuth2RsClaimMap, + Attribute::Image, + ], + create_classes: vec![ + EntryClass::Object, + EntryClass::OAuth2ResourceServer, +@@ -759,37 +761,39 @@ lazy_static! { + Attribute::Image, + ], + modify_present_attrs: vec![ + Attribute::Description, + Attribute::DisplayName, + Attribute::Name, + Attribute::OAuth2RsOrigin, + Attribute::OAuth2RsOriginLanding, + Attribute::OAuth2RsSupScopeMap, + Attribute::OAuth2RsScopeMap, ++ Attribute::OAuth2RsBasicSecret, + Attribute::OAuth2AllowInsecureClientDisablePkce, + Attribute::OAuth2JwtLegacyCryptoEnable, + Attribute::OAuth2PreferShortUsername, + Attribute::OAuth2AllowLocalhostRedirect, + Attribute::OAuth2RsClaimMap, + Attribute::Image, + ], + create_attrs: vec![ + Attribute::Class, + Attribute::Description, + Attribute::Name, + Attribute::DisplayName, + Attribute::OAuth2RsName, + Attribute::OAuth2RsOrigin, + Attribute::OAuth2RsOriginLanding, + Attribute::OAuth2RsSupScopeMap, + Attribute::OAuth2RsScopeMap, ++ Attribute::OAuth2RsBasicSecret, + Attribute::OAuth2AllowInsecureClientDisablePkce, + Attribute::OAuth2JwtLegacyCryptoEnable, + Attribute::OAuth2PreferShortUsername, + Attribute::OAuth2AllowLocalhostRedirect, + Attribute::OAuth2RsClaimMap, + Attribute::Image, + ], + create_classes: vec![ + EntryClass::Object, + EntryClass::Account, +@@ -864,38 +868,40 @@ lazy_static! { + Attribute::OAuth2StrictRedirectUri, + ], + modify_present_attrs: vec![ + Attribute::Description, + Attribute::DisplayName, + Attribute::Name, + Attribute::OAuth2RsOrigin, + Attribute::OAuth2RsOriginLanding, + Attribute::OAuth2RsSupScopeMap, + Attribute::OAuth2RsScopeMap, ++ Attribute::OAuth2RsBasicSecret, + Attribute::OAuth2AllowInsecureClientDisablePkce, + Attribute::OAuth2JwtLegacyCryptoEnable, + Attribute::OAuth2PreferShortUsername, + Attribute::OAuth2AllowLocalhostRedirect, + Attribute::OAuth2RsClaimMap, + Attribute::Image, + Attribute::OAuth2StrictRedirectUri, + ], + create_attrs: vec![ + Attribute::Class, + Attribute::Description, + Attribute::Name, + Attribute::DisplayName, + Attribute::OAuth2RsName, + Attribute::OAuth2RsOrigin, + Attribute::OAuth2RsOriginLanding, + Attribute::OAuth2RsSupScopeMap, + Attribute::OAuth2RsScopeMap, ++ Attribute::OAuth2RsBasicSecret, + Attribute::OAuth2AllowInsecureClientDisablePkce, + Attribute::OAuth2JwtLegacyCryptoEnable, + Attribute::OAuth2PreferShortUsername, + Attribute::OAuth2AllowLocalhostRedirect, + Attribute::OAuth2RsClaimMap, + Attribute::Image, + Attribute::OAuth2StrictRedirectUri, + ], + create_classes: vec![ + EntryClass::Object, +-- +2.46.1 + diff --git a/pkgs/by-name/ka/kanidm/patches/1_5/recover-account.patch b/pkgs/by-name/ka/kanidm/patches/1_5/recover-account.patch new file mode 100644 index 000000000000..1ec61301f036 --- /dev/null +++ b/pkgs/by-name/ka/kanidm/patches/1_5/recover-account.patch @@ -0,0 +1,173 @@ +From c8ed69efe3f702b19834c2659be1dd3ec2d41c17 Mon Sep 17 00:00:00 2001 +From: oddlama +Date: Fri, 1 Nov 2024 12:27:43 +0100 +Subject: [PATCH 2/2] recover account + +--- + server/core/src/actors/internal.rs | 3 ++- + server/core/src/admin.rs | 6 +++--- + server/daemon/src/main.rs | 14 +++++++++++++- + server/daemon/src/opt.rs | 4 ++++ + 4 files changed, 22 insertions(+), 5 deletions(-) + +diff --git a/server/core/src/actors/internal.rs b/server/core/src/actors/internal.rs +index 420e72c6c..5c4353116 100644 +--- a/server/core/src/actors/internal.rs ++++ b/server/core/src/actors/internal.rs +@@ -171,25 +171,26 @@ impl QueryServerWriteV1 { + } + + #[instrument( + level = "info", + skip(self, eventid), + fields(uuid = ?eventid) + )] + pub(crate) async fn handle_admin_recover_account( + &self, + name: String, ++ password: Option, + eventid: Uuid, + ) -> Result { + let ct = duration_from_epoch_now(); + let mut idms_prox_write = self.idms.proxy_write(ct).await?; +- let pw = idms_prox_write.recover_account(name.as_str(), None)?; ++ let pw = idms_prox_write.recover_account(name.as_str(), password.as_deref())?; + + idms_prox_write.commit().map(|()| pw) + } + + #[instrument( + level = "info", + skip_all, + fields(uuid = ?eventid) + )] + pub(crate) async fn handle_domain_raise(&self, eventid: Uuid) -> Result { +diff --git a/server/core/src/admin.rs b/server/core/src/admin.rs +index 90ccb1927..85e31ddef 100644 +--- a/server/core/src/admin.rs ++++ b/server/core/src/admin.rs +@@ -17,21 +17,21 @@ use tokio_util::codec::{Decoder, Encoder, Framed}; + use tracing::{span, Instrument, Level}; + use uuid::Uuid; + + pub use kanidm_proto::internal::{ + DomainInfo as ProtoDomainInfo, DomainUpgradeCheckReport as ProtoDomainUpgradeCheckReport, + DomainUpgradeCheckStatus as ProtoDomainUpgradeCheckStatus, + }; + + #[derive(Serialize, Deserialize, Debug)] + pub enum AdminTaskRequest { +- RecoverAccount { name: String }, ++ RecoverAccount { name: String, password: Option }, + ShowReplicationCertificate, + RenewReplicationCertificate, + RefreshReplicationConsumer, + DomainShow, + DomainUpgradeCheck, + DomainRaise, + DomainRemigrate { level: Option }, + } + + #[derive(Serialize, Deserialize, Debug)] +@@ -302,22 +302,22 @@ async fn handle_client( + let mut reqs = Framed::new(sock, ServerCodec); + + trace!("Waiting for requests ..."); + while let Some(Ok(req)) = reqs.next().await { + // Setup the logging span + let eventid = Uuid::new_v4(); + let nspan = span!(Level::INFO, "handle_admin_client_request", uuid = ?eventid); + + let resp = async { + match req { +- AdminTaskRequest::RecoverAccount { name } => { +- match server_rw.handle_admin_recover_account(name, eventid).await { ++ AdminTaskRequest::RecoverAccount { name, password } => { ++ match server_rw.handle_admin_recover_account(name, password, eventid).await { + Ok(password) => AdminTaskResponse::RecoverAccount { password }, + Err(e) => { + error!(err = ?e, "error during recover-account"); + AdminTaskResponse::Error + } + } + } + AdminTaskRequest::ShowReplicationCertificate => match repl_ctrl_tx.as_mut() { + Some(ctrl_tx) => show_replication_certificate(ctrl_tx).await, + None => { +diff --git a/server/daemon/src/main.rs b/server/daemon/src/main.rs +index 7486d34a8..784106352 100644 +--- a/server/daemon/src/main.rs ++++ b/server/daemon/src/main.rs +@@ -903,27 +903,39 @@ async fn kanidm_main( + } else { + let output_mode: ConsoleOutputMode = commonopts.output_mode.to_owned().into(); + submit_admin_req( + config.adminbindpath.as_str(), + AdminTaskRequest::RefreshReplicationConsumer, + output_mode, + ) + .await; + } + } +- KanidmdOpt::RecoverAccount { name, commonopts } => { ++ KanidmdOpt::RecoverAccount { name, from_environment, commonopts } => { + info!("Running account recovery ..."); + let output_mode: ConsoleOutputMode = commonopts.output_mode.to_owned().into(); ++ let password = if *from_environment { ++ match std::env::var("KANIDM_RECOVER_ACCOUNT_PASSWORD") { ++ Ok(val) => Some(val), ++ _ => { ++ error!("Environment variable KANIDM_RECOVER_ACCOUNT_PASSWORD not set"); ++ return ExitCode::FAILURE; ++ } ++ } ++ } else { ++ None ++ }; + submit_admin_req( + config.adminbindpath.as_str(), + AdminTaskRequest::RecoverAccount { + name: name.to_owned(), ++ password, + }, + output_mode, + ) + .await; + } + KanidmdOpt::Database { + commands: DbCommands::Reindex(_copt), + } => { + info!("Running in reindex mode ..."); + reindex_server_core(&config).await; +diff --git a/server/daemon/src/opt.rs b/server/daemon/src/opt.rs +index f1b45a5b3..9c013e32e 100644 +--- a/server/daemon/src/opt.rs ++++ b/server/daemon/src/opt.rs +@@ -229,20 +229,24 @@ enum KanidmdOpt { + /// Create a self-signed ca and tls certificate in the locations listed from the + /// configuration. These certificates should *not* be used in production, they + /// are for testing and evaluation only! + CertGenerate(CommonOpt), + #[clap(name = "recover-account")] + /// Recover an account's password + RecoverAccount { + #[clap(value_parser)] + /// The account name to recover credentials for. + name: String, ++ /// Use the password given in the environment variable ++ /// `KANIDM_RECOVER_ACCOUNT_PASSWORD` instead of generating one. ++ #[clap(long = "from-environment")] ++ from_environment: bool, + #[clap(flatten)] + commonopts: CommonOpt, + }, + /// Display this server's replication certificate + ShowReplicationCertificate { + #[clap(flatten)] + commonopts: CommonOpt, + }, + /// Renew this server's replication certificate + RenewReplicationCertificate { +-- +2.46.1 + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a58cf1edb0c..ba7e68c24a95 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11376,6 +11376,7 @@ with pkgs; kanidm_1_3 = callPackage ../by-name/ka/kanidm/1_3.nix { }; kanidm_1_4 = callPackage ../by-name/ka/kanidm/1_4.nix { }; + kanidm_1_5 = callPackage ../by-name/ka/kanidm/1_5.nix { }; kanidmWithSecretProvisioning = kanidmWithSecretProvisioning_1_4; @@ -11387,6 +11388,10 @@ with pkgs; enableSecretProvisioning = true; }; + kanidmWithSecretProvisioning_1_5 = callPackage ../by-name/ka/kanidm/1_5.nix { + enableSecretProvisioning = true; + }; + knot-resolver = callPackage ../servers/dns/knot-resolver { systemd = systemdMinimal; # in closure already anyway }; From 1db4d963aab2230697d944a2c7d2efcca1a78689 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Mon, 10 Feb 2025 15:14:46 -0500 Subject: [PATCH 1080/2168] kanidm: update default to 1.5.0 --- pkgs/by-name/ka/kanidm/package.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ka/kanidm/package.nix b/pkgs/by-name/ka/kanidm/package.nix index a7bf92b6be6d..0b9178b3d6a7 100644 --- a/pkgs/by-name/ka/kanidm/package.nix +++ b/pkgs/by-name/ka/kanidm/package.nix @@ -1 +1 @@ -import ./1_4.nix +import ./1_5.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ba7e68c24a95..176f52d2aa03 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11378,7 +11378,7 @@ with pkgs; kanidm_1_4 = callPackage ../by-name/ka/kanidm/1_4.nix { }; kanidm_1_5 = callPackage ../by-name/ka/kanidm/1_5.nix { }; - kanidmWithSecretProvisioning = kanidmWithSecretProvisioning_1_4; + kanidmWithSecretProvisioning = kanidmWithSecretProvisioning_1_5; kanidmWithSecretProvisioning_1_3 = callPackage ../by-name/ka/kanidm/1_3.nix { enableSecretProvisioning = true; From 3cb1c53241c405ec008912fe6ac9988090c70978 Mon Sep 17 00:00:00 2001 From: Nessdoor Date: Tue, 11 Feb 2025 02:14:42 +0100 Subject: [PATCH 1081/2168] emacsPackages.notdeft: 0-unstable-2021-12-04 -> 0-unstable-2025-02-04 --- .../elisp-packages/manual-packages/notdeft/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/package.nix index 055c09a05f61..fd34ff4f8bff 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/package.nix @@ -18,13 +18,13 @@ melpaBuild { pname = "notdeft"; - version = "0-unstable-2021-12-04"; + version = "0-unstable-2025-02-04"; src = fetchFromGitHub { owner = "hasu"; repo = "notdeft"; - rev = "1b7054dcfc3547a7cafeb621552cec01d0540478"; - hash = "sha256-LMMLJFVpmoE/y3MqrgY2fmsehmzk6TkLsVoHmFUxiSw="; + rev = "de2b6a7666e9e5010184966f89a04241f221afe3"; + hash = "sha256-B8aVRb8hyAKmHTTVCtDRcb2F0Rs5zhlqyfRe7IxH5jc="; }; packageRequires = lib.optional withHydra hydra ++ lib.optional withIvy ivy; From ce39f53682acc2f2553bb5d2d2efbc8c9488b83e Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Wed, 5 Feb 2025 21:17:30 +0100 Subject: [PATCH 1082/2168] nginxMainline: 1.27.3 -> 1.27.4 Due to https://www.openwall.com/lists/oss-security/2025/02/05/8. Fix CVE-2025-23419. Change-Id: Iaac69b5071f02f608cb895338f42f15f7ac25831 Signed-off-by: Raito Bezarius --- pkgs/servers/http/nginx/mainline.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index cd314ea48f8f..0060f6de1791 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix args { - version = "1.27.3"; - hash = "sha256-uiOpVo9EIDa2HNDim9ZqR7kGNO+pHgss8tcZBXqbeQM="; + version = "1.27.4"; + hash = "sha256-KUgW+HmzAOYh+k7dU1PdHsALrbBWOZ7Osw3n22S3U7I="; } From 9490b4e08591b8ea0ae7e56b281b025ae223878c Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Wed, 5 Feb 2025 21:17:53 +0100 Subject: [PATCH 1083/2168] nginxStable: 1.26.2 -> 1.26.3 Due to https://www.openwall.com/lists/oss-security/2025/02/05/8. Fix CVE-2025-23419. Change-Id: I2a341a55467ee67f77f0b133a8e9d3e6243249eb Signed-off-by: Raito Bezarius --- pkgs/servers/http/nginx/stable.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/stable.nix b/pkgs/servers/http/nginx/stable.nix index e1c69c4263b0..d331ba630117 100644 --- a/pkgs/servers/http/nginx/stable.nix +++ b/pkgs/servers/http/nginx/stable.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix args { - version = "1.26.2"; - hash = "sha256-Yn/ghiCbuoCihToK3Z2VjX673/oahGeleEyaa08D1zg="; + version = "1.26.3"; + hash = "sha256-ae4rI3dEA25h0kuDZmiq0wQN2kYf5vVw8Xh+q1cMdao="; } From 0317f91517b7c94fe4d5d52a7cc6e63eaff78614 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 11 Feb 2025 02:51:00 +0100 Subject: [PATCH 1084/2168] nginx: add fixed zlib-ng patch --- pkgs/servers/http/nginx/generic.nix | 5 +- pkgs/servers/http/nginx/nginx-zlib-ng.patch | 271 ++++++++++++++++++++ 2 files changed, 272 insertions(+), 4 deletions(-) create mode 100644 pkgs/servers/http/nginx/nginx-zlib-ng.patch diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 6563f5c1e159..a767cab27d11 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -230,10 +230,7 @@ stdenv.mkDerivation { [ # https://github.com/NixOS/nixpkgs/issues/357522 # https://github.com/zlib-ng/patches/blob/5a036c0a00120c75ee573b27f4f44ade80d82ff2/nginx/README.md - (fetchpatch { - url = "https://raw.githubusercontent.com/zlib-ng/patches/38756e6325a5d2cc32709b8e9549984c63a78815/nginx/1.26.2-zlib-ng.patch"; - hash = "sha256-LX5kP6jFiqgt4ApKw5eqOAFJNkc5QI6kX8ZRvBYTi9k="; - }) + ./nginx-zlib-ng.patch ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ (fetchpatch { diff --git a/pkgs/servers/http/nginx/nginx-zlib-ng.patch b/pkgs/servers/http/nginx/nginx-zlib-ng.patch new file mode 100644 index 000000000000..0bda52411390 --- /dev/null +++ b/pkgs/servers/http/nginx/nginx-zlib-ng.patch @@ -0,0 +1,271 @@ +--- a/auto/lib/zlib/conf ++++ b/auto/lib/zlib/conf +@@ -33,8 +33,8 @@ if [ $ZLIB != NONE ]; then + + *) + have=NGX_ZLIB . auto/have +- LINK_DEPS="$LINK_DEPS $ZLIB/libz.a" +- CORE_LIBS="$CORE_LIBS $ZLIB/libz.a" ++ LINK_DEPS="$LINK_DEPS $ZLIB/libz-ng.a" ++ CORE_LIBS="$CORE_LIBS $ZLIB/libz-ng.a" + #CORE_LIBS="$CORE_LIBS -L $ZLIB -lz" + ;; + +@@ -50,10 +50,10 @@ else + ngx_feature="zlib library" + ngx_feature_name="NGX_ZLIB" + ngx_feature_run=no +- ngx_feature_incs="#include " ++ ngx_feature_incs="#include " + ngx_feature_path= +- ngx_feature_libs="-lz" +- ngx_feature_test="z_stream z; deflate(&z, Z_NO_FLUSH)" ++ ngx_feature_libs="-lz-ng" ++ ngx_feature_test="zng_stream z; zng_deflate(&z, Z_NO_FLUSH)" + . auto/feature + + +diff --git a/src/core/ngx_config.h b/src/core/ngx_config.h +index 1861be6..bd427b8 100644 +--- a/src/core/ngx_config.h ++++ b/src/core/ngx_config.h +@@ -141,5 +141,9 @@ typedef intptr_t ngx_flag_t; + + #endif + ++/* Force enable ZLIB-NG */ ++#ifndef NGX_ZLIB_NG ++#define NGX_ZLIB_NG 1 ++#endif + + #endif /* _NGX_CONFIG_H_INCLUDED_ */ +diff --git a/src/http/modules/ngx_http_gunzip_filter_module.c b/src/http/modules/ngx_http_gunzip_filter_module.c +index 5d170a1..d8dcc96 100644 +--- a/src/http/modules/ngx_http_gunzip_filter_module.c ++++ b/src/http/modules/ngx_http_gunzip_filter_module.c +@@ -10,7 +10,14 @@ + #include + #include + +-#include ++#if defined(NGX_ZLIB_NG) ++# include ++# define ZPREFIX(x) zng_ ## x ++# define z_stream zng_stream ++#elif defined(NGX_ZLIB) ++# include ++# define ZPREFIX(x) x ++#endif + + + typedef struct { +@@ -312,7 +319,7 @@ ngx_http_gunzip_filter_inflate_start(ngx_http_request_t *r, + ctx->zstream.opaque = ctx; + + /* windowBits +16 to decode gzip, zlib 1.2.0.4+ */ +- rc = inflateInit2(&ctx->zstream, MAX_WBITS + 16); ++ rc = ZPREFIX(inflateInit2)(&ctx->zstream, MAX_WBITS + 16); + + if (rc != Z_OK) { + ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0, +@@ -435,7 +442,7 @@ ngx_http_gunzip_filter_inflate(ngx_http_request_t *r, + ctx->zstream.avail_in, ctx->zstream.avail_out, + ctx->flush, ctx->redo); + +- rc = inflate(&ctx->zstream, ctx->flush); ++ rc = ZPREFIX(inflate)(&ctx->zstream, ctx->flush); + + if (rc != Z_OK && rc != Z_STREAM_END && rc != Z_BUF_ERROR) { + ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, +@@ -533,7 +540,7 @@ ngx_http_gunzip_filter_inflate(ngx_http_request_t *r, + + if (rc == Z_STREAM_END && ctx->zstream.avail_in > 0) { + +- rc = inflateReset(&ctx->zstream); ++ rc = ZPREFIX(inflateReset)(&ctx->zstream); + + if (rc != Z_OK) { + ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0, +@@ -584,7 +591,7 @@ ngx_http_gunzip_filter_inflate_end(ngx_http_request_t *r, + ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, + "gunzip inflate end"); + +- rc = inflateEnd(&ctx->zstream); ++ rc = ZPREFIX(inflateEnd)(&ctx->zstream); + + if (rc != Z_OK) { + ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0, +diff --git a/src/http/modules/ngx_http_gzip_filter_module.c b/src/http/modules/ngx_http_gzip_filter_module.c +index 7113df6..d6c2ea1 100644 +--- a/src/http/modules/ngx_http_gzip_filter_module.c ++++ b/src/http/modules/ngx_http_gzip_filter_module.c +@@ -9,7 +9,14 @@ + #include + #include + +-#include ++#if defined(NGX_ZLIB_NG) ++# include ++# define ZPREFIX(x) zng_ ## x ++# define z_stream zng_stream ++#elif defined(NGX_ZLIB) ++# include ++# define ZPREFIX(x) x ++#endif + + + typedef struct { +@@ -454,7 +461,7 @@ failed: + ctx->done = 1; + + if (ctx->preallocated) { +- deflateEnd(&ctx->zstream); ++ ZPREFIX(deflateEnd)(&ctx->zstream); + + ngx_pfree(r->pool, ctx->preallocated); + } +@@ -527,10 +534,20 @@ ngx_http_gzip_filter_memory(ngx_http_request_t *r, ngx_http_gzip_ctx_t *ctx) + wbits = ngx_max(wbits, 13); + } + +- ctx->allocated = 8192 + 16 + (1 << (wbits + 2)) +- + 131072 + (5 << (memlevel + 6)) +- + 4 * (64 + sizeof(void*)); + ctx->zlib_ng = 1; ++ ctx->allocated = 6144 // State ++ + 65536 // Window ++ + 65536 // Prev ++ + 131072 // Head ++ + 163840 // Pending ++ + 56 + 8 // Alloc struct + padding ++#if (defined(__s390__) || defined(__s390x__) || defined(__zarch__)) ++ + 4096 // Required to fix allocation alignment ++#else ++ + 64 // Required to fix allocation alignment ++#endif ++ + 256; // Extra to allow for future changes ++ + } + } + +@@ -623,7 +640,7 @@ ngx_http_gzip_filter_deflate_start(ngx_http_request_t *r, + ctx->zstream.zfree = ngx_http_gzip_filter_free; + ctx->zstream.opaque = ctx; + +- rc = deflateInit2(&ctx->zstream, (int) conf->level, Z_DEFLATED, ++ rc = ZPREFIX(deflateInit2)(&ctx->zstream, (int) conf->level, Z_DEFLATED, + ctx->wbits + 16, ctx->memlevel, Z_DEFAULT_STRATEGY); + + if (rc != Z_OK) { +@@ -758,7 +775,7 @@ ngx_http_gzip_filter_deflate(ngx_http_request_t *r, ngx_http_gzip_ctx_t *ctx) + ctx->zstream.avail_in, ctx->zstream.avail_out, + ctx->flush, ctx->redo); + +- rc = deflate(&ctx->zstream, ctx->flush); ++ rc = ZPREFIX(deflate)(&ctx->zstream, ctx->flush); + + if (rc != Z_OK && rc != Z_STREAM_END && rc != Z_BUF_ERROR) { + ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0, +@@ -882,7 +899,7 @@ ngx_http_gzip_filter_deflate_end(ngx_http_request_t *r, + ctx->zin = ctx->zstream.total_in; + ctx->zout = ctx->zstream.total_out; + +- rc = deflateEnd(&ctx->zstream); ++ rc = ZPREFIX(deflateEnd)(&ctx->zstream); + + if (rc != Z_OK) { + ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0, +diff --git a/src/http/modules/ngx_http_log_module.c b/src/http/modules/ngx_http_log_module.c +index f7c4bd2..ad71d4d 100644 +--- a/src/http/modules/ngx_http_log_module.c ++++ b/src/http/modules/ngx_http_log_module.c +@@ -9,8 +9,13 @@ + #include + #include + +-#if (NGX_ZLIB) +-#include ++#if defined(NGX_ZLIB_NG) ++# include ++# define ZPREFIX(x) zng_ ## x ++# define z_stream zng_stream ++#elif defined(NGX_ZLIB) ++# include ++# define ZPREFIX(x) x + #endif + + +@@ -634,7 +639,7 @@ ngx_http_log_gzip(ngx_fd_t fd, u_char *buf, size_t len, ngx_int_t level, + zstream.next_out = out; + zstream.avail_out = size; + +- rc = deflateInit2(&zstream, (int) level, Z_DEFLATED, wbits + 16, memlevel, ++ rc = ZPREFIX(deflateInit2)(&zstream, (int) level, Z_DEFLATED, wbits + 16, memlevel, + Z_DEFAULT_STRATEGY); + + if (rc != Z_OK) { +@@ -647,7 +652,7 @@ ngx_http_log_gzip(ngx_fd_t fd, u_char *buf, size_t len, ngx_int_t level, + zstream.next_in, zstream.next_out, + zstream.avail_in, zstream.avail_out); + +- rc = deflate(&zstream, Z_FINISH); ++ rc = ZPREFIX(deflate)(&zstream, Z_FINISH); + + if (rc != Z_STREAM_END) { + ngx_log_error(NGX_LOG_ALERT, log, 0, +@@ -663,7 +668,7 @@ ngx_http_log_gzip(ngx_fd_t fd, u_char *buf, size_t len, ngx_int_t level, + + size -= zstream.avail_out; + +- rc = deflateEnd(&zstream); ++ rc = ZPREFIX(deflateEnd)(&zstream); + + if (rc != Z_OK) { + ngx_log_error(NGX_LOG_ALERT, log, 0, "deflateEnd() failed: %d", rc); +diff --git a/src/stream/ngx_stream_log_module.c b/src/stream/ngx_stream_log_module.c +index 0ff7f42..0b9d12c 100644 +--- a/src/stream/ngx_stream_log_module.c ++++ b/src/stream/ngx_stream_log_module.c +@@ -9,8 +9,13 @@ + #include + #include + +-#if (NGX_ZLIB) +-#include ++#if defined(NGX_ZLIB_NG) ++# include ++# define ZPREFIX(x) zng_ ## x ++# define z_stream zng_stream ++#elif defined(NGX_ZLIB) ++# include ++# define ZPREFIX(x) x + #endif + + +@@ -525,7 +530,7 @@ ngx_stream_log_gzip(ngx_fd_t fd, u_char *buf, size_t len, ngx_int_t level, + zstream.next_out = out; + zstream.avail_out = size; + +- rc = deflateInit2(&zstream, (int) level, Z_DEFLATED, wbits + 16, memlevel, ++ rc = ZPREFIX(deflateInit2)(&zstream, (int) level, Z_DEFLATED, wbits + 16, memlevel, + Z_DEFAULT_STRATEGY); + + if (rc != Z_OK) { +@@ -538,7 +543,7 @@ ngx_stream_log_gzip(ngx_fd_t fd, u_char *buf, size_t len, ngx_int_t level, + zstream.next_in, zstream.next_out, + zstream.avail_in, zstream.avail_out); + +- rc = deflate(&zstream, Z_FINISH); ++ rc = ZPREFIX(deflate)(&zstream, Z_FINISH); + + if (rc != Z_STREAM_END) { + ngx_log_error(NGX_LOG_ALERT, log, 0, +@@ -554,7 +559,7 @@ ngx_stream_log_gzip(ngx_fd_t fd, u_char *buf, size_t len, ngx_int_t level, + + size -= zstream.avail_out; + +- rc = deflateEnd(&zstream); ++ rc = ZPREFIX(deflateEnd)(&zstream); + + if (rc != Z_OK) { + ngx_log_error(NGX_LOG_ALERT, log, 0, "deflateEnd() failed: %d", rc); From 473b725c5dedf23a85518340d13e5d977c121dc1 Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Mon, 10 Feb 2025 18:11:28 -0800 Subject: [PATCH 1085/2168] probe-rs-tools: 0.26.0 -> 0.27.0 --- pkgs/by-name/pr/probe-rs-tools/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/probe-rs-tools/package.nix b/pkgs/by-name/pr/probe-rs-tools/package.nix index be2490502562..99ef721a9216 100644 --- a/pkgs/by-name/pr/probe-rs-tools/package.nix +++ b/pkgs/by-name/pr/probe-rs-tools/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "probe-rs-tools"; - version = "0.26.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "probe-rs"; repo = "probe-rs"; tag = "v${version}"; - hash = "sha256-cVRa5idgAi6UoQkEFvhFd27Mp9AVkfzEuGnWrThm9+Q="; + hash = "sha256-xtUaGJyzr0uQUb/A+7RmOVVgrXIctr2I9gLPU2/rXso="; }; useFetchCargoVendor = true; - cargoHash = "sha256-HTYpSm6Q/ZLQRxD1a9Xky3tFOadp8iJnPXAhwjcxfnM="; + cargoHash = "sha256-acGLTbWI0SHspFISWw5Lj+sqn5HE4du5jTC3NS5zzh8="; buildAndTestSubdir = pname; From 768bb2c9b63df453c029d3ae61ce3aa6cb0e1ca7 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Tue, 3 Dec 2024 22:09:45 -0800 Subject: [PATCH 1086/2168] flutter319: drop --- .../compilers/flutter/versions/3_19/data.json | 1002 ----------------- .../3_19/engine/patches/flutter-140969.patch | 41 - ...deregister-pub-dependencies-artifact.patch | 19 - .../patches/disable-auto-update-shared.patch | 13 - .../3_19/patches/disable-auto-update.patch | 37 - .../gradle-flutter-tools-wrapper.patch | 44 - pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 8 files changed, 1 insertion(+), 1157 deletions(-) delete mode 100644 pkgs/development/compilers/flutter/versions/3_19/data.json delete mode 100644 pkgs/development/compilers/flutter/versions/3_19/engine/patches/flutter-140969.patch delete mode 100644 pkgs/development/compilers/flutter/versions/3_19/patches/deregister-pub-dependencies-artifact.patch delete mode 100644 pkgs/development/compilers/flutter/versions/3_19/patches/disable-auto-update-shared.patch delete mode 100644 pkgs/development/compilers/flutter/versions/3_19/patches/disable-auto-update.patch delete mode 100644 pkgs/development/compilers/flutter/versions/3_19/patches/gradle-flutter-tools-wrapper.patch diff --git a/pkgs/development/compilers/flutter/versions/3_19/data.json b/pkgs/development/compilers/flutter/versions/3_19/data.json deleted file mode 100644 index ac71e12b51e1..000000000000 --- a/pkgs/development/compilers/flutter/versions/3_19/data.json +++ /dev/null @@ -1,1002 +0,0 @@ -{ - "version": "3.19.4", - "engineVersion": "a5c24f538d05aaf66f7972fb23959d8cafb9f95a", - "engineSwiftShaderHash": "sha256-mRLCvhNkmHz7Rv6GzXkY7OB1opBSq+ATWZ466qZdgto=", - "engineSwiftShaderRev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f", - "channel": "stable", - "engineHashes": { - "aarch64-linux": { - "aarch64-linux": "sha256-Rgz097BWYOBnjfq/J/c3Mj4H289Jdydd9Nq4OKcf/38=", - "x86_64-linux": "sha256-Rgz097BWYOBnjfq/J/c3Mj4H289Jdydd9Nq4OKcf/38=" - }, - "x86_64-linux": { - "aarch64-linux": "sha256-vzeVvck3cEtK90rG89qW1SNhnTFXBsTdV8mVjiMl3BE=", - "x86_64-linux": "sha256-vzeVvck3cEtK90rG89qW1SNhnTFXBsTdV8mVjiMl3BE=" - } - }, - "dartVersion": "3.3.2", - "dartHash": { - "x86_64-linux": "sha256-eO8qcSQNWGEz/5oVaJ5tjRMnGy2aq3PbcF15z/Pi3xQ=", - "aarch64-linux": "sha256-K/sxpQAVd5Z75KPCb3XbIZ8dhuS/zTIDgO/YZoIKQjU=", - "x86_64-darwin": "sha256-Zh+nXms2NIOuS3Cc25kQT2ZKUXW3NbDZB6CugI4GJnM=", - "aarch64-darwin": "sha256-5mSNavcc3l8Cv3WkJFTjtpbR/x6MRZ1i9iwyv7V1BYQ=" - }, - "flutterHash": "sha256-y1zU74xU8xwJAJM2TlWTbyzySvKUZ42tA6hTIYE6ies=", - "artifactHashes": { - "android": { - "aarch64-darwin": "sha256-x6L9qgzcd6HKuTV/L4iCHdyoh9eoQQqZX5B2IgLzqQI=", - "aarch64-linux": "sha256-MgDFaeQ/1cSGY751I7bExD/x8ZLw3youhpXlvcSuDaE=", - "x86_64-darwin": "sha256-x6L9qgzcd6HKuTV/L4iCHdyoh9eoQQqZX5B2IgLzqQI=", - "x86_64-linux": "sha256-MgDFaeQ/1cSGY751I7bExD/x8ZLw3youhpXlvcSuDaE=" - }, - "fuchsia": { - "aarch64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", - "aarch64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", - "x86_64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", - "x86_64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=" - }, - "ios": { - "aarch64-darwin": "sha256-mqHe53QP6SCFkSkTSaoORAmCYnXYsk/MqgsIv3B2nZk=", - "aarch64-linux": "sha256-mqHe53QP6SCFkSkTSaoORAmCYnXYsk/MqgsIv3B2nZk=", - "x86_64-darwin": "sha256-mqHe53QP6SCFkSkTSaoORAmCYnXYsk/MqgsIv3B2nZk=", - "x86_64-linux": "sha256-mqHe53QP6SCFkSkTSaoORAmCYnXYsk/MqgsIv3B2nZk=" - }, - "linux": { - "aarch64-darwin": "sha256-6EUraGnPYhPiZZikCMZE8gDw+FAsZj5XzCsmLOLULE8=", - "aarch64-linux": "sha256-6EUraGnPYhPiZZikCMZE8gDw+FAsZj5XzCsmLOLULE8=", - "x86_64-darwin": "sha256-2B1gVRil51sQEO65pD7To7sGa3aIzXFcQbIGoX97FJM=", - "x86_64-linux": "sha256-2B1gVRil51sQEO65pD7To7sGa3aIzXFcQbIGoX97FJM=" - }, - "macos": { - "aarch64-darwin": "sha256-rcB6lKXqmLsbI/RHAtTJgV1TJQf3w4B3tohwln0Fgw0=", - "aarch64-linux": "sha256-rcB6lKXqmLsbI/RHAtTJgV1TJQf3w4B3tohwln0Fgw0=", - "x86_64-darwin": "sha256-rcB6lKXqmLsbI/RHAtTJgV1TJQf3w4B3tohwln0Fgw0=", - "x86_64-linux": "sha256-rcB6lKXqmLsbI/RHAtTJgV1TJQf3w4B3tohwln0Fgw0=" - }, - "universal": { - "aarch64-darwin": "sha256-gX4WA4lHIinwbOK2z3RiQ3JBD73mMyazvv4VvT5mkQw=", - "aarch64-linux": "sha256-lgftQbVZhZtikAr6D8TaPoplUFtxE9uQgGLje4RHMlM=", - "x86_64-darwin": "sha256-TFfI6gifj73LbZ1kbxngnRMzH7kckyMlCJD6hRKl5ts=", - "x86_64-linux": "sha256-6pQLVOewI86CkEUUp25XuPhgVKB3yQUHiusLqK1Muug=" - }, - "web": { - "aarch64-darwin": "sha256-Fdnq1VhiGvLdqv4g3rRy3PzC2xYKozBr6kDaXeGlPLM=", - "aarch64-linux": "sha256-Fdnq1VhiGvLdqv4g3rRy3PzC2xYKozBr6kDaXeGlPLM=", - "x86_64-darwin": "sha256-Fdnq1VhiGvLdqv4g3rRy3PzC2xYKozBr6kDaXeGlPLM=", - "x86_64-linux": "sha256-Fdnq1VhiGvLdqv4g3rRy3PzC2xYKozBr6kDaXeGlPLM=" - }, - "windows": { - "aarch64-darwin": "sha256-MRzcLlYApeKPMTSkf5ql4EuvVY8PL9asAKNSFUFA/YY=", - "aarch64-linux": "sha256-MRzcLlYApeKPMTSkf5ql4EuvVY8PL9asAKNSFUFA/YY=", - "x86_64-darwin": "sha256-MRzcLlYApeKPMTSkf5ql4EuvVY8PL9asAKNSFUFA/YY=", - "x86_64-linux": "sha256-MRzcLlYApeKPMTSkf5ql4EuvVY8PL9asAKNSFUFA/YY=" - } - }, - "pubspecLock": { - "packages": { - "_fe_analyzer_shared": { - "dependency": "direct main", - "description": { - "name": "_fe_analyzer_shared", - "sha256": "36a321c3d2cbe01cbcb3540a87b8843846e0206df3e691fa7b23e19e78de6d49", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "65.0.0" - }, - "analyzer": { - "dependency": "direct main", - "description": { - "name": "analyzer", - "sha256": "dfe03b90ec022450e22513b5e5ca1f01c0c01de9c3fba2f7fd233cb57a6b9a07", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.3.0" - }, - "archive": { - "dependency": "direct main", - "description": { - "name": "archive", - "sha256": "80e5141fafcb3361653ce308776cfd7d45e6e9fbb429e14eec571382c0c5fecb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.3.2" - }, - "args": { - "dependency": "direct main", - "description": { - "name": "args", - "sha256": "eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.2" - }, - "async": { - "dependency": "direct main", - "description": { - "name": "async", - "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.11.0" - }, - "boolean_selector": { - "dependency": "direct main", - "description": { - "name": "boolean_selector", - "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.1" - }, - "browser_launcher": { - "dependency": "direct main", - "description": { - "name": "browser_launcher", - "sha256": "6ee4c6b1f68a42e769ef6e663c4f56708522f7bce9d2ab6e308a37b612ffa4ec", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.1" - }, - "built_collection": { - "dependency": "direct main", - "description": { - "name": "built_collection", - "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.1.1" - }, - "built_value": { - "dependency": "direct main", - "description": { - "name": "built_value", - "sha256": "c9aabae0718ec394e5bc3c7272e6bb0dc0b32201a08fe185ec1d8401d3e39309", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "8.8.1" - }, - "checked_yaml": { - "dependency": "direct dev", - "description": { - "name": "checked_yaml", - "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.3" - }, - "cli_config": { - "dependency": "direct main", - "description": { - "name": "cli_config", - "sha256": "65c7830649e1f8247660f1b783effb460255d6e2c1ac94eb823cf1f84e59b288", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.2" - }, - "clock": { - "dependency": "direct main", - "description": { - "name": "clock", - "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.1" - }, - "collection": { - "dependency": "direct dev", - "description": { - "name": "collection", - "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.18.0" - }, - "completion": { - "dependency": "direct main", - "description": { - "name": "completion", - "sha256": "f11b7a628e6c42b9edc9b0bc3aa490e2d930397546d2f794e8e1325909d11c60", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.1" - }, - "convert": { - "dependency": "direct main", - "description": { - "name": "convert", - "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.1" - }, - "coverage": { - "dependency": "direct main", - "description": { - "name": "coverage", - "sha256": "8acabb8306b57a409bf4c83522065672ee13179297a6bb0cb9ead73948df7c76", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.7.2" - }, - "crypto": { - "dependency": "direct main", - "description": { - "name": "crypto", - "sha256": "ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.3" - }, - "csslib": { - "dependency": "direct main", - "description": { - "name": "csslib", - "sha256": "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.0" - }, - "dap": { - "dependency": "direct main", - "description": { - "name": "dap", - "sha256": "1dc9a11bc60836b151672d3edb6a56a18383ecf122e56eaf5837b32c81641aeb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.0" - }, - "dds": { - "dependency": "direct main", - "description": { - "name": "dds", - "sha256": "436bf46d0bf15ec750098fbf4d43e90210873ea615aee14611bfd593ae52ddd8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.0+1" - }, - "dds_service_extensions": { - "dependency": "direct main", - "description": { - "name": "dds_service_extensions", - "sha256": "c41b86e0c7c496b39d10448f1e4bcd2dbabc29c4cce2bd6d864d57a837ab94b2", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.6.2" - }, - "devtools_shared": { - "dependency": "direct main", - "description": { - "name": "devtools_shared", - "sha256": "7f173edabb97ac7c7815ae6b08dc18733504e62651eb0ab4216559e173164df1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.0.3" - }, - "dwds": { - "dependency": "direct main", - "description": { - "name": "dwds", - "sha256": "7ae2b39e73f959e572fa5efabf3606b0c9863a39067a869ac3ea593ace901280", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "23.0.0+1" - }, - "extension_discovery": { - "dependency": "direct main", - "description": { - "name": "extension_discovery", - "sha256": "20735622d0763865f9d94c3ecdce4441174530870760253e9d364fb4f3da8688", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.0" - }, - "fake_async": { - "dependency": "direct main", - "description": { - "name": "fake_async", - "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.3.1" - }, - "file": { - "dependency": "direct main", - "description": { - "name": "file", - "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "7.0.0" - }, - "file_testing": { - "dependency": "direct dev", - "description": { - "name": "file_testing", - "sha256": "0aaadb4025bd350403f4308ad6c4cea953278d9407814b8342558e4946840fb5", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.0" - }, - "fixnum": { - "dependency": "direct main", - "description": { - "name": "fixnum", - "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.0" - }, - "flutter_template_images": { - "dependency": "direct main", - "description": { - "name": "flutter_template_images", - "sha256": "fd3e55af73c577b9e3f88d4080d3e366cb5c8ef3fbd50b94dfeca56bb0235df6", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.2.0" - }, - "frontend_server_client": { - "dependency": "direct main", - "description": { - "name": "frontend_server_client", - "sha256": "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.2.0" - }, - "glob": { - "dependency": "direct main", - "description": { - "name": "glob", - "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.2" - }, - "graphs": { - "dependency": "direct main", - "description": { - "name": "graphs", - "sha256": "aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.3.1" - }, - "html": { - "dependency": "direct main", - "description": { - "name": "html", - "sha256": "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.15.4" - }, - "http": { - "dependency": "direct main", - "description": { - "name": "http", - "sha256": "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.13.6" - }, - "http_multi_server": { - "dependency": "direct main", - "description": { - "name": "http_multi_server", - "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.2.1" - }, - "http_parser": { - "dependency": "direct main", - "description": { - "name": "http_parser", - "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.0.2" - }, - "intl": { - "dependency": "direct main", - "description": { - "name": "intl", - "sha256": "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.18.1" - }, - "io": { - "dependency": "direct main", - "description": { - "name": "io", - "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.4" - }, - "js": { - "dependency": "direct main", - "description": { - "name": "js", - "sha256": "f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.6.7" - }, - "json_annotation": { - "dependency": "direct dev", - "description": { - "name": "json_annotation", - "sha256": "b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.8.1" - }, - "json_rpc_2": { - "dependency": "direct main", - "description": { - "name": "json_rpc_2", - "sha256": "5e469bffa23899edacb7b22787780068d650b106a21c76db3c49218ab7ca447e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.2" - }, - "logging": { - "dependency": "direct main", - "description": { - "name": "logging", - "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.0" - }, - "matcher": { - "dependency": "direct main", - "description": { - "name": "matcher", - "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.12.16+1" - }, - "meta": { - "dependency": "direct main", - "description": { - "name": "meta", - "sha256": "d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.11.0" - }, - "mime": { - "dependency": "direct main", - "description": { - "name": "mime", - "sha256": "e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.4" - }, - "multicast_dns": { - "dependency": "direct main", - "description": { - "name": "multicast_dns", - "sha256": "316cc47a958d4bd3c67bd238fe8b44fdfb6133bad89cb191c0c3bd3edb14e296", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.3.2+6" - }, - "mustache_template": { - "dependency": "direct main", - "description": { - "name": "mustache_template", - "sha256": "a46e26f91445bfb0b60519be280555b06792460b27b19e2b19ad5b9740df5d1c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.0" - }, - "native_assets_builder": { - "dependency": "direct main", - "description": { - "name": "native_assets_builder", - "sha256": "15076b8010eb1ab2a01c1b4bee6abd0174f40f2151406466119b69b398071df4", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.3.0" - }, - "native_assets_cli": { - "dependency": "direct main", - "description": { - "name": "native_assets_cli", - "sha256": "3119600043214157fb54f4ef05717a82a7858f35625fe767799c60f3039361c8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.3.2" - }, - "native_stack_traces": { - "dependency": "direct main", - "description": { - "name": "native_stack_traces", - "sha256": "c797830b9910d13b0f4e70ddef15cde034214fe3bdb8092c4ea5ffad2f74013f", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.5.6" - }, - "node_preamble": { - "dependency": "direct dev", - "description": { - "name": "node_preamble", - "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.2" - }, - "package_config": { - "dependency": "direct main", - "description": { - "name": "package_config", - "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.0" - }, - "path": { - "dependency": "direct main", - "description": { - "name": "path", - "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.9.0" - }, - "petitparser": { - "dependency": "direct main", - "description": { - "name": "petitparser", - "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.0.2" - }, - "platform": { - "dependency": "direct main", - "description": { - "name": "platform", - "sha256": "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.4" - }, - "pool": { - "dependency": "direct main", - "description": { - "name": "pool", - "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.5.1" - }, - "process": { - "dependency": "direct main", - "description": { - "name": "process", - "sha256": "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.0.2" - }, - "pub_semver": { - "dependency": "direct main", - "description": { - "name": "pub_semver", - "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.4" - }, - "pubspec_parse": { - "dependency": "direct dev", - "description": { - "name": "pubspec_parse", - "sha256": "c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.3" - }, - "shelf": { - "dependency": "direct main", - "description": { - "name": "shelf", - "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.4.1" - }, - "shelf_packages_handler": { - "dependency": "direct main", - "description": { - "name": "shelf_packages_handler", - "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.2" - }, - "shelf_proxy": { - "dependency": "direct main", - "description": { - "name": "shelf_proxy", - "sha256": "a71d2307f4393211930c590c3d2c00630f6c5a7a77edc1ef6436dfd85a6a7ee3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.4" - }, - "shelf_static": { - "dependency": "direct main", - "description": { - "name": "shelf_static", - "sha256": "a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.2" - }, - "shelf_web_socket": { - "dependency": "direct main", - "description": { - "name": "shelf_web_socket", - "sha256": "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.4" - }, - "source_map_stack_trace": { - "dependency": "direct main", - "description": { - "name": "source_map_stack_trace", - "sha256": "84cf769ad83aa6bb61e0aa5a18e53aea683395f196a6f39c4c881fb90ed4f7ae", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.1" - }, - "source_maps": { - "dependency": "direct main", - "description": { - "name": "source_maps", - "sha256": "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.10.12" - }, - "source_span": { - "dependency": "direct main", - "description": { - "name": "source_span", - "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.10.0" - }, - "sse": { - "dependency": "direct main", - "description": { - "name": "sse", - "sha256": "8168874cdbd42c36ea118ba9f88a656ad97f604f28c976c61cb6d5b281c5319c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.1.4" - }, - "stack_trace": { - "dependency": "direct main", - "description": { - "name": "stack_trace", - "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.11.1" - }, - "standard_message_codec": { - "dependency": "direct main", - "description": { - "name": "standard_message_codec", - "sha256": "fc7dd712d191b7e33196a0ecf354c4573492bb95995e7166cb6f73b047f9cae0", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.0.1+4" - }, - "stream_channel": { - "dependency": "direct main", - "description": { - "name": "stream_channel", - "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.2" - }, - "string_scanner": { - "dependency": "direct main", - "description": { - "name": "string_scanner", - "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.0" - }, - "sync_http": { - "dependency": "direct main", - "description": { - "name": "sync_http", - "sha256": "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.3.1" - }, - "term_glyph": { - "dependency": "direct main", - "description": { - "name": "term_glyph", - "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.1" - }, - "test": { - "dependency": "direct dev", - "description": { - "name": "test", - "sha256": "a1f7595805820fcc05e5c52e3a231aedd0b72972cb333e8c738a8b1239448b6f", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.24.9" - }, - "test_api": { - "dependency": "direct main", - "description": { - "name": "test_api", - "sha256": "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.6.1" - }, - "test_core": { - "dependency": "direct main", - "description": { - "name": "test_core", - "sha256": "a757b14fc47507060a162cc2530d9a4a2f92f5100a952c7443b5cad5ef5b106a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.5.9" - }, - "typed_data": { - "dependency": "direct main", - "description": { - "name": "typed_data", - "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.3.2" - }, - "unified_analytics": { - "dependency": "direct main", - "description": { - "name": "unified_analytics", - "sha256": "18204ce613142fc252b36f919d0f6dae4124df221812fe0b1bfb66251df280c1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.8.0+1" - }, - "usage": { - "dependency": "direct main", - "description": { - "name": "usage", - "sha256": "0bdbde65a6e710343d02a56552eeaefd20b735e04bfb6b3ee025b6b22e8d0e15", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.1.1" - }, - "uuid": { - "dependency": "direct main", - "description": { - "name": "uuid", - "sha256": "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.7" - }, - "vm_service": { - "dependency": "direct main", - "description": { - "name": "vm_service", - "sha256": "b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "13.0.0" - }, - "vm_service_interface": { - "dependency": "direct main", - "description": { - "name": "vm_service_interface", - "sha256": "a1897b14842d58ca75de00ccaec6d0bdc9806b4c3560d781ef61dc6851a66f76", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.0" - }, - "vm_snapshot_analysis": { - "dependency": "direct main", - "description": { - "name": "vm_snapshot_analysis", - "sha256": "5a79b9fbb6be2555090f55b03b23907e75d44c3fd7bdd88da09848aa5a1914c8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.7.6" - }, - "watcher": { - "dependency": "direct main", - "description": { - "name": "watcher", - "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.0" - }, - "web": { - "dependency": "direct main", - "description": { - "name": "web", - "sha256": "edc8a9573dd8c5a83a183dae1af2b6fd4131377404706ca4e5420474784906fa", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.4.0" - }, - "web_socket_channel": { - "dependency": "direct main", - "description": { - "name": "web_socket_channel", - "sha256": "045ec2137c27bf1a32e6ffa0e734d532a6677bf9016a0d1a406c54e499ff945b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.1" - }, - "webdriver": { - "dependency": "direct main", - "description": { - "name": "webdriver", - "sha256": "003d7da9519e1e5f329422b36c4dcdf18d7d2978d1ba099ea4e45ba490ed845e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.3" - }, - "webkit_inspection_protocol": { - "dependency": "direct main", - "description": { - "name": "webkit_inspection_protocol", - "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.1" - }, - "xml": { - "dependency": "direct main", - "description": { - "name": "xml", - "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.5.0" - }, - "yaml": { - "dependency": "direct main", - "description": { - "name": "yaml", - "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.2" - }, - "yaml_edit": { - "dependency": "direct main", - "description": { - "name": "yaml_edit", - "sha256": "1579d4a0340a83cf9e4d580ea51a16329c916973bffd5bd4b45e911b25d46bfd", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.1" - } - }, - "sdks": { - "dart": ">=3.3.0-91.0.dev <4.0.0" - } - } -} diff --git a/pkgs/development/compilers/flutter/versions/3_19/engine/patches/flutter-140969.patch b/pkgs/development/compilers/flutter/versions/3_19/engine/patches/flutter-140969.patch deleted file mode 100644 index bf5d9320a0a3..000000000000 --- a/pkgs/development/compilers/flutter/versions/3_19/engine/patches/flutter-140969.patch +++ /dev/null @@ -1,41 +0,0 @@ -From dd74740ddceac81e748a7e7834c28135abc59454 Mon Sep 17 00:00:00 2001 -From: Brandon DeRosier -Date: Tue, 16 Jan 2024 11:00:34 -0800 -Subject: [PATCH] [Flutter GPU] Fix playground shader paths. (#49790) - -Resolves https://github.com/flutter/flutter/issues/140969. - -Makes the shader paths absolute to prevent issues caused by the working -directory differing across build environments. ---- - impeller/fixtures/BUILD.gn | 3 ++- - impeller/tools/impeller.gni | 2 +- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/impeller/fixtures/BUILD.gn b/impeller/fixtures/BUILD.gn -index 9165f06542a2a..5ea90ab3969f3 100644 ---- a/impeller/fixtures/BUILD.gn -+++ b/impeller/fixtures/BUILD.gn -@@ -131,7 +131,8 @@ - "flutter_gpu_texture.vert", - ] - shader_target_flags = [ "--runtime-stage-metal" ] -- shader_bundle = "{\"UnlitFragment\": {\"type\": \"fragment\", \"file\": \"../../flutter/impeller/fixtures/flutter_gpu_unlit.frag\"}, \"UnlitVertex\": {\"type\": \"vertex\", \"file\": \"../../flutter/impeller/fixtures/flutter_gpu_unlit.vert\"}, \"TextureFragment\": {\"type\": \"fragment\", \"file\": \"../../flutter/impeller/fixtures/flutter_gpu_texture.frag\"}, \"TextureVertex\": {\"type\": \"vertex\", \"file\": \"../../flutter/impeller/fixtures/flutter_gpu_texture.vert\"}}" -+ fixtures = rebase_path("//flutter/impeller/fixtures") -+ shader_bundle = "{\"UnlitFragment\": {\"type\": \"fragment\", \"file\": \"${fixtures}/flutter_gpu_unlit.frag\"}, \"UnlitVertex\": {\"type\": \"vertex\", \"file\": \"${fixtures}/flutter_gpu_unlit.vert\"}, \"TextureFragment\": {\"type\": \"fragment\", \"file\": \"${fixtures}/flutter_gpu_texture.frag\"}, \"TextureVertex\": {\"type\": \"vertex\", \"file\": \"${fixtures}/flutter_gpu_texture.vert\"}}" - shader_bundle_output = "playground.shaderbundle" - } - -diff --git a/impeller/tools/impeller.gni b/impeller/tools/impeller.gni -index 6541c3b12173b..2ab7ec0f0b07a 100644 ---- a/impeller/tools/impeller.gni -+++ b/impeller/tools/impeller.gni -@@ -313,7 +313,7 @@ - if (defined(invoker.shader_bundle)) { - assert( - defined(invoker.shader_bundle_output), -- "When shader_bundle is specified, shader_output_bundle must also be specified.") -+ "When shader_bundle is specified, shader_bundle_output must also be specified.") - } - - sksl = false diff --git a/pkgs/development/compilers/flutter/versions/3_19/patches/deregister-pub-dependencies-artifact.patch b/pkgs/development/compilers/flutter/versions/3_19/patches/deregister-pub-dependencies-artifact.patch deleted file mode 100644 index 01e34c6d292c..000000000000 --- a/pkgs/development/compilers/flutter/versions/3_19/patches/deregister-pub-dependencies-artifact.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/packages/flutter_tools/lib/src/flutter_cache.dart b/packages/flutter_tools/lib/src/flutter_cache.dart -index 252021cf78..e50ef0885d 100644 ---- a/packages/flutter_tools/lib/src/flutter_cache.dart -+++ b/packages/flutter_tools/lib/src/flutter_cache.dart -@@ -51,14 +51,6 @@ class FlutterCache extends Cache { - registerArtifact(IosUsbArtifacts(artifactName, this, platform: platform)); - } - registerArtifact(FontSubsetArtifacts(this, platform: platform)); -- registerArtifact(PubDependencies( -- logger: logger, -- // flutter root and pub must be lazily initialized to avoid accessing -- // before the version is determined. -- flutterRoot: () => Cache.flutterRoot!, -- pub: () => pub, -- projectFactory: projectFactory, -- )); - } - } - \ No newline at end of file diff --git a/pkgs/development/compilers/flutter/versions/3_19/patches/disable-auto-update-shared.patch b/pkgs/development/compilers/flutter/versions/3_19/patches/disable-auto-update-shared.patch deleted file mode 100644 index 961b41f7327c..000000000000 --- a/pkgs/development/compilers/flutter/versions/3_19/patches/disable-auto-update-shared.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/bin/internal/shared.sh b/bin/internal/shared.sh -index 75d9d3013e..657ad3cb78 100644 ---- a/bin/internal/shared.sh -+++ b/bin/internal/shared.sh -@@ -245,7 +245,7 @@ function shared::execute() { - # and will corrupt each others' downloads. - # - # SHARED_NAME itself is prepared by the caller script. -- upgrade_flutter 7< "$SHARED_NAME" -+ # upgrade_flutter 7< "$SHARED_NAME" - - BIN_NAME="$(basename "$PROG_NAME")" - case "$BIN_NAME" in diff --git a/pkgs/development/compilers/flutter/versions/3_19/patches/disable-auto-update.patch b/pkgs/development/compilers/flutter/versions/3_19/patches/disable-auto-update.patch deleted file mode 100644 index 05960c01b737..000000000000 --- a/pkgs/development/compilers/flutter/versions/3_19/patches/disable-auto-update.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart -index b7e624b4e2..edfdde118b 100644 ---- a/packages/flutter_tools/lib/src/runner/flutter_command.dart -+++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart -@@ -1554,7 +1554,7 @@ Run 'flutter -h' (or 'flutter -h') for available flutter commands and - - // Populate the cache. We call this before pub get below so that the - // sky_engine package is available in the flutter cache for pub to find. -- if (shouldUpdateCache) { -+ if (false) { - // First always update universal artifacts, as some of these (e.g. - // ios-deploy on macOS) are required to determine `requiredArtifacts`. - final bool offline; -diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -index 5d6d78639f..90a4dfa555 100644 ---- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -+++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -@@ -297,7 +297,6 @@ class FlutterCommandRunner extends CommandRunner { - globals.flutterUsage.suppressAnalytics = true; - } - -- globals.flutterVersion.ensureVersionFile(); - final bool machineFlag = topLevelResults[FlutterGlobalOptions.kMachineFlag] as bool? ?? false; - final bool ci = await globals.botDetector.isRunningOnBot; - final bool redirectedCompletion = !globals.stdio.hasTerminal && -@@ -306,11 +305,6 @@ class FlutterCommandRunner extends CommandRunner { - final bool versionCheckFlag = topLevelResults[FlutterGlobalOptions.kVersionCheckFlag] as bool? ?? false; - final bool explicitVersionCheckPassed = topLevelResults.wasParsed(FlutterGlobalOptions.kVersionCheckFlag) && versionCheckFlag; - -- if (topLevelResults.command?.name != 'upgrade' && -- (explicitVersionCheckPassed || (versionCheckFlag && !isMachine))) { -- await globals.flutterVersion.checkFlutterVersionFreshness(); -- } -- - // See if the user specified a specific device. - final String? specifiedDeviceId = topLevelResults[FlutterGlobalOptions.kDeviceIdOption] as String?; - if (specifiedDeviceId != null) { diff --git a/pkgs/development/compilers/flutter/versions/3_19/patches/gradle-flutter-tools-wrapper.patch b/pkgs/development/compilers/flutter/versions/3_19/patches/gradle-flutter-tools-wrapper.patch deleted file mode 100644 index de6080efbba8..000000000000 --- a/pkgs/development/compilers/flutter/versions/3_19/patches/gradle-flutter-tools-wrapper.patch +++ /dev/null @@ -1,44 +0,0 @@ -This patch introduces an intermediate Gradle build step to alter the behavior -of flutter_tools' Gradle project, specifically moving the creation of `build` -and `.gradle` directories from within the Nix Store to somewhere in `$HOME/.cache/flutter/nix-flutter-tools-gradle/$engineShortRev`. - -Without this patch, flutter_tools' Gradle project tries to generate `build` and `.gradle` -directories within the Nix Store. Resulting in read-only errors when trying to build a -Flutter Android app at runtime. - -This patch takes advantage of the fact settings.gradle takes priority over settings.gradle.kts to build the intermediate Gradle project -when a Flutter app runs `includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")` - -`rootProject.buildFileName = "/dev/null"` so that the intermediate project doesn't use `build.gradle.kts` that's in the same directory. - -The intermediate project makes a `settings.gradle` file in `$HOME/.cache/flutter/nix-flutter-tools-gradle//` and `includeBuild`s it. -This Gradle project will build the actual `packages/flutter_tools/gradle` project by setting -`rootProject.projectDir = new File("$settingsDir")` and `apply from: new File("$settingsDir/settings.gradle.kts")`. - -Now the `.gradle` will be built in `$HOME/.cache/flutter/nix-flutter-tools-gradle//`, but `build` doesn't. -To move `build` to `$HOME/.cache/flutter/nix-flutter-tools-gradle//` as well, we need to set `buildDirectory`. -diff --git a/packages/flutter_tools/gradle/settings.gradle b/packages/flutter_tools/gradle/settings.gradle -new file mode 100644 -index 0000000000..b2485c94b4 ---- /dev/null -+++ b/packages/flutter_tools/gradle/settings.gradle -@@ -0,0 +1,19 @@ -+rootProject.buildFileName = "/dev/null" -+ -+def engineShortRev = (new File("$settingsDir/../../../bin/internal/engine.version")).text.take(10) -+def dir = new File("$System.env.HOME/.cache/flutter/nix-flutter-tools-gradle/$engineShortRev") -+dir.mkdirs() -+def file = new File(dir, "settings.gradle") -+ -+file.text = """ -+rootProject.projectDir = new File("$settingsDir") -+apply from: new File("$settingsDir/settings.gradle.kts") -+ -+gradle.allprojects { project -> -+ project.beforeEvaluate { -+ project.layout.buildDirectory = new File("$dir/build") -+ } -+} -+""" -+ -+includeBuild(dir) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c60b89cd4649..c5bc3a61bfb4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -416,6 +416,7 @@ mapAliases { flatcam = throw "flatcam has been removed because it is unmaintained since 2022 and doesn't support Python > 3.10"; # Added 2025-01-25 flutter313 = throw "flutter313 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05 flutter316 = throw "flutter316 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05 + flutter319 = throw "flutter319 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-12-03 flutter322 = throw "flutter322 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05 flutter323 = throw "flutter323 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05 fluxus = throw "fluxus has been removed because it hasn't been updated in 9 years and depended on insecure Racket 7.9"; # Added 2024-12-06 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e706ddf19217..6548a7920053 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5800,7 +5800,6 @@ with pkgs; flutter327 = flutterPackages.v3_27; flutter326 = flutterPackages.v3_26; flutter324 = flutterPackages.v3_24; - flutter319 = flutterPackages.v3_19; fnm = callPackage ../development/tools/fnm { }; From dd19eff90b6459296531c434886739386905bf2b Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Tue, 3 Dec 2024 22:11:22 -0800 Subject: [PATCH 1087/2168] expidus: move to flutter 3.24 --- pkgs/desktops/expidus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/expidus/default.nix b/pkgs/desktops/expidus/default.nix index 05cd356345e7..2072455e2f6d 100644 --- a/pkgs/desktops/expidus/default.nix +++ b/pkgs/desktops/expidus/default.nix @@ -1,10 +1,10 @@ { callPackage, flutterPackages }: { calculator = callPackage ./calculator { - flutter = flutterPackages.v3_19; + flutter = flutterPackages.v3_24; }; file-manager = callPackage ./file-manager { - flutter = flutterPackages.v3_19; + flutter = flutterPackages.v3_24; }; } From 96993904545a62ac309a64f2d52ef899b56d00a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 02:33:26 +0000 Subject: [PATCH 1088/2168] ergo: 5.0.24 -> 5.0.25 --- pkgs/by-name/er/ergo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/er/ergo/package.nix b/pkgs/by-name/er/ergo/package.nix index 6eb6c6f574c1..b9d8f66439b8 100644 --- a/pkgs/by-name/er/ergo/package.nix +++ b/pkgs/by-name/er/ergo/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "5.0.24"; + version = "5.0.25"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "sha256-+dpSgqJGHUNzIBQBbfbeclB5t+NyaluGRTCZ4OESZu8="; + sha256 = "sha256-4Eoo1f9oLxYdFC1M46Bq1D9RbIeOoWh0qECzcBbv3KA="; }; nativeBuildInputs = [ makeWrapper ]; From b7a65e85e59a65d33dd0594b91564e3e54c977f5 Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Mon, 10 Feb 2025 18:53:39 -0800 Subject: [PATCH 1089/2168] cargo-spellcheck: 0.14.0 -> 0.15.1 --- pkgs/by-name/ca/cargo-spellcheck/package.nix | 21 +++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ca/cargo-spellcheck/package.nix b/pkgs/by-name/ca/cargo-spellcheck/package.nix index 0a0e6ec2ffd6..90d0a0bcbe96 100644 --- a/pkgs/by-name/ca/cargo-spellcheck/package.nix +++ b/pkgs/by-name/ca/cargo-spellcheck/package.nix @@ -2,28 +2,39 @@ lib, rustPlatform, fetchFromGitHub, + fetchpatch2, }: rustPlatform.buildRustPackage rec { pname = "cargo-spellcheck"; - version = "0.14.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "drahnr"; repo = pname; - rev = "v${version}"; - hash = "sha256-NrtPV2bd9BuA1nnniIcth85gJQmFGy9LHdajqmW8j4Q="; + tag = "v${version}"; + hash = "sha256-o4gvTF9Zb6bZ9443zos4bz37w3bXKumW2x425MM5/FY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-1bOEOZ1byVm9apCqR9zgESsgA9Z9TdFSondwzwOPfWI="; + cargoHash = "sha256-wEcHMzeSj/JO/ZBPmQAiHaixtOTCT2+rTd1LDCY9wqc="; + + patches = [ + # fixes compilation of tests + # https://github.com/drahnr/cargo-spellcheck/pull/342 + (fetchpatch2 { + name = "fix-test-compilation.patch"; + url = "https://github.com/drahnr/cargo-spellcheck/pull/342/commits/aed8f3ca7a50fae38a5c6e0b974ed9773cd6c659.patch"; + hash = "sha256-840t8uPg0EiiVppmMT38C1P16vps7F+g0o313tzghjE="; + }) + ]; nativeBuildInputs = [ rustPlatform.bindgenHook ]; preCheck = "HOME=$(mktemp -d)"; checkFlags = [ - "--skip checker::hunspell::tests::hunspell_binding_is_sane" + "--skip=checker::hunspell::tests::hunspell_binding_is_sane" ]; meta = with lib; { From 899eeb92a9306f39fdf23683219681d772768bd5 Mon Sep 17 00:00:00 2001 From: nayeko Date: Tue, 11 Feb 2025 11:17:16 +0800 Subject: [PATCH 1090/2168] wakatime-cli: disable check on darwin --- pkgs/by-name/wa/wakatime-cli/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wa/wakatime-cli/package.nix b/pkgs/by-name/wa/wakatime-cli/package.nix index 9c6192a7face..9126211e5d30 100644 --- a/pkgs/by-name/wa/wakatime-cli/package.nix +++ b/pkgs/by-name/wa/wakatime-cli/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildGoModule, fetchFromGitHub, testers, @@ -25,6 +26,11 @@ buildGoModule rec { "-w" "-X github.com/wakatime/wakatime-cli/pkg/version.Version=${version}" ]; + + # dial tcp 127.0.0.1:51272: connect: operation not permitted + # and goroutine 33 [IO wait, 10 minutes] on darwin + doCheck = !stdenv.hostPlatform.isDarwin; + nativeCheckInputs = [ writableTmpDirAsHomeHook ]; checkFlags = @@ -38,9 +44,6 @@ buildGoModule rec { "TestSendHeartbeats_NonExistingExtraHeartbeatsEntity" "TestSendHeartbeats_ExtraHeartbeatsIsUnsavedEntity" "TestFileExperts_Err(Auth|Api|BadRequest)" - - # Flaky tests - "TestLoadParams_ApiKey_FromVault_Err_Darwin" ]; in [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; From d6bbb2a12af01fbf41e1ad5ffc81a17de1923984 Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Tue, 11 Feb 2025 08:49:52 +0530 Subject: [PATCH 1091/2168] opengist: 1.8.4 -> 1.9.1 Signed-off-by: phanirithvij --- pkgs/by-name/op/opengist/package.nix | 8 ++++---- pkgs/by-name/op/opengist/update.sh | 9 ++++++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/op/opengist/package.nix b/pkgs/by-name/op/opengist/package.nix index 459b7b2d29d6..000823c3d3ba 100644 --- a/pkgs/by-name/op/opengist/package.nix +++ b/pkgs/by-name/op/opengist/package.nix @@ -12,12 +12,12 @@ let # finalAttrs when 🥺 (buildGoModule does not support them) # https://github.com/NixOS/nixpkgs/issues/273815 - version = "1.8.4"; + version = "1.9.1"; src = fetchFromGitHub { owner = "thomiceli"; repo = "opengist"; tag = "v${version}"; - hash = "sha256-vpl3ztLHeVZndAwDgobfiI+3Xu3CFU38qgXy83p06As="; + hash = "sha256-Zjn38OGnDtgD2OfIhgUxWo0Cx+ZmNv6UjJanASbjiYU="; }; frontend = buildNpmPackage { @@ -40,13 +40,13 @@ let cp -R public $out ''; - npmDepsHash = "sha256-l09TPGBGhWcsl3x14ovilDd1zZWv4XzFCAmAfapKtAE="; + npmDepsHash = "sha256-Uh+oXd//G/lPAMXRxijjEOpQNmeXK/XCIU7DJN3ujaY="; }; in buildGoModule { pname = "opengist"; inherit version src; - vendorHash = "sha256-mLFjRL4spAWuPLVOtt88KH+p2g9lGCYzaHokVxdrLOw="; + vendorHash = "sha256-aqfr3yGyTXDtZDU8d1lbWWvFfY4fo6/PsSDwpiDtM90="; tags = [ "fs_embed" ]; ldflags = [ "-s" diff --git a/pkgs/by-name/op/opengist/update.sh b/pkgs/by-name/op/opengist/update.sh index ad3ac9ca639a..219894eb27ef 100755 --- a/pkgs/by-name/op/opengist/update.sh +++ b/pkgs/by-name/op/opengist/update.sh @@ -1,11 +1,12 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p bash curl coreutils jq git prefetch-npm-deps moreutils common-updater-scripts common-updater-scripts +#!nix-shell -i bash -p bash curl coreutils jq git prefetch-npm-deps moreutils common-updater-scripts # shellcheck shell=bash set -eou pipefail +set -x -NIXPKGS_DIR="$PWD" +NIXPKGS_DIR="$(git rev-parse --show-toplevel)" SCRIPT_DIR="$(dirname "${BASH_SOURCE[0]}")" # Get latest release @@ -27,7 +28,9 @@ fi echo "Updating opengist $oldVersion -> $latestVersion" +pushd "$NIXPKGS_DIR" >/dev/null || exit 1 update-source-version opengist "${latestVersion}" +popd >/dev/null pushd "$SCRIPT_DIR" >/dev/null || exit 1 @@ -43,7 +46,7 @@ popd >/dev/null # nix-prefetch broken due to ninja finalAttrs.src.rev # nix-update with goModules broken for this package -setKV () { +setKV() { sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" "${SCRIPT_DIR}/package.nix" } From 7c3f4d158bfe75750456635f11fb95d54ecc805d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Feb 2025 21:25:10 +0000 Subject: [PATCH 1092/2168] emacsPackages.elpaca: 0-unstable-2025-01-25 -> 0-unstable-2025-02-07 --- .../emacs/elisp-packages/manual-packages/elpaca/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elpaca/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elpaca/default.nix index caf2d4a2c8bc..df1414d8c4d6 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elpaca/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elpaca/default.nix @@ -8,13 +8,13 @@ melpaBuild { pname = "elpaca"; - version = "0-unstable-2025-01-25"; + version = "0-unstable-2025-02-07"; src = fetchFromGitHub { owner = "progfolio"; repo = "elpaca"; - rev = "db2fd7258ff69fe2d100888cb8d92cf3bf94d465"; - hash = "sha256-SseY0iU3D3cloKZy6xPp8QT0H1Cu2uGiiVG6rXq/UHg="; + rev = "9cd26d91193fea631c25484109d04c54ad8f0188"; + hash = "sha256-Mr5uBXvtFfBnrMqnnsgStHvmcyzqpHKdovvH3xb6RBE="; }; nativeBuildInputs = [ git ]; From f5ff3cf76b1875f1f6104a4d0032e2c85c6f1b3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francis=20Gagn=C3=A9?= Date: Sun, 9 Feb 2025 20:08:36 -0500 Subject: [PATCH 1093/2168] lldb: Fix dependency cycle between `out` and `lib` outputs Remove the `lib` output, so that `/lib` goes to the `out` output instead. This fixes the following error: ERROR: noBrokenSymlinks: the symlink .../lib/python3.12/site-packages/lldb/lldb-argdumper points to a missing target .../bin/lldb-argdumper Fixes #380196 --- pkgs/development/compilers/llvm/common/lldb.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/llvm/common/lldb.nix b/pkgs/development/compilers/llvm/common/lldb.nix index f4a131c47620..40e61d874621 100644 --- a/pkgs/development/compilers/llvm/common/lldb.nix +++ b/pkgs/development/compilers/llvm/common/lldb.nix @@ -54,9 +54,10 @@ stdenv.mkDerivation (rec { src = src'; inherit patches; - # LLDB expects to find the path to `bin` relative to `lib` on Darwin. It can’t be patched with the location of - # the `lib` output because that would create a cycle between it and the `out` output. - outputs = [ "out" "dev" ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "lib" ]; + # There is no `lib` output because some of the files in `$out/lib` depend on files in `$out/bin`. + # For example, `$out/lib/python3.12/site-packages/lldb/lldb-argdumper` is a symlink to `$out/bin/lldb-argdumper`. + # Also, LLDB expects to find the path to `bin` relative to `lib` on Darwin. + outputs = [ "out" "dev" ]; sourceRoot = lib.optional (lib.versionAtLeast release_version "13") "${src.name}/${pname}"; @@ -140,7 +141,7 @@ stdenv.mkDerivation (rec { ''; postInstall = '' - wrapProgram $out/bin/lldb --prefix PYTHONPATH : $lib/${python3.sitePackages}/ + wrapProgram $out/bin/lldb --prefix PYTHONPATH : ''${!outputLib}/${python3.sitePackages}/ # Editor support # vscode: From eff68a9be3c3c7bfc1e9143ce90c89d4b0186433 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 03:49:16 +0000 Subject: [PATCH 1094/2168] martian-mono: 1.0.0 -> 1.1.0 --- pkgs/by-name/ma/martian-mono/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/martian-mono/package.nix b/pkgs/by-name/ma/martian-mono/package.nix index c6cf4cfb1698..223b22009c3e 100644 --- a/pkgs/by-name/ma/martian-mono/package.nix +++ b/pkgs/by-name/ma/martian-mono/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation rec { pname = "martian-mono"; - version = "1.0.0"; + version = "1.1.0"; src = fetchzip { url = "https://github.com/evilmartians/mono/releases/download/v${version}/martian-mono-${version}-otf.zip"; - sha256 = "sha256-hC08IHWqg+x3qoEf4EL98ZbGeqdwjnMpDovEiWrWPpI="; + sha256 = "sha256-L+T9XxTH7+yFJwhZ8UXAlq3rAkPFn/8dRBoGfbiHuGA="; stripRoot = false; }; From 86e50979ef98c02a8b566e79f26a2f740dccfbd1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 03:59:10 +0000 Subject: [PATCH 1095/2168] libxlsxwriter: 1.1.9 -> 1.2.0 --- pkgs/by-name/li/libxlsxwriter/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libxlsxwriter/package.nix b/pkgs/by-name/li/libxlsxwriter/package.nix index 1ab35b3b6739..868f7d464d85 100644 --- a/pkgs/by-name/li/libxlsxwriter/package.nix +++ b/pkgs/by-name/li/libxlsxwriter/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "libxlsxwriter"; - version = "1.1.9"; + version = "1.2.0"; src = fetchFromGitHub { owner = "jmcnamara"; repo = "libxlsxwriter"; tag = "v${version}"; - hash = "sha256-ZXVNW5cEWgMXKLnE0IpwWS0RIWBta5uhuGh4R9uFJ14="; + hash = "sha256-SKLQIx3DGRWGjRAJFD1FKN1F8E/ZSuj2rV38YxZw6fw="; }; buildInputs = [ From 46a376eda729278263691eff6decbca3fffc5721 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 04:01:11 +0000 Subject: [PATCH 1096/2168] nkeys: 0.4.9 -> 0.4.10 --- pkgs/by-name/nk/nkeys/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/nk/nkeys/package.nix b/pkgs/by-name/nk/nkeys/package.nix index 80d791e60808..1272455703ea 100644 --- a/pkgs/by-name/nk/nkeys/package.nix +++ b/pkgs/by-name/nk/nkeys/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nkeys"; - version = "0.4.9"; + version = "0.4.10"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; tag = "v${version}"; - hash = "sha256-5HmtCzY2EmlnBqg36JcjaaM2ivrM5f719bkWqpxekVI="; + hash = "sha256-vSjIqeGWS9sDGyrPD11u4ngiZrW6gZfYd08kKXUDXdU="; }; - vendorHash = "sha256-AJrfHMNjuGO8LbuP4cAVClKWHkqkG+nPzQw+B+nRpxM="; + vendorHash = "sha256-TtplWIDLUsFXhT5OQVhW3KTfxh1MVY8Hssejy8GBYVQ="; meta = with lib; { description = "Public-key signature system for NATS"; From 221ab6a1ccda1743116656c0203c2a1e02db144d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 10 Feb 2025 20:01:26 -0800 Subject: [PATCH 1097/2168] python313Packages.catboost: mark broken with NumPy v2 --- pkgs/development/python-modules/catboost/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/catboost/default.nix b/pkgs/development/python-modules/catboost/default.nix index d0fc77b70038..5bb4e58d151e 100644 --- a/pkgs/development/python-modules/catboost/default.nix +++ b/pkgs/development/python-modules/catboost/default.nix @@ -22,7 +22,6 @@ buildPythonPackage rec { pname version src - meta ; pyproject = true; @@ -55,4 +54,9 @@ buildPythonPackage rec { doCheck = false; pythonImportsCheck = [ "catboost" ]; + + meta = catboost.meta // { + # https://github.com/catboost/catboost/issues/2671 + broken = lib.versionAtLeast numpy.version "2"; + }; } From cac52e40c684c17ac2c8c99f42e7f71c73562bf8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 04:04:50 +0000 Subject: [PATCH 1098/2168] netavark: 1.13.1 -> 1.14.0 --- pkgs/by-name/ne/netavark/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ne/netavark/package.nix b/pkgs/by-name/ne/netavark/package.nix index bd43bfb612eb..91bcedbfd965 100644 --- a/pkgs/by-name/ne/netavark/package.nix +++ b/pkgs/by-name/ne/netavark/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "netavark"; - version = "1.13.1"; + version = "1.14.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-Vz2/Y8o6fiVdLElgytUqLfa1oK/kyu1+dks4aiDHMAY="; + hash = "sha256-/95tYUqjIPoyO2+YGza9RJ88YAbsIOzEB//d2FXfNZY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-OrqhGTHd6gi6nMqvM/znQSwNoN5VSBRzcdgY3LbpYWU="; + cargoHash = "sha256-6XSKuohY7gpnGmRK/Y+c3+0es/KRbkXjt5XQU/HksQ0="; nativeBuildInputs = [ installShellFiles mandown protobuf go-md2man ]; From 4d4d821e1a0d76af0ab632568b0c7e487d1259d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 10 Feb 2025 20:09:10 -0800 Subject: [PATCH 1099/2168] python313Packages.castepxbin: unpin numpy --- .../development/python-modules/castepxbin/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/castepxbin/default.nix b/pkgs/development/python-modules/castepxbin/default.nix index 18e753488d1b..72c6e4513478 100644 --- a/pkgs/development/python-modules/castepxbin/default.nix +++ b/pkgs/development/python-modules/castepxbin/default.nix @@ -12,11 +12,10 @@ buildPythonPackage rec { pname = "castepxbin"; version = "0.3.0"; + pyproject = true; disabled = pythonOlder "3.7"; - format = "pyproject"; - src = fetchFromGitHub { owner = "zhubonan"; repo = "castepxbin"; @@ -24,9 +23,13 @@ buildPythonPackage rec { hash = "sha256-6kumVnm4PLRxuKO6Uz0iHzfYuu21hFC7EPRsc3S1kxE="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ + pythonRelaxDeps = [ + "numpy" + ]; + + dependencies = [ numpy scipy ]; From 892d1e52c20aac5dc1ae2745bc68a92111f8b563 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Mon, 10 Feb 2025 12:39:38 +0700 Subject: [PATCH 1100/2168] zerotierone: 1.14.0 -> 1.14.2 --- ...m-remove-unsupported-lints.workspace.patch | 24 + pkgs/by-name/ze/zerotierone/Cargo.lock | 3579 ----------------- pkgs/by-name/ze/zerotierone/package.nix | 39 +- 3 files changed, 41 insertions(+), 3601 deletions(-) create mode 100644 pkgs/by-name/ze/zerotierone/0001-rustfsm-remove-unsupported-lints.workspace.patch delete mode 100644 pkgs/by-name/ze/zerotierone/Cargo.lock diff --git a/pkgs/by-name/ze/zerotierone/0001-rustfsm-remove-unsupported-lints.workspace.patch b/pkgs/by-name/ze/zerotierone/0001-rustfsm-remove-unsupported-lints.workspace.patch new file mode 100644 index 000000000000..0db2b4d26fa2 --- /dev/null +++ b/pkgs/by-name/ze/zerotierone/0001-rustfsm-remove-unsupported-lints.workspace.patch @@ -0,0 +1,24 @@ +From b83e6354de099860bcb1ca3876c222c57de89f0c Mon Sep 17 00:00:00 2001 +From: Michael Hoang +Date: Mon, 10 Feb 2025 18:03:12 +0700 +Subject: [PATCH] rustfsm: remove unsupported `lints.workspace` + +This patch will no longer be necessary when +https://github.com/NixOS/nixpkgs/pull/300532 is merged +--- + fsm/Cargo.toml | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/fsm/Cargo.toml b/fsm/Cargo.toml +index 5e9e1c9..3fda704 100644 +--- a/fsm/Cargo.toml ++++ b/fsm/Cargo.toml +@@ -17,5 +17,3 @@ rustfsm_trait = { version = "0.1", path = "rustfsm_trait" } + [package.metadata.workspaces] + independent = true + +-[lints] +-workspace = true +-- +2.46.0 + diff --git a/pkgs/by-name/ze/zerotierone/Cargo.lock b/pkgs/by-name/ze/zerotierone/Cargo.lock deleted file mode 100644 index 09d9ced0cfc9..000000000000 --- a/pkgs/by-name/ze/zerotierone/Cargo.lock +++ /dev/null @@ -1,3579 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[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 = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if", - "once_cell", - "version_check", - "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 = "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 = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - -[[package]] -name = "anstyle" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" - -[[package]] -name = "anyhow" -version = "1.0.81" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" - -[[package]] -name = "async-stream" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" -dependencies = [ - "async-stream-impl", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-stream-impl" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.53", -] - -[[package]] -name = "async-trait" -version = "0.1.78" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "461abc97219de0eaaf81fe3ef974a540158f3d079c2ab200f891f1a2ef201e85" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.53", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "axum" -version = "0.6.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" -dependencies = [ - "async-trait", - "axum-core", - "bitflags 1.3.2", - "bytes", - "futures-util", - "http", - "http-body", - "hyper", - "itoa", - "matchit", - "memchr", - "mime", - "percent-encoding", - "pin-project-lite", - "rustversion", - "serde", - "sync_wrapper", - "tower", - "tower-layer", - "tower-service", -] - -[[package]] -name = "axum-core" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" -dependencies = [ - "async-trait", - "bytes", - "futures-util", - "http", - "http-body", - "mime", - "rustversion", - "tower-layer", - "tower-service", -] - -[[package]] -name = "backoff" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" -dependencies = [ - "getrandom", - "instant", - "rand", -] - -[[package]] -name = "backtrace" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base16ct" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" - -[[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 = "base64ct" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" - -[[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 = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - -[[package]] -name = "bumpalo" -version = "3.15.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" - -[[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 = "cbindgen" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51e3973b165dc0f435831a9e426de67e894de532754ff7a3f307c03ee5dec7dc" -dependencies = [ - "clap", - "heck 0.3.3", - "indexmap 1.9.3", - "log", - "proc-macro2", - "quote", - "serde", - "serde_json", - "syn 1.0.109", - "tempfile", - "toml", -] - -[[package]] -name = "cc" -version = "1.0.90" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" - -[[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.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "serde", - "wasm-bindgen", - "windows-targets 0.52.4", -] - -[[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", - "textwrap", - "unicode-width", - "vec_map", -] - -[[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 = "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 = "cpufeatures" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" -dependencies = [ - "libc", -] - -[[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-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 = "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", - "typenum", -] - -[[package]] -name = "curve25519-dalek" -version = "4.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" -dependencies = [ - "cfg-if", - "cpufeatures", - "curve25519-dalek-derive", - "digest", - "fiat-crypto", - "platforms", - "rustc_version", - "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", - "quote", - "syn 2.0.53", -] - -[[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 2.0.53", -] - -[[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 2.0.53", -] - -[[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.3", - "lock_api", - "once_cell", - "parking_lot_core", -] - -[[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 = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", - "serde", -] - -[[package]] -name = "derive_builder" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7" -dependencies = [ - "derive_builder_macro", -] - -[[package]] -name = "derive_builder_core" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 2.0.53", -] - -[[package]] -name = "derive_builder_macro" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" -dependencies = [ - "derive_builder_core", - "syn 2.0.53", -] - -[[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", - "quote", - "rustc_version", - "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 = "downcast" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" - -[[package]] -name = "dyn-clone" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" - -[[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 = "ed25519" -version = "2.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" -dependencies = [ - "pkcs8", - "signature", -] - -[[package]] -name = "ed25519-dalek" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" -dependencies = [ - "curve25519-dalek", - "ed25519", - "serde", - "sha2", - "subtle", - "zeroize", -] - -[[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", -] - -[[package]] -name = "enum-iterator" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "600536cfe9e2da0820aa498e570f6b2b9223eec3ce2f835c8ae4861304fa4794" -dependencies = [ - "enum-iterator-derive", -] - -[[package]] -name = "enum-iterator-derive" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03cdc46ec28bd728e67540c528013c6a10eb69a02eb31078a1bda695438cbfb8" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.53", -] - -[[package]] -name = "enum_dispatch" -version = "0.3.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e" -dependencies = [ - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.53", -] - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "erased-serde" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b73807008a3c7f171cc40312f37d95ef0396e048b5848d775f54b1a4dd4a0d3" -dependencies = [ - "serde", -] - -[[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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" - -[[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 = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "fragile" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" - -[[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", - "quote", - "syn 2.0.53", -] - -[[package]] -name = "futures-retry" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fde5a672a61f96552aa5ed9fd9c81c3fbdae4be9b1e205d6eaf17c83705adc0f" -dependencies = [ - "futures", - "pin-project-lite", - "tokio", -] - -[[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-timer" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" - -[[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 = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", - "zeroize", -] - -[[package]] -name = "getrandom" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "wasi", - "wasm-bindgen", -] - -[[package]] -name = "gimli" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" - -[[package]] -name = "governor" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a7f542ee6b35af73b06abc0dad1c1bae89964e4e253bc4b587b91c9637867b" -dependencies = [ - "cfg-if", - "dashmap", - "futures", - "futures-timer", - "no-std-compat", - "nonzero_ext", - "parking_lot", - "portable-atomic", - "quanta", - "rand", - "smallvec", - "spinning_top", -] - -[[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.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fbd2820c5e49886948654ab546d0688ff24530286bdcf8fca3cefb16d4618eb" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap 2.2.5", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" -dependencies = [ - "ahash", - "allocator-api2", -] - -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -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.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -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" -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.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 = "http" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" -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", - "pin-project-lite", -] - -[[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 = "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", - "http", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper-timeout" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" -dependencies = [ - "hyper", - "pin-project-lite", - "tokio", - "tokio-io-timeout", -] - -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper", - "native-tls", - "tokio", - "tokio-native-tls", -] - -[[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 = "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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" -dependencies = [ - "equivalent", - "hashbrown 0.14.3", - "serde", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "inventory" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f958d3d68f4167080a18141e10381e7634563984a537f2a49a30fd8e53ac5767" - -[[package]] -name = "ipnet" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" - -[[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.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "jwt" -version = "0.16.0" -source = "git+https://github.com/glimberg/rust-jwt#61a9291fdeec747c6edf14f4fa0caf235136c168" -dependencies = [ - "base64 0.13.1", - "crypto-common", - "digest", - "hmac", - "serde", - "serde_json", - "sha2", -] - -[[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 = "libc" -version = "0.2.153" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" - -[[package]] -name = "libm" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" - -[[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 = "lru" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" -dependencies = [ - "hashbrown 0.14.3", -] - -[[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 = "matchit" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" - -[[package]] -name = "memchr" -version = "2.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[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", - "wasi", - "windows-sys 0.48.0", -] - -[[package]] -name = "mockall" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43766c2b5203b10de348ffe19f7e54564b64f3d6018ff7648d1e2d6d3a0f0a48" -dependencies = [ - "cfg-if", - "downcast", - "fragile", - "lazy_static", - "mockall_derive", - "predicates", - "predicates-tree", -] - -[[package]] -name = "mockall_derive" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af7cbce79ec385a1d4f54baa90a76401eb15d9cab93685f62e7e9f942aa00ae2" -dependencies = [ - "cfg-if", - "proc-macro2", - "quote", - "syn 2.0.53", -] - -[[package]] -name = "multimap" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" - -[[package]] -name = "native-tls" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" -dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "no-std-compat" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" - -[[package]] -name = "nonzero_ext" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21" - -[[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-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", - "smallvec", - "zeroize", -] - -[[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.9", - "libc", -] - -[[package]] -name = "oauth2" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c38841cdd844847e3e7c8d29cef9dcfed8877f8f56f9071f77843ecf3baf937f" -dependencies = [ - "base64 0.13.1", - "chrono", - "getrandom", - "http", - "rand", - "reqwest", - "serde", - "serde_json", - "serde_path_to_error", - "sha2", - "thiserror", - "url", -] - -[[package]] -name = "object" -version = "0.32.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "openidconnect" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f47e80a9cfae4462dd29c41e987edd228971d6565553fbc14b8a11e666d91590" -dependencies = [ - "base64 0.13.1", - "chrono", - "dyn-clone", - "ed25519-dalek", - "hmac", - "http", - "itertools 0.10.5", - "log", - "oauth2", - "p256", - "p384", - "rand", - "rsa", - "serde", - "serde-value", - "serde_derive", - "serde_json", - "serde_path_to_error", - "serde_plain", - "serde_with", - "sha2", - "subtle", - "thiserror", - "url", -] - -[[package]] -name = "openssl" -version = "0.10.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" -dependencies = [ - "bitflags 2.5.0", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.53", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-sys" -version = "0.9.101" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "opentelemetry" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900d57987be3f2aeb70d385fff9b27fb74c5723cc9a52d904d4f9c807a0667bf" -dependencies = [ - "futures-core", - "futures-sink", - "js-sys", - "once_cell", - "pin-project-lite", - "thiserror", - "urlencoding", -] - -[[package]] -name = "ordered-float" -version = "2.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" -dependencies = [ - "num-traits", -] - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[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 = "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", - "libc", - "redox_syscall", - "smallvec", - "windows-targets 0.48.5", -] - -[[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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "petgraph" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" -dependencies = [ - "fixedbitset", - "indexmap 2.2.5", -] - -[[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.53", -] - -[[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 = "portable-atomic" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" - -[[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 = "predicates" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8" -dependencies = [ - "anstyle", - "predicates-core", -] - -[[package]] -name = "predicates-core" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" - -[[package]] -name = "predicates-tree" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" -dependencies = [ - "predicates-core", - "termtree", -] - -[[package]] -name = "prettyplease" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5" -dependencies = [ - "proc-macro2", - "syn 2.0.53", -] - -[[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-macro2" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "prometheus" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c" -dependencies = [ - "cfg-if", - "fnv", - "lazy_static", - "memchr", - "parking_lot", - "protobuf", - "thiserror", -] - -[[package]] -name = "prost" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" -dependencies = [ - "bytes", - "prost-derive", -] - -[[package]] -name = "prost-build" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55e02e35260070b6f716a2423c2ff1c3bb1642ddca6f99e1f26d06268a0e2d2" -dependencies = [ - "bytes", - "heck 0.4.1", - "itertools 0.11.0", - "log", - "multimap", - "once_cell", - "petgraph", - "prettyplease", - "prost", - "prost-types", - "regex", - "syn 2.0.53", - "tempfile", - "which", -] - -[[package]] -name = "prost-derive" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e" -dependencies = [ - "anyhow", - "itertools 0.11.0", - "proc-macro2", - "quote", - "syn 2.0.53", -] - -[[package]] -name = "prost-types" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e" -dependencies = [ - "prost", -] - -[[package]] -name = "prost-wkt" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d8ef9c3f0f1dab910d2b7e2c24a8e4322e122eba6d7a1921eeebcebbc046c40" -dependencies = [ - "chrono", - "inventory", - "prost", - "serde", - "serde_derive", - "serde_json", - "typetag", -] - -[[package]] -name = "prost-wkt-build" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b31cae9a54ca84fee1504740a82eebf2479532905e106f63ca0c3bc8d780321" -dependencies = [ - "heck 0.4.1", - "prost", - "prost-build", - "prost-types", - "quote", -] - -[[package]] -name = "prost-wkt-types" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435be4a8704091b4c5fb1d79799de7f2dbff53af05edf29385237f8cf7ab37ee" -dependencies = [ - "chrono", - "prost", - "prost-build", - "prost-types", - "prost-wkt", - "prost-wkt-build", - "regex", - "serde", - "serde_derive", - "serde_json", -] - -[[package]] -name = "protobuf" -version = "2.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" - -[[package]] -name = "quanta" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ca0b7bac0b97248c40bb77288fc52029cf1459c0461ea1b05ee32ccf011de2c" -dependencies = [ - "crossbeam-utils", - "libc", - "once_cell", - "raw-cpuid", - "wasi", - "web-sys", - "winapi", -] - -[[package]] -name = "quote" -version = "1.0.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" -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 = "raw-cpuid" -version = "11.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d86a7c4638d42c44551f4791a20e687dbb4c3de1f33c43dd71e355cd429def1" -dependencies = [ - "bitflags 2.5.0", -] - -[[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 = "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.6", - "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.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" -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 = "reqwest" -version = "0.11.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78bf93c4af7a8bb7d879d51cebe797356ff10ae8516ace542b5182d9dcac10b2" -dependencies = [ - "base64 0.21.7", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-tls", - "ipnet", - "js-sys", - "log", - "mime", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls-pemfile 1.0.4", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "system-configuration", - "tokio", - "tokio-native-tls", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "winreg", -] - -[[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.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" -dependencies = [ - "cc", - "cfg-if", - "getrandom", - "libc", - "spin 0.9.8", - "untrusted", - "windows-sys 0.52.0", -] - -[[package]] -name = "ringbuf" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79abed428d1fd2a128201cec72c5f6938e2da607c6f3745f769fabea399d950a" -dependencies = [ - "crossbeam-utils", -] - -[[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 = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] -name = "rustfsm" -version = "0.1.0" -source = "git+https://github.com/temporalio/sdk-core?branch=master#4840a9c570fa3388e190e20f01f61065d0b7e965" -dependencies = [ - "rustfsm_procmacro", - "rustfsm_trait", -] - -[[package]] -name = "rustfsm_procmacro" -version = "0.1.0" -source = "git+https://github.com/temporalio/sdk-core?branch=master#4840a9c570fa3388e190e20f01f61065d0b7e965" -dependencies = [ - "derive_more", - "proc-macro2", - "quote", - "rustfsm_trait", - "syn 2.0.53", -] - -[[package]] -name = "rustfsm_trait" -version = "0.1.0" -source = "git+https://github.com/temporalio/sdk-core?branch=master#4840a9c570fa3388e190e20f01f61065d0b7e965" - -[[package]] -name = "rustix" -version = "0.38.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" -dependencies = [ - "bitflags 2.5.0", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", -] - -[[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", - "subtle", - "zeroize", -] - -[[package]] -name = "rustls-native-certs" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" -dependencies = [ - "openssl-probe", - "rustls-pemfile 2.1.1", - "rustls-pki-types", - "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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f48172685e6ff52a556baa527774f61fcaa884f59daf3375c62a3f1cd2549dab" -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-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.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" - -[[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 = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[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 = "1.0.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" - -[[package]] -name = "serde" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde-value" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c" -dependencies = [ - "ordered-float", - "serde", -] - -[[package]] -name = "serde_derive" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.53", -] - -[[package]] -name = "serde_json" -version = "1.0.114" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_path_to_error" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" -dependencies = [ - "itoa", - "serde", -] - -[[package]] -name = "serde_plain" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1fc6db65a611022b23a0dec6975d63fb80a302cb3388835ff02c097258d50" -dependencies = [ - "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_with" -version = "3.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee80b0e361bbf88fd2f6e242ccd19cfda072cb0faa6ae694ecee08199938569a" -dependencies = [ - "base64 0.21.7", - "chrono", - "hex", - "indexmap 1.9.3", - "indexmap 2.2.5", - "serde", - "serde_derive", - "serde_json", - "serde_with_macros", - "time", -] - -[[package]] -name = "serde_with_macros" -version = "3.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6561dc161a9224638a31d876ccdfefbc1df91d3f3a8342eddb35f055d48c7655" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 2.0.53", -] - -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "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 = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[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 = "siphasher" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" - -[[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", -] - -[[package]] -name = "smallvec" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" - -[[package]] -name = "smeeclient" -version = "0.1.0" -dependencies = [ - "cbindgen", - "serde", - "temporal-client", - "temporal-sdk", - "temporal-sdk-core-protos", - "tokio", - "url", - "uuid", -] - -[[package]] -name = "socket2" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[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" - -[[package]] -name = "spinning_top" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96d2d1d716fb500937168cc09353ffdc7a012be8475ac7308e1bdf0e3923300" -dependencies = [ - "lock_api", -] - -[[package]] -name = "spki" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" -dependencies = [ - "base64ct", - "der", -] - -[[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 = "subtle" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.53" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[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 = "temporal-client" -version = "0.1.0" -source = "git+https://github.com/temporalio/sdk-core?branch=master#4840a9c570fa3388e190e20f01f61065d0b7e965" -dependencies = [ - "anyhow", - "async-trait", - "backoff", - "derive_builder", - "derive_more", - "futures", - "futures-retry", - "http", - "once_cell", - "opentelemetry", - "parking_lot", - "prost-types", - "slotmap", - "temporal-sdk-core-api", - "temporal-sdk-core-protos", - "thiserror", - "tokio", - "tonic", - "tower", - "tracing", - "url", - "uuid", -] - -[[package]] -name = "temporal-sdk" -version = "0.1.0-alpha.1" -source = "git+https://github.com/temporalio/sdk-core?branch=master#4840a9c570fa3388e190e20f01f61065d0b7e965" -dependencies = [ - "anyhow", - "async-trait", - "base64 0.21.7", - "crossbeam-channel", - "derive_more", - "futures", - "once_cell", - "parking_lot", - "prost-wkt-types", - "serde", - "sha2", - "temporal-client", - "temporal-sdk-core", - "temporal-sdk-core-api", - "temporal-sdk-core-protos", - "thiserror", - "tokio", - "tokio-stream", - "tokio-util", - "tonic", - "tracing", -] - -[[package]] -name = "temporal-sdk-core" -version = "0.1.0" -source = "git+https://github.com/temporalio/sdk-core?branch=master#4840a9c570fa3388e190e20f01f61065d0b7e965" -dependencies = [ - "anyhow", - "async-trait", - "base64 0.21.7", - "crossbeam-channel", - "crossbeam-queue", - "dashmap", - "derive_builder", - "derive_more", - "enum-iterator", - "enum_dispatch", - "futures", - "futures-util", - "governor", - "itertools 0.12.1", - "log", - "lru", - "mockall", - "once_cell", - "parking_lot", - "pin-project", - "prometheus", - "prost", - "prost-wkt-types", - "rand", - "ringbuf", - "rustfsm", - "serde", - "serde_json", - "siphasher", - "slotmap", - "temporal-client", - "temporal-sdk-core-api", - "temporal-sdk-core-protos", - "thiserror", - "tokio", - "tokio-stream", - "tokio-util", - "tonic", - "tonic-build", - "tracing", - "tracing-subscriber", - "url", - "uuid", -] - -[[package]] -name = "temporal-sdk-core-api" -version = "0.1.0" -source = "git+https://github.com/temporalio/sdk-core?branch=master#4840a9c570fa3388e190e20f01f61065d0b7e965" -dependencies = [ - "async-trait", - "derive_builder", - "derive_more", - "opentelemetry", - "prost-types", - "serde_json", - "temporal-sdk-core-protos", - "thiserror", - "tonic", - "tracing-core", - "url", -] - -[[package]] -name = "temporal-sdk-core-protos" -version = "0.1.0" -source = "git+https://github.com/temporalio/sdk-core?branch=master#4840a9c570fa3388e190e20f01f61065d0b7e965" -dependencies = [ - "anyhow", - "base64 0.21.7", - "derive_more", - "prost", - "prost-wkt", - "prost-wkt-build", - "prost-wkt-types", - "rand", - "serde", - "serde_json", - "thiserror", - "tonic", - "tonic-build", - "uuid", -] - -[[package]] -name = "termtree" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "thiserror" -version = "1.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.53", -] - -[[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 = "time" -version = "0.3.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" -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.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" -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 = "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-io-timeout" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" -dependencies = [ - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-macros" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.53", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-rustls" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" -dependencies = [ - "rustls", - "rustls-pki-types", - "tokio", -] - -[[package]] -name = "tokio-stream" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" -dependencies = [ - "futures-core", - "pin-project-lite", - "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-sink", - "pin-project-lite", - "tokio", - "tracing", -] - -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - -[[package]] -name = "tonic" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13" -dependencies = [ - "async-stream", - "async-trait", - "axum", - "base64 0.21.7", - "bytes", - "h2", - "http", - "http-body", - "hyper", - "hyper-timeout", - "percent-encoding", - "pin-project", - "prost", - "rustls-native-certs", - "rustls-pemfile 2.1.1", - "rustls-pki-types", - "tokio", - "tokio-rustls", - "tokio-stream", - "tower", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tonic-build" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4ef6dd70a610078cb4e338a0f79d06bc759ff1b22d2120c2ff02ae264ba9c2" -dependencies = [ - "prettyplease", - "proc-macro2", - "prost-build", - "quote", - "syn 2.0.53", -] - -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "indexmap 1.9.3", - "pin-project", - "pin-project-lite", - "rand", - "slab", - "tokio", - "tokio-util", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-layer" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" - -[[package]] -name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[package]] -name = "tracing" -version = "0.1.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 2.0.53", -] - -[[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", - "parking_lot", - "regex", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log", -] - -[[package]] -name = "try-lock" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "typetag" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "661d18414ec032a49ece2d56eee03636e43c4e8d577047ab334c0ba892e29aaf" -dependencies = [ - "erased-serde", - "inventory", - "once_cell", - "serde", - "typetag-impl", -] - -[[package]] -name = "typetag-impl" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac73887f47b9312552aa90ef477927ff014d63d1920ca8037c6c1951eab64bb1" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.53", -] - -[[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-normalization" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] - -[[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 = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - -[[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 = "urlencoding" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" - -[[package]] -name = "uuid" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" -dependencies = [ - "getrandom", -] - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.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 2.0.53", - "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 2.0.53", - "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 = "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 = "which" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" -dependencies = [ - "either", - "home", - "once_cell", - "rustix", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-core" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" -dependencies = [ - "windows-targets 0.52.4", -] - -[[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.4", -] - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" -dependencies = [ - "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.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.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.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.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.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.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.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.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[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 2.0.53", -] - -[[package]] -name = "zeroidc" -version = "0.1.0" -dependencies = [ - "base64 0.21.7", - "bytes", - "cbindgen", - "jwt", - "openidconnect", - "reqwest", - "serde", - "thiserror", - "time", - "tokio", - "url", -] - -[[package]] -name = "zeroize" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" diff --git a/pkgs/by-name/ze/zerotierone/package.nix b/pkgs/by-name/ze/zerotierone/package.nix index 8f5f2dcb1422..b7157273c7ad 100644 --- a/pkgs/by-name/ze/zerotierone/package.nix +++ b/pkgs/by-name/ze/zerotierone/package.nix @@ -13,50 +13,45 @@ zlib, libiconv, darwin, - fetchpatch, }: let pname = "zerotierone"; - version = "1.14.0"; + version = "1.14.2"; src = fetchFromGitHub { owner = "zerotier"; repo = "ZeroTierOne"; - rev = version; - hash = "sha256-YWcqALUB3ZEukL4er2FKcyNdEbuaf//QU5hRbKAfxDA="; + tag = version; + hash = "sha256-D+7/ja5uYzH1iNd+Ti3k+dWOf5GvN4U+GuVBA9gxtTc="; }; in stdenv.mkDerivation { inherit pname version src; - cargoDeps = rustPlatform.importCargoLock { - lockFile = ./Cargo.lock; - outputHashes = { - "jwt-0.16.0" = "sha256-P5aJnNlcLe9sBtXZzfqHdRvxNfm6DPBcfcKOVeLZxcM="; - "rustfsm-0.1.0" = "sha256-q7J9QgN67iuoNhQC8SDVzUkjCNRXGiNCkE8OsQc5+oI="; - }; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit src; + sourceRoot = "source/rustybits"; + hash = "sha256-CSpm4zBWKhcrM/KXGU6/51NSQ6hzpT44D2J+QETBtpQ="; + + # REMOVEME when https://github.com/NixOS/nixpkgs/pull/300532 is merged + postBuild = '' + pushd $out/git/730aadcc02767ae630e88f8f8c788a85d6bc81e6 + patch --verbose -p1 <${./0001-rustfsm-remove-unsupported-lints.workspace.patch} + popd + ''; }; + patches = [ - # https://github.com/zerotier/ZeroTierOne/pull/2314 - (fetchpatch { - url = "https://github.com/zerotier/ZeroTierOne/commit/f9c6ee0181acb1b77605d9a4e4106ac79aaacca3.patch"; - hash = "sha256-zw7KmaxiCH99Y0wQtOQM4u0ruxiePhvv/birxMQioJU="; - }) ./0001-darwin-disable-link-time-optimization.patch ]; + postPatch = '' - cp ${./Cargo.lock} Cargo.lock - cp ${./Cargo.lock} rustybits/Cargo.lock + cp rustybits/Cargo.lock Cargo.lock ''; preConfigure = '' - cmp ./Cargo.lock ./rustybits/Cargo.lock || { - echo 1>&2 "Please make sure that the derivation's Cargo.lock is identical to ./rustybits/Cargo.lock!" - exit 1 - } - patchShebangs ./doc/build.sh substituteInPlace ./doc/build.sh \ --replace '/usr/bin/ronn' '${buildPackages.ronn}/bin/ronn' \ From 9801b983c7b8c2a41398a1b8cb31c44b321112e1 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Mon, 10 Feb 2025 12:31:41 +0700 Subject: [PATCH 1101/2168] zerotierone: fix build on macOS --- pkgs/by-name/ze/zerotierone/package.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ze/zerotierone/package.nix b/pkgs/by-name/ze/zerotierone/package.nix index b7157273c7ad..d3d4b80297bb 100644 --- a/pkgs/by-name/ze/zerotierone/package.nix +++ b/pkgs/by-name/ze/zerotierone/package.nix @@ -13,6 +13,7 @@ zlib, libiconv, darwin, + fetchpatch, }: let @@ -45,6 +46,11 @@ stdenv.mkDerivation { patches = [ ./0001-darwin-disable-link-time-optimization.patch + # https://github.com/zerotier/ZeroTierOne/pull/2435 + (fetchpatch { + url = "https://github.com/zerotier/ZeroTierOne/commit/8f56d484b681ea30cd28e19cab34499acfa6e64d.patch"; + hash = "sha256-UplkX2O4o8XKKTlR3ZsSG9E0y5gVhAagyepqwyGEYmA="; + }) ]; postPatch = '' @@ -89,20 +95,12 @@ stdenv.mkDerivation { preBuild = if stdenv.hostPlatform.isDarwin then '' - makeFlagsArray+=("ARCH_FLAGS=") # disable multi-arch build + # building multiple architectures at the same time from nixpkgs is not supported + makeFlagsArray+=("ARCH=${stdenv.hostPlatform.darwinArch}") if ! grep -q MACOS_VERSION_MIN=10.13 make-mac.mk; then echo "You may need to update MACOSX_DEPLOYMENT_TARGET to match the value in make-mac.mk" exit 1 fi - (cd rustybits && MACOSX_DEPLOYMENT_TARGET=10.13 cargo build -p zeroidc --release) - - cp \ - ./rustybits/target/${stdenv.hostPlatform.rust.rustcTarget}/release/libzeroidc.a \ - ./rustybits/target - - # zerotier uses the "FORCE" target as a phony target to force rebuilds. - # We don't want to rebuild libzeroidc.a as we build want to build this library ourself for a single architecture - touch FORCE '' else '' From 2d028149d9fd13a53cf556fcf9f48868ef249011 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 04:12:29 +0000 Subject: [PATCH 1102/2168] cadical: 2.1.2 -> 2.1.3 --- pkgs/by-name/ca/cadical/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ca/cadical/package.nix b/pkgs/by-name/ca/cadical/package.nix index fde53b371fb5..dfc2727379cc 100644 --- a/pkgs/by-name/ca/cadical/package.nix +++ b/pkgs/by-name/ca/cadical/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, copyPkgconfigItems, makePkgconfigItem, - version ? "2.1.2", + version ? "2.1.3", }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { rev = "rel-${version}"; hash = { - "2.1.2" = "sha256-fhvQd/f8eaw7OA2/XoOTVOnQxSSxUvugu6VWo2nmpQ0="; + "2.1.3" = "sha256-W3kO+6nVzkmJXyHJU+NZWP0oatK3gon4EWF1/03rgL4="; "2.0.0" = "sha256-qoeEM9SdpuFuBPeQlCzuhPLcJ+bMQkTUTGiT8QdU8rc="; } .${version}; From 882fac471737df700a6fe01d7d9b223c03376be9 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Mon, 10 Feb 2025 12:44:59 +0800 Subject: [PATCH 1103/2168] emacsPackages.dap-mode: fix build https://hydra.nix-community.org/build/2991612 (cherry picked from commit fe5312cd441714a518c3585297ba0f1915e899b8) This was originally committed to the staging-next branch. To make it reach users sooner, we revert it on the staging-next branch and reapply it to the master branch. Closes: https://github.com/nix-community/emacs-overlay/issues/467 --- .../emacs/elisp-packages/melpa-packages.nix | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 122a02f18abd..dbbbe8df53b1 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -977,14 +977,19 @@ let cssh = ignoreCompilationError super.cssh; # elisp error - dap-mode = super.dap-mode.overrideAttrs (old: { - # empty file causing native-compiler-error-empty-byte - preBuild = - '' - rm --verbose dapui.el - '' - + old.preBuild or ""; - }); + dap-mode = super.dap-mode.overrideAttrs ( + finalAttrs: previousAttrs: { + # empty file causing native-compiler-error-empty-byte + preBuild = + if lib.versionOlder finalAttrs.version "20250131.1624" then + '' + rm --verbose dapui.el + '' + + previousAttrs.preBuild or "" + else + previousAttrs.preBuild or null; + } + ); db-pg = ignoreCompilationError super.db-pg; # elisp error From 7fac2f761bc326e308743c9b60462dcab43f2734 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 04:28:44 +0000 Subject: [PATCH 1104/2168] yamlfmt: 0.15.0 -> 0.16.0 --- pkgs/by-name/ya/yamlfmt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ya/yamlfmt/package.nix b/pkgs/by-name/ya/yamlfmt/package.nix index 9f4964ed7636..cadab5c8ba7d 100644 --- a/pkgs/by-name/ya/yamlfmt/package.nix +++ b/pkgs/by-name/ya/yamlfmt/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "yamlfmt"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "google"; repo = "yamlfmt"; tag = "v${version}"; - hash = "sha256-eAcHl4h7c3HU901cuqzAPs49qRldxKQDxrWBmccmwos="; + hash = "sha256-4PCwMLwFtCK55k7b6CgpPOKsxLdeU55DxYEDbYDWVYg="; }; - vendorHash = "sha256-za95/Zj8MXJqt9tW6csaRlXFs+5ET/D4CUsCnGqcLQQ="; + vendorHash = "sha256-eOuLgNCxrI2HIFBwLAYRl6PwW/1hihQ0QsTtG1sxCL8="; ldflags = [ "-s" From b364d449332dc6b41a240c4a51f199754cbc61e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 04:29:40 +0000 Subject: [PATCH 1105/2168] vscode-extensions.timonwong.shellcheck: 0.37.6 -> 0.37.7 --- .../vscode/extensions/timonwong.shellcheck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix b/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix index 4b3fae6e9d53..5b77d76e9168 100644 --- a/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix +++ b/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix @@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "shellcheck"; publisher = "timonwong"; - version = "0.37.6"; - sha256 = "sha256-xfVKI+xxA/8YUcCWpskxZLbBLPsYCF46iKJkrV2zODs="; + version = "0.37.7"; + sha256 = "sha256-i8cVY8EcKSxnmWmRWDiARF79pOEcYMc+y+7i4d8EDTo="; }; nativeBuildInputs = [ jq From 1ba5e8fe862281c938a1a0ed82250de5fe621e6b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 04:31:31 +0000 Subject: [PATCH 1106/2168] static-web-server: 2.35.0 -> 2.36.0 --- pkgs/by-name/st/static-web-server/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/static-web-server/package.nix b/pkgs/by-name/st/static-web-server/package.nix index 68d88a29326d..fa62932604d8 100644 --- a/pkgs/by-name/st/static-web-server/package.nix +++ b/pkgs/by-name/st/static-web-server/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "static-web-server"; - version = "2.35.0"; + version = "2.36.0"; src = fetchFromGitHub { owner = "static-web-server"; repo = pname; rev = "v${version}"; - hash = "sha256-vrv/qCn57wO3no3ASgaJFAhTjFyW5M4kZkfpgkpYYhY="; + hash = "sha256-TE0V9Ai7lLb1TBtusDV+ACuPO8/1VUjeVZzA4XoL3VQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-i+x8Box4gz79qnrcI2XXkSZ3u3h5qHKwJhOBc+Lx+Nw="; + cargoHash = "sha256-uGEn+UvHse4tGOAQGzEoFpJxqbXM0u4IrXmMVgKz8z4="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; From 21c6a520d1f14f547b95662c36bcef236d06133c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 04:40:45 +0000 Subject: [PATCH 1107/2168] victoriametrics: 1.110.0 -> 1.111.0 --- pkgs/by-name/vi/victoriametrics/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix index bcdbaa465213..1dbce435d37c 100644 --- a/pkgs/by-name/vi/victoriametrics/package.nix +++ b/pkgs/by-name/vi/victoriametrics/package.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "VictoriaMetrics"; - version = "1.110.0"; + version = "1.111.0"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaMetrics"; rev = "v${version}"; - hash = "sha256-TrM2YyxZZZw+wGMIFACJExtQb6aJwDe1xe63OQqCjDo="; + hash = "sha256-KLRaAGLh7SYPQERZvuj5Jlu1oIrvQPFCQJRlHedLezk="; }; vendorHash = null; From 82018809af6fc3cc93f4d0caac83d674a0bac445 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 05:27:40 +0000 Subject: [PATCH 1108/2168] python312Packages.gwcs: 0.22.1 -> 0.24.0 --- pkgs/development/python-modules/gwcs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/gwcs/default.nix b/pkgs/development/python-modules/gwcs/default.nix index af8aa9d36ef2..dd344dde1622 100644 --- a/pkgs/development/python-modules/gwcs/default.nix +++ b/pkgs/development/python-modules/gwcs/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "gwcs"; - version = "0.22.1"; + version = "0.24.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "spacetelescope"; repo = "gwcs"; tag = version; - hash = "sha256-9s3HwKFpUXb0aqcSEJVL2SB6G2pQc8xQT5HdZYoHd/I="; + hash = "sha256-XxC61AzyZt0lVVwOr2yiN0/ldjcq/ABtzNDSQaGo9as="; }; build-system = [ @@ -53,7 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to manage the Generalized World Coordinate System"; homepage = "https://github.com/spacetelescope/gwcs"; - changelog = "https://github.com/spacetelescope/gwcs/blob/${version}/CHANGES.rst"; + changelog = "https://github.com/spacetelescope/gwcs/blob/${src.tag}/CHANGES.rst"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; From 3c32085ed98a296ba35a6d859df8f9b7e4d1ad60 Mon Sep 17 00:00:00 2001 From: Yifei Sun Date: Sun, 9 Feb 2025 22:36:25 -0500 Subject: [PATCH 1109/2168] dolmen_lsp: init at 0.10 --- .../ocaml-modules/dolmen/linol-lwt-6.patch | 43 +++++++++++++++++++ pkgs/development/ocaml-modules/dolmen/lsp.nix | 34 +++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 + 3 files changed, 79 insertions(+) create mode 100644 pkgs/development/ocaml-modules/dolmen/linol-lwt-6.patch create mode 100644 pkgs/development/ocaml-modules/dolmen/lsp.nix diff --git a/pkgs/development/ocaml-modules/dolmen/linol-lwt-6.patch b/pkgs/development/ocaml-modules/dolmen/linol-lwt-6.patch new file mode 100644 index 000000000000..b92bfa46cd66 --- /dev/null +++ b/pkgs/development/ocaml-modules/dolmen/linol-lwt-6.patch @@ -0,0 +1,43 @@ +diff --git a/src/lsp/main.ml b/src/lsp/main.ml +index 8d6fc760..b52dd25c 100644 +--- a/src/lsp/main.ml ++++ b/src/lsp/main.ml +@@ -3,7 +3,7 @@ + + let run () = + let s = new Server.dolmen_lsp_server in +- let server = Linol_lwt.Jsonrpc2.create_stdio s in ++ let server = Linol_lwt.Jsonrpc2.create_stdio ~env:() s in + let task = Linol_lwt.Jsonrpc2.run server in + match Linol_lwt.run task with + | () -> () +diff --git a/src/lsp/server.ml b/src/lsp/server.ml +index e895cc6a..c9a3f237 100644 +--- a/src/lsp/server.ml ++++ b/src/lsp/server.ml +@@ -44,6 +44,8 @@ class dolmen_lsp_server = + object(self) + inherit Linol_lwt.Jsonrpc2.server + ++ method spawn_query_handler _ = () ++ + (* one env per document *) + val buffers: (Lsp.Types.DocumentUri.t, State.t) Hashtbl.t = Hashtbl.create 32 + +@@ -55,14 +57,14 @@ class dolmen_lsp_server = + let change = Lsp.Types.TextDocumentSyncKind.Incremental in + (* Lsp.Types.TextDocumentSyncKind.Full *) + Lsp.Types.TextDocumentSyncOptions.create ~openClose:true ~change +- ~save:(Lsp.Types.SaveOptions.create ~includeText:false ()) ++ ~save:(`SaveOptions (Lsp.Types.SaveOptions.create ~includeText:false ())) + () + + method private _on_doc + ~(notify_back:Linol_lwt.Jsonrpc2.notify_back) + (uri:Lsp.Types.DocumentUri.t) (contents:string) = + (* TODO: unescape uri/translate it to a correct path ? *) +- match Loop.process prelude (preprocess_uri uri) (Some contents) with ++ match Loop.process prelude (preprocess_uri (Lsp.Types.DocumentUri.to_string uri)) (Some contents) with + | Ok state -> + let diags = State.get State.diagnostics state in + Hashtbl.replace buffers uri state; diff --git a/pkgs/development/ocaml-modules/dolmen/lsp.nix b/pkgs/development/ocaml-modules/dolmen/lsp.nix new file mode 100644 index 000000000000..5d92bd1278ed --- /dev/null +++ b/pkgs/development/ocaml-modules/dolmen/lsp.nix @@ -0,0 +1,34 @@ +{ + lib, + buildDunePackage, + dolmen, + dolmen_loop, + dolmen_type, + linol, + linol-lwt, + logs, +# lsp, # transitive dependency from linol +}: + +buildDunePackage { + pname = "dolmen_lsp"; + inherit (dolmen) src version; + + patches = [ ./linol-lwt-6.patch ]; + + buildInputs = [ + dolmen + dolmen_loop + dolmen_type + linol + linol-lwt + logs + # lsp # transitive dependency from linol + ]; + + meta = dolmen.meta // { + description = "A LSP server for automated deduction languages"; + mainProgram = "dolmenls"; + maintainers = [ lib.maintainers.stepbrobd ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 19d7a829fc29..7c216103317c 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -361,6 +361,8 @@ let dolmen_loop = callPackage ../development/ocaml-modules/dolmen/loop.nix { }; + dolmen_lsp = callPackage ../development/ocaml-modules/dolmen/lsp.nix { }; + dolmen_type = callPackage ../development/ocaml-modules/dolmen/type.nix { }; dolog = callPackage ../development/ocaml-modules/dolog { }; From 3cb3f93aef923ee33f5e2593c7068c31dd8b47de Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Feb 2025 17:47:33 +0000 Subject: [PATCH 1110/2168] refine: 0.4.2 -> 0.4.4 --- pkgs/by-name/re/refine/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/refine/package.nix b/pkgs/by-name/re/refine/package.nix index 87a462c23bcf..ddac6eb30001 100644 --- a/pkgs/by-name/re/refine/package.nix +++ b/pkgs/by-name/re/refine/package.nix @@ -34,7 +34,7 @@ in python3Packages.buildPythonApplication rec { pname = "refine"; - version = "0.4.3"; + version = "0.4.4"; pyproject = false; # uses meson src = fetchFromGitLab { @@ -42,7 +42,7 @@ python3Packages.buildPythonApplication rec { owner = "TheEvilSkeleton"; repo = "Refine"; tag = version; - hash = "sha256-WFajNhTXFqZUYLXumcnDM2pfmKye8p7h6L+BS1orEgs="; + hash = "sha256-39fbUJpNON0aALT/pb18/m9hStue4TxkrAsHymEpy5I="; }; nativeBuildInputs = [ From 7bae65cd6bc9807073d7826c8e831772815220d4 Mon Sep 17 00:00:00 2001 From: Rebecca Turner Date: Mon, 10 Feb 2025 22:11:11 -0800 Subject: [PATCH 1111/2168] git-upstream: 1.2.0 -> 1.5.0 Diff: https://github.com/9999years/git-upstream/compare/refs/tags/v1.2.0...v1.5.0 Changelog: https://github.com/9999years/git-upstream/releases/tag/v1.5.0 --- pkgs/by-name/gi/git-upstream/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/git-upstream/package.nix b/pkgs/by-name/gi/git-upstream/package.nix index 9c930fa1e6d3..bc93518ddff1 100644 --- a/pkgs/by-name/gi/git-upstream/package.nix +++ b/pkgs/by-name/gi/git-upstream/package.nix @@ -6,7 +6,7 @@ }: let pname = "git-upstream"; - version = "1.2.0"; + version = "1.5.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -15,11 +15,11 @@ rustPlatform.buildRustPackage { owner = "9999years"; repo = pname; tag = "v${version}"; - hash = "sha256-GnsqZSztDLXMO4T16nfcOKMKXap88CJzJ5nObzGwhMA="; + hash = "sha256-ooqz2Xp/nljx2+zQsc/RjVbGG/5YTeggU6pB8lGK0o8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-DzRiRUCsTslldnSNByaCr5eQGKxyTSifL2duZnMTmNk="; + cargoHash = "sha256-oIrUjb+yJgDR5GYrG3hPLpXYJynR9eeX00emcrcjmZY="; meta = { homepage = "https://github.com/9999years/git-upstream"; From 4f094f4a2ee6bcb449de091f1b3c7e658409d58f Mon Sep 17 00:00:00 2001 From: Mutsuha Asada Date: Fri, 7 Feb 2025 20:29:58 +0900 Subject: [PATCH 1112/2168] ocamlPackages.easy-format: 1.3.3 -> 1.3.4 Changelog: https://github.com/ocaml-community/easy-format/releases/tag/1.3.4 Diff: https://github.com/ocaml-community/easy-format/compare/1.3.3...1.3.4 --- pkgs/development/ocaml-modules/easy-format/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/easy-format/default.nix b/pkgs/development/ocaml-modules/easy-format/default.nix index df1b30dd647a..d65b5863e86e 100644 --- a/pkgs/development/ocaml-modules/easy-format/default.nix +++ b/pkgs/development/ocaml-modules/easy-format/default.nix @@ -9,8 +9,8 @@ let params = if lib.versionAtLeast ocaml.version "4.08" then { - version = "1.3.3"; - sha256 = "sha256:05n4mm1yz33h9gw811ivjw7x4m26lpmf7kns9lza4v6227lwmz7a"; + version = "1.3.4"; + sha256 = "sha256-Hb8FHp9oV03ebi4lSma5xSTKQl6As26Zr5btlkq2EMM="; } else { From da85d37aa491d6df3087d5f1f4fe959b50c48051 Mon Sep 17 00:00:00 2001 From: Mutsuha Asada Date: Fri, 7 Feb 2025 20:34:49 +0900 Subject: [PATCH 1113/2168] ocamlPackages.easy-format: modernized derivation - Removed with lib - Added changelog and longDescription to meta - Replaced sha256 with hash --- .../ocaml-modules/easy-format/default.nix | 31 +++++++++++++++---- 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/easy-format/default.nix b/pkgs/development/ocaml-modules/easy-format/default.nix index d65b5863e86e..ddbe68fe779c 100644 --- a/pkgs/development/ocaml-modules/easy-format/default.nix +++ b/pkgs/development/ocaml-modules/easy-format/default.nix @@ -10,12 +10,12 @@ let if lib.versionAtLeast ocaml.version "4.08" then { version = "1.3.4"; - sha256 = "sha256-Hb8FHp9oV03ebi4lSma5xSTKQl6As26Zr5btlkq2EMM="; + hash = "sha256-Hb8FHp9oV03ebi4lSma5xSTKQl6As26Zr5btlkq2EMM="; } else { version = "1.3.2"; - sha256 = "sha256:09hrikx310pac2sb6jzaa7k6fmiznnmhdsqij1gawdymhawc4h1l"; + hash = "sha256-NEDCuILVN65ekBHrBqu1P1Zn5lHqS7O0YOqCMPqMGSY="; }; in @@ -25,15 +25,34 @@ buildDunePackage rec { src = fetchurl { url = "https://github.com/ocaml-community/easy-format/releases/download/${version}/easy-format-${version}.tbz"; - inherit (params) sha256; + inherit (params) hash; }; doCheck = true; - meta = with lib; { + meta = { description = "High-level and functional interface to the Format module of the OCaml standard library"; + longDescription = '' + This module offers a high-level and functional interface to the Format module of + the OCaml standard library. It is a pretty-printing facility, i.e. it takes as + input some code represented as a tree and formats this code into the most + visually satisfying result, breaking and indenting lines of code where + appropriate. + + Input data must be first modelled and converted into a tree using 3 kinds of + nodes: + + * atoms + * lists + * labelled nodes + + Atoms represent any text that is guaranteed to be printed as-is. Lists can model + any sequence of items such as arrays of data or lists of definitions that are + labelled with something like "int main", "let x =" or "x:". + ''; homepage = "https://github.com/ocaml-community/easy-format"; - license = licenses.bsd3; - maintainers = [ maintainers.vbgl ]; + changelog = "https://github.com/ocaml-community/easy-format/releases/tag/${params.version}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ vbgl ]; }; } From 3c86adfe01cca60247de2b07ebe2a1d346118fb2 Mon Sep 17 00:00:00 2001 From: Alessandro Sappia Date: Thu, 6 Feb 2025 11:17:11 +0000 Subject: [PATCH 1114/2168] vwifi: init at 6.3-unstable-2025-02-04 Signed-off-by: Alessandro Sappia --- pkgs/by-name/vw/vwifi/makefile.patch | 41 ++++++++++++++++++++++++ pkgs/by-name/vw/vwifi/package.nix | 47 ++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 pkgs/by-name/vw/vwifi/makefile.patch create mode 100644 pkgs/by-name/vw/vwifi/package.nix diff --git a/pkgs/by-name/vw/vwifi/makefile.patch b/pkgs/by-name/vw/vwifi/makefile.patch new file mode 100644 index 000000000000..8d82129e8e5a --- /dev/null +++ b/pkgs/by-name/vw/vwifi/makefile.patch @@ -0,0 +1,41 @@ +diff --git a/Makefile b/Makefile +index 9430d7e..e46efd3 100644 +--- a/Makefile ++++ b/Makefile +@@ -2,8 +2,10 @@ + # + NAME := vwifi + VERSION := 6.3 +-BINDIR := $(DESTDIR)/usr/local/bin +-MANDIR := $(DESTDIR)/usr/local/man/man1 ++PREFIX ?= $(out) ++DESTDIR ?= $(PREFIX) ++BINDIR ?= $(PREFIX)/bin ++MANDIR ?= $(PREFIX)/share/man/man1 + + EXEC := vwifi-server vwifi-client vwifi-ctrl vwifi-add-interfaces + #EXEC := vwifi-server vwifi-client vwifi-ctrl vwifi-add-interfaces vwifi-inet-monitor +@@ -23,10 +25,8 @@ MODE+= -O3 -s -Wall -Wextra -pedantic # ////////// RELEASE + + EDITOR ?= geany + +-NETLINK_FLAGS_PATH := /usr/include/libnl3 +-NETLINK_FLAGS := -I $(NETLINK_FLAGS_PATH) +-NETLINK_LIBS_PATH := . +-NETLINK_LIBS := -L $(NETLINK_LIBS_PATH) -lnl-genl-3 -lnl-3 ++NETLINK_FLAGS := $(shell pkg-config --cflags libnl-3.0 libnl-genl-3.0) ++NETLINK_LIBS := $(shell pkg-config --libs libnl-3.0 libnl-genl-3.0) + + THREAD_LIBS := -lpthread + +@@ -101,10 +101,6 @@ gitversion: .git + @sed -i "s/^\(VERSION.[^\-]*\)\(-.*\)\?/\1-$(shell git log --pretty=format:"%h" -n 1)/g" Makefile + + install : build +-ifneq ($(EUID),0) +- @echo "Please run 'make install' as root user" +- @exit 1 +-endif + chmod +x $(EXEC) + # Install binaire : + mkdir -p $(BINDIR) && cp -p $(EXEC) $(BINDIR) diff --git a/pkgs/by-name/vw/vwifi/package.nix b/pkgs/by-name/vw/vwifi/package.nix new file mode 100644 index 000000000000..21f40ff19916 --- /dev/null +++ b/pkgs/by-name/vw/vwifi/package.nix @@ -0,0 +1,47 @@ +{ + lib, + stdenv, + fetchFromGitHub, + libnl, + pkg-config, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "vwifi"; + version = "6.3-unstable-2025-02-04"; + src = fetchFromGitHub { + owner = "Raizo62"; + repo = "vwifi"; + rev = "18c320b1b92bea241ad801d05e0f2b4748478fd9"; + hash = "sha256-rlwBO5/xyr8KjvacxYt7dBrV1noXhwBJaElGhmM/eWU="; + }; + + patches = [ ./makefile.patch ]; + + buildInputs = [ + libnl + ]; + + nativeBuildInputs = [ + pkg-config + ]; + + doInstallCheck = true; + + installCheckPhase = '' + checksRan=0 + for bin in $out/bin/vwifi-*; do + echo -n "$(basename -- "$bin"): " + $bin --version 2>&1 | grep -F "${lib.versions.majorMinor finalAttrs.version}" + checksRan=$((checksRan+1)) + done + [ $checksRan -gt 0 ] || exit 1 + ''; + + meta = { + description = "Simulate Wi-Fi (802.11) between Linux Virtual Machines"; + homepage = "https://github.com/Raizo62/vwifi"; + license = lib.licenses.lgpl3Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ asappia ]; + }; +}) From 6d0ac786baa4681a84633faa598329bf842ff21e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=A9tan=20Lepage?= <33058747+GaetanLepage@users.noreply.github.com> Date: Tue, 11 Feb 2025 07:37:12 +0100 Subject: [PATCH 1115/2168] Revert "python312Packages.dask: 2024.12.1 -> 2025.1.0" --- .../python-modules/awkward-cpp/default.nix | 4 +- .../python-modules/awkward/default.nix | 51 ++-- .../python-modules/catboost/default.nix | 7 +- .../python-modules/coffea/default.nix | 8 - .../python-modules/dask-awkward/default.nix | 12 +- .../python-modules/dask-expr/default.nix | 65 +++++ .../python-modules/dask-glm/default.nix | 58 ++-- .../python-modules/dask-histogram/default.nix | 8 +- .../python-modules/dask-image/default.nix | 27 +- .../python-modules/dask-ml/default.nix | 46 +++- .../python-modules/dask/default.nix | 252 ++++++++++-------- .../python-modules/devito/default.nix | 30 +-- .../python-modules/mplhep/default.nix | 31 +-- .../python-modules/narwhals/default.nix | 25 +- .../python-modules/sparse/default.nix | 52 ++-- .../python-modules/streamz/default.nix | 60 +++-- pkgs/top-level/python-aliases.nix | 1 - pkgs/top-level/python-packages.nix | 2 + 18 files changed, 406 insertions(+), 333 deletions(-) create mode 100644 pkgs/development/python-modules/dask-expr/default.nix diff --git a/pkgs/development/python-modules/awkward-cpp/default.nix b/pkgs/development/python-modules/awkward-cpp/default.nix index ce96b50ca49b..0063cd3f851f 100644 --- a/pkgs/development/python-modules/awkward-cpp/default.nix +++ b/pkgs/development/python-modules/awkward-cpp/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "awkward-cpp"; - version = "44"; + version = "43"; pyproject = true; src = fetchPypi { pname = "awkward_cpp"; inherit version; - hash = "sha256-jcSZKI1tFrLqILUaJ9UEflGiR7aqz8vLOzAsrW08h9g="; + hash = "sha256-we11WW7IKvZm2ghLW/gF2bcsg1MtA10rZeB5WQXSXq0="; }; build-system = [ diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index 6124a408e605..8722a72cf635 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -1,7 +1,7 @@ { lib, - stdenv, buildPythonPackage, + pythonOlder, fetchFromGitHub, # build-system @@ -13,27 +13,29 @@ fsspec, numpy, packaging, + typing-extensions, + importlib-metadata, - # tests + # checks numba, + setuptools, numexpr, pandas, pyarrow, pytest-xdist, pytestCheckHook, - setuptools, }: buildPythonPackage rec { pname = "awkward"; - version = "2.7.4"; + version = "2.7.2"; pyproject = true; src = fetchFromGitHub { owner = "scikit-hep"; repo = "awkward"; tag = "v${version}"; - hash = "sha256-OXSl+8sfrx+JlLu40wHf+98WVNNwm9uxvsnGXRDztDg="; + hash = "sha256-nOKMwAQ5t8tc64bEKz0j8JxxoVQQu39Iu8Zr9cqSx7A="; }; build-system = [ @@ -41,12 +43,15 @@ buildPythonPackage rec { hatchling ]; - dependencies = [ - awkward-cpp - fsspec - numpy - packaging - ]; + dependencies = + [ + awkward-cpp + fsspec + numpy + packaging + ] + ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ] + ++ lib.optionals (pythonOlder "3.12") [ importlib-metadata ]; dontUseCmakeConfigure = true; @@ -55,35 +60,19 @@ buildPythonPackage rec { nativeCheckInputs = [ fsspec numba + setuptools numexpr pandas pyarrow pytest-xdist pytestCheckHook - setuptools ]; - disabledTests = [ - # pyarrow.lib.ArrowInvalid - "test_recordarray" + disabledTestPaths = [ + # Need to be run on a GPU platform. + "tests-cuda" ]; - disabledTestPaths = - [ - # Need to be run on a GPU platform. - "tests-cuda" - ] - ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ - # Fatal Python error: Segmentation fault at: - # numba/typed/typedlist.py", line 344 in append - "tests/test_0118_numba_cpointers.py" - "tests/test_0397_arrays_as_constants_in_numba.py" - "tests/test_1677_array_builder_in_numba.py" - "tests/test_2055_array_builder_check.py" - "tests/test_2349_growablebuffer_in_numba.py" - "tests/test_2408_layoutbuilder_in_numba.py" - ]; - meta = { description = "Manipulate JSON-like data with NumPy-like idioms"; homepage = "https://github.com/scikit-hep/awkward"; diff --git a/pkgs/development/python-modules/catboost/default.nix b/pkgs/development/python-modules/catboost/default.nix index 86c1211aead0..d0fc77b70038 100644 --- a/pkgs/development/python-modules/catboost/default.nix +++ b/pkgs/development/python-modules/catboost/default.nix @@ -22,8 +22,8 @@ buildPythonPackage rec { pname version src + meta ; - pyproject = true; sourceRoot = "${src.name}/catboost/python-package"; @@ -55,9 +55,4 @@ buildPythonPackage rec { doCheck = false; pythonImportsCheck = [ "catboost" ]; - - meta = catboost.meta // { - # Incompatible with numpy >= 2.0 - broken = true; - }; } diff --git a/pkgs/development/python-modules/coffea/default.nix b/pkgs/development/python-modules/coffea/default.nix index 0710ca0f5dba..5e61b17c5c2d 100644 --- a/pkgs/development/python-modules/coffea/default.nix +++ b/pkgs/development/python-modules/coffea/default.nix @@ -57,10 +57,6 @@ buildPythonPackage rec { hatch-vcs ]; - pythonRelaxDeps = [ - "dask" - ]; - dependencies = [ aiohttp awkward @@ -110,10 +106,6 @@ buildPythonPackage rec { # AssertionError: bug in Awkward Array: attempt to convert TypeTracerArray into a concrete array "test_apply_to_fileset" "test_lorentz_behavior" - - # ValueError: The array to mask was deleted before it could be masked. - # If you want to construct this mask, you must either keep the array alive or use 'ak.mask' explicitly. - "test_read_nanomc" ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/dask-awkward/default.nix b/pkgs/development/python-modules/dask-awkward/default.nix index 8031a140ffbf..a0d8b63fe06a 100644 --- a/pkgs/development/python-modules/dask-awkward/default.nix +++ b/pkgs/development/python-modules/dask-awkward/default.nix @@ -16,7 +16,7 @@ # optional-dependencies pyarrow, - # tests + # checks dask-histogram, distributed, hist, @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "dask-awkward"; - version = "2025.2.0"; + version = "2024.12.2"; pyproject = true; src = fetchFromGitHub { owner = "dask-contrib"; repo = "dask-awkward"; tag = version; - hash = "sha256-hhAY2cPUOYnP86FGsLvxlMeoEwY+sTrjPMKyuZrO0/M="; + hash = "sha256-pL1LDW/q78V/c3Bha38k40018MFO+i8X6htYNdcsy7s="; }; build-system = [ @@ -53,8 +53,8 @@ buildPythonPackage rec { io = [ pyarrow ]; }; - nativeCheckInputs = [ - # dask-histogram (circular dependency) + checkInputs = [ + dask-histogram distributed hist pandas @@ -86,7 +86,7 @@ buildPythonPackage rec { meta = { description = "Native Dask collection for awkward arrays, and the library to use it"; homepage = "https://github.com/dask-contrib/dask-awkward"; - changelog = "https://github.com/dask-contrib/dask-awkward/releases/tag/${version}"; + changelog = "https://github.com/dask-contrib/dask-awkward/releases/tag/${src.tag}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ veprbl ]; }; diff --git a/pkgs/development/python-modules/dask-expr/default.nix b/pkgs/development/python-modules/dask-expr/default.nix new file mode 100644 index 000000000000..c7bb6c734ee9 --- /dev/null +++ b/pkgs/development/python-modules/dask-expr/default.nix @@ -0,0 +1,65 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + versioneer, + + # dependencies + dask, + pandas, + pyarrow, + + # checks + jinja2, + pytestCheckHook, + xarray, +}: + +buildPythonPackage rec { + pname = "dask-expr"; + version = "1.1.21"; + pyproject = true; + + src = fetchFromGitHub { + owner = "dask"; + repo = "dask-expr"; + tag = "v${version}"; + hash = "sha256-t1vPlTxV5JYArg/a7CzPP13NHbstEoCgHRmd8Y9mDfA="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "versioneer[toml]==0.28" "versioneer[toml]" + ''; + + build-system = [ + setuptools + versioneer + ]; + + dependencies = [ + dask + pandas + pyarrow + ]; + + pythonImportsCheck = [ "dask_expr" ]; + + nativeCheckInputs = [ + jinja2 + pytestCheckHook + xarray + ]; + + __darwinAllowLocalNetworking = true; + + meta = { + description = "Rewrite of Dask DataFrame that includes query optimization and generally improved organization"; + homepage = "https://github.com/dask/dask-expr"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/dask-glm/default.nix b/pkgs/development/python-modules/dask-glm/default.nix index 97cfa6100313..a4bead52b43b 100644 --- a/pkgs/development/python-modules/dask-glm/default.nix +++ b/pkgs/development/python-modules/dask-glm/default.nix @@ -1,46 +1,34 @@ { lib, buildPythonPackage, - fetchFromGitHub, - - # build-system - setuptools-scm, - - # dependencies cloudpickle, + dask, distributed, + fetchPypi, multipledispatch, + pytestCheckHook, + pythonOlder, scikit-learn, scipy, + setuptools-scm, sparse, - dask, - - # tests - pytest-xdist, - pytestCheckHook, }: buildPythonPackage rec { pname = "dask-glm"; version = "0.3.2"; - pyproject = true; + format = "setuptools"; - src = fetchFromGitHub { - owner = "dask"; - repo = "dask-glm"; - tag = version; - hash = "sha256-q98QMmw1toashimS16of54cgZgIPqkua3xGD1FZ1nTc="; + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-yUelZoZmmKAdeZeK5zIzy16DitXq1ghRQ1gsXpMLmko="; }; - # ValueError: The truth value of an empty array is ambiguous. Use `array.size > 0` to check that an array is not empty. - postPatch = '' - substituteInPlace dask_glm/utils.py \ - --replace-fail "if arr:" "if (arr is not None) and (arr.size > 0):" - ''; + nativeBuildInputs = [ setuptools-scm ]; - build-system = [ setuptools-scm ]; - - dependencies = [ + propagatedBuildInputs = [ cloudpickle distributed multipledispatch @@ -50,24 +38,30 @@ buildPythonPackage rec { ] ++ dask.optional-dependencies.array; nativeCheckInputs = [ - pytest-xdist + sparse pytestCheckHook ]; pythonImportsCheck = [ "dask_glm" ]; + disabledTestPaths = [ + # Circular dependency with dask-ml + "dask_glm/tests/test_estimators.py" + # Test tries to imort an obsolete method + "dask_glm/tests/test_utils.py" + ]; + disabledTests = [ - # ValueError: can be computed for one-element arrays only. - "test_dot_with_sparse" + # missing fixture with distributed>=2022.8.0 + "test_determinism_distributed" ]; __darwinAllowLocalNetworking = true; - meta = { + meta = with lib; { description = "Generalized Linear Models with Dask"; homepage = "https://github.com/dask/dask-glm/"; - changelog = "https://github.com/dask/dask-glm/releases/tag/${version}"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ GaetanLepage ]; + license = licenses.bsd3; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/dask-histogram/default.nix b/pkgs/development/python-modules/dask-histogram/default.nix index 98692269069d..fc6af4c39c6b 100644 --- a/pkgs/development/python-modules/dask-histogram/default.nix +++ b/pkgs/development/python-modules/dask-histogram/default.nix @@ -10,7 +10,6 @@ # dependencies boost-histogram, dask, - dask-awkward, # tests pytestCheckHook, @@ -18,14 +17,14 @@ buildPythonPackage rec { pname = "dask-histogram"; - version = "2025.2.0"; + version = "2024.12.1"; pyproject = true; src = fetchFromGitHub { owner = "dask-contrib"; repo = "dask-histogram"; tag = version; - hash = "sha256-5Ec/qzVc/7LDG6SJym1e76BbxmbVjKKQHckwtTs1+6M="; + hash = "sha256-chznfEsMFuIioIlTz6uNpVAkjMMoMXjS62R4luKxVZQ="; }; build-system = [ @@ -36,7 +35,6 @@ buildPythonPackage rec { dependencies = [ boost-histogram dask - dask-awkward ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -46,7 +44,7 @@ buildPythonPackage rec { meta = { description = "Histograms with task scheduling"; homepage = "https://dask-histogram.readthedocs.io/"; - changelog = "https://github.com/dask-contrib/dask-histogram/releases/tag/${version}"; + changelog = "https://github.com/dask-contrib/dask-histogram/releases/tag/${src.tag}"; license = with lib.licenses; [ bsd3 ]; maintainers = with lib.maintainers; [ veprbl ]; }; diff --git a/pkgs/development/python-modules/dask-image/default.nix b/pkgs/development/python-modules/dask-image/default.nix index 599e99853ad8..a297902bc684 100644 --- a/pkgs/development/python-modules/dask-image/default.nix +++ b/pkgs/development/python-modules/dask-image/default.nix @@ -1,21 +1,15 @@ { lib, buildPythonPackage, + pythonOlder, fetchFromGitHub, - - # build-system setuptools, setuptools-scm, - - # dependencies dask, numpy, scipy, pandas, pims, - - # tests - pyarrow, pytestCheckHook, scikit-image, }: @@ -25,6 +19,8 @@ buildPythonPackage rec { version = "2024.5.3"; pyproject = true; + disabled = pythonOlder "3.9"; + src = fetchFromGitHub { owner = "dask"; repo = "dask-image"; @@ -32,11 +28,6 @@ buildPythonPackage rec { hash = "sha256-kXCAqJ2Zgo/2Khvo2YcK+n4oGM219GyQ2Hsq9re1Lac="; }; - postPatch = '' - substituteInPlace dask_image/ndinterp/__init__.py \ - --replace-fail "out_bounds.ptp(axis=1)" "np.ptp(out_bounds, axis=1)" - ''; - build-system = [ setuptools setuptools-scm @@ -51,27 +42,15 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pyarrow pytestCheckHook scikit-image ]; pythonImportsCheck = [ "dask_image" ]; - disabledTests = [ - # The following tests are from 'tests/test_dask_image/test_ndmeasure/test_find_objects.py' and - # fail because of errrors on numpy slices - # AttributeError: 'str' object has no attribute 'start' - "test_find_objects" - "test_3d_find_objects" - # AssertionError (comparing slices) - "test_find_objects_with_empty_chunks" - ]; - meta = { description = "Distributed image processing"; homepage = "https://github.com/dask/dask-image"; - changelog = "https://github.com/dask/dask-image/releases/tag/v${version}"; license = lib.licenses.bsdOriginal; maintainers = with lib.maintainers; [ GaetanLepage ]; }; diff --git a/pkgs/development/python-modules/dask-ml/default.nix b/pkgs/development/python-modules/dask-ml/default.nix index f30adb7ff246..e3949fde678b 100644 --- a/pkgs/development/python-modules/dask-ml/default.nix +++ b/pkgs/development/python-modules/dask-ml/default.nix @@ -3,13 +3,14 @@ stdenv, buildPythonPackage, fetchFromGitHub, - fetchpatch, # build-system hatch-vcs, hatchling, + setuptools-scm, # dependencies + dask-expr, dask-glm, distributed, multipledispatch, @@ -28,23 +29,25 @@ buildPythonPackage rec { pname = "dask-ml"; - version = "2025.1.0"; + version = "2024.4.4"; pyproject = true; src = fetchFromGitHub { owner = "dask"; repo = "dask-ml"; tag = "v${version}"; - hash = "sha256-DHxx0LFuJmGWYuG/WGHj+a5XHAEekBmlHUUb90rl2IY="; + hash = "sha256-ZiBpCk3b4Tk0Hwb4uapJLEx+Nb/qHFROCnkBTNGDzoU="; }; build-system = [ hatch-vcs hatchling + setuptools-scm ]; dependencies = [ + dask-expr dask-glm distributed multipledispatch @@ -70,14 +73,39 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTestPaths = [ - # AttributeError: module 'numpy' has no attribute 'product' - "tests/test_svd.py" - ]; + disabledTestPaths = + [ + # AttributeError: 'csr_matrix' object has no attribute 'A' + # Fixed in https://github.com/dask/dask-ml/pull/996 + "tests/test_svd.py" + + # Tests fail with dask>=0.11.2 + # RuntimeError: Not enough arguments provided + # Reported in https://github.com/dask/dask-ml/issues/1003 + "tests/model_selection/test_incremental.py" + ] + ++ lib.optionals stdenv.isDarwin [ + # RuntimeError: Not enough arguments provided: missing keys + "tests/model_selection/test_hyperband.py" + "tests/model_selection/test_incremental.py" + "tests/model_selection/test_incremental_warns.py" + "tests/model_selection/test_successive_halving.py" + ]; disabledTests = [ - # AssertionError: Regex pattern did not match. - "test_unknown_category_transform_array" + # Flaky: `Arrays are not almost equal to 3 decimals` (although values do actually match) + "test_whitening" + + # Tests fail with dask>=0.11.2 + # RuntimeError: Not enough arguments provided + # Reported in https://github.com/dask/dask-ml/issues/1003 + "test_basic" + "test_hyperband_patience" + "test_same_random_state_same_params" + "test_search_patience_infeasible_tol" + "test_sha_max_iter_and_metadata" + "test_warns_decay_rate" + "test_warns_decay_rate_wanted" ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index b37ddce56526..93b38b11b1f7 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, @@ -26,127 +27,168 @@ jinja2, # tests + arrow-cpp, + dask-expr, hypothesis, pytest-asyncio, - pytest-mock, pytest-rerunfailures, pytest-xdist, pytestCheckHook, - versionCheckHook, }: -buildPythonPackage rec { - pname = "dask"; - version = "2025.1.0"; - pyproject = true; +let + self = buildPythonPackage rec { + pname = "dask"; + version = "2024.12.1"; + pyproject = true; - src = fetchFromGitHub { - owner = "dask"; - repo = "dask"; - tag = version; - hash = "sha256-KBqOyf471mNg3L9dYmR7IRSltEtC+VgC+6ptsoKgVmM="; - }; + src = fetchFromGitHub { + owner = "dask"; + repo = "dask"; + tag = version; + hash = "sha256-QqvdldAHW2UYt1NXfk3Aa+oe97e+OpRbF8d6eKV3OJ4="; + }; - postPatch = '' - # versioneer hack to set version of GitHub package - echo "def get_versions(): return {'dirty': False, 'error': None, 'full-revisionid': None, 'version': '${version}'}" > dask/_version.py + build-system = [ setuptools ]; - substituteInPlace setup.py \ - --replace-fail "import versioneer" "" \ - --replace-fail "version=versioneer.get_version()," "version='${version}'," \ - --replace-fail "cmdclass=versioneer.get_cmdclass()," "" - - substituteInPlace pyproject.toml \ - --replace-fail ', "versioneer[toml]==0.29"' "" \ - --replace-fail " --durations=10" "" \ - --replace-fail " --cov-config=pyproject.toml" "" \ - --replace-fail "\"-v" "\" " - ''; - - build-system = [ setuptools ]; - - dependencies = [ - click - cloudpickle - fsspec - packaging - partd - pyyaml - importlib-metadata - toolz - ]; - - optional-dependencies = lib.fix (self: { - array = [ numpy ]; - complete = - [ - pyarrow - lz4 - ] - ++ self.array - ++ self.dataframe - ++ self.distributed - ++ self.diagnostics; - dataframe = [ - pandas - pyarrow - ] ++ self.array; - distributed = [ distributed ]; - diagnostics = [ - bokeh - jinja2 + dependencies = [ + click + cloudpickle + fsspec + packaging + partd + pyyaml + importlib-metadata + toolz ]; - }); - nativeCheckInputs = - [ - hypothesis - pytest-asyncio - pytest-mock - pytest-rerunfailures - pytest-xdist - pytestCheckHook - versionCheckHook - pyarrow - ] - ++ optional-dependencies.array - ++ optional-dependencies.dataframe; - versionCheckProgramArg = [ "--version" ]; + optional-dependencies = lib.fix (self: { + array = [ numpy ]; + complete = + [ + pyarrow + lz4 + ] + ++ self.array + ++ self.dataframe + ++ self.distributed + ++ self.diagnostics; + dataframe = [ + # dask-expr -> circular dependency with dask-expr + numpy + pandas + ]; + distributed = [ distributed ]; + diagnostics = [ + bokeh + jinja2 + ]; + }); - pytestFlagsArray = [ - # Rerun failed tests up to three times - "--reruns 3" - # Don't run tests that require network access - "-m 'not network'" - ]; + nativeCheckInputs = + [ + dask-expr + pytestCheckHook + pytest-rerunfailures + pytest-xdist + # from panda[test] + hypothesis + pytest-asyncio + ] + ++ self.optional-dependencies.array + ++ self.optional-dependencies.dataframe + ++ lib.optionals (!arrow-cpp.meta.broken) [ + # support is sparse on aarch64 + pyarrow + ]; - disabledTests = [ - # UserWarning: Insufficient elements for `head`. 10 elements requested, only 5 elements available. Try passing larger `npartitions` to `head`. - "test_set_index_head_nlargest_string" - ]; + dontUseSetuptoolsCheck = true; - __darwinAllowLocalNetworking = true; + postPatch = '' + # versioneer hack to set version of GitHub package + echo "def get_versions(): return {'dirty': False, 'error': None, 'full-revisionid': None, 'version': '${version}'}" > dask/_version.py - pythonImportsCheck = [ - "dask" - "dask.bag" - "dask.bytes" - "dask.diagnostics" + substituteInPlace setup.py \ + --replace-fail "import versioneer" "" \ + --replace-fail "version=versioneer.get_version()," "version='${version}'," \ + --replace-fail "cmdclass=versioneer.get_cmdclass()," "" - # Requires the `dask.optional-dependencies.array` that are only in `nativeCheckInputs` - "dask.array" - # Requires the `dask.optional-dependencies.dataframe` that are only in `nativeCheckInputs` - "dask.dataframe" - "dask.dataframe.io" - "dask.dataframe.tseries" - ]; + substituteInPlace pyproject.toml \ + --replace-fail ', "versioneer[toml]==0.29"' "" \ + --replace-fail " --durations=10" "" \ + --replace-fail " --cov-config=pyproject.toml" "" \ + --replace-fail "\"-v" "\" " + ''; - meta = { - description = "Minimal task scheduling abstraction"; - mainProgram = "dask"; - homepage = "https://dask.org/"; - changelog = "https://docs.dask.org/en/latest/changelog.html"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ GaetanLepage ]; + pytestFlagsArray = [ + # Rerun failed tests up to three times + "--reruns 3" + # Don't run tests that require network access + "-m 'not network'" + ]; + + disabledTests = + lib.optionals stdenv.hostPlatform.isDarwin [ + # Test requires features of python3Packages.psutil that are + # blocked in sandboxed-builds + "test_auto_blocksize_csv" + # AttributeError: 'str' object has no attribute 'decode' + "test_read_dir_nometa" + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ + # concurrent.futures.process.BrokenProcessPool: A process in the process pool terminated abpruptly... + "test_foldby_tree_reduction" + "test_to_bag" + ] + ++ [ + # https://github.com/dask/dask/issues/10347#issuecomment-1589683941 + "test_concat_categorical" + # AttributeError: 'ArrowStringArray' object has no attribute 'tobytes'. Did you mean: 'nbytes'? + "test_dot" + "test_dot_nan" + "test_merge_column_with_nulls" + # FileNotFoundError: [Errno 2] No such file or directory: '/build/tmp301jryv_/createme/0.part' + "test_to_csv_nodir" + "test_to_json_results" + # FutureWarning: Those tests should be working fine when pandas will have been upgraded to 2.1.1 + "test_apply" + "test_apply_infer_columns" + ]; + + __darwinAllowLocalNetworking = true; + + pythonImportsCheck = [ + "dask" + "dask.bag" + "dask.bytes" + "dask.diagnostics" + ]; + + doCheck = false; + + # Enable tests via passthru to avoid cyclic dependency with dask-expr. + passthru.tests = { + check = self.overridePythonAttrs (old: { + doCheck = true; + pythonImportsCheck = [ + # Requires the `dask.optional-dependencies.array` that are only in `nativeCheckInputs` + "dask.array" + # Requires the `dask.optional-dependencies.dataframe` that are only in `nativeCheckInputs` + "dask.dataframe" + "dask.dataframe.io" + "dask.dataframe.tseries" + ] ++ old.pythonImportsCheck; + }); + }; + + meta = { + description = "Minimal task scheduling abstraction"; + mainProgram = "dask"; + homepage = "https://dask.org/"; + changelog = "https://docs.dask.org/en/latest/changelog.html"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; }; -} +in +self diff --git a/pkgs/development/python-modules/devito/default.nix b/pkgs/development/python-modules/devito/default.nix index a69ae736a22a..4c9ee562011f 100644 --- a/pkgs/development/python-modules/devito/default.nix +++ b/pkgs/development/python-modules/devito/default.nix @@ -1,32 +1,27 @@ { lib, stdenv, - buildPythonPackage, - fetchFromGitHub, - - # build-system - setuptools, - - # dependencies anytree, + buildPythonPackage, + setuptools, cached-property, cgen, click, codepy, distributed, + fetchFromGitHub, + gcc, llvmPackages, + matplotlib, multidict, nbval, psutil, py-cpuinfo, - scipy, - sympy, - - # tests - gcc, - matplotlib, pytest-xdist, pytestCheckHook, + pythonOlder, + scipy, + sympy, }: buildPythonPackage rec { @@ -34,6 +29,8 @@ buildPythonPackage rec { version = "4.8.11"; pyproject = true; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "devitocodes"; repo = "devito"; @@ -45,9 +42,6 @@ buildPythonPackage rec { postPatch = '' substituteInPlace requirements-testing.txt \ --replace-fail 'pooch; python_version >= "3.8"' "pooch" - - substituteInPlace tests/test_builtins.py \ - --replace-fail "from scipy.misc import ascent" "from scipy.datasets import ascent" ''; pythonRemoveDeps = [ "pip" ]; @@ -105,10 +99,6 @@ buildPythonPackage rec { "test_stability_mpi" "test_subdomainset_mpi" "test_subdomains_mpi" - - # Download dataset from the internet - "test_gs_2d_float" - "test_gs_2d_int" ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # FAILED tests/test_unexpansion.py::Test2Pass::test_v0 - assert False diff --git a/pkgs/development/python-modules/mplhep/default.nix b/pkgs/development/python-modules/mplhep/default.nix index a5c167aa603f..604eea8a8489 100644 --- a/pkgs/development/python-modules/mplhep/default.nix +++ b/pkgs/development/python-modules/mplhep/default.nix @@ -2,42 +2,36 @@ lib, buildPythonPackage, fetchFromGitHub, - - # build-system - hatch-vcs, - hatchling, - - # dependencies + setuptools, + setuptools-scm, matplotlib, mplhep-data, numpy, packaging, uhi, - - # tests - hist, - pytest-mock, - pytest-mpl, pytestCheckHook, scipy, + pytest-mpl, + pytest-mock, uproot, + hist, }: buildPythonPackage rec { pname = "mplhep"; - version = "0.3.56"; + version = "0.3.55"; pyproject = true; src = fetchFromGitHub { owner = "scikit-hep"; repo = "mplhep"; tag = "v${version}"; - hash = "sha256-sMJpJUEtIqmu7kCgZp43t9XLy/6nkDgKcxC4nFb+1po="; + hash = "sha256-7YkrrH9Bfn3ctjv+H6TXEDE8yS/wnjO7umuHIXeYTDU="; }; build-system = [ - hatch-vcs - hatchling + setuptools + setuptools-scm ]; dependencies = [ @@ -49,12 +43,12 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - hist - pytest-mock - pytest-mpl pytestCheckHook scipy + pytest-mpl + pytest-mock uproot + hist ]; disabledTests = [ @@ -68,7 +62,6 @@ buildPythonPackage rec { meta = { description = "Extended histogram plots on top of matplotlib and HEP compatible styling similar to current collaboration requirements (ROOT)"; homepage = "https://github.com/scikit-hep/mplhep"; - changelog = "https://github.com/scikit-hep/mplhep/releases/tag/v${version}"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ veprbl ]; }; diff --git a/pkgs/development/python-modules/narwhals/default.nix b/pkgs/development/python-modules/narwhals/default.nix index f96998a32908..5aa36f62364c 100644 --- a/pkgs/development/python-modules/narwhals/default.nix +++ b/pkgs/development/python-modules/narwhals/default.nix @@ -1,36 +1,34 @@ { lib, buildPythonPackage, - fetchFromGitHub, - - # build-system - hatchling, - - # optional-dependencies # cudf, dask, + dask-expr, + duckdb, + fetchFromGitHub, + hatchling, + hypothesis, # modin, pandas, polars, pyarrow, - - # tests - duckdb, - hypothesis, pytest-env, pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { pname = "narwhals"; - version = "1.25.2"; + version = "1.22.0"; pyproject = true; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "narwhals-dev"; repo = "narwhals"; tag = "v${version}"; - hash = "sha256-cp/Ang5RXLpgTdpOHRKz9fGN9D+SgFC5KhF3ukf8G+w="; + hash = "sha256-I6nJJiiW1v04YH70OPxXKeO80N52nnCPKRzJLILEWmw="; }; build-system = [ @@ -41,6 +39,7 @@ buildPythonPackage rec { # cudf = [ cudf ]; dask = [ dask + dask-expr ]; # modin = [ modin ]; pandas = [ pandas ]; @@ -65,7 +64,7 @@ buildPythonPackage rec { meta = { description = "Lightweight and extensible compatibility layer between dataframe libraries"; homepage = "https://github.com/narwhals-dev/narwhals"; - changelog = "https://github.com/narwhals-dev/narwhals/releases/tag/v${version}"; + changelog = "https://github.com/narwhals-dev/narwhals/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/sparse/default.nix b/pkgs/development/python-modules/sparse/default.nix index 81e567f46ec4..c09040d2beaa 100644 --- a/pkgs/development/python-modules/sparse/default.nix +++ b/pkgs/development/python-modules/sparse/default.nix @@ -1,21 +1,15 @@ { lib, buildPythonPackage, - fetchFromGitHub, - - # build-system - setuptools, - setuptools-scm, - - # dependencies + dask, + fetchPypi, numba, numpy, + pytest7CheckHook, + pythonOlder, + setuptools, + setuptools-scm, scipy, - - # tests - dask, - pytest-cov-stub, - pytestCheckHook, }: buildPythonPackage rec { @@ -23,13 +17,18 @@ buildPythonPackage rec { version = "0.15.5"; pyproject = true; - src = fetchFromGitHub { - owner = "pydata"; - repo = "sparse"; - tag = version; - hash = "sha256-W4rcq7G/bQsT9oTLieOzWNst5LnIAelRMbm+uUPeQgs="; + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-THbODJb1zVwxt+eeZQ8AIkJMKxbwXxAEnpxjge5L4mY="; }; + postPatch = '' + substituteInPlace pytest.ini \ + --replace-fail "--cov-report term-missing --cov-report html --cov-report=xml --cov-report=term --cov sparse --cov-config .coveragerc --junitxml=junit/test-results.xml" "" + ''; + build-system = [ setuptools setuptools-scm @@ -43,23 +42,22 @@ buildPythonPackage rec { nativeCheckInputs = [ dask - pytest-cov-stub - pytestCheckHook + pytest7CheckHook ]; pythonImportsCheck = [ "sparse" ]; - meta = { + pytestFlagsArray = [ + "-W" + "ignore::pytest.PytestRemovedIn8Warning" + ]; + + meta = with lib; { description = "Sparse n-dimensional arrays computations"; homepage = "https://sparse.pydata.org/"; changelog = "https://sparse.pydata.org/en/stable/changelog.html"; downloadPage = "https://github.com/pydata/sparse/releases/tag/${version}"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ GaetanLepage ]; - badPlatforms = [ - # Most tests fail with: Fatal Python error: Segmentation fault - # numba/typed/typedlist.py", line 344 in append - "aarch64-linux" - ]; + license = licenses.bsd3; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/streamz/default.nix b/pkgs/development/python-modules/streamz/default.nix index 5aab96e7c462..eea52b8fa8f2 100644 --- a/pkgs/development/python-modules/streamz/default.nix +++ b/pkgs/development/python-modules/streamz/default.nix @@ -1,24 +1,23 @@ { lib, buildPythonPackage, - fetchFromGitHub, - - # build-system + pythonOlder, + fetchPypi, setuptools, - - # dependencies + confluent-kafka, + dask, + dask-expr, + distributed, + flaky, + graphviz, + networkx, + pytest-asyncio, + pytestCheckHook, + requests, six, toolz, tornado, zict, - - # tests - dask, - distributed, - flaky, - pandas, - pyarrow, - pytestCheckHook, }: buildPythonPackage rec { @@ -26,16 +25,17 @@ buildPythonPackage rec { version = "0.6.4"; pyproject = true; - src = fetchFromGitHub { - owner = "python-streamz"; - repo = "streamz"; - tag = version; - hash = "sha256-lSb3gl+TSIzz4BZzxH8zXu74HvzSntOAoVQUUJKIEvA="; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-VXfWkEwuxInBQVQJV3IQXgGVRkiBmYfUZCBMbjyWNPM="; }; build-system = [ setuptools ]; dependencies = [ + networkx six toolz tornado @@ -43,12 +43,15 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + confluent-kafka dask + dask-expr distributed flaky - pandas - pyarrow + graphviz + pytest-asyncio pytestCheckHook + requests ]; pythonImportsCheck = [ "streamz" ]; @@ -60,17 +63,24 @@ buildPythonPackage rec { "test_partition_then_scatter_sync" "test_sync" "test_sync_2" - + # Test fail in the sandbox + "test_tcp_async" + "test_tcp" + "test_partition_timeout" # Tests are flaky + "test_from_iterable" "test_buffer" ]; - __darwinAllowLocalNetworking = true; + disabledTestPaths = [ + # Disable kafka tests + "streamz/tests/test_kafka.py" + ]; - meta = { + meta = with lib; { description = "Pipelines to manage continuous streams of data"; homepage = "https://github.com/python-streamz/streamz"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ GaetanLepage ]; + license = licenses.bsd3; + maintainers = [ ]; }; } diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index c87843dcb618..434e1b6f3cd9 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -142,7 +142,6 @@ mapAliases ({ cx_Freeze = cx-freeze; # added 2023-08-02 cx_oracle = cx-oracle; # added 2024-01-03 d2to1 = throw "d2to1 is archived and no longer works with setuptools v68"; # added 2023-07-30 - dask-expr = throw "dask-expr was removed because its features are available in dask"; # added 2025-02-07 dask-xgboost = throw "dask-xgboost was removed because its features are available in xgboost"; # added 2022-05-24 dash-renderer = throw "dash-renderer has been removed since it is abandoned"; # added 2025-01-01 dateutil = python-dateutil; # added 2021-07-03 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 687c342fd174..013e7f91fb05 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2961,6 +2961,8 @@ self: super: with self; { dask-awkward = callPackage ../development/python-modules/dask-awkward { }; + dask-expr = callPackage ../development/python-modules/dask-expr { }; + dask-gateway = callPackage ../development/python-modules/dask-gateway { }; dask-gateway-server = callPackage ../development/python-modules/dask-gateway-server { }; From 21afaadf5ca73ef4b72d23350f868831c2fb843c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 7 Feb 2025 15:12:52 +0100 Subject: [PATCH 1116/2168] python312Packages.sparse: add GaetanLepage as maintainer --- pkgs/development/python-modules/sparse/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/sparse/default.nix b/pkgs/development/python-modules/sparse/default.nix index c09040d2beaa..215b826b477d 100644 --- a/pkgs/development/python-modules/sparse/default.nix +++ b/pkgs/development/python-modules/sparse/default.nix @@ -59,5 +59,6 @@ buildPythonPackage rec { downloadPage = "https://github.com/pydata/sparse/releases/tag/${version}"; license = licenses.bsd3; maintainers = [ ]; + maintainers = with maintainers; [ GaetanLepage ]; }; } From e6bbb5d92a27068d6b8c92ea054349a0bb13422d Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 7 Feb 2025 15:13:02 +0100 Subject: [PATCH 1117/2168] python312Packages.sparse: cleanup & mark as broken on aarch64-linux --- .../python-modules/sparse/default.nix | 53 ++++++++++--------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/pkgs/development/python-modules/sparse/default.nix b/pkgs/development/python-modules/sparse/default.nix index 215b826b477d..81e567f46ec4 100644 --- a/pkgs/development/python-modules/sparse/default.nix +++ b/pkgs/development/python-modules/sparse/default.nix @@ -1,15 +1,21 @@ { lib, buildPythonPackage, - dask, - fetchPypi, - numba, - numpy, - pytest7CheckHook, - pythonOlder, + fetchFromGitHub, + + # build-system setuptools, setuptools-scm, + + # dependencies + numba, + numpy, scipy, + + # tests + dask, + pytest-cov-stub, + pytestCheckHook, }: buildPythonPackage rec { @@ -17,18 +23,13 @@ buildPythonPackage rec { version = "0.15.5"; pyproject = true; - disabled = pythonOlder "3.8"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-THbODJb1zVwxt+eeZQ8AIkJMKxbwXxAEnpxjge5L4mY="; + src = fetchFromGitHub { + owner = "pydata"; + repo = "sparse"; + tag = version; + hash = "sha256-W4rcq7G/bQsT9oTLieOzWNst5LnIAelRMbm+uUPeQgs="; }; - postPatch = '' - substituteInPlace pytest.ini \ - --replace-fail "--cov-report term-missing --cov-report html --cov-report=xml --cov-report=term --cov sparse --cov-config .coveragerc --junitxml=junit/test-results.xml" "" - ''; - build-system = [ setuptools setuptools-scm @@ -42,23 +43,23 @@ buildPythonPackage rec { nativeCheckInputs = [ dask - pytest7CheckHook + pytest-cov-stub + pytestCheckHook ]; pythonImportsCheck = [ "sparse" ]; - pytestFlagsArray = [ - "-W" - "ignore::pytest.PytestRemovedIn8Warning" - ]; - - meta = with lib; { + meta = { description = "Sparse n-dimensional arrays computations"; homepage = "https://sparse.pydata.org/"; changelog = "https://sparse.pydata.org/en/stable/changelog.html"; downloadPage = "https://github.com/pydata/sparse/releases/tag/${version}"; - license = licenses.bsd3; - maintainers = [ ]; - maintainers = with maintainers; [ GaetanLepage ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ GaetanLepage ]; + badPlatforms = [ + # Most tests fail with: Fatal Python error: Segmentation fault + # numba/typed/typedlist.py", line 344 in append + "aarch64-linux" + ]; }; } From f72186d14b66c7a43f493c711d5c6050293de8c2 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 7 Feb 2025 16:27:40 +0100 Subject: [PATCH 1118/2168] python312Packages.devito: fix build --- .../python-modules/devito/default.nix | 28 +++++++++++++------ 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/devito/default.nix b/pkgs/development/python-modules/devito/default.nix index 4c9ee562011f..a69ae736a22a 100644 --- a/pkgs/development/python-modules/devito/default.nix +++ b/pkgs/development/python-modules/devito/default.nix @@ -1,27 +1,32 @@ { lib, stdenv, - anytree, buildPythonPackage, + fetchFromGitHub, + + # build-system setuptools, + + # dependencies + anytree, cached-property, cgen, click, codepy, distributed, - fetchFromGitHub, - gcc, llvmPackages, - matplotlib, multidict, nbval, psutil, py-cpuinfo, - pytest-xdist, - pytestCheckHook, - pythonOlder, scipy, sympy, + + # tests + gcc, + matplotlib, + pytest-xdist, + pytestCheckHook, }: buildPythonPackage rec { @@ -29,8 +34,6 @@ buildPythonPackage rec { version = "4.8.11"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "devitocodes"; repo = "devito"; @@ -42,6 +45,9 @@ buildPythonPackage rec { postPatch = '' substituteInPlace requirements-testing.txt \ --replace-fail 'pooch; python_version >= "3.8"' "pooch" + + substituteInPlace tests/test_builtins.py \ + --replace-fail "from scipy.misc import ascent" "from scipy.datasets import ascent" ''; pythonRemoveDeps = [ "pip" ]; @@ -99,6 +105,10 @@ buildPythonPackage rec { "test_stability_mpi" "test_subdomainset_mpi" "test_subdomains_mpi" + + # Download dataset from the internet + "test_gs_2d_float" + "test_gs_2d_int" ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # FAILED tests/test_unexpansion.py::Test2Pass::test_v0 - assert False From ed3db9c9a7c818c00ab2827dfc9573b7ad44c2c1 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Tue, 11 Feb 2025 06:56:07 +0000 Subject: [PATCH 1119/2168] badkeys: 0.0.12 -> 0.0.13 Diff: https://github.com/badkeys/badkeys/compare/v0.0.12...v0.0.13 Changelog: https://github.com/badkeys/badkeys/releases/tag/v0.0.13 --- pkgs/by-name/ba/badkeys/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ba/badkeys/package.nix b/pkgs/by-name/ba/badkeys/package.nix index 584d5e57b1f3..7b9ef6cb21f9 100644 --- a/pkgs/by-name/ba/badkeys/package.nix +++ b/pkgs/by-name/ba/badkeys/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "badkeys"; - version = "0.0.12"; + version = "0.0.13"; pyproject = true; src = fetchFromGitHub { owner = "badkeys"; repo = "badkeys"; tag = "v${version}"; - hash = "sha256-LFoB/ZHIMRpN/eHg3x8HCxNbMKclf2SJSDPk33OIil8="; + hash = "sha256-xukdaqyQKEnwPmAN4WZqeLo5g2tJxPehabTyDgCv8q4="; }; build-system = with python3Packages; [ @@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Tool to find common vulnerabilities in cryptographic public keys"; homepage = "https://badkeys.info/"; - changelog = "https://github.com/badkeys/badkeys/releases/tag/v${version}"; + changelog = "https://github.com/badkeys/badkeys/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ getchoo ]; mainProgram = "badkeys"; From c6f6d0bdaa35185f16199fb6996e9250b825bb0f Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Tue, 11 Feb 2025 02:13:16 -0500 Subject: [PATCH 1120/2168] badkeys: add version test --- pkgs/by-name/ba/badkeys/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/ba/badkeys/package.nix b/pkgs/by-name/ba/badkeys/package.nix index 7b9ef6cb21f9..4035dc26541a 100644 --- a/pkgs/by-name/ba/badkeys/package.nix +++ b/pkgs/by-name/ba/badkeys/package.nix @@ -1,7 +1,9 @@ { lib, + badkeys, fetchFromGitHub, python3Packages, + testers, }: python3Packages.buildPythonApplication rec { @@ -35,6 +37,10 @@ python3Packages.buildPythonApplication rec { pythonImportsCheck = [ "badkeys" ]; + passthru = { + tests.version = testers.testVersion { package = badkeys; }; + }; + meta = { description = "Tool to find common vulnerabilities in cryptographic public keys"; homepage = "https://badkeys.info/"; From cdf52f25bea501046b7d140cd4e207c73cccf59e Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Tue, 11 Feb 2025 06:56:28 +0000 Subject: [PATCH 1121/2168] dosage-tracker: 1.8.0 -> 1.8.3 Diff: https://github.com/diegopvlk/Dosage/compare/v1.8.0...v1.8.3 --- pkgs/by-name/do/dosage-tracker/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/do/dosage-tracker/package.nix b/pkgs/by-name/do/dosage-tracker/package.nix index db912ceca71f..c7d9721bb1fa 100644 --- a/pkgs/by-name/do/dosage-tracker/package.nix +++ b/pkgs/by-name/do/dosage-tracker/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dosage"; - version = "1.8.0"; + version = "1.8.3"; src = fetchFromGitHub { owner = "diegopvlk"; repo = "Dosage"; tag = "v${finalAttrs.version}"; - hash = "sha256-u/HnlnitLJjYxt+LqbhS2DYUDVVBamZCakBym2eNK1c="; + hash = "sha256-BEKhIIM0/uaqFD56W+fgsE78KVgqj6HqpS7KRp9Lt3c="; }; # https://github.com/NixOS/nixpkgs/issues/318830 From cc5ad5c14933208b1d0ed8800c1b55f07c14186e Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Tue, 11 Feb 2025 06:56:38 +0000 Subject: [PATCH 1122/2168] garnet: 1.0.54 -> 1.0.55 Diff: https://github.com/microsoft/garnet/compare/v1.0.54...v1.0.55 Changelog: https://github.com/microsoft/garnet/releases/tag/v1.0.55 --- pkgs/by-name/ga/garnet/deps.json | 5 ----- pkgs/by-name/ga/garnet/package.nix | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ga/garnet/deps.json b/pkgs/by-name/ga/garnet/deps.json index 56c17f432cc2..46004d44a882 100644 --- a/pkgs/by-name/ga/garnet/deps.json +++ b/pkgs/by-name/ga/garnet/deps.json @@ -144,11 +144,6 @@ "version": "8.0.0", "hash": "sha256-hNTkpKdCLY5kIuOmznD1mY+pRdJ0PKu2HypyXog9vb0=" }, - { - "pname": "NLua", - "version": "1.7.3", - "hash": "sha256-2+eOxal0BDwAc6nJTNsFvf5E0KdfksIie7C7hEKeQos=" - }, { "pname": "System.ClientModel", "version": "1.0.0", diff --git a/pkgs/by-name/ga/garnet/package.nix b/pkgs/by-name/ga/garnet/package.nix index 740b45574e61..30ded66f519e 100644 --- a/pkgs/by-name/ga/garnet/package.nix +++ b/pkgs/by-name/ga/garnet/package.nix @@ -8,13 +8,13 @@ buildDotnetModule rec { pname = "garnet"; - version = "1.0.54"; + version = "1.0.55"; src = fetchFromGitHub { owner = "microsoft"; repo = "garnet"; tag = "v${version}"; - hash = "sha256-tTJz4LilzrSDDmsTwRRK3Svif3ewUWuU3nbUN8GyyPY="; + hash = "sha256-yeaSSQXsTw6JsF2ugCRSIWCSwuOYuWLErb77/CBraQE="; }; projectFile = "main/GarnetServer/GarnetServer.csproj"; From 5000025ece5c77a858192c6f0efd5936b147f8e1 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Mon, 10 Feb 2025 08:46:33 +0100 Subject: [PATCH 1123/2168] python3Packages.inequality: 1.1.0 -> 1.1.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Robert Schütz --- .../python-modules/inequality/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/inequality/default.nix b/pkgs/development/python-modules/inequality/default.nix index 810e9f7b824a..1c153b486dc3 100644 --- a/pkgs/development/python-modules/inequality/default.nix +++ b/pkgs/development/python-modules/inequality/default.nix @@ -6,14 +6,17 @@ pythonOlder, libpysal, + mapclassify, + matplotlib, numpy, scipy, + seaborn, setuptools-scm, }: buildPythonPackage rec { pname = "inequality"; - version = "1.1.0"; + version = "1.1.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -21,18 +24,23 @@ buildPythonPackage rec { owner = "pysal"; repo = "inequality"; tag = "v${version}"; - hash = "sha256-tKMpmsP19K4dyBCj84FBoGkEvrmQuSi77sY3uQYvz5s="; + hash = "sha256-JVim2u+VF35dvD+y14WbA2+G4wktAGpin/GMe0uGhjc="; }; build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ libpysal + matplotlib numpy scipy ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + mapclassify + pytestCheckHook + seaborn + ]; pythonImportsCheck = [ "inequality" ]; From c42dcff29920de2355fb5bce58a14cd4935fba08 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Tue, 11 Feb 2025 06:58:52 +0000 Subject: [PATCH 1124/2168] shortwave: 4.0.1 -> 5.0.0 --- pkgs/by-name/sh/shortwave/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sh/shortwave/package.nix b/pkgs/by-name/sh/shortwave/package.nix index fbab3ca14b4b..83a925941a98 100644 --- a/pkgs/by-name/sh/shortwave/package.nix +++ b/pkgs/by-name/sh/shortwave/package.nix @@ -28,20 +28,20 @@ stdenv.mkDerivation rec { pname = "shortwave"; - version = "4.0.1"; + version = "5.0.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "Shortwave"; rev = version; - sha256 = "sha256-W1eOMyiooDesI13lOze/JcxzhSSxYOW6FOY85NkVyps="; + sha256 = "sha256-MbkfbpX2av/o+wC1pORHfaLXnchEIFmhQ5mqPuMElak="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-vtQRt8/eWwMA1+tKULpStLR7E1+R7LkNutS2Joz7zeI="; + hash = "sha256-DBWg9Xss1ChbPyI3MiN7eTXhSUG37ZaYS/HFxou9d/w="; }; nativeBuildInputs = [ From fe1e0f9f0fdeaa7d51f01119a9dadbf819ce860e Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Tue, 11 Feb 2025 06:58:58 +0000 Subject: [PATCH 1125/2168] slskd: 0.22.1 -> 0.22.2 Diff: https://github.com/slskd/slskd/compare/0.22.1...0.22.2 Changelog: https://github.com/slskd/slskd/releases/tag/0.22.2 --- pkgs/by-name/sl/slskd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sl/slskd/package.nix b/pkgs/by-name/sl/slskd/package.nix index 2941a701cbe4..1192c5536dd0 100644 --- a/pkgs/by-name/sl/slskd/package.nix +++ b/pkgs/by-name/sl/slskd/package.nix @@ -19,13 +19,13 @@ let in buildDotnetModule rec { pname = "slskd"; - version = "0.22.1"; + version = "0.22.2"; src = fetchFromGitHub { owner = "slskd"; repo = "slskd"; tag = version; - hash = "sha256-2IMEkNc7LqevTwsW6r6WR+2xH760wFYT5/S8dvjOz4o="; + hash = "sha256-Arf/QOq0wYely+CYwb4sJXsxB2BbEHZ2bUNyqeGbFdg="; }; nativeBuildInputs = [ From 86673af28a29d77fd59790b566425ba86f644ba0 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Tue, 11 Feb 2025 06:59:20 +0000 Subject: [PATCH 1126/2168] xwayland-satellite: 0.5 -> 0.5.1 Diff: https://github.com/Supreeeme/xwayland-satellite/compare/v0.5...v0.5.1 Changelog: https://github.com/Supreeeme/xwayland-satellite/releases/tag/v0.5.1 --- pkgs/by-name/xw/xwayland-satellite/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/xw/xwayland-satellite/package.nix b/pkgs/by-name/xw/xwayland-satellite/package.nix index aa61abefcf93..c63af00aec55 100644 --- a/pkgs/by-name/xw/xwayland-satellite/package.nix +++ b/pkgs/by-name/xw/xwayland-satellite/package.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "xwayland-satellite"; - version = "0.5"; + version = "0.5.1"; src = fetchFromGitHub { owner = "Supreeeme"; repo = "xwayland-satellite"; tag = "v${version}"; - hash = "sha256-nq7bouXQXaaPPo/E+Jbq+wNHnatD4dY8OxSrRqzvy6s="; + hash = "sha256-/hBM43/Gd0/tW+egrhlWgOIISeJxEs2uAOIYVpfDKeU="; }; postPatch = '' @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { ''; useFetchCargoVendor = true; - cargoHash = "sha256-1IsKt+OfezILaDklHts74TnS0/FVogu6Ds/7JG+ataY="; + cargoHash = "sha256-1tt7YNornw9U9FRdsRkdWx3Al3FZtvtCBXn9Pln+gk4="; nativeBuildInputs = [ makeBinaryWrapper From 221ea50b3242eac20666ca0cdcf776f56b109cb9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 08:00:58 +0000 Subject: [PATCH 1127/2168] sqlitestudio: 3.4.15 -> 3.4.16 --- pkgs/by-name/sq/sqlitestudio/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sq/sqlitestudio/package.nix b/pkgs/by-name/sq/sqlitestudio/package.nix index 15f1a546e1e4..6837ddbba635 100644 --- a/pkgs/by-name/sq/sqlitestudio/package.nix +++ b/pkgs/by-name/sq/sqlitestudio/package.nix @@ -11,13 +11,13 @@ }: stdenv.mkDerivation rec { pname = "sqlitestudio"; - version = "3.4.15"; + version = "3.4.16"; src = fetchFromGitHub { owner = "pawelsalawa"; repo = "sqlitestudio"; rev = version; - hash = "sha256-wMkTvw0zGl01511udpk3zZQygVWkmYp1QB+HsghWzNg="; + hash = "sha256-N+WizF7R23GUtCBvGggoONag5F53ugKHaxWP67i7hO8="; }; nativeBuildInputs = From c9974b78fe3fcc54d61b8e318e7c49ceb1779a65 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Tue, 11 Feb 2025 03:02:14 -0500 Subject: [PATCH 1128/2168] sydbox: 3.30.0 -> 3.30.1 Diff: https://gitlab.exherbo.org/Sydbox/sydbox/-/compare/refs/tags/v3.30.0...3.30.1 Changelog: https://gitlab.exherbo.org/sydbox/sydbox/-/blob/v3.30.1/ChangeLog.md --- pkgs/by-name/sy/sydbox/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sy/sydbox/package.nix b/pkgs/by-name/sy/sydbox/package.nix index b455322bee9f..0f247a1c50b8 100644 --- a/pkgs/by-name/sy/sydbox/package.nix +++ b/pkgs/by-name/sy/sydbox/package.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { pname = "sydbox"; - version = "3.30.0"; + version = "3.30.1"; outputs = [ "out" @@ -25,11 +25,11 @@ rustPlatform.buildRustPackage rec { owner = "Sydbox"; repo = "sydbox"; tag = "v${version}"; - hash = "sha256-EbdJuJefFQaL6e+2AcsPF4eXin3ky+jlt4s68mSusoc="; + hash = "sha256-Vby+2uSosp5yHc99lB2nMozMfsLowPunXuS30evKiZk="; }; useFetchCargoVendor = true; - cargoHash = "sha256-+tyUKX0hzVt2CkbbNYuonWfh1sJBaqmbaeYdctHbPVw="; + cargoHash = "sha256-1Em6ibjYXWnCIF1r7qS2uKvBAhb1klGjwrv9E6PTQCU="; nativeBuildInputs = [ mandoc From 2dae2e9540d9a41981dedb0de0f670a09012b587 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 08:04:34 +0000 Subject: [PATCH 1129/2168] inputplumber: 0.42.2 -> 0.45.1 --- pkgs/by-name/in/inputplumber/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/in/inputplumber/package.nix b/pkgs/by-name/in/inputplumber/package.nix index d0fbd3fdd3e3..abfcb30c3dff 100644 --- a/pkgs/by-name/in/inputplumber/package.nix +++ b/pkgs/by-name/in/inputplumber/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "inputplumber"; - version = "0.42.2"; + version = "0.45.1"; src = fetchFromGitHub { owner = "ShadowBlip"; repo = "InputPlumber"; tag = "v${version}"; - hash = "sha256-wIncdLGQUpAxldKg4rp8KK6qhOBlzo4AqHQk4Q+rMnU="; + hash = "sha256-mapuj/9VCrzux5yS3+NeMw1xG70+xglshOs9O+RIHKM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-C0zRUNQQ/Gw8InmX+SmQV/oj8T2IxtwQPyBKga7Ju2Y="; + cargoHash = "sha256-QUTMzHAdB4GJMO+LZP5VFTJRvRHUa6XIcP+1bRSaGdg="; nativeBuildInputs = [ pkg-config From 928bdcfac29e1d5b535559fe7ea61d7ce5396881 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 08:22:34 +0000 Subject: [PATCH 1130/2168] postgresqlPackages.plpgsql_check: 2.7.13 -> 2.7.15 --- pkgs/servers/sql/postgresql/ext/plpgsql_check.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix index e3b93c16d1be..4ca7244ba407 100644 --- a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix +++ b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -9,13 +9,13 @@ buildPostgresqlExtension (finalAttrs: { pname = "plpgsql-check"; - version = "2.7.13"; + version = "2.7.15"; src = fetchFromGitHub { owner = "okbob"; repo = "plpgsql_check"; rev = "v${finalAttrs.version}"; - hash = "sha256-9xfL/nhjvVb2hQj0OLOFYdpRfuEXikgTC7rSsEZ8ws8="; + hash = "sha256-JF0aTYakoHMRdiWcA70mYFvzTiwMhOJZfqRj+6JC6n0="; }; passthru.tests.extension = postgresqlTestExtension { From 645b20465461fc1e0c2210274372a6bb8f330640 Mon Sep 17 00:00:00 2001 From: uku Date: Tue, 11 Feb 2025 09:24:24 +0100 Subject: [PATCH 1131/2168] reposilite: 3.5.20 -> 3.5.21 --- pkgs/by-name/re/reposilite/package.nix | 4 ++-- pkgs/by-name/re/reposilite/plugins.nix | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/re/reposilite/package.nix b/pkgs/by-name/re/reposilite/package.nix index 15ff73caa47a..1a8a443a3598 100644 --- a/pkgs/by-name/re/reposilite/package.nix +++ b/pkgs/by-name/re/reposilite/package.nix @@ -17,11 +17,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "Reposilite"; - version = "3.5.20"; + version = "3.5.21"; src = fetchurl { url = "https://maven.reposilite.com/releases/com/reposilite/reposilite/${finalAttrs.version}/reposilite-${finalAttrs.version}-all.jar"; - hash = "sha256-IdUHtulkSKvXatAs+BmzXgwv9oJz1XeRVtpEyIZ7BY4="; + hash = "sha256-jE9wCShscLp3rUbybd35kBL4UvvENExuUlJXr55qnow="; }; dontUnpack = true; diff --git a/pkgs/by-name/re/reposilite/plugins.nix b/pkgs/by-name/re/reposilite/plugins.nix index a64baf95f661..8b5881181553 100644 --- a/pkgs/by-name/re/reposilite/plugins.nix +++ b/pkgs/by-name/re/reposilite/plugins.nix @@ -40,10 +40,10 @@ makeScopeWithSplicing' { ) { }; } // builtins.mapAttrs (name: hash: self.fetchPlugin { inherit name hash; }) { - checksum = "sha256-k9JWyDj7wMB8kLihqR7gB5N//NKxTrDWoFQ4Jt422I0="; - groovy = "sha256-iwlLMHh9A6WIHYo4sN2TIISif9pWbe6i1Hofd4D3BsI="; - migration = "sha256-0p4DQeaCH/i2e8MESPIbOgaSPF0pHIbs1rXiZcSCJso="; - prometheus = "sha256-bCJvTQPXW3mydOqz5Tug6MyIEonrRiJ9NkIYy9OviDc="; - swagger = "sha256-akKRMibzA4UtGpwcHvmjXKPLzpA2pcGPpaBkDsdvcK0="; + checksum = "sha256-s7GADQqFsoEDM2vtJFE/C/F5jGyQeYlT3BntvHS4DtQ="; + groovy = "sha256-8HWMqZZNIqCBpkMuCjKxqTLcQ2dYaOAAYON9QrXYEyo="; + migration = "sha256-Xv0+RsXZzyGV/4v0IT3hfNANiC1OWVYFoTZHDxduKh0="; + prometheus = "sha256-F5fSUo6wt7L3R/xCike0SlfG3CyxHKrlrg+SNrUYtm4="; + swagger = "sha256-wyXKrYBhigHVtxq/RZiJhnigc3Z/UCbYotrF6VLLTGA="; }; } From 4251f4f573ab375b3971b9655c43655548369c4e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 08:27:41 +0000 Subject: [PATCH 1132/2168] python312Packages.migen: 0.9.2-unstable-2025-01-16 -> 0.9.2-unstable-2025-02-07 --- pkgs/development/python-modules/migen/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/migen/default.nix b/pkgs/development/python-modules/migen/default.nix index 8e02b3290a45..e77fab6e0e9f 100644 --- a/pkgs/development/python-modules/migen/default.nix +++ b/pkgs/development/python-modules/migen/default.nix @@ -10,14 +10,14 @@ buildPythonPackage { pname = "migen"; - version = "0.9.2-unstable-2025-01-16"; + version = "0.9.2-unstable-2025-02-07"; pyproject = true; src = fetchFromGitHub { owner = "m-labs"; repo = "migen"; - rev = "28e913e7114dae485747ccd8f9fd436ada2195f0"; - hash = "sha256-5Rv7R8OO/CsjdDreo+vCUO7dIrTD+70meV5rIvHOGDk="; + rev = "2828df54594673653a641ab551caf6c6b1bfeee5"; + hash = "sha256-GproDJowtcgbccsT+I0mObzFhE483shcS8MSszKXwlc="; }; nativeBuildInputs = [ setuptools ]; From fb02e835ec4b8ee9af85fa131534cd12ca2920bd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 09:10:32 +0000 Subject: [PATCH 1133/2168] python312Packages.pyvera: 0.3.15 -> 0.3.16 --- pkgs/development/python-modules/pyvera/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyvera/default.nix b/pkgs/development/python-modules/pyvera/default.nix index 5a6c502e2eb0..e9dc1888a5cb 100644 --- a/pkgs/development/python-modules/pyvera/default.nix +++ b/pkgs/development/python-modules/pyvera/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvera"; - version = "0.3.15"; + version = "0.3.16"; format = "pyproject"; src = fetchFromGitHub { owner = "pavoni"; repo = pname; - rev = version; - hash = "sha256-1+xIqOogRUt+blX7AZSKIiU8lpR4AzKIIW/smCSft94="; + tag = version; + hash = "sha256-WLzVOQEykST2BsVRHmcBhrsd/am0jI/f7D0PmpCTbdQ="; }; nativeBuildInputs = [ poetry-core ]; From 33e74519c6132dfa18005d6d2118f548a2dce8cc Mon Sep 17 00:00:00 2001 From: arminius-smh Date: Mon, 10 Feb 2025 00:04:56 +0100 Subject: [PATCH 1134/2168] kora-icon-theme: 1.6.2 -> 1.6.3 --- pkgs/data/icons/kora-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/kora-icon-theme/default.nix b/pkgs/data/icons/kora-icon-theme/default.nix index 486f06b614b0..549f77485c56 100644 --- a/pkgs/data/icons/kora-icon-theme/default.nix +++ b/pkgs/data/icons/kora-icon-theme/default.nix @@ -10,13 +10,13 @@ stdenvNoCC.mkDerivation rec { pname = "kora-icon-theme"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "bikass"; repo = "kora"; rev = "v${version}"; - sha256 = "sha256-FBUOmiw3Ak1QVUrpj0+pfFqG/oKNnEXMRNlVKVNzK2I="; + sha256 = "sha256-miVtdEmlW4BTQ4wNASISQcn+XqHF40nLXLwkxS2TYbE="; }; nativeBuildInputs = [ From adcf722f6d966c074ce7f199796373e3c0bafe30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Tue, 11 Feb 2025 10:16:12 +0100 Subject: [PATCH 1135/2168] teamspeak6-client: fix some audio issues --- pkgs/by-name/te/teamspeak6-client/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/te/teamspeak6-client/package.nix b/pkgs/by-name/te/teamspeak6-client/package.nix index 006afd52d63f..feef9378133c 100644 --- a/pkgs/by-name/te/teamspeak6-client/package.nix +++ b/pkgs/by-name/te/teamspeak6-client/package.nix @@ -101,6 +101,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { lib.makeLibraryPath [ udev libGL + libpulseaudio ] }" From 31134c9dc6b75f27a7414f6ed0fa4b34e12b04ca Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 11 Feb 2025 08:11:01 +0100 Subject: [PATCH 1136/2168] python312Packages.azure-mgmt-redis: 14.4.0 -> 14.5.0 Signed-off-by: Paul Meyer --- .../python-modules/azure-mgmt-redis/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-redis/default.nix b/pkgs/development/python-modules/azure-mgmt-redis/default.nix index 18cf2fd0c10b..4fe7c67670a4 100644 --- a/pkgs/development/python-modules/azure-mgmt-redis/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-redis/default.nix @@ -11,14 +11,15 @@ buildPythonPackage rec { pname = "azure-mgmt-redis"; - version = "14.4.0"; + version = "14.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-CIRzJa/wexeuheb+Az0KBaz4z0HMmpzGBiOuLaxGZ+8="; + inherit version; + pname = "azure_mgmt_redis"; + hash = "sha256-XDQ0yCSSaI4luTqvURPs/wuSt61toqT9RpVTD4KxUvo="; }; propagatedBuildInputs = [ From 9276c08bb79a600471bc82c539de3a2ea4528208 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 11 Feb 2025 08:27:35 +0100 Subject: [PATCH 1137/2168] python312Packages.azure-mgmt-batchai: 2.0.0 -> 7.0.0 Signed-off-by: Paul Meyer --- .../azure-mgmt-batchai/default.nix | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-batchai/default.nix b/pkgs/development/python-modules/azure-mgmt-batchai/default.nix index 0fa160b6adc0..cd28585ae7d6 100644 --- a/pkgs/development/python-modules/azure-mgmt-batchai/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-batchai/default.nix @@ -4,27 +4,29 @@ fetchPypi, azure-common, azure-mgmt-core, - azure-mgmt-nspkg, - msrestazure, + isodate, + pythonOlder, + typing-extensions, }: buildPythonPackage rec { pname = "azure-mgmt-batchai"; - version = "2.0.0"; + version = "7.0.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { - inherit pname version; - extension = "zip"; - sha256 = "f1870b0f97d5001cdb66208e5a236c9717a0ed18b34dbfdb238a828f3ca2a683"; + inherit version; + pname = "azure_mgmt_batchai"; + hash = "sha256-XfAE/QyST8ZVlJR6nP9Pdgh97hfIhFM6G7sLINsn06M="; }; propagatedBuildInputs = [ - msrestazure + isodate azure-common azure-mgmt-core - azure-mgmt-nspkg - ]; + ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; pythonNamespaces = [ "azure.mgmt" ]; @@ -34,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "This is the Microsoft Azure Batch AI Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-batchai_${version}/sdk/batchai/azure-mgmt-batchai/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ maxwilson ]; }; From fd4b29eac6043ac23e924182acf39b0877e73b80 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 11 Feb 2025 10:16:18 +0100 Subject: [PATCH 1138/2168] azure-cli: 2.68.0 -> 2.69.0 Signed-off-by: Paul Meyer --- pkgs/by-name/az/azure-cli/package.nix | 6 ++--- pkgs/by-name/az/azure-cli/python-packages.nix | 25 +++++++------------ 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/package.nix b/pkgs/by-name/az/azure-cli/package.nix index b4d6294758e3..12b2b9949b2d 100644 --- a/pkgs/by-name/az/azure-cli/package.nix +++ b/pkgs/by-name/az/azure-cli/package.nix @@ -26,14 +26,14 @@ }: let - version = "2.68.0"; + version = "2.69.0"; src = fetchFromGitHub { name = "azure-cli-${version}-src"; owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - hash = "sha256-WJkuLZUWNzbjAmOPilOK6jnjmax/3ct+ZVWQB3ho/BI="; + hash = "sha256-bn6x01fVfn/jNWAN3q2oI3CHt5h575lV9YZp0pgBUxg="; }; # put packages that needs to be overridden in the py package scope @@ -175,7 +175,6 @@ py.pkgs.toPythonApplication ( azure-mgmt-iothub azure-mgmt-iothubprovisioningservices azure-mgmt-keyvault - azure-mgmt-kusto azure-mgmt-loganalytics azure-mgmt-managedservices azure-mgmt-managementgroups @@ -329,7 +328,6 @@ py.pkgs.toPythonApplication ( "azure.mgmt.iothub" "azure.mgmt.iothubprovisioningservices" "azure.mgmt.keyvault" - "azure.mgmt.kusto" "azure.mgmt.loganalytics" "azure.mgmt.managedservices" "azure.mgmt.managementgroups" diff --git a/pkgs/by-name/az/azure-cli/python-packages.nix b/pkgs/by-name/az/azure-cli/python-packages.nix index 6f3aeeb3aa56..d99d18df6495 100644 --- a/pkgs/by-name/az/azure-cli/python-packages.nix +++ b/pkgs/by-name/az/azure-cli/python-packages.nix @@ -117,10 +117,15 @@ let meta.downloadPage = "https://github.com/Azure/azure-cli/blob/azure-cli-${version}/src/azure-cli-telemetry/"; }; - # AttributeError: type object 'WorkspacesOperations' has no attribute 'begin_delete' - azure-mgmt-batchai = - overrideAzureMgmtPackage super.azure-mgmt-batchai "7.0.0b1" "zip" - "sha256-mT6vvjWbq0RWQidugR229E8JeVEiobPD3XA/nDM3I6Y="; + # Error loading command module 'batch': No module named 'azure.batch._model_base' + azure-batch = super.azure-batch.overridePythonAttrs (attrs: rec { + version = "15.0.0b1"; + src = fetchPypi { + pname = "azure_batch"; # Different from src.pname in the original package. + inherit version; + hash = "sha256-373dFY/63lIZPj5NhsmW6nI2/9JpWkNzT65eBal04u0="; + }; + }); azure-mgmt-billing = (overrideAzureMgmtPackage super.azure-mgmt-billing "6.0.0" "zip" @@ -173,18 +178,6 @@ let overrideAzureMgmtPackage super.azure-mgmt-hdinsight "9.0.0b3" "tar.gz" "sha256-clSeCP8+7T1uI4Nec+zhzDK980C9+JGeeJFsNSwgD2Q="; - # ValueError: The operation 'azure.mgmt.kusto.operations#ClustersOperations.delete' is invalid. - azure-mgmt-kusto = - (overrideAzureMgmtPackage super.azure-mgmt-kusto "0.3.0" "zip" - "sha256-nri3eB/UQQ7p4gfNDDmDuvnlhBS1tKGISdCYVuNrrN4=" - ).overridePythonAttrs - (attrs: { - propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ - self.msrest - self.msrestazure - ]; - }); - # ValueError: The operation 'azure.mgmt.media.operations#MediaservicesOperations.create_or_update' is invalid. azure-mgmt-media = overrideAzureMgmtPackage super.azure-mgmt-media "9.0.0" "zip" From 765a186d5c4c94ac7ca535e5c9ca9a544bff3f32 Mon Sep 17 00:00:00 2001 From: Coca Date: Tue, 11 Feb 2025 09:16:59 +0000 Subject: [PATCH 1139/2168] uiua-unstable: 0.14.1 -> 0.15.0-dev.1 --- pkgs/by-name/ui/uiua/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ui/uiua/unstable.nix b/pkgs/by-name/ui/uiua/unstable.nix index 2ea907bcfaaf..6758c68df030 100644 --- a/pkgs/by-name/ui/uiua/unstable.nix +++ b/pkgs/by-name/ui/uiua/unstable.nix @@ -1,7 +1,7 @@ rec { - version = "0.14.1"; + version = "0.15.0-dev.1"; tag = version; - hash = "sha256-+FiJYxB2Lb1B7l9QEuB/XzdEYgJZmYAQpKimRIhWwhc="; - cargoHash = "sha256-bDj7pvZORP1cc2PXd1W9TWptWCvIKW9TXzaQAmni6hg="; + hash = "sha256-taR403/r6dxQv/hVpuea2Nz/meFauXUxfyVC5tvMSlo="; + cargoHash = "sha256-OdG5UVs5fY5xOCY1GwaKrCSY/cIe4dB6LZb+ZNSvU90="; updateScript = ./update-unstable.sh; } From 962af45537f06fdd36ac43f078b35ae569147403 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 11 Feb 2025 10:17:50 +0100 Subject: [PATCH 1140/2168] azure-cli-extensions.apic-extension: 1.1.0 -> 1.2.0b1 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 968bda7dac86..03c79b8a442d 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -92,9 +92,9 @@ }, "apic-extension": { "pname": "apic-extension", - "version": "1.1.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/apic_extension-1.1.0-py3-none-any.whl", - "hash": "sha256-AeXrQi6EJoOW3bAlEjC907nUdfRj6BM/BBX7Dw4DJAs=", + "version": "1.2.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/apic_extension-1.2.0b1-py3-none-any.whl", + "hash": "sha256-v8y6Jgg9dYCO/GuLEl44il77WC9nuKT9cRnMI43wZaM=", "description": "Microsoft Azure Command-Line Tools ApicExtension Extension" }, "appservice-kube": { From c32b542c1a2ff65b4fe06682bb47ec43ba1ad16b Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 11 Feb 2025 10:17:51 +0100 Subject: [PATCH 1141/2168] azure-cli-extensions.datafactory: 1.0.2 -> 1.0.3 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 03c79b8a442d..75dd58c78637 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -288,9 +288,9 @@ }, "datafactory": { "pname": "datafactory", - "version": "1.0.2", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/datafactory-1.0.2-py3-none-any.whl", - "hash": "sha256-6hNOKWO3zfK8vVAkSm8aQR2ne9TbfkLIyPllFjjIKsc=", + "version": "1.0.3", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/datafactory-1.0.3-py3-none-any.whl", + "hash": "sha256-ZvQWykXTiKMvuzc4ByUecOIFNH+j6HBWaW7xaTCa6vs=", "description": "Microsoft Azure Command-Line Tools DataFactoryManagementClient Extension" }, "datamigration": { From d88ecb523ad12da3c85afd5f824fe507b425539a Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 11 Feb 2025 10:17:53 +0100 Subject: [PATCH 1142/2168] azure-cli-extensions.alb: 1.0.0 -> 2.0.0 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 75dd58c78637..7be9444f9699 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -64,9 +64,9 @@ }, "alb": { "pname": "alb", - "version": "1.0.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/alb-1.0.0-py3-none-any.whl", - "hash": "sha256-sCDNjNPaYpncl4SZ2uRSdot2UcPtjgXy8LMhvZuDVNQ=", + "version": "2.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/alb-2.0.0-py3-none-any.whl", + "hash": "sha256-Z9Pbk2dkAqSyFDlpuyD7jsYidiTsUUnTF6GRtX0WqcM=", "description": "Microsoft Azure Command-Line Tools ALB Extension" }, "alertsmanagement": { From ab755113086cd5561b7d3c2a0a29fdcb3e808fec Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 11 Feb 2025 10:17:55 +0100 Subject: [PATCH 1143/2168] azure-cli-extensions.networkcloud: 2.0.0 -> 3.0.0b1 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 7be9444f9699..61d7b1d6f1d0 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -729,10 +729,10 @@ }, "networkcloud": { "pname": "networkcloud", - "version": "2.0.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/networkcloud-2.0.0-py3-none-any.whl", - "hash": "sha256-8ntKTSkGJwdhHJCeClEd7A0cUgRed8sV/l7qP5jAQhQ=", - "description": "Support for Azure Operator Nexus network cloud commands based on 2024-07-01 API version" + "version": "3.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/networkcloud-3.0.0b1-py3-none-any.whl", + "hash": "sha256-YGCfBmwvotljUiwopPmRGLx+4T3NOdp8YySgF9ro+KY=", + "description": "Support for Azure Operator Nexus network cloud commands based on 2024-10-01-preview API version" }, "new-relic": { "pname": "new-relic", From 38e1a16a5280df87c41d311ddd69b91bcbda70a3 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 11 Feb 2025 10:17:57 +0100 Subject: [PATCH 1144/2168] azure-cli-extensions.bastion: 1.3.1 -> 1.4.0 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 61d7b1d6f1d0..4b4b80c83640 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -169,9 +169,9 @@ }, "bastion": { "pname": "bastion", - "version": "1.3.1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/bastion-1.3.1-py3-none-any.whl", - "hash": "sha256-DMqkBnT8Mp/p+SV/hpwxnGTWyJwChmSm/1NOuu4dxek=", + "version": "1.4.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/bastion-1.4.0-py3-none-any.whl", + "hash": "sha256-G3kYIjI8MiRLO9ug2F6DjzL/V+I13xhIDTDhuq0t3jQ=", "description": "Microsoft Azure Command-Line Tools Bastion Extension" }, "billing-benefits": { From cfdb5ca6e8c7caec7594cd6f296a0eb5be8a660b Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 11 Feb 2025 10:17:59 +0100 Subject: [PATCH 1145/2168] azure-cli-extensions.aks-preview: 13.0.0b2 -> 13.0.0b5 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 4b4b80c83640..d1cac122e18f 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -50,9 +50,9 @@ }, "aks-preview": { "pname": "aks-preview", - "version": "13.0.0b2", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-13.0.0b2-py2.py3-none-any.whl", - "hash": "sha256-lVOEs9+Vbg7vYt5jhV8agVFvfbqpxdqF58b06Zv9erY=", + "version": "13.0.0b5", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-13.0.0b5-py2.py3-none-any.whl", + "hash": "sha256-uB+Vz7PEm28It6DyOEoWJJfWv6wfLC16SV/poGFb4TM=", "description": "Provides a preview for upcoming AKS features" }, "akshybrid": { From 0e11c26194b42f5b04e91c2945873482ddd89167 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 11 Feb 2025 10:18:01 +0100 Subject: [PATCH 1146/2168] azure-cli-extensions.neon: 1.0.0b1 -> 1.0.0b2 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index d1cac122e18f..945f74ab3c60 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -715,9 +715,9 @@ }, "neon": { "pname": "neon", - "version": "1.0.0b1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/neon-1.0.0b1-py3-none-any.whl", - "hash": "sha256-JA3DOHznnpjq0nt30tAWLHSUyUv6ihfRt4Qa4l5Dajs=", + "version": "1.0.0b2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/neon-1.0.0b2-py3-none-any.whl", + "hash": "sha256-EUIO1Xjt9RaJ4RFq9YQTO2a1ZqydVs8b5PqyW0ef7AY=", "description": "Microsoft Azure Command-Line Tools Neon Extension" }, "network-analytics": { From 565a870dbe2764edf1b10322c595fa747293c656 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 11 Feb 2025 10:18:03 +0100 Subject: [PATCH 1147/2168] azure-cli-extensions.nginx: 2.0.0b6 -> 2.0.0b8 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 945f74ab3c60..dd3874bedc6f 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -750,9 +750,9 @@ }, "nginx": { "pname": "nginx", - "version": "2.0.0b6", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/nginx-2.0.0b6-py2.py3-none-any.whl", - "hash": "sha256-2U93wSzmlFyCP376hCOOOYta7IeBVrvfMRLw3vHriWA=", + "version": "2.0.0b8", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/nginx-2.0.0b8-py2.py3-none-any.whl", + "hash": "sha256-d/ELXpGjr/oR7rnIQqddcWA88X2n5BizhAuWYSNb1JM=", "description": "Microsoft Azure Command-Line Tools Nginx Extension" }, "notification-hub": { From 5f14e93ec2e6b09d2694839835b6c3657ef2dfc8 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 11 Feb 2025 10:18:04 +0100 Subject: [PATCH 1148/2168] azure-cli-extensions.cosmosdb-preview: 1.1.0b1 -> 1.2.0b1 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index dd3874bedc6f..eddeb31e7c35 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -232,9 +232,9 @@ }, "cosmosdb-preview": { "pname": "cosmosdb-preview", - "version": "1.1.0b1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/cosmosdb_preview-1.1.0b1-py2.py3-none-any.whl", - "hash": "sha256-D8EbL83XXEhoz8Q+xL4ZwhKP0de2FrYeM2TDwaDEwdo=", + "version": "1.2.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/cosmosdb_preview-1.2.0b1-py2.py3-none-any.whl", + "hash": "sha256-01tYc3cg2cTa1KDRAOHMoU3bA8heyc4ZdECgbvUPVhE=", "description": "Microsoft Azure Command-Line Tools Cosmosdb-preview Extension" }, "costmanagement": { From 6cf13d9892629dc8a3e052ab259546fe26544c41 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 11 Feb 2025 10:18:06 +0100 Subject: [PATCH 1149/2168] azure-cli-extensions.nsp: 1.0.0b2 -> 1.0.0b3 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index eddeb31e7c35..3635a24e0189 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -764,9 +764,9 @@ }, "nsp": { "pname": "nsp", - "version": "1.0.0b2", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/nsp-1.0.0b2-py3-none-any.whl", - "hash": "sha256-/r/OOPxEnapnx62EEOf6JQ9/Oa+1+HBJbOBFu3STW80=", + "version": "1.0.0b3", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/nsp-1.0.0b3-py3-none-any.whl", + "hash": "sha256-Nsxf4BMEWkvx5od7YsLwQLZdULc5glwtcDC7qClx5T8=", "description": "Microsoft Azure Command-Line Tools Nsp Extension" }, "offazure": { From c56dc154cc0e18100240120f3baf6ac8117b7b85 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 11 Feb 2025 10:18:08 +0100 Subject: [PATCH 1150/2168] azure-cli-extensions.k8s-extension: 1.6.2 -> 1.6.3 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 3635a24e0189..4e3971fcf38b 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -582,9 +582,9 @@ }, "k8s-extension": { "pname": "k8s-extension", - "version": "1.6.2", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/k8s_extension-1.6.2-py3-none-any.whl", - "hash": "sha256-hS2nusfLVQF8yEPgX1pw6juS6V3eJZLP6JL+1R41Co8=", + "version": "1.6.3", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/k8s_extension-1.6.3-py3-none-any.whl", + "hash": "sha256-NHKwalI003mKt2/WS8q6A7nbjDyKBMQMrng+YPiDAeY=", "description": "Microsoft Azure Command-Line Tools K8s-extension Extension" }, "k8s-runtime": { From 92bd46b8d9b7562866814524387d8b84f21c6af1 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 11 Feb 2025 10:18:10 +0100 Subject: [PATCH 1151/2168] azure-cli-extensions.devcenter: 6.2.0 -> 6.2.3 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 4e3971fcf38b..ed7a0958e753 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -337,9 +337,9 @@ }, "devcenter": { "pname": "devcenter", - "version": "6.2.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/devcenter-6.2.0-py3-none-any.whl", - "hash": "sha256-JPT+sOq8D1Ojjy/7e4Nwd9jWuUNg1o/Dhn8C6Y4PcLc=", + "version": "6.2.3", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/devcenter-6.2.3-py3-none-any.whl", + "hash": "sha256-w0IE25YKaUtrtHzExBn2lEQC8UnXOZkbPMh2czkhAfw=", "description": "Microsoft Azure Command-Line Tools DevCenter Extension" }, "diskpool": { From 6e96992ac22de0b02c21b20c208bc707af64ecc7 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 11 Feb 2025 10:18:12 +0100 Subject: [PATCH 1152/2168] azure-cli-extensions.resource-graph: 2.1.0 -> 2.1.1 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index ed7a0958e753..86446ddc0ca9 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -876,9 +876,9 @@ }, "resource-graph": { "pname": "resource-graph", - "version": "2.1.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/resource_graph-2.1.0-py2.py3-none-any.whl", - "hash": "sha256-YsgePWLOYMWgpIWCnQC9sMczFF7pP7YJjBTjsn7ifEA=", + "version": "2.1.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/resource_graph-2.1.1-py2.py3-none-any.whl", + "hash": "sha256-Q2suhl1/P7a+6izcAXx03UimaZEgmlq43AkkQ+yTFA8=", "description": "Support for querying Azure resources with Resource Graph" }, "resource-mover": { From e58543ef03d362b0ece1c90e37b1a71c0eb74ca8 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 11 Feb 2025 10:18:14 +0100 Subject: [PATCH 1153/2168] azure-cli-extensions.amg: 2.5.4 -> 2.5.5 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 86446ddc0ca9..2dfcc15535e5 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -78,9 +78,9 @@ }, "amg": { "pname": "amg", - "version": "2.5.4", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/amg-2.5.4-py3-none-any.whl", - "hash": "sha256-4sNSdZJleUc+MzvzgLW57zrhsGLcGIpBzxHX+A7JM0g=", + "version": "2.5.5", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/amg-2.5.5-py3-none-any.whl", + "hash": "sha256-uCgv54CC2Ed5coMxxWbX1OQLbFNYIh8gRnYM87U/9WU=", "description": "Microsoft Azure Command-Line Tools Azure Managed Grafana Extension" }, "amlfs": { From 67d7e51a8ee7afa61cdc0642654d737d5c8dba18 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 11 Feb 2025 10:18:16 +0100 Subject: [PATCH 1154/2168] azure-cli-extensions.logz: remove Signed-off-by: Paul Meyer --- pkgs/by-name/az/azure-cli/extensions-generated.json | 7 ------- pkgs/by-name/az/azure-cli/extensions-manual.nix | 1 + 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 2dfcc15535e5..b372bb04afa7 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -622,13 +622,6 @@ "hash": "sha256-FMGHaMAu6cNwrH7tDyMgbu59NEoQOCowg7F7XhhIz80=", "description": "Microsoft Azure Command-Line Tools Logic Extension" }, - "logz": { - "pname": "logz", - "version": "0.1.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/logz-0.1.0-py3-none-any.whl", - "hash": "sha256-apN9u4xadYspr9Rez8EBdDpb8kkfL7pg6OpRLVt2WEA=", - "description": "Microsoft Azure Command-Line Tools MicrosoftLogz Extension" - }, "maintenance": { "pname": "maintenance", "version": "1.7.0b2", diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix index 17bc2d60f3b4..d402cd903a46 100644 --- a/pkgs/by-name/az/azure-cli/extensions-manual.nix +++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix @@ -154,4 +154,5 @@ compute-diagnostic-rp = throw "The 'compute-diagnostic-rp' extension for azure-cli was deprecated upstream"; # Added 2024-11-12, https://github.com/Azure/azure-cli-extensions/pull/8240 connection-monitor-preview = throw "The 'connection-monitor-preview' extension for azure-cli was deprecated upstream"; # Added 2024-11-02, https://github.com/Azure/azure-cli-extensions/pull/8194 deidservice = throw "The 'deidservice' extension for azure-cli was moved under healthcareapis"; # Added 2024-11-19, https://github.com/Azure/azure-cli-extensions/pull/8224 + logz = throw "The 'logz' extension for azure-cli was deprecated upstream"; # Added 2024-11-02, https://github.com/Azure/azure-cli-extensions/pull/8459 } From 68e34e6024d8f99ee563f1815324e02426637522 Mon Sep 17 00:00:00 2001 From: Moritz Sanft <58110325+msanft@users.noreply.github.com> Date: Mon, 10 Feb 2025 17:01:08 +0100 Subject: [PATCH 1155/2168] aflplusplus: 4.21c -> 4.31c --- pkgs/tools/security/aflplusplus/default.nix | 4 ++-- pkgs/tools/security/aflplusplus/qemu.nix | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/aflplusplus/default.nix b/pkgs/tools/security/aflplusplus/default.nix index 5b4e2e87293d..29eba5d87b63 100644 --- a/pkgs/tools/security/aflplusplus/default.nix +++ b/pkgs/tools/security/aflplusplus/default.nix @@ -37,13 +37,13 @@ let libtokencap = callPackage ./libtokencap.nix { inherit aflplusplus; }; aflplusplus = stdenvNoCC.mkDerivation rec { pname = "aflplusplus"; - version = "4.21c"; + version = "4.31c"; src = fetchFromGitHub { owner = "AFLplusplus"; repo = "AFLplusplus"; tag = "v${version}"; - hash = "sha256-DKwPRxSO+JEJYWLldnfrAYqzwqukNzrbo4R5FzJqzzg="; + hash = "sha256-O3NPtQaxcRRFE6H7O6JTsmQsO+iEl8eQxHGKtc+1g8w="; }; enableParallelBuilding = true; diff --git a/pkgs/tools/security/aflplusplus/qemu.nix b/pkgs/tools/security/aflplusplus/qemu.nix index 950e4eb85cba..5cdf3c04f890 100644 --- a/pkgs/tools/security/aflplusplus/qemu.nix +++ b/pkgs/tools/security/aflplusplus/qemu.nix @@ -25,9 +25,10 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "AFLplusplus"; repo = "qemuafl"; - # rev origin: https://github.com/AFLplusplus/AFLplusplus/blob/v4.21c/qemu_mode/QEMUAFL_VERSION - rev = "a6f0632a65e101e680dd72643a6128dd180dff72"; - sha256 = "sha256-4kaQA5KDUqkK+fbjHg47lxZHRN8JrfSC2zdjrbMbDPo="; + # Use a fixed qemuafl version instead of the one in https://github.com/AFLplusplus/AFLplusplus/blob/v4.31c/qemu_mode/QEMUAFL_VERSION. + # See: https://github.com/AFLplusplus/AFLplusplus/issues/2296. + rev = "ef1cd9a8cb1522c918faab42805216f9a4054dda"; + hash = "sha256-tbKDnDoBtFhvtE9nbi9XuHPuFuGezUFngnw4pJyKFgY="; fetchSubmodules = true; }; From aeae0a1f189cc4eea80aeb9f47dcf3a80cc278c4 Mon Sep 17 00:00:00 2001 From: Moritz Sanft <58110325+msanft@users.noreply.github.com> Date: Mon, 10 Feb 2025 17:01:47 +0100 Subject: [PATCH 1156/2168] aflplusplus: add msanft as maintainer --- pkgs/tools/security/aflplusplus/default.nix | 1 + pkgs/tools/security/aflplusplus/libdislocator.nix | 5 ++++- pkgs/tools/security/aflplusplus/libtokencap.nix | 5 ++++- pkgs/tools/security/aflplusplus/qemu.nix | 5 ++++- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/aflplusplus/default.nix b/pkgs/tools/security/aflplusplus/default.nix index 29eba5d87b63..2a0797668d35 100644 --- a/pkgs/tools/security/aflplusplus/default.nix +++ b/pkgs/tools/security/aflplusplus/default.nix @@ -209,6 +209,7 @@ let maintainers = with lib.maintainers; [ ris mindavi + msanft ]; }; }; diff --git a/pkgs/tools/security/aflplusplus/libdislocator.nix b/pkgs/tools/security/aflplusplus/libdislocator.nix index c99ba96a4339..cf1fec671440 100644 --- a/pkgs/tools/security/aflplusplus/libdislocator.nix +++ b/pkgs/tools/security/aflplusplus/libdislocator.nix @@ -35,6 +35,9 @@ stdenv.mkDerivation { several ways ''; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ ris ]; + maintainers = with lib.maintainers; [ + ris + msanft + ]; }; } diff --git a/pkgs/tools/security/aflplusplus/libtokencap.nix b/pkgs/tools/security/aflplusplus/libtokencap.nix index 428dff5bdb9c..083cf8eaaac8 100644 --- a/pkgs/tools/security/aflplusplus/libtokencap.nix +++ b/pkgs/tools/security/aflplusplus/libtokencap.nix @@ -31,6 +31,9 @@ stdenv.mkDerivation { homepage = "https://github.com/AFLplusplus/AFLplusplus"; description = "strcmp & memcmp token capture library"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ ris ]; + maintainers = with lib.maintainers; [ + ris + msanft + ]; }; } diff --git a/pkgs/tools/security/aflplusplus/qemu.nix b/pkgs/tools/security/aflplusplus/qemu.nix index 5cdf3c04f890..515738fa163d 100644 --- a/pkgs/tools/security/aflplusplus/qemu.nix +++ b/pkgs/tools/security/aflplusplus/qemu.nix @@ -140,7 +140,10 @@ stdenv.mkDerivation { homepage = "https://github.com/AFLplusplus/qemuafl"; description = "Fork of QEMU with AFL++ instrumentation support"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ ris ]; + maintainers = with lib.maintainers; [ + ris + msanft + ]; platforms = lib.platforms.linux; }; } From 9b07137f8a7219372ebc366a2479b3074b983905 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 09:41:41 +0000 Subject: [PATCH 1157/2168] python312Packages.cart: 1.2.2 -> 1.2.3 --- pkgs/development/python-modules/cart/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cart/default.nix b/pkgs/development/python-modules/cart/default.nix index de5d51e589d9..ddf27ae42a34 100644 --- a/pkgs/development/python-modules/cart/default.nix +++ b/pkgs/development/python-modules/cart/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "cart"; - version = "1.2.2"; + version = "1.2.3"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "CybercentreCanada"; repo = pname; tag = "v${version}"; - hash = "sha256-0dHdXb4v92681xL21FsrIkNgNQ9R5ULV1lnSCITZzP8="; + hash = "sha256-oeWeay1Pr9T4oR3XSrwv9hRr/sLTel1Bt6BG6jHXxIA="; }; propagatedBuildInputs = [ pycryptodome ]; @@ -33,7 +33,7 @@ buildPythonPackage rec { description = "Python module for the CaRT Neutering format"; mainProgram = "cart"; homepage = "https://github.com/CybercentreCanada/cart"; - changelog = "https://github.com/CybercentreCanada/cart/releases/tag/v${version}"; + changelog = "https://github.com/CybercentreCanada/cart/releases/tag/${src.tag}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From baf9539e172212f580a167c3352545bfee6b4a96 Mon Sep 17 00:00:00 2001 From: Martin Thuemmler Date: Fri, 20 Dec 2024 14:21:12 +0100 Subject: [PATCH 1158/2168] quantum-espresso: 7.2 -> 7.4.1 --- .../chemistry/quantum-espresso/default.nix | 9 ++- .../quantum-espresso/findLibxc.patch | 70 +++++++++++++++++++ 2 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/science/chemistry/quantum-espresso/findLibxc.patch diff --git a/pkgs/applications/science/chemistry/quantum-espresso/default.nix b/pkgs/applications/science/chemistry/quantum-espresso/default.nix index 2156c1d26969..3c2604e59df6 100644 --- a/pkgs/applications/science/chemistry/quantum-espresso/default.nix +++ b/pkgs/applications/science/chemistry/quantum-espresso/default.nix @@ -42,14 +42,14 @@ let in stdenv.mkDerivation rec { - version = "7.2"; + version = "7.4.1"; pname = "quantum-espresso"; src = fetchFromGitLab { owner = "QEF"; repo = "q-e"; rev = "qe-${version}"; - hash = "sha256-0q0QWX4BVjVHjcbKOBpjbBADuL+2S5LAALyrxmjVs4c="; + hash = "sha256-o1CjIuJCTtIud4zeHROksK1Ub9RL/OB8GecAQOIGf1s="; }; # add git submodules manually and fix pkg-config file @@ -77,6 +77,11 @@ stdenv.mkDerivation rec { --replace 'libdir="''${prefix}/@CMAKE_INSTALL_LIBDIR@"' 'libdir="@CMAKE_INSTALL_FULL_LIBDIR@"' ''; + patches = [ + # this patch reverts commit 5fb5a679, which enforced static library builds. + ./findLibxc.patch + ]; + passthru = { inherit mpi; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/chemistry/quantum-espresso/findLibxc.patch b/pkgs/applications/science/chemistry/quantum-espresso/findLibxc.patch new file mode 100644 index 000000000000..76c592360c97 --- /dev/null +++ b/pkgs/applications/science/chemistry/quantum-espresso/findLibxc.patch @@ -0,0 +1,70 @@ +diff --git a/cmake/FindLibxc.cmake b/cmake/FindLibxc.cmake +index 011a36b77..226f38051 100644 +--- a/cmake/FindLibxc.cmake ++++ b/cmake/FindLibxc.cmake +@@ -1,45 +1,50 @@ +-include(FindPackageHandleStandardArgs) +-find_package(PkgConfig REQUIRED) +- + pkg_search_module(_LIBXC libxc>=${Libxc_FIND_VERSION}) + +-find_library(LIBXC_LIBRARIES NAMES libxc.a ++find_library(LIBXC_LIBRARIES NAMES xc + PATH_SUFFIXES lib + HINTS +- ${LIBXC_ROOT} + ENV EBROOTLIBXC + ENV LIBXCROOT + ${_LIBXC_LIBRARY_DIRS} + DOC "libxc libraries list") + +-find_library(LIBXC_LIBRARIES_F03 NAMES libxcf03.a ++find_library(LIBXC_LIBRARIES_F90 NAMES xcf90 + PATH_SUFFIXES lib + HINTS +- ${LIBXC_ROOT} + ENV EBROOTLIBXC + ENV LIBXCROOT + ${_LIBXC_LIBRARY_DIRS} + DOC "libxc libraries list") + ++find_library(LIBXC_LIBRARIES_F03 NAMES xcf03 ++ PATH_SUFFIXES lib ++ HINTS ++ ENV EBROOTLIBXC ++ ENV LIBXCROOT ++ ${_LIBXC_LIBRARY_DIRS}) + find_path(LIBXC_INCLUDE_DIR NAMES xc.h + PATH_SUFFIXES inc include + HINTS +- ${LIBXC_ROOT} + ${_LIBXC_INCLUDE_DIRS} + ENV EBROOTLIBXC + ENV LIBXCROOT) + ++find_path(LIBXC_INCLUDE_DIR_F90 NAMES xc_f90_lib_m.mod ++ PATH_SUFFIXES inc include ++ HINTS ++ ${_LIBXC_INCLUDE_DIRS} ++ ENV EBROOTLIBXC ++ ENV LIBXCROOT) + find_path(LIBXC_INCLUDE_DIR_F03 NAMES xc_f03_lib_m.mod + PATH_SUFFIXES inc include + HINTS +- ${LIBXC_ROOT} + ${_LIBXC_INCLUDE_DIRS} + ENV EBROOTLIBXC + ENV LIBXCROOT) + + find_package_handle_standard_args(Libxc DEFAULT_MSG LIBXC_LIBRARIES LIBXC_INCLUDE_DIR) + +-if (${Libxc_FOUND} AND LIBXC_LIBRARIES_F03 AND LIBXC_INCLUDE_DIR_F03) ++if (${Libxc_FOUND} AND LIBXC_LIBRARIES_F90 AND LIBXC_LIBRARIES_F03 AND LIBXC_INCLUDE_DIR_F90 AND LIBXC_INCLUDE_DIR_F03) + if(_LIBXC_VERSION) + set(Libxc_VERSION ${_LIBXC_VERSION}) + else() +@@ -53,4 +58,3 @@ if (${Libxc_FOUND} AND LIBXC_LIBRARIES_F03 AND LIBXC_INCLUDE_DIR_F03) + else() + unset(Libxc_FOUND) + endif() +- From 89ac8843492aabe1c18d21e5175d3db0038f0af3 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Tue, 11 Feb 2025 18:03:01 +0800 Subject: [PATCH 1159/2168] sing-box: 1.11.1 -> 1.11.3 Diff: https://github.com/SagerNet/sing-box/compare/v1.11.1...v1.11.3 --- pkgs/by-name/si/sing-box/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/si/sing-box/package.nix b/pkgs/by-name/si/sing-box/package.nix index ee093dc055c2..83323fd24f79 100644 --- a/pkgs/by-name/si/sing-box/package.nix +++ b/pkgs/by-name/si/sing-box/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "sing-box"; - version = "1.11.1"; + version = "1.11.3"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-W/b3pAyeTQiBZ5T8u74JITlAfJ5fmWn8DUUTw9tAZTk="; + hash = "sha256-TaCz3IS+t4v7p/gT19DCP5ARM3nvFqDPGtMv/Vvwmtk="; }; - vendorHash = "sha256-NWHDEN7aQWR3DXp9nFNhxDXFMeBsCk8/ZzCcT/zgwmI="; + vendorHash = "sha256-Ix4Pzq+yGfaJNPJnhLGgcCzZ85hGjSU24NffMR3ZSxQ="; tags = [ "with_quic" From 33440ed3eabfef4925df82135ba16976f340a1c9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 10:23:24 +0000 Subject: [PATCH 1160/2168] python312Packages.pyexcel-io: 0.6.7 -> 0.6.7.1 --- pkgs/development/python-modules/pyexcel-io/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyexcel-io/default.nix b/pkgs/development/python-modules/pyexcel-io/default.nix index a1b0ed35318f..8ec7dad0213c 100644 --- a/pkgs/development/python-modules/pyexcel-io/default.nix +++ b/pkgs/development/python-modules/pyexcel-io/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyexcel-io"; - version = "0.6.7"; + version = "0.6.7.1"; pyproject = true; src = fetchFromGitHub { owner = "pyexcel"; repo = "pyexcel-io"; tag = "v${version}"; - hash = "sha256-fRayB+XKWpPson64lbJ0KvCK75+H2H2Kd18Jc7ocJPU="; + hash = "sha256-DBiHHiKXR26/WPJDmEZpRgjvJitFaidbV41Tvn0etLY="; }; build-system = [ setuptools ]; From 85098a1e377177364eb989a2ea26993a257c0964 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 10:29:52 +0000 Subject: [PATCH 1161/2168] postgresqlPackages.timescaledb: 2.18.0 -> 2.18.1 --- pkgs/servers/sql/postgresql/ext/timescaledb.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 03631de86122..18f842accbc6 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -13,7 +13,7 @@ buildPostgresqlExtension rec { pname = "timescaledb${lib.optionalString (!enableUnfree) "-apache"}"; - version = "2.18.0"; + version = "2.18.1"; nativeBuildInputs = [ cmake ]; buildInputs = [ @@ -25,7 +25,7 @@ buildPostgresqlExtension rec { owner = "timescale"; repo = "timescaledb"; rev = version; - hash = "sha256-wDjzahlhUlBDXppk9HLNUOc7mlVqv56M2VGE/C04gUo="; + hash = "sha256-Ckrs22lPQb+zx9JNHHB3TQDx9ry+q8+FimvR3OT3npg="; }; cmakeFlags = From a3207b2be20fd337cb16ee578ebea89cf02ff679 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 10:42:58 +0000 Subject: [PATCH 1162/2168] python312Packages.reflex-hosting-cli: 0.1.32 -> 0.1.35 --- .../development/python-modules/reflex-hosting-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reflex-hosting-cli/default.nix b/pkgs/development/python-modules/reflex-hosting-cli/default.nix index c64f5c81cabd..fc597ada7650 100644 --- a/pkgs/development/python-modules/reflex-hosting-cli/default.nix +++ b/pkgs/development/python-modules/reflex-hosting-cli/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "reflex-hosting-cli"; - version = "0.1.32"; + version = "0.1.35"; pyproject = true; # source is not published https://github.com/reflex-dev/reflex/issues/3762 src = fetchPypi { pname = "reflex_hosting_cli"; inherit version; - hash = "sha256-C45LSzDZJhv21yAmXxxCiyhAu2MIluYKGi+qCVkB7Vk="; + hash = "sha256-ml0Cl4uQAEVGShpVgfOtxiYNqqCeis+V/QUCTNqSauc="; }; pythonRelaxDeps = [ "pipdeptree" ]; From 63009dea928a2e4909954d3d2a9e22dd32024961 Mon Sep 17 00:00:00 2001 From: myamusashi Date: Tue, 11 Feb 2025 17:45:17 +0700 Subject: [PATCH 1163/2168] waypaper: 2.4 -> 2.5 --- pkgs/by-name/wa/waypaper/package.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wa/waypaper/package.nix b/pkgs/by-name/wa/waypaper/package.nix index 8fcabc574485..8d3b0018582f 100644 --- a/pkgs/by-name/wa/waypaper/package.nix +++ b/pkgs/by-name/wa/waypaper/package.nix @@ -9,14 +9,14 @@ python3.pkgs.buildPythonApplication rec { pname = "waypaper"; - version = "2.4"; + version = "2.5"; pyproject = true; src = fetchFromGitHub { owner = "anufrievroman"; repo = "waypaper"; tag = version; - hash = "sha256-bNh8WWSLgCV8PLFvDn/+AEcNOazxMEKEYv7n+L9ABTA="; + hash = "sha256-g1heJUBVJzRZXcNQCwRcqp6cTUaroKVpcTjG0KldlxU="; }; nativeBuildInputs = [ @@ -29,7 +29,6 @@ python3.pkgs.buildPythonApplication rec { dependencies = [ python3.pkgs.pygobject3 python3.pkgs.platformdirs - python3.pkgs.importlib-metadata python3.pkgs.pillow python3.pkgs.imageio python3.pkgs.imageio-ffmpeg From 62359ce7943f42d96202dbf55bfd09d592f68c79 Mon Sep 17 00:00:00 2001 From: Rolf Verschuuren Date: Tue, 11 Feb 2025 11:50:17 +0100 Subject: [PATCH 1164/2168] unison-ucm: 0.5.29 -> 0.5.33 --- pkgs/by-name/un/unison-ucm/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/un/unison-ucm/package.nix b/pkgs/by-name/un/unison-ucm/package.nix index 088da6370333..159d4419ed9e 100644 --- a/pkgs/by-name/un/unison-ucm/package.nix +++ b/pkgs/by-name/un/unison-ucm/package.nix @@ -14,21 +14,21 @@ stdenv.mkDerivation (finalAttrs: { pname = "unison-code-manager"; - version = "0.5.29"; + version = "0.5.33"; src = { aarch64-darwin = fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos-arm64.tar.gz"; - hash = "sha256-iSyhPCn8+u/kKW1NVorUaRXaP0Q771m6G1ICsHp1/Rs="; + hash = "sha256-DXqQMv1pEEFSHDsY8BICFfKAD4zaishRIDo1hwCVj54="; }; x86_64-darwin = fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos-x64.tar.gz"; - hash = "sha256-Rukx1I67jq78xvDB7eYP6TvZZBZtWisOv2WZe6/KlHE="; + hash = "sha256-ffHbkujs3UMChPM2uL3tBcxInKEOHwRUMrIeh+k5ghY="; }; x86_64-linux = fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux-x64.tar.gz"; - hash = "sha256-fVsKPTi9j+LVWDPhuHYb7NKD2JXJz7nRE6yuE7rQ3e0="; + hash = "sha256-+kBuQn73P8yxa8l6/R3NGj61LB6kKwa2lfNKZmhI5Dk="; }; } .${stdenv.hostPlatform.system} or (throw "Unsupported platform ${stdenv.hostPlatform.system}"); From fc33393951c25f1dd1e9edbf4acd0a2e90bc0168 Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Tue, 11 Feb 2025 03:06:14 +0000 Subject: [PATCH 1165/2168] umu-launcher: use steam's FHS profile Some games require additional profile/environment, according to: https://github.com/NixOS/nixpkgs/issues/297662#issuecomment-2647656699 To keep things simple and maintainable, use Steam's `profile` FHS arg. --- pkgs/by-name/um/umu-launcher/package.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/by-name/um/umu-launcher/package.nix b/pkgs/by-name/um/umu-launcher/package.nix index aa9bf806b89d..a282d7d3e2ab 100644 --- a/pkgs/by-name/um/umu-launcher/package.nix +++ b/pkgs/by-name/um/umu-launcher/package.nix @@ -1,11 +1,20 @@ { buildFHSEnv, lib, + steam, umu-launcher-unwrapped, extraPkgs ? pkgs: [ ], extraLibraries ? pkgs: [ ], + extraProfile ? "", # string to append to shell profile + extraEnv ? { }, # Environment variables to include in shell profile withMultiArch ? true, # Many Wine games need 32-bit libraries. }: +let + # Steam is not a dependency, but we re-use some of its implementation + steam' = steam.override { + inherit extraEnv extraProfile; + }; +in buildFHSEnv { pname = "umu-launcher"; inherit (umu-launcher-unwrapped) version meta; @@ -27,4 +36,10 @@ buildFHSEnv { ln -s ${umu-launcher-unwrapped}/lib $out/lib ln -s ${umu-launcher-unwrapped}/share $out/share ''; + + # For umu & proton, we need roughly the same environment as Steam. + # For simplicity, we use Steam's `profile` implementation. + # See https://github.com/NixOS/nixpkgs/pull/381047 + # And https://github.com/NixOS/nixpkgs/issues/297662#issuecomment-2647656699 + inherit (steam'.args) profile; } From 57fae8ff01eadc3a46404ce6c323adb3bc6cb1e2 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Tue, 11 Feb 2025 10:56:57 +0000 Subject: [PATCH 1166/2168] google-chrome: 132.0.6834.110 -> 133.0.6943.53 --- pkgs/by-name/go/google-chrome/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index 5ce066824f60..f35d832b9c30 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -171,11 +171,11 @@ let linux = stdenv.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "132.0.6834.110"; + version = "133.0.6943.53"; 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-4mtVCiKXKnjmHlyYgnDneX9hOmYgafwZ230iFfH48Tc="; + hash = "sha256-73X2cohboI+GbFDk5ikjxnT1PKjG4UoyzhA9T9Qe9Vk="; }; # With strictDeps on, some shebangs were not being patched correctly @@ -274,11 +274,11 @@ let darwin = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "132.0.6834.111"; + version = "133.0.6943.54"; src = fetchurl { - url = "http://dl.google.com/release2/chrome/acuc7atz5smv6q4nvkuutofbz6uq_132.0.6834.111/GoogleChrome-132.0.6834.111.dmg"; - hash = "sha256-kC4MA57eeapnzCgyBuLNq9NBTFdcECMtoNwMzWd0KEg="; + url = "http://dl.google.com/release2/chrome/acyg7rfg57oedifn3wrcxvaq5duq_133.0.6943.54/GoogleChrome-133.0.6943.54.dmg"; + hash = "sha256-VkLjnKjAgj9Fg21jh9Xl56XDBmG0OUuDsnj93rQvJ40="; }; dontPatch = true; From 2a7576547647f0c0885d74b7d8daf2e220bd0b66 Mon Sep 17 00:00:00 2001 From: Dionysis Grigoropoulos Date: Tue, 11 Feb 2025 02:44:14 +0200 Subject: [PATCH 1167/2168] python3Packages.yamlfix: fix build Pin maison to v1.4.3. since v2.0.0 contains a breaking change. Closes #381020 --- pkgs/development/python-modules/yamlfix/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/yamlfix/default.nix b/pkgs/development/python-modules/yamlfix/default.nix index 432592060be3..b91cb7bb5b11 100644 --- a/pkgs/development/python-modules/yamlfix/default.nix +++ b/pkgs/development/python-modules/yamlfix/default.nix @@ -12,6 +12,17 @@ ruyaml, setuptools, }: +let + maison143 = maison.overridePythonAttrs (old: rec { + version = "1.4.3"; + src = fetchFromGitHub { + owner = "dbatten5"; + repo = "maison"; + tag = "v${version}"; + hash = "sha256-2hUmk91wr5o2cV3un2nMoXDG+3GT7SaIOKY+QaZY3nw="; + }; + }); +in buildPythonPackage rec { pname = "yamlfix"; @@ -34,7 +45,7 @@ buildPythonPackage rec { dependencies = [ click - maison + maison143 ruyaml ]; From e135e7f1ae9dd7e9dc4b2924e20bfea19e1a9d98 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Mon, 10 Feb 2025 20:41:19 -0800 Subject: [PATCH 1168/2168] llvmPackages_git: 21.0.0-unstable-2025-02-01 -> 21.0.0-unstable-2025-02-10 --- pkgs/development/compilers/llvm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 439be465f5de..f2ac815b4b2c 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -32,9 +32,9 @@ let "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I="; "20.1.0-rc1".officialRelease.sha256 = "sha256-yOczbperlR20+iLoao9g0CR+Ml2mjTCx1cqP/9WOhME="; "21.0.0-git".gitRelease = { - rev = "312055d1da169f043e65b35fcd62d6d685700114"; - rev-version = "21.0.0-unstable-2025-02-01"; - sha256 = "sha256-V14ypUGn7GxzchmKjoSH2oiHDUQa07b4bQWjjRpQKCo="; + rev = "c9f1d2cbf18990311ea1287cc154e3784a10a3b0"; + rev-version = "21.0.0-unstable-2025-02-10"; + sha256 = "sha256-ggH32zM85geN0c0LPLBv7VAObi67AxPlTJ4YgbT4s7M="; }; } // llvmVersions; From b384bc28b919ad03c4de60a6684e29f84a365d05 Mon Sep 17 00:00:00 2001 From: misilelab Date: Tue, 11 Feb 2025 20:18:44 +0900 Subject: [PATCH 1169/2168] uv: 0.5.29 -> 0.5.30 Signed-off-by: misilelab --- pkgs/by-name/uv/uv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 3a3743da5ddf..86dab7f846da 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -17,17 +17,17 @@ rustPlatform.buildRustPackage rec { pname = "uv"; - version = "0.5.29"; + version = "0.5.30"; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = version; - hash = "sha256-EWm1sjmDAmMQoGoRqgtFMlXwi8n/iCdahsoRERhhulc="; + hash = "sha256-a56y7sf2Os5ygTSu+iNZFjWwKi3HQ9VKo7p7e6LXmUc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-gBygAspjCzZqDnjHH4J1WUsrIjpiB55Vr33qj1nv+FM="; + cargoHash = "sha256-rodzLpaCuokvHWvwXLB2qgPnDJaP+Qff1T4LfNCQsYM="; nativeBuildInputs = [ cmake From 65ecf34ce2dbec16f9d348581d31efe58691a42a Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 23 Jan 2025 17:33:40 +0300 Subject: [PATCH 1170/2168] scripts/kde/generate-sources: use download.kde.org file listings directly --- maintainers/scripts/kde/generate-sources.py | 38 +++++++++++++-------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/maintainers/scripts/kde/generate-sources.py b/maintainers/scripts/kde/generate-sources.py index e7c52368363a..b03ef3cc5f6b 100755 --- a/maintainers/scripts/kde/generate-sources.py +++ b/maintainers/scripts/kde/generate-sources.py @@ -5,7 +5,7 @@ import binascii import json import pathlib from typing import Optional -from urllib.parse import urlparse +from urllib.parse import urljoin, urlparse import bs4 import click @@ -72,32 +72,42 @@ def main(set: str, version: str, nixpkgs: pathlib.Path, sources_url: Optional[st if sources_url is None: set_url = { - "frameworks": "kf", - "gear": "releases", - "plasma": "plasma", + "frameworks": f"frameworks/{version}/", + "gear": f"release-service/{version}/src/", + "plasma": f"plasma/{version}/", }[set] - sources_url = f"https://kde.org/info/sources/source-{set_url}-{version}/" + sources_url = f"https://download.kde.org/stable/{set_url}" - sources = httpx.get(sources_url) + client = httpx.Client() + sources = client.get(sources_url) sources.raise_for_status() bs = bs4.BeautifulSoup(sources.text, features="html.parser") results = {} - for item in bs.select("tr")[1:]: - link = item.select_one("td:nth-child(1) a") - assert link + for item in bs.select("tr")[3:]: + link = item.select_one("td:nth-child(2) a") + if not link: + continue - hash = item.select_one("td:nth-child(3) tt") - assert hash + project_name, version_and_ext = link.text.rsplit("-", maxsplit=1) - project_name, version = link.text.rsplit("-", maxsplit=1) if project_name not in metadata.projects_by_name: print(f"Warning: unknown tarball: {project_name}") + if version_and_ext.endswith(".sig"): + continue + + version = version_and_ext.removesuffix(".tar.xz") + + url = urljoin(sources_url, link.attrs["href"]) + + hash = client.get(url + ".sha256").text.split(" ", maxsplit=1)[0] + assert hash + results[project_name] = { "version": version, - "url": "mirror://kde" + urlparse(link.attrs["href"]).path, - "hash": to_sri(hash.text) + "url": "mirror://kde" + urlparse(url).path, + "hash": to_sri(hash) } pkg_dir = set_dir / project_name From 18440f37482abb37fde3b946815e94cba1f81b83 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 10 Feb 2025 23:29:07 +0100 Subject: [PATCH 1171/2168] haskell.compiler.ghcjs810: set up EM_CACHE for emcc The compiler function test now causes emcc to try and lock its cache (which is located in the nix store unless we set EM_CACHE). Resolves #376582. --- pkgs/development/compilers/ghcjs/8.10/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/compilers/ghcjs/8.10/default.nix b/pkgs/development/compilers/ghcjs/8.10/default.nix index d3f74f52e86e..c46a84e87791 100644 --- a/pkgs/development/compilers/ghcjs/8.10/default.nix +++ b/pkgs/development/compilers/ghcjs/8.10/default.nix @@ -105,6 +105,9 @@ stdenv.mkDerivation { touch $HOME/.cabal/config cd lib/boot + export EM_CACHE="$HOME/.emscriptencache" + mkdir -p "$EM_CACHE" + mkdir -p $out/bin mkdir -p $out/lib/${bootGhcjs.name} lndir ${bootGhcjs}/bin $out/bin From df251e20548ee2ee060ac4f43c4d52fafc62d695 Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Tue, 11 Feb 2025 12:53:06 +0100 Subject: [PATCH 1172/2168] yazi-unwrapped: 25.2.7 -> 25.2.11 --- pkgs/by-name/ya/yazi-unwrapped/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ya/yazi-unwrapped/package.nix b/pkgs/by-name/ya/yazi-unwrapped/package.nix index 045291a208ec..574b9207f9a0 100644 --- a/pkgs/by-name/ya/yazi-unwrapped/package.nix +++ b/pkgs/by-name/ya/yazi-unwrapped/package.nix @@ -11,21 +11,21 @@ rustPlatform.buildRustPackage rec { pname = "yazi"; - version = "25.2.7"; + version = "25.2.11"; src = fetchFromGitHub { owner = "sxyazi"; repo = "yazi"; rev = "v${version}"; - hash = "sha256-f8+C+L8eOugnyx4Zm2y3qAXH33BsI5F1JWecigPKuMg="; + hash = "sha256-yVpSoEmEA+/XF/jlJqKdkj86m8IZLAbrxDxz5ZnmP78="; }; useFetchCargoVendor = true; - cargoHash = "sha256-7ARj5TNZm//CfkOczqaaoY1KjpXpr5dtSvdUNygpL6U="; + cargoHash = "sha256-AfXi68PNrYj6V6CYIPZT0t2l5KYTYrIzJgrcEPLW8FM="; env.YAZI_GEN_COMPLETIONS = true; env.VERGEN_GIT_SHA = "Nixpkgs"; - env.VERGEN_BUILD_DATE = "2025-02-07"; + env.VERGEN_BUILD_DATE = "2025-02-11"; nativeBuildInputs = [ installShellFiles ]; buildInputs = [ rust-jemalloc-sys ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; From eedce86ef01ad39165d79802e5acd66d81078241 Mon Sep 17 00:00:00 2001 From: Naxdy Date: Sun, 5 Jan 2025 13:26:53 +0100 Subject: [PATCH 1173/2168] blackmagic-desktop-video: 14.2a1 -> 14.4.1a4 --- pkgs/by-name/bl/blackmagic-desktop-video/package.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/bl/blackmagic-desktop-video/package.nix b/pkgs/by-name/bl/blackmagic-desktop-video/package.nix index 55cbe5332089..56c7ef7a63ab 100644 --- a/pkgs/by-name/bl/blackmagic-desktop-video/package.nix +++ b/pkgs/by-name/bl/blackmagic-desktop-video/package.nix @@ -11,7 +11,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "blackmagic-desktop-video"; - version = "14.2a1"; + version = "14.4.1a4"; buildInputs = [ autoPatchelfHook @@ -25,15 +25,15 @@ stdenv.mkDerivation (finalAttrs: { src = let # from the URL the download page where you click the "only download" button is at - REFERID = "b97e55f37a0042fbacd234971d8c93ed"; + REFERID = "5baba0af3eda41ee9cd0ec7349660d74"; # from the URL that the POST happens to, see browser console - DOWNLOADID = "552546307a7c4de29ea6d09a6ca08c90"; + DOWNLOADID = "bc31044728f146859c6d9e0ccef868d8"; in runCommandLocal "${finalAttrs.pname}-${lib.versions.majorMinor finalAttrs.version}-src.tar.gz" { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-rfZDL1YvAuMD5u68MMyiT8cERsIHMc9K25lXt7cqrrk="; + outputHash = "sha256-qh305s7u1yurv58TZnlONgDmWT4RXG3fXTfun382HAs="; impureEnvVars = lib.fetchers.proxyImpureEnvVars; @@ -58,7 +58,6 @@ stdenv.mkDerivation (finalAttrs: { "platform" = "Linux"; "policy" = true; }; - } '' RESOLVEURL=$(curl \ From a0396d34c73dea29d229f9112414947098c6c75f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 11:55:19 +0000 Subject: [PATCH 1174/2168] gauge-unwrapped: 1.6.12 -> 1.6.13 --- pkgs/development/tools/gauge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix index 414edd86d0fc..e2ce2edfa477 100644 --- a/pkgs/development/tools/gauge/default.nix +++ b/pkgs/development/tools/gauge/default.nix @@ -6,7 +6,7 @@ buildGoModule rec { pname = "gauge"; - version = "1.6.12"; + version = "1.6.13"; patches = [ # adds a check which adds an error message when trying to @@ -18,7 +18,7 @@ buildGoModule rec { owner = "getgauge"; repo = "gauge"; rev = "v${version}"; - hash = "sha256-CstlH7KOSUK3Oe5d8LyUswcebwusVv5iuB7gaZOKpVg="; + hash = "sha256-oyZDz3SX68rlnAG+JzKeIKyKUjQ+ttTrzthHUwW0b54="; }; vendorHash = "sha256-nqyzNbD2j6b34QpFiv2yVxEVkrZkuzcwAt9uqAB2iA4="; From d278283dbcc65691d0afa5693ffcdeb3820ce81c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Feb 2025 12:01:26 +0000 Subject: [PATCH 1175/2168] polylux2pdfpc: 0.3.1 -> 0.4.0 --- pkgs/by-name/po/polylux2pdfpc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/po/polylux2pdfpc/package.nix b/pkgs/by-name/po/polylux2pdfpc/package.nix index 0e95e56ca816..99eea57f3d89 100644 --- a/pkgs/by-name/po/polylux2pdfpc/package.nix +++ b/pkgs/by-name/po/polylux2pdfpc/package.nix @@ -10,14 +10,14 @@ let in rustPlatform.buildRustPackage rec { pname = "polylux2pdfpc"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "andreasKroepelin"; repo = "polylux"; rev = "v${version}"; sparseCheckout = [ dirname ]; - hash = "sha256-GefX7XsUfOMCp2THstSizRGpKAoq7yquVukWQjGuFgc="; + hash = "sha256-41FgRejonvVTmE89WGm0Cqumm8lb6kkfxtkWV74UKJA="; }; sourceRoot = "${src.name}/${dirname}"; From 9f2b7c3596619befc64a50d8198ee5f30d3b975b Mon Sep 17 00:00:00 2001 From: Diogo Correia Date: Wed, 5 Feb 2025 13:01:35 +0000 Subject: [PATCH 1176/2168] polylux2pdfpc: update github owner to new org Upstream repository has moved --- pkgs/by-name/po/polylux2pdfpc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/po/polylux2pdfpc/package.nix b/pkgs/by-name/po/polylux2pdfpc/package.nix index 99eea57f3d89..a2d535413c53 100644 --- a/pkgs/by-name/po/polylux2pdfpc/package.nix +++ b/pkgs/by-name/po/polylux2pdfpc/package.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { version = "0.4.0"; src = fetchFromGitHub { - owner = "andreasKroepelin"; + owner = "polylux-typ"; repo = "polylux"; rev = "v${version}"; sparseCheckout = [ dirname ]; @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Tool to make pdfpc interpret slides created by polylux correctly"; - homepage = "https://github.com/andreasKroepelin/polylux/tree/main/pdfpc-extractor"; + homepage = "https://github.com/polylux-typ/polylux/tree/main/pdfpc-extractor"; license = licenses.mit; mainProgram = "polylux2pdfpc"; maintainers = [ maintainers.diogotcorreia ]; From 4f7a8f1423001d78f182289c226964b56f582843 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 12:09:22 +0000 Subject: [PATCH 1177/2168] postgresqlPackages.pgrouting: 3.7.2 -> 3.7.3 --- pkgs/servers/sql/postgresql/ext/pgrouting.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/pkgs/servers/sql/postgresql/ext/pgrouting.nix index f795ad8618fb..4aef42af2579 100644 --- a/pkgs/servers/sql/postgresql/ext/pgrouting.nix +++ b/pkgs/servers/sql/postgresql/ext/pgrouting.nix @@ -11,7 +11,7 @@ buildPostgresqlExtension rec { pname = "pgrouting"; - version = "3.7.2"; + version = "3.7.3"; nativeBuildInputs = [ cmake @@ -23,7 +23,7 @@ buildPostgresqlExtension rec { owner = "pgRouting"; repo = "pgrouting"; rev = "v${version}"; - hash = "sha256-dzt1fVqbOE37A/qcQbuQuyiZpYuCwavQhnN/ZwFy1KM="; + hash = "sha256-jaevnDCJ6hRQeDhdAkvMTvnnFWElMNvo9gZRW53proQ="; }; meta = with lib; { From dfa0e1732755e3ebbc57421e486410b1b5d11385 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 11 Feb 2025 13:14:55 +0100 Subject: [PATCH 1178/2168] harper: 0.19.1 -> 0.20.0 Diff: https://github.com/Automattic/harper/compare/v0.19.1...v0.20.0 Changelog: https://github.com/Automattic/harper/releases/tag/v0.20.0 --- pkgs/by-name/ha/harper/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix index 772784a79e42..04459f608807 100644 --- a/pkgs/by-name/ha/harper/package.nix +++ b/pkgs/by-name/ha/harper/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "harper"; - version = "0.19.1"; + version = "0.20.0"; src = fetchFromGitHub { owner = "Automattic"; repo = "harper"; rev = "v${version}"; - hash = "sha256-3W/pFtI8G9GOEXt1nCpoy+vp6+59Ya3oqlx2EttGEIk="; + hash = "sha256-8JeF1HxsP+Y+C1g3YJ0B0+JHoRFkBjz4/T8rVr2KgGw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-xPppf2YRgvGqmFBFLZl8XF5apGUX6kICE0jp2nx++io="; + cargoHash = "sha256-uVjDFo5mJi4Xbq0Z+XOjy5VqXqkm0a+4xu+dVnjWXCU="; meta = { description = "Grammar Checker for Developers"; From 24586c164beb2a7c6f42921a3bcec88a066a3eb6 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 9 Jan 2025 21:36:52 +0300 Subject: [PATCH 1179/2168] kdePackages: Plasma 6.2 -> 6.3 --- pkgs/kde/gear/default.nix | 1 - pkgs/kde/generated/sources/plasma.json | 401 +++++++-------- pkgs/kde/plasma/breeze/default.nix | 3 + pkgs/kde/plasma/default.nix | 1 + .../plasma/kinfocenter/0001-tool-paths.patch | 472 ++++++++++++------ pkgs/kde/plasma/kinfocenter/default.nix | 4 + pkgs/kde/plasma/plasma-desktop/default.nix | 2 + pkgs/kde/plasma/plasma-workspace/default.nix | 3 +- .../plasma-workspace/dependency-paths.patch | 22 +- pkgs/kde/plasma/plasma5support/default.nix | 19 +- .../{gear => plasma}/spectacle/default.nix | 0 11 files changed, 562 insertions(+), 366 deletions(-) rename pkgs/kde/{gear => plasma}/spectacle/default.nix (100%) diff --git a/pkgs/kde/gear/default.nix b/pkgs/kde/gear/default.nix index ce0cadba3dd2..1ab627559e03 100644 --- a/pkgs/kde/gear/default.nix +++ b/pkgs/kde/gear/default.nix @@ -242,7 +242,6 @@ skanlite = callPackage ./skanlite { }; skanpage = callPackage ./skanpage { }; skladnik = callPackage ./skladnik { }; - spectacle = callPackage ./spectacle { }; step = callPackage ./step { }; svgpart = callPackage ./svgpart { }; sweeper = callPackage ./sweeper { }; diff --git a/pkgs/kde/generated/sources/plasma.json b/pkgs/kde/generated/sources/plasma.json index 70357307b834..4fcd394c04a1 100644 --- a/pkgs/kde/generated/sources/plasma.json +++ b/pkgs/kde/generated/sources/plasma.json @@ -1,332 +1,337 @@ { "bluedevil": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/bluedevil-6.2.5.tar.xz", - "hash": "sha256-Tl9D6d2ddZDimkMhSK1Rq7vTHPMChXMUJfW+jyRE8ro=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/bluedevil-6.3.0.tar.xz", + "hash": "sha256-uqgVjWesGDHzIwx828RAw9Vt6BRwg8gZUv2i2azssoQ=" }, "breeze": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/breeze-6.2.5.tar.xz", - "hash": "sha256-HTvUSBu3zSdKE6xdWFK+Uf8pdeYghy38IvvVMbrQTiU=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/breeze-6.3.0.tar.xz", + "hash": "sha256-e7UN1mLjXf2u7JWPrUIU5sPBRISRmrEqVFoRCfvgiZU=" }, "breeze-grub": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/breeze-grub-6.2.5.tar.xz", - "hash": "sha256-AotNwvjw9mMDnl64Ayh8X549xPXz5f16RPxx1nbcOYk=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/breeze-grub-6.3.0.tar.xz", + "hash": "sha256-sQCf31ZSG9KEAnRjnM5AXRDiDldJKrYrWSuBWmGFvhw=" }, "breeze-gtk": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/breeze-gtk-6.2.5.tar.xz", - "hash": "sha256-IRXwC7zvjmulckfpxs4WM97fNw+S2gHS/Eqvyhp0018=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/breeze-gtk-6.3.0.tar.xz", + "hash": "sha256-Jrd9zu3h8mh99jZlxLoODnnbyarO/HSFhQL4Fu0yZfg=" }, "breeze-plymouth": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/breeze-plymouth-6.2.5.tar.xz", - "hash": "sha256-4D/NjM4Z3pjxstrzlw29WeF/Wfm2iN7/xOSgd6um4Uo=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/breeze-plymouth-6.3.0.tar.xz", + "hash": "sha256-BYlAsh647wIQ3RHMsOwfjiDBe2jOi404vE7qImBQBII=" }, "discover": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/discover-6.2.5.tar.xz", - "hash": "sha256-jMu4gTkqS61UCrC7RlY3oOIG72tT578C5xvI+2RTpKQ=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/discover-6.3.0.tar.xz", + "hash": "sha256-v1kqF0opluIQgfK+wGjb7umrlF3w7s8tRlvkSOAj6ps=" }, "drkonqi": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/drkonqi-6.2.5.tar.xz", - "hash": "sha256-+V7FbHAuscukhBH9FwnYcjhJ43D/jqaZgUgtbzpdXHM=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/drkonqi-6.3.0.tar.xz", + "hash": "sha256-ZSu8VecEccp6zxONgKI3/PXhB+QNKssOx58DqtUAlIk=" }, "flatpak-kcm": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/flatpak-kcm-6.2.5.tar.xz", - "hash": "sha256-JshyE62aOUorPcZhYFHWfFyqMji6qoipr7mV3YlnOy4=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/flatpak-kcm-6.3.0.tar.xz", + "hash": "sha256-9XmPHQzO6bUCicy0EHFdNf7N5f0a181ITJGPFJxtUSE=" }, "kactivitymanagerd": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/kactivitymanagerd-6.2.5.tar.xz", - "hash": "sha256-824bvFwQD0w50a8AegPEdOo90VhFkgKf4k+72xz52tY=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/kactivitymanagerd-6.3.0.tar.xz", + "hash": "sha256-Il9k5WjlWePm7I6aBS2E+zxVfhbp1PgbVnGZCBGnVe4=" }, "kde-cli-tools": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/kde-cli-tools-6.2.5.tar.xz", - "hash": "sha256-HdpX90lQYKCGZYeWUZ1o1U9efaThL6bY1L9GFKxygAI=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/kde-cli-tools-6.3.0.tar.xz", + "hash": "sha256-zMvNc38fQz8u6xfuHjuMwQtnOhO2hbwNYKORl4/Jezs=" }, "kde-gtk-config": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/kde-gtk-config-6.2.5.tar.xz", - "hash": "sha256-KD+YA6FfE3NN5imFWPh1QGpcfA6kbp/7pWR/SAv8alg=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/kde-gtk-config-6.3.0.tar.xz", + "hash": "sha256-9SkQ8j7zamMDfkASSozxU2JygK45s/ijHtHy20iHmE8=" }, "kdecoration": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/kdecoration-6.2.5.tar.xz", - "hash": "sha256-cmxYzUs0/ElUZXhyekR8diQpOK3Vdyks0zS9YL+djyY=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/kdecoration-6.3.0.tar.xz", + "hash": "sha256-dPf0r8oQoKN5FSM8gAM82zMqf59Fr8ZNDDjGCrotXdM=" }, "kdeplasma-addons": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/kdeplasma-addons-6.2.5.tar.xz", - "hash": "sha256-V9E41RAa27gJLEJMWM63Ph0F0Mzj7Eo1RDJ0Tb0X5CY=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/kdeplasma-addons-6.3.0.tar.xz", + "hash": "sha256-WZnR7hIK9Wc+cM8X8wMM5JK8zOeZfNTJLcBB+hgQmbk=" }, "kgamma": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/kgamma-6.2.5.tar.xz", - "hash": "sha256-Pfdc3LAgrP0hbppyJATTgcik2XJivoX2cEsYnmZWEM4=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/kgamma-6.3.0.tar.xz", + "hash": "sha256-yxNocFCZ9vbwmwjT+IVgHR9HkHSaK7xM6XdXTUTxcQI=" }, "kglobalacceld": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/kglobalacceld-6.2.5.tar.xz", - "hash": "sha256-lLXMN4DKawdAk8SH7J5sNGD2Na5RRXgPh8D+hITYxsk=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/kglobalacceld-6.3.0.tar.xz", + "hash": "sha256-YSSYgpexkQhGtK8qApAraSM5g4NENBL0G5XMiL8N4LM=" }, "kinfocenter": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/kinfocenter-6.2.5.tar.xz", - "hash": "sha256-nth+2zokJWGJ+Nx5yCG49FWJqrcDLY3eeNXZTPBjn/k=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/kinfocenter-6.3.0.tar.xz", + "hash": "sha256-IPtgc2bRZjkNwYvsqPkyGBOSQwWgrf7pH3leTgXq0xE=" }, "kmenuedit": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/kmenuedit-6.2.5.tar.xz", - "hash": "sha256-CQhkX0/CSgCwI9BTfKxt7nt6utdceYC0oBxsCY3taEo=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/kmenuedit-6.3.0.tar.xz", + "hash": "sha256-9oK736Q25leu7LRh+doF1w5dbNsCNt/bcWNdMHcXRWM=" }, "kpipewire": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/kpipewire-6.2.5.tar.xz", - "hash": "sha256-20LVgfDKQnvYDuamfR+pzvARFCZsmu5/qizsvZc+Yxk=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/kpipewire-6.3.0.tar.xz", + "hash": "sha256-N38NIPvx84BzE28XtZlcg+XH+oClCJZtVp41xPGA3yo=" }, "krdp": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/krdp-6.2.5.tar.xz", - "hash": "sha256-Go0349uR6AyuniK/HFmGmFxCed4kVrp7xIHHJcNKc/w=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/krdp-6.3.0.tar.xz", + "hash": "sha256-HpdFCwXazBteJamcSRVsQaGYZvsvGW7KHR4nWlfXJFA=" }, "kscreen": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/kscreen-6.2.5.tar.xz", - "hash": "sha256-YjfEf+cDhNEObyDX8FjGqsylGkk9qSgHf87JGw72lkI=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/kscreen-6.3.0.tar.xz", + "hash": "sha256-Vtngpgfy+3mDEeFx32eykJZBf1BkLfhxCTflCvTR1/U=" }, "kscreenlocker": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/kscreenlocker-6.2.5.tar.xz", - "hash": "sha256-Oj7S0EA5TcKoDPJc3SpsQCIUaspU5yxErxbomC6Ljk4=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/kscreenlocker-6.3.0.tar.xz", + "hash": "sha256-rYa6DX3IdUql3YCXqyUojN+qRMAeMaEIE6tNDWmH9l4=" }, "ksshaskpass": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/ksshaskpass-6.2.5.tar.xz", - "hash": "sha256-heccgDfV0hmfhhrnBxifQqfK7S8DdD6oO3Vww0oR63I=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/ksshaskpass-6.3.0.tar.xz", + "hash": "sha256-EXk3lsXE9ut7BgG8AD2Ezo5CFHvwUhLCpr0g38dKNiI=" }, "ksystemstats": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/ksystemstats-6.2.5.tar.xz", - "hash": "sha256-7/9W9V5v5e1CMaR6RMjQjT1G/RDXTRhjRO9PL82VlaE=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/ksystemstats-6.3.0.tar.xz", + "hash": "sha256-ZAr5jGsHagdDan1rka4wGOHlrImea4Q/BNSABZSydzo=" }, "kwallet-pam": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/kwallet-pam-6.2.5.tar.xz", - "hash": "sha256-AWjU8jl64omuAnp9ICsP/V+NehmyM+v6ZBe4Q4Qb/UQ=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/kwallet-pam-6.3.0.tar.xz", + "hash": "sha256-Gie/yXAB5MDFEg7sGjbTcwuqbvnfRPv2jyOjTNVRxn8=" }, "kwayland": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/kwayland-6.2.5.tar.xz", - "hash": "sha256-KheozlZD/VHDz3h1QgMsEFDaOh+wDcyaMt6iiL0419I=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/kwayland-6.3.0.tar.xz", + "hash": "sha256-L21ouJ2rIQN7puzJGmNT0fWjFPe4Bou25gW/XhtrJaw=" }, "kwayland-integration": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/kwayland-integration-6.2.5.tar.xz", - "hash": "sha256-Brb7fdzxnHJ3FvR2tyJOIw9Jhsfj02Bm6RiFn9w7RBM=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/kwayland-integration-6.3.0.tar.xz", + "hash": "sha256-S8VCEZQ4TZvDfFRqKg85ZT6VdPK6FqnONqvoyctUOv0=" }, "kwin": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/kwin-6.2.5.tar.xz", - "hash": "sha256-XMRQpuQRBcjEmSm3JVCzMSN/lqr7KUaQ9HB73F93aEg=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/kwin-6.3.0.tar.xz", + "hash": "sha256-Gtl4/FKyG/3SGIQ1VKAVskaJ4MBJBNHLAOLkr8pPSvQ=" }, "kwrited": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/kwrited-6.2.5.tar.xz", - "hash": "sha256-BHlPEJF6CpQWeWIBXPuwV8mAIGH/+RsCfeAaPmk315I=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/kwrited-6.3.0.tar.xz", + "hash": "sha256-/H0YFVieKNBsbalnsYMSzlB+rMJ+9YG9rtwYNzm2Llw=" }, "layer-shell-qt": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/layer-shell-qt-6.2.5.tar.xz", - "hash": "sha256-vAmHAhjfOHw3e60v7UsqjzkSHdvcXGuyikC+DBsADHc=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/layer-shell-qt-6.3.0.tar.xz", + "hash": "sha256-oJiKEqI2ZM/jV7AHDT2Mrs6jsIiC7lIIalpONLiF1EM=" }, "libkscreen": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/libkscreen-6.2.5.tar.xz", - "hash": "sha256-Xtr2+i7tbdzvS8R59LsV00gay2Ct8BUOn5oTgmB7vLg=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/libkscreen-6.3.0.tar.xz", + "hash": "sha256-nveR7vL1xulUKKnaP7c15NIjAIHFRyliyVyDU8AaZDo=" }, "libksysguard": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/libksysguard-6.2.5.tar.xz", - "hash": "sha256-lpTz1rUHi02C645u006yDi0QntfCI0xZpkC8MvMcdqs=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/libksysguard-6.3.0.tar.xz", + "hash": "sha256-vBu7OFslwGQj9vLQRLAMEGy9tVHFz4NIvVkixj1MvLk=" }, "libplasma": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/libplasma-6.2.5.tar.xz", - "hash": "sha256-r3cPX++XhRLHBJGIlRb7dp00DwCgInCYfS0dF3U2WOw=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/libplasma-6.3.0.tar.xz", + "hash": "sha256-nCzelhWpQ5faaOQpMYJ2jh+9wvQZzbjwDosTo2bVl40=" }, "milou": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/milou-6.2.5.tar.xz", - "hash": "sha256-gzvK6v4pLoXv81PgmwYx9gOuISHo0db+BhsfYyAXrM8=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/milou-6.3.0.tar.xz", + "hash": "sha256-gbSDavVLQsHY3zJ1KgcIWtkYYjft2KQ0RV6qk9m9xpE=" }, "ocean-sound-theme": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/ocean-sound-theme-6.2.5.tar.xz", - "hash": "sha256-AX0yXsZzu4DfykQrdu9xoXLMomkRwoojDMc5KwFdxQU=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/ocean-sound-theme-6.3.0.tar.xz", + "hash": "sha256-g9nF9oc8uQ4tcepUVUh8QnN+BTUTOM7xnj+MrT68JNo=" }, "oxygen": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/oxygen-6.2.5.tar.xz", - "hash": "sha256-bXct1QnCv9A9f4AeRe/xUfNEFykAuuBbsW2LovjTt9w=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/oxygen-6.3.0.tar.xz", + "hash": "sha256-SpCO5h552/wlIFJ8ZJPvuSeWVXUMxxXx4z2FKk8JaDQ=" }, "oxygen-sounds": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/oxygen-sounds-6.2.5.tar.xz", - "hash": "sha256-7gg8Zyt2AF3940CQLPAwLKCBs1nKpWZnkzTaln6PdbQ=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/oxygen-sounds-6.3.0.tar.xz", + "hash": "sha256-vqL+XEFKN65mnzmSLMutwUB3kkcEUpfsLQEfoX7MDys=" }, "plasma-activities": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/plasma-activities-6.2.5.tar.xz", - "hash": "sha256-d+pznHzlFw2S141vN2XhmjLw4kt0H1JVVdWdx94V5sc=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/plasma-activities-6.3.0.tar.xz", + "hash": "sha256-zLHKLcHeseI13UlvQjVfAFT1gGHs+adZ2fqgopmlbHs=" }, "plasma-activities-stats": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/plasma-activities-stats-6.2.5.tar.xz", - "hash": "sha256-zduiWSRlHg9d50pvqryJkDAYV7sx9O5KwfadegxIUyw=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/plasma-activities-stats-6.3.0.tar.xz", + "hash": "sha256-tKO4AhZgGP5NTTXNDXxBG1LRy3T/0iochOSUrTA1aC4=" }, "plasma-browser-integration": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/plasma-browser-integration-6.2.5.tar.xz", - "hash": "sha256-JdqQUWafIKG/m9iYfZViGy5mQTGjw4cBo8Xi+G2bXc4=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/plasma-browser-integration-6.3.0.tar.xz", + "hash": "sha256-nF7TyOy+Co7PFpdBbL+fNBaUHp339avhebZnvYB4+20=" }, "plasma-desktop": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/plasma-desktop-6.2.5.tar.xz", - "hash": "sha256-tz0pICAxtwSUhdhOYV170KPKiQ3LLCLYEW64/m/p0Gg=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/plasma-desktop-6.3.0.tar.xz", + "hash": "sha256-u9v6h0tsBOO7M2g+oNCeMmFt6CfflqG2ZKILL1nWnQ4=" }, "plasma-dialer": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/plasma-dialer-6.2.5.tar.xz", - "hash": "sha256-DWTYOXsRAbqJgyvjbyKazthzFQpUHRECNbXQWawPYEY=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/plasma-dialer-6.3.0.tar.xz", + "hash": "sha256-yVB0e4yD15DsY+5YXu0tMw10C3ZcYUFSPQlGNicgV6o=" }, "plasma-disks": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/plasma-disks-6.2.5.tar.xz", - "hash": "sha256-m1FKt/sL3gyxhxM0zp6oEV2JjdKJDpbuBo6lpCm+f3U=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/plasma-disks-6.3.0.tar.xz", + "hash": "sha256-p2meDmgZMRlSw1FZE5xqESYS3fOVHrdC60zf+2rYbT0=" }, "plasma-firewall": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/plasma-firewall-6.2.5.tar.xz", - "hash": "sha256-8Om32kgaODrEURIQuqmYuMJjYB8YIRsGVfXJ2YFX2mk=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/plasma-firewall-6.3.0.tar.xz", + "hash": "sha256-ll172oqLjZCW6UeLCcRqfR3Mh9z//tHCe3h3kdvjx/A=" }, "plasma-integration": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/plasma-integration-6.2.5.tar.xz", - "hash": "sha256-V5XlIoXe6hCHf9VkdEc9BhBxy0JbqHzvM2aDLVB2Ryk=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/plasma-integration-6.3.0.tar.xz", + "hash": "sha256-4IL0XHGAfkpBpf7g7uPyc0couMje0EHi+US3UwaGlDM=" }, "plasma-mobile": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/plasma-mobile-6.2.5.tar.xz", - "hash": "sha256-rs65urOS/D2f3qWRPCAqEQeMQGB5SSdyJYG9iOxlGNI=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/plasma-mobile-6.3.0.tar.xz", + "hash": "sha256-tDkNwsSouZcT1FxR8kG3H/7RGLmKuJqsQND4sL07s5E=" }, "plasma-nano": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/plasma-nano-6.2.5.tar.xz", - "hash": "sha256-czQB7HQ2hPWdrSGa1+ucFW3XMLjhcmv1WA2HlInfGsk=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/plasma-nano-6.3.0.tar.xz", + "hash": "sha256-q0uhUTOq8nPsHHkfw39FzjBPKH96FwaEn8TtrhtLHQM=" }, "plasma-nm": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/plasma-nm-6.2.5.tar.xz", - "hash": "sha256-FG12k2zphViDmpp88w+pUbfubNPap8MtcczfFXpPbGg=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/plasma-nm-6.3.0.tar.xz", + "hash": "sha256-IakXwSdy9+KBzi5rewgnN55E97VHomHfRhWdVy0NxeA=" }, "plasma-pa": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/plasma-pa-6.2.5.tar.xz", - "hash": "sha256-UXkzen6sQUWpU7RhRtSJmUXZxDNzrWD3ZpL/xCzxnUc=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/plasma-pa-6.3.0.tar.xz", + "hash": "sha256-3gT7Kgwe7H+Ek1DVoXyOhP+XLYILXjTTja4LiSJhae0=" }, "plasma-sdk": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/plasma-sdk-6.2.5.tar.xz", - "hash": "sha256-dr1i5e89nnF/fEX/WGOHMrgH56UTlCxiRywCsLKuNRE=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/plasma-sdk-6.3.0.tar.xz", + "hash": "sha256-PXXSJLK3p9ZcextB1NqxIizyXFnqTpwBcK23J9fvQWg=" }, "plasma-systemmonitor": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/plasma-systemmonitor-6.2.5.tar.xz", - "hash": "sha256-lXXUVi5oIJYnruLzWAcLCRIsw+Cf7lDJBFHfUr8Asso=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/plasma-systemmonitor-6.3.0.tar.xz", + "hash": "sha256-/kZ/X+uSlaAtoQNTCYoC8wBWu5ZAFjV+LOTQwH0wXIg=" }, "plasma-thunderbolt": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/plasma-thunderbolt-6.2.5.tar.xz", - "hash": "sha256-5sOMf+hE66ay04oGzz6fLFHpiYk5ZeFoORfEbZTrJNo=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/plasma-thunderbolt-6.3.0.tar.xz", + "hash": "sha256-oMPbVanG0+QMf0t49iH2uF4R9mzPwEkTMzn7jJzh/mw=" }, "plasma-vault": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/plasma-vault-6.2.5.tar.xz", - "hash": "sha256-a35z/DnGu14sBlc++IqJSO6lcGCKjh5J2RI4mu+lC04=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/plasma-vault-6.3.0.tar.xz", + "hash": "sha256-QU/lNg6xMv8kYyLs6aVkUEES+pWkxGKz8XK5hhPcJdg=" }, "plasma-welcome": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/plasma-welcome-6.2.5.tar.xz", - "hash": "sha256-6aKuDK2C75/q50cfYlYo199wmCVeqO5x+reO1IU5Jho=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/plasma-welcome-6.3.0.tar.xz", + "hash": "sha256-x+iEF4wc0aoKwmBzvZzxJNCjvjkmwCQLeXR3gGchGYQ=" }, "plasma-workspace": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/plasma-workspace-6.2.5.tar.xz", - "hash": "sha256-uCUR5G9i4bj2C5acgoyNjTL8eShAGnDMKMKfhfRsQS8=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/plasma-workspace-6.3.0.tar.xz", + "hash": "sha256-FBZ9trlmsVZ7S4uPt77RjZUvK02UR7Uiij9aH7s4xDk=" }, "plasma-workspace-wallpapers": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/plasma-workspace-wallpapers-6.2.5.tar.xz", - "hash": "sha256-2LB6LMPTTRNDTzog6aSW7XUCgFJi47sYnrhG1XTxvIA=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/plasma-workspace-wallpapers-6.3.0.tar.xz", + "hash": "sha256-1OhrrEgzpN8jmNCBXV+SwH6+W6+X2lIGP0b/XFEPEAo=" }, "plasma5support": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/plasma5support-6.2.5.tar.xz", - "hash": "sha256-ysUkSqKWGtAg7SxDQnOJ4II0guyxeZSLX9ayIWBuiwQ=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/plasma5support-6.3.0.tar.xz", + "hash": "sha256-uVIBaVez+AM9gfxY+QvxPwL5fuzWbKTmtrCAUHTKYoM=" }, "plymouth-kcm": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/plymouth-kcm-6.2.5.tar.xz", - "hash": "sha256-rfcELy5wmFWZUMQr1hAm/kYtZs1/u9u5l7RY9plrEEg=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/plymouth-kcm-6.3.0.tar.xz", + "hash": "sha256-pGqGc06TgiXSh8HPpJnVv3jWzFsAjAxD45rdmvd3JS4=" }, "polkit-kde-agent-1": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/polkit-kde-agent-1-6.2.5.tar.xz", - "hash": "sha256-sf+z5ETGxT24Iqj7THUFw48mE6gSrhe+JDTgL1DCk/s=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/polkit-kde-agent-1-6.3.0.tar.xz", + "hash": "sha256-4H+0PlDvqaRZn/Eo7FExy75nBJ8b/yRnPOkfVbXkQes=" }, "powerdevil": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/powerdevil-6.2.5.tar.xz", - "hash": "sha256-cCUDltXvrkvn0yAb6Hjg41/Y2b+zkGYNXgOUgosfRks=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/powerdevil-6.3.0.tar.xz", + "hash": "sha256-y0y+bKuw6j0JipkQNcEc/BhNnJvQZfu6nvNPbAgsE6g=" }, "print-manager": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/print-manager-6.2.5.tar.xz", - "hash": "sha256-BWAW67df4Co/LnG/pnmAbAwNwgvcZ240NFwu0Etf6sw=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/print-manager-6.3.0.tar.xz", + "hash": "sha256-wsR6LEvcOKMuzZaFbVvZzRa/UBFleeV1tbw6T3HHmAw=" }, "qqc2-breeze-style": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/qqc2-breeze-style-6.2.5.tar.xz", - "hash": "sha256-OAy2NpbKISYmVlnGGOBWNhk/KOf2pZc0HrkVr13R0Q8=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/qqc2-breeze-style-6.3.0.tar.xz", + "hash": "sha256-6x7qYWDPcFIoeYt+zv/DVP1+k/saimSobl059T64on8=" }, "sddm-kcm": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/sddm-kcm-6.2.5.tar.xz", - "hash": "sha256-+kARFrz8aQ/SVXwWzzlGH6nW4d4NkXpPSf+S431f31Y=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/sddm-kcm-6.3.0.tar.xz", + "hash": "sha256-o44ChGGmqwQkF9GfLyTFufTEKDias3E4Rjb3C8q3dkw=" }, "spacebar": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/spacebar-6.2.5.tar.xz", - "hash": "sha256-+La9PZgNuwCvjzMHAw6gXq2m2qzT5fI+wXki5mWPV6I=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/spacebar-6.3.0.tar.xz", + "hash": "sha256-Q56khGQDJ4FyYYFITcXkHcAOhfQX7Sbf81XY/U+lW0k=" + }, + "spectacle": { + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/spectacle-6.3.0.tar.xz", + "hash": "sha256-voCrvB6AvESTcRCJWAqQWEhJlgiiSXvj1+uBy7+HYJk=" }, "systemsettings": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/systemsettings-6.2.5.tar.xz", - "hash": "sha256-tQIvKUMl29PaFqvvtSoSwBjHOjx47aAy34kXPGmr03U=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/systemsettings-6.3.0.tar.xz", + "hash": "sha256-dxubbLveFf6GDKZewJo4xuF1yRSCnlVt5WwTYmkaxoA=" }, "wacomtablet": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/wacomtablet-6.2.5.tar.xz", - "hash": "sha256-5bNvjj5W1VwphX1tp8HjzsU49wPfihAldmOIoHrPOHs=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/wacomtablet-6.3.0.tar.xz", + "hash": "sha256-wFdo6kWRe1WZojxYze8xzRIcQhOvD/xwDK8qGcvBWDU=" }, "xdg-desktop-portal-kde": { - "version": "6.2.5", - "url": "mirror://kde/stable/plasma/6.2.5/xdg-desktop-portal-kde-6.2.5.tar.xz", - "hash": "sha256-Hoa/b33EM0AK3pM0dnHsnK2I44JTbdMJMAMORRRiOvE=" + "version": "6.3.0", + "url": "mirror://kde/stable/plasma/6.3.0/xdg-desktop-portal-kde-6.3.0.tar.xz", + "hash": "sha256-swz1cWaFvqkWG3rD3LqqMRVmJzmYUNdFksBunNTdD1E=" } } \ No newline at end of file diff --git a/pkgs/kde/plasma/breeze/default.nix b/pkgs/kde/plasma/breeze/default.nix index 6768ffb94ecf..1e6652164854 100644 --- a/pkgs/kde/plasma/breeze/default.nix +++ b/pkgs/kde/plasma/breeze/default.nix @@ -1,6 +1,7 @@ { mkKdeDerivation, qtbase, + qtsvg, libsForQt5, }: mkKdeDerivation { @@ -12,6 +13,8 @@ mkKdeDerivation { "qt5" ]; + extraBuildInputs = [ qtsvg ]; + # We can't add qt5 stuff to dependencies or the hooks blow up, # so manually point everything to everything. Oof. extraCmakeFlags = [ diff --git a/pkgs/kde/plasma/default.nix b/pkgs/kde/plasma/default.nix index fb7846ed86fc..85ddce4b0807 100644 --- a/pkgs/kde/plasma/default.nix +++ b/pkgs/kde/plasma/default.nix @@ -63,6 +63,7 @@ qqc2-breeze-style = callPackage ./qqc2-breeze-style { }; sddm-kcm = callPackage ./sddm-kcm { }; spacebar = callPackage ./spacebar { }; + spectacle = callPackage ./spectacle { }; systemsettings = callPackage ./systemsettings { }; wacomtablet = callPackage ./wacomtablet { }; xdg-desktop-portal-kde = callPackage ./xdg-desktop-portal-kde { }; diff --git a/pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch b/pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch index 4ee9761fbd9d..54e5fbb1c2b4 100644 --- a/pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch +++ b/pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch @@ -1,8 +1,206 @@ +diff --git a/kcms/audio_information/kcm_audio_information.json b/kcms/audio_information/kcm_audio_information.json +index d94ef1d0..13f1c377 100644 +--- a/kcms/audio_information/kcm_audio_information.json ++++ b/kcms/audio_information/kcm_audio_information.json +@@ -80,7 +80,7 @@ + "Name[zh_CN]": "音频", + "Name[zh_TW]": "音訊" + }, +- "TryExec": "pactl", ++ "TryExec": "@pactl@", + "X-KDE-KInfoCenter-Category": "device_information", + "X-KDE-Keywords": "Pipewire,Audio,PulseAudio,pactl", + "X-KDE-Keywords[ar]": "Pipewire,Audio,PulseAudio,pactl,بايبواير,الصوت,بولس أوديو", +diff --git a/kcms/audio_information/main.cpp b/kcms/audio_information/main.cpp +index adb196fd..9d6c8675 100644 +--- a/kcms/audio_information/main.cpp ++++ b/kcms/audio_information/main.cpp +@@ -16,7 +16,7 @@ public: + explicit KCMAudioInformation(QObject *parent, const KPluginMetaData &data) + : KQuickConfigModule(parent, data) + { +- m_outputContext = new CommandOutputContext(QStringLiteral("pactl"), {"list"}, parent); ++ m_outputContext = new CommandOutputContext(QStringLiteral("@pactl@"), {"list"}, parent); + } + CommandOutputContext *outputContext() const + { +diff --git a/kcms/block_devices/kcm_block_devices.json b/kcms/block_devices/kcm_block_devices.json +index a73e33ad..3a1ab4da 100644 +--- a/kcms/block_devices/kcm_block_devices.json ++++ b/kcms/block_devices/kcm_block_devices.json +@@ -80,7 +80,7 @@ + "Name[zh_CN]": "块设备", + "Name[zh_TW]": "區塊裝置" + }, +- "TryExec": "lsblk", ++ "TryExec": "@lsblk@", + "X-KDE-KInfoCenter-Category": "device_information", + "X-KDE-Keywords": "lsblk,block device,partition,disk,drive,hdd,ssd,nvme", + "X-KDE-Keywords[ar]": "lsblk,block device,partition,disk,drive,hdd,ssd,nvme,قرص,قسم,قطاع جهاز", +diff --git a/kcms/block_devices/main.cpp b/kcms/block_devices/main.cpp +index 2de923f3..6b14f7fb 100644 +--- a/kcms/block_devices/main.cpp ++++ b/kcms/block_devices/main.cpp +@@ -20,7 +20,7 @@ public: + { + // NOTE: careful when using -o, it tends to incorrectly print multiple mountpoints as a single path + // (e.g. when different btrfs subvolumes are mounted at various points in the system it ought to enumerate all mountpoints) +- m_outputContext = new CommandOutputContext(u"lsblk"_s, {}, parent); ++ m_outputContext = new CommandOutputContext(u"@lsblk@"_s, {}, parent); + } + CommandOutputContext *outputContext() const + { +diff --git a/kcms/cpu/kcm_cpu.json b/kcms/cpu/kcm_cpu.json +index a783b5bc..5866c4d2 100644 +--- a/kcms/cpu/kcm_cpu.json ++++ b/kcms/cpu/kcm_cpu.json +@@ -102,7 +102,7 @@ + "Name[zh_CN]": "CPU", + "Name[zh_TW]": "CPU" + }, +- "TryExec": "lscpu", ++ "TryExec": "@lscpu@", + "X-KDE-KInfoCenter-Category": "device_information", + "X-KDE-Keywords": "cpu,amd,intel,arm,instructions,cores,architecture,byte order", + "X-KDE-Keywords[ar]": "cpu,amd,intel,arm,instructions,cores,architecture,byte order,تعليمات,أنوية,معمارية", +diff --git a/kcms/cpu/main.cpp b/kcms/cpu/main.cpp +index 608381eb..8fd7914f 100644 +--- a/kcms/cpu/main.cpp ++++ b/kcms/cpu/main.cpp +@@ -16,7 +16,7 @@ public: + explicit KCMCPU(QObject *parent, const KPluginMetaData &data) + : KQuickConfigModule(parent, data) + { +- m_outputContext = new CommandOutputContext(QStringLiteral("lscpu"), {}, parent); ++ m_outputContext = new CommandOutputContext(QStringLiteral("@lscpu@"), {}, parent); + } + CommandOutputContext *outputContext() const + { +diff --git a/kcms/edid/edid.sh b/kcms/edid/edid.sh +index da803598..4e24eaaf 100755 +--- a/kcms/edid/edid.sh ++++ b/kcms/edid/edid.sh +@@ -13,7 +13,7 @@ for card in /sys/class/drm/card*; do + # Try to read any data. If it fails continue. This prevents errors from di-edid-decode. + IFS= read -r data < "$edid" || continue + +- data=$(di-edid-decode "$edid" 2>&1) || true ++ data=$(@di_edid_decode@ "$edid" 2>&1) || true + printf "# %s #######################\n" "$(basename "$card")" + printf "%s\n\n" "$data" + done +diff --git a/kcms/edid/kcm_edid.json b/kcms/edid/kcm_edid.json +index 68e4e670..19dfdc59 100644 +--- a/kcms/edid/kcm_edid.json ++++ b/kcms/edid/kcm_edid.json +@@ -64,7 +64,7 @@ + "Name[x-test]": "xxEDIDxx", + "Name[zh_CN]": "EDID" + }, +- "TryExec": "di-edid-decode", ++ "TryExec": "@di_edid_decode@", + "X-KDE-KInfoCenter-Category": "graphical_information", + "X-KDE-Keywords": "EDID,Graphics", + "X-KDE-Keywords[ar]": "EDID,Graphics,الرسوميات,بيانات تعريف العرض الممتدة", +diff --git a/kcms/edid/main.cpp b/kcms/edid/main.cpp +index 9f04e7fd..8ef37d2c 100644 +--- a/kcms/edid/main.cpp ++++ b/kcms/edid/main.cpp +@@ -20,7 +20,7 @@ public: + { + const QString executable = + QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("kinfocenter/edid/edid.sh"), QStandardPaths::LocateFile); +- m_outputContext = new CommandOutputContext({QStringLiteral("di-edid-decode")}, QStringLiteral("/bin/sh"), {executable}, parent); ++ m_outputContext = new CommandOutputContext({QStringLiteral("@di_edid_decode@")}, QStringLiteral("/bin/sh"), {executable}, parent); + } + [[nodiscard]] CommandOutputContext *outputContext() const + { +diff --git a/kcms/egl/kcm_egl.json b/kcms/egl/kcm_egl.json +index 1cc89eb2..f1aed6c3 100644 +--- a/kcms/egl/kcm_egl.json ++++ b/kcms/egl/kcm_egl.json +@@ -102,7 +102,7 @@ + "Name[zh_CN]": "OpenGL (EGL)", + "Name[zh_TW]": "OpenGL (EGL)" + }, +- "TryExec": "eglinfo", ++ "TryExec": "@eglinfo@", + "X-KDE-KInfoCenter-Category": "graphical_information", + "X-KDE-Keywords": "OpenGL,DRI,3D,VideoCard,Hardware Acceleration,Graphics,EGL", + "X-KDE-Keywords[ar]": "OpenGL,DRI,3D,VideoCard,Hardware Acceleration,Graphics,EGL,بطاقة الرسوميات,تسريع العتاد,رسوميات", +diff --git a/kcms/egl/main.cpp b/kcms/egl/main.cpp +index 1a509dac..886a62d8 100644 +--- a/kcms/egl/main.cpp ++++ b/kcms/egl/main.cpp +@@ -16,7 +16,7 @@ public: + explicit KCMXServer(QObject *parent, const KPluginMetaData &data) + : KQuickConfigModule(parent, data) + { +- m_outputContext = new CommandOutputContext(QStringLiteral("eglinfo"), {}, parent); ++ m_outputContext = new CommandOutputContext(QStringLiteral("@eglinfo@"), {}, parent); + } + CommandOutputContext *outputContext() const + { +diff --git a/kcms/firmware_security/main.cpp b/kcms/firmware_security/main.cpp +index eab20e0f..5a0d2499 100644 +--- a/kcms/firmware_security/main.cpp ++++ b/kcms/firmware_security/main.cpp +@@ -20,7 +20,7 @@ public: + const QString executable = QStandardPaths::locate(QStandardPaths::GenericDataLocation, + QStringLiteral("kinfocenter/firmware_security/fwupdmgr.sh"), + QStandardPaths::LocateFile); +- m_outputContext = new CommandOutputContext({QStringLiteral("fwupdmgr"), QStringLiteral("aha")}, ++ m_outputContext = new CommandOutputContext({QStringLiteral("fwupdmgr"), QStringLiteral("@aha@")}, + QStringLiteral("/bin/sh"), + {executable}, + Qt::TextFormat::RichText, +diff --git a/kcms/glx/kcm_glx.json b/kcms/glx/kcm_glx.json +index 640ef4a5..791e8ce9 100644 +--- a/kcms/glx/kcm_glx.json ++++ b/kcms/glx/kcm_glx.json +@@ -101,7 +101,7 @@ + "Name[zh_CN]": "OpenGL (GLX)", + "Name[zh_TW]": "OpenGL (GLX)" + }, +- "TryExec": "glxinfo", ++ "TryExec": "@glxinfo@", + "X-KDE-KInfoCenter-Category": "graphical_information", + "X-KDE-Keywords": "OpenGL,DRI,GLX,3D,VideoCard,Hardware Acceleration,Graphics,X,X11,Xserver,X-Server,XFree86,Display", + "X-KDE-Keywords[ar]": "OpenGL,DRI,GLX,3D,VideoCard,Hardware Acceleration,Graphics,X,X11,Xserver,X-Server,XFree86,Display,بطاقة الرسوميات,تسريع العتاد,الرسوميات", +diff --git a/kcms/glx/main.cpp b/kcms/glx/main.cpp +index a7317411..a6c5621d 100644 +--- a/kcms/glx/main.cpp ++++ b/kcms/glx/main.cpp +@@ -16,7 +16,7 @@ public: + explicit KCMXServer(QObject *parent, const KPluginMetaData &data) + : KQuickConfigModule(parent, data) + { +- m_outputContext = new CommandOutputContext(QStringLiteral("glxinfo"), {}, parent); ++ m_outputContext = new CommandOutputContext(QStringLiteral("@glxinfo@"), {}, parent); + } + CommandOutputContext *outputContext() const + { +diff --git a/kcms/helpers/dmidecode-helper/helper.cpp b/kcms/helpers/dmidecode-helper/helper.cpp +index 11921934..1160c5f0 100644 +--- a/kcms/helpers/dmidecode-helper/helper.cpp ++++ b/kcms/helpers/dmidecode-helper/helper.cpp +@@ -20,10 +20,7 @@ auto make_array(Input &&...args) -> std::array // NB: w + DMIDecodeHelper::DMIDecodeHelper(QObject *parent) + : QObject(parent) + { +- // PATH is super minimal when invoked through dbus +- setenv("PATH", "/usr/sbin:/sbin:/usr/local/sbin", 1); +- +- m_dmidecodePath = QStandardPaths::findExecutable("dmidecode"); ++ m_dmidecodePath = QStringLiteral("@dmidecode@"); + } + + KAuth::ActionReply DMIDecodeHelper::memoryinformation(const QVariantMap &args) diff --git a/kcms/kwinsupportinfo/kcm_kwinsupportinfo.json.in b/kcms/kwinsupportinfo/kcm_kwinsupportinfo.json.in -index 0de6973e..30035768 100644 +index 24dc11a7..bc72f2af 100644 --- a/kcms/kwinsupportinfo/kcm_kwinsupportinfo.json.in +++ b/kcms/kwinsupportinfo/kcm_kwinsupportinfo.json.in -@@ -85,6 +85,6 @@ +@@ -93,6 +93,6 @@ "Name[zh_CN]": "窗口管理器", "Name[zh_TW]": "視窗管理員" }, @@ -11,7 +209,7 @@ index 0de6973e..30035768 100644 "X-KDE-KInfoCenter-Category": "graphical_information" } diff --git a/kcms/kwinsupportinfo/main.cpp b/kcms/kwinsupportinfo/main.cpp -index 6ae168b5..89d0a2ff 100644 +index ddb55b5c..8dc6b668 100644 --- a/kcms/kwinsupportinfo/main.cpp +++ b/kcms/kwinsupportinfo/main.cpp @@ -18,7 +18,7 @@ public: @@ -23,116 +221,37 @@ index 6ae168b5..89d0a2ff 100644 {QStringLiteral("org.kde.KWin"), QStringLiteral("/KWin"), QStringLiteral("supportInformation")}, parent); } -diff --git a/kcms/about-distro/src/dmidecode-helper/helper.cpp b/kcms/about-distro/src/dmidecode-helper/helper.cpp -index 396b2d74..615e1057 100644 ---- a/kcms/about-distro/src/dmidecode-helper/helper.cpp -+++ b/kcms/about-distro/src/dmidecode-helper/helper.cpp -@@ -20,13 +20,6 @@ KAuth::ActionReply DMIDecodeHelper::systeminformation(const QVariantMap &args) - { - Q_UNUSED(args); - -- // PATH is super minimal when invoked through dbus -- setenv("PATH", "/usr/sbin:/sbin:/usr/local/sbin", 1); -- const QString dmidecode = QStandardPaths::findExecutable("dmidecode"); -- if (dmidecode.isEmpty()) { -- return KAuth::ActionReply::HelperErrorReply(); -- } -- - // NB: Microsoft also outlines a limited set of DMI values to be required for IOT OEM licensing, as such we - // can rely on the same fields to have sound content . Since this only applies to OEMs we still need to filter - // out dummy values though and because of that we can grab more fields, since we'll filter them anyway. -@@ -38,7 +31,7 @@ KAuth::ActionReply DMIDecodeHelper::systeminformation(const QVariantMap &args) - QStringLiteral("system-version"), - QStringLiteral("system-serial-number")}) { - QProcess proc; -- proc.start(dmidecode, {QStringLiteral("--string"), key}); -+ proc.start("@dmidecode@", {QStringLiteral("--string"), key}); - proc.waitForFinished(); - const QByteArray output = proc.readAllStandardOutput().trimmed(); - -diff --git a/kcms/audio_information/main.cpp b/kcms/audio_information/main.cpp -index adb196fd..9d6c8675 100644 ---- a/kcms/audio_information/main.cpp -+++ b/kcms/audio_information/main.cpp -@@ -16,7 +16,7 @@ class KCMAudioInformation : public KQuickConfigModule - explicit KCMAudioInformation(QObject *parent, const KPluginMetaData &data) - : KQuickConfigModule(parent, data) - { -- m_outputContext = new CommandOutputContext(QStringLiteral("pactl"), {"list"}, parent); -+ m_outputContext = new CommandOutputContext(QStringLiteral("@pactl@"), {"list"}, parent); - } - CommandOutputContext *outputContext() const - { -diff --git a/kcms/block_devices/main.cpp b/kcms/block_devices/main.cpp -index 2de923f3..6b14f7fb 100644 ---- a/kcms/block_devices/main.cpp -+++ b/kcms/block_devices/main.cpp -@@ -20,7 +20,7 @@ class KCMBlockDevices : public KQuickConfigModule - { - // NOTE: careful when using -o, it tends to incorrectly print multiple mountpoints as a single path - // (e.g. when different btrfs subvolumes are mounted at various points in the system it ought to enumerate all mountpoints) -- m_outputContext = new CommandOutputContext(u"lsblk"_s, {}, parent); -+ m_outputContext = new CommandOutputContext(u"@lsblk@"_s, {}, parent); - } - CommandOutputContext *outputContext() const - { -diff --git a/kcms/cpu/main.cpp b/kcms/cpu/main.cpp -index 608381eb..8fd7914f 100644 ---- a/kcms/cpu/main.cpp -+++ b/kcms/cpu/main.cpp -@@ -16,7 +16,7 @@ class KCMCPU : public KQuickConfigModule - explicit KCMCPU(QObject *parent, const KPluginMetaData &data) - : KQuickConfigModule(parent, data) - { -- m_outputContext = new CommandOutputContext(QStringLiteral("lscpu"), {}, parent); -+ m_outputContext = new CommandOutputContext(QStringLiteral("@lscpu@"), {}, parent); - } - CommandOutputContext *outputContext() const - { -diff --git a/kcms/egl/main.cpp b/kcms/egl/main.cpp -index 1a509dac..886a62d8 100644 ---- a/kcms/egl/main.cpp -+++ b/kcms/egl/main.cpp -@@ -16,7 +16,7 @@ class KCMXServer : public KQuickConfigModule - explicit KCMXServer(QObject *parent, const KPluginMetaData &data) - : KQuickConfigModule(parent, data) - { -- m_outputContext = new CommandOutputContext(QStringLiteral("eglinfo"), {}, parent); -+ m_outputContext = new CommandOutputContext(QStringLiteral("@eglinfo@"), {}, parent); - } - CommandOutputContext *outputContext() const - { -diff --git a/kcms/firmware_security/main.cpp b/kcms/firmware_security/main.cpp -index 58e25458..890772c8 100644 ---- a/kcms/firmware_security/main.cpp -+++ b/kcms/firmware_security/main.cpp -@@ -20,7 +20,7 @@ class KCMFirmwareSecurity : public KQuickConfigModule - const QString executable = QStandardPaths::locate(QStandardPaths::GenericDataLocation, - QStringLiteral("kinfocenter/firmware_security/fwupdmgr.sh"), - QStandardPaths::LocateFile); -- m_outputContext = new CommandOutputContext({QStringLiteral("fwupdmgr"), QStringLiteral("aha")}, QStringLiteral("/bin/sh"), {executable}, parent); -+ m_outputContext = new CommandOutputContext({QStringLiteral("fwupdmgr"), QStringLiteral("@aha@")}, QStringLiteral("/bin/sh"), {executable}, parent); - } - CommandOutputContext *outputContext() const - { -diff --git a/kcms/glx/main.cpp b/kcms/glx/main.cpp -index a7317411..a6c5621d 100644 ---- a/kcms/glx/main.cpp -+++ b/kcms/glx/main.cpp -@@ -16,7 +16,7 @@ class KCMXServer : public KQuickConfigModule - explicit KCMXServer(QObject *parent, const KPluginMetaData &data) - : KQuickConfigModule(parent, data) - { -- m_outputContext = new CommandOutputContext(QStringLiteral("glxinfo"), {}, parent); -+ m_outputContext = new CommandOutputContext(QStringLiteral("@glxinfo@"), {}, parent); - } - CommandOutputContext *outputContext() const - { +diff --git a/kcms/memory/kcm_memory.json b/kcms/memory/kcm_memory.json +index 54f729ec..8e7aeb57 100644 +--- a/kcms/memory/kcm_memory.json ++++ b/kcms/memory/kcm_memory.json +@@ -132,7 +132,7 @@ + "Name[zh_CN]": "内存", + "Name[zh_TW]": "記憶體" + }, +- "TryExec": "pkexec dmidecode", ++ "TryExec": "@dmidecode@", + "X-KDE-KInfoCenter-Category": "device_information", + "X-KDE-Keywords": "Memory,RAM,dmidecode", + "X-KDE-Keywords[ar]": "Memory,RAM,dmidecode,رام,ذاكرة,ذاكرة حية", +diff --git a/kcms/network/kcm_network.json b/kcms/network/kcm_network.json +index 65e929e2..20bc2289 100644 +--- a/kcms/network/kcm_network.json ++++ b/kcms/network/kcm_network.json +@@ -147,7 +147,7 @@ + "Name[zh_CN]": "网络接口", + "Name[zh_TW]": "網路介面" + }, +- "TryExec": "ip", ++ "TryExec": "@ip@", + "X-KDE-KInfoCenter-Category": "network_information", + "X-KDE-Keywords": "network,nic,ip,ip address,mac,inet,eth,wlan,wifi", + "X-KDE-Keywords[ar]": "network,nic,ip,ip address,mac,inet,eth,wlan,wifi,الشبكة,شبكة الاتصال,عنوان IP,عنوان IP,جهاز Mac,شبكة الإنترنت,شبكة ETH,شبكة WLAN,شبكة Wi-Fi", diff --git a/kcms/network/main.cpp b/kcms/network/main.cpp index f02577a3..479e18df 100644 --- a/kcms/network/main.cpp +++ b/kcms/network/main.cpp -@@ -18,7 +18,7 @@ class KCMNetwork : public KQuickConfigModule +@@ -18,7 +18,7 @@ public: explicit KCMNetwork(QObject *parent, const KPluginMetaData &data) : KQuickConfigModule(parent, data) { @@ -141,11 +260,24 @@ index f02577a3..479e18df 100644 } CommandOutputContext *outputContext() const { +diff --git a/kcms/opencl/kcm_opencl.json b/kcms/opencl/kcm_opencl.json +index 774dd42e..40e2076a 100644 +--- a/kcms/opencl/kcm_opencl.json ++++ b/kcms/opencl/kcm_opencl.json +@@ -90,7 +90,7 @@ + "Name[zh_CN]": "OpenCL", + "Name[zh_TW]": "OpenCL" + }, +- "TryExec": "clinfo", ++ "TryExec": "@clinfo@", + "X-KDE-KInfoCenter-Category": "graphical_information", + "X-KDE-Keywords": "OpenCL,VideoCard,Hardware Acceleration,Graphics", + "X-KDE-Keywords[ar]": "OpenCL,VideoCard,Hardware Acceleration,Graphics,بطاقة الفيديو,تسريع العتاد,الرسوميات", diff --git a/kcms/opencl/main.cpp b/kcms/opencl/main.cpp index d58728ab..88733d46 100644 --- a/kcms/opencl/main.cpp +++ b/kcms/opencl/main.cpp -@@ -18,7 +18,7 @@ class KCMOpenCL : public KQuickConfigModule +@@ -18,7 +18,7 @@ public: explicit KCMOpenCL(QObject *parent, const KPluginMetaData &data) : KQuickConfigModule(parent, data) { @@ -154,45 +286,6 @@ index d58728ab..88733d46 100644 } CommandOutputContext *outputContext() const { -diff --git a/kcms/vulkan/main.cpp b/kcms/vulkan/main.cpp -index 5665d9d2..008f1bf0 100644 ---- a/kcms/vulkan/main.cpp -+++ b/kcms/vulkan/main.cpp -@@ -16,7 +16,7 @@ class KCMVulkan : public KQuickConfigModule - explicit KCMVulkan(QObject *parent, const KPluginMetaData &data) - : KQuickConfigModule(parent, data) - { -- m_outputContext = new CommandOutputContext(QStringLiteral("vulkaninfo"), {}, parent); -+ m_outputContext = new CommandOutputContext(QStringLiteral("@vulkaninfo@"), {}, parent); - } - CommandOutputContext *outputContext() const - { -diff --git a/kcms/wayland/main.cpp b/kcms/wayland/main.cpp -index 3a4825c7..2c6a6c43 100644 ---- a/kcms/wayland/main.cpp -+++ b/kcms/wayland/main.cpp -@@ -16,7 +16,7 @@ class KCMWayland : public KQuickConfigModule - explicit KCMWayland(QObject *parent, const KPluginMetaData &data) - : KQuickConfigModule(parent, data) - { -- m_outputContext = new CommandOutputContext(QStringLiteral("wayland-info"), {}, parent); -+ m_outputContext = new CommandOutputContext(QStringLiteral("@waylandinfo@"), {}, parent); - } - CommandOutputContext *outputContext() const - { -diff --git a/kcms/xserver/main.cpp b/kcms/xserver/main.cpp -index df9af24a..e5983e22 100644 ---- a/kcms/xserver/main.cpp -+++ b/kcms/xserver/main.cpp -@@ -16,7 +16,7 @@ class KCMXServer : public KQuickConfigModule - explicit KCMXServer(QObject *parent, const KPluginMetaData &data) - : KQuickConfigModule(parent, data) - { -- m_outputContext = new CommandOutputContext(QStringLiteral("xdpyinfo"), {}, parent); -+ m_outputContext = new CommandOutputContext(QStringLiteral("@xdpyinfo@"), {}, parent); - } - CommandOutputContext *outputContext() const - { diff --git a/kcms/pci/CMakeLists.txt b/kcms/pci/CMakeLists.txt index 36d82ef8..16ce2703 100644 --- a/kcms/pci/CMakeLists.txt @@ -200,8 +293,87 @@ index 36d82ef8..16ce2703 100644 @@ -19,7 +19,7 @@ else() find_package(lspci) set_package_properties(lspci PROPERTIES TYPE RUNTIME) - + - set(PCI_BACKEND lspci) + set(PCI_BACKEND @lspci@) set(PCI_BACKEND_ARGUMENTS "-v") endif() + +diff --git a/kcms/vulkan/kcm_vulkan.json b/kcms/vulkan/kcm_vulkan.json +index 78b42cfd..1ec93c91 100644 +--- a/kcms/vulkan/kcm_vulkan.json ++++ b/kcms/vulkan/kcm_vulkan.json +@@ -100,7 +100,7 @@ + "Name[zh_CN]": "Vulkan", + "Name[zh_TW]": "Vulkan" + }, +- "TryExec": "vulkaninfo", ++ "TryExec": "@vulkaninfo@", + "X-KDE-KInfoCenter-Category": "graphical_information", + "X-KDE-Keywords": "Vulkan,VideoCard,Hardware Acceleration,Graphics", + "X-KDE-Keywords[ar]": "Vulkan,VideoCard,Hardware Acceleration,Graphics,فولكان,بطاقة الفيديو,تسريع الأجهزة,الرسومات", +diff --git a/kcms/vulkan/main.cpp b/kcms/vulkan/main.cpp +index 5665d9d2..008f1bf0 100644 +--- a/kcms/vulkan/main.cpp ++++ b/kcms/vulkan/main.cpp +@@ -16,7 +16,7 @@ public: + explicit KCMVulkan(QObject *parent, const KPluginMetaData &data) + : KQuickConfigModule(parent, data) + { +- m_outputContext = new CommandOutputContext(QStringLiteral("vulkaninfo"), {}, parent); ++ m_outputContext = new CommandOutputContext(QStringLiteral("@vulkaninfo@"), {}, parent); + } + CommandOutputContext *outputContext() const + { +diff --git a/kcms/wayland/kcm_wayland.json b/kcms/wayland/kcm_wayland.json +index 9ae953bb..27d98104 100644 +--- a/kcms/wayland/kcm_wayland.json ++++ b/kcms/wayland/kcm_wayland.json +@@ -107,7 +107,7 @@ + "Name[zh_CN]": "Wayland", + "Name[zh_TW]": "Wayland" + }, +- "TryExec": "wayland-info", ++ "TryExec": "@waylandinfo@", + "X-KDE-KInfoCenter-Category": "graphical_information", + "X-KDE-Keywords": "Wayland,Compositor,Display,System Information", + "X-KDE-Keywords[ar]": "ويلاند,مراكب,عرض,معلومات النّظام", +diff --git a/kcms/wayland/main.cpp b/kcms/wayland/main.cpp +index 3a4825c7..4633927b 100644 +--- a/kcms/wayland/main.cpp ++++ b/kcms/wayland/main.cpp +@@ -16,7 +16,7 @@ public: + explicit KCMWayland(QObject *parent, const KPluginMetaData &data) + : KQuickConfigModule(parent, data) + { +- m_outputContext = new CommandOutputContext(QStringLiteral("wayland-info"), {}, parent); ++ m_outputContext = new CommandOutputContext(QStringLiteral("@waylandinfo@"), {}, parent); + } + CommandOutputContext *outputContext() const + { +diff --git a/kcms/xserver/kcm_xserver.json b/kcms/xserver/kcm_xserver.json +index f5642e25..11f108a7 100644 +--- a/kcms/xserver/kcm_xserver.json ++++ b/kcms/xserver/kcm_xserver.json +@@ -147,7 +147,7 @@ + "Name[zh_CN]": "X 服务器", + "Name[zh_TW]": "X 伺服器" + }, +- "TryExec": "xdpyinfo", ++ "TryExec": "@xdpyinfo@", + "X-DocPath": "kinfocenter/graphical.html#xserver", + "X-KDE-KInfoCenter-Category": "graphical_information", + "X-KDE-Keywords": "X,X-Server,XServer,XFree86,Display,VideoCard,System Information", +diff --git a/kcms/xserver/main.cpp b/kcms/xserver/main.cpp +index df9af24a..e5983e22 100644 +--- a/kcms/xserver/main.cpp ++++ b/kcms/xserver/main.cpp +@@ -16,7 +16,7 @@ public: + explicit KCMXServer(QObject *parent, const KPluginMetaData &data) + : KQuickConfigModule(parent, data) + { +- m_outputContext = new CommandOutputContext(QStringLiteral("xdpyinfo"), {}, parent); ++ m_outputContext = new CommandOutputContext(QStringLiteral("@xdpyinfo@"), {}, parent); + } + CommandOutputContext *outputContext() const + { diff --git a/pkgs/kde/plasma/kinfocenter/default.nix b/pkgs/kde/plasma/kinfocenter/default.nix index 8911e77cf452..ed3a1b466cda 100644 --- a/pkgs/kde/plasma/kinfocenter/default.nix +++ b/pkgs/kde/plasma/kinfocenter/default.nix @@ -4,9 +4,11 @@ dmidecode, iproute2, lib, + libdisplay-info, libusb1, mesa-demos, mkKdeDerivation, + pkg-config, pciutils, pulseaudio, qttools, @@ -21,6 +23,7 @@ let tools = { aha = lib.getExe aha; clinfo = lib.getExe clinfo; + di_edid_decode = lib.getExe libdisplay-info; dmidecode = lib.getExe' dmidecode "dmidecode"; eglinfo = lib.getExe' mesa-demos "eglinfo"; glxinfo = lib.getExe' mesa-demos "glxinfo"; @@ -53,6 +56,7 @@ mkKdeDerivation { --replace-fail " aha " " ${lib.getExe aha} " ''; + extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ libusb1 ]; # fix wrong symlink of infocenter pointing to a 'systemsettings5' binary in diff --git a/pkgs/kde/plasma/plasma-desktop/default.nix b/pkgs/kde/plasma/plasma-desktop/default.nix index 53c270cb5905..7933541b4501 100644 --- a/pkgs/kde/plasma/plasma-desktop/default.nix +++ b/pkgs/kde/plasma/plasma-desktop/default.nix @@ -16,6 +16,7 @@ xkeyboard_config, xorg, libcanberra, + libwacom, libxkbfile, ibus, }: @@ -53,6 +54,7 @@ mkKdeDerivation { SDL2 libcanberra + libwacom libxkbfile xkeyboard_config diff --git a/pkgs/kde/plasma/plasma-workspace/default.nix b/pkgs/kde/plasma/plasma-workspace/default.nix index 6225f7c3b77c..2dcff1183cc2 100644 --- a/pkgs/kde/plasma/plasma-workspace/default.nix +++ b/pkgs/kde/plasma/plasma-workspace/default.nix @@ -30,7 +30,6 @@ mkKdeDerivation { qdbus = lib.getExe' qttools "qdbus"; xmessage = lib.getExe xorg.xmessage; xrdb = lib.getExe xorg.xrdb; - xsetroot = lib.getExe xorg.xsetroot; }) ]; @@ -65,7 +64,7 @@ mkKdeDerivation { # Hardcoded as QStrings, which are UTF-16 so Nix can't pick these up automatically postFixup = '' mkdir -p $out/nix-support - echo "${lsof} ${xorg.xmessage} ${xorg.xrdb} ${xorg.xsetroot}" > $out/nix-support/depends + echo "${lsof} ${xorg.xmessage} ${xorg.xrdb}" > $out/nix-support/depends ''; passthru.providedSessions = [ diff --git a/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch b/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch index 561655dde280..b4d46cd869bb 100644 --- a/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch +++ b/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch @@ -1,5 +1,5 @@ diff --git a/applets/devicenotifier/plugin/deviceerrormonitor_p.cpp b/applets/devicenotifier/plugin/deviceerrormonitor_p.cpp -index 8c2bc13a74..7b3cd72363 100644 +index ba214a555d..421d940738 100644 --- a/applets/devicenotifier/plugin/deviceerrormonitor_p.cpp +++ b/applets/devicenotifier/plugin/deviceerrormonitor_p.cpp @@ -155,7 +155,7 @@ void DeviceErrorMonitor::queryBlockingApps(const QString &devicePath) @@ -25,7 +25,7 @@ index e27e21a7bd..abbf7f32e1 100644 p.write(input); p.closeWriteChannel(); diff --git a/kcms/fonts/fonts.cpp b/kcms/fonts/fonts.cpp -index a75f313880..a1e649c1f6 100644 +index 96417c440a..8c9bc2e9ab 100644 --- a/kcms/fonts/fonts.cpp +++ b/kcms/fonts/fonts.cpp @@ -137,7 +137,7 @@ void KFonts::save() @@ -38,7 +38,7 @@ index a75f313880..a1e649c1f6 100644 proc.write("Xft.dpi\n"); proc.closeWriteChannel(); diff --git a/kcms/kfontinst/kcmfontinst/FcQuery.cpp b/kcms/kfontinst/kcmfontinst/FcQuery.cpp -index f5034455c9..8ea57813a1 100644 +index e4d1ad4311..d45bdfad98 100644 --- a/kcms/kfontinst/kcmfontinst/FcQuery.cpp +++ b/kcms/kfontinst/kcmfontinst/FcQuery.cpp @@ -46,7 +46,7 @@ void CFcQuery::run(const QString &query) @@ -51,10 +51,10 @@ index f5034455c9..8ea57813a1 100644 void CFcQuery::procExited() diff --git a/kcms/krdb/krdb.cpp b/kcms/krdb/krdb.cpp -index 39bcb7317d..b0363afde9 100644 +index f3c9956921..09c818739d 100644 --- a/kcms/krdb/krdb.cpp +++ b/kcms/krdb/krdb.cpp -@@ -423,7 +423,7 @@ void runRdb(unsigned int flags) +@@ -425,7 +425,7 @@ void runRdb(unsigned int flags) contents += "Xft.dpi: "_L1 + QString::number(dpi) + u'\n'; else { KProcess queryProc; @@ -63,7 +63,7 @@ index 39bcb7317d..b0363afde9 100644 queryProc.setOutputChannelMode(KProcess::OnlyStdoutChannel); queryProc.start(); if (queryProc.waitForFinished()) { -@@ -443,7 +443,7 @@ void runRdb(unsigned int flags) +@@ -445,7 +445,7 @@ void runRdb(unsigned int flags) } KProcess loadProc; @@ -72,7 +72,7 @@ index 39bcb7317d..b0363afde9 100644 loadProc.start(); if (loadProc.waitForStarted()) { loadProc.write(db); -@@ -461,14 +461,14 @@ void runRdb(unsigned int flags) +@@ -463,9 +463,9 @@ void runRdb(unsigned int flags) KProcess proc; #ifndef NDEBUG @@ -84,12 +84,6 @@ index 39bcb7317d..b0363afde9 100644 #endif proc.execute(); - // Needed for applications that don't set their own cursor. -- QProcess::execute(QStringLiteral("xsetroot"), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")}); -+ QProcess::execute(QStringLiteral("@xsetroot@"), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")}); - - applyGtkStyles(1); - applyGtkStyles(2); diff --git a/ksmserver/plasma-restoresession.service.in b/ksmserver/plasma-restoresession.service.in index 2c52a4b87d..fd7fdc8ac1 100644 --- a/ksmserver/plasma-restoresession.service.in @@ -135,7 +129,7 @@ index 4d31c6f408..17418b1ff7 100644 } return p; diff --git a/startkde/systemd/plasma-ksplash-ready.service.in b/startkde/systemd/plasma-ksplash-ready.service.in -index 1e903130a9..1d807a8526 100644 +index 1e903130a9..0861c3d136 100644 --- a/startkde/systemd/plasma-ksplash-ready.service.in +++ b/startkde/systemd/plasma-ksplash-ready.service.in @@ -6,5 +6,5 @@ PartOf=graphical-session.target diff --git a/pkgs/kde/plasma/plasma5support/default.nix b/pkgs/kde/plasma/plasma5support/default.nix index f1c0632fdcf3..b5226ca56c4a 100644 --- a/pkgs/kde/plasma/plasma5support/default.nix +++ b/pkgs/kde/plasma/plasma5support/default.nix @@ -1,4 +1,21 @@ -{ mkKdeDerivation }: +{ + mkKdeDerivation, + pkg-config, + kidletime, + networkmanager-qt, + plasma-activities, + gpsd, +}: mkKdeDerivation { pname = "plasma5support"; + + extraNativeBuildInputs = [ pkg-config ]; + + extraBuildInputs = [ + kidletime + networkmanager-qt + plasma-activities + + gpsd + ]; } diff --git a/pkgs/kde/gear/spectacle/default.nix b/pkgs/kde/plasma/spectacle/default.nix similarity index 100% rename from pkgs/kde/gear/spectacle/default.nix rename to pkgs/kde/plasma/spectacle/default.nix From 15ff4bbe97c673dfacfb568969d8a5a8d7010c25 Mon Sep 17 00:00:00 2001 From: kpine Date: Tue, 11 Feb 2025 04:35:29 -0800 Subject: [PATCH 1180/2168] python3Packages.gphoto2: fix build (#380469) --- pkgs/development/python-modules/gphoto2/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/development/python-modules/gphoto2/default.nix b/pkgs/development/python-modules/gphoto2/default.nix index 5cf5e39b45bb..67da4bd44503 100644 --- a/pkgs/development/python-modules/gphoto2/default.nix +++ b/pkgs/development/python-modules/gphoto2/default.nix @@ -1,7 +1,6 @@ { lib, fetchPypi, - fetchpatch, buildPythonPackage, pkg-config, libgphoto2, @@ -19,13 +18,6 @@ buildPythonPackage rec { hash = "sha256-Jgh7ff+iUaeNQtBsXw2Jm+2gj1ctvrY3oahGrbxx3uE="; }; - # only convert first 2 values from setuptools_version to ints to avoid - # parse errors if last value is a string. - patches = fetchpatch { - url = "https://github.com/jim-easterbrook/python-gphoto2/commit/d388971b63fea831eb986d2212d4828c6c553235.patch"; - hash = "sha256-EXtXlhBx2jCKtMl7HmN87liqiHVAFSeXr11y830AlpY="; - }; - nativeBuildInputs = [ pkg-config setuptools From f2a397ef7bee5f2067b9f3dec6efc982304dea8c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 12:36:04 +0000 Subject: [PATCH 1181/2168] gnustep-make: 2.9.2 -> 2.9.3 --- pkgs/by-name/gn/gnustep-make/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnustep-make/package.nix b/pkgs/by-name/gn/gnustep-make/package.nix index 66fe1c42b1b3..03b0ead9f25b 100644 --- a/pkgs/by-name/gn/gnustep-make/package.nix +++ b/pkgs/by-name/gn/gnustep-make/package.nix @@ -8,11 +8,11 @@ clangStdenv.mkDerivation (finalAttrs: { pname = "gnustep-make"; - version = "2.9.2"; + version = "2.9.3"; src = fetchurl { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-9UDfnw4drrPSOwjhSyBLKkbx0KQAXLFxyVMjQTgG5OE="; + sha256 = "sha256-k8oyC3BieevKU3YNqJ1MPyu8VH9HI5ZxQKNDRtnwTCQ="; }; configureFlags = [ From 1f3628fa94fc532baa0ae738c7a775678c246a19 Mon Sep 17 00:00:00 2001 From: joergdw Date: Tue, 11 Feb 2025 13:40:39 +0100 Subject: [PATCH 1182/2168] rubyPackages.cf-uaac: init at 4.6.0 (#189079) --- pkgs/top-level/ruby-packages.nix | 86 ++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index 49fd9c7ece37..3bf08ddf5be8 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -295,6 +295,28 @@ }; version = "1.0.0"; }; + cf-uaa-lib = { + dependencies = ["addressable" "httpclient" "multi_json"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "f03e5fc4630511d39d42d802715d65997abfc5cdd113564fa21aebb610f63a46"; + type = "gem"; + }; + version = "4.0.8"; + }; + cf-uaac = { + dependencies = ["cf-uaa-lib" "em-http-request" "eventmachine" "highline" "json_pure" "launchy" "rack"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "f31cbbe93f8d791fac8ed6c9ede370f29d58654913b81177b6918c476b675528"; + type = "gem"; + }; + version = "4.27.0"; + }; charlock_holmes = { groups = ["default"]; platforms = []; @@ -305,6 +327,17 @@ }; version = "0.7.7"; }; + childprocess = { + dependecnies = ["logger"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "9a8d484be2fd4096a0e90a0cd3e449a05bc3aa33f8ac9e4d6dcef6ac1455b6ec"; + type = "gem"; + }; + version = "5.1.0"; + }; claide = { groups = ["default"]; platforms = []; @@ -717,6 +750,16 @@ }; version = "4.0.4"; }; + cookiejar = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11b16acfc4baf7a0f463c21a6212005e04e25f5554d4d9f24d97f3492dfda0df"; + type = "gem"; + }; + version = "0.3.4"; + }; crass = { groups = ["default"]; platforms = []; @@ -922,6 +965,28 @@ }; version = "0.1.0"; }; + em-http-request = { + dependencies = ["addressable" "cookiejar" "em-socksify" "eventmachine" "http_parser.rb"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1azx5rgm1zvx7391sfwcxzyccs46x495vb34ql2ch83f58mwgyqn"; + type = "gem"; + }; + version = "1.1.7"; + }; + em-socksify = { + dependencies = ["eventmachine"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rk43ywaanfrd8180d98287xv2pxyl7llj291cwy87g1s735d5nk"; + type = "gem"; + }; + version = "0.3.3"; + }; elftools = { dependencies = ["bindata"]; groups = ["default"]; @@ -2080,6 +2145,17 @@ }; version = "1.7.8"; }; + launchy = { + dependencies = ["addressable" "childprocess" "logger"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "4964ae775cd802f5a57ae5584fbdb1151a8908cb0c626341563430d614a59572"; + type = "gem"; + }; + version = "3.1.0"; + }; language_server-protocol = { groups = ["default"]; platforms = []; @@ -2172,6 +2248,16 @@ }; version = "2.1.4"; }; + logger = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "c3cfe56d01656490ddd103d38b8993d73d86296adebc5f58cefc9ec03741e56b"; + type = "gem"; + }; + version = "1.6.5"; + }; loofah = { dependencies = ["crass" "nokogiri"]; groups = ["default"]; From 076b4aacee63188aa2bbb9d87e5665698df76e94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 10 Feb 2025 19:11:18 +0100 Subject: [PATCH 1183/2168] python313Packages.aiohttp-apispec: general cleanup --- .../python-modules/aiohttp-apispec/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/aiohttp-apispec/default.nix b/pkgs/development/python-modules/aiohttp-apispec/default.nix index f0aa60cd4028..ec0b6391daa4 100644 --- a/pkgs/development/python-modules/aiohttp-apispec/default.nix +++ b/pkgs/development/python-modules/aiohttp-apispec/default.nix @@ -9,20 +9,21 @@ pytest-aiohttp, pytestCheckHook, pythonOlder, + setuptools, webargs, }: buildPythonPackage rec { pname = "aiohttp-apispec"; version = "3.0.0b2"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "maximdanilchenko"; - repo = pname; - rev = "v${version}"; + repo = "aiohttp-apispec"; + tag = "v${version}"; hash = "sha256-C+/M25oCLTNGGEUj2EyXn3UjcvPvDYFmmUW8IOoF1uU="; }; @@ -32,7 +33,9 @@ buildPythonPackage rec { --replace-fail 'return loop.run_until_complete' 'return event_loop.run_until_complete' ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ aiohttp apispec jinja2 From b7d2ed75ccff8834f00c6abf5abebe8ad30bd35f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 10 Feb 2025 19:11:31 +0100 Subject: [PATCH 1184/2168] python313Packages.webtest-aiohttp: general cleanup --- .../python-modules/webtest-aiohttp/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/webtest-aiohttp/default.nix b/pkgs/development/python-modules/webtest-aiohttp/default.nix index 4958b0d53ebc..0f915980724c 100644 --- a/pkgs/development/python-modules/webtest-aiohttp/default.nix +++ b/pkgs/development/python-modules/webtest-aiohttp/default.nix @@ -6,21 +6,19 @@ fetchpatch, pytest-aiohttp, pytestCheckHook, - pythonOlder, + setuptools, webtest, }: buildPythonPackage rec { pname = "webtest-aiohttp"; version = "2.0.0"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + pyproject = true; src = fetchFromGitHub { owner = "sloria"; - repo = pname; - rev = version; + repo = "webtest-aiohttp"; + tag = version; hash = "sha256-UuAz/k/Tnumupv3ybFR7PkYHwG3kH7M5oobZykEP+ao="; }; @@ -38,7 +36,9 @@ buildPythonPackage rec { --replace-fail 'WebTestApp(app, loop=loop)' 'WebTestApp(app, loop=event_loop)' ''; - propagatedBuildInputs = [ webtest ]; + build-system = [ setuptools ]; + + dependencies = [ webtest ]; nativeCheckInputs = [ aiohttp From 7b0efc17edfb871fcb184a9e8e2cec28ab91fbea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 10 Feb 2025 19:23:43 +0100 Subject: [PATCH 1185/2168] libtorrent-rasterbar-1_2_x: fix build by using older boost --- pkgs/by-name/li/libtorrent-rasterbar-1_2_x/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libtorrent-rasterbar-1_2_x/package.nix b/pkgs/by-name/li/libtorrent-rasterbar-1_2_x/package.nix index 9bc236b5ec3c..b04840fb6a95 100644 --- a/pkgs/by-name/li/libtorrent-rasterbar-1_2_x/package.nix +++ b/pkgs/by-name/li/libtorrent-rasterbar-1_2_x/package.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook -, zlib, boost, openssl, python311, libiconv, ncurses, darwin +, zlib, boost186, openssl, python311, libiconv, ncurses, darwin , boost-build }: @@ -8,7 +8,7 @@ let # Make sure we override python, so the correct version is chosen # for the bindings, if overridden - boostPython = boost.override (_: { + boostPython = boost186.override (_: { enablePython = true; python = python311; enableStatic = true; From 7ec5e385ef4473f11dc49482d006054fed7d182e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 11 Feb 2025 13:48:34 +0100 Subject: [PATCH 1186/2168] python313Packages.private-gpt: fix dependencies --- pkgs/development/python-modules/private-gpt/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/private-gpt/default.nix b/pkgs/development/python-modules/private-gpt/default.nix index 827c02e36797..d814ad05ab5e 100644 --- a/pkgs/development/python-modules/private-gpt/default.nix +++ b/pkgs/development/python-modules/private-gpt/default.nix @@ -8,6 +8,7 @@ poetry-core, # dependencies + cryptography, docx2txt, fastapi, injector, @@ -16,7 +17,6 @@ python-multipart, pyyaml, transformers, - uvicorn, watchdog, # optional-dependencies @@ -48,9 +48,11 @@ buildPythonPackage rec { "llama-index-core" "llama-index-readers-file" "python-multipart" + "watchdog" ]; dependencies = [ + cryptography docx2txt fastapi injector @@ -59,7 +61,6 @@ buildPythonPackage rec { python-multipart pyyaml transformers - uvicorn watchdog ] ++ lib.flatten (builtins.attrValues optional-dependencies); From b8fb8aeccd577f805fac30bbb136be19362c42a6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 13:03:07 +0000 Subject: [PATCH 1187/2168] tellico: 4.1 -> 4.1.1 --- pkgs/applications/misc/tellico/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/tellico/default.nix b/pkgs/applications/misc/tellico/default.nix index d5450e48fdcd..556ce02e0546 100644 --- a/pkgs/applications/misc/tellico/default.nix +++ b/pkgs/applications/misc/tellico/default.nix @@ -27,14 +27,14 @@ stdenv.mkDerivation rec { pname = "tellico"; - version = "4.1"; + version = "4.1.1"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "office"; repo = pname; rev = "v${version}"; - hash = "sha256-xzMPYze77oajMjS2fprjGu2FsZgI7MjnWVxIxYYN0TY="; + hash = "sha256-eYmLDQfnC0/R7VF+oMBwb5Q56CBl2icusoit/LIIpUs="; }; nativeBuildInputs = [ From 517bbe87f07da3758b55b6750342044ded4c9269 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 11 Feb 2025 14:03:25 +0100 Subject: [PATCH 1188/2168] python312Packages.mypy-boto3-apigatewayv2: 1.36.0 -> 1.36.17 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 5c45bd8e3923..49c8f964c2d2 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -86,8 +86,8 @@ rec { "sha256-wqul7cHa1ui2Wbyl01bnwZgIUZZodniAn6EQ24bgfkI="; mypy-boto3-apigatewayv2 = - buildMypyBoto3Package "apigatewayv2" "1.36.0" - "sha256-UDfSHfLkzNNcecERrGCJIYnVJE27qCECZ2CRmFxvGRM="; + buildMypyBoto3Package "apigatewayv2" "1.36.17" + "sha256-VntzS1WAuNtSpl0+i6mTQk/Xs7yuDQgnu4IbdDaDabc="; mypy-boto3-appconfig = buildMypyBoto3Package "appconfig" "1.36.0" From 3f1b715e4ac7f990e6d61ad4f09ab89189386bd1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 11 Feb 2025 14:03:38 +0100 Subject: [PATCH 1189/2168] python312Packages.mypy-boto3-cloudfront: 1.36.0 -> 1.36.17 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 49c8f964c2d2..261d23117993 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -230,8 +230,8 @@ rec { "sha256-g8YpVNduF0EAsCwheQCS2xX2yoIKuYTQ1DY/DRdwkt8="; mypy-boto3-cloudfront = - buildMypyBoto3Package "cloudfront" "1.36.0" - "sha256-6HRqoRpUsrvPVrNvVlQodzjWpfk5Eq472jCzNVMULzM="; + buildMypyBoto3Package "cloudfront" "1.36.17" + "sha256-jfYI2Kn4er6cG3LpxdVV0QacKbpTDzAiBmVzD5D76UI="; mypy-boto3-cloudhsm = buildMypyBoto3Package "cloudhsm" "1.36.0" From 99c177cde063a9d072113c22106bd96e51507799 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 11 Feb 2025 14:03:48 +0100 Subject: [PATCH 1190/2168] python312Packages.mypy-boto3-connect: 1.36.3 -> 1.36.17 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 261d23117993..689a5410fd6f 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -338,8 +338,8 @@ rec { "sha256-VK7/vxmSeMHYNow/ifwEYB8w/35PQfUiMhinyKNlDJ8="; mypy-boto3-connect = - buildMypyBoto3Package "connect" "1.36.3" - "sha256-thT1nWwkUSsmhLQOyV5QiR17jGHvkxbxcwMGwV5gFXE="; + buildMypyBoto3Package "connect" "1.36.17" + "sha256-8uSSGygW+4wKLt09LGUdr8q07bJLiIAK8avQOhoKpQI="; mypy-boto3-connect-contact-lens = buildMypyBoto3Package "connect-contact-lens" "1.36.0" From f87d8fe7f5abeb6da0e0db79753bf3ce2adb3272 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 11 Feb 2025 14:03:57 +0100 Subject: [PATCH 1191/2168] python312Packages.mypy-boto3-dms: 1.36.13 -> 1.36.17 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 689a5410fd6f..3a65414ef8b7 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -414,8 +414,8 @@ rec { "sha256-si7pjgKzxg++SfVdOsIQP37rXG84IZM0ltcwc2+wn3I="; mypy-boto3-dms = - buildMypyBoto3Package "dms" "1.36.13" - "sha256-D8d8TAjSlxNw5xumOLyzIBb92C7Blh3f3Mo1WOPxzP4="; + buildMypyBoto3Package "dms" "1.36.17" + "sha256-XymlDkObpiUJqGjheovvypfDS8xDGLy6MKT4+mhBePs="; mypy-boto3-docdb = buildMypyBoto3Package "docdb" "1.36.0" From cb9bcda34ef69561dba41c33f27d07c4a4af21d1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 13:05:54 +0000 Subject: [PATCH 1192/2168] tabiew: 0.8.1 -> 0.8.2 --- pkgs/by-name/ta/tabiew/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ta/tabiew/package.nix b/pkgs/by-name/ta/tabiew/package.nix index b98a2fdfc096..2eed66124863 100644 --- a/pkgs/by-name/ta/tabiew/package.nix +++ b/pkgs/by-name/ta/tabiew/package.nix @@ -6,17 +6,17 @@ }: rustPlatform.buildRustPackage rec { pname = "tabiew"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "shshemi"; repo = "tabiew"; rev = "v${version}"; - hash = "sha256-Q/GX3kcGx83h0XFlG0r2RGpoh63ijnaM4mp/ewrf920="; + hash = "sha256-bYmHFH39DYtv7AbKTteiAiRyzTJXzBHmQ/Mu/oEQ3fI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-rViJDF0cC8j8OVGNCxf6C1xpA8GXrt2UZvnkOuEJEmA="; + cargoHash = "sha256-JECqyR+ONiotJhKv3AJv1JfFtP2XBECqmvXTc1kNL20="; nativeBuildInputs = [ installShellFiles ]; From 91b34a4c57b6bbd26fd3b0de651617c4902b4ad5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 13:11:22 +0000 Subject: [PATCH 1193/2168] cargo-hack: 0.6.34 -> 0.6.35 --- pkgs/by-name/ca/cargo-hack/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-hack/package.nix b/pkgs/by-name/ca/cargo-hack/package.nix index e2a556b4f75d..bcb683354db5 100644 --- a/pkgs/by-name/ca/cargo-hack/package.nix +++ b/pkgs/by-name/ca/cargo-hack/package.nix @@ -6,15 +6,15 @@ rustPlatform.buildRustPackage rec { pname = "cargo-hack"; - version = "0.6.34"; + version = "0.6.35"; src = fetchCrate { inherit pname version; - hash = "sha256-FAcKzLr835FxgcnWmAe1JirzlRc3fvxGXMKxnSmgCzA="; + hash = "sha256-6C3YiPgoszEvJBkaOg7URYxnEl17oGLYzl0P+m3VAAI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-3M+UK0+lvnRH7j1vbqMgpE7mnz8YnPO3MEjQWnPRy8c="; + cargoHash = "sha256-pRZ6mmCQCaio7aW55dKSAEHeGNJoFJNUnnUGoBlmZ6w="; # some necessary files are absent in the crate version doCheck = false; From 1c79a28ec09bb340b31a1490622d76e15af16710 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 11 Feb 2025 14:17:12 +0100 Subject: [PATCH 1194/2168] python313Packages.pyipma: refactor --- pkgs/development/python-modules/pyipma/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pyipma/default.nix b/pkgs/development/python-modules/pyipma/default.nix index d3e6460c7ded..c8c1611fe3b9 100644 --- a/pkgs/development/python-modules/pyipma/default.nix +++ b/pkgs/development/python-modules/pyipma/default.nix @@ -10,23 +10,26 @@ pytest-asyncio, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "pyipma"; version = "3.0.9"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "dgomes"; - repo = pname; + repo = "pyipma"; tag = version; hash = "sha256-1EUOkNwNoZQEetJ5v6httas0S0a3bHLv/lDRXQsT/Ds="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ aiohttp geopy ]; @@ -52,7 +55,7 @@ buildPythonPackage rec { description = "Library to retrieve information from Instituto Português do Mar e Atmosfera"; homepage = "https://github.com/dgomes/pyipma"; changelog = "https://github.com/dgomes/pyipma/releases/tag/${src.tag}"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } From 2aeaf85c514701c1f51441924b721ae1269dafe5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 13:19:06 +0000 Subject: [PATCH 1195/2168] roadrunner: 2024.3.2 -> 2024.3.3 --- pkgs/by-name/ro/roadrunner/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ro/roadrunner/package.nix b/pkgs/by-name/ro/roadrunner/package.nix index 828b9a837fb6..e74f247c9efb 100644 --- a/pkgs/by-name/ro/roadrunner/package.nix +++ b/pkgs/by-name/ro/roadrunner/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "roadrunner"; - version = "2024.3.2"; + version = "2024.3.3"; src = fetchFromGitHub { repo = "roadrunner"; owner = "roadrunner-server"; tag = "v${version}"; - hash = "sha256-KkwJ/977PHp8mKMJYDohRCi4PY9Q/LsRvsIBMyElZKc="; + hash = "sha256-5AB+fGyQa5+/fGqqNSYu0KnFbIZwL/ZjXyYHYk00cV8="; }; nativeBuildInputs = [ @@ -46,7 +46,7 @@ buildGoModule rec { --replace "127.0.0.1:0" "127.0.0.1:55554" ''; - vendorHash = "sha256-vvO67zi3Zod7Kf/yEXlk9aSRpLPzf+kWmNnDFaGdCzA="; + vendorHash = "sha256-BsIZxeSTz7wv4VJKffpOACXo7dm/qwZ/MYbmNogtMvg="; meta = { changelog = "https://github.com/roadrunner-server/roadrunner/blob/v${version}/CHANGELOG.md"; From a5d219cf850e2e844480855b037ab086c425fc08 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 11 Feb 2025 14:20:48 +0100 Subject: [PATCH 1196/2168] python313Packages.pyvera: refactor --- pkgs/development/python-modules/pyvera/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pyvera/default.nix b/pkgs/development/python-modules/pyvera/default.nix index e9dc1888a5cb..bdcef9663071 100644 --- a/pkgs/development/python-modules/pyvera/default.nix +++ b/pkgs/development/python-modules/pyvera/default.nix @@ -8,24 +8,27 @@ pytest-timeout, responses, pytestCheckHook, + pythonOlder, requests, }: buildPythonPackage rec { pname = "pyvera"; version = "0.3.16"; - format = "pyproject"; + pyproject = true; + + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "pavoni"; - repo = pname; + repo = "pyvera"; tag = version; hash = "sha256-WLzVOQEykST2BsVRHmcBhrsd/am0jI/f7D0PmpCTbdQ="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ requests ]; + dependencies = [ requests ]; nativeCheckInputs = [ pytest-asyncio @@ -40,7 +43,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to control devices via the Vera hub"; homepage = "https://github.com/pavoni/pyvera"; - license = with licenses; [ gpl2Only ]; + changelog = "https://github.com/maximvelichko/pyvera/releases/tag/${version}"; + license = licenses.gpl2Only; maintainers = with maintainers; [ fab ]; }; } From 59efc12c9ba3f555acff4f67f57db3ac250da84e Mon Sep 17 00:00:00 2001 From: Markus Theil Date: Tue, 11 Feb 2025 14:12:37 +0100 Subject: [PATCH 1197/2168] rshim-user-space: 2.1.5 -> 2.2.4 Some notable changes and fixes: - bfb-install: Handle PF1 bind/unbind in NIC mode - allow multiple rshims to run in parallel - show bluefield mode in MISC device While there, add myself as maintainer and remove @nikstur after discussing this with him. Signed-off-by: Markus Theil --- pkgs/by-name/rs/rshim-user-space/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/rs/rshim-user-space/package.nix b/pkgs/by-name/rs/rshim-user-space/package.nix index 82a6e55aaea4..bd9a66095dcd 100644 --- a/pkgs/by-name/rs/rshim-user-space/package.nix +++ b/pkgs/by-name/rs/rshim-user-space/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "rshim-user-space"; - version = "2.1.5"; + version = "2.2.4"; src = fetchFromGitHub { owner = "Mellanox"; repo = pname; rev = "rshim-${version}"; - hash = "sha256-moU6XxBVSAZiiR/usFfxse2CHk6+003Jb9t62szk1fk="; + hash = "sha256-z0Uk520vsBERbeVtxBqXPXSWhO0sLD5GCQy1dQsJdEg="; }; nativeBuildInputs = [ @@ -76,6 +76,8 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Mellanox/rshim-user-space"; license = licenses.gpl2Only; platforms = platforms.linux; - maintainers = with maintainers; [ nikstur ]; + maintainers = with maintainers; [ + thillux + ]; }; } From 02029674430590d9ba681eb91f45e3fc7759abb3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 13:30:48 +0000 Subject: [PATCH 1198/2168] goreleaser: 2.6.1 -> 2.7.0 --- pkgs/by-name/go/goreleaser/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/goreleaser/package.nix b/pkgs/by-name/go/goreleaser/package.nix index ff6c2dbe14a1..34ea472a0bdc 100644 --- a/pkgs/by-name/go/goreleaser/package.nix +++ b/pkgs/by-name/go/goreleaser/package.nix @@ -10,16 +10,16 @@ }: buildGoModule rec { pname = "goreleaser"; - version = "2.6.1"; + version = "2.7.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = "goreleaser"; rev = "v${version}"; - hash = "sha256-MlI76xiHT+JZAaL7LnEqHOgt6UypVoBjZHTmQXrnNxs="; + hash = "sha256-tpUnoW2Hx/A+bmhAn0GctllILEx9QCfgpscJWJTxJUU="; }; - vendorHash = "sha256-fYYPpf/Hnci5DCvhbWkmenTL+95PvqPtn1RdoRby+jI="; + vendorHash = "sha256-coO4Y+/ELu4yRusxop/Xc4cTlc+6HYAVIfiUbC2bLTw="; ldflags = [ "-s" From 72f62e3e7843657da6cb85d2279415e5015cf608 Mon Sep 17 00:00:00 2001 From: binarydigitz01 Date: Tue, 11 Feb 2025 18:55:04 +0530 Subject: [PATCH 1199/2168] maintainers: add binarydigitz01 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3aeb6c6f3b37..c7e8d6826704 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3053,6 +3053,12 @@ githubId = 19915050; name = "binarycat"; }; + binarydigitz01 = { + email = "binarydigitz01@protonmail.com"; + github = "binarydigitz01"; + githubId = 47600778; + name = "Arnav Vijaywargiya"; + }; binary-eater = { email = "sergeantsagara@protonmail.com"; github = "Binary-Eater"; From 7027e5ae22521e8232424744f421066d5299370a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 12:59:07 +0000 Subject: [PATCH 1200/2168] telegraf: 1.33.1 -> 1.33.2 --- pkgs/by-name/te/telegraf/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/telegraf/package.nix b/pkgs/by-name/te/telegraf/package.nix index 5b89365b9de1..29ddef3535a2 100644 --- a/pkgs/by-name/te/telegraf/package.nix +++ b/pkgs/by-name/te/telegraf/package.nix @@ -10,7 +10,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.33.1"; + version = "1.33.2"; subPackages = [ "cmd/telegraf" ]; @@ -18,10 +18,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - hash = "sha256-35L83l1aa7TDis0bZss4xBrciK1QEofkKY04JInmRmo="; + hash = "sha256-DOsjECXi2OEhSFd+eDXGN0kIZgZdpng6hkNMh6cOQ88="; }; - vendorHash = "sha256-JGG+IIYC0JKjetkrgTS6gwhk0/ehvSIxZi6ts234Gi4="; + vendorHash = "sha256-6valHYL2A4+rw1oMw4APT05O9gmj3+zUJQf226GDBaw="; proxyVendor = true; ldflags = [ From 0619ee8dc9497ffe16352808f8cab1e6aa48d317 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 14:00:48 +0000 Subject: [PATCH 1201/2168] patch2pr: 0.31.0 -> 0.32.0 --- pkgs/by-name/pa/patch2pr/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pa/patch2pr/package.nix b/pkgs/by-name/pa/patch2pr/package.nix index 607526c43ab3..12e0059452c1 100644 --- a/pkgs/by-name/pa/patch2pr/package.nix +++ b/pkgs/by-name/pa/patch2pr/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "patch2pr"; - version = "0.31.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "bluekeyes"; repo = "patch2pr"; rev = "v${version}"; - hash = "sha256-DiPgfpXXp8uB3PTjtSIN+1eKLBqy0AcNVQDnBmHM2u4="; + hash = "sha256-WYNvHwikY6ULEar2ZBvsALEgHuZarrwBjk3ZaGhvlk8="; }; - vendorHash = "sha256-nn/jCMLw77KOegcEOLCdZVc9wcmrMnVkEkmSUkNan2s="; + vendorHash = "sha256-Y7WpJ6h76+5BJonmDldXYzUxLH6YYl9zlitoqX3H/mk="; ldflags = [ "-X main.version=${version}" From e1eb1aff893ae623b6c30eda2e6ab67b1a933cce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 14:04:32 +0000 Subject: [PATCH 1202/2168] pik: 0.15.0 -> 0.16.0 --- pkgs/by-name/pi/pik/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pi/pik/package.nix b/pkgs/by-name/pi/pik/package.nix index 1fd16763e97f..b3d2b6c0824a 100644 --- a/pkgs/by-name/pi/pik/package.nix +++ b/pkgs/by-name/pi/pik/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "pik"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "jacek-kurlit"; repo = "pik"; rev = version; - hash = "sha256-iXLAV4VWJczdxrfevxaRxYTAL+d/VRQ61zc0B4UNbPM="; + hash = "sha256-L5r8ds5Avh6WqiYYg/0hVDjdp/TBGgCZgKnJoDzs7Rw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-nTx44lQFd1GSVNyCtiShml4+ho4k+o0m8zmMV9xLVSs="; + cargoHash = "sha256-d2I4RDo/U+69WwXjxHRsRNUxY2ymxzHqObR6X68xXRo="; passthru.tests.version = testers.testVersion { package = pik; }; From 29853f23ca42d14a51e8dee3447578183178c560 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 14:06:47 +0000 Subject: [PATCH 1203/2168] orchard: 0.26.4 -> 0.27.1 --- pkgs/by-name/or/orchard/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/or/orchard/package.nix b/pkgs/by-name/or/orchard/package.nix index 8058366d61d2..fecb1d610d09 100644 --- a/pkgs/by-name/or/orchard/package.nix +++ b/pkgs/by-name/or/orchard/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "orchard"; - version = "0.26.4"; + version = "0.27.1"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = version; - hash = "sha256-XA4cu7Jou5kGYovGgIpRvpMFBSha0d8sk4WMbp7GpGc="; + hash = "sha256-2FaB+f2aXEDfqa50EkBo6GN6mStrBnij9+cpLXWIKIg="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -24,7 +24,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-R4KsR00VAq0fUxHM48212GWy8KJoIOM0R8ycVjjjMO4="; + vendorHash = "sha256-J0gCkH7B4JxZBQkr1cUvXWuaz7QDQhKPNARZtxq3uDw="; nativeBuildInputs = [ installShellFiles ]; From 4f4a5b83d7eb1c242a0cbb9b16d8b1a2ba4ad36f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 11 Feb 2025 15:11:41 +0100 Subject: [PATCH 1204/2168] python313Packages.htmlmin: mark broken on python 3.13 --- pkgs/development/python-modules/htmlmin/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/htmlmin/default.nix b/pkgs/development/python-modules/htmlmin/default.nix index fd19103e41ac..be5f6c485cfa 100644 --- a/pkgs/development/python-modules/htmlmin/default.nix +++ b/pkgs/development/python-modules/htmlmin/default.nix @@ -2,12 +2,14 @@ lib, buildPythonPackage, fetchPypi, + pythonAtLeast, }: buildPythonPackage rec { pname = "htmlmin"; version = "0.1.12"; format = "setuptools"; + src = fetchPypi { inherit pname version; sha256 = "50c1ef4630374a5d723900096a961cff426dff46b48f34d194a81bbe14eca178"; @@ -22,5 +24,6 @@ buildPythonPackage rec { homepage = "https://pypi.python.org/pypi/htmlmin"; license = licenses.bsd3; maintainers = [ ]; + broken = pythonAtLeast "3.13"; # requires removed cgi module }; } From 78e4c32395829655f9640f2d6c30c8dada7af609 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 11 Feb 2025 15:11:51 +0100 Subject: [PATCH 1205/2168] python313Packages.type-infer: mark broken --- pkgs/development/python-modules/type-infer/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/type-infer/default.nix b/pkgs/development/python-modules/type-infer/default.nix index 80bc703c8405..cf940f9727ad 100644 --- a/pkgs/development/python-modules/type-infer/default.nix +++ b/pkgs/development/python-modules/type-infer/default.nix @@ -87,5 +87,7 @@ buildPythonPackage rec { homepage = "https://github.com/mindsdb/type_infer"; license = licenses.gpl3Only; maintainers = with maintainers; [ mbalatsko ]; + # ModuleNotFoundError: No module named 'imghdr', unrelated + broken = true; }; } From 3560388c196eab01830ac383b4cd4aabbc3d862a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 14:33:40 +0000 Subject: [PATCH 1206/2168] python312Packages.translate-toolkit: 3.14.6 -> 3.14.7 --- pkgs/development/python-modules/translate-toolkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/translate-toolkit/default.nix b/pkgs/development/python-modules/translate-toolkit/default.nix index 3dccad83058f..ae8d0775503e 100644 --- a/pkgs/development/python-modules/translate-toolkit/default.nix +++ b/pkgs/development/python-modules/translate-toolkit/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "translate-toolkit"; - version = "3.14.6"; + version = "3.14.7"; pyproject = true; build-system = [ setuptools-scm ]; @@ -30,7 +30,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "translate_toolkit"; inherit version; - hash = "sha256-2FCt8D+GSEv5xeriA8kT7T2Rjb86jwCNmxVgKnKG554="; + hash = "sha256-5xpvNxEQBuMggHCb2RPCQ/lQWop6Hiep8BpRSey31R0="; }; dependencies = [ From ef84310bb5347aea886283ce482d3114dd841d89 Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Tue, 11 Feb 2025 15:39:22 +0100 Subject: [PATCH 1207/2168] keycloak: 26.1.1 -> 26.1.2 --- pkgs/by-name/ke/keycloak/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ke/keycloak/package.nix b/pkgs/by-name/ke/keycloak/package.nix index 0228d47de9a6..a9f729078196 100644 --- a/pkgs/by-name/ke/keycloak/package.nix +++ b/pkgs/by-name/ke/keycloak/package.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation rec { pname = "keycloak"; - version = "26.1.1"; + version = "26.1.2"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - hash = "sha256-glBfG/j9J3ZjTTmMrNIbJhHUUIOV0Kardc5P3ohT98Y="; + hash = "sha256-U9g3SIh6qAQBWqIUfv1GQRqmRVzNImwCHAzfQFEFNOk="; }; nativeBuildInputs = [ From e0c8765ce2a12e9b06778c112dc2442375dd4fc0 Mon Sep 17 00:00:00 2001 From: merrkry Date: Tue, 11 Feb 2025 15:44:51 +0100 Subject: [PATCH 1208/2168] asusctl: 6.1.1 -> 6.1.2 --- pkgs/by-name/as/asusctl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/as/asusctl/package.nix b/pkgs/by-name/as/asusctl/package.nix index 3ff9cfb714dd..5de7b319bb37 100644 --- a/pkgs/by-name/as/asusctl/package.nix +++ b/pkgs/by-name/as/asusctl/package.nix @@ -17,17 +17,17 @@ }: rustPlatform.buildRustPackage rec { pname = "asusctl"; - version = "6.1.1"; + version = "6.1.2"; src = fetchFromGitLab { owner = "asus-linux"; repo = "asusctl"; rev = version; - hash = "sha256-E2c4KhwLGAgorq4cHdPt/j45ebL0k+A/ktkXh71utxA="; + hash = "sha256-nhhlimr1w0tgfzPQTr/Opey2Hviy1YAdSVUe5YINnZE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-o+u4k6yGVThBO9Chv4EwVpkDZzZj64RN9iNZyAy0LHs="; + cargoHash = "sha256-qgnMPICq7K3UT5l2T/nEvvWfEeNBpxwJburVJeAhQSs="; postPatch = '' files=" From 47a64666e752359e0b30513a80759c3df7478c2b Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Tue, 11 Feb 2025 15:53:10 +0100 Subject: [PATCH 1209/2168] matrix-synapse: 1.123.0 -> 1.124.0 --- pkgs/servers/matrix-synapse/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index b2cab540a8e5..eda4b67d833b 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -18,20 +18,20 @@ let in python3.pkgs.buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.123.0"; + version = "1.124.0"; format = "pyproject"; src = fetchFromGitHub { owner = "element-hq"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-fbT0DMz6F76e/IRb0e1nFEOxmtIDQ53it8zi88jiUDU="; + hash = "sha256-hL1MdngaAVqgdN8GS9m3jn4twsbX0GPFa5cq+SCJ1oI="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-Lfs7myNxWoPZI4USoK+aaTPLjT2EoEvnVnXFwdcKofE="; + hash = "sha256-OIrjBhjSavJubpcMtHLrfuK7uhfNd+AHKUmHno32yo4="; }; postPatch = '' From 542644d79bf35bbdb2f1aa24bbe6fc46a58233e4 Mon Sep 17 00:00:00 2001 From: Dennis Wuitz Date: Tue, 11 Feb 2025 11:13:16 +0100 Subject: [PATCH 1210/2168] stalwart-mail: fix package --- pkgs/by-name/st/stalwart-mail/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix index 775491f40319..6745c432e1f8 100644 --- a/pkgs/by-name/st/stalwart-mail/package.nix +++ b/pkgs/by-name/st/stalwart-mail/package.nix @@ -19,14 +19,14 @@ rustPlatform.buildRustPackage rec { pname = "stalwart-mail"; - version = "0.11.6"; + version = "0.11.6-unstable-2025-02-04"; src = fetchFromGitHub { owner = "stalwartlabs"; repo = "mail-server"; - tag = "v${version}"; - hash = "sha256-8xRmAPqIVanGyWoUWb4DyRkhl5djPJD+ie03B3FyZ4w="; - fetchSubmodules = true; + # release 0.11.6 broken, see https://github.com/stalwartlabs/mail-server/issues/1150 + rev = "fa6483b6df57513582425119027bc4fce8f03d65"; + hash = "sha256-mB3Vm07b+eKDlQ95pmVk14Q7jXTBbV1jTbN+6hcFt0s="; }; useFetchCargoVendor = true; @@ -52,9 +52,9 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.SystemConfiguration ]; - # skip defaults on darwin because foundationdb is not available - buildNoDefaultFeatures = stdenv.hostPlatform.isDarwin; - buildFeatures = lib.optional (stdenv.hostPlatform.isDarwin) [ + # Issue: https://github.com/stalwartlabs/mail-server/issues/1104 + buildNoDefaultFeatures = true; + buildFeatures = [ "sqlite" "postgres" "mysql" From 2d0a58401d4793ee1035d56306ab32908b5b9a8b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 15:10:07 +0000 Subject: [PATCH 1211/2168] rapidfuzz-cpp: 3.3.1 -> 3.3.2 --- pkgs/by-name/ra/rapidfuzz-cpp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ra/rapidfuzz-cpp/package.nix b/pkgs/by-name/ra/rapidfuzz-cpp/package.nix index d86f384429b2..42fdec694135 100644 --- a/pkgs/by-name/ra/rapidfuzz-cpp/package.nix +++ b/pkgs/by-name/ra/rapidfuzz-cpp/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rapidfuzz-cpp"; - version = "3.3.1"; + version = "3.3.2"; src = fetchFromGitHub { owner = "rapidfuzz"; repo = "rapidfuzz-cpp"; rev = "v${finalAttrs.version}"; - hash = "sha256-m8VSqvKF7oRZeVJHRebPePc9iOreXhdmV2rAtB3frKI="; + hash = "sha256-AuH0Vq0Le5T9vDCpEviEjfNpwJFnFtqj/taFJy+YoMY="; }; nativeBuildInputs = [ From 446a33733605c3dc8f627f4e5de11a7b62e64b15 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 15:12:16 +0000 Subject: [PATCH 1212/2168] sasquatch-v4be: 4.5.1-4 -> 4.5.1-5 --- pkgs/by-name/sa/sasquatch/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sa/sasquatch/package.nix b/pkgs/by-name/sa/sasquatch/package.nix index 678812819eb5..fba9da9c1dbb 100644 --- a/pkgs/by-name/sa/sasquatch/package.nix +++ b/pkgs/by-name/sa/sasquatch/package.nix @@ -14,13 +14,13 @@ let drv = stdenv.mkDerivation (finalAttrs: { pname = "sasquatch"; - version = "4.5.1-4"; + version = "4.5.1-5"; src = fetchFromGitHub { owner = "onekey-sec"; repo = "sasquatch"; rev = "sasquatch-v${finalAttrs.version}"; - hash = "sha256-0itva+j5WMKvueiUaO253UQ1S6W29xgtFvV4i3yvMtU="; + hash = "sha256-4Mltt0yFt4oh9hsrHL8/ch5n7nZYiXIJ1UgLktPvlKQ="; }; patches = lib.optional stdenv.hostPlatform.isDarwin ./darwin.patch; From 9e0c3ed64044cc7c1a5214bf9e65a07d661bbc39 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Tue, 11 Feb 2025 08:25:38 -0700 Subject: [PATCH 1213/2168] desktop-file-utils: mark support for FreeBSD --- pkgs/by-name/de/desktop-file-utils/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/de/desktop-file-utils/package.nix b/pkgs/by-name/de/desktop-file-utils/package.nix index 387a43b5ae89..4732b764c4e5 100644 --- a/pkgs/by-name/de/desktop-file-utils/package.nix +++ b/pkgs/by-name/de/desktop-file-utils/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.freedesktop.org/wiki/Software/desktop-file-utils"; description = "Command line utilities for working with .desktop files"; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.linux ++ platforms.darwin ++ platforms.freebsd; license = licenses.gpl2Plus; }; } From fb48a4d3b1ebb73f36377bcfdce8f64066ff2d5f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 15:30:31 +0000 Subject: [PATCH 1214/2168] tpnote: 1.25.1 -> 1.25.2 --- pkgs/by-name/tp/tpnote/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tp/tpnote/package.nix b/pkgs/by-name/tp/tpnote/package.nix index 969d64711357..1430ba0efc27 100644 --- a/pkgs/by-name/tp/tpnote/package.nix +++ b/pkgs/by-name/tp/tpnote/package.nix @@ -14,17 +14,17 @@ rustPlatform.buildRustPackage rec { pname = "tpnote"; - version = "1.25.1"; + version = "1.25.2"; src = fetchFromGitHub { owner = "getreu"; repo = "tp-note"; rev = "v${version}"; - hash = "sha256-TT34+r4f3TaurLwyXxQa5AZT1xPOKkDYPra/bgchoTc="; + hash = "sha256-8AUPNjrT4/Vu8ykTHuDSdnCteih3i61CrfRBfPMwCfY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-1uqUB+65sMjjp4LJbvHehg9hMcrjun3/1cEmPPnrx3Y="; + cargoHash = "sha256-+qtphGkypyVY8SZsEmejikhnu18WIuvABlYGNA3GDUw="; nativeBuildInputs = [ cmake From 0c0e3aeba6db9a004067917e56b276279fe45e07 Mon Sep 17 00:00:00 2001 From: Charlie Egan Date: Tue, 11 Feb 2025 15:31:43 +0000 Subject: [PATCH 1215/2168] maintainers: add @charlieegan3 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3aeb6c6f3b37..6ba95215b283 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4046,6 +4046,12 @@ githubId = 6608071; name = "Charles Huyghues-Despointes"; }; + charlieegan3 = { + email = "git@charlieegan3.com"; + github = "charlieegan3"; + githubId = 1774239; + name = "Charlie Egan"; + }; chayleaf = { email = "chayleaf-nix@pavluk.org"; github = "chayleaf"; From ca81338f518cfe7f105fa2cda58bc1ff57420076 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?= <1771332+vlaci@users.noreply.github.com> Date: Tue, 11 Feb 2025 16:45:10 +0100 Subject: [PATCH 1216/2168] jefferson: add update script --- pkgs/by-name/je/jefferson/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/je/jefferson/package.nix b/pkgs/by-name/je/jefferson/package.nix index 81b27588147f..8db93d43cdb3 100644 --- a/pkgs/by-name/je/jefferson/package.nix +++ b/pkgs/by-name/je/jefferson/package.nix @@ -1,6 +1,7 @@ { lib, fetchFromGitHub, + gitUpdater, python3, }: @@ -35,6 +36,10 @@ python3.pkgs.buildPythonApplication rec { # upstream has no tests doCheck = false; + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + }; + meta = with lib; { description = "JFFS2 filesystem extraction tool"; homepage = "https://github.com/onekey-sec/jefferson"; From 3a1eb76a966346341d7cdc3439e6dd20f329e3d3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 15:50:31 +0000 Subject: [PATCH 1217/2168] zsh-abbr: 6.0.1 -> 6.1.0 --- pkgs/by-name/zs/zsh-abbr/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/zs/zsh-abbr/package.nix b/pkgs/by-name/zs/zsh-abbr/package.nix index 2f096fb4735f..3bdbbb59166e 100644 --- a/pkgs/by-name/zs/zsh-abbr/package.nix +++ b/pkgs/by-name/zs/zsh-abbr/package.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation rec { pname = "zsh-abbr"; - version = "6.0.1"; + version = "6.1.0"; src = fetchFromGitHub { owner = "olets"; repo = "zsh-abbr"; rev = "v${version}"; - hash = "sha256-PWr8o0so2ZfQJkinkLRa4bFxZtw0Lgs7UXVWvd/rWF0"; + hash = "sha256-M2HBVC72RA0OUBUz8AaJMEsGMNrRzS2Kz8QLSplxP9o="; fetchSubmodules = true; }; From d2c4fad234274a59ff3d5de5f90f2ed2b7a42d07 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 11 Feb 2025 16:50:46 +0100 Subject: [PATCH 1218/2168] python313Packages.publicsuffixlist: 1.0.2.20250207 -> 1.0.2.20250211 Changelog: https://github.com/ko-zu/psl/blob/v1.0.2.20250211-gha/CHANGES.md --- pkgs/development/python-modules/publicsuffixlist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index b37d8a649d23..215eebaf8fe2 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "1.0.2.20250207"; + version = "1.0.2.20250211"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wYOFcyEO9wH0lpEtrTCCDJKb4NQJ51BnJ8dysjsZwSM="; + hash = "sha256-ujbidDxlKcthvB90O2WJLLBRtmT69+rgzha4wAGJue8="; }; build-system = [ setuptools ]; From 7b45abef764fdf976b99b91d772ee9772371f8c2 Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Tue, 11 Feb 2025 07:52:18 -0800 Subject: [PATCH 1219/2168] cargo-spellcheck: 0.15.1 -> 0.15.2 --- pkgs/by-name/ca/cargo-spellcheck/package.nix | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/ca/cargo-spellcheck/package.nix b/pkgs/by-name/ca/cargo-spellcheck/package.nix index 90d0a0bcbe96..bf5e721665d3 100644 --- a/pkgs/by-name/ca/cargo-spellcheck/package.nix +++ b/pkgs/by-name/ca/cargo-spellcheck/package.nix @@ -2,32 +2,21 @@ lib, rustPlatform, fetchFromGitHub, - fetchpatch2, }: rustPlatform.buildRustPackage rec { pname = "cargo-spellcheck"; - version = "0.15.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "drahnr"; repo = pname; tag = "v${version}"; - hash = "sha256-o4gvTF9Zb6bZ9443zos4bz37w3bXKumW2x425MM5/FY="; + hash = "sha256-KiulbQhSg5CCZlts8FLsfOrN7nz16u3gRnQrWTFAzdc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-wEcHMzeSj/JO/ZBPmQAiHaixtOTCT2+rTd1LDCY9wqc="; - - patches = [ - # fixes compilation of tests - # https://github.com/drahnr/cargo-spellcheck/pull/342 - (fetchpatch2 { - name = "fix-test-compilation.patch"; - url = "https://github.com/drahnr/cargo-spellcheck/pull/342/commits/aed8f3ca7a50fae38a5c6e0b974ed9773cd6c659.patch"; - hash = "sha256-840t8uPg0EiiVppmMT38C1P16vps7F+g0o313tzghjE="; - }) - ]; + cargoHash = "sha256-iDulfKsw3Ui5b1v7QakIcf7HXNEBlMbhbzqLekuSsUU="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; @@ -35,6 +24,8 @@ rustPlatform.buildRustPackage rec { checkFlags = [ "--skip=checker::hunspell::tests::hunspell_binding_is_sane" + # requires dictionaries + "--skip=tests::e2e::issue_226" ]; meta = with lib; { From ede6348af68f867eb6522c4584b272640b7dfc8a Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Tue, 11 Feb 2025 16:52:52 +0100 Subject: [PATCH 1220/2168] cloak: set branch name by literal --- pkgs/by-name/cl/cloak/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/cl/cloak/package.nix b/pkgs/by-name/cl/cloak/package.nix index 152c4921a356..2a4c4c5f80e0 100644 --- a/pkgs/by-name/cl/cloak/package.nix +++ b/pkgs/by-name/cl/cloak/package.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "evansmurithi"; - repo = pname; + repo = "cloak"; rev = "v${version}"; hash = "sha256-Pd2aorsXdHB1bs609+S5s+WV5M1ql48yIKaoN8SEvsg="; }; From 2798e4cb0d8d48e5d201f78bbb7c2742ed28601a Mon Sep 17 00:00:00 2001 From: Philipp Bartsch Date: Sun, 1 Dec 2024 23:04:52 +0100 Subject: [PATCH 1221/2168] oxigraph: 0.3.22 -> 0.4.7 Looks like the project shuffled some things around and now the oxigraph_server functionality is in oxigraph-cli. --- pkgs/servers/oxigraph/default.nix | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/oxigraph/default.nix b/pkgs/servers/oxigraph/default.nix index c1bf8fa265b5..f77a1c45b465 100644 --- a/pkgs/servers/oxigraph/default.nix +++ b/pkgs/servers/oxigraph/default.nix @@ -2,34 +2,48 @@ , stdenv , rustPlatform , fetchFromGitHub +, installShellFiles , IOKit , Security }: rustPlatform.buildRustPackage rec { pname = "oxigraph"; - version = "0.3.22"; + version = "0.4.7"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-zwUiUDWdrmLF+Qj9Jy6JGXHaBskRnm+pMKW2GKGGeN8="; + hash = "sha256-xkmCfOLlNvQe8VwUS/jFHACxzo8RwIvX3jGGarj1LSg="; fetchSubmodules = true; }; useFetchCargoVendor = true; - cargoHash = "sha256-UnXWBq+oS7tXFCsOhlTkq0L1j8pqzXZ0QKrdYayLunA="; + cargoHash = "sha256-sAAwQnV7p7x0bQb/VIJ9hh+UncYB6aGRorjhD2wgosk="; nativeBuildInputs = [ rustPlatform.bindgenHook + installShellFiles ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ IOKit Security ]; - cargoBuildFlags = [ "--package" "oxigraph_server" ]; + buildAndTestSubdir = "cli"; + buildNoDefaultFeatures = true; + buildFeatures = [ "rustls-webpki" "geosparql" ]; - # requires packaging of the associated python modules - doCheck = false; + # Man pages and autocompletion + postInstall = '' + MAN_DIR="$(find target/*/release -name man)" + installManPage "$MAN_DIR"/*.1 + COMPLETE_DIR="$(find target/*/release -name complete)" + installShellCompletion --bash --name oxigraph.bash "$COMPLETE_DIR/oxigraph.bash" + installShellCompletion --fish --name oxigraph.fish "$COMPLETE_DIR/oxigraph.fish" + installShellCompletion --zsh --name _oxigraph "$COMPLETE_DIR/_oxigraph" + ''; + + cargoCheckNoDefaultFeatures = true; + cargoCheckFeatures = buildFeatures; meta = with lib; { homepage = "https://github.com/oxigraph/oxigraph"; @@ -37,6 +51,6 @@ rustPlatform.buildRustPackage rec { platforms = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" ]; maintainers = with maintainers; [ astro ]; license = with licenses; [ asl20 mit ]; - mainProgram = "oxigraph_server"; + mainProgram = "oxigraph"; }; } From ebcb1a97c8e1c0db8218b515c1f610580888d0f7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 15:53:48 +0000 Subject: [PATCH 1222/2168] wxsqlite3: 4.10.2 -> 4.10.3 --- pkgs/by-name/wx/wxsqlite3/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wx/wxsqlite3/package.nix b/pkgs/by-name/wx/wxsqlite3/package.nix index 3aa0538d1f63..8b2d87cd135d 100644 --- a/pkgs/by-name/wx/wxsqlite3/package.nix +++ b/pkgs/by-name/wx/wxsqlite3/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "wxsqlite3"; - version = "4.10.2"; + version = "4.10.3"; src = fetchFromGitHub { owner = "utelle"; repo = "wxsqlite3"; rev = "v${version}"; - hash = "sha256-i9f6rzydsdh5wIkSUp1ZSzH1z08B9S8kpWLdElaAv9M="; + hash = "sha256-XoGysM5Btm9MdeaS2eAOEn7j/Do0+1sqC/tGIkWnkxw="; }; nativeBuildInputs = [ From 283c114f0ed889c7ca4aa78f140d4bc49b256a99 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Tue, 11 Feb 2025 16:54:03 +0100 Subject: [PATCH 1223/2168] cloak: use tag attribute for fetchFromGitHub --- pkgs/by-name/cl/cloak/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/cl/cloak/package.nix b/pkgs/by-name/cl/cloak/package.nix index 2a4c4c5f80e0..801d3ba83783 100644 --- a/pkgs/by-name/cl/cloak/package.nix +++ b/pkgs/by-name/cl/cloak/package.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "evansmurithi"; repo = "cloak"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-Pd2aorsXdHB1bs609+S5s+WV5M1ql48yIKaoN8SEvsg="; }; From 441b3b201e1911d59228d9eb3f01692da1681e54 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Mon, 10 Feb 2025 20:30:09 -0800 Subject: [PATCH 1224/2168] llvmPackages.libc: use clang by default --- .../compilers/llvm/common/default.nix | 6 ++++ .../compilers/llvm/common/libc/default.nix | 31 ++++++++++--------- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index a40ffd4044b4..3b657ce5bb3f 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -1221,10 +1221,16 @@ let // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "20") { libc-overlay = callPackage ./libc { isFullBuild = false; + # Use clang due to "gnu::naked" not working on aarch64. + # Issue: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=77882 + stdenv = overrideCC stdenv buildLlvmTools.clang; }; libc-full = callPackage ./libc { isFullBuild = true; + # Use clang due to "gnu::naked" not working on aarch64. + # Issue: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=77882 + stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcNoRt; }; libc = if stdenv.targetPlatform.libc == "llvm" then libraries.libc-full else libraries.libc-overlay; diff --git a/pkgs/development/compilers/llvm/common/libc/default.nix b/pkgs/development/compilers/llvm/common/libc/default.nix index 09fbeb5e7cc6..900c884c72b4 100644 --- a/pkgs/development/compilers/llvm/common/libc/default.nix +++ b/pkgs/development/compilers/llvm/common/libc/default.nix @@ -14,6 +14,7 @@ ninja, isFullBuild ? true, linuxHeaders, + fetchpatch, }: let pname = "libc"; @@ -25,26 +26,28 @@ let cp -r ${monorepoSrc}/llvm "$out" cp -r ${monorepoSrc}/${pname} "$out" ''); - - stdenv' = - if stdenv.cc.isClang then - stdenv.override { - cc = stdenv.cc.override { - nixSupport = stdenv.cc.nixSupport // { - cc-cflags = lib.remove "-lunwind" (stdenv.cc.nixSupport.cc-cflags or [ ]); - }; - }; - } - else - stdenv; in -stdenv'.mkDerivation (finalAttrs: { - inherit pname version patches; +stdenv.mkDerivation (finalAttrs: { + inherit pname version; src = src'; sourceRoot = "${finalAttrs.src.name}/runtimes"; + patches = + lib.optional (lib.versions.major version == "20") + # Removes invalid token from the LLVM version being placed in the namespace. + # Can be removed when LLVM 20 bumps to rc2. + # PR: https://github.com/llvm/llvm-project/pull/126284 + ( + fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/3a3a3230d171e11842a9940b6da0f72022b1c5b3.patch"; + stripLen = 1; + hash = "sha256-QiU1cWp+027ZZNVdvfGVwbIoRd9jqtSbftGsmaW1gig="; + } + ) + ++ patches; + nativeBuildInputs = [ cmake From c21f7c9c8ab3fa443cdee114c2323cd5477a34d9 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Tue, 11 Feb 2025 16:55:01 +0100 Subject: [PATCH 1225/2168] cloak: provide update script --- pkgs/by-name/cl/cloak/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/cl/cloak/package.nix b/pkgs/by-name/cl/cloak/package.nix index 801d3ba83783..0135ea0c42e5 100644 --- a/pkgs/by-name/cl/cloak/package.nix +++ b/pkgs/by-name/cl/cloak/package.nix @@ -2,6 +2,7 @@ lib, rustPlatform, fetchFromGitHub, + nix-update-script, }: rustPlatform.buildRustPackage rec { @@ -18,6 +19,8 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-PAZOenugZrKYIP7zzxozerjkauwg7VN0mAlex0WPttQ="; + passthru.updateScript = nix-update-script { }; + meta = with lib; { homepage = "https://github.com/evansmurithi/cloak"; description = "Command-line OTP authenticator application"; From 6463fe689afffabfda4a27b29fac458cb4aa63b8 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Tue, 11 Feb 2025 16:56:07 +0100 Subject: [PATCH 1226/2168] cloak: remove use of with lib; --- pkgs/by-name/cl/cloak/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cl/cloak/package.nix b/pkgs/by-name/cl/cloak/package.nix index 0135ea0c42e5..af7b2f634108 100644 --- a/pkgs/by-name/cl/cloak/package.nix +++ b/pkgs/by-name/cl/cloak/package.nix @@ -21,11 +21,11 @@ rustPlatform.buildRustPackage rec { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { homepage = "https://github.com/evansmurithi/cloak"; description = "Command-line OTP authenticator application"; - license = licenses.mit; - maintainers = with maintainers; [ mvs ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ mvs ]; mainProgram = "cloak"; }; } From e6da6a19bda25d9594a833c8d7d40e795993d63d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?= <1771332+vlaci@users.noreply.github.com> Date: Tue, 11 Feb 2025 16:45:54 +0100 Subject: [PATCH 1227/2168] jefferson: 0.4.5 -> 0.4.6 The `cstruct` workaround is no longer needed. --- pkgs/by-name/je/jefferson/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/je/jefferson/package.nix b/pkgs/by-name/je/jefferson/package.nix index 8db93d43cdb3..d1b95dd2df0a 100644 --- a/pkgs/by-name/je/jefferson/package.nix +++ b/pkgs/by-name/je/jefferson/package.nix @@ -7,14 +7,15 @@ python3.pkgs.buildPythonApplication rec { pname = "jefferson"; - version = "0.4.5"; + version = "0.4.6"; format = "pyproject"; + disabled = python3.pkgs.pythonOlder "3.9"; src = fetchFromGitHub { owner = "onekey-sec"; repo = pname; rev = "v${version}"; - hash = "sha256-PGtrvZ0cQvdiswn2Bk43c3LbIZqJyvNe5rnTPw/ipUM="; + hash = "sha256-6eh4i9N3aArU8+W8K341pp9J0QYEojDiMrEc8yax4SY="; }; nativeBuildInputs = with python3.pkgs; [ @@ -27,8 +28,6 @@ python3.pkgs.buildPythonApplication rec { lzallright ]; - pythonRelaxDeps = [ "cstruct" ]; - pythonImportsCheck = [ "jefferson" ]; From d2a61b2dd4759f7be8e2cbe241f95532ab8cfffc Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Tue, 4 Feb 2025 22:56:00 +0100 Subject: [PATCH 1228/2168] sdl3: fix building for static windows --- pkgs/by-name/sd/sdl3/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sd/sdl3/package.nix b/pkgs/by-name/sd/sdl3/package.nix index 004dee8aa8d1..78f564388f47 100644 --- a/pkgs/by-name/sd/sdl3/package.nix +++ b/pkgs/by-name/sd/sdl3/package.nix @@ -173,7 +173,8 @@ stdenv.mkDerivation (finalAttrs: { # Many dependencies are not directly linked to, but dlopen()'d at runtime. Adding them to the RPATH # helps them be found NIX_LDFLAGS = - lib.optionalString (stdenv.hostPlatform.extensions.sharedLibrary == ".so") + lib.optionalString + (stdenv.hostPlatform.hasSharedLibraries && stdenv.hostPlatform.extensions.sharedLibrary == ".so") "-rpath ${ lib.makeLibraryPath (finalAttrs.dlopenBuildInputs ++ finalAttrs.dlopenPropagatedBuildInputs) }"; @@ -230,7 +231,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/libsdl-org/SDL/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.zlib; maintainers = with lib.maintainers; [ getchoo ]; - platforms = lib.platforms.unix; + platforms = lib.platforms.unix ++ lib.platforms.windows; pkgConfigModules = [ "sdl3" ]; }; }) From fd442c50f9514c3b778ed08034914d7064dc2f01 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Wed, 5 Feb 2025 20:28:35 +0100 Subject: [PATCH 1229/2168] sdl3: assert that wayland is built with opengl Wayland support in SDL3 requires OpenGL. Without it the wayland support is silently skipped in the built library. --- pkgs/by-name/sd/sdl3/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/sd/sdl3/package.nix b/pkgs/by-name/sd/sdl3/package.nix index 78f564388f47..6f7f818984aa 100644 --- a/pkgs/by-name/sd/sdl3/package.nix +++ b/pkgs/by-name/sd/sdl3/package.nix @@ -51,6 +51,10 @@ x11Support ? !stdenv.hostPlatform.isAndroid && !stdenv.hostPlatform.isWindows, }: +assert lib.assertMsg ( + waylandSupport -> openglSupport +) "SDL3 requires OpenGL support to enable Wayland"; + stdenv.mkDerivation (finalAttrs: { pname = "sdl3"; version = "3.2.2"; From e100269019acf082b8d24b78e84ed8ad8a0ef2e9 Mon Sep 17 00:00:00 2001 From: KSJ2000 Date: Fri, 31 Jan 2025 18:20:00 +0200 Subject: [PATCH 1230/2168] renpy: modernize derivation --- pkgs/by-name/re/renpy/package.nix | 105 +++++++++++++++--------------- 1 file changed, 52 insertions(+), 53 deletions(-) diff --git a/pkgs/by-name/re/renpy/package.nix b/pkgs/by-name/re/renpy/package.nix index f39f4e4e61d4..2696c6359f12 100644 --- a/pkgs/by-name/re/renpy/package.nix +++ b/pkgs/by-name/re/renpy/package.nix @@ -1,89 +1,84 @@ { - lib, - stdenv, fetchFromGitHub, - fetchpatch, - python311, - pkg-config, - SDL2, - libpng, ffmpeg, freetype, + fribidi, glew, + harfbuzz, + lib, libGL, libGLU, - fribidi, - zlib, - harfbuzz, + libpng, makeWrapper, + nix-update-script, + pkg-config, + python311, + SDL2, + stdenv, + versionCheckHook, withoutSteam ? true, + zlib, }: let - # https://renpy.org/doc/html/changelog.html#versioning - # base_version is of the form major.minor.patch - # vc_version is of the form YYMMDDCC - # version corresponds to the tag on GitHub - base_version = "8.3.4"; - vc_version = "24120703"; - version = "${base_version}.${vc_version}"; + python = python311; in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "renpy"; - inherit version; + version = "8.3.4.24120703"; src = fetchFromGitHub { owner = "renpy"; repo = "renpy"; - rev = version; - hash = "sha256-GM6cx9yP5bgKWMSYOkZS9hE33/HJnsv4KmlB23jbkqg="; + tag = finalAttrs.version; + hash = "sha256-9f1ptw+6OQ2rMytwPZPtUd+K/ihnVKHUiELs22iTTqE="; }; nativeBuildInputs = [ - pkg-config makeWrapper + pkg-config # Ren'Py currently does not compile on Cython 3.x. # See https://github.com/renpy/renpy/issues/5359 - python311.pkgs.cython_0 - python311.pkgs.setuptools + python.pkgs.cython_0 + python.pkgs.setuptools ]; buildInputs = [ - SDL2 - libpng ffmpeg freetype - glew - libGLU - libGL fribidi - zlib + glew harfbuzz + libGL + libGLU + libpng + SDL2 + zlib ] - ++ (with python311.pkgs; [ - python - pygame-sdl2 - tkinter - future - six - pefile - requests + ++ (with python.pkgs; [ ecdsa + future + pefile + pygame-sdl2 + python + requests + six + tkinter ]); RENPY_DEPS_INSTALL = lib.concatStringsSep "::" [ - SDL2 - SDL2.dev - libpng ffmpeg.lib freetype - glew.dev - libGLU - libGL fribidi - zlib + glew.dev harfbuzz.dev + libGL + libGLU + libpng + SDL2 + SDL2.dev + zlib ]; enableParallelBuilding = true; @@ -97,7 +92,7 @@ stdenv.mkDerivation { cp tutorial/game/tutorial_director.rpy{m,} cat > renpy/vc_version.py << EOF - version = '${version}' + version = '${finalAttrs.version}' official = False nightly = False # Look at https://renpy.org/latest.html for what to put. @@ -105,13 +100,13 @@ stdenv.mkDerivation { EOF ''; - buildPhase = with python311.pkgs; '' + buildPhase = '' runHook preBuild ${python.pythonOnBuildForHost.interpreter} module/setup.py build --parallel=$NIX_BUILD_CORES runHook postBuild ''; - installPhase = with python311.pkgs; '' + installPhase = '' runHook preInstall ${python.pythonOnBuildForHost.interpreter} module/setup.py install_lib -d $out/${python.sitePackages} @@ -125,7 +120,13 @@ stdenv.mkDerivation { runHook postInstall ''; - env.NIX_CFLAGS_COMPILE = with python311.pkgs; "-I${pygame-sdl2}/include/${python.libPrefix}"; + env.NIX_CFLAGS_COMPILE = "-I${python.pkgs.pygame-sdl2}/include/${python.libPrefix}"; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + versionCheckProgramArg = "--version"; + + passthru.updateScript = nix-update-script { }; meta = { description = "Visual Novel Engine"; @@ -133,9 +134,7 @@ stdenv.mkDerivation { homepage = "https://renpy.org/"; changelog = "https://renpy.org/doc/html/changelog.html"; license = lib.licenses.mit; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ shadowrz ]; }; - - passthru = { inherit base_version vc_version; }; -} +}) From ce8a55eb34b8876dbca588aedba88439da5ca0b3 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Tue, 11 Feb 2025 17:59:00 +0100 Subject: [PATCH 1231/2168] lpcnetfreedv: provide update script --- pkgs/by-name/lp/lpcnetfreedv/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/lp/lpcnetfreedv/package.nix b/pkgs/by-name/lp/lpcnetfreedv/package.nix index ea1815a5731e..50860d1335cd 100644 --- a/pkgs/by-name/lp/lpcnetfreedv/package.nix +++ b/pkgs/by-name/lp/lpcnetfreedv/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, fetchurl, cmake, + nix-update-script, }: let @@ -31,6 +32,10 @@ stdenv.mkDerivation rec { ln -s ${data} build/lpcnet_${dataVersion}.tgz ''; + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; + meta = with lib; { homepage = "https://freedv.org/"; description = "Experimental Neural Net speech coding for FreeDV"; From 188488b2b354a90ef18c8f20aa4ee9f5507fd440 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 17:06:01 +0000 Subject: [PATCH 1232/2168] python312Packages.llama-cloud: 0.1.11 -> 0.1.12 --- pkgs/development/python-modules/llama-cloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-cloud/default.nix b/pkgs/development/python-modules/llama-cloud/default.nix index 5f1e6e7ad2e7..a7c9495cd821 100644 --- a/pkgs/development/python-modules/llama-cloud/default.nix +++ b/pkgs/development/python-modules/llama-cloud/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-cloud"; - version = "0.1.11"; + version = "0.1.12"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_cloud"; inherit version; - hash = "sha256-1L5bSGWf2f4WmHJ74lcmmiLX8nM6LtEbznBldo65TL4="; + hash = "sha256-1R0mzExUI5ijSQgTvHkfdQSkApgiXmLtkYlRv1cmbio="; }; build-system = [ poetry-core ]; From 4a1de84ca360c1b517040f7a292e3242f0cd88e1 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Tue, 11 Feb 2025 10:03:54 -0700 Subject: [PATCH 1233/2168] mautrix-facebook: remove The mautrix-facebook project was deprecated as of 2 March 2024: https://github.com/mautrix/facebook/commit/2ab4342c0d1ec1714de2b05f1a7ef6698d4fcf3f The repository is archived, and it is now recommended to use mautrix-meta. Signed-off-by: Sumner Evans --- nixos/modules/module-list.nix | 1 - .../services/matrix/mautrix-facebook.nix | 203 ------------------ pkgs/by-name/ma/mautrix-facebook/package.nix | 68 ------ 3 files changed, 272 deletions(-) delete mode 100644 nixos/modules/services/matrix/mautrix-facebook.nix delete mode 100644 pkgs/by-name/ma/mautrix-facebook/package.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e09380faa6df..81dca2243104 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -737,7 +737,6 @@ ./services/matrix/hebbot.nix ./services/matrix/hookshot.nix ./services/matrix/maubot.nix - ./services/matrix/mautrix-facebook.nix ./services/matrix/mautrix-meta.nix ./services/matrix/mautrix-signal.nix ./services/matrix/mautrix-telegram.nix diff --git a/nixos/modules/services/matrix/mautrix-facebook.nix b/nixos/modules/services/matrix/mautrix-facebook.nix deleted file mode 100644 index 2368e4e39d19..000000000000 --- a/nixos/modules/services/matrix/mautrix-facebook.nix +++ /dev/null @@ -1,203 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: -let - cfg = config.services.mautrix-facebook; - settingsFormat = pkgs.formats.json { }; - settingsFile = settingsFormat.generate "mautrix-facebook-config.json" cfg.settings; - - puppetRegex = lib.concatStringsSep ".*" ( - map lib.escapeRegex (lib.splitString "{userid}" cfg.settings.bridge.username_template) - ); -in -{ - options = { - services.mautrix-facebook = { - enable = lib.mkEnableOption "Mautrix-Facebook, a Matrix-Facebook hybrid puppeting/relaybot bridge"; - - settings = lib.mkOption rec { - apply = lib.recursiveUpdate default; - type = settingsFormat.type; - default = { - homeserver = { - address = "http://localhost:8008"; - software = "standard"; - }; - - appservice = rec { - id = "facebook"; - address = "http://${hostname}:${toString port}"; - hostname = "localhost"; - port = 29319; - - database = "postgresql://"; - - bot_username = "facebookbot"; - }; - - metrics.enabled = false; - manhole.enabled = false; - - bridge = { - encryption = { - allow = true; - default = true; - - verification_levels = { - receive = "cross-signed-tofu"; - send = "cross-signed-tofu"; - share = "cross-signed-tofu"; - }; - }; - username_template = "facebook_{userid}"; - }; - - logging = { - version = 1; - formatters.journal_fmt.format = "%(name)s: %(message)s"; - handlers.journal = { - class = "systemd.journal.JournalHandler"; - formatter = "journal_fmt"; - SYSLOG_IDENTIFIER = "mautrix-facebook"; - }; - root = { - level = "INFO"; - handlers = [ "journal" ]; - }; - }; - }; - example = lib.literalExpression '' - { - homeserver = { - address = "http://localhost:8008"; - domain = "mydomain.example"; - }; - - bridge.permissions = { - "@admin:mydomain.example" = "admin"; - "mydomain.example" = "user"; - }; - } - ''; - description = '' - {file}`config.yaml` configuration as a Nix attribute set. - Configuration options should match those described in - [example-config.yaml](https://github.com/mautrix/facebook/blob/master/mautrix_facebook/example-config.yaml). - - Secret tokens should be specified using {option}`environmentFile` - instead of this world-readable attribute set. - ''; - }; - - environmentFile = lib.mkOption { - type = lib.types.nullOr lib.types.path; - default = null; - description = '' - File containing environment variables to be passed to the mautrix-facebook service. - - Any config variable can be overridden by setting `MAUTRIX_FACEBOOK_SOME_KEY` to override the `some.key` variable. - ''; - }; - - configurePostgresql = lib.mkOption { - type = lib.types.bool; - default = true; - description = '' - Enable PostgreSQL and create a user and database for mautrix-facebook. The default `settings` reference this database, if you disable this option you must provide a database URL. - ''; - }; - - registrationData = lib.mkOption { - type = lib.types.attrs; - default = { }; - description = '' - Output data for appservice registration. Simply make any desired changes and serialize to JSON. Note that this data contains secrets so think twice before putting it into the nix store. - - Currently `as_token` and `hs_token` need to be added as they are not known to this module. - ''; - }; - }; - }; - - config = lib.mkIf cfg.enable { - users.groups.mautrix-facebook = { }; - - users.users.mautrix-facebook = { - group = "mautrix-facebook"; - isSystemUser = true; - }; - - services.postgresql = lib.mkIf cfg.configurePostgresql { - ensureDatabases = [ "mautrix-facebook" ]; - ensureUsers = [ - { - name = "mautrix-facebook"; - ensureDBOwnership = true; - } - ]; - }; - - systemd.services.mautrix-facebook = rec { - wantedBy = [ "multi-user.target" ]; - wants = - [ - "network-online.target" - ] - ++ lib.optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit - ++ lib.optional cfg.configurePostgresql "postgresql.service"; - after = wants; - - serviceConfig = { - Type = "simple"; - Restart = "always"; - - User = "mautrix-facebook"; - - ProtectSystem = "strict"; - ProtectHome = true; - ProtectKernelTunables = true; - ProtectKernelModules = true; - ProtectControlGroups = true; - PrivateTmp = true; - - EnvironmentFile = cfg.environmentFile; - - ExecStart = '' - ${pkgs.mautrix-facebook}/bin/mautrix-facebook --config=${settingsFile} - ''; - }; - }; - - services.mautrix-facebook = { - registrationData = { - id = cfg.settings.appservice.id; - - namespaces = { - users = [ - { - exclusive = true; - regex = lib.escapeRegex "@${cfg.settings.appservice.bot_username}:${cfg.settings.homeserver.domain}"; - } - { - exclusive = true; - regex = "@${puppetRegex}:${lib.escapeRegex cfg.settings.homeserver.domain}"; - } - ]; - aliases = [ ]; - }; - - url = cfg.settings.appservice.address; - sender_localpart = "mautrix-facebook-sender"; - - rate_limited = false; - "de.sorunome.msc2409.push_ephemeral" = true; - push_ephemeral = true; - }; - }; - }; - - meta.maintainers = with lib.maintainers; [ kevincox ]; -} diff --git a/pkgs/by-name/ma/mautrix-facebook/package.nix b/pkgs/by-name/ma/mautrix-facebook/package.nix deleted file mode 100644 index 3ae5c76fb19e..000000000000 --- a/pkgs/by-name/ma/mautrix-facebook/package.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - python3, - enableSystemd ? lib.meta.availableOn stdenv.hostPlatform python3.pkgs.systemd, -}: - -python3.pkgs.buildPythonPackage rec { - pname = "mautrix-facebook"; - version = "0.5.1"; - - src = fetchFromGitHub { - owner = "mautrix"; - repo = "facebook"; - rev = "v${version}"; - hash = "sha256-8uleN7L3fgNqqRjva3kJU7fLPJZpO6b0J4z0RxZ9B64="; - }; - - propagatedBuildInputs = - with python3.pkgs; - [ - commonmark - aiohttp - asyncpg - commonmark - (mautrix.override { withOlm = true; }) - paho-mqtt - pillow - prometheus-client - pycryptodome - python-olm - python-magic - ruamel-yaml - unpaddedbase64 - yarl - zstandard - ] - ++ lib.optional enableSystemd systemd; - - postPatch = '' - # Drop version limiting so that every dependency update doesn't break this package. - sed -i -e 's/,<.*//' requirements.txt - ''; - - postInstall = '' - mkdir -p $out/bin - - cat <<-END >$out/bin/mautrix-facebook - #!/bin/sh - PYTHONPATH="$PYTHONPATH" exec ${python3}/bin/python -m mautrix_facebook "\$@" - END - chmod +x $out/bin/mautrix-facebook - ''; - - checkPhase = '' - $out/bin/mautrix-facebook --help - ''; - - meta = with lib; { - homepage = "https://github.com/mautrix/facebook"; - changelog = "https://github.com/mautrix/facebook/releases/tag/v${version}"; - description = "Matrix-Facebook Messenger puppeting bridge"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ kevincox ]; - mainProgram = "mautrix-facebook"; - }; -} From cd2166e93083693c3a588b52c538c63466a9892f Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Mon, 10 Feb 2025 17:50:13 -0500 Subject: [PATCH 1234/2168] freeipa: add missing ifaddr dependency This should make the ipa-client-automount script work --- pkgs/os-specific/linux/freeipa/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/freeipa/default.nix b/pkgs/os-specific/linux/freeipa/default.nix index 212080d23365..3a7edb9abbb9 100644 --- a/pkgs/os-specific/linux/freeipa/default.nix +++ b/pkgs/os-specific/linux/freeipa/default.nix @@ -64,6 +64,7 @@ let jinja2 augeas samba + ifaddr ]; in stdenv.mkDerivation rec { From 157c574c95b230284afc5d79eca0084218b05ef5 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Tue, 11 Feb 2025 10:18:57 -0700 Subject: [PATCH 1235/2168] maintainers/team-list: remove sumnerevans from matrix Signed-off-by: Sumner Evans --- maintainers/team-list.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index bced164f9518..aa77c3245932 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -770,7 +770,6 @@ with lib.maintainers; mguentner ralith dandellion - sumnerevans nickcao teutat3s ]; From a87068b870558d840d6e98be8beeb1badba25df2 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Tue, 11 Feb 2025 10:19:10 -0700 Subject: [PATCH 1236/2168] matrix-synapse: update maintainers and make tests inherit maintainers from package Signed-off-by: Sumner Evans --- nixos/modules/services/matrix/synapse.nix | 2 +- nixos/tests/matrix/mjolnir.nix | 4 ++-- nixos/tests/matrix/synapse-workers.nix | 4 ++-- nixos/tests/matrix/synapse.nix | 4 ++-- pkgs/servers/matrix-synapse/default.nix | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/matrix/synapse.nix b/nixos/modules/services/matrix/synapse.nix index 48372d9c4874..1adc02852a4d 100644 --- a/nixos/modules/services/matrix/synapse.nix +++ b/nixos/modules/services/matrix/synapse.nix @@ -1597,9 +1597,9 @@ in }; meta = { + inherit (pkgs.matrix-synapse.meta) maintainers; buildDocsInSandbox = false; doc = ./synapse.md; - maintainers = teams.matrix.members; }; } diff --git a/nixos/tests/matrix/mjolnir.nix b/nixos/tests/matrix/mjolnir.nix index 67a53d045c2e..a4a4426758d3 100644 --- a/nixos/tests/matrix/mjolnir.nix +++ b/nixos/tests/matrix/mjolnir.nix @@ -30,8 +30,8 @@ import ../make-test-python.nix ( in { name = "mjolnir"; - meta = with pkgs.lib; { - maintainers = teams.matrix.members; + meta = { + inherit (pkgs.mjolnir.meta) maintainers; }; nodes = { diff --git a/nixos/tests/matrix/synapse-workers.nix b/nixos/tests/matrix/synapse-workers.nix index 10b72da70d43..f75a0528769a 100644 --- a/nixos/tests/matrix/synapse-workers.nix +++ b/nixos/tests/matrix/synapse-workers.nix @@ -2,8 +2,8 @@ import ../make-test-python.nix ( { pkgs, ... }: { name = "matrix-synapse-workers"; - meta = with pkgs.lib; { - maintainers = teams.matrix.members; + meta = { + inherit (pkgs.matrix-synapse.meta) maintainers; }; nodes = { diff --git a/nixos/tests/matrix/synapse.nix b/nixos/tests/matrix/synapse.nix index 96454491a7a4..c16182a46cd2 100644 --- a/nixos/tests/matrix/synapse.nix +++ b/nixos/tests/matrix/synapse.nix @@ -54,8 +54,8 @@ import ../make-test-python.nix ( { name = "matrix-synapse"; - meta = with pkgs.lib; { - maintainers = teams.matrix.members; + meta = { + inherit (pkgs.matrix-synapse.meta) maintainers; }; nodes = { diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index b2cab540a8e5..d3a1a8f9449f 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -186,6 +186,6 @@ python3.pkgs.buildPythonApplication rec { changelog = "https://github.com/element-hq/synapse/releases/tag/v${version}"; description = "Matrix reference homeserver"; license = licenses.agpl3Plus; - maintainers = teams.matrix.members; + maintainers = with lib.maintainers; teams.matrix.members ++ [ sumnerevans ]; }; } From 332372ce4b5acc8f1530b1486e05a27f5f2d0116 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Tue, 11 Feb 2025 15:12:59 +0000 Subject: [PATCH 1237/2168] python3Packages.craft-providers: fix bad substitution for setuptools version --- pkgs/development/python-modules/craft-providers/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/craft-providers/default.nix b/pkgs/development/python-modules/craft-providers/default.nix index 4ba9ad1adf4b..8d90421f5dd2 100644 --- a/pkgs/development/python-modules/craft-providers/default.nix +++ b/pkgs/development/python-modules/craft-providers/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { # The urllib3 incompat: https://github.com/msabramo/requests-unixsocket/pull/69 # This is already patched in nixpkgs. substituteInPlace pyproject.toml \ - --replace-fail "setuptools==73.0.1" "setuptools" + --replace-fail "setuptools==75.2.0" "setuptools" ''; pythonRelaxDeps = [ "requests" ]; From c292ac9573833322d71a790b901775a52feb769d Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Tue, 11 Feb 2025 15:39:05 +0000 Subject: [PATCH 1238/2168] python3Packages.macaroonbakery: use pythonRelaxDeps --- pkgs/development/python-modules/macaroonbakery/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/macaroonbakery/default.nix b/pkgs/development/python-modules/macaroonbakery/default.nix index f1598d432e1b..110bdc0ffd20 100644 --- a/pkgs/development/python-modules/macaroonbakery/default.nix +++ b/pkgs/development/python-modules/macaroonbakery/default.nix @@ -44,6 +44,8 @@ buildPythonPackage rec { requests ]; + pythonRelaxDeps = true; + pythonImportsCheck = [ "macaroonbakery" ]; nativeCheckInputs = [ From 41ded9d5a936c7a6f88eb97a014acd749f945463 Mon Sep 17 00:00:00 2001 From: Arsenii Zorin Date: Tue, 11 Feb 2025 20:24:25 +0300 Subject: [PATCH 1239/2168] pulumi-bin: 3.149.0 -> 3.150.0 --- pkgs/tools/admin/pulumi-bin/data.nix | 50 ++++++++++++++-------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix index b796b0befec8..486031d89981 100644 --- a/pkgs/tools/admin/pulumi-bin/data.nix +++ b/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,16 +1,16 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.149.0"; + version = "3.150.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.149.0-linux-x64.tar.gz"; - sha256 = "01q8q78q4f5d3nrv419lwsjrcvb1rbpjb2khwnrnijy808jgm5pz"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.150.0-linux-x64.tar.gz"; + sha256 = "0pdr4przwkbr10c4cyfcvsh0x5lsmdvqcxdifnl7la04si6mla3b"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.33.0-linux-amd64.tar.gz"; - sha256 = "0zqzlxmrz3ifs7dazhgjzmphdmg5g56kz1bi9s2iajhm22bxy7qm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.33.1-linux-amd64.tar.gz"; + sha256 = "1k78fsnifcrknr4xlzy30j4rjcz8811h7pnw1dsnqvqzcrjs9zas"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.6.1-linux-amd64.tar.gz"; @@ -41,8 +41,8 @@ sha256 = "0h3zym30gj8lyj294zj3dimdl2wdir2vmymvv6wr392f9i22m2yn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.18.0-linux-amd64.tar.gz"; - sha256 = "1brri4avf40fsa4374xil103mw9xm9s7vlcg6b44p9m3a9pczm5s"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.19.0-linux-amd64.tar.gz"; + sha256 = "19d2q12zs0dmsr6djhy7y35bqjax9mhixa4gz8lv4g78zc9vfkkx"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.49.0-linux-amd64.tar.gz"; @@ -163,12 +163,12 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.149.0-darwin-x64.tar.gz"; - sha256 = "17j0ilhqx08avrllkf72lfrzzhrv6k551a1vdag5xvkcsakcy9ik"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.150.0-darwin-x64.tar.gz"; + sha256 = "1c07s1xcys8r7jdnikkv0s03b7y003cvybijqmwxfq89wn95g5x9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.33.0-darwin-amd64.tar.gz"; - sha256 = "16364hqjbdy6zjrvmkz1ry434y1fblcbzyrlc0cipjb1nwf92yhp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.33.1-darwin-amd64.tar.gz"; + sha256 = "1hxyr5wzasqr7spxvw450vz82ckf9g53zhz9dkzj6yzpg1dbw8qd"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.6.1-darwin-amd64.tar.gz"; @@ -199,8 +199,8 @@ sha256 = "1j952sjqhp42a1s8fxn5li8mjfvl9as3ydhwdpslx8pzc8ykr2zj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.18.0-darwin-amd64.tar.gz"; - sha256 = "0m7h5dgwh2bz14lmncxaa7n97vgrp0fy65ll5q8jjw49s5a7jrnh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.19.0-darwin-amd64.tar.gz"; + sha256 = "1038d064l47m2058d9vpbl81d793h9q58whhxqs7vmc2wg99050c"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.49.0-darwin-amd64.tar.gz"; @@ -321,12 +321,12 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.149.0-linux-arm64.tar.gz"; - sha256 = "09yvl92bxdnz1796rsqjw0dxkw84s4c0gv69acd358wc1lv6ff2m"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.150.0-linux-arm64.tar.gz"; + sha256 = "1dyw5yfxb5l9bbjafdr5x5sm6j045cj44gigr50px5gci7h7cy3c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.33.0-linux-arm64.tar.gz"; - sha256 = "06w7740rf3nz36zi1pzpvz1nj36k36kqxiahl7zndw8zbbjq7sda"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.33.1-linux-arm64.tar.gz"; + sha256 = "06sxs66cdavs7bgs3b0mr1ywlsfgbdf1ikhyicllq9nnf8hw11ca"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.6.1-linux-arm64.tar.gz"; @@ -357,8 +357,8 @@ sha256 = "1d4a5xyx55mscqq4wqgvilfagk8mg49xnhwp5vx1i274kgdq7a7z"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.18.0-linux-arm64.tar.gz"; - sha256 = "0m93phlw0ixxvlsnv3g425clh4bf0j14w409pgkzig23zjanxrr0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.19.0-linux-arm64.tar.gz"; + sha256 = "1xcv4py5g7wdah5xdfz01ppp5x9wa8ha27zi3afx83d5anz3g49n"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.49.0-linux-arm64.tar.gz"; @@ -479,12 +479,12 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.149.0-darwin-arm64.tar.gz"; - sha256 = "0k01fdxydlw488wqvisxabp82z0a954g8zzjyavi06lik5qkab7y"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.150.0-darwin-arm64.tar.gz"; + sha256 = "0hbc63ki7h7m99f2v83rg1kicsl3jd4pjvc1fcmvs4zfzhwyvxl3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.33.0-darwin-arm64.tar.gz"; - sha256 = "15771vs6kvb031z5d66x6ii77aqwq3i79qr8k1h6dl6v807dgcgc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.33.1-darwin-arm64.tar.gz"; + sha256 = "1inxcss49ikfmxsyvv30c3ikqzzmr2p4643y40mv4fri6dnbk9dp"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.6.1-darwin-arm64.tar.gz"; @@ -515,8 +515,8 @@ sha256 = "1x4ij8qv9jq39fbacirjvk96hc117da5ll3fzrmgpkvjc1mall01"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.18.0-darwin-arm64.tar.gz"; - sha256 = "095lx9kxhq564wlp4q7d58ma2llx3daiiq8q2svn25nc6gs527fx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.19.0-darwin-arm64.tar.gz"; + sha256 = "065600j782v38w4hrbyqn0l6871s2j8s08xk560m145jnzza9p4x"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.49.0-darwin-arm64.tar.gz"; From e61d64c3679df00eb022f1733b7b2ca8a4167489 Mon Sep 17 00:00:00 2001 From: Rishik Yalamanchili <73787402+Rishik-Y@users.noreply.github.com> Date: Tue, 11 Feb 2025 23:04:19 +0530 Subject: [PATCH 1240/2168] =?UTF-8?q?fastfetch:=202.36.0=20=E2=86=92=202.3?= =?UTF-8?q?6.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/fa/fastfetch/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index b2e09f04e23e..8ade4bb67234 100644 --- a/pkgs/by-name/fa/fastfetch/package.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -45,13 +45,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.36.0"; + version = "2.36.1"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; tag = finalAttrs.version; - hash = "sha256-pSPXSvomvQBps8ctF/PXaOP+7xBIRxNlRVIFVy8nxwY="; + hash = "sha256-gvhhYZ6wp3t+GNL8lyKaC6IHZXxu+CQo40rsJARNKY0="; }; outputs = [ From d0fc0a6201659c3bd67ef091dae293f56046ce2f Mon Sep 17 00:00:00 2001 From: Dominic Date: Tue, 11 Feb 2025 18:41:32 +0100 Subject: [PATCH 1241/2168] librewolf-bin: 134.0.1-1 -> 135.0-1 --- pkgs/by-name/li/librewolf-bin/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/librewolf-bin/package.nix b/pkgs/by-name/li/librewolf-bin/package.nix index 7aec7bd04c0d..7d3a23cd489b 100644 --- a/pkgs/by-name/li/librewolf-bin/package.nix +++ b/pkgs/by-name/li/librewolf-bin/package.nix @@ -6,11 +6,11 @@ let pname = "librewolf-bin"; - upstreamVersion = "134.0.1-1"; + upstreamVersion = "135.0-1"; version = lib.replaceStrings [ "-" ] [ "." ] upstreamVersion; src = fetchurl { url = "https://gitlab.com/api/v4/projects/24386000/packages/generic/librewolf/${upstreamVersion}/LibreWolf.x86_64.AppImage"; - hash = "sha256-AZSIHs8m0Y5CWE9C1MyQReOIxkrl3QvLhHx+n41hlIk="; + hash = "sha256-Qg4hc3bpJh3NFMUlq65K1fVtp6Slgtk2OjvcELp4aH8="; }; appimageContents = appimageTools.extract { inherit pname version src; }; in From 8daeb3ce946b5e0ef81ffe8478810ec4db331545 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Tue, 11 Feb 2025 09:36:21 -0700 Subject: [PATCH 1242/2168] harper: only build harper-ls From @elijah-potter: `harper-cli` is a debugging tool for us. It shouldn't be published at all. Signed-off-by: Sumner Evans --- pkgs/by-name/ha/harper/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix index 04459f608807..ba03ff532ae3 100644 --- a/pkgs/by-name/ha/harper/package.nix +++ b/pkgs/by-name/ha/harper/package.nix @@ -15,6 +15,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-8JeF1HxsP+Y+C1g3YJ0B0+JHoRFkBjz4/T8rVr2KgGw="; }; + buildAndTestSubdir = "harper-ls"; useFetchCargoVendor = true; cargoHash = "sha256-uVjDFo5mJi4Xbq0Z+XOjy5VqXqkm0a+4xu+dVnjWXCU="; @@ -23,7 +24,10 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/Automattic/harper"; changelog = "https://github.com/Automattic/harper/releases/tag/v${version}"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ pbsds ]; - mainProgram = "harper-cli"; + maintainers = with lib.maintainers; [ + pbsds + sumnerevans + ]; + mainProgram = "harper-ls"; }; } From 611a0ee6b25f867c2e0b85dc8aa9b8c7830ae2f3 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Tue, 11 Feb 2025 13:01:14 -0500 Subject: [PATCH 1243/2168] gleam: 1.8.0 -> 1.8.1 --- pkgs/development/compilers/gleam/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index 6c71fdd534f1..f190cb7490c6 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -14,13 +14,13 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; tag = "v${version}"; - hash = "sha256-gBVr4kAec8hrDBiRXa/sQUNYvgSX3nTVMwFGYRFCbSA="; + hash = "sha256-Qt2VQhbiNNORrGUR5LHeBb0q/EIqPNPz/adljj6xpS4="; }; nativeBuildInputs = [ @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { ]; useFetchCargoVendor = true; - cargoHash = "sha256-tYSqE+bn0GUQe/xVBZTh37XsMyzFnmxgVCL0II2/3jQ="; + cargoHash = "sha256-7oawxv1s8BJsOxGuADKjf4XqJ/UT+zYOrPQCbQljArM="; passthru.updateScript = nix-update-script { }; From 12ad7461c9241f095a4c225e9c39d5de010a0bfb Mon Sep 17 00:00:00 2001 From: Commander <45269106+Commander07@users.noreply.github.com> Date: Tue, 11 Feb 2025 19:18:04 +0100 Subject: [PATCH 1244/2168] autosubsync-mpv: 0-unstable-2022-12-26 -> 0-unstable-2024-10-29 New version has added the `overwrite_old_sub` option. Default behavior remains unchanged. --- pkgs/applications/video/mpv/scripts/autosubsync-mpv.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/autosubsync-mpv.nix b/pkgs/applications/video/mpv/scripts/autosubsync-mpv.nix index ac2876055890..59daec0aa67d 100644 --- a/pkgs/applications/video/mpv/scripts/autosubsync-mpv.nix +++ b/pkgs/applications/video/mpv/scripts/autosubsync-mpv.nix @@ -7,13 +7,13 @@ buildLua { pname = "autosubsync-mpv"; - version = "0-unstable-2022-12-26"; + version = "0-unstable-2024-10-29"; src = fetchFromGitHub { owner = "joaquintorres"; repo = "autosubsync-mpv"; - rev = "22cb928ecd94cc8cadaf8c354438123c43e0c70d"; - sha256 = "sha256-XQPFC7l9MTZAW5FfULRQJfu/7FuGj9bbjQUZhNv0rlc="; + rev = "125ac13d1b84b3a64bb2e912225a8356c1c01364"; + sha256 = "sha256-Xwu8WTB3p3YDTydfyidF/zpN6CyTQyZgQvGX/HAa9hw="; }; # While nixpkgs only packages alass, we might as well make that the default From 395ce6cc75c89b3aca04180772a17ff8dc5d9f18 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Tue, 11 Feb 2025 11:27:17 -0700 Subject: [PATCH 1245/2168] mautrix-meta: 0.4.0 -> 0.4.3 https://github.com/mautrix/meta/releases/tag/v0.4.3 Also add myself as a maintainer Signed-off-by: Sumner Evans --- pkgs/by-name/ma/mautrix-meta/package.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ma/mautrix-meta/package.nix b/pkgs/by-name/ma/mautrix-meta/package.nix index 1b5204f6d20b..dcabe80c261b 100644 --- a/pkgs/by-name/ma/mautrix-meta/package.nix +++ b/pkgs/by-name/ma/mautrix-meta/package.nix @@ -15,7 +15,7 @@ buildGoModule rec { pname = "mautrix-meta"; - version = "0.4.0"; + version = "0.4.3"; subPackages = [ "cmd/mautrix-meta" ]; @@ -23,13 +23,13 @@ buildGoModule rec { owner = "mautrix"; repo = "meta"; rev = "v${version}"; - hash = "sha256-KJuLBJy/g4ShcylkqIG4OuUalwboUSErSif3p7x4Zo4="; + hash = "sha256-aq1tmw19evTxmSNpDQyFdjyc0ow1Rsm2jlodglcj084="; }; buildInputs = lib.optional (!withGoolm) olm; tags = lib.optional withGoolm "goolm"; - vendorHash = "sha256-ErY40xIDhhOHQI/jYa8DcnfjOI998neIMgb/IQNP/JQ="; + vendorHash = "sha256-1ulBTkhb/MDmu26R8v8HUt1HkRNpsufpp+EzTQrlaCQ="; passthru = { tests = { @@ -46,7 +46,10 @@ buildGoModule rec { homepage = "https://github.com/mautrix/meta"; description = "Matrix <-> Facebook and Matrix <-> Instagram hybrid puppeting/relaybot bridge"; license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ eyjhb ]; + maintainers = with lib.maintainers; [ + eyjhb + sumnerevans + ]; mainProgram = "mautrix-meta"; }; } From c4b4256bfb985de69acc5b312a01270d90e71e85 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 11 Feb 2025 19:30:12 +0100 Subject: [PATCH 1246/2168] linux_6_6: 6.6.76 -> 6.6.77 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 8078336c484f..630cc673e791 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -20,8 +20,8 @@ "hash": "sha256:0mm4q8f6kbqddy4zaxjf5xyqpnla5qprvsf7v3vq01gmlzr3rivc" }, "6.6": { - "version": "6.6.76", - "hash": "sha256:180kxgacwx7kr76gls8gw4zrrdrqb9xf6fjmmfi38h66y0aqn5l1" + "version": "6.6.77", + "hash": "sha256:0km855dnimg1clilnpcz293bd2gpbycvn3llm9kyynhjrzgqj408" }, "6.11": { "version": "6.11.11", From 31721165f8fc8f19b88a0c92421bca84fcbe0567 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Tue, 11 Feb 2025 11:36:51 -0700 Subject: [PATCH 1247/2168] mautrix-discord: 0.7.0 -> 0.7.2 https://github.com/mautrix/discord/releases/tag/v0.7.2 Also add myself as a maintainer Signed-off-by: Sumner Evans --- pkgs/by-name/ma/mautrix-discord/package.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ma/mautrix-discord/package.nix b/pkgs/by-name/ma/mautrix-discord/package.nix index d0b469debd1b..b3943084ca55 100644 --- a/pkgs/by-name/ma/mautrix-discord/package.nix +++ b/pkgs/by-name/ma/mautrix-discord/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "mautrix-discord"; - version = "0.7.0"; + version = "0.7.2"; src = fetchFromGitHub { owner = "mautrix"; repo = "discord"; rev = "v${version}"; - hash = "sha256-N6CepP+P63TIKKi6FQLJEuV5hFtiv1CcBM+1Y/QPZrI="; + hash = "sha256-KRfbxPblOL4JznnGx9Jj5XXEWEKzan5xWvAwYmP7yGc="; }; - vendorHash = "sha256-QdH98NA5Y9YKkvL8Gq8ChgvHFOyOBFXDDulxwql6v5c="; + vendorHash = "sha256-8SW2q4Svfe8X9qwzYBa5HhHyQZDsPJqig/V1/Wp+avo="; ldflags = [ "-s" @@ -42,7 +42,10 @@ buildGoModule rec { homepage = "https://github.com/mautrix/discord"; changelog = "https://github.com/mautrix/discord/blob/${src.rev}/CHANGELOG.md"; license = licenses.agpl3Only; - maintainers = with maintainers; [ MoritzBoehme ]; + maintainers = with maintainers; [ + MoritzBoehme + sumnerevans + ]; mainProgram = "mautrix-discord"; }; } From cdb630d1bdb6542d562b6b9bd712ccace133464c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 18:39:09 +0000 Subject: [PATCH 1248/2168] python312Packages.prometheus-api-client: 0.5.5 -> 0.5.6 --- .../python-modules/prometheus-api-client/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/prometheus-api-client/default.nix b/pkgs/development/python-modules/prometheus-api-client/default.nix index affb5a2971fc..93cf3ed6f1b3 100644 --- a/pkgs/development/python-modules/prometheus-api-client/default.nix +++ b/pkgs/development/python-modules/prometheus-api-client/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "prometheus-api-client"; - version = "0.5.5"; + version = "0.5.6"; format = "setuptools"; src = fetchFromGitHub { owner = "4n4nd"; repo = "prometheus-api-client-python"; tag = "v${version}"; - hash = "sha256-tUu0+ZUOFxBCj//lHhNm88rhFbS01j1x508+nqIkCfQ="; + hash = "sha256-0vnG0m+RV2Z9GIMJ/R0edjcjyPH1OvB8zERCMeyRuRg="; }; propagatedBuildInputs = [ @@ -47,7 +47,7 @@ buildPythonPackage rec { and performing various aggregation operations on the time series data. ''; homepage = "https://github.com/4n4nd/prometheus-api-client-python"; - changelog = "https://github.com/4n4nd/prometheus-api-client-python/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/4n4nd/prometheus-api-client-python/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ azahi ]; }; From 2e4d084c588d812a08ab83424467ae9e8e92c8de Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 18:47:53 +0000 Subject: [PATCH 1249/2168] python312Packages.astropy-healpix: 1.0.3 -> 1.1.0 --- pkgs/development/python-modules/astropy-healpix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/astropy-healpix/default.nix b/pkgs/development/python-modules/astropy-healpix/default.nix index fce3ab8e11e9..53af110b3836 100644 --- a/pkgs/development/python-modules/astropy-healpix/default.nix +++ b/pkgs/development/python-modules/astropy-healpix/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "astropy-healpix"; - version = "1.0.3"; + version = "1.1.0"; pyproject = true; src = fetchPypi { inherit version; pname = lib.replaceStrings [ "-" ] [ "_" ] pname; - hash = "sha256-3l0qfsl7FnBFBmlx8loVDR5AYfBxWb4jZJY02zbnl0Y="; + hash = "sha256-0YFlh6YEkYjiqi6fABJZ3j+LoVjwS5O1BruEcmQAf24="; }; nativeBuildInputs = [ From 6fd9de8bb1f0cead4ae279a5452cafb1f51e173a Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Tue, 11 Feb 2025 12:10:04 -0700 Subject: [PATCH 1250/2168] freebsd.mount_nullfs: init --- pkgs/os-specific/bsd/freebsd/pkgs/mount_nullfs.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/mount_nullfs.nix diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/mount_nullfs.nix b/pkgs/os-specific/bsd/freebsd/pkgs/mount_nullfs.nix new file mode 100644 index 000000000000..32717aa22dd7 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/mount_nullfs.nix @@ -0,0 +1,10 @@ +{ + lib, + mkDerivation, +}: +mkDerivation { + path = "sbin/mount_nullfs"; + extraPaths = [ "sbin/mount" ]; + + meta.platforms = lib.platforms.freebsd; +} From 9509dab11b490fb7e561657124a6ceba415444ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 11 Feb 2025 19:23:40 +0000 Subject: [PATCH 1251/2168] devenv: 1.3.1 -> 1.4 --- pkgs/by-name/de/devenv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/de/devenv/package.nix b/pkgs/by-name/de/devenv/package.nix index 61290c125be6..6e64ccf592e2 100644 --- a/pkgs/by-name/de/devenv/package.nix +++ b/pkgs/by-name/de/devenv/package.nix @@ -27,7 +27,7 @@ let doInstallCheck = false; }); - version = "1.3.1"; + version = "1.4"; in rustPlatform.buildRustPackage { pname = "devenv"; @@ -37,11 +37,11 @@ rustPlatform.buildRustPackage { owner = "cachix"; repo = "devenv"; rev = "v${version}"; - hash = "sha256-FhlknassIb3rKEucqnfFAzgny1ANmenJcTyRaXYwbA0="; + hash = "sha256-ax0264nOyPcTJvIJAnPKGfkfXQ8Oe8ZVFziKf3UV26o="; }; useFetchCargoVendor = true; - cargoHash = "sha256-8FuRxs4wRdMT/0ZGD1Cj12f0igzlAx3G5OW4IhB9hYk="; + cargoHash = "sha256-K06D4tD3IOCA7/iqQ7fhybsgcSmMxPUcoUi+VNPtgAY="; buildAndTestSubdir = "devenv"; From 38ffb2ce340356d60e8738a049073e6f2b17100d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 19:43:17 +0000 Subject: [PATCH 1252/2168] python312Packages.textual-fastdatatable: 0.11.0 -> 0.12.0 --- .../python-modules/textual-fastdatatable/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/textual-fastdatatable/default.nix b/pkgs/development/python-modules/textual-fastdatatable/default.nix index a063f5dbe665..46213a689308 100644 --- a/pkgs/development/python-modules/textual-fastdatatable/default.nix +++ b/pkgs/development/python-modules/textual-fastdatatable/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "textual-fastdatatable"; - version = "0.11.0"; + version = "0.12.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "tconbeer"; repo = "textual-fastdatatable"; tag = "v${version}"; - hash = "sha256-Jz0ujO/nAnn15t8/OFOzZTpVBXNYsfVhxmYdGC39PpM="; + hash = "sha256-aQduVFHsdAMwjJzFPqOGB5Ec16YZ9YOYnEK6Ilf96xM="; }; build-system = [ poetry-core ]; @@ -57,7 +57,7 @@ buildPythonPackage rec { meta = { description = "A performance-focused reimplementation of Textual's DataTable widget, with a pluggable data storage backend"; homepage = "https://github.com/tconbeer/textual-fastdatatable"; - changelog = "https://github.com/tconbeer/textual-fastdatatable/releases/tag/v${version}"; + changelog = "https://github.com/tconbeer/textual-fastdatatable/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ pcboy ]; }; From fa4301e30443a65c2a8b6bfa21021c2b834fb11d Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 5 Feb 2025 06:33:02 +0100 Subject: [PATCH 1253/2168] ocamlPackages.multipart_form: init at 0.6.0 --- .../ocaml-modules/multipart_form/default.nix | 45 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/ocaml-modules/multipart_form/default.nix diff --git a/pkgs/development/ocaml-modules/multipart_form/default.nix b/pkgs/development/ocaml-modules/multipart_form/default.nix new file mode 100644 index 000000000000..b020eb21a376 --- /dev/null +++ b/pkgs/development/ocaml-modules/multipart_form/default.nix @@ -0,0 +1,45 @@ +{ + lib, + buildDunePackage, + fetchurl, + angstrom, + base64, + bigstringaf, + fmt, + ke, + logs, + pecu, + prettym, + unstrctrd, + uutf, +}: + +buildDunePackage rec { + pname = "multipart_form"; + version = "0.6.0"; + + src = fetchurl { + url = "https://github.com/dinosaure/multipart_form/releases/download/v${version}/multipart_form-${version}.tbz"; + hash = "sha256-oOMpwyPP+q1BZ81a+HpooeaglUZgDxdz2MDNLygGIRY="; + }; + + propagatedBuildInputs = [ + angstrom + base64 + bigstringaf + fmt + ke + logs + pecu + prettym + unstrctrd + uutf + ]; + + meta = { + description = "Implementation of RFC7578 in OCaml"; + homepage = "https://github.com/dinosaure/multipart_form"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 7c216103317c..9220d22805f9 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1246,6 +1246,8 @@ let multicore-magic = callPackage ../development/ocaml-modules/multicore-magic { }; + multipart_form = callPackage ../development/ocaml-modules/multipart_form { }; + multipart-form-data = callPackage ../development/ocaml-modules/multipart-form-data { }; mustache = callPackage ../development/ocaml-modules/mustache { }; From 3fd6fcf0a896c789573955df6e674e7dad64da67 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 5 Feb 2025 06:33:11 +0100 Subject: [PATCH 1254/2168] ocamlPackages.multipart_form-lwt: init at 0.6.0 --- .../ocaml-modules/multipart_form/lwt.nix | 17 +++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/development/ocaml-modules/multipart_form/lwt.nix diff --git a/pkgs/development/ocaml-modules/multipart_form/lwt.nix b/pkgs/development/ocaml-modules/multipart_form/lwt.nix new file mode 100644 index 000000000000..9644e3ff10d6 --- /dev/null +++ b/pkgs/development/ocaml-modules/multipart_form/lwt.nix @@ -0,0 +1,17 @@ +{ + buildDunePackage, + multipart_form, + lwt, +}: + +buildDunePackage { + pname = "multipart_form-lwt"; + + inherit (multipart_form) version src meta; + + propagatedBuildInputs = [ + lwt + multipart_form + + ]; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 9220d22805f9..4706d9fa0ecd 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1248,6 +1248,8 @@ let multipart_form = callPackage ../development/ocaml-modules/multipart_form { }; + multipart_form-lwt = callPackage ../development/ocaml-modules/multipart_form/lwt.nix { }; + multipart-form-data = callPackage ../development/ocaml-modules/multipart-form-data { }; mustache = callPackage ../development/ocaml-modules/mustache { }; From 0344bd7f882b1c485f025239be420cb50d5b0d86 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 11 Feb 2025 21:12:31 +0100 Subject: [PATCH 1255/2168] ci/eval: Refactor to cleanly separate stderr Previously stderr was mixed with the time stats This allows checking stderr in the next commit --- ci/eval/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/ci/eval/default.nix b/ci/eval/default.nix index 927dec5a908d..fe4a8027383f 100644 --- a/ci/eval/default.nix +++ b/ci/eval/default.nix @@ -87,7 +87,8 @@ let export NIX_SHOW_STATS_PATH="$outputDir/stats/$myChunk" echo "Chunk $myChunk on $system start" set +e - command time -f "Chunk $myChunk on $system done [%MKB max resident, %Es elapsed] %C" \ + command time -o "$outputDir/timestats/$myChunk" \ + -f "Chunk $myChunk on $system done [%MKB max resident, %Es elapsed] %C" \ nix-env -f "${nixpkgs}/pkgs/top-level/release-attrpaths-parallel.nix" \ --option restrict-eval true \ --option allow-import-from-derivation false \ @@ -102,9 +103,12 @@ let --arg includeBroken ${lib.boolToString includeBroken} \ -I ${nixpkgs} \ -I ${attrpathFile} \ - > "$outputDir/result/$myChunk" + > "$outputDir/result/$myChunk" \ + 2> "$outputDir/stderr/$myChunk" exitCode=$? set -e + cat "$outputDir/stderr/$myChunk" + cat "$outputDir/timestats/$myChunk" if (( exitCode != 0 )); then echo "Evaluation failed with exit code $exitCode" # This immediately halts all xargs processes @@ -164,7 +168,7 @@ let ''} chunkOutputDir=$(mktemp -d) - mkdir "$chunkOutputDir"/{result,stats} + mkdir "$chunkOutputDir"/{result,stats,timestats,stderr} seq -w 0 "$seq_end" | command time -f "%e" -o "$out/total-time" \ From 7c62a764b4872d6a1de0bb564d9dd8d9b1a2ac56 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 11 Feb 2025 21:16:58 +0100 Subject: [PATCH 1256/2168] ci/eval: Fail on non-empty stderr Just like the channel eval requires. --- ci/eval/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci/eval/default.nix b/ci/eval/default.nix index fe4a8027383f..377582b96068 100644 --- a/ci/eval/default.nix +++ b/ci/eval/default.nix @@ -113,6 +113,9 @@ let echo "Evaluation failed with exit code $exitCode" # This immediately halts all xargs processes kill $PPID + elif [[ -s "$outputDir/stderr/$myChunk" ]]; then + echo "Nixpkgs on $system evaluated with warnings, aborting" + kill $PPID fi ''; in From 799273bf13dfbd3c108f1b8659b78e970cfe6f43 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 11 Feb 2025 20:47:52 +0100 Subject: [PATCH 1257/2168] ci/eval/compare: Ignore null packages CI can fail to evaluate if a package is null: https://github.com/NixOS/nixpkgs/actions/runs/13209876145/job/36881335314?pr=380228 --- ci/eval/compare/maintainers.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ci/eval/compare/maintainers.nix b/ci/eval/compare/maintainers.nix index 64025c066f96..69748a629cff 100644 --- a/ci/eval/compare/maintainers.nix +++ b/ci/eval/compare/maintainers.nix @@ -24,8 +24,11 @@ let pkg: if (lib.attrsets.hasAttrByPath pkg.path pkgs) then ( - if (builtins.tryEval (lib.attrsets.attrByPath pkg.path null pkgs)).success then - true + let + value = lib.attrsets.attrByPath pkg.path null pkgs; + in + if (builtins.tryEval value).success then + if value != null then true else builtins.trace "${pkg.name} exists but is null" false else builtins.trace "Failed to access ${pkg.name} even though it exists" false ) From 3a142c5ca1afe303e97db1cdd8934da61a3ad0b7 Mon Sep 17 00:00:00 2001 From: Charlie Egan Date: Tue, 11 Feb 2025 15:32:08 +0000 Subject: [PATCH 1258/2168] opa-envoy-plugin: init at 1.1.0-envoy-1 --- pkgs/by-name/op/opa-envoy-plugin/package.nix | 82 ++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 pkgs/by-name/op/opa-envoy-plugin/package.nix diff --git a/pkgs/by-name/op/opa-envoy-plugin/package.nix b/pkgs/by-name/op/opa-envoy-plugin/package.nix new file mode 100644 index 000000000000..07df9758c624 --- /dev/null +++ b/pkgs/by-name/op/opa-envoy-plugin/package.nix @@ -0,0 +1,82 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + installShellFiles, + + enableWasmEval ? false, +}: + +assert + enableWasmEval && stdenv.hostPlatform.isDarwin + -> builtins.throw "building with wasm on darwin is failing in nixpkgs"; + +buildGoModule rec { + pname = "opa-envoy-plugin"; + version = "1.1.0-envoy-1"; + + src = fetchFromGitHub { + owner = "open-policy-agent"; + repo = "opa-envoy-plugin"; + tag = "v${version}"; + hash = "sha256-IGB3m3xXZnDs8Vb38MYnS01yt/Nk3jHiPn+QjrPIfuQ="; + }; + + vendorHash = null; + + nativeBuildInputs = [ installShellFiles ]; + + subPackages = [ "./cmd/opa-envoy-plugin" ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/open-policy-agent/opa/v1/version.Version=${version}" + ]; + + tags = lib.optional enableWasmEval ( + builtins.trace ( + "Warning: enableWasmEval breaks reproducability, " + + "ensure you need wasm evaluation. " + + "`opa build` does not need this feature." + ) "opa_wasm" + ); + + checkPhase = '' + go test -v $(go list ./.../ | grep -v 'vendor') + ''; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + $out/bin/opa-envoy-plugin --help + $out/bin/opa-envoy-plugin version + $out/bin/opa-envoy-plugin version | grep "Version: ${version}" + + ${lib.optionalString enableWasmEval '' + # If wasm is enabled verify it works + $out/bin/opa eval -t wasm 'trace("hello from wasm")' + ''} + + runHook postInstallCheck + ''; + + meta = { + mainProgram = "opa"; + homepage = "https://www.openpolicyagent.org/docs/latest/envoy-introduction/"; + changelog = "https://github.com/open-policy-agent/opa-envoy-plugin/blob/v${version}/CHANGELOG.md"; + description = "A plugin to enforce OPA policies with Envoy"; + longDescription = '' + OPA-Envoy extends OPA with a gRPC server that implements the Envoy + External Authorization API. You can use this version of OPA to enforce + fine-grained, context-aware access control policies with Envoy without + modifying your microservice. + ''; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + charlieegan3 + ]; + }; +} From 87d51d391b950a4044ba093754412209f74593ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 11 Feb 2025 17:07:37 +0100 Subject: [PATCH 1259/2168] ndpi: 4.12 -> 4.10 Downgrade ndpi to fix building ntopng, which is the only user of this library. (Note that ndpi 4.11 doesn't exist.) Fixes: 63c1ea97a19f189387cc0056ef24b4c4e76a8002 ("ndpi: 4.10 -> 4.12") (A plain revert fails because of treewide changes.) Ref. https://github.com/NixOS/nixpkgs/issues/380866 --- pkgs/by-name/nd/ndpi/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nd/ndpi/package.nix b/pkgs/by-name/nd/ndpi/package.nix index 134487ef4e96..ffade02b5b4a 100644 --- a/pkgs/by-name/nd/ndpi/package.nix +++ b/pkgs/by-name/nd/ndpi/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ndpi"; - version = "4.12"; + version = "4.10"; src = fetchFromGitHub { owner = "ntop"; repo = "nDPI"; tag = finalAttrs.version; - hash = "sha256-jdyKvM/Tb9pRWQPxpB/UQOOKamWrTS24Ofc3M5M1Zso="; + hash = "sha256-iXqvDMJsOXcg9YkqKFgInLLfH6j/HEp4bEaIl6dpVtc="; }; nativeBuildInputs = [ From 6675fab0b51590d3f813739f8ae1c4955fdcbeb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 11 Feb 2025 17:09:03 +0100 Subject: [PATCH 1260/2168] ntopng: fix after noBrokenSymlinks Ref. https://github.com/NixOS/nixpkgs/issues/380866 Ref. https://github.com/NixOS/nixpkgs/pull/370750 --- pkgs/by-name/nt/ntopng/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/nt/ntopng/package.nix b/pkgs/by-name/nt/ntopng/package.nix index 48ee6a6857b5..e26ff249810c 100644 --- a/pkgs/by-name/nt/ntopng/package.nix +++ b/pkgs/by-name/nt/ntopng/package.nix @@ -81,6 +81,16 @@ stdenv.mkDerivation (finalAttrs: { -i include/ntop_defines.h ''; + # Upstream build system makes + # $out/share/ntopng/httpdocs/geoip/README.geolocation.md a dangling symlink + # to ../../doc/README.geolocation.md. Copying the whole doc/ tree adds over + # 70 MiB to the output size, so only copy the files we need for now. + # (Ref. noBrokenSymlinks.) + postInstall = '' + mkdir -p "$out/share/ntopng/doc" + cp -r doc/README.geolocation.md "$out/share/ntopng/doc/" + ''; + enableParallelBuilding = true; meta = with lib; { From d46de2852d794108aaf9760310bb8088f9eef709 Mon Sep 17 00:00:00 2001 From: Ethan Carter Edwards Date: Tue, 11 Feb 2025 15:17:57 -0500 Subject: [PATCH 1261/2168] difftastic: modernize Signed-off-by: Ethan Carter Edwards --- pkgs/by-name/di/difftastic/package.nix | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/di/difftastic/package.nix b/pkgs/by-name/di/difftastic/package.nix index 16b3f94e3393..490c3938ca5b 100644 --- a/pkgs/by-name/di/difftastic/package.nix +++ b/pkgs/by-name/di/difftastic/package.nix @@ -5,6 +5,8 @@ fetchFromGitHub, testers, difftastic, + nix-update-script, + versionCheckHook, }: let @@ -22,8 +24,8 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "wilfred"; - repo = pname; - rev = version; + repo = "difftastic"; + tag = version; hash = "sha256-AAnlopJTb+tjkACISK9OC0k59BDt+8michzt37P1lL8="; }; @@ -41,14 +43,20 @@ rustPlatform.buildRustPackage rec { -p1 < ${mimallocPatch} ''; - passthru.tests.version = testers.testVersion { package = difftastic; }; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/difft"; + versionCheckProgramArg = "--version"; + doInstallCheck = true; - meta = with lib; { + passthru.tests.version = testers.testVersion { package = difftastic; }; + passthru.updateScript = nix-update-script { }; + + meta = { description = "Syntax-aware diff"; homepage = "https://github.com/Wilfred/difftastic"; changelog = "https://github.com/Wilfred/difftastic/blob/${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ethancedwards8 figsoda matthiasbeyer From ae37b7fef5c7b0af9bd17c635d21652083e3a084 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Tue, 11 Feb 2025 15:49:51 +0000 Subject: [PATCH 1262/2168] python3Packages.logassert: init at 8.2 --- .../python-modules/logassert/default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/python-modules/logassert/default.nix diff --git a/pkgs/development/python-modules/logassert/default.nix b/pkgs/development/python-modules/logassert/default.nix new file mode 100644 index 000000000000..04640d926e9a --- /dev/null +++ b/pkgs/development/python-modules/logassert/default.nix @@ -0,0 +1,42 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pytestCheckHook, + flake8, + structlog, +}: + +buildPythonPackage rec { + pname = "logassert"; + version = "8.2"; + + pyproject = true; + + src = fetchFromGitHub { + owner = "facundobatista"; + repo = "logassert"; + tag = version; + hash = "sha256-wtSX1jAHanHCF58cSNluChWY3lrrsgludnnW+xVJuOo="; + }; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ "logassert" ]; + + nativeCheckInputs = [ + flake8 + pytestCheckHook + structlog + ]; + + meta = { + description = "A simple Log Assertion mechanism for Python unittests"; + homepage = "https://github.com/facundobatista/logassert"; + changelog = "https://github.com/facundobatista/logassert/releases/tag/${version}"; + license = lib.licenses.lgpl3Only; + maintainers = with lib.maintainers; [ jnsgruk ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6c8a9c3e0318..a128bbcc871e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7748,6 +7748,8 @@ self: super: with self; { log-symbols = callPackage ../development/python-modules/log-symbols { }; + logassert = callPackage ../development/python-modules/logassert { }; + logbook = callPackage ../development/python-modules/logbook { }; logfury = callPackage ../development/python-modules/logfury { }; From 8c9bb48ad3e07b40380c25670b61285f400d7dd8 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Tue, 11 Feb 2025 15:51:54 +0000 Subject: [PATCH 1263/2168] python3Packages.craft-providers: 2.1.0 -> 2.1.1 --- .../python-modules/craft-providers/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/craft-providers/default.nix b/pkgs/development/python-modules/craft-providers/default.nix index 8d90421f5dd2..bcdbcf148b43 100644 --- a/pkgs/development/python-modules/craft-providers/default.nix +++ b/pkgs/development/python-modules/craft-providers/default.nix @@ -15,12 +15,12 @@ responses, freezegun, pytest-subprocess, - pytest-logdog, + logassert, }: buildPythonPackage rec { pname = "craft-providers"; - version = "2.1.0"; + version = "2.1.1"; pyproject = true; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-providers"; tag = version; - hash = "sha256-+j3uwvecffl8cK+yNidWbL243VnPkX72DMYv8RXMaXE="; + hash = "sha256-aW3efKy3c7ZGXS4wsvby0ww3Gwjt+1tMKsJCGprkcZo="; }; patches = [ @@ -69,10 +69,10 @@ buildPythonPackage rec { nativeCheckInputs = [ freezegun + logassert pytest-check pytest-mock pytest-subprocess - pytest-logdog pytestCheckHook responses ]; From 8d1cad230981223e308ef72fb8c5d35961b2b5d3 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 7 Feb 2025 17:59:30 +0100 Subject: [PATCH 1264/2168] python312Packages.catboost: mark as broken --- pkgs/development/python-modules/catboost/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/catboost/default.nix b/pkgs/development/python-modules/catboost/default.nix index d0fc77b70038..919e206da006 100644 --- a/pkgs/development/python-modules/catboost/default.nix +++ b/pkgs/development/python-modules/catboost/default.nix @@ -22,8 +22,8 @@ buildPythonPackage rec { pname version src - meta ; + pyproject = true; sourceRoot = "${src.name}/catboost/python-package"; @@ -55,4 +55,10 @@ buildPythonPackage rec { doCheck = false; pythonImportsCheck = [ "catboost" ]; + + meta = catboost.meta // { + # Incompatible with numpy >= 2.0 + # https://github.com/catboost/catboost/issues/2671 + broken = true; + }; } From 837e57fab36d6e477cdb50afa5c9d5cf8b04add7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 20:55:51 +0000 Subject: [PATCH 1265/2168] postgresqlPackages.pgroonga: 3.2.5 -> 4.0.0 --- pkgs/servers/sql/postgresql/ext/pgroonga.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index c8696b67e674..18901547e1c3 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -12,13 +12,13 @@ buildPostgresqlExtension rec { pname = "pgroonga"; - version = "3.2.5"; + version = "4.0.0"; src = fetchFromGitHub { owner = "pgroonga"; repo = "pgroonga"; rev = "${version}"; - hash = "sha256-mWpgBoKj7wm7Tb+raL+sjAQqTdzF23SH/wQRYn5bLhw="; + hash = "sha256-9rDb7rNd/HpvdQ/lMQGCr1Hq/4TBBo9HaA2b0zmC9QY="; }; nativeBuildInputs = [ pkg-config ]; From f0e6d1f1825dc94bf3aab06b5ee4ff03e32dd0d4 Mon Sep 17 00:00:00 2001 From: Ethan Carter Edwards Date: Sun, 9 Feb 2025 14:29:27 -0500 Subject: [PATCH 1266/2168] anarch: init at 1.0-unstable-2023-09-08 Signed-off-by: Ethan Carter Edwards --- pkgs/by-name/an/anarch/package.nix | 55 ++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 pkgs/by-name/an/anarch/package.nix diff --git a/pkgs/by-name/an/anarch/package.nix b/pkgs/by-name/an/anarch/package.nix new file mode 100644 index 000000000000..811fe5e253d9 --- /dev/null +++ b/pkgs/by-name/an/anarch/package.nix @@ -0,0 +1,55 @@ +{ + lib, + stdenv, + fetchFromGitLab, + SDL2, + xorg, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "anarch"; + version = "1.0-unstable-2023-09-08"; + + src = fetchFromGitLab { + owner = "drummyfish"; + repo = "anarch"; + rev = "6f90562161200682459e772f1dacb747f23c5f95"; + hash = "sha256-KmuJruzQRFunhwUGz3bHhXgtD2m4+5Vk0n7xhzVBMWs="; + }; + + buildInputs = [ + SDL2 + xorg.libXcursor + xorg.libXrandr + xorg.libXfixes + xorg.libXext + xorg.libXi + xorg.libXScrnSaver + ]; + + # upstream is an error-prone make/build script + buildPhase = '' + runHook preBuild + + $CC -O3 -o anarch main_sdl.c $(sdl2-config --cflags --libs) + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -Dm755 anarch $out/bin/anarch + + runHook postInstall + ''; + + meta = { + homepage = "https://drummyfish.gitlab.io/anarch/"; + description = "Suckless FPS game"; + maintainers = with lib.maintainers; [ ethancedwards8 ]; + license = lib.licenses.cc0; + platforms = lib.platforms.unix; + mainProgram = "anarch"; + }; +}) From 44f6a48030bb51491860cc88aed46aadf94c31cd Mon Sep 17 00:00:00 2001 From: Ethan Carter Edwards Date: Sun, 9 Feb 2025 12:45:11 -0500 Subject: [PATCH 1267/2168] msnake: init at 0.1.1-unstable-2020-02-01 Signed-off-by: Ethan Carter Edwards --- pkgs/by-name/ms/msnake/package.nix | 37 ++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 pkgs/by-name/ms/msnake/package.nix diff --git a/pkgs/by-name/ms/msnake/package.nix b/pkgs/by-name/ms/msnake/package.nix new file mode 100644 index 000000000000..430fb2553639 --- /dev/null +++ b/pkgs/by-name/ms/msnake/package.nix @@ -0,0 +1,37 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + ncurses, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "msnake"; + # last release tag was 13 years ago + version = "0.1.1-unstable-2020-02-01"; + + src = fetchFromGitHub { + owner = "mogria"; + repo = "msnake"; + rev = "830967fc8195216120fedcac1574113b367a0f9a"; + hash = "sha256-5q3yT7amPF+SSvO6/eUU7IiK0k6f3nme9YYBUobSuuo="; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + ncurses + ]; + + meta = { + description = "Multiplatform command line snake game"; + homepage = "https://github.com/mogria/msnake"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + mainProgram = "msnake"; + maintainers = with lib.maintainers; [ ethancedwards8 ]; + }; +}) From 54c767c8896b628f4f24fee6357d738ad119e734 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Tue, 11 Feb 2025 16:17:02 +0000 Subject: [PATCH 1268/2168] python3Packages.craft-parts: 2.2.2 -> 2.6.0 --- .../craft-parts/bash-path.patch | 90 +++++++++++++++---- .../python-modules/craft-parts/default.nix | 14 ++- 2 files changed, 86 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/craft-parts/bash-path.patch b/pkgs/development/python-modules/craft-parts/bash-path.patch index 80e63d48003d..f684b3bf6920 100644 --- a/pkgs/development/python-modules/craft-parts/bash-path.patch +++ b/pkgs/development/python-modules/craft-parts/bash-path.patch @@ -1,19 +1,8 @@ diff --git a/craft_parts/executor/step_handler.py b/craft_parts/executor/step_handler.py -index 404df69..f90e2ac 100644 +index 5eab915..bc26252 100644 --- a/craft_parts/executor/step_handler.py +++ b/craft_parts/executor/step_handler.py -@@ -243,8 +243,9 @@ class StepHandler: - print(script, file=script_file) - script_file.flush() - script_file.seek(0) -+ import shutil - process = subprocess.Popen( # pylint: disable=consider-using-with -- ["/bin/bash"], -+ [shutil.which("bash")], - stdin=script_file, - cwd=work_dir, - stdout=self._stdout, -@@ -394,7 +395,8 @@ def _create_and_run_script( +@@ -445,7 +445,8 @@ def _create_and_run_script( ) -> None: """Create a script with step-specific commands and execute it.""" with script_path.open("w") as run_file: @@ -22,12 +11,28 @@ index 404df69..f90e2ac 100644 + print(f"#!{shutil.which('bash')}", file=run_file) print("set -euo pipefail", file=run_file) - if build_environment_script_path: + if environment_script_path: +diff --git a/craft_parts/plugins/java_plugin.py b/craft_parts/plugins/java_plugin.py +index f2b4064..cb4e9e8 100644 +--- a/craft_parts/plugins/java_plugin.py ++++ b/craft_parts/plugins/java_plugin.py +@@ -71,9 +71,8 @@ class JavaPlugin(Plugin): + return None, "" + + def _find_javac(self) -> list[str]: +- cmd = ["find", "/usr/lib/jvm", "-path", "*/bin/javac", "-print"] +- output = subprocess.check_output(cmd, text=True) +- return [x for x in output.split("\n") if len(x) > 0] ++ import shutil ++ return [shutil.which("javac")] + + @override + def get_build_environment(self) -> dict[str, str]: diff --git a/craft_parts/plugins/validator.py b/craft_parts/plugins/validator.py -index b8d8f11..fce0e72 100644 +index 5b4c735..8ff30c2 100644 --- a/craft_parts/plugins/validator.py +++ b/craft_parts/plugins/validator.py -@@ -142,9 +142,9 @@ class PluginEnvironmentValidator: +@@ -141,9 +141,9 @@ class PluginEnvironmentValidator: print(self._env, file=env_file) print(cmd, file=env_file) env_file.flush() @@ -39,3 +44,56 @@ index b8d8f11..fce0e72 100644 check=True, capture_output=True, text=True, +diff --git a/tests/unit/executor/test_step_handler.py b/tests/unit/executor/test_step_handler.py +index 4e73c2b..b762fb8 100644 +--- a/tests/unit/executor/test_step_handler.py ++++ b/tests/unit/executor/test_step_handler.py +@@ -209,9 +209,10 @@ class TestStepHandlerBuiltins: + + assert get_mode(build_script_path) == 0o755 + with open(build_script_path) as file: ++ import shutil + assert file.read() == dedent( + f"""\ +- #!/bin/bash ++ #!{shutil.which('bash')} + set -euo pipefail + source {environment_script_path} + set -x +diff --git a/tests/unit/utils/test_process.py b/tests/unit/utils/test_process.py +index 84b29ad..dc2d772 100644 +--- a/tests/unit/utils/test_process.py ++++ b/tests/unit/utils/test_process.py +@@ -33,7 +33,8 @@ _RUN_TEST_CASES = [ + + @pytest.mark.parametrize(("out", "err"), _RUN_TEST_CASES) + def test_run(out, err): +- result = process.run(["/usr/bin/sh", "-c", f"echo {out};sleep 0;echo {err} >&2"]) ++ import shutil ++ result = process.run([shutil.which("sh"), "-c", f"echo {out};sleep 0;echo {err} >&2"]) + assert result.returncode == 0 + assert result.stdout == (out + "\n").encode() + assert result.stderr == (err + "\n").encode() +@@ -42,8 +43,9 @@ def test_run(out, err): + + @pytest.mark.parametrize(("out", "err"), _RUN_TEST_CASES) + def test_run_devnull(out, err): ++ import shutil + result = process.run( +- ["/usr/bin/sh", "-c", f"echo {out};echo {err} >&2"], ++ [shutil.which("sh"), "-c", f"echo {out};echo {err} >&2"], + stdout=subprocess.DEVNULL, + stderr=subprocess.DEVNULL, + ) +@@ -78,9 +80,10 @@ def test_run_selector(out, err, new_dir): + + selector.register(sock, selectors.EVENT_READ, accept) + ++ import shutil + result = process.run( + [ +- "/usr/bin/sh", ++ shutil.which("sh"), + "-c", + f"echo {out};sleep 0;echo {err} >&2; echo -n {out}|socat - UNIX-CONNECT:{new_dir}/test.socket", + ], diff --git a/pkgs/development/python-modules/craft-parts/default.nix b/pkgs/development/python-modules/craft-parts/default.nix index eb462fcb5a98..e7bbf01087cb 100644 --- a/pkgs/development/python-modules/craft-parts/default.nix +++ b/pkgs/development/python-modules/craft-parts/default.nix @@ -18,13 +18,17 @@ jsonschema, git, squashfsTools, + socat, setuptools-scm, stdenv, + ant, + maven, + jdk, }: buildPythonPackage rec { pname = "craft-parts"; - version = "2.2.2"; + version = "2.6.0"; pyproject = true; @@ -32,7 +36,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-parts"; tag = version; - hash = "sha256-6ufcay1C2Qv3nnG0augnPWzwBVDMj1ypRwzHRAhHARA="; + hash = "sha256-SybDzprUrKeL+Jl7Gm4XYLlvmy056D1OtJB7v/W2flY="; }; patches = [ ./bash-path.patch ]; @@ -57,14 +61,18 @@ buildPythonPackage rec { pythonImportsCheck = [ "craft_parts" ]; nativeCheckInputs = [ + ant git hypothesis + jdk jsonschema + maven pytest-check pytest-mock pytest-subprocess pytestCheckHook requests-mock + socat squashfsTools ]; @@ -80,6 +88,8 @@ buildPythonPackage rec { "test_run_prime" "test_get_build_packages_with_source_type" "test_get_build_packages" + # Relies upon certain paths being present that don't make sense on Nix. + "test_java_plugin_jre_not_17" ]; disabledTestPaths = From 76987bf1419d19d9273bd7bea4676a8179ad4f01 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Tue, 11 Feb 2025 16:19:44 +0000 Subject: [PATCH 1269/2168] python3Packages.craft-store: 3.1.0 -> 3.2.1 --- pkgs/development/python-modules/craft-store/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/craft-store/default.nix b/pkgs/development/python-modules/craft-store/default.nix index 4c44e30fa514..14d258fdb4f8 100644 --- a/pkgs/development/python-modules/craft-store/default.nix +++ b/pkgs/development/python-modules/craft-store/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "craft-store"; - version = "3.1.0"; + version = "3.2.1"; pyproject = true; @@ -33,12 +33,12 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-store"; tag = version; - hash = "sha256-pTG0JJRoHjmcLg+lAgg53rvC+7d3TLlTLe+Rxhy8wqg="; + hash = "sha256-rJ7FXHDrJ7w+dFPBs7MhT4iqN6KCWaqrmlCni5kUEKI="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools==75.6.0" "setuptools" + --replace-fail "setuptools==75.8.0" "setuptools" ''; build-system = [ From 5c46fcef9f4ace72e07635080fa34051fa53d07b Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Tue, 11 Feb 2025 16:21:48 +0000 Subject: [PATCH 1270/2168] python3Packages.craft-cli: 2.13.0 -> 2.15.0 --- pkgs/development/python-modules/craft-cli/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/craft-cli/default.nix b/pkgs/development/python-modules/craft-cli/default.nix index a11a840cca98..1ab9e9145629 100644 --- a/pkgs/development/python-modules/craft-cli/default.nix +++ b/pkgs/development/python-modules/craft-cli/default.nix @@ -4,6 +4,8 @@ fetchFromGitHub, nix-update-script, platformdirs, + jinja2, + overrides, pyyaml, setuptools-scm, pytest-check, @@ -13,7 +15,7 @@ buildPythonPackage rec { pname = "craft-cli"; - version = "2.13.0"; + version = "2.15.0"; pyproject = true; @@ -21,7 +23,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-cli"; tag = version; - hash = "sha256-IqK+eU2z63yDMJrHAhETHWoTz5lWK1er9bwYH9Oml18="; + hash = "sha256-L8hOQJhjVAMo/WxEHHEk2QorlSdDFMGdcL/Q3Pv6mT4="; }; postPatch = '' @@ -32,6 +34,8 @@ buildPythonPackage rec { build-system = [ setuptools-scm ]; dependencies = [ + jinja2 + overrides platformdirs pyyaml ]; From aac0d171adb6811420aaa233ac12fe3d7f6b8276 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Tue, 11 Feb 2025 16:24:31 +0000 Subject: [PATCH 1271/2168] python3Packages.craft-application: 4.8.2 -> 4.9.0 --- .../python-modules/craft-application/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/craft-application/default.nix b/pkgs/development/python-modules/craft-application/default.nix index 762f45403da3..2501fe7738fd 100644 --- a/pkgs/development/python-modules/craft-application/default.nix +++ b/pkgs/development/python-modules/craft-application/default.nix @@ -30,21 +30,19 @@ buildPythonPackage rec { pname = "craft-application"; - version = "4.8.2"; + version = "4.9.0"; pyproject = true; - disabled = pythonOlder "3.10"; - src = fetchFromGitHub { owner = "canonical"; repo = "craft-application"; tag = version; - hash = "sha256-rKeEi9z5eQfjn0Q4FR6CVIz9YDS7Ejg4cqcor5wtz0s="; + hash = "sha256-DprItAuGjw8AACeJDrIa6KIWLSyImuWI0qeROpPohtM="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools==75.2.0" "setuptools" + --replace-fail "setuptools==75.8.0" "setuptools" ''; build-system = [ setuptools-scm ]; From 7bb04ecfab4202cb1680ee70331c7e70400c5f43 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Tue, 11 Feb 2025 15:06:20 +0000 Subject: [PATCH 1272/2168] snapcraft: 8.5.1 -> 8.6.1 --- pkgs/by-name/sn/snapcraft/os-platform.patch | 13 ------------- pkgs/by-name/sn/snapcraft/package.nix | 10 +++------- 2 files changed, 3 insertions(+), 20 deletions(-) delete mode 100644 pkgs/by-name/sn/snapcraft/os-platform.patch diff --git a/pkgs/by-name/sn/snapcraft/os-platform.patch b/pkgs/by-name/sn/snapcraft/os-platform.patch deleted file mode 100644 index d3c914e73c7b..000000000000 --- a/pkgs/by-name/sn/snapcraft/os-platform.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/snapcraft/utils.py b/snapcraft/utils.py -index 999a64ec..4f38b4cd 100644 ---- a/snapcraft/utils.py -+++ b/snapcraft/utils.py -@@ -94,7 +94,7 @@ def get_os_platform( - release = platform.release() - machine = platform.machine() - -- if system == "Linux": -+ if system == "Linux" and "NixOS" not in platform.version(): - try: - with filepath.open("rt", encoding="utf-8") as release_file: - lines = release_file.readlines() diff --git a/pkgs/by-name/sn/snapcraft/package.nix b/pkgs/by-name/sn/snapcraft/package.nix index 02c86328e71b..dd7d02d44775 100644 --- a/pkgs/by-name/sn/snapcraft/package.nix +++ b/pkgs/by-name/sn/snapcraft/package.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { pname = "snapcraft"; - version = "8.5.1"; + version = "8.6.1"; pyproject = true; @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { owner = "canonical"; repo = "snapcraft"; tag = version; - hash = "sha256-7kIVWbVj5qse3JIdlCvRtVUfSa/rSjn4e8HJdVY3sOA="; + hash = "sha256-SbxsgvDptkUl8gHAIrJvnzIPOh0/R81n8cgJWBH7BXQ="; }; patches = [ @@ -29,11 +29,6 @@ python3Packages.buildPythonApplication rec { # path for LXD must be adjusted so that it's at the correct location for LXD # on NixOS. This patch will likely never be accepted upstream. ./lxd-socket-path.patch - # In certain places, Snapcraft expects an /etc/os-release file to determine - # host info which doesn't exist in our test environment. This is a - # relatively naive patch which helps the test suite pass - without it *many* - # of the tests fail. This patch will likely never be accepted upstream. - ./os-platform.patch # Snapcraft will try to inject itself as a snap *from the host system* into # the build system. This patch short-circuits that logic and ensures that # Snapcraft is installed on the build system from the snap store - because @@ -118,6 +113,7 @@ python3Packages.buildPythonApplication rec { build-system = with python3Packages; [ setuptools ]; pythonRelaxDeps = [ + "craft-parts" "docutils" "jsonschema" "pygit2" From 3f437f92a36dcd36cb654cc2564c1b816570113b Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Tue, 11 Feb 2025 17:21:56 +0000 Subject: [PATCH 1273/2168] rockcraft: 1.7.0 -> 1.8.0 --- pkgs/by-name/ro/rockcraft/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ro/rockcraft/package.nix b/pkgs/by-name/ro/rockcraft/package.nix index 15857bf97414..41ac37d47707 100644 --- a/pkgs/by-name/ro/rockcraft/package.nix +++ b/pkgs/by-name/ro/rockcraft/package.nix @@ -11,13 +11,13 @@ python3Packages.buildPythonApplication rec { pname = "rockcraft"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "canonical"; repo = "rockcraft"; rev = version; - hash = "sha256-2Bo3qtpSSfNvqszlt9cCc9/rurDNDMySAaqLbvRmjjw="; + hash = "sha256-v7biDGgJoQO6cKRXG8xosCgd/mlOUEwHrqcgtL2R5L4="; }; pyproject = true; From b4c51dce2cb30cfb74bb77a6dfdea975d239a3cb Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Tue, 11 Feb 2025 17:26:55 +0000 Subject: [PATCH 1274/2168] charmcraft: 3.2.2 -> 3.4.2 --- pkgs/by-name/ch/charmcraft/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ch/charmcraft/package.nix b/pkgs/by-name/ch/charmcraft/package.nix index 526da18da7bf..8ffad09d7a11 100644 --- a/pkgs/by-name/ch/charmcraft/package.nix +++ b/pkgs/by-name/ch/charmcraft/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { pname = "charmcraft"; - version = "3.2.2"; + version = "3.4.2"; pyproject = true; @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { owner = "canonical"; repo = "charmcraft"; tag = version; - hash = "sha256-2MI2cbAohfTgbilxZcFvmxt/iVjR6zJ2o0gequB//hg="; + hash = "sha256-6ucF0iQxQrFFz7jlaktYsB538W8jbX+Sw5hP0/VoYsk="; }; postPatch = '' @@ -35,6 +35,7 @@ python3Packages.buildPythonApplication rec { humanize jinja2 jsonschema + pip pydantic python-dateutil pyyaml @@ -51,11 +52,14 @@ python3Packages.buildPythonApplication rec { pythonRelaxDeps = [ "urllib3" "craft-application" + "pip" + "pydantic" ]; nativeCheckInputs = with python3Packages; [ + freezegun hypothesis pyfakefs pytest-check From ab27b065977d94ec609be2456c24b4f1acf906b4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 21:29:15 +0000 Subject: [PATCH 1275/2168] python312Packages.pysoundfile: 0.13.0 -> 0.13.1 --- pkgs/development/python-modules/soundfile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/soundfile/default.nix b/pkgs/development/python-modules/soundfile/default.nix index 4d095f06c9cb..aec21950eed7 100644 --- a/pkgs/development/python-modules/soundfile/default.nix +++ b/pkgs/development/python-modules/soundfile/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "soundfile"; - version = "0.13.0"; + version = "0.13.1"; pyproject = true; # https://github.com/bastibe/python-soundfile/issues/157 disabled = isPyPy || stdenv.hostPlatform.isi686; src = fetchPypi { inherit pname version; - hash = "sha256-6DOZ2L3n1zsRfDPWoeyFcTGDOPic5y9MPUV+l2h5g1U="; + hash = "sha256-ssaNqx4wKXMXCApbQ99X4wJYTEnilC3v3eCszMU/Dls="; }; postPatch = '' From 052d936cfec2fe741b06754a310ffe7087c17f46 Mon Sep 17 00:00:00 2001 From: Zitrone Date: Sat, 16 Nov 2024 18:03:12 +0100 Subject: [PATCH 1276/2168] nixos/rss-bridge: refactor --- .../modules/services/web-apps/rss-bridge.nix | 81 ++++++++++++------- 1 file changed, 50 insertions(+), 31 deletions(-) diff --git a/nixos/modules/services/web-apps/rss-bridge.nix b/nixos/modules/services/web-apps/rss-bridge.nix index f375635c94b6..0f91c6d6c4b0 100644 --- a/nixos/modules/services/web-apps/rss-bridge.nix +++ b/nixos/modules/services/web-apps/rss-bridge.nix @@ -4,33 +4,53 @@ pkgs, ... }: -with lib; let + inherit (lib) + literalExpression + mkDefault + mkEnableOption + mkIf + mkOption + mkRenamedOptionModule + types + ; + cfg = config.services.rss-bridge; - poolName = "rss-bridge"; - cfgHalf = lib.mapAttrsRecursive ( - path: value: - let - envName = lib.toUpper ("RSSBRIDGE_" + lib.concatStringsSep "_" path); - envValue = - if lib.isList value then - lib.concatStringsSep "," value - else if lib.isBool value then - lib.boolToString value - else - toString value; - in - if (value != null) then "fastcgi_param \"${envName}\" \"${envValue}\";" else null - ) cfg.config; - cfgEnv = lib.concatStringsSep "\n" (lib.collect lib.isString cfgHalf); + cfgEnv = lib.pipe cfg.config [ + (lib.mapAttrsRecursive ( + path: value: + lib.optionalAttrs (value != null) { + name = lib.toUpper "RSSBRIDGE_${lib.concatStringsSep "_" path}"; + value = + if lib.isList value then + lib.concatStringsSep "," value + else if lib.isBool value then + lib.boolToString value + else + toString value; + } + )) + (lib.collect (x: lib.isString x.name or false && lib.isString x.value or false)) + lib.listToAttrs + ]; in { imports = [ (mkRenamedOptionModule - [ "services" "rss-bridge" "whitelist" ] - [ "services" "rss-bridge" "config" "system" "enabled_bridges" ] + [ + "services" + "rss-bridge" + "whitelist" + ] + [ + "services" + "rss-bridge" + "config" + "system" + "enabled_bridges" + ] ) ]; @@ -55,12 +75,11 @@ in }; pool = mkOption { - type = types.str; - default = poolName; + type = types.nullOr types.str; + default = "rss-bridge"; description = '' - Name of existing phpfpm pool that is used to run web-application. - If not specified a pool will be created automatically with - default values. + Name of phpfpm pool that is used to run web-application. + If `null` specified none will be created, otherwise automatically created with default values. ''; }; @@ -97,12 +116,12 @@ in type = types.str; description = "Directory where to store cache files (if cache.type = \"file\")."; default = "${cfg.dataDir}/cache/"; - defaultText = options.literalExpression "\${config.services.rss-bridge.dataDir}/cache/"; + defaultText = literalExpression "\${config.services.rss-bridge.dataDir}/cache/"; }; }; }; }; - example = options.literalExpression '' + example = literalExpression '' { system.enabled_bridges = [ "*" ]; error = { @@ -124,12 +143,12 @@ in }; config = mkIf cfg.enable { - services.phpfpm.pools = mkIf (cfg.pool == poolName) { - ${poolName} = { + services.phpfpm.pools = mkIf (cfg.pool != null) { + ${cfg.pool} = { user = cfg.user; - settings = mapAttrs (name: mkDefault) { + settings = lib.mapAttrs (name: mkDefault) { "listen.owner" = cfg.user; - "listen.group" = cfg.user; + "listen.group" = cfg.group; "listen.mode" = "0600"; "pm" = "dynamic"; "pm.max_children" = 75; @@ -166,7 +185,7 @@ in fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass unix:${config.services.phpfpm.pools.${cfg.pool}.socket}; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - ${cfgEnv} + ${lib.concatStringsSep "\n" (lib.mapAttrsToList (n: v: "fastcgi_param \"${n}\" \"${v}\";") cfgEnv)} ''; }; }; From 05d63a6bd538e5c28d76dfaa0ad466455801f061 Mon Sep 17 00:00:00 2001 From: Zitrone Date: Sat, 16 Nov 2024 18:07:31 +0100 Subject: [PATCH 1277/2168] nixos/rss-bridge: adopt --- nixos/modules/services/web-apps/rss-bridge.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/web-apps/rss-bridge.nix b/nixos/modules/services/web-apps/rss-bridge.nix index 0f91c6d6c4b0..3e0ff0207f63 100644 --- a/nixos/modules/services/web-apps/rss-bridge.nix +++ b/nixos/modules/services/web-apps/rss-bridge.nix @@ -192,4 +192,6 @@ in }; }; }; + + meta.maintainers = with lib.maintainers; [ quantenzitrone ]; } From b8735ce2549f8a8c6a7fc09a03f38de83dea7136 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 10 Feb 2025 23:28:03 +0100 Subject: [PATCH 1278/2168] nixos/rss-bridge: add package option Co-authored-by: Zitrone --- nixos/doc/manual/release-notes/rl-2505.section.md | 2 ++ nixos/modules/services/web-apps/rss-bridge.nix | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 37dab65d2eba..cbd051dbeb54 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -463,6 +463,8 @@ - `networking.wireguard` now has an optional networkd backend. It is enabled by default when `networking.useNetworkd` is enabled, and it can be enabled alongside scripted networking with `networking.wireguard.useNetworkd`. Some `networking.wireguard` options have slightly different behavior with the networkd and script-based backends, documented in each option. +- `services.rss-bridge` now has a `package` option. + - `services.avahi.ipv6` now defaults to true. - The Home Assistant module has new options {option}`services.home-assistant.blueprints.automation`, `services.home-assistant.blueprints.script`, and {option}`services.home-assistant.blueprints.template` that allow for the declarative installation of [blueprints](https://www.home-assistant.io/docs/blueprint/) into the appropriate configuration directories. diff --git a/nixos/modules/services/web-apps/rss-bridge.nix b/nixos/modules/services/web-apps/rss-bridge.nix index 3e0ff0207f63..fff760b0199b 100644 --- a/nixos/modules/services/web-apps/rss-bridge.nix +++ b/nixos/modules/services/web-apps/rss-bridge.nix @@ -11,6 +11,7 @@ let mkEnableOption mkIf mkOption + mkPackageOption mkRenamedOptionModule types ; @@ -74,6 +75,8 @@ in ''; }; + package = mkPackageOption pkgs "rss-bridge" { }; + pool = mkOption { type = types.nullOr types.str; default = "rss-bridge"; @@ -173,7 +176,7 @@ in enable = true; virtualHosts = { ${cfg.virtualHost} = { - root = "${pkgs.rss-bridge}"; + root = "${cfg.package}"; locations."/" = { tryFiles = "$uri /index.php$is_args$args"; From 2bfaf8e4713a093f99caf0a2e1210cbfb156cdd8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 21:42:23 +0000 Subject: [PATCH 1279/2168] esp-generate: 0.2.1 -> 0.2.2 --- pkgs/by-name/es/esp-generate/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/es/esp-generate/package.nix b/pkgs/by-name/es/esp-generate/package.nix index bd0b5372e44c..4636a241afbb 100644 --- a/pkgs/by-name/es/esp-generate/package.nix +++ b/pkgs/by-name/es/esp-generate/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "esp-generate"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "esp-rs"; repo = "esp-generate"; rev = "v${version}"; - hash = "sha256-o8b30xCkHWdfGhI+8KXVj1U8xJtt7YsRcKBL6FxUVW8="; + hash = "sha256-qDlEI9cav2RSsYinIlW4VqmCtUW+vAgFJOE2miFAVVo="; }; useFetchCargoVendor = true; - cargoHash = "sha256-eTXSVeFzlQHBPWPRgt//uvtsPal4KeD2Rk7Sevkx/LE="; + cargoHash = "sha256-fBTJBHlbIvj1JYJBrtZdaIU1ztB3yE3LF6GxTfGXWTM="; meta = { description = "Template generation tool to create no_std applications targeting Espressif's chips"; From 0669232bbb9f73efcc8bbfcf3972bb75ed506f5c Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 11 Feb 2025 16:37:41 -0500 Subject: [PATCH 1280/2168] deeptools: 3.5.5 -> 3.5.6 Diff: https://github.com/deeptools/deepTools/compare/refs/tags/3.5.5...3.5.6 --- pkgs/by-name/de/deeptools/package.nix | 35 ++++++++++++--------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/de/deeptools/package.nix b/pkgs/by-name/de/deeptools/package.nix index 97c76c7f0575..509242f7b521 100644 --- a/pkgs/by-name/de/deeptools/package.nix +++ b/pkgs/by-name/de/deeptools/package.nix @@ -1,46 +1,43 @@ { lib, - python3, + python3Packages, fetchFromGitHub, + addBinToPathHook, }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "deeptools"; - version = "3.5.5"; + version = "3.5.6"; pyproject = true; src = fetchFromGitHub { owner = "deeptools"; repo = "deepTools"; tag = version; - hash = "sha256-2kSlL7Y5f/FjVtStnmz+GlTw2oymrtxOCaXlqgbQ7FU="; + hash = "sha256-dxXlOvOjF4KSc5YO+1A5hlp95sfeyPSbmp93tihm7Vo="; }; - nativeBuildInputs = with python3.pkgs; [ + build-system = with python3Packages; [ setuptools ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3Packages; [ numpy - numpydoc scipy - py2bit - pybigwig - pysam matplotlib + pysam + numpydoc + pybigwig + py2bit plotly deeptoolsintervals - importlib-metadata ]; - nativeCheckInputs = with python3.pkgs; [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook + addBinToPathHook ]; - preCheck = '' - export PATH="$out/bin:$PATH" - ''; - disabledTestPaths = [ # tests trip on `len(sys.argv) == 1` "deeptools/test/test_bigwigAverage.py" @@ -49,7 +46,7 @@ python3.pkgs.buildPythonApplication rec { "deeptools/test/test_multiBamSummary.py" ]; - meta = with lib; { + meta = { homepage = "https://deeptools.readthedocs.io/en/develop"; description = "Tools for exploring deep DNA sequencing data"; longDescription = '' @@ -60,10 +57,10 @@ python3.pkgs.buildPythonApplication rec { publication-ready visualizations to identify enrichments and for functional annotations of the genome. ''; - license = with licenses; [ + license = with lib.licenses; [ mit bsd3 ]; - maintainers = with maintainers; [ scalavision ]; + maintainers = with lib.maintainers; [ scalavision ]; }; } From f611c803e5434016a11fa65369fe8e630a9c33ed Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 11 Feb 2025 22:45:23 +0100 Subject: [PATCH 1281/2168] tests.haskell.upstreamStackhpackVersion: set descriptive user agent GitHub apparently immediately terminates the connection for our previous bogus curl user agent. Let's be more polite about this (default curl user agent would work, too). --- pkgs/test/haskell/upstreamStackHpackVersion/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/test/haskell/upstreamStackHpackVersion/default.nix b/pkgs/test/haskell/upstreamStackHpackVersion/default.nix index 788a3e2db5ef..4e01c213700b 100644 --- a/pkgs/test/haskell/upstreamStackHpackVersion/default.nix +++ b/pkgs/test/haskell/upstreamStackHpackVersion/default.nix @@ -46,7 +46,7 @@ let --retry 3 --disable-epsv --cookie-jar cookies - --user-agent "curl " + --user-agent "nixpkgs stack version test/1.0" --insecure ) From 46a3240961a501453830859da089a6dbaf4d3c47 Mon Sep 17 00:00:00 2001 From: Nathan Henrie Date: Tue, 11 Feb 2025 14:53:12 -0700 Subject: [PATCH 1282/2168] python3Packages.objsize: 0.7.0 -> 0.7.1 (#381190) --- pkgs/development/python-modules/objsize/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/objsize/default.nix b/pkgs/development/python-modules/objsize/default.nix index f1c9b9c6676b..495f4eaef066 100644 --- a/pkgs/development/python-modules/objsize/default.nix +++ b/pkgs/development/python-modules/objsize/default.nix @@ -10,16 +10,16 @@ buildPythonPackage rec { pname = "objsize"; - version = "0.7.0"; + version = "0.7.1"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "liran-funaro"; repo = "objsize"; tag = version; - hash = "sha256-wy4Tj+Q+4zymRdoN8Z7wcazJTb2lQ+XHY1Kta02R3R0="; + hash = "sha256-l0l80dMVWZqWBK4z53NCU+rKOQl6jRZ1zb2SmMnhs1k="; }; nativeBuildInputs = [ From 5285d91e2c330b41a0f4dab3812744eb1995ab94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 11 Feb 2025 14:00:18 -0800 Subject: [PATCH 1283/2168] Revert "python312Packages.catboost: mark as broken" --- pkgs/development/python-modules/catboost/default.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/catboost/default.nix b/pkgs/development/python-modules/catboost/default.nix index 919e206da006..d0fc77b70038 100644 --- a/pkgs/development/python-modules/catboost/default.nix +++ b/pkgs/development/python-modules/catboost/default.nix @@ -22,8 +22,8 @@ buildPythonPackage rec { pname version src + meta ; - pyproject = true; sourceRoot = "${src.name}/catboost/python-package"; @@ -55,10 +55,4 @@ buildPythonPackage rec { doCheck = false; pythonImportsCheck = [ "catboost" ]; - - meta = catboost.meta // { - # Incompatible with numpy >= 2.0 - # https://github.com/catboost/catboost/issues/2671 - broken = true; - }; } From 87be39f10b9341df08a3c6afd4a3f042b6077be8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 22:07:52 +0000 Subject: [PATCH 1284/2168] python312Packages.dom-toml: 2.0.0 -> 2.0.1 --- pkgs/development/python-modules/dom-toml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dom-toml/default.nix b/pkgs/development/python-modules/dom-toml/default.nix index 99ff069ce49f..76ff28c51b6a 100644 --- a/pkgs/development/python-modules/dom-toml/default.nix +++ b/pkgs/development/python-modules/dom-toml/default.nix @@ -9,13 +9,13 @@ }: buildPythonPackage rec { pname = "dom-toml"; - version = "2.0.0"; + version = "2.0.1"; pyproject = true; src = fetchPypi { inherit version; pname = "dom_toml"; - hash = "sha256-PAfoQ2U4mUl0Ensa4DdmHRp3mskVxE/Qazq1/hQP9Yk="; + hash = "sha256-McWHRZXHd/QcwZHDTGbb6iFcgomnsUi0Jft6EMP0+8g="; }; build-system = [ flit-core ]; From 3c2e5ab61195c31d586f404f0224c2c8c9ab0244 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 11 Feb 2025 13:27:32 +0100 Subject: [PATCH 1285/2168] searxng: downgrade httpx to fix search --- pkgs/by-name/se/searxng/package.nix | 39 +++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/se/searxng/package.nix b/pkgs/by-name/se/searxng/package.nix index b77b4143a6a5..7c6de0157d59 100644 --- a/pkgs/by-name/se/searxng/package.nix +++ b/pkgs/by-name/se/searxng/package.nix @@ -4,9 +4,38 @@ fetchFromGitHub, nixosTests, }: +let + python = python3.override { + packageOverrides = final: prev: { + httpx = prev.httpx.overridePythonAttrs (old: rec { + version = "0.27.2"; + src = old.src.override { + tag = version; + hash = "sha256-N0ztVA/KMui9kKIovmOfNTwwrdvSimmNkSvvC+3gpck="; + }; + }); -python3.pkgs.toPythonModule ( - python3.pkgs.buildPythonApplication rec { + httpx-socks = prev.httpx-socks.overridePythonAttrs (old: rec { + version = "0.9.2"; + src = old.src.override { + tag = "v${version}"; + hash = "sha256-PUiciSuDCO4r49st6ye5xPLCyvYMKfZY+yHAkp5j3ZI="; + }; + }); + + starlette = prev.starlette.overridePythonAttrs (old: { + disabledTests = old.disabledTests or [ ] ++ [ + # fails in assertion with spacing issue + "test_request_body" + "test_request_stream" + "test_wsgi_post" + ]; + }); + }; + }; +in +python.pkgs.toPythonModule ( + python.pkgs.buildPythonApplication rec { pname = "searxng"; version = "0-unstable-2025-01-10"; @@ -41,7 +70,7 @@ python3.pkgs.toPythonModule ( ''; dependencies = - with python3.pkgs; + with python.pkgs; [ babel brotli @@ -73,10 +102,10 @@ python3.pkgs.toPythonModule ( postInstall = '' # Create a symlink for easier access to static data mkdir -p $out/share - ln -s ../${python3.sitePackages}/searx/static $out/share/ + ln -s ../${python.sitePackages}/searx/static $out/share/ # copy config schema for the limiter - cp searx/limiter.toml $out/${python3.sitePackages}/searx/limiter.toml + cp searx/limiter.toml $out/${python.sitePackages}/searx/limiter.toml ''; passthru = { From a4aadaa4743cac2b6f3e19aa0d7ea3b00622d8c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 11 Feb 2025 15:16:23 +0100 Subject: [PATCH 1286/2168] searxng: 0-unstable-2025-01-10 -> 0-unstable-2025-02-09 --- pkgs/by-name/se/searxng/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/se/searxng/package.nix b/pkgs/by-name/se/searxng/package.nix index 7c6de0157d59..264dc4473f28 100644 --- a/pkgs/by-name/se/searxng/package.nix +++ b/pkgs/by-name/se/searxng/package.nix @@ -37,13 +37,13 @@ in python.pkgs.toPythonModule ( python.pkgs.buildPythonApplication rec { pname = "searxng"; - version = "0-unstable-2025-01-10"; + version = "0-unstable-2025-02-09"; src = fetchFromGitHub { owner = "searxng"; repo = "searxng"; - rev = "94a0b415ef587e013df9e7350667b752a3822e90"; - hash = "sha256-ZeFHsoQXmG2sZXhPY7aRTsAXmFGHNT5ig0c2Hy344vw="; + rev = "a1e2b254677a22f1f8968a06564661ac6203c162"; + hash = "sha256-DrSj1wQUWq9xVuQqt0BZ79JgyRS9qJqg1cdYTIBb1A8="; }; postPatch = '' From 3b776d2c98195ed911f57a011e7faf9f14493844 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 22:52:43 +0000 Subject: [PATCH 1287/2168] python312Packages.pyzx: 0.8.0 -> 0.9.0 --- pkgs/development/python-modules/pyzx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyzx/default.nix b/pkgs/development/python-modules/pyzx/default.nix index b3b52c8fbb5a..9878448f6ef5 100644 --- a/pkgs/development/python-modules/pyzx/default.nix +++ b/pkgs/development/python-modules/pyzx/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyzx"; - version = "0.8.0"; + version = "0.9.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "zxcalc"; repo = "pyzx"; tag = "v${version}"; - hash = "sha256-4yc4P2v2L/F/A1A9z41ow2KA0aUA+3SJyC+wyMWzhwM="; + hash = "sha256-MhsbJIDeSIeF0LaHhI6nNxPD3ZjBWh5yvLGuwBH41a4="; }; build-system = [ setuptools ]; @@ -62,7 +62,7 @@ buildPythonPackage rec { meta = { description = "Library for quantum circuit rewriting and optimisation using the ZX-calculus"; homepage = "https://github.com/zxcalc/pyzx"; - changelog = "https://github.com/zxcalc/pyzx/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/zxcalc/pyzx/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ bcdarwin ]; }; From 9c53679a1a978811476f29585f25ea06bc3bd29c Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Tue, 11 Feb 2025 23:56:38 +0100 Subject: [PATCH 1288/2168] lomiri.lomiri-music-app: Fix passthru.updateScript Tags are prefixed with v, need to remove that. --- pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix index f3688b33d9e3..4d27e18dd569 100644 --- a/pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { tests.vm = nixosTests.lomiri-music-app; - updateScript = gitUpdater { }; + updateScript = gitUpdater { rev-prefix = "v"; }; }; meta = { From 3cade1b5aca8637714c8705d05d31b1ed9aebfec Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 10 Feb 2025 23:30:07 +0100 Subject: [PATCH 1289/2168] nixos/rss-bridge: add webserver option Co-authored-by: Zitrone --- .../manual/release-notes/rl-2505.section.md | 2 +- .../modules/services/web-apps/rss-bridge.nix | 41 +++++++++++++++---- 2 files changed, 35 insertions(+), 8 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index cbd051dbeb54..6e0951a1ed2b 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -463,7 +463,7 @@ - `networking.wireguard` now has an optional networkd backend. It is enabled by default when `networking.useNetworkd` is enabled, and it can be enabled alongside scripted networking with `networking.wireguard.useNetworkd`. Some `networking.wireguard` options have slightly different behavior with the networkd and script-based backends, documented in each option. -- `services.rss-bridge` now has a `package` option. +- `services.rss-bridge` now has a `package` option as well as support for `caddy` as reverse proxy. - `services.avahi.ipv6` now defaults to true. diff --git a/nixos/modules/services/web-apps/rss-bridge.nix b/nixos/modules/services/web-apps/rss-bridge.nix index fff760b0199b..d847f6005309 100644 --- a/nixos/modules/services/web-apps/rss-bridge.nix +++ b/nixos/modules/services/web-apps/rss-bridge.nix @@ -18,7 +18,6 @@ let cfg = config.services.rss-bridge; - cfgEnv = lib.pipe cfg.config [ (lib.mapAttrsRecursive ( path: value: @@ -61,17 +60,19 @@ in user = mkOption { type = types.str; - default = "nginx"; + default = if cfg.webserver == null then "rss-bridge" else cfg.webserver; + defaultText = "{option}`config.services.rss-bridge.webserver` or \"rss-bridge\""; description = '' - User account under which both the service and the web-application run. + The user account under which both the service and the web application run. ''; }; group = mkOption { type = types.str; - default = "nginx"; + default = if cfg.webserver == null then "rss-bridge" else cfg.webserver; + defaultText = "{option}`config.services.rss-bridge.webserver` or \"rss-bridge\""; description = '' - Group under which the web-application run. + The group under which the web application runs. ''; }; @@ -99,7 +100,20 @@ in type = types.nullOr types.str; default = "rss-bridge"; description = '' - Name of the nginx virtualhost to use and setup. If null, do not setup any virtualhost. + Name of the nginx or caddy virtualhost to use and setup. If null, do not setup any virtualhost. + ''; + }; + + webserver = mkOption { + type = types.nullOr ( + types.enum [ + "nginx" + "caddy" + ] + ); + default = "nginx"; + description = '' + Type of virtualhost to use and setup. If null, do not setup any virtualhost. ''; }; @@ -172,7 +186,7 @@ in }; }; - services.nginx = mkIf (cfg.virtualHost != null) { + services.nginx = mkIf (cfg.virtualHost != null && cfg.webserver == "nginx") { enable = true; virtualHosts = { ${cfg.virtualHost} = { @@ -194,6 +208,19 @@ in }; }; }; + + services.caddy = mkIf (cfg.virtualHost != null && cfg.webserver == "caddy") { + enable = true; + virtualHosts.${cfg.virtualHost} = { + extraConfig = '' + root * ${cfg.package} + file_server + php_fastcgi unix/${config.services.phpfpm.pools.${cfg.pool}.socket} { + ${lib.concatStringsSep "\n" (lib.mapAttrsToList (n: v: " env ${n} \"${v}\"") cfgEnv)} + } + ''; + }; + }; }; meta.maintainers = with lib.maintainers; [ quantenzitrone ]; From 874d00ecf44ff941889a24b04c678e5946bf2389 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 3 Feb 2025 22:25:20 +0100 Subject: [PATCH 1290/2168] nixosTests/rss-bridge: improve and add caddy --- nixos/tests/all-tests.nix | 2 +- nixos/tests/web-apps/rss-bridge.nix | 22 ---------------- nixos/tests/web-apps/rss-bridge/caddy.nix | 28 +++++++++++++++++++++ nixos/tests/web-apps/rss-bridge/default.nix | 5 ++++ nixos/tests/web-apps/rss-bridge/nginx.nix | 27 ++++++++++++++++++++ pkgs/by-name/rs/rss-bridge/package.nix | 2 +- 6 files changed, 62 insertions(+), 24 deletions(-) delete mode 100644 nixos/tests/web-apps/rss-bridge.nix create mode 100644 nixos/tests/web-apps/rss-bridge/caddy.nix create mode 100644 nixos/tests/web-apps/rss-bridge/default.nix create mode 100644 nixos/tests/web-apps/rss-bridge/nginx.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index cb7f599eb6ea..a33e4ee8fdd4 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -921,7 +921,7 @@ in { rshim = handleTest ./rshim.nix {}; rspamd = handleTest ./rspamd.nix {}; rspamd-trainer = handleTest ./rspamd-trainer.nix {}; - rss-bridge = handleTest ./web-apps/rss-bridge.nix {}; + rss-bridge = handleTest ./web-apps/rss-bridge {}; rss2email = handleTest ./rss2email.nix {}; rstudio-server = handleTest ./rstudio-server.nix {}; rsyncd = handleTest ./rsyncd.nix {}; diff --git a/nixos/tests/web-apps/rss-bridge.nix b/nixos/tests/web-apps/rss-bridge.nix deleted file mode 100644 index 16ab6cd8b584..000000000000 --- a/nixos/tests/web-apps/rss-bridge.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ pkgs, ... }: -{ - name = "rss-bridge"; - meta.maintainers = with pkgs.lib.maintainers; [ mynacol ]; - - nodes.machine = - { ... }: - { - services.rss-bridge = { - enable = true; - }; - }; - - testScript = '' - start_all() - machine.wait_for_unit("nginx.service") - machine.wait_for_unit("phpfpm-rss-bridge.service") - - # check for successful feed download - machine.succeed("curl -sS -f 'http://localhost/?action=display&bridge=DemoBridge&context=testCheckbox&format=Atom'") - ''; -} diff --git a/nixos/tests/web-apps/rss-bridge/caddy.nix b/nixos/tests/web-apps/rss-bridge/caddy.nix new file mode 100644 index 000000000000..4e1d9b9347c9 --- /dev/null +++ b/nixos/tests/web-apps/rss-bridge/caddy.nix @@ -0,0 +1,28 @@ +import ../../make-test-python.nix ( + { lib, pkgs, ... }: + { + name = "rss-bridge-caddy"; + meta.maintainers = with lib.maintainers; [ mynacol ]; + + nodes.machine = + { ... }: + { + services.rss-bridge = { + enable = true; + webserver = "caddy"; + virtualHost = "localhost:80"; + config.system.enabled_bridges = [ "DemoBridge" ]; + }; + }; + + testScript = '' + machine.wait_for_unit("caddy.service") + machine.wait_for_unit("phpfpm-rss-bridge.service") + machine.wait_for_open_port(80) + + # check for successful feed download + response = machine.succeed("curl -f 'http://localhost:80/?action=display&bridge=DemoBridge&context=testCheckbox&format=Atom'") + assert 'Test' in response, "Feed didn't load successfully" + ''; + } +) diff --git a/nixos/tests/web-apps/rss-bridge/default.nix b/nixos/tests/web-apps/rss-bridge/default.nix new file mode 100644 index 000000000000..fe3e9a5cd897 --- /dev/null +++ b/nixos/tests/web-apps/rss-bridge/default.nix @@ -0,0 +1,5 @@ +{ system, pkgs, ... }: +{ + nginx = import ./nginx.nix { inherit system pkgs; }; + caddy = import ./caddy.nix { inherit system pkgs; }; +} diff --git a/nixos/tests/web-apps/rss-bridge/nginx.nix b/nixos/tests/web-apps/rss-bridge/nginx.nix new file mode 100644 index 000000000000..78f3fd77aa2f --- /dev/null +++ b/nixos/tests/web-apps/rss-bridge/nginx.nix @@ -0,0 +1,27 @@ +import ../../make-test-python.nix ( + { lib, pkgs, ... }: + { + name = "rss-bridge-nginx"; + meta.maintainers = with lib.maintainers; [ mynacol ]; + + nodes.machine = + { ... }: + { + services.rss-bridge = { + enable = true; + webserver = "nginx"; + config.system.enabled_bridges = [ "DemoBridge" ]; + }; + }; + + testScript = '' + machine.wait_for_unit("nginx.service") + machine.wait_for_unit("phpfpm-rss-bridge.service") + machine.wait_for_open_port(80) + + # check for successful feed download + response = machine.succeed("curl -f 'http://localhost:80/?action=display&bridge=DemoBridge&context=testCheckbox&format=Atom'") + assert 'Test' in response, "Feed didn't load successfully" + ''; + } +) diff --git a/pkgs/by-name/rs/rss-bridge/package.nix b/pkgs/by-name/rs/rss-bridge/package.nix index 0baedb8dc21e..c622a937a19d 100644 --- a/pkgs/by-name/rs/rss-bridge/package.nix +++ b/pkgs/by-name/rs/rss-bridge/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { passthru = { tests = { - basic-functionality = nixosTests.rss-bridge; + inherit (nixosTests.rss-bridge) caddy nginx; }; updateScript = nix-update-script { }; }; From 4cb05a71134f633a465a20bcbd39a7ab7b838eff Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 11 Feb 2025 21:48:26 +0100 Subject: [PATCH 1291/2168] gpt4all: drop unnecessary dependencies --- pkgs/by-name/gp/gpt4all/package.nix | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/gp/gpt4all/package.nix b/pkgs/by-name/gp/gpt4all/package.nix index 61921ee2d068..ec3fc70a8e00 100644 --- a/pkgs/by-name/gp/gpt4all/package.nix +++ b/pkgs/by-name/gp/gpt4all/package.nix @@ -5,14 +5,9 @@ fetchFromGitHub, fetchurl, cmake, - boost, - fmt, - duckx, - expected-lite, - optional-lite, - string-view-lite, - variant-lite, qt6, + duckx, + fmt, shaderc, vulkan-headers, wayland, @@ -61,20 +56,16 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ - expected-lite - optional-lite - string-view-lite - variant-lite - boost - fmt duckx - qt6.qtwayland - qt6.qtquicktimeline - qt6.qtsvg - qt6.qthttpserver - qt6.qtwebengine + fmt qt6.qt5compat + qt6.qtbase + qt6.qtdeclarative + qt6.qthttpserver + qt6.qtsvg qt6.qttools + qt6.qtwayland + qt6.qtwebengine shaderc vulkan-headers wayland From 613ad1c292b9663b0f0ee2ddb194a023fa9bb897 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 7 Feb 2025 11:46:55 +0100 Subject: [PATCH 1292/2168] python312Packages.dask: 2024.12.1 -> 2025.1.0 Diff: https://github.com/dask/dask/compare/refs/tags/2024.12.1...2025.1.0 Changelog: https://docs.dask.org/en/latest/changelog.html --- .../python-modules/dask/default.nix | 249 ++++++++---------- 1 file changed, 103 insertions(+), 146 deletions(-) diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 93b38b11b1f7..d151090c4221 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, @@ -27,168 +26,126 @@ jinja2, # tests - arrow-cpp, - dask-expr, hypothesis, pytest-asyncio, + pytest-cov-stub, + pytest-mock, pytest-rerunfailures, pytest-xdist, pytestCheckHook, + versionCheckHook, }: -let - self = buildPythonPackage rec { - pname = "dask"; - version = "2024.12.1"; - pyproject = true; +buildPythonPackage rec { + pname = "dask"; + version = "2025.1.0"; + pyproject = true; - src = fetchFromGitHub { - owner = "dask"; - repo = "dask"; - tag = version; - hash = "sha256-QqvdldAHW2UYt1NXfk3Aa+oe97e+OpRbF8d6eKV3OJ4="; - }; + src = fetchFromGitHub { + owner = "dask"; + repo = "dask"; + tag = version; + hash = "sha256-KBqOyf471mNg3L9dYmR7IRSltEtC+VgC+6ptsoKgVmM="; + }; - build-system = [ setuptools ]; + postPatch = '' + # versioneer hack to set version of GitHub package + echo "def get_versions(): return {'dirty': False, 'error': None, 'full-revisionid': None, 'version': '${version}'}" > dask/_version.py - dependencies = [ - click - cloudpickle - fsspec - packaging - partd - pyyaml - importlib-metadata - toolz - ]; - - optional-dependencies = lib.fix (self: { - array = [ numpy ]; - complete = - [ - pyarrow - lz4 - ] - ++ self.array - ++ self.dataframe - ++ self.distributed - ++ self.diagnostics; - dataframe = [ - # dask-expr -> circular dependency with dask-expr - numpy - pandas - ]; - distributed = [ distributed ]; - diagnostics = [ - bokeh - jinja2 - ]; - }); - - nativeCheckInputs = - [ - dask-expr - pytestCheckHook - pytest-rerunfailures - pytest-xdist - # from panda[test] - hypothesis - pytest-asyncio - ] - ++ self.optional-dependencies.array - ++ self.optional-dependencies.dataframe - ++ lib.optionals (!arrow-cpp.meta.broken) [ - # support is sparse on aarch64 - pyarrow - ]; - - dontUseSetuptoolsCheck = true; - - postPatch = '' - # versioneer hack to set version of GitHub package - echo "def get_versions(): return {'dirty': False, 'error': None, 'full-revisionid': None, 'version': '${version}'}" > dask/_version.py - - substituteInPlace setup.py \ - --replace-fail "import versioneer" "" \ - --replace-fail "version=versioneer.get_version()," "version='${version}'," \ - --replace-fail "cmdclass=versioneer.get_cmdclass()," "" + substituteInPlace setup.py \ + --replace-fail "import versioneer" "" \ + --replace-fail "version=versioneer.get_version()," "version='${version}'," \ + --replace-fail "cmdclass=versioneer.get_cmdclass()," "" substituteInPlace pyproject.toml \ - --replace-fail ', "versioneer[toml]==0.29"' "" \ - --replace-fail " --durations=10" "" \ - --replace-fail " --cov-config=pyproject.toml" "" \ - --replace-fail "\"-v" "\" " - ''; + --replace-fail ', "versioneer[toml]==0.29"' "" + ''; - pytestFlagsArray = [ - # Rerun failed tests up to three times - "--reruns 3" - # Don't run tests that require network access - "-m 'not network'" - ]; + build-system = [ setuptools ]; - disabledTests = - lib.optionals stdenv.hostPlatform.isDarwin [ - # Test requires features of python3Packages.psutil that are - # blocked in sandboxed-builds - "test_auto_blocksize_csv" - # AttributeError: 'str' object has no attribute 'decode' - "test_read_dir_nometa" + dependencies = [ + click + cloudpickle + fsspec + packaging + partd + pyyaml + importlib-metadata + toolz + ]; + + optional-dependencies = lib.fix (self: { + array = [ numpy ]; + complete = + [ + pyarrow + lz4 ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ - # concurrent.futures.process.BrokenProcessPool: A process in the process pool terminated abpruptly... - "test_foldby_tree_reduction" - "test_to_bag" - ] - ++ [ - # https://github.com/dask/dask/issues/10347#issuecomment-1589683941 - "test_concat_categorical" - # AttributeError: 'ArrowStringArray' object has no attribute 'tobytes'. Did you mean: 'nbytes'? - "test_dot" - "test_dot_nan" - "test_merge_column_with_nulls" - # FileNotFoundError: [Errno 2] No such file or directory: '/build/tmp301jryv_/createme/0.part' - "test_to_csv_nodir" - "test_to_json_results" - # FutureWarning: Those tests should be working fine when pandas will have been upgraded to 2.1.1 - "test_apply" - "test_apply_infer_columns" - ]; - - __darwinAllowLocalNetworking = true; - - pythonImportsCheck = [ - "dask" - "dask.bag" - "dask.bytes" - "dask.diagnostics" + ++ self.array + ++ self.dataframe + ++ self.distributed + ++ self.diagnostics; + dataframe = [ + pandas + pyarrow + ] ++ self.array; + distributed = [ distributed ]; + diagnostics = [ + bokeh + jinja2 ]; + }); - doCheck = false; + nativeCheckInputs = + [ + hypothesis + pyarrow + pytest-asyncio + pytest-cov-stub + pytest-mock + pytest-rerunfailures + pytest-xdist + pytestCheckHook + versionCheckHook + ] + ++ optional-dependencies.array + ++ optional-dependencies.dataframe; + versionCheckProgramArg = [ "--version" ]; - # Enable tests via passthru to avoid cyclic dependency with dask-expr. - passthru.tests = { - check = self.overridePythonAttrs (old: { - doCheck = true; - pythonImportsCheck = [ - # Requires the `dask.optional-dependencies.array` that are only in `nativeCheckInputs` - "dask.array" - # Requires the `dask.optional-dependencies.dataframe` that are only in `nativeCheckInputs` - "dask.dataframe" - "dask.dataframe.io" - "dask.dataframe.tseries" - ] ++ old.pythonImportsCheck; - }); - }; + pytestFlagsArray = [ + # Rerun failed tests up to three times + "--reruns 3" + # Don't run tests that require network access + "-m 'not network'" + ]; - meta = { - description = "Minimal task scheduling abstraction"; - mainProgram = "dask"; - homepage = "https://dask.org/"; - changelog = "https://docs.dask.org/en/latest/changelog.html"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ GaetanLepage ]; - }; + disabledTests = [ + # UserWarning: Insufficient elements for `head`. 10 elements requested, only 5 elements available. Try passing larger `npartitions` to `head`. + "test_set_index_head_nlargest_string" + ]; + + __darwinAllowLocalNetworking = true; + + pythonImportsCheck = [ + "dask" + "dask.bag" + "dask.bytes" + "dask.diagnostics" + + # Requires the `dask.optional-dependencies.array` that are only in `nativeCheckInputs` + "dask.array" + # Requires the `dask.optional-dependencies.dataframe` that are only in `nativeCheckInputs` + "dask.dataframe" + "dask.dataframe.io" + "dask.dataframe.tseries" + ]; + + meta = { + description = "Minimal task scheduling abstraction"; + mainProgram = "dask"; + homepage = "https://dask.org/"; + changelog = "https://docs.dask.org/en/latest/changelog.html"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; -in -self +} From 5189b14037c1f587201c160c6d889a632288a726 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 7 Feb 2025 12:41:10 +0100 Subject: [PATCH 1293/2168] python312Packages.streamz: cleanup --- .../python-modules/streamz/default.nix | 58 ++++++++----------- 1 file changed, 24 insertions(+), 34 deletions(-) diff --git a/pkgs/development/python-modules/streamz/default.nix b/pkgs/development/python-modules/streamz/default.nix index eea52b8fa8f2..4a4e8855d22a 100644 --- a/pkgs/development/python-modules/streamz/default.nix +++ b/pkgs/development/python-modules/streamz/default.nix @@ -1,23 +1,24 @@ { lib, buildPythonPackage, - pythonOlder, - fetchPypi, + fetchFromGitHub, + + # build-system setuptools, - confluent-kafka, - dask, - dask-expr, - distributed, - flaky, - graphviz, - networkx, - pytest-asyncio, - pytestCheckHook, - requests, + + # dependencies six, toolz, tornado, zict, + + # tests + dask, + distributed, + flaky, + pandas, + pyarrow, + pytestCheckHook, }: buildPythonPackage rec { @@ -25,17 +26,16 @@ buildPythonPackage rec { version = "0.6.4"; pyproject = true; - disabled = pythonOlder "3.6"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-VXfWkEwuxInBQVQJV3IQXgGVRkiBmYfUZCBMbjyWNPM="; + src = fetchFromGitHub { + owner = "python-streamz"; + repo = "streamz"; + tag = version; + hash = "sha256-lSb3gl+TSIzz4BZzxH8zXu74HvzSntOAoVQUUJKIEvA="; }; build-system = [ setuptools ]; dependencies = [ - networkx six toolz tornado @@ -43,15 +43,12 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - confluent-kafka dask - dask-expr distributed flaky - graphviz - pytest-asyncio + pandas + pyarrow pytestCheckHook - requests ]; pythonImportsCheck = [ "streamz" ]; @@ -63,24 +60,17 @@ buildPythonPackage rec { "test_partition_then_scatter_sync" "test_sync" "test_sync_2" - # Test fail in the sandbox - "test_tcp_async" - "test_tcp" - "test_partition_timeout" + # Tests are flaky - "test_from_iterable" "test_buffer" ]; - disabledTestPaths = [ - # Disable kafka tests - "streamz/tests/test_kafka.py" - ]; + __darwinAllowLocalNetworking = true; - meta = with lib; { + meta = { description = "Pipelines to manage continuous streams of data"; homepage = "https://github.com/python-streamz/streamz"; - license = licenses.bsd3; + license = lib.licenses.bsd3; maintainers = [ ]; }; } From 6b1916cd60fd38606110d5d7ccee8804da7ceee2 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 7 Feb 2025 12:41:38 +0100 Subject: [PATCH 1294/2168] python312Packages.streamz: add GaetanLepage as maintainer --- pkgs/development/python-modules/streamz/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/streamz/default.nix b/pkgs/development/python-modules/streamz/default.nix index 4a4e8855d22a..5aab96e7c462 100644 --- a/pkgs/development/python-modules/streamz/default.nix +++ b/pkgs/development/python-modules/streamz/default.nix @@ -71,6 +71,6 @@ buildPythonPackage rec { description = "Pipelines to manage continuous streams of data"; homepage = "https://github.com/python-streamz/streamz"; license = lib.licenses.bsd3; - maintainers = [ ]; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } From ad3aa55d737e8ba7fbe7de30396c762b38ec00b6 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 7 Feb 2025 14:29:01 +0100 Subject: [PATCH 1295/2168] python312Packages.narwhals: 1.22.0 -> 1.26.0 Diff: https://github.com/narwhals-dev/narwhals/compare/refs/tags/v1.22.0...v1.26.0 Changelog: https://github.com/narwhals-dev/narwhals/releases/tag/v1.26.0 --- .../python-modules/narwhals/default.nix | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/narwhals/default.nix b/pkgs/development/python-modules/narwhals/default.nix index 5aa36f62364c..f5a7876fbbfa 100644 --- a/pkgs/development/python-modules/narwhals/default.nix +++ b/pkgs/development/python-modules/narwhals/default.nix @@ -1,34 +1,36 @@ { lib, buildPythonPackage, + fetchFromGitHub, + + # build-system + hatchling, + + # optional-dependencies # cudf, dask, - dask-expr, - duckdb, - fetchFromGitHub, - hatchling, - hypothesis, # modin, pandas, polars, pyarrow, + + # tests + duckdb, + hypothesis, pytest-env, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { pname = "narwhals"; - version = "1.22.0"; + version = "1.26.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "narwhals-dev"; repo = "narwhals"; tag = "v${version}"; - hash = "sha256-I6nJJiiW1v04YH70OPxXKeO80N52nnCPKRzJLILEWmw="; + hash = "sha256-tGxRJauYD0mCA66Rd2i8jJsuDLVgyk35F7HRMR1ZkQs="; }; build-system = [ @@ -39,8 +41,7 @@ buildPythonPackage rec { # cudf = [ cudf ]; dask = [ dask - dask-expr - ]; + ] ++ dask.optional-dependencies.dataframe; # modin = [ modin ]; pandas = [ pandas ]; polars = [ polars ]; @@ -64,7 +65,7 @@ buildPythonPackage rec { meta = { description = "Lightweight and extensible compatibility layer between dataframe libraries"; homepage = "https://github.com/narwhals-dev/narwhals"; - changelog = "https://github.com/narwhals-dev/narwhals/releases/tag/${src.tag}"; + changelog = "https://github.com/narwhals-dev/narwhals/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; From 9336c17636171c9f6edcea7a1e53035b72614aba Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 7 Feb 2025 14:37:28 +0100 Subject: [PATCH 1296/2168] python312Packages.dask-glm: add GaetanLepage as maintainer --- pkgs/development/python-modules/dask-glm/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/dask-glm/default.nix b/pkgs/development/python-modules/dask-glm/default.nix index a4bead52b43b..7fbb0359e2ca 100644 --- a/pkgs/development/python-modules/dask-glm/default.nix +++ b/pkgs/development/python-modules/dask-glm/default.nix @@ -63,5 +63,6 @@ buildPythonPackage rec { homepage = "https://github.com/dask/dask-glm/"; license = licenses.bsd3; maintainers = [ ]; + maintainers = with maintainers; [ GaetanLepage ]; }; } From b8ea2990997c1bf7159b6850fed34e3fa7b148b6 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 7 Feb 2025 14:38:52 +0100 Subject: [PATCH 1297/2168] python312Packages.dask-glm: fix build --- .../python-modules/dask-glm/default.nix | 59 ++++++++++--------- 1 file changed, 32 insertions(+), 27 deletions(-) diff --git a/pkgs/development/python-modules/dask-glm/default.nix b/pkgs/development/python-modules/dask-glm/default.nix index 7fbb0359e2ca..97cfa6100313 100644 --- a/pkgs/development/python-modules/dask-glm/default.nix +++ b/pkgs/development/python-modules/dask-glm/default.nix @@ -1,34 +1,46 @@ { lib, buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools-scm, + + # dependencies cloudpickle, - dask, distributed, - fetchPypi, multipledispatch, - pytestCheckHook, - pythonOlder, scikit-learn, scipy, - setuptools-scm, sparse, + dask, + + # tests + pytest-xdist, + pytestCheckHook, }: buildPythonPackage rec { pname = "dask-glm"; version = "0.3.2"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-yUelZoZmmKAdeZeK5zIzy16DitXq1ghRQ1gsXpMLmko="; + src = fetchFromGitHub { + owner = "dask"; + repo = "dask-glm"; + tag = version; + hash = "sha256-q98QMmw1toashimS16of54cgZgIPqkua3xGD1FZ1nTc="; }; - nativeBuildInputs = [ setuptools-scm ]; + # ValueError: The truth value of an empty array is ambiguous. Use `array.size > 0` to check that an array is not empty. + postPatch = '' + substituteInPlace dask_glm/utils.py \ + --replace-fail "if arr:" "if (arr is not None) and (arr.size > 0):" + ''; - propagatedBuildInputs = [ + build-system = [ setuptools-scm ]; + + dependencies = [ cloudpickle distributed multipledispatch @@ -38,31 +50,24 @@ buildPythonPackage rec { ] ++ dask.optional-dependencies.array; nativeCheckInputs = [ - sparse + pytest-xdist pytestCheckHook ]; pythonImportsCheck = [ "dask_glm" ]; - disabledTestPaths = [ - # Circular dependency with dask-ml - "dask_glm/tests/test_estimators.py" - # Test tries to imort an obsolete method - "dask_glm/tests/test_utils.py" - ]; - disabledTests = [ - # missing fixture with distributed>=2022.8.0 - "test_determinism_distributed" + # ValueError: can be computed for one-element arrays only. + "test_dot_with_sparse" ]; __darwinAllowLocalNetworking = true; - meta = with lib; { + meta = { description = "Generalized Linear Models with Dask"; homepage = "https://github.com/dask/dask-glm/"; - license = licenses.bsd3; - maintainers = [ ]; - maintainers = with maintainers; [ GaetanLepage ]; + changelog = "https://github.com/dask/dask-glm/releases/tag/${version}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } From 155a3601cf556580e0ffb1f1302a59c1067e5ec9 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 8 Feb 2025 11:49:04 +0100 Subject: [PATCH 1298/2168] python312Packages.dask-ml: 2024.4.4 -> 2025.1.0 Diff: https://github.com/dask/dask-ml/compare/refs/tags/v2024.4.4...v2025.1.0 --- .../python-modules/dask-ml/default.nix | 46 ++++--------------- 1 file changed, 9 insertions(+), 37 deletions(-) diff --git a/pkgs/development/python-modules/dask-ml/default.nix b/pkgs/development/python-modules/dask-ml/default.nix index e3949fde678b..f30adb7ff246 100644 --- a/pkgs/development/python-modules/dask-ml/default.nix +++ b/pkgs/development/python-modules/dask-ml/default.nix @@ -3,14 +3,13 @@ stdenv, buildPythonPackage, fetchFromGitHub, + fetchpatch, # build-system hatch-vcs, hatchling, - setuptools-scm, # dependencies - dask-expr, dask-glm, distributed, multipledispatch, @@ -29,25 +28,23 @@ buildPythonPackage rec { pname = "dask-ml"; - version = "2024.4.4"; + version = "2025.1.0"; pyproject = true; src = fetchFromGitHub { owner = "dask"; repo = "dask-ml"; tag = "v${version}"; - hash = "sha256-ZiBpCk3b4Tk0Hwb4uapJLEx+Nb/qHFROCnkBTNGDzoU="; + hash = "sha256-DHxx0LFuJmGWYuG/WGHj+a5XHAEekBmlHUUb90rl2IY="; }; build-system = [ hatch-vcs hatchling - setuptools-scm ]; dependencies = [ - dask-expr dask-glm distributed multipledispatch @@ -73,39 +70,14 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTestPaths = - [ - # AttributeError: 'csr_matrix' object has no attribute 'A' - # Fixed in https://github.com/dask/dask-ml/pull/996 - "tests/test_svd.py" - - # Tests fail with dask>=0.11.2 - # RuntimeError: Not enough arguments provided - # Reported in https://github.com/dask/dask-ml/issues/1003 - "tests/model_selection/test_incremental.py" - ] - ++ lib.optionals stdenv.isDarwin [ - # RuntimeError: Not enough arguments provided: missing keys - "tests/model_selection/test_hyperband.py" - "tests/model_selection/test_incremental.py" - "tests/model_selection/test_incremental_warns.py" - "tests/model_selection/test_successive_halving.py" - ]; + disabledTestPaths = [ + # AttributeError: module 'numpy' has no attribute 'product' + "tests/test_svd.py" + ]; disabledTests = [ - # Flaky: `Arrays are not almost equal to 3 decimals` (although values do actually match) - "test_whitening" - - # Tests fail with dask>=0.11.2 - # RuntimeError: Not enough arguments provided - # Reported in https://github.com/dask/dask-ml/issues/1003 - "test_basic" - "test_hyperband_patience" - "test_same_random_state_same_params" - "test_search_patience_infeasible_tol" - "test_sha_max_iter_and_metadata" - "test_warns_decay_rate" - "test_warns_decay_rate_wanted" + # AssertionError: Regex pattern did not match. + "test_unknown_category_transform_array" ]; __darwinAllowLocalNetworking = true; From a4ad25f8826800e95c938fe6e1e723076a480bfc Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 8 Feb 2025 21:52:02 +0100 Subject: [PATCH 1299/2168] python312Packages.dask-histogram: 2024.12.1 -> 2025.2.0 Diff: https://github.com/dask-contrib/dask-histogram/compare/refs/tags/2024.12.1...2025.2.0 Changelog: https://github.com/dask-contrib/dask-histogram/releases/tag/2025.2.0 --- .../development/python-modules/dask-histogram/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dask-histogram/default.nix b/pkgs/development/python-modules/dask-histogram/default.nix index fc6af4c39c6b..98692269069d 100644 --- a/pkgs/development/python-modules/dask-histogram/default.nix +++ b/pkgs/development/python-modules/dask-histogram/default.nix @@ -10,6 +10,7 @@ # dependencies boost-histogram, dask, + dask-awkward, # tests pytestCheckHook, @@ -17,14 +18,14 @@ buildPythonPackage rec { pname = "dask-histogram"; - version = "2024.12.1"; + version = "2025.2.0"; pyproject = true; src = fetchFromGitHub { owner = "dask-contrib"; repo = "dask-histogram"; tag = version; - hash = "sha256-chznfEsMFuIioIlTz6uNpVAkjMMoMXjS62R4luKxVZQ="; + hash = "sha256-5Ec/qzVc/7LDG6SJym1e76BbxmbVjKKQHckwtTs1+6M="; }; build-system = [ @@ -35,6 +36,7 @@ buildPythonPackage rec { dependencies = [ boost-histogram dask + dask-awkward ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -44,7 +46,7 @@ buildPythonPackage rec { meta = { description = "Histograms with task scheduling"; homepage = "https://dask-histogram.readthedocs.io/"; - changelog = "https://github.com/dask-contrib/dask-histogram/releases/tag/${src.tag}"; + changelog = "https://github.com/dask-contrib/dask-histogram/releases/tag/${version}"; license = with lib.licenses; [ bsd3 ]; maintainers = with lib.maintainers; [ veprbl ]; }; From 463c481a849d7f99050cf01de1c981b19ce1a409 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 8 Feb 2025 21:54:54 +0100 Subject: [PATCH 1300/2168] python312Packages.dask-awkward: 2024.12.2 -> 2025.2.0 Diff: https://github.com/dask-contrib/dask-awkward/compare/refs/tags/2024.12.2...2025.2.0 Changelog: https://github.com/dask-contrib/dask-awkward/releases/tag/2025.2.0 --- .../python-modules/dask-awkward/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/dask-awkward/default.nix b/pkgs/development/python-modules/dask-awkward/default.nix index a0d8b63fe06a..8031a140ffbf 100644 --- a/pkgs/development/python-modules/dask-awkward/default.nix +++ b/pkgs/development/python-modules/dask-awkward/default.nix @@ -16,7 +16,7 @@ # optional-dependencies pyarrow, - # checks + # tests dask-histogram, distributed, hist, @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "dask-awkward"; - version = "2024.12.2"; + version = "2025.2.0"; pyproject = true; src = fetchFromGitHub { owner = "dask-contrib"; repo = "dask-awkward"; tag = version; - hash = "sha256-pL1LDW/q78V/c3Bha38k40018MFO+i8X6htYNdcsy7s="; + hash = "sha256-hhAY2cPUOYnP86FGsLvxlMeoEwY+sTrjPMKyuZrO0/M="; }; build-system = [ @@ -53,8 +53,8 @@ buildPythonPackage rec { io = [ pyarrow ]; }; - checkInputs = [ - dask-histogram + nativeCheckInputs = [ + # dask-histogram (circular dependency) distributed hist pandas @@ -86,7 +86,7 @@ buildPythonPackage rec { meta = { description = "Native Dask collection for awkward arrays, and the library to use it"; homepage = "https://github.com/dask-contrib/dask-awkward"; - changelog = "https://github.com/dask-contrib/dask-awkward/releases/tag/${src.tag}"; + changelog = "https://github.com/dask-contrib/dask-awkward/releases/tag/${version}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ veprbl ]; }; From a6615dccd466d30afaa2a6dc8b2a7b19b70649cf Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 8 Feb 2025 21:59:59 +0100 Subject: [PATCH 1301/2168] python312Packages.awkward-cpp: 43 -> 44 --- pkgs/development/python-modules/awkward-cpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awkward-cpp/default.nix b/pkgs/development/python-modules/awkward-cpp/default.nix index 0063cd3f851f..ce96b50ca49b 100644 --- a/pkgs/development/python-modules/awkward-cpp/default.nix +++ b/pkgs/development/python-modules/awkward-cpp/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "awkward-cpp"; - version = "43"; + version = "44"; pyproject = true; src = fetchPypi { pname = "awkward_cpp"; inherit version; - hash = "sha256-we11WW7IKvZm2ghLW/gF2bcsg1MtA10rZeB5WQXSXq0="; + hash = "sha256-jcSZKI1tFrLqILUaJ9UEflGiR7aqz8vLOzAsrW08h9g="; }; build-system = [ From de4d55a5971f83869bbd1fd3f5eab486140e633c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 8 Feb 2025 21:58:04 +0100 Subject: [PATCH 1302/2168] python312Packages.awkward: 2.7.2 -> 2.7.4 Diff: https://github.com/scikit-hep/awkward/compare/refs/tags/v2.7.2...v2.7.4 Changelog: https://github.com/scikit-hep/awkward/releases/tag/v2.7.4 --- .../python-modules/awkward/default.nix | 49 +++++++++++-------- 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index 8722a72cf635..83dd0ad4cf61 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -1,7 +1,7 @@ { lib, + stdenv, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -13,12 +13,9 @@ fsspec, numpy, packaging, - typing-extensions, - importlib-metadata, - # checks + # tests numba, - setuptools, numexpr, pandas, pyarrow, @@ -28,14 +25,14 @@ buildPythonPackage rec { pname = "awkward"; - version = "2.7.2"; + version = "2.7.4"; pyproject = true; src = fetchFromGitHub { owner = "scikit-hep"; repo = "awkward"; tag = "v${version}"; - hash = "sha256-nOKMwAQ5t8tc64bEKz0j8JxxoVQQu39Iu8Zr9cqSx7A="; + hash = "sha256-OXSl+8sfrx+JlLu40wHf+98WVNNwm9uxvsnGXRDztDg="; }; build-system = [ @@ -43,15 +40,12 @@ buildPythonPackage rec { hatchling ]; - dependencies = - [ - awkward-cpp - fsspec - numpy - packaging - ] - ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ] - ++ lib.optionals (pythonOlder "3.12") [ importlib-metadata ]; + dependencies = [ + awkward-cpp + fsspec + numpy + packaging + ]; dontUseCmakeConfigure = true; @@ -60,7 +54,6 @@ buildPythonPackage rec { nativeCheckInputs = [ fsspec numba - setuptools numexpr pandas pyarrow @@ -68,11 +61,27 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTestPaths = [ - # Need to be run on a GPU platform. - "tests-cuda" + disabledTests = [ + # pyarrow.lib.ArrowInvalid + "test_recordarray" ]; + disabledTestPaths = + [ + # Need to be run on a GPU platform. + "tests-cuda" + ] + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ + # Fatal Python error: Segmentation fault at: + # numba/typed/typedlist.py", line 344 in append + "tests/test_0118_numba_cpointers.py" + "tests/test_0397_arrays_as_constants_in_numba.py" + "tests/test_1677_array_builder_in_numba.py" + "tests/test_2055_array_builder_check.py" + "tests/test_2349_growablebuffer_in_numba.py" + "tests/test_2408_layoutbuilder_in_numba.py" + ]; + meta = { description = "Manipulate JSON-like data with NumPy-like idioms"; homepage = "https://github.com/scikit-hep/awkward"; From 6034e48ce4c5e6e37ce8fecfbd12a461abb9f7a3 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 8 Feb 2025 22:08:22 +0100 Subject: [PATCH 1303/2168] python312Packages.mplhep: 0.3.55 -> 0.3.56 Diff: https://github.com/scikit-hep/mplhep/compare/refs/tags/v0.3.55...v0.3.56 --- .../python-modules/mplhep/default.nix | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/mplhep/default.nix b/pkgs/development/python-modules/mplhep/default.nix index 604eea8a8489..a5c167aa603f 100644 --- a/pkgs/development/python-modules/mplhep/default.nix +++ b/pkgs/development/python-modules/mplhep/default.nix @@ -2,36 +2,42 @@ lib, buildPythonPackage, fetchFromGitHub, - setuptools, - setuptools-scm, + + # build-system + hatch-vcs, + hatchling, + + # dependencies matplotlib, mplhep-data, numpy, packaging, uhi, + + # tests + hist, + pytest-mock, + pytest-mpl, pytestCheckHook, scipy, - pytest-mpl, - pytest-mock, uproot, - hist, }: buildPythonPackage rec { pname = "mplhep"; - version = "0.3.55"; + version = "0.3.56"; pyproject = true; src = fetchFromGitHub { owner = "scikit-hep"; repo = "mplhep"; tag = "v${version}"; - hash = "sha256-7YkrrH9Bfn3ctjv+H6TXEDE8yS/wnjO7umuHIXeYTDU="; + hash = "sha256-sMJpJUEtIqmu7kCgZp43t9XLy/6nkDgKcxC4nFb+1po="; }; build-system = [ - setuptools - setuptools-scm + hatch-vcs + hatchling ]; dependencies = [ @@ -43,12 +49,12 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + hist + pytest-mock + pytest-mpl pytestCheckHook scipy - pytest-mpl - pytest-mock uproot - hist ]; disabledTests = [ @@ -62,6 +68,7 @@ buildPythonPackage rec { meta = { description = "Extended histogram plots on top of matplotlib and HEP compatible styling similar to current collaboration requirements (ROOT)"; homepage = "https://github.com/scikit-hep/mplhep"; + changelog = "https://github.com/scikit-hep/mplhep/releases/tag/v${version}"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ veprbl ]; }; From e4b6f92d39a2e79e29e53dc2894d1168ab60fa78 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 8 Feb 2025 22:15:52 +0100 Subject: [PATCH 1304/2168] python312Packages.coffea: fix build --- pkgs/development/python-modules/coffea/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/coffea/default.nix b/pkgs/development/python-modules/coffea/default.nix index 5e61b17c5c2d..0710ca0f5dba 100644 --- a/pkgs/development/python-modules/coffea/default.nix +++ b/pkgs/development/python-modules/coffea/default.nix @@ -57,6 +57,10 @@ buildPythonPackage rec { hatch-vcs ]; + pythonRelaxDeps = [ + "dask" + ]; + dependencies = [ aiohttp awkward @@ -106,6 +110,10 @@ buildPythonPackage rec { # AssertionError: bug in Awkward Array: attempt to convert TypeTracerArray into a concrete array "test_apply_to_fileset" "test_lorentz_behavior" + + # ValueError: The array to mask was deleted before it could be masked. + # If you want to construct this mask, you must either keep the array alive or use 'ak.mask' explicitly. + "test_read_nanomc" ]; __darwinAllowLocalNetworking = true; From da903daeed9e17a8e1f422497e81a088ff5531b9 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 9 Feb 2025 12:28:47 +0100 Subject: [PATCH 1305/2168] python312Packages.dask-image: fix build --- .../python-modules/dask-image/default.nix | 27 ++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dask-image/default.nix b/pkgs/development/python-modules/dask-image/default.nix index a297902bc684..599e99853ad8 100644 --- a/pkgs/development/python-modules/dask-image/default.nix +++ b/pkgs/development/python-modules/dask-image/default.nix @@ -1,15 +1,21 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, + + # build-system setuptools, setuptools-scm, + + # dependencies dask, numpy, scipy, pandas, pims, + + # tests + pyarrow, pytestCheckHook, scikit-image, }: @@ -19,8 +25,6 @@ buildPythonPackage rec { version = "2024.5.3"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "dask"; repo = "dask-image"; @@ -28,6 +32,11 @@ buildPythonPackage rec { hash = "sha256-kXCAqJ2Zgo/2Khvo2YcK+n4oGM219GyQ2Hsq9re1Lac="; }; + postPatch = '' + substituteInPlace dask_image/ndinterp/__init__.py \ + --replace-fail "out_bounds.ptp(axis=1)" "np.ptp(out_bounds, axis=1)" + ''; + build-system = [ setuptools setuptools-scm @@ -42,15 +51,27 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pyarrow pytestCheckHook scikit-image ]; pythonImportsCheck = [ "dask_image" ]; + disabledTests = [ + # The following tests are from 'tests/test_dask_image/test_ndmeasure/test_find_objects.py' and + # fail because of errrors on numpy slices + # AttributeError: 'str' object has no attribute 'start' + "test_find_objects" + "test_3d_find_objects" + # AssertionError (comparing slices) + "test_find_objects_with_empty_chunks" + ]; + meta = { description = "Distributed image processing"; homepage = "https://github.com/dask/dask-image"; + changelog = "https://github.com/dask/dask-image/releases/tag/v${version}"; license = lib.licenses.bsdOriginal; maintainers = with lib.maintainers; [ GaetanLepage ]; }; From f038704a74d55815a0fa8777caea5af4588646c2 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 7 Feb 2025 11:45:28 +0100 Subject: [PATCH 1306/2168] python312Packages.dask-expr: remove (now included in dask) --- .../python-modules/dask-expr/default.nix | 65 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 67 deletions(-) delete mode 100644 pkgs/development/python-modules/dask-expr/default.nix diff --git a/pkgs/development/python-modules/dask-expr/default.nix b/pkgs/development/python-modules/dask-expr/default.nix deleted file mode 100644 index c7bb6c734ee9..000000000000 --- a/pkgs/development/python-modules/dask-expr/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - - # build-system - setuptools, - versioneer, - - # dependencies - dask, - pandas, - pyarrow, - - # checks - jinja2, - pytestCheckHook, - xarray, -}: - -buildPythonPackage rec { - pname = "dask-expr"; - version = "1.1.21"; - pyproject = true; - - src = fetchFromGitHub { - owner = "dask"; - repo = "dask-expr"; - tag = "v${version}"; - hash = "sha256-t1vPlTxV5JYArg/a7CzPP13NHbstEoCgHRmd8Y9mDfA="; - }; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "versioneer[toml]==0.28" "versioneer[toml]" - ''; - - build-system = [ - setuptools - versioneer - ]; - - dependencies = [ - dask - pandas - pyarrow - ]; - - pythonImportsCheck = [ "dask_expr" ]; - - nativeCheckInputs = [ - jinja2 - pytestCheckHook - xarray - ]; - - __darwinAllowLocalNetworking = true; - - meta = { - description = "Rewrite of Dask DataFrame that includes query optimization and generally improved organization"; - homepage = "https://github.com/dask/dask-expr"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ GaetanLepage ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 434e1b6f3cd9..c87843dcb618 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -142,6 +142,7 @@ mapAliases ({ cx_Freeze = cx-freeze; # added 2023-08-02 cx_oracle = cx-oracle; # added 2024-01-03 d2to1 = throw "d2to1 is archived and no longer works with setuptools v68"; # added 2023-07-30 + dask-expr = throw "dask-expr was removed because its features are available in dask"; # added 2025-02-07 dask-xgboost = throw "dask-xgboost was removed because its features are available in xgboost"; # added 2022-05-24 dash-renderer = throw "dash-renderer has been removed since it is abandoned"; # added 2025-01-01 dateutil = python-dateutil; # added 2021-07-03 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a128bbcc871e..6fb26c833a94 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2961,8 +2961,6 @@ self: super: with self; { dask-awkward = callPackage ../development/python-modules/dask-awkward { }; - dask-expr = callPackage ../development/python-modules/dask-expr { }; - dask-gateway = callPackage ../development/python-modules/dask-gateway { }; dask-gateway-server = callPackage ../development/python-modules/dask-gateway-server { }; From 6f8e938bc95b2bc840feed4b2916420280d88cb0 Mon Sep 17 00:00:00 2001 From: William Vandervalk Date: Fri, 10 Jan 2025 15:50:03 -0500 Subject: [PATCH 1307/2168] backrest: 1.5.0 -> 1.7.1 --- pkgs/by-name/ba/backrest/package.nix | 42 ++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/ba/backrest/package.nix b/pkgs/by-name/ba/backrest/package.nix index 80689fb85e83..393ff7e1c25f 100644 --- a/pkgs/by-name/ba/backrest/package.nix +++ b/pkgs/by-name/ba/backrest/package.nix @@ -1,29 +1,46 @@ { buildGoModule, - buildNpmPackage, fetchFromGitHub, + gzip, lib, + nodejs, + pnpm_9, restic, - util-linux, stdenv, + util-linux, }: let pname = "backrest"; - version = "1.5.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "garethgeorge"; repo = "backrest"; tag = "v${version}"; - hash = "sha256-qxEZkRKkwKZ+EZ3y3aGcX2ioKOz19SRdi3+9mjF1LpE="; + hash = "sha256-I6UGxqZRtCai86Yq5VIg1ROYSQx4voQccPGRf7XdxYo="; }; - frontend = buildNpmPackage { + frontend = stdenv.mkDerivation (finalAttrs: { inherit version; pname = "${pname}-webui"; src = "${src}/webui"; - npmDepsHash = "sha256-mS8G3+JuASaOkAYi+vgWztrSIIu7vfaasu+YeRJjWZw="; + nativeBuildInputs = [ + nodejs + pnpm_9.configHook + ]; + + pnpmDeps = pnpm_9.fetchDeps { + inherit (finalAttrs) pname version src; + hash = "sha256-rBu+6QwTmQsjHh0yd8QjdHPc3VOmadJQ+NK9X6qbSx8="; + }; + + buildPhase = '' + runHook preBuild + export BACKREST_BUILD_VERSION=${version} + pnpm build + runHook postBuild + ''; installPhase = '' runHook preInstall @@ -31,16 +48,20 @@ let cp -r dist/* $out runHook postInstall ''; - }; + }); in buildGoModule { inherit pname src version; - vendorHash = "sha256-YukcHnXa/QimfX3nDtQI6yfPkEK9j5SPXOPIT++eWsU="; + vendorHash = "sha256-OVJnJ5fdpa1vpYTCxtvRGbnICbfwZeYiCwAS8c4Tg2Y="; + + nativeBuildInputs = [ gzip ]; preBuild = '' mkdir -p ./webui/dist cp -r ${frontend}/* ./webui/dist + + go generate -skip="npm" ./... ''; nativeCheckInputs = [ util-linux ]; @@ -48,11 +69,10 @@ buildGoModule { checkFlags = let skippedTests = - [ - "TestServeIndex" # Fails with handler returned wrong content encoding - ] + [ "TestRunCommand" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "TestBackup" # relies on ionice + "TestCancelBackup" ]; in [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; From a354cd975885cfeb9f21fc727585d2b250abf3da Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 12 Feb 2025 00:31:37 +0100 Subject: [PATCH 1308/2168] python312Packages.datashape: cleanup & fix --- .../python-modules/datashape/default.nix | 79 +++++++++---------- 1 file changed, 36 insertions(+), 43 deletions(-) diff --git a/pkgs/development/python-modules/datashape/default.nix b/pkgs/development/python-modules/datashape/default.nix index 7077087d3587..176a3136a802 100644 --- a/pkgs/development/python-modules/datashape/default.nix +++ b/pkgs/development/python-modules/datashape/default.nix @@ -2,45 +2,30 @@ lib, buildPythonPackage, fetchFromGitHub, - pytest, - mock, - numpy, - multipledispatch, - python-dateutil, + + # build-system setuptools, versioneer, + + # dependencies + multipledispatch, + numpy, + python-dateutil, + + # tests + pytestCheckHook, }: -let - # Fetcher function looks similar to fetchPypi. - # Allows for easier overriding, without having to know - # how the source is actually fetched. - fetcher = - { - pname, - version, - sha256, - }: - fetchFromGitHub { - owner = "blaze"; - repo = pname; - rev = version; - inherit sha256; - }; -in buildPythonPackage rec { pname = "datashape"; version = "0.5.4"; - pyproject = true; - build-system = [ - setuptools - versioneer - ]; - src = fetcher { - inherit pname version; - sha256 = "0rhlj2kjj1vx5m73wnc5518rd6cs1zsbgpsvzk893n516k69shcf"; + src = fetchFromGitHub { + owner = "blaze"; + repo = "datashape"; + tag = version; + hash = "sha256-jkGdzDSh2JHQ/Fvft/QPmpmWUSiFWT5OLX0HKaeQFGY="; }; postPatch = '' @@ -48,29 +33,37 @@ buildPythonPackage rec { rm versioneer.py ''; - nativeCheckInputs = [ - pytest - mock + build-system = [ + setuptools + versioneer ]; + dependencies = [ - numpy multipledispatch + numpy python-dateutil ]; - # Disable several tests - # https://github.com/blaze/datashape/issues/232 - checkPhase = '' - pytest --ignore datashape/tests/test_str.py \ - --ignore datashape/tests/test_user.py - ''; + nativeCheckInputs = [ + pytestCheckHook + ]; - # https://github.com/blaze/datashape/issues/238 - PYTEST_ADDOPTS = "-k 'not test_record and not test_tuple'"; + disabledTests = [ + # AttributeError: `np.unicode_` was removed in the NumPy 2.0 release. Use `np.str_` instead. + "test_from_numpy_dtype_fails" + "test_string_from_CType_classmethod" + ]; + disabledTestPaths = [ + # numpy incompatibilities + # https://github.com/blaze/datashape/issues/232 + "datashape/tests/test_str.py" + "datashape/tests/test_user.py" + ]; meta = { - homepage = "https://github.com/ContinuumIO/datashape"; description = "Data description language"; + homepage = "https://github.com/ContinuumIO/datashape"; + changelog = "https://github.com/blaze/datashape/releases/tag/${version}"; license = lib.licenses.bsd2; }; } From e5b16faa47cfb2df47dad70f8b9d0017f14b5c70 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 11 Feb 2025 23:28:15 +0100 Subject: [PATCH 1309/2168] python312Packages.ray: 2.42.0 -> 2.42.1 Changelog: https://github.com/ray-project/ray/releases/tag/ray-2.42.1 --- .../python-modules/ray/default.nix | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/ray/default.nix b/pkgs/development/python-modules/ray/default.nix index 6baac15b32ae..e3313ce96840 100644 --- a/pkgs/development/python-modules/ray/default.nix +++ b/pkgs/development/python-modules/ray/default.nix @@ -66,7 +66,7 @@ let pname = "ray"; - version = "2.42.0"; + version = "2.42.1"; in buildPythonPackage rec { inherit pname version; @@ -87,28 +87,28 @@ buildPythonPackage rec { # curl https://pypi.org/pypi/ray/${version}/json | jq -r '.urls[] | "\(.digests.sha256) \(.filename)"' hashes = { aarch64-darwin = { - cp39 = "4835c58b2e14f70badc059e9a6310cbfb51dec7a5b20fe712a4d193c85c9b2c5"; - cp310 = "4bb3d88c478dd2cc3a17a66f0c47a73978608ce5579f92f77a468720763c2331"; - cp311 = "7de151d403f351bb0fe3ed6f3f0e0258ce989871c60e4ccca2ab5bab7e9fc820"; - cp312 = "4a3ab3d73541c4e1b8c0dca31d4006ba18b20ccf7eb7a7428f5dbf96e9736a83"; + cp39 = "sha256-MijkhGUC4MW+rmm2mfyQcaBtPPv8DKXyvScHkkpS40s="; + cp310 = "sha256-YHJ/nHKo9xvE4U1H3E3ElNxZo8Sw0QiuBPpuWo5FIo8="; + cp311 = "sha256-8BlRTFIgqCL7wMOO0fdQXOx1uWGnYEq2d/1kd+M6Ki4"; + cp312 = "sha256-orb2JZC7YF1m043rSV84MqbQMB2z9JatxU0SoURUHjc="; }; aarch64-linux = { - cp39 = "sha256-NlE3pzeWzz6DlS2Y6Gv8W+1DRMjK1a9T2R9lvq5nL7g="; - cp310 = "sha256-MxCDruyfxiqy/Fkn0YM1idpZNUvChx8Xt6EBie7Q2uY="; - cp311 = "sha256-eb9KDQIX6i2O/UfeZ9nCKTBAGc6ZZ427FI9WXZakRuI="; - cp312 = "sha256-PnKHZmINbjEYajepBsB7gH2i86rPSxZ/bos3xy7U3mM="; + cp39 = "sha256-V/epiChYGASp537Jnz/d1UIl2r2pwNmmdx630i5pMHI="; + cp310 = "sha256-kNi/DBr+I2SjP1NWNnYaV0440oOwQGE7joY5vhQdBKA="; + cp311 = "sha256-xdeeSYrOtapbPlMH7HSV9YSGtCZrOP7qOXm5iB6VDE8="; + cp312 = "sha256-nKXH/V9nboMXgS53AY9i+HxbOa4Op/n4DW6YzSL99Vo="; }; x86_64-darwin = { - cp39 = "aa5692cc8f584c5f531074fd7283004acfbc538b36101f6c403d4ff1837aca52"; - cp310 = "515bc5d9811cc4bb982daf6c7b2c82453cccc886e41514e03bc3342293acb109"; - cp311 = "6e2b8ad794729f068742ffc2547fd322fa6ef31e46e886ac6e53690b86415cf0"; - cp312 = "6b117e01d0304305e459cccc78e1b46dc1ee60227a2afd8569d97b7a2bc516ed"; + cp39 = "sha256-EgWa4hgQ0K6LCcx8N51SzRCIgbi56cYo0ywEWXD8KsQ="; + cp310 = "sha256-ufLyDLLd31LsB+JU84upFGe4bfETMImdauI2GD45UnU="; + cp311 = "sha256-ToHIlnedis5mr8KsdQUIBtsQLZUBou1uovOAEJYsyn8="; + cp312 = "sha256-t+9IkWQyoNXMyr78jL2L8MDSrQuIQczjzr0bEzmWyjY="; }; x86_64-linux = { - cp39 = "sha256-rGz4bKRemxRdHCLPpHBpzdyq3ms/3Bsd5adhEJfZbX4="; - cp310 = "sha256-i+C9U2ErZEbDm09OnLS9NUhknVISR3NJzPvcklCHgik="; - cp311 = "sha256-6JJLbtCGZVsr+LP/KaxFPR6Kp6TW0s6WW7ql+xfRNk8="; - cp312 = "sha256-4+3gNnqyj72GiiL05M2sRFQ8ZU4svFo7SCF45/cl6iw="; + cp39 = "sha256-LUATaRjN1/YHEKpGRS7vqcDkYOLE51svxXI8c9521wE="; + cp310 = "sha256-AYAiSeuc02Mm5v4LqoiRb6YGJzHaElBryT5zbxcRHdQ="; + cp311 = "sha256-z1vEMnUuKbyADjAAO9ZJM9eFND9ZqajDGoOc2YH8UIQ="; + cp312 = "sha256-4Np/+6ctOsJ1B4FvAPKtM0+BWDX0e4sEghzFdQ7Flkc="; }; }; in From e68de07c2e9eb4812b178693af35816c7038f320 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 23:54:05 +0000 Subject: [PATCH 1310/2168] python312Packages.thermopro-ble: 0.10.1 -> 0.11.0 --- pkgs/development/python-modules/thermopro-ble/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/thermopro-ble/default.nix b/pkgs/development/python-modules/thermopro-ble/default.nix index e7649a04822c..b7e6be0e089b 100644 --- a/pkgs/development/python-modules/thermopro-ble/default.nix +++ b/pkgs/development/python-modules/thermopro-ble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "thermopro-ble"; - version = "0.10.1"; + version = "0.11.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bluetooth-devices"; repo = "thermopro-ble"; tag = "v${version}"; - hash = "sha256-OGUgWiD/4a2A40wut70YAvwBREpB9xjN0YcFpu411z4="; + hash = "sha256-3GgFRY36KMcMWxwjLgzuJB++DZ2TMdQQruen1gLHAbk="; }; build-system = [ poetry-core ]; @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for Thermopro BLE devices"; homepage = "https://github.com/bluetooth-devices/thermopro-ble"; - changelog = "https://github.com/Bluetooth-Devices/thermopro-ble/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/Bluetooth-Devices/thermopro-ble/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From 2be02aaa18ee4fbb33e29ec34fecc9dcf4b53cd1 Mon Sep 17 00:00:00 2001 From: nikolaizombie1 Date: Tue, 11 Feb 2025 18:53:11 -0500 Subject: [PATCH 1311/2168] waytrogen: 0.6.8 -> 0.6.9 --- pkgs/by-name/wa/waytrogen/package.nix | 46 ++++++++++++++++----------- 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/wa/waytrogen/package.nix b/pkgs/by-name/wa/waytrogen/package.nix index 95d3746a7820..87bfcfdc749d 100644 --- a/pkgs/by-name/wa/waytrogen/package.nix +++ b/pkgs/by-name/wa/waytrogen/package.nix @@ -6,46 +6,56 @@ wrapGAppsHook4, glib, nix-update-script, + stdenv, + meson, + ninja, + cargo, + rustc, + sqlite, + openssl, }: -rustPlatform.buildRustPackage rec { +stdenv.mkDerivation rec { pname = "waytrogen"; - version = "0.6.8"; + version = "0.6.9"; src = fetchFromGitHub { owner = "nikolaizombie1"; repo = "waytrogen"; tag = version; - hash = "sha256-/NvLgC1IB3YrilnuuZFMuDYaUDQ4fDrtYNf1xL8H+Ng="; + hash = "sha256-bHQhgavD7L0jCWafOGnGRGOBigdcpSBvsFxTlJudZSY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-cdomE3K8T1urvRK1TAm+IvnKC8ZuPgEVnN3TzlJVtBQ="; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-577bzSc2iEoTotG55qBZOR3SdRUvp3gGQP2zrtkePAw="; + }; nativeBuildInputs = [ pkg-config wrapGAppsHook4 + meson + ninja + rustPlatform.cargoSetupHook + cargo + rustc ]; - buildInputs = [ glib ]; + buildInputs = [ + glib + sqlite + openssl + ]; + + preBuild = ''export OUT_PATH=$out''; env = { OPENSSL_NO_VENDOR = 1; }; - postBuild = '' - install -Dm644 org.Waytrogen.Waytrogen.gschema.xml -t $out/share/gsettings-schemas/$name/glib-2.0/schemas - glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas - ''; - - postInstall = '' - install -Dm644 waytrogen.desktop $out/share/applications/waytrogen.desktop - install -Dm644 README-Assets/WaytrogenLogo.svg $out/share/icons/hicolor/scalable/apps/waytrogen.svg - while IFS= read -r lang; do - mkdir -p $out/share/locale/$lang/LC_MESSAGES - msgfmt locales/$lang/LC_MESSAGES/waytrogen.po -o $out/share/locale/$lang/LC_MESSAGES/waytrogen.mo - done < locales/LINGUAS - ''; + mesonFlags = [ "-Dcargo_features=nixos" ]; passthru.updateScript = nix-update-script { }; From 0ac2f6f4eec2493c4ac4fe3d0a324dfd0e8ebf06 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 23:57:55 +0000 Subject: [PATCH 1312/2168] python312Packages.hid: 1.0.6 -> 1.0.7 --- pkgs/development/python-modules/hid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hid/default.nix b/pkgs/development/python-modules/hid/default.nix index f8d0535409a5..59af2d501e9a 100644 --- a/pkgs/development/python-modules/hid/default.nix +++ b/pkgs/development/python-modules/hid/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "hid"; - version = "1.0.6"; + version = "1.0.7"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-SNdk166XRroSO5bb9FeJPKgCaLd5HEsdLgUTEO64OGA="; + hash = "sha256-P4CeKSq1LEQ1rRRCyO8gW+TJyk7rgPtHx9mODHVSeyo="; }; postPatch = '' From 83a2581c81ff5b06f7c1a4e7cc736a455dfcf7b4 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Tue, 11 Feb 2025 13:47:23 -0500 Subject: [PATCH 1313/2168] go_1_24: 1.24rc3 -> 1.24.0 --- pkgs/development/compilers/go/1.24.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.24.nix b/pkgs/development/compilers/go/1.24.nix index 75a4cb6c8475..f03c42af8ae1 100644 --- a/pkgs/development/compilers/go/1.24.nix +++ b/pkgs/development/compilers/go/1.24.nix @@ -49,11 +49,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.24rc3"; + version = "1.24.0"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-LHEopY9iz9706vaOe5vxh/P/6i7AZ1SmTW7ja/6j1pE="; + hash = "sha256-0UEgYUrLKdEryrcr1onyV+tL6eC2+IqPt+Qaxl+FVuU="; }; strictDeps = true; From b77e5e62099791b9466c3942645be5b0dd4efa0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 11 Feb 2025 16:05:36 -0800 Subject: [PATCH 1314/2168] python312Packages.great-expectations: mark broken --- pkgs/development/python-modules/great-expectations/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/great-expectations/default.nix b/pkgs/development/python-modules/great-expectations/default.nix index 9b3f2902ce9e..fe2f4f5274c5 100644 --- a/pkgs/development/python-modules/great-expectations/default.nix +++ b/pkgs/development/python-modules/great-expectations/default.nix @@ -52,6 +52,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace tests/conftest.py --replace 'locale.setlocale(locale.LC_ALL, "en_US.UTF-8")' "" + substituteInPlace pyproject.toml \ + --replace-fail '"ignore::marshmallow.warnings.ChangedInMarshmallow4Warning",' "" ''; build-system = [ setuptools ]; @@ -129,6 +131,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "-m 'not spark and not postgresql and not snowflake'" ]; meta = { + broken = true; # 408 tests fail description = "Library for writing unit tests for data validation"; homepage = "https://docs.greatexpectations.io"; changelog = "https://github.com/great-expectations/great_expectations/releases/tag/${src.tag}"; From d1e4020ac2653d4e5dbb68723b89d7ae1b40ac8d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 00:31:57 +0000 Subject: [PATCH 1315/2168] api-linter: 1.68.0 -> 1.69.0 --- pkgs/by-name/ap/api-linter/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ap/api-linter/package.nix b/pkgs/by-name/ap/api-linter/package.nix index 6e77539b60cc..86c08979d205 100644 --- a/pkgs/by-name/ap/api-linter/package.nix +++ b/pkgs/by-name/ap/api-linter/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "api-linter"; - version = "1.68.0"; + version = "1.69.0"; src = fetchFromGitHub { owner = "googleapis"; repo = "api-linter"; rev = "v${version}"; - hash = "sha256-pYzdI7bcAPP47K4EKjsAV7UY2RLGX9m3tksYRZeGdTQ="; + hash = "sha256-a+TBI4rm/6JzDH6PZyYfX6ThZuA6FW7H6ml5K9lorG4="; }; - vendorHash = "sha256-vdoEMMlFwS+BBd0EsrahVL3ZZE4PHQJP4CNwsqIo5Y8="; + vendorHash = "sha256-wQQGQHz7Z8iSaDbfGWR/MazCo27uLycN0rKerRqzCDc="; subPackages = [ "cmd/api-linter" ]; From 63e89836a547118f68a935f5bc773913d8dd113d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 00:34:43 +0000 Subject: [PATCH 1316/2168] microcode-intel: 20241112 -> 20250211 --- pkgs/by-name/mi/microcode-intel/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mi/microcode-intel/package.nix b/pkgs/by-name/mi/microcode-intel/package.nix index 46769b79174f..0093c9235321 100644 --- a/pkgs/by-name/mi/microcode-intel/package.nix +++ b/pkgs/by-name/mi/microcode-intel/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "microcode-intel"; - version = "20241112"; + version = "20250211"; src = fetchFromGitHub { owner = "intel"; repo = "Intel-Linux-Processor-Microcode-Data-Files"; rev = "microcode-${version}"; - hash = "sha256-dvXt4SX/90oFM4GR9R7C2udhZ+plxnabOZpbtwN3V8Q="; + hash = "sha256-XfBVygHmUAV287MyBreoAyGcffGBEY7YKyj6AOytXZ4="; }; nativeBuildInputs = [ From 82f16a6df680777f2f7f532193c5f0815deccb53 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 00:35:17 +0000 Subject: [PATCH 1317/2168] aiken: 1.1.10 -> 1.1.11 --- pkgs/by-name/ai/aiken/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ai/aiken/package.nix b/pkgs/by-name/ai/aiken/package.nix index a3fd09b6c233..dcbf74ad9960 100644 --- a/pkgs/by-name/ai/aiken/package.nix +++ b/pkgs/by-name/ai/aiken/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "aiken"; - version = "1.1.10"; + version = "1.1.11"; src = fetchFromGitHub { owner = "aiken-lang"; repo = "aiken"; rev = "v${version}"; - hash = "sha256-qM6rBBBwLUwB3g+jjT0R6z0473x929t2W8tOY663EcI="; + hash = "sha256-RCMUF9+dj+zJM1tyuUs2oOMk+5xdHrzWYejuOPd/Ngc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-bgf9iVqQ7HuUV+idlPxyuILmxjBi2ThihdeCLjhj8Hk="; + cargoHash = "sha256-R6jTr4F+ZbRracW8yQdpDHHerzbJy1jQYr/ttFSwCWc="; buildInputs = [ openssl ] From e937874e091144f60b1839c0aa5c4764f0d9ec2e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 00:37:24 +0000 Subject: [PATCH 1318/2168] thermald: 2.5.8 -> 2.5.9 --- pkgs/by-name/th/thermald/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/th/thermald/package.nix b/pkgs/by-name/th/thermald/package.nix index 590b813f6644..fbf1e7fdf9aa 100644 --- a/pkgs/by-name/th/thermald/package.nix +++ b/pkgs/by-name/th/thermald/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "thermald"; - version = "2.5.8"; + version = "2.5.9"; outputs = [ "out" @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "thermal_daemon"; rev = "v${version}"; - sha256 = "sha256-aqNaXg+XznIgsMzORcRcwfTI5tBYmSGA2pma2oUu8K4="; + sha256 = "sha256-ydv6wZ3r2QxVji9bSx0sgpaOQNtgN+Y4rPZ44XtxNh8="; }; nativeBuildInputs = [ From 5b7872c588e5730e38b7c5b94d531c3f5bed7496 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 00:59:35 +0000 Subject: [PATCH 1319/2168] rabbitmq-server: 4.0.5 -> 4.0.6 --- pkgs/by-name/ra/rabbitmq-server/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ra/rabbitmq-server/package.nix b/pkgs/by-name/ra/rabbitmq-server/package.nix index c83df6532321..e23b19abb91f 100644 --- a/pkgs/by-name/ra/rabbitmq-server/package.nix +++ b/pkgs/by-name/ra/rabbitmq-server/package.nix @@ -42,12 +42,12 @@ in stdenv.mkDerivation rec { pname = "rabbitmq-server"; - version = "4.0.5"; + version = "4.0.6"; # when updating, consider bumping elixir version in all-packages.nix src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz"; - hash = "sha256-Jn6DvSvegezhq+zjZbUdHR/b6Kgg+QqZwDDrxu21+0g="; + hash = "sha256-JkXBZtOUJXfccYZyryO/fZUKL3jyKLGq2vhpRENeDo4="; }; nativeBuildInputs = [ From 29887942dab0a2c382afea7f1af6fddf172c426e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 01:01:48 +0000 Subject: [PATCH 1320/2168] lychee: 0.18.0 -> 0.18.1 --- pkgs/tools/networking/lychee/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/lychee/default.nix b/pkgs/tools/networking/lychee/default.nix index ae546198a89d..50d841d2a8a0 100644 --- a/pkgs/tools/networking/lychee/default.nix +++ b/pkgs/tools/networking/lychee/default.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "lychee"; - version = "0.18.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "lycheeverse"; repo = pname; rev = "lychee-v${version}"; - hash = "sha256-DRGby8Ov7Mosz4FVz/w2ECkvyuBktL9PTnUYds+mCI8="; + hash = "sha256-aT7kVN2KM90M193h4Xng6+v69roW0J4GLd+29BzALhI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-B0bskG5ptUJCwRy/m0ZMo80dE2MTi39mnQLsgQjwTBY="; + cargoHash = "sha256-TKKhT4AhV2uzXOHRnKHiZJusNoCWUliKmKvDw+Aeqnc="; nativeBuildInputs = [ pkg-config ]; From 79355d4bc5b1fce8318be3dfac9b0bd89cccf47e Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Tue, 11 Feb 2025 12:21:27 -0700 Subject: [PATCH 1321/2168] freebsd.umount: init --- pkgs/os-specific/bsd/freebsd/pkgs/umount.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/umount.nix diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/umount.nix b/pkgs/os-specific/bsd/freebsd/pkgs/umount.nix new file mode 100644 index 000000000000..07befa596e24 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/umount.nix @@ -0,0 +1,19 @@ +{ + lib, + mkDerivation, +}: +mkDerivation { + path = "sbin/umount"; + extraPaths = [ + "sbin/mount" + "usr.sbin/rpc.umntall" + ]; + + outputs = [ + "out" + "man" + "debug" + ]; + + meta.platforms = lib.platforms.freebsd; +} From 305a93a7257aa399aa1ab1cf0d5d6115b3eaa6c0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 Feb 2025 02:44:36 +0100 Subject: [PATCH 1322/2168] python313Packages.drf-ujson2: 1.7.2 -> 1.8.0 https://github.com/Amertz08/drf_ujson2/releases/tag/v1.8.0 --- .../python-modules/drf-ujson2/default.nix | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/drf-ujson2/default.nix b/pkgs/development/python-modules/drf-ujson2/default.nix index e0a04ac41669..94be92161e00 100644 --- a/pkgs/development/python-modules/drf-ujson2/default.nix +++ b/pkgs/development/python-modules/drf-ujson2/default.nix @@ -2,6 +2,10 @@ lib, buildPythonPackage, fetchFromGitHub, + pythonOlder, + + # build-system + setuptools, # dependencies django, @@ -9,6 +13,7 @@ ujson, # tests + pytest-cov-stub, pytest-django, pytest-mock, pytestCheckHook, @@ -16,23 +21,22 @@ buildPythonPackage rec { pname = "drf-ujson2"; - version = "1.7.2"; - format = "setuptools"; + version = "1.8.0"; + pyproject = true; + + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "Amertz08"; repo = "drf_ujson2"; tag = "v${version}"; - hash = "sha256-kbpZN1zOXHvRPcn+Sjbelq74cWgvCUeMXZy1eFSa6rA="; + hash = "sha256-NtloZWsEmRbPl7pdxPQqpzIzTyyOEFO9KtZ60F7VuUQ="; }; - postPatch = '' - sed -i '/--cov/d' setup.cfg - ''; + build-system = [ setuptools ]; - buildInputs = [ django ]; - - propagatedBuildInputs = [ + dependencies = [ + django djangorestframework ujson ]; @@ -40,6 +44,7 @@ buildPythonPackage rec { env.DJANGO_SETTINGS_MODULE = "tests.settings"; nativeCheckInputs = [ + pytest-cov-stub pytest-django pytest-mock pytestCheckHook @@ -49,6 +54,7 @@ buildPythonPackage rec { changelog = "https://github.com/Amertz08/drf_ujson2/releases/tag/v${version}"; description = "JSON parser and renderer using ujson for Django Rest Framework"; homepage = "https://github.com/Amertz08/drf_ujson2"; + license = licenses.mit; maintainers = with maintainers; [ hexa ]; }; } From 712f6ff8ce07c26285d972c13bafbdcf8833267a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 Feb 2025 03:04:42 +0100 Subject: [PATCH 1323/2168] pretix: relax drf-ujson2 constraint --- pkgs/by-name/pr/pretix/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index d44f0f5df26c..52f8e728eb21 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -83,6 +83,7 @@ python.pkgs.buildPythonApplication rec { pythonRelaxDeps = [ "django-phonenumber-field" "dnspython" + "drf_ujson2" "importlib-metadata" "kombu" "markdown" From 062abf015545737d3e76126213885725b25e9e22 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 02:32:49 +0000 Subject: [PATCH 1324/2168] ndpi: 4.10 -> 4.12 --- pkgs/by-name/nd/ndpi/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nd/ndpi/package.nix b/pkgs/by-name/nd/ndpi/package.nix index ffade02b5b4a..134487ef4e96 100644 --- a/pkgs/by-name/nd/ndpi/package.nix +++ b/pkgs/by-name/nd/ndpi/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ndpi"; - version = "4.10"; + version = "4.12"; src = fetchFromGitHub { owner = "ntop"; repo = "nDPI"; tag = finalAttrs.version; - hash = "sha256-iXqvDMJsOXcg9YkqKFgInLLfH6j/HEp4bEaIl6dpVtc="; + hash = "sha256-jdyKvM/Tb9pRWQPxpB/UQOOKamWrTS24Ofc3M5M1Zso="; }; nativeBuildInputs = [ From 0eb066a039d0a129dbe9603d6e935b3f6102ceef Mon Sep 17 00:00:00 2001 From: PassiveLemon Date: Sat, 8 Feb 2025 15:43:41 -0500 Subject: [PATCH 1325/2168] wivrn: 0.22 -> 0.23 --- pkgs/by-name/wi/wivrn/package.nix | 65 ++++++++++++++++++------------- 1 file changed, 39 insertions(+), 26 deletions(-) diff --git a/pkgs/by-name/wi/wivrn/package.nix b/pkgs/by-name/wi/wivrn/package.nix index a4cb0a83fe9a..ab7db9eb0381 100644 --- a/pkgs/by-name/wi/wivrn/package.nix +++ b/pkgs/by-name/wi/wivrn/package.nix @@ -29,6 +29,7 @@ gst_all_1, harfbuzz, hidapi, + kdePackages, # leapsdk # leapv2 libGL, @@ -75,13 +76,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "wivrn"; - version = "0.22"; + version = "0.23"; src = fetchFromGitHub { owner = "wivrn"; repo = "wivrn"; rev = "v${finalAttrs.version}"; - hash = "sha256-i/CG+zD64cwnu0z1BRkRn7Wm67KszE+wZ5geeAvrvMY="; + hash = "sha256-Ae25yLlkZ958gXr8nyWPv27leVLF5enljXAkCx+fDSk="; }; monado = applyPatches { @@ -89,8 +90,8 @@ stdenv.mkDerivation (finalAttrs: { domain = "gitlab.freedesktop.org"; owner = "monado"; repo = "monado"; - rev = "aa2b0f9f1d638becd6bb9ca3c357ac2561a36b07"; - hash = "sha256-yfHtkMvX/gyVG0UgpSB6KjSDdCym6Reb9LRb3OortaI="; + rev = "848a24aa106758fd6c7afcab6d95880c57dbe450"; + hash = "sha256-+rax9/CG/3y8rLYwGqoWJa4FxH+Z3eREiwhuxDOUzLs="; }; patches = [ @@ -107,7 +108,7 @@ stdenv.mkDerivation (finalAttrs: { postUnpack = '' # Let's make sure our monado source revision matches what is used by WiVRn upstream ourMonadoRev="${finalAttrs.monado.src.rev}" - theirMonadoRev=$(grep "GIT_TAG" ${finalAttrs.src.name}/CMakeLists.txt | awk '{print $2}') + theirMonadoRev=$(sed -n '/FetchContent_Declare(monado/,/)/p' ${finalAttrs.src.name}/CMakeLists.txt | grep "GIT_TAG" | awk '{print $2}') if [ ! "$theirMonadoRev" == "$ourMonadoRev" ]; then echo "Our Monado source revision doesn't match CMakeLists.txt." >&2 echo " theirs: $theirMonadoRev" >&2 @@ -150,6 +151,12 @@ stdenv.mkDerivation (finalAttrs: { gst_all_1.gstreamer harfbuzz hidapi + kdePackages.kcoreaddons + kdePackages.ki18n + kdePackages.kiconthemes + kdePackages.kirigami + kdePackages.qcoro + kdePackages.qqc2-desktop-style libbsd libdrm libGL @@ -174,6 +181,7 @@ stdenv.mkDerivation (finalAttrs: { orc pipewire qt6.qtbase + qt6.qtsvg qt6.qttools SDL2 shaderc @@ -191,23 +199,31 @@ stdenv.mkDerivation (finalAttrs: { cudaPackages.cudatoolkit ]; - cmakeFlags = [ - (lib.cmakeBool "WIVRN_USE_NVENC" cudaSupport) - (lib.cmakeBool "WIVRN_USE_VAAPI" true) - (lib.cmakeBool "WIVRN_USE_VULKAN" true) - (lib.cmakeBool "WIVRN_USE_X264" true) - (lib.cmakeBool "WIVRN_USE_PIPEWIRE" true) - (lib.cmakeBool "WIVRN_USE_PULSEAUDIO" true) - (lib.cmakeBool "WIVRN_FEATURE_STEAMVR_LIGHTHOUSE" true) - (lib.cmakeBool "WIVRN_BUILD_CLIENT" false) - (lib.cmakeBool "WIVRN_BUILD_DASHBOARD" true) - (lib.cmakeBool "WIVRN_CHECK_CAPSYSNICE" false) - (lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true) - (lib.cmakeFeature "WIVRN_OPENXR_MANIFEST_TYPE" "absolute") - (lib.cmakeFeature "GIT_DESC" "${finalAttrs.version}") - (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MONADO" "${finalAttrs.monado}") - (lib.cmakeFeature "CUDA_TOOLKIT_ROOT_DIR" "${cudaPackages.cudatoolkit}") - ]; + cmakeFlags = + [ + (lib.cmakeBool "WIVRN_USE_NVENC" cudaSupport) + (lib.cmakeBool "WIVRN_USE_VAAPI" true) + (lib.cmakeBool "WIVRN_USE_VULKAN_ENCODE" true) + (lib.cmakeBool "WIVRN_USE_X264" true) + (lib.cmakeBool "WIVRN_USE_PIPEWIRE" true) + (lib.cmakeBool "WIVRN_USE_PULSEAUDIO" true) + (lib.cmakeBool "WIVRN_FEATURE_STEAMVR_LIGHTHOUSE" true) + (lib.cmakeBool "WIVRN_BUILD_CLIENT" false) + (lib.cmakeBool "WIVRN_BUILD_DASHBOARD" true) + (lib.cmakeBool "WIVRN_CHECK_CAPSYSNICE" false) + (lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true) + (lib.cmakeFeature "WIVRN_OPENXR_MANIFEST_TYPE" "absolute") + (lib.cmakeFeature "GIT_DESC" "v${finalAttrs.version}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MONADO" "${finalAttrs.monado}") + ] + ++ lib.optionals cudaSupport [ + (lib.cmakeFeature "CUDA_TOOLKIT_ROOT_DIR" "${cudaPackages.cudatoolkit}") + ]; + + postFixup = '' + wrapProgram $out/bin/wivrn-dashboard \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]} + ''; desktopItems = [ (makeDesktopItem { @@ -218,10 +234,7 @@ stdenv.mkDerivation (finalAttrs: { icon = "io.github.wivrn.wivrn"; exec = "wivrn-dashboard"; type = "Application"; - categories = [ - "Network" - "Game" - ]; + categories = [ "Network" ]; }) ]; From 4b19f0fa2ea2a7fd62d6aae3827d0ac480343feb Mon Sep 17 00:00:00 2001 From: aleksana Date: Sun, 26 Jan 2025 16:06:46 +0800 Subject: [PATCH 1326/2168] avidemux: move to pkgs/by-name --- .../av}/avidemux/bootstrap_logging.patch | 0 .../av}/avidemux/dynamic_install_dir.patch | 0 .../av/avidemux/package.nix} | 18 +++++++++--------- pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 9 insertions(+), 11 deletions(-) rename pkgs/{applications/video => by-name/av}/avidemux/bootstrap_logging.patch (100%) rename pkgs/{applications/video => by-name/av}/avidemux/dynamic_install_dir.patch (100%) rename pkgs/{applications/video/avidemux/default.nix => by-name/av/avidemux/package.nix} (95%) diff --git a/pkgs/applications/video/avidemux/bootstrap_logging.patch b/pkgs/by-name/av/avidemux/bootstrap_logging.patch similarity index 100% rename from pkgs/applications/video/avidemux/bootstrap_logging.patch rename to pkgs/by-name/av/avidemux/bootstrap_logging.patch diff --git a/pkgs/applications/video/avidemux/dynamic_install_dir.patch b/pkgs/by-name/av/avidemux/dynamic_install_dir.patch similarity index 100% rename from pkgs/applications/video/avidemux/dynamic_install_dir.patch rename to pkgs/by-name/av/avidemux/dynamic_install_dir.patch diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/by-name/av/avidemux/package.nix similarity index 95% rename from pkgs/applications/video/avidemux/default.nix rename to pkgs/by-name/av/avidemux/package.nix index 2e7275372514..c08cfd2f49a0 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/by-name/av/avidemux/package.nix @@ -18,9 +18,6 @@ makeWrapper, libXext, libGLU, - qttools, - qtbase, - wrapQtAppsHook, alsa-lib, withX265 ? true, x265, @@ -43,12 +40,12 @@ withVPX ? true, libvpx, withQT ? true, + libsForQt5, withCLI ? true, default ? "qt5", withPlugins ? true, }: -assert withQT -> qttools != null && qtbase != null; assert default != "qt5" -> default == "cli"; assert !withQT -> default != "qt5"; @@ -90,7 +87,7 @@ stdenv.mkDerivation rec { cmake pkg-config makeWrapper - ] ++ lib.optional withQT wrapQtAppsHook; + ] ++ lib.optional withQT libsForQt5.wrapQtAppsHook; buildInputs = [ zlib @@ -115,10 +112,13 @@ stdenv.mkDerivation rec { ++ lib.optional withPulse libpulseaudio ++ lib.optional withFAAD faad2 ++ lib.optional withOpus libopus - ++ lib.optionals withQT [ - qttools - qtbase - ] + ++ lib.optionals withQT ( + with libsForQt5; + [ + qttools + qtbase + ] + ) ++ lib.optional withVPX libvpx; dontWrapQtApps = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 257671f33092..f4256f6998bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12972,8 +12972,6 @@ with pkgs; ausweisapp = qt6Packages.callPackage ../applications/misc/ausweisapp { }; - avidemux = libsForQt5.callPackage ../applications/video/avidemux { }; - awesome = callPackage ../applications/window-managers/awesome { cairo = cairo.override { xcbSupport = true; }; inherit (texFunctions) fontsConf; From 0932d53270d1417cf2b7012db38defae169f5faa Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Wed, 12 Feb 2025 03:42:22 +0100 Subject: [PATCH 1327/2168] services.mysqlBackup: document why we need different dumpBinary paths --- nixos/modules/services/backup/mysql-backup.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/backup/mysql-backup.nix b/nixos/modules/services/backup/mysql-backup.nix index 7e6a0b76d08f..7a2e6df8a1be 100644 --- a/nixos/modules/services/backup/mysql-backup.nix +++ b/nixos/modules/services/backup/mysql-backup.nix @@ -8,6 +8,7 @@ let cfg = config.services.mysqlBackup; defaultUser = "mysqlbackup"; + # Newer mariadb versions warn of the usage of 'mysqldump' and recommend 'mariadb-dump' (https://mariadb.com/kb/en/mysqldump/) dumpBinary = if ( From ccfb408ec21b1b71178947a4542c059c1c63dffa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 11 Feb 2025 18:41:51 -0800 Subject: [PATCH 1328/2168] python313Packages.qcodes-contrib-drivers: fix build with NumPy v2 --- .../python-modules/qcodes-contrib-drivers/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix b/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix index ce0328f6f2e0..9f4bd2cf0de6 100644 --- a/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix +++ b/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + fetchpatch2, setuptools, versioningit, cffi, @@ -29,6 +30,14 @@ buildPythonPackage rec { sha256 = "sha256-/W5oC5iqYifMR3/s7aSQ2yTJNmkemkc0KVxIU0Es3zY="; }; + patches = [ + (fetchpatch2 { + name = "numpy-v2-compat.patch"; + url = "https://github.com/QCoDeS/Qcodes_contrib_drivers/commit/fc792779dbc0b023bdccfe8877dac192d75a88db.patch?full_index=1"; + hash = "sha256-G+/IVG9a4mOFudpqEpI+Q/+WwF6lm2nRKjODCdzWHe0="; + }) + ]; + build-system = [ setuptools versioningit From 158f4614ed461c52514f9d35391456c9360f6fe4 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 12 Feb 2025 03:46:13 +0100 Subject: [PATCH 1329/2168] =?UTF-8?q?ocamlPackages.atd:=202.15.0=20?= =?UTF-8?q?=E2=86=92=202.16.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/atdgen/codec-runtime.nix | 4 ++-- pkgs/development/ocaml-modules/atdgen/default.nix | 4 ++-- pkgs/development/ocaml-modules/atdgen/runtime.nix | 1 - pkgs/development/ocaml-modules/elpi/default.nix | 6 ++++-- pkgs/development/ocaml-modules/github/data.nix | 7 +++++-- pkgs/development/ocaml-modules/gitlab/default.nix | 7 ++++++- pkgs/development/ocaml-modules/reason-native/refmterr.nix | 7 ++++++- 7 files changed, 25 insertions(+), 11 deletions(-) diff --git a/pkgs/development/ocaml-modules/atdgen/codec-runtime.nix b/pkgs/development/ocaml-modules/atdgen/codec-runtime.nix index 494b8bcb3517..b3ea1fbc26fd 100644 --- a/pkgs/development/ocaml-modules/atdgen/codec-runtime.nix +++ b/pkgs/development/ocaml-modules/atdgen/codec-runtime.nix @@ -6,11 +6,11 @@ buildDunePackage rec { pname = "atdgen-codec-runtime"; - version = "2.15.0"; + version = "2.16.0"; src = fetchurl { url = "https://github.com/ahrefs/atd/releases/download/${version}/atd-${version}.tbz"; - hash = "sha256-ukJ5vtVNE9zz9nA6SzF0TbgV3yLAUC2ZZdbGdM4IOTM="; + hash = "sha256-Wea0RWICQcvWkBqEKzNmg6+w6xJbOtv+4ovZTNVODe8="; }; meta = { diff --git a/pkgs/development/ocaml-modules/atdgen/default.nix b/pkgs/development/ocaml-modules/atdgen/default.nix index d36b364c2cd7..555e336dcfc6 100644 --- a/pkgs/development/ocaml-modules/atdgen/default.nix +++ b/pkgs/development/ocaml-modules/atdgen/default.nix @@ -4,6 +4,7 @@ atd, atdgen-codec-runtime, atdgen-runtime, + biniou, re, python3, }: @@ -12,8 +13,6 @@ buildDunePackage { pname = "atdgen"; inherit (atdgen-codec-runtime) version src; - duneVersion = "3"; - buildInputs = [ atd re @@ -24,6 +23,7 @@ buildDunePackage { doCheck = true; nativeCheckInputs = [ atd + biniou (python3.withPackages (ps: [ ps.jsonschema ])) ]; checkInputs = [ diff --git a/pkgs/development/ocaml-modules/atdgen/runtime.nix b/pkgs/development/ocaml-modules/atdgen/runtime.nix index f0442d46a30f..547dfd32d0dd 100644 --- a/pkgs/development/ocaml-modules/atdgen/runtime.nix +++ b/pkgs/development/ocaml-modules/atdgen/runtime.nix @@ -10,7 +10,6 @@ buildDunePackage rec { inherit (atdgen-codec-runtime) version src; minimalOCamlVersion = "4.08"; - duneVersion = "3"; propagatedBuildInputs = [ biniou diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix index a9dc8597b8dd..bf928b090e4a 100644 --- a/pkgs/development/ocaml-modules/elpi/default.nix +++ b/pkgs/development/ocaml-modules/elpi/default.nix @@ -3,6 +3,7 @@ , ocaml , menhir, menhirLib , atdgen +, atdgen-runtime , stdlib-shims , re, perl, ncurses , ppxlib, ppx_deriving @@ -47,12 +48,11 @@ in buildDunePackage { minimalOCamlVersion = "4.07"; - # atdgen is both a library and executable nativeBuildInputs = [ perl ] ++ [ (if lib.versionAtLeast version "1.15" || version == "dev" then menhir else camlp5) ] ++ lib.optional (lib.versionAtLeast version "1.16" || version == "dev") atdgen; buildInputs = [ ncurses ] - ++ lib.optional (lib.versionAtLeast version "1.16" || version == "dev") atdgen; + ++ lib.optional (lib.versionAtLeast version "1.16" || version == "dev") atdgen-runtime; propagatedBuildInputs = [ re stdlib-shims ] ++ (if lib.versionAtLeast version "1.15" || version == "dev" @@ -73,5 +73,7 @@ in buildDunePackage { postPatch = '' substituteInPlace elpi_REPL.ml --replace-warn "tput cols" "${ncurses}/bin/tput cols" + '' + lib.optionalString (lib.versionAtLeast version "1.16" || version == "dev") '' + substituteInPlace src/dune --replace-warn ' atdgen re' ' atdgen-runtime re' ''; } diff --git a/pkgs/development/ocaml-modules/github/data.nix b/pkgs/development/ocaml-modules/github/data.nix index 9d7544d34bde..eea986e09590 100644 --- a/pkgs/development/ocaml-modules/github/data.nix +++ b/pkgs/development/ocaml-modules/github/data.nix @@ -3,13 +3,16 @@ github, yojson, atdgen, + atdgen-runtime, }: buildDunePackage { pname = "github-data"; inherit (github) version src; - duneVersion = "3"; + postPatch = '' + substituteInPlace lib_data/dune --replace-warn 'atdgen)' 'atdgen-runtime)' + ''; nativeBuildInputs = [ atdgen @@ -17,7 +20,7 @@ buildDunePackage { propagatedBuildInputs = [ yojson - atdgen + atdgen-runtime ]; meta = github.meta // { diff --git a/pkgs/development/ocaml-modules/gitlab/default.nix b/pkgs/development/ocaml-modules/gitlab/default.nix index f8bc6224cf70..08b500bba423 100644 --- a/pkgs/development/ocaml-modules/gitlab/default.nix +++ b/pkgs/development/ocaml-modules/gitlab/default.nix @@ -5,6 +5,7 @@ uri, cohttp-lwt, atdgen, + atdgen-runtime, yojson, iso8601, stringext, @@ -21,6 +22,10 @@ buildDunePackage rec { hash = "sha256-7pUpH1SoP4eW8ild5j+Tcy+aTXq0+eSkhKUOXJ6Z30k="; }; + postPatch = '' + substituteInPlace lib/dune --replace-warn 'atdgen str' 'atdgen-runtime str' + ''; + minimalOCamlVersion = "4.08"; buildInputs = [ stringext ]; @@ -30,7 +35,7 @@ buildDunePackage rec { propagatedBuildInputs = [ uri cohttp-lwt - atdgen + atdgen-runtime yojson iso8601 ]; diff --git a/pkgs/development/ocaml-modules/reason-native/refmterr.nix b/pkgs/development/ocaml-modules/reason-native/refmterr.nix index 35b127a9d218..a9fa995f1700 100644 --- a/pkgs/development/ocaml-modules/reason-native/refmterr.nix +++ b/pkgs/development/ocaml-modules/reason-native/refmterr.nix @@ -2,6 +2,7 @@ lib, buildDunePackage, atdgen, + atdgen-runtime, re, reason, pastel, @@ -14,13 +15,17 @@ buildDunePackage { pname = "refmterr"; version = "3.3.0-unstable-2024-05-07"; + postPatch = '' + substituteInPlace src/refmterr/lib/dune --replace-warn 'atdgen re' 'atdgen-runtime re' + ''; + nativeBuildInputs = [ atdgen reason ]; propagatedBuildInputs = [ - atdgen + atdgen-runtime re pastel ]; From 9361081879eb1cc2ceab714eb273a5befa4cf8f0 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 6 Feb 2025 06:39:42 +0100 Subject: [PATCH 1330/2168] ocamlPackages.httpun-lwt: init at 0.2.0 --- pkgs/development/ocaml-modules/httpun/lwt.nix | 24 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/ocaml-modules/httpun/lwt.nix diff --git a/pkgs/development/ocaml-modules/httpun/lwt.nix b/pkgs/development/ocaml-modules/httpun/lwt.nix new file mode 100644 index 000000000000..c4c671a8c4e6 --- /dev/null +++ b/pkgs/development/ocaml-modules/httpun/lwt.nix @@ -0,0 +1,24 @@ +{ + buildDunePackage, + httpun, + lwt, + gluten, + gluten-lwt, +}: + +buildDunePackage { + pname = "httpun-lwt"; + + inherit (httpun) version src; + + propagatedBuildInputs = [ + gluten + gluten-lwt + httpun + lwt + ]; + + meta = httpun.meta // { + description = "Lwt support for httpun"; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 4706d9fa0ecd..68aa44eb0c35 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -711,6 +711,8 @@ let httpun-eio = callPackage ../development/ocaml-modules/httpun/eio.nix { }; + httpun-lwt = callPackage ../development/ocaml-modules/httpun/lwt.nix { }; + httpun-types = callPackage ../development/ocaml-modules/httpun/types.nix { }; httpun-ws = callPackage ../development/ocaml-modules/httpun-ws { }; From 8e1bf1897df2222a076db70ff8d30960feaee739 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 6 Feb 2025 06:39:46 +0100 Subject: [PATCH 1331/2168] ocamlPackages.httpun-lwt-unix: init at 0.2.0 --- .../ocaml-modules/httpun/lwt-unix.nix | 20 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/ocaml-modules/httpun/lwt-unix.nix diff --git a/pkgs/development/ocaml-modules/httpun/lwt-unix.nix b/pkgs/development/ocaml-modules/httpun/lwt-unix.nix new file mode 100644 index 000000000000..3e56ca768532 --- /dev/null +++ b/pkgs/development/ocaml-modules/httpun/lwt-unix.nix @@ -0,0 +1,20 @@ +{ + buildDunePackage, + httpun-lwt, + gluten-lwt-unix, +}: + +buildDunePackage { + pname = "httpun-lwt-unix"; + + inherit (httpun-lwt) version src; + + propagatedBuildInputs = [ + httpun-lwt + gluten-lwt-unix + ]; + + meta = httpun-lwt.meta // { + description = "Lwt + Unix support for httpun"; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 68aa44eb0c35..09bda1d9cebe 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -713,6 +713,8 @@ let httpun-lwt = callPackage ../development/ocaml-modules/httpun/lwt.nix { }; + httpun-lwt-unix = callPackage ../development/ocaml-modules/httpun/lwt-unix.nix { }; + httpun-types = callPackage ../development/ocaml-modules/httpun/types.nix { }; httpun-ws = callPackage ../development/ocaml-modules/httpun-ws { }; From 845cb5da4d0373b6efc422f6761b786d35b2beca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 02:54:04 +0000 Subject: [PATCH 1332/2168] nixdoc: 3.0.8 -> 3.1.0 --- pkgs/by-name/ni/nixdoc/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ni/nixdoc/package.nix b/pkgs/by-name/ni/nixdoc/package.nix index d30ea60b721e..8e895030339f 100644 --- a/pkgs/by-name/ni/nixdoc/package.nix +++ b/pkgs/by-name/ni/nixdoc/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "nixdoc"; - version = "3.0.8"; + version = "3.1.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixdoc"; rev = "v${version}"; - sha256 = "sha256-0tMGTKcuvyDE5281nGCvZKYJKIEAU01G6vV8Fnt/1ZQ="; + sha256 = "sha256-7UOjmW8Ef4mEvj7SINaKWh2ZuyNMVEXB82mtuZTQiPA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Xqwytw6dRL/bZutnZxQchSfWCzjACw2/UAr4YW5fz44="; + cargoHash = "sha256-Aw794yhIET8/pnlQiK2xKVbYC/Kd5MExvFTwkv4LLTc="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.Security ]; From 86e14590c1e220a12a8f0f42072f5df25077f961 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 03:15:40 +0000 Subject: [PATCH 1333/2168] mcfly: 0.9.2 -> 0.9.3 --- pkgs/by-name/mc/mcfly/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mc/mcfly/package.nix b/pkgs/by-name/mc/mcfly/package.nix index f36f43ddcbc8..104592c80cc3 100644 --- a/pkgs/by-name/mc/mcfly/package.nix +++ b/pkgs/by-name/mc/mcfly/package.nix @@ -6,13 +6,13 @@ rustPlatform.buildRustPackage rec { pname = "mcfly"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "cantino"; repo = "mcfly"; rev = "v${version}"; - hash = "sha256-KQgoyxzTWoQok/sUFcvUazxrBMxVXvxqjJudyKYeZCo="; + hash = "sha256-eRuMsUN5zRWsM5BqYHI9iSfoHHMu5ugZDjeDc1GGQL8="; }; postPatch = '' @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { ''; useFetchCargoVendor = true; - cargoHash = "sha256-+ko1ltt3a5rst4qbIMUeiq0/0Vmqf0cHt6wv8GSmC70="; + cargoHash = "sha256-9oNfXNQywvgTREa0G1UbId4ezLSCem4IBkqE5X234hE="; meta = with lib; { homepage = "https://github.com/cantino/mcfly"; From 455d9cc871ac9e6efa8bcefc0c84ea895065d482 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 03:22:11 +0000 Subject: [PATCH 1334/2168] golangci-lint: 1.63.4 -> 1.64.2 --- pkgs/by-name/go/golangci-lint/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/golangci-lint/package.nix b/pkgs/by-name/go/golangci-lint/package.nix index 94e31f5b3ca3..1bdc8b7d2d8d 100644 --- a/pkgs/by-name/go/golangci-lint/package.nix +++ b/pkgs/by-name/go/golangci-lint/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.63.4"; + version = "1.64.2"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - hash = "sha256-7nIo6Nuz8KLuQlT7btjnTRFpOl+KVd30v973HRKzh08="; + hash = "sha256-ODnNBwtfILD0Uy2AKDR/e76ZrdyaOGlCktVUcf9ujy8="; }; - vendorHash = "sha256-atr4HMxoPEfGeaNlHqwTEAcvgbSyzgCe262VUg3J86c="; + vendorHash = "sha256-/iq7Ju7c2gS7gZn3n+y0kLtPn2Nn8HY/YdqSDYjtEkI="; subPackages = [ "cmd/golangci-lint" ]; From cab2a1296e683e21f6aa43e048eb9d6f8b89a408 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 12 Feb 2025 00:29:48 -0300 Subject: [PATCH 1335/2168] treewide: remove AndersonTorres from maintainers As I said before, I want to keep a narrow focus on Nixpkgs. Now that I am back at undergrad, this focus should be even narrower: I will keep my eyes on Emacs, and nothing else. --- pkgs/applications/emulators/zsnes/2.x.nix | 2 +- pkgs/applications/video/mpv/default.nix | 1 - pkgs/by-name/_0/_0verkill/package.nix | 2 +- pkgs/by-name/_0/_0x/package.nix | 2 +- pkgs/by-name/_1/_1oom/package.nix | 2 +- pkgs/by-name/_4/_4th/package.nix | 2 +- pkgs/by-name/_4/_4ti2/package.nix | 2 +- pkgs/by-name/_9/_9menu/package.nix | 2 +- pkgs/by-name/aa/aaphoto/package.nix | 2 +- pkgs/by-name/ac/ace-of-penguins/package.nix | 2 +- pkgs/by-name/ac/acr/package.nix | 2 +- pkgs/by-name/af/afterstep/package.nix | 2 +- pkgs/by-name/al/algol68g/package.nix | 2 +- pkgs/by-name/an/antiprism/package.nix | 2 +- pkgs/by-name/ar/aranym/package.nix | 2 +- pkgs/by-name/ar/arcan/package.nix | 2 +- pkgs/by-name/ar/ares/package.nix | 1 - pkgs/by-name/ar/argagg/package.nix | 2 +- pkgs/by-name/ar/argbash/package.nix | 2 +- pkgs/by-name/as/as31/package.nix | 2 +- pkgs/by-name/as/asl/package.nix | 2 +- pkgs/by-name/at/atari800/package.nix | 2 +- pkgs/by-name/at/ataripp/package.nix | 2 +- pkgs/by-name/at/atasm/package.nix | 2 +- pkgs/by-name/ba/barrage/package.nix | 2 +- pkgs/by-name/ba/base16-shell-preview/package.nix | 2 +- pkgs/by-name/ba/basu/package.nix | 2 +- pkgs/by-name/be/berry/package.nix | 2 +- pkgs/by-name/be/bevelbar/package.nix | 1 - pkgs/by-name/bi/biblesync/package.nix | 2 +- pkgs/by-name/bi/bibletime/package.nix | 2 +- pkgs/by-name/bl/blockattack/package.nix | 2 +- pkgs/by-name/bo/bochs/package.nix | 2 +- pkgs/by-name/bq/bqn/package.nix | 2 +- pkgs/by-name/br/brogue-ce/package.nix | 1 - pkgs/by-name/br/brogue/package.nix | 1 - pkgs/by-name/bs/bsd-finger/package.nix | 2 +- pkgs/by-name/bs/bsnes-hd/package.nix | 1 - pkgs/by-name/bt/btanks/package.nix | 2 +- pkgs/by-name/by/byacc/package.nix | 2 +- pkgs/by-name/by/byobu/package.nix | 2 +- pkgs/by-name/ca/calcoo/package.nix | 2 +- pkgs/by-name/ca/cardboard/package.nix | 2 +- pkgs/by-name/ca/cat9/package.nix | 2 +- pkgs/by-name/cb/cbftp/package.nix | 2 +- pkgs/by-name/cc/cc65/package.nix | 2 +- pkgs/by-name/cd/cdk/package.nix | 1 - pkgs/by-name/ce/celluloid/package.nix | 2 +- pkgs/by-name/ce/cemu/package.nix | 1 - pkgs/by-name/cg/cgreen/package.nix | 2 +- pkgs/by-name/ch/chemacs2/package.nix | 2 +- pkgs/by-name/ch/chemtool/package.nix | 2 +- pkgs/by-name/ch/chezmoi/package.nix | 2 +- pkgs/by-name/ch/chromium-bsu/package.nix | 3 +-- pkgs/by-name/ci/ciano/package.nix | 2 +- pkgs/by-name/cl/clevis/package.nix | 2 +- pkgs/by-name/cm/cmatrix/package.nix | 2 +- pkgs/by-name/co/comic-neue/package.nix | 2 +- pkgs/by-name/co/connman/package.nix | 2 +- pkgs/by-name/cr/cronie/package.nix | 2 +- pkgs/by-name/cs/csvkit/package.nix | 2 +- pkgs/by-name/ct/ctx/package.nix | 2 +- pkgs/by-name/cu/cue2pops/package.nix | 2 +- pkgs/by-name/cy/cyberpunk-neon/package.nix | 2 +- pkgs/by-name/cz/czkawka/package.nix | 1 - pkgs/by-name/da/dap/package.nix | 2 +- pkgs/by-name/db/dbqn/package.nix | 3 --- pkgs/by-name/de/desmume/package.nix | 2 +- pkgs/by-name/de/dev86/package.nix | 1 - pkgs/by-name/dg/dgen-sdl/package.nix | 2 +- pkgs/by-name/di/dialog/package.nix | 1 - pkgs/by-name/di/dillo/package.nix | 2 +- pkgs/by-name/di/disk-filltest/package.nix | 2 +- pkgs/by-name/do/doomretro/package.nix | 2 +- pkgs/by-name/do/dosbox-staging/package.nix | 1 - pkgs/by-name/do/doublecmd/package.nix | 2 +- pkgs/by-name/du/duckstation/package.nix | 1 - pkgs/by-name/du/durden/package.nix | 2 +- pkgs/by-name/dv/dvdstyler/package.nix | 2 +- pkgs/by-name/dw/dwl/package.nix | 2 +- pkgs/by-name/dx/dxa/package.nix | 2 +- pkgs/by-name/ec/ecmtools/package.nix | 2 +- pkgs/by-name/ed/ed/package.nix | 2 +- pkgs/by-name/ed/edit/package.nix | 2 +- pkgs/by-name/ed/edlin/package.nix | 2 +- pkgs/by-name/el/elvis/package.nix | 2 +- pkgs/by-name/em/em/package.nix | 2 +- pkgs/by-name/em/emacspeak/package.nix | 2 +- pkgs/by-name/em/emu2/package.nix | 2 +- pkgs/by-name/eu/eudev/package.nix | 1 - pkgs/by-name/ew/eweb/package.nix | 2 +- pkgs/by-name/fa/fastjar/package.nix | 2 +- pkgs/by-name/fc/fceux/package.nix | 1 - pkgs/by-name/fl/fluxbox/package.nix | 2 +- pkgs/by-name/fr/free42/package.nix | 2 +- pkgs/by-name/fr/freecell-solver/package.nix | 2 +- pkgs/by-name/fs/fsuae-launcher/package.nix | 1 - pkgs/by-name/fs/fsuae/package.nix | 2 +- pkgs/by-name/ft/ftgl/package.nix | 2 +- pkgs/by-name/fu/funnelweb/package.nix | 2 +- pkgs/by-name/fv/fvwm3/package.nix | 2 +- pkgs/by-name/ga/galaxis/package.nix | 2 +- pkgs/by-name/ga/galculator/package.nix | 2 +- pkgs/by-name/ga/gavin-bc/package.nix | 2 +- pkgs/by-name/gd/gdbm/package.nix | 2 +- pkgs/by-name/ge/germinal/package.nix | 2 +- pkgs/by-name/gi/git-branchstack/package.nix | 2 +- pkgs/by-name/gl/glpng/package.nix | 2 +- pkgs/by-name/gm/gmic-qt/package.nix | 2 +- pkgs/by-name/gm/gmic/package.nix | 2 +- pkgs/by-name/gn/gnu-smalltalk/package.nix | 2 +- pkgs/by-name/go/gofish/package.nix | 2 +- pkgs/by-name/gr/grafx2/package.nix | 2 +- pkgs/by-name/gr/graphicsmagick/package.nix | 2 +- pkgs/by-name/gx/gxemul/package.nix | 2 +- pkgs/by-name/ha/hachimarupop/package.nix | 2 +- pkgs/by-name/ha/hackedbox/package.nix | 2 +- pkgs/by-name/ha/haunt/package.nix | 2 +- pkgs/by-name/ha/havoc/package.nix | 2 +- pkgs/by-name/hi/higan/package.nix | 2 +- pkgs/by-name/ht/httplib/package.nix | 4 +--- pkgs/by-name/ic/icewm/package.nix | 2 +- pkgs/by-name/ii/iir1/package.nix | 2 +- pkgs/by-name/in/intercal/package.nix | 2 +- pkgs/by-name/is/isc-cron/package.nix | 2 +- pkgs/by-name/iw/iw/package.nix | 2 +- pkgs/by-name/ja/jam/package.nix | 1 - pkgs/by-name/jo/joe/package.nix | 2 +- pkgs/by-name/jo/jove/package.nix | 2 +- pkgs/by-name/ju/jupp/package.nix | 2 +- pkgs/by-name/jw/jwasm/package.nix | 2 +- pkgs/by-name/ka/katriawm/package.nix | 2 +- pkgs/by-name/ke/kermit-terminal/package.nix | 2 +- pkgs/by-name/ki/kirc/package.nix | 2 +- pkgs/by-name/la/labwc-tweaks/package.nix | 1 - pkgs/by-name/la/lavalauncher/package.nix | 2 +- pkgs/by-name/lb/lbreakout2/package.nix | 1 - pkgs/by-name/lb/lbreakouthd/package.nix | 2 +- pkgs/by-name/le/lefthook/package.nix | 2 +- pkgs/by-name/li/libburn/package.nix | 1 - pkgs/by-name/li/libbytesize/package.nix | 2 +- pkgs/by-name/li/libcaca/package.nix | 2 +- pkgs/by-name/li/libedit/package.nix | 2 +- pkgs/by-name/li/libisoburn/package.nix | 2 +- pkgs/by-name/li/libisofs/package.nix | 1 - pkgs/by-name/li/libmpdclient/package.nix | 2 +- pkgs/by-name/li/libpkgconf/package.nix | 1 - pkgs/by-name/li/libremidi/package.nix | 2 +- pkgs/by-name/li/librep/package.nix | 2 +- pkgs/by-name/li/libtap/package.nix | 2 +- pkgs/by-name/li/libtcod/package.nix | 2 +- pkgs/by-name/li/libverto/package.nix | 2 +- pkgs/by-name/li/libz/package.nix | 2 +- pkgs/by-name/li/lightning/package.nix | 2 +- pkgs/by-name/li/live555/package.nix | 2 +- pkgs/by-name/lo/lolcode/package.nix | 2 +- pkgs/by-name/lp/lpairs2/package.nix | 2 +- pkgs/by-name/lt/ltris/package.nix | 2 +- pkgs/by-name/lu/luakit/package.nix | 2 +- pkgs/by-name/lu/luckybackup/package.nix | 2 +- pkgs/by-name/lu/lukesmithxyz-st/package.nix | 2 +- pkgs/by-name/lw/lwm/package.nix | 2 +- pkgs/by-name/lz/lzsa/package.nix | 2 +- pkgs/by-name/ma/marst/package.nix | 2 +- pkgs/by-name/mc/mcpp/package.nix | 2 +- pkgs/by-name/md/md-tangle/package.nix | 2 +- pkgs/by-name/md/md4c/package.nix | 2 +- pkgs/by-name/md/mdds/package.nix | 2 +- pkgs/by-name/me/mednafen-server/package.nix | 2 +- pkgs/by-name/me/mednafen/package.nix | 2 +- pkgs/by-name/me/mednaffe/package.nix | 2 +- pkgs/by-name/me/melonDS/package.nix | 1 - pkgs/by-name/mg/mgba/package.nix | 2 +- pkgs/by-name/mk/mksh/package.nix | 3 --- pkgs/by-name/mo/moe/package.nix | 2 +- pkgs/by-name/mo/monaspace/package.nix | 2 +- pkgs/by-name/mp/mpc/package.nix | 2 +- pkgs/by-name/mp/mpvc/package.nix | 2 +- pkgs/by-name/ms/msr/package.nix | 2 +- pkgs/by-name/mu/multimarkdown/package.nix | 2 +- pkgs/by-name/mu/muon/package.nix | 2 +- pkgs/by-name/na/nanoflann/package.nix | 2 +- pkgs/by-name/na/nawk/package.nix | 1 - pkgs/by-name/ne/nestopia-ue/package.nix | 2 +- pkgs/by-name/no/notcurses/package.nix | 2 +- pkgs/by-name/no/notejot/package.nix | 2 +- pkgs/by-name/nu/nuweb/package.nix | 2 +- pkgs/by-name/nx/nxengine-evo/assets.nix | 2 +- pkgs/by-name/nx/nxengine-evo/package.nix | 2 +- pkgs/by-name/of/office-code-pro/package.nix | 2 +- pkgs/by-name/og/oguri/package.nix | 2 +- pkgs/by-name/on/onedrive/package.nix | 1 - pkgs/by-name/op/openh264/package.nix | 2 +- pkgs/by-name/op/openmsx/package.nix | 2 +- pkgs/by-name/pa/paperkey/package.nix | 1 - pkgs/by-name/pa/passwdqc/package.nix | 2 +- pkgs/by-name/pc/pcsx2/package.nix | 1 - pkgs/by-name/pe/pekwm/package.nix | 2 +- pkgs/by-name/pf/pforth/package.nix | 1 - pkgs/by-name/pg/pgf-pie/package.nix | 2 +- pkgs/by-name/pg/pgf-umlcd/package.nix | 2 +- pkgs/by-name/pg/pgf-umlsd/package.nix | 2 +- pkgs/by-name/pg/pgf1/package.nix | 2 +- pkgs/by-name/pg/pgf2/package.nix | 2 +- pkgs/by-name/pg/pgf3/package.nix | 2 +- pkgs/by-name/pg/pgfplots/package.nix | 2 +- pkgs/by-name/pi/pipeworld/package.nix | 2 +- pkgs/by-name/pp/ppsspp/package.nix | 2 +- pkgs/by-name/pr/previewqt/package.nix | 2 +- pkgs/by-name/pr/prio/package.nix | 2 +- pkgs/by-name/pr/pru/package.nix | 2 +- pkgs/by-name/py/pyp/package.nix | 1 - pkgs/by-name/py/pyspread/package.nix | 2 +- pkgs/by-name/qm/qmplay2/package.nix | 1 - pkgs/by-name/qn/qnial/package.nix | 2 +- pkgs/by-name/qr/qrcodegen/package.nix | 2 +- pkgs/by-name/qu/quickjs-ng/package.nix | 2 +- pkgs/by-name/qu/quickjs/package.nix | 1 - pkgs/by-name/ra/ratpoison/package.nix | 2 +- pkgs/by-name/rc/rcm/package.nix | 1 - pkgs/by-name/re/recutils/package.nix | 2 +- pkgs/by-name/re/renderdoc/package.nix | 2 +- pkgs/by-name/re/rep-gtk/package.nix | 2 +- pkgs/by-name/ro/robotfindskitten/package.nix | 2 +- pkgs/by-name/ro/rockbox-utility/package.nix | 2 +- pkgs/by-name/ro/rootbar/package.nix | 2 +- pkgs/by-name/ro/roxterm/package.nix | 2 +- pkgs/by-name/rp/rpcemu/package.nix | 2 +- pkgs/by-name/rs/rs/package.nix | 2 +- pkgs/by-name/rs/rst2html5/package.nix | 2 +- pkgs/by-name/rx/rxvt/package.nix | 2 +- pkgs/by-name/sa/sawfish/package.nix | 2 +- pkgs/by-name/sc/scdoc/package.nix | 1 - pkgs/by-name/sc/scimark/package.nix | 3 +-- pkgs/by-name/se/setconf/package.nix | 2 +- pkgs/by-name/sh/shfm/package.nix | 2 +- pkgs/by-name/si/simh/package.nix | 2 +- pkgs/by-name/si/simpleini/package.nix | 1 - pkgs/by-name/sk/skribilo/package.nix | 2 +- pkgs/by-name/sl/slang/package.nix | 2 +- pkgs/by-name/sm/smallwm/package.nix | 2 +- pkgs/by-name/sm/smplayer/package.nix | 4 ++-- pkgs/by-name/sn/snes9x/package.nix | 1 - pkgs/by-name/sn/sng/package.nix | 1 - pkgs/by-name/so/sound-of-sorting/package.nix | 2 +- pkgs/by-name/sp/spigot/package.nix | 2 +- pkgs/by-name/sr/src/package.nix | 2 +- pkgs/by-name/ss/ssh-askpass-fullscreen/package.nix | 2 +- pkgs/by-name/st/stacktile/package.nix | 2 +- pkgs/by-name/st/steghide/package.nix | 2 +- pkgs/by-name/st/stella/package.nix | 2 +- pkgs/by-name/ta/tap-plugins/package.nix | 2 +- pkgs/by-name/te/teapot/package.nix | 2 +- pkgs/by-name/te/tecla/package.nix | 2 +- pkgs/by-name/th/the-legend-of-edgar/package.nix | 2 +- pkgs/by-name/ti/tilda/package.nix | 2 +- pkgs/by-name/ti/tiny8086/package.nix | 2 +- pkgs/by-name/ti/tinyemu/package.nix | 2 +- pkgs/by-name/ti/tinywm/package.nix | 2 +- pkgs/by-name/ti/tinyxml-2/package.nix | 2 +- pkgs/by-name/to/tomato-c/package.nix | 2 +- pkgs/by-name/to/tomlcpp/package.nix | 2 +- pkgs/by-name/tr/trealla/package.nix | 1 - pkgs/by-name/tr/triehash/package.nix | 2 +- pkgs/by-name/tt/tty-solitaire/package.nix | 2 +- pkgs/by-name/tw/twolame/package.nix | 2 +- pkgs/by-name/tx/txr/package.nix | 1 - pkgs/by-name/uc/ucg/package.nix | 2 +- pkgs/by-name/uc/uclibc-ng/package.nix | 1 - pkgs/by-name/un/units/package.nix | 2 +- pkgs/by-name/un/universal-ctags/package.nix | 2 +- pkgs/by-name/un/unzoo/package.nix | 2 +- pkgs/by-name/ur/urjtag/package.nix | 2 +- pkgs/by-name/ux/uxn/package.nix | 2 +- pkgs/by-name/ve/ventoy/package.nix | 2 +- pkgs/by-name/vi/viw/package.nix | 2 +- pkgs/by-name/vm/vms-empire/package.nix | 2 +- pkgs/by-name/vn/vnote/package.nix | 2 +- pkgs/by-name/vp/vp/package.nix | 2 +- pkgs/by-name/vy/vym/package.nix | 2 +- pkgs/by-name/wa/wallutils/package.nix | 2 +- pkgs/by-name/wa/waybox/package.nix | 2 +- pkgs/by-name/wi/wifish/package.nix | 2 +- pkgs/by-name/wi/windowmaker/package.nix | 2 +- pkgs/by-name/wi/wio/package.nix | 2 +- pkgs/by-name/wi/with-shell/package.nix | 2 +- pkgs/by-name/wl/wlay/package.nix | 2 +- pkgs/by-name/wl/wlogout/package.nix | 2 +- pkgs/by-name/wo/worker/package.nix | 2 +- pkgs/by-name/x1/x16/package.nix | 2 +- pkgs/by-name/x1/x16/rom.nix | 2 +- pkgs/by-name/x1/x16/run.nix | 6 ------ pkgs/by-name/xa/xa/package.nix | 2 +- pkgs/by-name/xa/xarcan/package.nix | 2 +- pkgs/by-name/xe/xemu/package.nix | 2 +- pkgs/by-name/xi/xine-lib/package.nix | 2 +- pkgs/by-name/xi/xine-ui/package.nix | 2 +- pkgs/by-name/xi/xiphos/package.nix | 2 +- pkgs/by-name/xo/xosview/package.nix | 2 +- pkgs/by-name/xo/xosview2/package.nix | 2 +- pkgs/by-name/xs/xscreensaver/package.nix | 1 - pkgs/by-name/ya/yabasic/package.nix | 2 +- pkgs/by-name/ya/yambar/package.nix | 2 +- pkgs/by-name/ya/yapesdl/package.nix | 2 +- pkgs/by-name/ye/yeahwm/package.nix | 2 +- pkgs/by-name/ye/yex-lang/package.nix | 2 +- pkgs/by-name/yt/ytree/package.nix | 2 +- pkgs/by-name/zc/zchunk/package.nix | 2 +- pkgs/by-name/ze/zegrapher/package.nix | 2 +- pkgs/by-name/ze/zesarux/package.nix | 2 +- pkgs/by-name/zo/zoekt/package.nix | 2 +- pkgs/by-name/zy/zydis/package.nix | 1 - pkgs/by-name/zz/zziplib/package.nix | 2 +- pkgs/data/documentation/zeal/default.nix | 1 - pkgs/development/python-modules/py65/default.nix | 1 - pkgs/games/2048-cli/default.nix | 2 +- 316 files changed, 271 insertions(+), 330 deletions(-) diff --git a/pkgs/applications/emulators/zsnes/2.x.nix b/pkgs/applications/emulators/zsnes/2.x.nix index 58e537c064ee..94cb5ad8e6e0 100644 --- a/pkgs/applications/emulators/zsnes/2.x.nix +++ b/pkgs/applications/emulators/zsnes/2.x.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/xyproto/zsnes"; description = "Maintained fork of zsnes"; license = lib.licenses.gpl2Plus; - maintainers = [ lib.maintainers.AndersonTorres ]; + maintainers = [ ]; platforms = lib.intersectLists lib.platforms.linux lib.platforms.x86; }; }) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index ffdfb193bd41..4a02a3544140 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -306,7 +306,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2Plus; mainProgram = "mpv"; maintainers = with lib.maintainers; [ - AndersonTorres fpletz globin ma27 diff --git a/pkgs/by-name/_0/_0verkill/package.nix b/pkgs/by-name/_0/_0verkill/package.nix index 66a498d68dc6..9309a670dbf5 100644 --- a/pkgs/by-name/_0/_0verkill/package.nix +++ b/pkgs/by-name/_0/_0verkill/package.nix @@ -41,7 +41,7 @@ gccStdenv.mkDerivation rec { homepage = "https://github.com/hackndev/0verkill"; description = "ASCII-ART bloody 2D action deathmatch-like game"; license = with licenses; gpl2Only; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = with platforms; unix; }; } diff --git a/pkgs/by-name/_0/_0x/package.nix b/pkgs/by-name/_0/_0x/package.nix index e072cc4b58c5..27f5baebb2d9 100644 --- a/pkgs/by-name/_0/_0x/package.nix +++ b/pkgs/by-name/_0/_0x/package.nix @@ -28,6 +28,6 @@ rustPlatform.buildRustPackage { description = "Colorful, configurable xxd"; mainProgram = "0x"; license = licenses.asl20; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/by-name/_1/_1oom/package.nix b/pkgs/by-name/_1/_1oom/package.nix index 6d82fe749013..a9e4c0a57ed0 100644 --- a/pkgs/by-name/_1/_1oom/package.nix +++ b/pkgs/by-name/_1/_1oom/package.nix @@ -58,6 +58,6 @@ stdenv.mkDerivation rec { description = "Master of Orion (1993) game engine recreation; a more updated fork"; license = licenses.gpl2Only; platforms = platforms.linux; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/_4/_4th/package.nix b/pkgs/by-name/_4/_4th/package.nix index bcacf1f8fb29..d1a53633b670 100644 --- a/pkgs/by-name/_4/_4th/package.nix +++ b/pkgs/by-name/_4/_4th/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Portable Forth compiler"; license = lib.licenses.lgpl3Plus; mainProgram = "4th"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/_4/_4ti2/package.nix b/pkgs/by-name/_4/_4ti2/package.nix index dc46e01828bf..6f8da6248ca8 100644 --- a/pkgs/by-name/_4/_4ti2/package.nix +++ b/pkgs/by-name/_4/_4ti2/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { homepage = "https://4ti2.github.io/"; description = "Software package for algebraic, geometric and combinatorial problems on linear spaces"; license = with licenses; [ gpl2Plus ]; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/pkgs/by-name/_9/_9menu/package.nix b/pkgs/by-name/_9/_9menu/package.nix index 91f587a4e7dc..ddce550e1589 100644 --- a/pkgs/by-name/_9/_9menu/package.nix +++ b/pkgs/by-name/_9/_9menu/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { description = "Simple X11 menu program for running commands"; mainProgram = "9menu"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = libX11.meta.platforms; }; } diff --git a/pkgs/by-name/aa/aaphoto/package.nix b/pkgs/by-name/aa/aaphoto/package.nix index 8dad7cf82d50..23805f10eadf 100644 --- a/pkgs/by-name/aa/aaphoto/package.nix +++ b/pkgs/by-name/aa/aaphoto/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { one-by-one. ''; license = licenses.gpl3Plus; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; mainProgram = "aaphoto"; }; diff --git a/pkgs/by-name/ac/ace-of-penguins/package.nix b/pkgs/by-name/ac/ace-of-penguins/package.nix index 137b312bf57e..d90504c1f769 100644 --- a/pkgs/by-name/ac/ace-of-penguins/package.nix +++ b/pkgs/by-name/ac/ace-of-penguins/package.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { Martin Thornquist). ''; license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/ac/acr/package.nix b/pkgs/by-name/ac/acr/package.nix index 35ffd56daade..5e8297c11a60 100644 --- a/pkgs/by-name/ac/acr/package.nix +++ b/pkgs/by-name/ac/acr/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { m4. This means that ACR is faster, smaller and easy to use. ''; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/af/afterstep/package.nix b/pkgs/by-name/af/afterstep/package.nix index efab01fe76ea..7661e5264872 100644 --- a/pkgs/by-name/af/afterstep/package.nix +++ b/pkgs/by-name/af/afterstep/package.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: { improving aestetics, and efficient use of system resources. ''; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "afterstep"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/al/algol68g/package.nix b/pkgs/by-name/al/algol68g/package.nix index 0a630c7e52f9..9873c1a09a48 100644 --- a/pkgs/by-name/al/algol68g/package.nix +++ b/pkgs/by-name/al/algol68g/package.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.gpl3Plus; mainProgram = "a68g"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/an/antiprism/package.nix b/pkgs/by-name/an/antiprism/package.nix index b9e16e48b40f..fda9f1420808 100644 --- a/pkgs/by-name/an/antiprism/package.nix +++ b/pkgs/by-name/an/antiprism/package.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.antiprism.com"; description = "Collection of programs for generating, manipulating, transforming and viewing polyhedra"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; }; }) diff --git a/pkgs/by-name/ar/aranym/package.nix b/pkgs/by-name/ar/aranym/package.nix index 1c43461ef58f..512f839244f1 100644 --- a/pkgs/by-name/ar/aranym/package.nix +++ b/pkgs/by-name/ar/aranym/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = with lib.licenses; [ gpl2Plus ]; mainProgram = "aranym"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/ar/arcan/package.nix b/pkgs/by-name/ar/arcan/package.nix index b318d305f85c..47f6f512dd8a 100644 --- a/pkgs/by-name/ar/arcan/package.nix +++ b/pkgs/by-name/ar/arcan/package.nix @@ -202,7 +202,7 @@ stdenv.mkDerivation (finalAttrs: { gpl2Plus lgpl2Plus ]; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/ar/ares/package.nix b/pkgs/by-name/ar/ares/package.nix index f712b24feb9d..f65448e6bb8a 100644 --- a/pkgs/by-name/ar/ares/package.nix +++ b/pkgs/by-name/ar/ares/package.nix @@ -101,7 +101,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "ares"; maintainers = with lib.maintainers; [ Madouura - AndersonTorres ]; platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; diff --git a/pkgs/by-name/ar/argagg/package.nix b/pkgs/by-name/ar/argagg/package.nix index 431fad5aa7d2..b38cd986f77f 100644 --- a/pkgs/by-name/ar/argagg/package.nix +++ b/pkgs/by-name/ar/argagg/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { pointers into the original command line argument C-strings. ''; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; badPlatforms = [ "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/ar/argbash/package.nix b/pkgs/by-name/ar/argbash/package.nix index 94babc074578..a3fe1d4026f2 100644 --- a/pkgs/by-name/ar/argbash/package.nix +++ b/pkgs/by-name/ar/argbash/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://argbash.io/"; description = "Bash argument parsing code generator"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/as/as31/package.nix b/pkgs/by-name/as/as31/package.nix index 83952f68d1bf..2936f7a79958 100644 --- a/pkgs/by-name/as/as31/package.nix +++ b/pkgs/by-name/as/as31/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { description = "8031/8051 assembler"; mainProgram = "as31"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/as/asl/package.nix b/pkgs/by-name/as/asl/package.nix index 2c545e04fdd9..0fa9c3fd75f7 100644 --- a/pkgs/by-name/as/asl/package.nix +++ b/pkgs/by-name/as/asl/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { are used in workstations and PCs. ''; license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; }) diff --git a/pkgs/by-name/at/atari800/package.nix b/pkgs/by-name/at/atari800/package.nix index b646426731a9..edf688511776 100644 --- a/pkgs/by-name/at/atari800/package.nix +++ b/pkgs/by-name/at/atari800/package.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { library. ''; license = with lib.licenses; [ gpl2Plus ]; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/at/ataripp/package.nix b/pkgs/by-name/at/ataripp/package.nix index f62dbf3e4b45..27b42fa2e01e 100644 --- a/pkgs/by-name/at/ataripp/package.nix +++ b/pkgs/by-name/at/ataripp/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { and the Atari 5200 game console. The emulator is auto-configurable and will compile on a variety of systems (Linux, Solaris, Irix). ''; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; license = with lib.licenses; [ gpl2Plus ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/at/atasm/package.nix b/pkgs/by-name/at/atasm/package.nix index 2c37e7f735b7..d9567a433056 100644 --- a/pkgs/by-name/at/atasm/package.nix +++ b/pkgs/by-name/at/atasm/package.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { description = "Commandline 6502 assembler compatible with Mac/65"; license = licenses.gpl2Plus; changelog = "https://github.com/CycoPH/atasm/releases/tag/V${version}"; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = with platforms; unix; }; } diff --git a/pkgs/by-name/ba/barrage/package.nix b/pkgs/by-name/ba/barrage/package.nix index c6677d8b708b..5236b588d8f3 100644 --- a/pkgs/by-name/ba/barrage/package.nix +++ b/pkgs/by-name/ba/barrage/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Destructive action game"; license = with lib.licenses; [ gpl2Plus ]; mainProgram = "barrage"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; inherit (SDL.meta) platforms; broken = stdenv.hostPlatform.isDarwin; }; diff --git a/pkgs/by-name/ba/base16-shell-preview/package.nix b/pkgs/by-name/ba/base16-shell-preview/package.nix index c6436a42e00b..b949d4dbd49c 100644 --- a/pkgs/by-name/ba/base16-shell-preview/package.nix +++ b/pkgs/by-name/ba/base16-shell-preview/package.nix @@ -26,6 +26,6 @@ python3Packages.buildPythonApplication { description = "Browse and preview Base16 Shell themes in your terminal"; mainProgram = "base16-shell-preview"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/by-name/ba/basu/package.nix b/pkgs/by-name/ba/basu/package.nix index b98b7cbd16e1..24e27ff19c20 100644 --- a/pkgs/by-name/ba/basu/package.nix +++ b/pkgs/by-name/ba/basu/package.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Sd-bus library, extracted from systemd"; mainProgram = "basuctl"; license = lib.licenses.lgpl21Only; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/be/berry/package.nix b/pkgs/by-name/be/berry/package.nix index fa12be670cdc..0236acba7362 100644 --- a/pkgs/by-name/be/berry/package.nix +++ b/pkgs/by-name/be/berry/package.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.mit; mainProgram = "berry"; - maintainers = [ lib.maintainers.AndersonTorres ]; + maintainers = [ ]; inherit (libX11.meta) platforms; }; }) diff --git a/pkgs/by-name/be/bevelbar/package.nix b/pkgs/by-name/be/bevelbar/package.nix index 077f60b60a18..9463954c82e5 100644 --- a/pkgs/by-name/be/bevelbar/package.nix +++ b/pkgs/by-name/be/bevelbar/package.nix @@ -38,7 +38,6 @@ stdenv.mkDerivation (finalAttrs: { description = "X11 status bar with beveled borders"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ - AndersonTorres neeasade ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/bi/biblesync/package.nix b/pkgs/by-name/bi/biblesync/package.nix index fd1a11d305c9..c3047c802326 100644 --- a/pkgs/by-name/bi/biblesync/package.nix +++ b/pkgs/by-name/bi/biblesync/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { navigation, and handling of incoming packets. ''; license = licenses.publicDomain; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/bi/bibletime/package.nix b/pkgs/by-name/bi/bibletime/package.nix index 2c95eb11b25b..3633f9915698 100644 --- a/pkgs/by-name/bi/bibletime/package.nix +++ b/pkgs/by-name/bi/bibletime/package.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Powerful cross platform Bible study tool"; license = lib.licenses.gpl2Plus; mainProgram = "bibletime"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/bl/blockattack/package.nix b/pkgs/by-name/bl/blockattack/package.nix index 0e8a3cbc4d51..961844da41bd 100644 --- a/pkgs/by-name/bl/blockattack/package.nix +++ b/pkgs/by-name/bl/blockattack/package.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/blockattack/blockattack-game/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = with lib.licenses; [ gpl2Plus ]; mainProgram = "blockattack"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; inherit (SDL2.meta) platforms; }; }) diff --git a/pkgs/by-name/bo/bochs/package.nix b/pkgs/by-name/bo/bochs/package.nix index 2bb8d36f3edb..94c22670807b 100644 --- a/pkgs/by-name/bo/bochs/package.nix +++ b/pkgs/by-name/bo/bochs/package.nix @@ -157,7 +157,7 @@ stdenv.mkDerivation (finalAttrs: { Intel x86 CPU, common I/O devices, and a custom BIOS. ''; license = lib.licenses.lgpl2Plus; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/bq/bqn/package.nix b/pkgs/by-name/bq/bqn/package.nix index d49547e4020d..7b7fed4a3211 100644 --- a/pkgs/by-name/bq/bqn/package.nix +++ b/pkgs/by-name/bq/bqn/package.nix @@ -56,7 +56,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://github.com/mlochbaum/BQN/"; description = "Original BQN implementation in Javascript"; license = lib.licenses.isc; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; inherit (nodejs.meta) platforms; }; }) diff --git a/pkgs/by-name/br/brogue-ce/package.nix b/pkgs/by-name/br/brogue-ce/package.nix index 09f2ac7c7d94..72e06aab80be 100644 --- a/pkgs/by-name/br/brogue-ce/package.nix +++ b/pkgs/by-name/br/brogue-ce/package.nix @@ -65,7 +65,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/tmewett/BrogueCE"; license = licenses.agpl3Plus; maintainers = with maintainers; [ - AndersonTorres fgaz ]; platforms = platforms.all; diff --git a/pkgs/by-name/br/brogue/package.nix b/pkgs/by-name/br/brogue/package.nix index 7f133c1dae99..c450b7c0ab5f 100644 --- a/pkgs/by-name/br/brogue/package.nix +++ b/pkgs/by-name/br/brogue/package.nix @@ -74,7 +74,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://sites.google.com/site/broguegame/"; license = licenses.agpl3Plus; maintainers = with maintainers; [ - AndersonTorres fgaz ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/by-name/bs/bsd-finger/package.nix b/pkgs/by-name/bs/bsd-finger/package.nix index 1e55dc65d928..7de8e315673f 100644 --- a/pkgs/by-name/bs/bsd-finger/package.nix +++ b/pkgs/by-name/bs/bsd-finger/package.nix @@ -203,7 +203,7 @@ stdenv.mkDerivation (finalAttrs: { "daemon" = "fingerd"; } .${buildProduct}; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/bs/bsnes-hd/package.nix b/pkgs/by-name/bs/bsnes-hd/package.nix index c98b96e2affb..bad94f7b922c 100644 --- a/pkgs/by-name/bs/bsnes-hd/package.nix +++ b/pkgs/by-name/bs/bsnes-hd/package.nix @@ -101,7 +101,6 @@ stdenv.mkDerivation { license = lib.licenses.gpl3Only; mainProgram = "bsnes"; maintainers = with lib.maintainers; [ - AndersonTorres stevebob ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/bt/btanks/package.nix b/pkgs/by-name/bt/btanks/package.nix index c055e64e664d..95c58f9ef018 100644 --- a/pkgs/by-name/bt/btanks/package.nix +++ b/pkgs/by-name/bt/btanks/package.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Fast 2d tank arcade game with multiplayer and split-screen modes"; license = lib.licenses.gpl2Plus; mainProgram = "btanks"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; inherit (SDL.meta) platforms; }; }) diff --git a/pkgs/by-name/by/byacc/package.nix b/pkgs/by-name/by/byacc/package.nix index 9cca09bcd502..9eb54ff223bf 100644 --- a/pkgs/by-name/by/byacc/package.nix +++ b/pkgs/by-name/by/byacc/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { ''; changelog = "https://invisible-island.net/byacc/CHANGES.html"; license = lib.licenses.publicDomain; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/by/byobu/package.nix b/pkgs/by-name/by/byobu/package.nix index 462b2ef3a7bd..207454b44ba4 100644 --- a/pkgs/by-name/by/byobu/package.nix +++ b/pkgs/by-name/by/byobu/package.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = with lib.licenses; [ gpl3Plus ]; mainProgram = "byobu"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/ca/calcoo/package.nix b/pkgs/by-name/ca/calcoo/package.nix index dfba85b2e667..b65c7cb11827 100644 --- a/pkgs/by-name/ca/calcoo/package.nix +++ b/pkgs/by-name/ca/calcoo/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://calcoo.sourceforge.net/"; license = lib.licenses.gpl2Plus; mainProgram = "calcoo"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; inherit (jdk.meta) platforms; }; }) diff --git a/pkgs/by-name/ca/cardboard/package.nix b/pkgs/by-name/ca/cardboard/package.nix index 6b4e37ce6ad2..2c966d891715 100644 --- a/pkgs/by-name/ca/cardboard/package.nix +++ b/pkgs/by-name/ca/cardboard/package.nix @@ -140,7 +140,7 @@ stdenv.mkDerivation { description = "Scrollable, tiling Wayland compositor inspired on PaperWM"; license = lib.licenses.gpl3Only; mainProgram = "cardboard"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; inherit (wayland.meta) platforms; }; } diff --git a/pkgs/by-name/ca/cat9/package.nix b/pkgs/by-name/ca/cat9/package.nix index 011450c02560..293de88569c2 100644 --- a/pkgs/by-name/ca/cat9/package.nix +++ b/pkgs/by-name/ca/cat9/package.nix @@ -32,7 +32,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://github.com/letoram/cat9"; description = "User shell for LASH"; license = with lib.licenses; [ unlicense ]; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/cb/cbftp/package.nix b/pkgs/by-name/cb/cbftp/package.nix index 7e7c99986fab..566fb6a8354c 100644 --- a/pkgs/by-name/cb/cbftp/package.nix +++ b/pkgs/by-name/cb/cbftp/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { semi-graphical user interface through ncurses. ''; license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = with platforms; unix; }; } diff --git a/pkgs/by-name/cc/cc65/package.nix b/pkgs/by-name/cc/cc65/package.nix index 1d9a4d582570..45a54356e96e 100644 --- a/pkgs/by-name/cc/cc65/package.nix +++ b/pkgs/by-name/cc/cc65/package.nix @@ -56,7 +56,7 @@ gccStdenv.mkDerivation rec { shouldn't be too much work. ''; license = licenses.zlib; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/cd/cdk/package.nix b/pkgs/by-name/cd/cdk/package.nix index 0115b4eaf166..53e8cb58a93c 100644 --- a/pkgs/by-name/cd/cdk/package.nix +++ b/pkgs/by-name/cd/cdk/package.nix @@ -28,7 +28,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ raskin - AndersonTorres ]; inherit (ncurses.meta) platforms; }; diff --git a/pkgs/by-name/ce/celluloid/package.nix b/pkgs/by-name/ce/celluloid/package.nix index 35f1841c4ab4..67d17f6b1266 100644 --- a/pkgs/by-name/ce/celluloid/package.nix +++ b/pkgs/by-name/ce/celluloid/package.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/celluloid-player/celluloid/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.gpl3Plus; mainProgram = "celluloid"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/ce/cemu/package.nix b/pkgs/by-name/ce/cemu/package.nix index e868cffd751e..191ece85ab31 100644 --- a/pkgs/by-name/ce/cemu/package.nix +++ b/pkgs/by-name/ce/cemu/package.nix @@ -179,7 +179,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ zhaofengli baduhai - AndersonTorres ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/by-name/cg/cgreen/package.nix b/pkgs/by-name/cg/cgreen/package.nix index 3ae0045d4167..e3c557fc9ce7 100644 --- a/pkgs/by-name/cg/cgreen/package.nix +++ b/pkgs/by-name/cg/cgreen/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Modern Unit Test and Mocking Framework for C and C++"; mainProgram = "cgreen-runner"; license = lib.licenses.isc; - maintainers = [ lib.maintainers.AndersonTorres ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/ch/chemacs2/package.nix b/pkgs/by-name/ch/chemacs2/package.nix index 15e2dc7741e9..1446fbb08ec7 100644 --- a/pkgs/by-name/ch/chemacs2/package.nix +++ b/pkgs/by-name/ch/chemacs2/package.nix @@ -45,7 +45,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { Think of it as a bootloader for Emacs. ''; license = with lib.licenses; [ gpl3Plus ]; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/ch/chemtool/package.nix b/pkgs/by-name/ch/chemtool/package.nix index deb9b01700ea..809fefab6321 100644 --- a/pkgs/by-name/ch/chemtool/package.nix +++ b/pkgs/by-name/ch/chemtool/package.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { hexagonal backdrop grids for easier alignment. ''; license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/ch/chezmoi/package.nix b/pkgs/by-name/ch/chezmoi/package.nix index 1b0bd2ddfd1d..24844e9279fa 100644 --- a/pkgs/by-name/ch/chezmoi/package.nix +++ b/pkgs/by-name/ch/chezmoi/package.nix @@ -46,7 +46,7 @@ let changelog = "https://github.com/twpayne/chezmoi/releases/tag/${argset.src.rev}"; license = lib.licenses.mit; mainProgram = "chezmoi"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; }; }; in diff --git a/pkgs/by-name/ch/chromium-bsu/package.nix b/pkgs/by-name/ch/chromium-bsu/package.nix index dffa9617c7f6..56dd8ba10bfe 100644 --- a/pkgs/by-name/ch/chromium-bsu/package.nix +++ b/pkgs/by-name/ch/chromium-bsu/package.nix @@ -62,8 +62,7 @@ stdenv.mkDerivation rec { description = "Fast paced, arcade-style, top-scrolling space shooter"; mainProgram = "chromium-bsu"; license = licenses.artistic1; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } -# TODO [ AndersonTorres ]: joystick; gothic uralic font diff --git a/pkgs/by-name/ci/ciano/package.nix b/pkgs/by-name/ci/ciano/package.nix index b223970625a9..650526eec16f 100644 --- a/pkgs/by-name/ci/ciano/package.nix +++ b/pkgs/by-name/ci/ciano/package.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/robertsanseries/ciano"; description = "Multimedia file converter focused on simplicity"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/cl/clevis/package.nix b/pkgs/by-name/cl/clevis/package.nix index 4dc89fa2acd5..61c85751299d 100644 --- a/pkgs/by-name/cl/clevis/package.nix +++ b/pkgs/by-name/cl/clevis/package.nix @@ -125,6 +125,6 @@ stdenv.mkDerivation (finalAttrs: { ''; changelog = "https://github.com/latchset/clevis/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; }; }) diff --git a/pkgs/by-name/cm/cmatrix/package.nix b/pkgs/by-name/cm/cmatrix/package.nix index a3a330effccf..756cc96e8987 100644 --- a/pkgs/by-name/cm/cmatrix/package.nix +++ b/pkgs/by-name/cm/cmatrix/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/abishekvashok/cmatrix"; platforms = ncurses.meta.platforms; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ ]; mainProgram = "cmatrix"; }; } diff --git a/pkgs/by-name/co/comic-neue/package.nix b/pkgs/by-name/co/comic-neue/package.nix index 006364609a81..0926f184ecef 100644 --- a/pkgs/by-name/co/comic-neue/package.nix +++ b/pkgs/by-name/co/comic-neue/package.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { ''; license = licenses.ofl; platforms = platforms.all; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/co/connman/package.nix b/pkgs/by-name/co/connman/package.nix index 44737f4f49ee..e62def2dccab 100644 --- a/pkgs/by-name/co/connman/package.nix +++ b/pkgs/by-name/co/connman/package.nix @@ -181,7 +181,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://git.kernel.org/pub/scm/network/connman/connman.git/about/"; license = lib.licenses.gpl2Only; mainProgram = "connmanctl"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/cr/cronie/package.nix b/pkgs/by-name/cr/cronie/package.nix index 3cad6e4d1d7a..068c4f0ca63f 100644 --- a/pkgs/by-name/cr/cronie/package.nix +++ b/pkgs/by-name/cr/cronie/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { lgpl21Plus ]; mainProgram = "crond"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/cs/csvkit/package.nix b/pkgs/by-name/cs/csvkit/package.nix index b3981deaa69d..2c852ab32d85 100644 --- a/pkgs/by-name/cs/csvkit/package.nix +++ b/pkgs/by-name/cs/csvkit/package.nix @@ -44,6 +44,6 @@ pythonEnv.pkgs.buildPythonApplication { description = "Suite of command-line tools for converting to and working with CSV"; changelog = "https://github.com/wireservice/csvkit/blob/${version}/CHANGELOG.rst"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/by-name/ct/ctx/package.nix b/pkgs/by-name/ct/ctx/package.nix index dde97bcf01c7..d93ef15d33c8 100644 --- a/pkgs/by-name/ct/ctx/package.nix +++ b/pkgs/by-name/ct/ctx/package.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { a vector graphics protocol. ''; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/cu/cue2pops/package.nix b/pkgs/by-name/cu/cue2pops/package.nix index 69a353f20550..d54c400cdee9 100644 --- a/pkgs/by-name/cu/cue2pops/package.nix +++ b/pkgs/by-name/cu/cue2pops/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { # Upstream license is unclear. # license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; mainProgram = "cue2pops"; }; diff --git a/pkgs/by-name/cy/cyberpunk-neon/package.nix b/pkgs/by-name/cy/cyberpunk-neon/package.nix index bb1079c1bb76..4c8d177fdd08 100644 --- a/pkgs/by-name/cy/cyberpunk-neon/package.nix +++ b/pkgs/by-name/cy/cyberpunk-neon/package.nix @@ -55,7 +55,7 @@ stdenvNoCC.mkDerivation { homepage = "https://github.com/Roboron3042/Cyberpunk-Neon"; description = "Neon themes for many programs"; license = lib.licenses.cc-by-sa-40; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/cz/czkawka/package.nix b/pkgs/by-name/cz/czkawka/package.nix index 479ad23f4358..c11906017ffe 100644 --- a/pkgs/by-name/cz/czkawka/package.nix +++ b/pkgs/by-name/cz/czkawka/package.nix @@ -106,7 +106,6 @@ let license = with lib.licenses; [ mit ]; mainProgram = "czkawka_gui"; maintainers = with lib.maintainers; [ - AndersonTorres yanganto _0x4A6F ]; diff --git a/pkgs/by-name/da/dap/package.nix b/pkgs/by-name/da/dap/package.nix index 846081859228..f8f2177b4fa9 100644 --- a/pkgs/by-name/da/dap/package.nix +++ b/pkgs/by-name/da/dap/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { analyses). ''; license = licenses.gpl3Plus; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/db/dbqn/package.nix b/pkgs/by-name/db/dbqn/package.nix index 8352bb2b57ad..81be3e7141ff 100644 --- a/pkgs/by-name/db/dbqn/package.nix +++ b/pkgs/by-name/db/dbqn/package.nix @@ -77,12 +77,9 @@ stdenv.mkDerivation rec { "BQN implementation in Java" + lib.optionalString buildNativeImage ", compiled as a native image"; license = licenses.mit; maintainers = with maintainers; [ - AndersonTorres sternenseemann ]; inherit (jdk.meta) platforms; broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/dbqn-native.x86_64-darwin }; } -# TODO: Processing app -# TODO: minimalistic JDK diff --git a/pkgs/by-name/de/desmume/package.nix b/pkgs/by-name/de/desmume/package.nix index 286c9dce72a2..458ae43f507b 100644 --- a/pkgs/by-name/de/desmume/package.nix +++ b/pkgs/by-name/de/desmume/package.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: { commercial nds rom titles which other DS Emulators aren't. ''; license = licenses.gpl2Plus; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ ]; platforms = platforms.unix; }; }) diff --git a/pkgs/by-name/de/dev86/package.nix b/pkgs/by-name/de/dev86/package.nix index bed0d6c26456..726ba568479f 100644 --- a/pkgs/by-name/de/dev86/package.nix +++ b/pkgs/by-name/de/dev86/package.nix @@ -23,7 +23,6 @@ stdenv.mkDerivation (finalAttrs: { description = "C compiler, assembler and linker environment for the production of 8086 executables"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ - AndersonTorres sigmasquadron ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/dg/dgen-sdl/package.nix b/pkgs/by-name/dg/dgen-sdl/package.nix index baa76c59a0a2..00dfc5471012 100644 --- a/pkgs/by-name/dg/dgen-sdl/package.nix +++ b/pkgs/by-name/dg/dgen-sdl/package.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { - VGM dumping ''; license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = with platforms; unix; }; } diff --git a/pkgs/by-name/di/dialog/package.nix b/pkgs/by-name/di/dialog/package.nix index a48cd4268796..04c7f1936a41 100644 --- a/pkgs/by-name/di/dialog/package.nix +++ b/pkgs/by-name/di/dialog/package.nix @@ -46,7 +46,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.lgpl21Plus; mainProgram = "dialog"; maintainers = with lib.maintainers; [ - AndersonTorres spacefrogg ]; inherit (ncurses.meta) platforms; diff --git a/pkgs/by-name/di/dillo/package.nix b/pkgs/by-name/di/dillo/package.nix index 7b65c4fc9c1d..cc6b32b1d205 100644 --- a/pkgs/by-name/di/dillo/package.nix +++ b/pkgs/by-name/di/dillo/package.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: { - Helps authors to comply with web standards by using the bug meter. ''; mainProgram = "dillo"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/di/disk-filltest/package.nix b/pkgs/by-name/di/disk-filltest/package.nix index d66357c40540..0ad1c9d7e79f 100644 --- a/pkgs/by-name/di/disk-filltest/package.nix +++ b/pkgs/by-name/di/disk-filltest/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.gpl3Plus; mainProgram = "disk-filltest"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/do/doomretro/package.nix b/pkgs/by-name/do/doomretro/package.nix index 271654b92124..2eb11cd61ea4 100644 --- a/pkgs/by-name/do/doomretro/package.nix +++ b/pkgs/by-name/do/doomretro/package.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.gpl3Plus; mainProgram = "doomretro"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/do/dosbox-staging/package.nix b/pkgs/by-name/do/dosbox-staging/package.nix index 4c92038abd3b..4b377a2e8fb3 100644 --- a/pkgs/by-name/do/dosbox-staging/package.nix +++ b/pkgs/by-name/do/dosbox-staging/package.nix @@ -124,7 +124,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ joshuafern - AndersonTorres ]; platforms = lib.platforms.unix; priority = 101; diff --git a/pkgs/by-name/do/doublecmd/package.nix b/pkgs/by-name/do/doublecmd/package.nix index 3740c3968bf6..f801990766fa 100644 --- a/pkgs/by-name/do/doublecmd/package.nix +++ b/pkgs/by-name/do/doublecmd/package.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Two-panel graphical file manager written in Pascal"; license = lib.licenses.gpl2Plus; mainProgram = "doublecmd"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/du/duckstation/package.nix b/pkgs/by-name/du/duckstation/package.nix index c0838e8fe32f..66f9db82b8fc 100644 --- a/pkgs/by-name/du/duckstation/package.nix +++ b/pkgs/by-name/du/duckstation/package.nix @@ -143,7 +143,6 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { mainProgram = "duckstation-qt"; maintainers = with lib.maintainers; [ guibou - AndersonTorres ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/du/durden/package.nix b/pkgs/by-name/du/durden/package.nix index 96d721a5561e..ec2551d8edf3 100644 --- a/pkgs/by-name/du/durden/package.nix +++ b/pkgs/by-name/du/durden/package.nix @@ -38,7 +38,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { of the desktop environment spectrum. ''; license = with lib.licenses; [ bsd3 ]; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/dv/dvdstyler/package.nix b/pkgs/by-name/dv/dvdstyler/package.nix index c882ff105086..390438fe2da9 100644 --- a/pkgs/by-name/dv/dvdstyler/package.nix +++ b/pkgs/by-name/dv/dvdstyler/package.nix @@ -128,7 +128,7 @@ stdenv.mkDerivation rec { - customize navigation using DVD scripting ''; license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = with platforms; linux; mainProgram = "dvdstyler"; }; diff --git a/pkgs/by-name/dw/dwl/package.nix b/pkgs/by-name/dw/dwl/package.nix index a819f904e7fb..e30827a71774 100644 --- a/pkgs/by-name/dw/dwl/package.nix +++ b/pkgs/by-name/dw/dwl/package.nix @@ -125,7 +125,7 @@ stdenv.mkDerivation (finalAttrs: { - Tied to as few external dependencies as possible ''; license = lib.licenses.gpl3Only; - maintainers = [ lib.maintainers.AndersonTorres ]; + maintainers = [ ]; inherit (wayland.meta) platforms; mainProgram = "dwl"; }; diff --git a/pkgs/by-name/dx/dxa/package.nix b/pkgs/by-name/dx/dxa/package.nix index 0b55bffdccca..5ff1ca4d45b0 100644 --- a/pkgs/by-name/dx/dxa/package.nix +++ b/pkgs/by-name/dx/dxa/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Andre Fachat's open-source 6502 disassembler"; mainProgram = "dxa"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = with lib.platforms; unix; }; }) diff --git a/pkgs/by-name/ec/ecmtools/package.nix b/pkgs/by-name/ec/ecmtools/package.nix index 4db1efe0b2c8..6bc83e944b2c 100644 --- a/pkgs/by-name/ec/ecmtools/package.nix +++ b/pkgs/by-name/ec/ecmtools/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/alucryd/ecm-tools"; license = lib.licenses.gpl3Plus; mainProgram = "bin2ecm"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/ed/ed/package.nix b/pkgs/by-name/ed/ed/package.nix index ad64a6c72a77..8f225e715437 100644 --- a/pkgs/by-name/ed/ed/package.nix +++ b/pkgs/by-name/ed/ed/package.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.gpl3Plus; mainProgram = "ed"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/ed/edit/package.nix b/pkgs/by-name/ed/edit/package.nix index e2c545172aab..11feb412ecc2 100644 --- a/pkgs/by-name/ed/edit/package.nix +++ b/pkgs/by-name/ed/edit/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation { description = "Relaxing mix of Vi and ACME"; homepage = "https://c9x.me/edit"; license = lib.licenses.publicDomain; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; mainProgram = "edit"; }; diff --git a/pkgs/by-name/ed/edlin/package.nix b/pkgs/by-name/ed/edlin/package.nix index 4575b117ccf8..114a68a7187e 100644 --- a/pkgs/by-name/ed/edlin/package.nix +++ b/pkgs/by-name/ed/edlin/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://sourceforge.net/projects/freedos-edlin/"; description = "FreeDOS line editor"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = with platforms; unix; mainProgram = "edlin"; }; diff --git a/pkgs/by-name/el/elvis/package.nix b/pkgs/by-name/el/elvis/package.nix index 337794ac642f..b3740b94bfe2 100644 --- a/pkgs/by-name/el/elvis/package.nix +++ b/pkgs/by-name/el/elvis/package.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Vi clone for Unix and other operating systems"; license = lib.licenses.free; mainProgram = "elvis"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/em/em/package.nix b/pkgs/by-name/em/em/package.nix index a70e2d19d779..1737f76679e4 100644 --- a/pkgs/by-name/em/em/package.nix +++ b/pkgs/by-name/em/em/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { (such as the ITT's at QMC). ''; license = licenses.publicDomain; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; mainProgram = "em"; }; diff --git a/pkgs/by-name/em/emacspeak/package.nix b/pkgs/by-name/em/emacspeak/package.nix index 3e9b753be964..9fa2573922bf 100644 --- a/pkgs/by-name/em/emacspeak/package.nix +++ b/pkgs/by-name/em/emacspeak/package.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/tvraman/emacspeak/blob/${finalAttrs.src.rev}/etc/NEWS"; license = with lib.licenses; [ gpl2Plus ]; mainProgram = "emacspeak"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; # Emacspeak requires a minimal Emacs version; let's use the broken flag broken = lib.versionOlder (lib.getVersion emacs) "29.1"; diff --git a/pkgs/by-name/em/emu2/package.nix b/pkgs/by-name/em/emu2/package.nix index 2900dc5ab83a..6218783f76df 100644 --- a/pkgs/by-name/em/emu2/package.nix +++ b/pkgs/by-name/em/emu2/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/dmsc/emu2/"; description = "Simple text-mode x86 + DOS emulator"; platforms = platforms.linux; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; license = licenses.gpl2Plus; mainProgram = "emu2"; }; diff --git a/pkgs/by-name/eu/eudev/package.nix b/pkgs/by-name/eu/eudev/package.nix index 713394d345ed..60c4f73ea8b6 100644 --- a/pkgs/by-name/eu/eudev/package.nix +++ b/pkgs/by-name/eu/eudev/package.nix @@ -87,7 +87,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ raskin - AndersonTorres ]; pkgConfigModules = [ "libudev" diff --git a/pkgs/by-name/ew/eweb/package.nix b/pkgs/by-name/ew/eweb/package.nix index ccd36c838a2d..e765b4a3cf28 100644 --- a/pkgs/by-name/ew/eweb/package.nix +++ b/pkgs/by-name/ew/eweb/package.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { mainProgram = "etangle.py"; platforms = platforms.linux; license = licenses.gpl3Plus; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/fa/fastjar/package.nix b/pkgs/by-name/fa/fastjar/package.nix index c7c0f9425195..c2d5f56dd08d 100644 --- a/pkgs/by-name/fa/fastjar/package.nix +++ b/pkgs/by-name/fa/fastjar/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.gpl2Plus; mainProgram = "fastjar"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/fc/fceux/package.nix b/pkgs/by-name/fc/fceux/package.nix index c0355e9e30ec..7f01638b96c5 100644 --- a/pkgs/by-name/fc/fceux/package.nix +++ b/pkgs/by-name/fc/fceux/package.nix @@ -67,7 +67,6 @@ stdenv.mkDerivation (finalAttrs: { license = with lib.licenses; [ gpl2Plus ]; mainProgram = "fceux"; maintainers = with lib.maintainers; [ - AndersonTorres sbruder ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/fl/fluxbox/package.nix b/pkgs/by-name/fl/fluxbox/package.nix index 65bc41d35f15..791e05b57669 100644 --- a/pkgs/by-name/fl/fluxbox/package.nix +++ b/pkgs/by-name/fl/fluxbox/package.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://fluxbox.org/"; license = licenses.mit; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/fr/free42/package.nix b/pkgs/by-name/fr/free42/package.nix index fa3afdf1aadb..6814a45f2d37 100644 --- a/pkgs/by-name/fr/free42/package.nix +++ b/pkgs/by-name/fr/free42/package.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/thomasokken/free42"; description = "Software clone of HP-42S Calculator"; license = with lib.licenses; [ gpl2Only ]; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "free42dec"; platforms = with lib.platforms; unix; }; diff --git a/pkgs/by-name/fr/freecell-solver/package.nix b/pkgs/by-name/fr/freecell-solver/package.nix index 22d87b53fd05..8479daf5888e 100644 --- a/pkgs/by-name/fr/freecell-solver/package.nix +++ b/pkgs/by-name/fr/freecell-solver/package.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.mit; mainProgram = "fc-solve"; - maintainers = [ lib.maintainers.AndersonTorres ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/fs/fsuae-launcher/package.nix b/pkgs/by-name/fs/fsuae-launcher/package.nix index 8c587ca300f8..7e756e0bc240 100644 --- a/pkgs/by-name/fs/fsuae-launcher/package.nix +++ b/pkgs/by-name/fs/fsuae-launcher/package.nix @@ -58,7 +58,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "fs-uae-launcher"; maintainers = with lib.maintainers; [ sander - AndersonTorres ]; platforms = with lib.systems.inspect; patternLogicalAnd patterns.isx86 patterns.isLinux; }; diff --git a/pkgs/by-name/fs/fsuae/package.nix b/pkgs/by-name/fs/fsuae/package.nix index 854538295ba1..bffc46e4dab3 100644 --- a/pkgs/by-name/fs/fsuae/package.nix +++ b/pkgs/by-name/fs/fsuae/package.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.gpl2Plus; mainProgram = "fs-uae"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = with lib.systems.inspect; patternLogicalAnd patterns.isx86 patterns.isLinux; }; }) diff --git a/pkgs/by-name/ft/ftgl/package.nix b/pkgs/by-name/ft/ftgl/package.nix index 2c05f30f3d72..6de0411e833c 100644 --- a/pkgs/by-name/ft/ftgl/package.nix +++ b/pkgs/by-name/ft/ftgl/package.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { rendering modes. ''; license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/fu/funnelweb/package.nix b/pkgs/by-name/fu/funnelweb/package.nix index 14e52ff56b25..ba285ec46e7f 100644 --- a/pkgs/by-name/fu/funnelweb/package.nix +++ b/pkgs/by-name/fu/funnelweb/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = "http://www.ross.net/funnelweb/"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ ]; }; } #TODO: implement it for other platforms diff --git a/pkgs/by-name/fv/fvwm3/package.nix b/pkgs/by-name/fv/fvwm3/package.nix index 93d2fbb32ae0..6ab018ebb4c0 100644 --- a/pkgs/by-name/fv/fvwm3/package.nix +++ b/pkgs/by-name/fv/fvwm3/package.nix @@ -113,7 +113,7 @@ stdenv.mkDerivation (finalAttrs: { ''; changelog = "https://github.com/fvwmorg/fvwm3/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; inherit (libX11.meta) platforms; }; }) diff --git a/pkgs/by-name/ga/galaxis/package.nix b/pkgs/by-name/ga/galaxis/package.nix index 6ec0c87fe814..b8266e9baf36 100644 --- a/pkgs/by-name/ga/galaxis/package.nix +++ b/pkgs/by-name/ga/galaxis/package.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://catb.org/~esr/galaxis/"; license = with lib.licenses; [ gpl2Plus ]; mainProgram = "galaxis"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/ga/galculator/package.nix b/pkgs/by-name/ga/galculator/package.nix index b1f45a1432d9..4f86d789a1aa 100644 --- a/pkgs/by-name/ga/galculator/package.nix +++ b/pkgs/by-name/ga/galculator/package.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.gpl2Plus; mainProgram = "galculator"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; inherit (gtk3.meta) platforms; }; }) diff --git a/pkgs/by-name/ga/gavin-bc/package.nix b/pkgs/by-name/ga/gavin-bc/package.nix index 5dba74350bf8..5cb9eaf1d887 100644 --- a/pkgs/by-name/ga/gavin-bc/package.nix +++ b/pkgs/by-name/ga/gavin-bc/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Gavin Howard's BC calculator implementation"; changelog = "https://git.gavinhoward.com/gavin/bc/raw/tag/${finalAttrs.version}/NEWS.md"; license = lib.licenses.bsd2; - maintainers = [ lib.maintainers.AndersonTorres ]; + maintainers = [ ]; platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; }; diff --git a/pkgs/by-name/gd/gdbm/package.nix b/pkgs/by-name/gd/gdbm/package.nix index 91271e71d129..9a46d37d698d 100644 --- a/pkgs/by-name/gd/gdbm/package.nix +++ b/pkgs/by-name/gd/gdbm/package.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.gpl3Plus; mainProgram = "gdbmtool"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/ge/germinal/package.nix b/pkgs/by-name/ge/germinal/package.nix index 83c0b977b081..b304492e5fd2 100644 --- a/pkgs/by-name/ge/germinal/package.nix +++ b/pkgs/by-name/ge/germinal/package.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/Keruspe/Germinal"; license = lib.licenses.gpl3Plus; mainProgram = "germinal"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/gi/git-branchstack/package.nix b/pkgs/by-name/gi/git-branchstack/package.nix index e0cdfaa884df..e7f2d24b21bf 100644 --- a/pkgs/by-name/gi/git-branchstack/package.nix +++ b/pkgs/by-name/gi/git-branchstack/package.nix @@ -23,7 +23,7 @@ let homepage = "https://github.com/krobelus/git-branchstack"; description = "Efficiently manage Git branches without leaving your local branch"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; }; }; in diff --git a/pkgs/by-name/gl/glpng/package.nix b/pkgs/by-name/gl/glpng/package.nix index 4a98163a2a4c..30f274367e26 100644 --- a/pkgs/by-name/gl/glpng/package.nix +++ b/pkgs/by-name/gl/glpng/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { homepage = "https://repo.or.cz/glpng.git/blob_plain/HEAD:/glpng.htm"; description = "PNG loader library for OpenGL"; license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/gm/gmic-qt/package.nix b/pkgs/by-name/gm/gmic-qt/package.nix index ad7ec1323da1..c22d819e2290 100644 --- a/pkgs/by-name/gm/gmic-qt/package.nix +++ b/pkgs/by-name/gm/gmic-qt/package.nix @@ -128,7 +128,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (variants.${variant}) description; license = lib.licenses.gpl3Plus; mainProgram = "gmic_qt"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/gm/gmic/package.nix b/pkgs/by-name/gm/gmic/package.nix index 481699eb5b2d..8e9097c95bf0 100644 --- a/pkgs/by-name/gm/gmic/package.nix +++ b/pkgs/by-name/gm/gmic/package.nix @@ -145,7 +145,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "gmic"; license = lib.licenses.cecill21; maintainers = [ - lib.maintainers.AndersonTorres + lib.maintainers. ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/gn/gnu-smalltalk/package.nix b/pkgs/by-name/gn/gnu-smalltalk/package.nix index 678aa56b0562..b6c961a5c72b 100644 --- a/pkgs/by-name/gn/gnu-smalltalk/package.nix +++ b/pkgs/by-name/gn/gnu-smalltalk/package.nix @@ -90,6 +90,6 @@ stdenv.mkDerivation rec { lgpl2 ]; platforms = platforms.linux; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/by-name/go/gofish/package.nix b/pkgs/by-name/go/gofish/package.nix index b5a28b021426..ac9ccbdf5ebf 100644 --- a/pkgs/by-name/go/gofish/package.nix +++ b/pkgs/by-name/go/gofish/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "Lightweight Gopher server"; homepage = "https://gofish.sourceforge.net/"; license = licenses.gpl2Plus; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/gr/grafx2/package.nix b/pkgs/by-name/gr/grafx2/package.nix index a36fe379bfa4..862bb76d26e2 100644 --- a/pkgs/by-name/gr/grafx2/package.nix +++ b/pkgs/by-name/gr/grafx2/package.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = with lib.licenses; [ gpl2Plus ]; mainProgram = "grafx2-sdl"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/gr/graphicsmagick/package.nix b/pkgs/by-name/gr/graphicsmagick/package.nix index ffde1a952745..fd600399b1d2 100644 --- a/pkgs/by-name/gr/graphicsmagick/package.nix +++ b/pkgs/by-name/gr/graphicsmagick/package.nix @@ -109,7 +109,7 @@ stdenv.mkDerivation (finalAttrs: { PNM, TIFF, and WebP. ''; license = with lib.licenses; [ mit ]; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "gm"; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/gx/gxemul/package.nix b/pkgs/by-name/gx/gxemul/package.nix index 1825a36e05a1..df51fe643aa2 100644 --- a/pkgs/by-name/gx/gxemul/package.nix +++ b/pkgs/by-name/gx/gxemul/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { unmodified "guest" operating systems to run. ''; license = licenses.bsd3; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; mainProgram = "gxemul"; }; diff --git a/pkgs/by-name/ha/hachimarupop/package.nix b/pkgs/by-name/ha/hachimarupop/package.nix index 4bcf78fe7ed7..549cced4db5c 100644 --- a/pkgs/by-name/ha/hachimarupop/package.nix +++ b/pkgs/by-name/ha/hachimarupop/package.nix @@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation { homepage = "https://github.com/noriokanisawa/HachiMaruPop"; description = "Cute, Japanese font"; license = lib.licenses.ofl; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/ha/hackedbox/package.nix b/pkgs/by-name/ha/hackedbox/package.nix index 023ff246ef56..6a4bcff5915c 100644 --- a/pkgs/by-name/ha/hackedbox/package.nix +++ b/pkgs/by-name/ha/hackedbox/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Bastard hacked offspring of Blackbox"; homepage = "https://github.com/museoa/hackedbox/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; inherit (libX11.meta) platforms; }; }) diff --git a/pkgs/by-name/ha/haunt/package.nix b/pkgs/by-name/ha/haunt/package.nix index 6f39fed07bb9..963a51068b66 100644 --- a/pkgs/by-name/ha/haunt/package.nix +++ b/pkgs/by-name/ha/haunt/package.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: { to do things that aren't provided out-of-the-box. ''; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; inherit (guile.meta) platforms; }; }) diff --git a/pkgs/by-name/ha/havoc/package.nix b/pkgs/by-name/ha/havoc/package.nix index 7dc9af73d5e3..9abe79999b43 100644 --- a/pkgs/by-name/ha/havoc/package.nix +++ b/pkgs/by-name/ha/havoc/package.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { publicDomain ]; mainProgram = "havoc"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; inherit (wayland.meta) platforms; broken = stdenv.hostPlatform.isDarwin; # fatal error: 'sys/epoll.h' file not found }; diff --git a/pkgs/by-name/hi/higan/package.nix b/pkgs/by-name/hi/higan/package.nix index 59558b72e00c..e47d722f95eb 100644 --- a/pkgs/by-name/hi/higan/package.nix +++ b/pkgs/by-name/hi/higan/package.nix @@ -184,7 +184,7 @@ stdenv.mkDerivation (finalAttrs: { Challenge V2. ''; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; }; diff --git a/pkgs/by-name/ht/httplib/package.nix b/pkgs/by-name/ht/httplib/package.nix index b88b782a0cd4..b89159b0d810 100644 --- a/pkgs/by-name/ht/httplib/package.nix +++ b/pkgs/by-name/ht/httplib/package.nix @@ -28,9 +28,7 @@ stdenv.mkDerivation (finalAttrs: { description = "C++ header-only HTTP/HTTPS server and client library"; changelog = "https://github.com/yhirose/cpp-httplib/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ - AndersonTorres - ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/ic/icewm/package.nix b/pkgs/by-name/ic/icewm/package.nix index 50f8565a4fe6..57a994ba7a6e 100644 --- a/pkgs/by-name/ic/icewm/package.nix +++ b/pkgs/by-name/ic/icewm/package.nix @@ -122,7 +122,7 @@ stdenv.mkDerivation (finalAttrs: { a simple session manager and a system tray. ''; license = licenses.lgpl2Only; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ ]; platforms = platforms.linux; }; }) diff --git a/pkgs/by-name/ii/iir1/package.nix b/pkgs/by-name/ii/iir1/package.nix index 326357c9e7f2..a0e6ffd1bccd 100644 --- a/pkgs/by-name/ii/iir1/package.nix +++ b/pkgs/by-name/ii/iir1/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { downloadPage = "https://github.com/berndporr/iir1"; changelog = "https://github.com/berndporr/iir1/releases/tag/${finalAttrs.src.rev}"; license = with lib.licenses; [ mit ]; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/in/intercal/package.nix b/pkgs/by-name/in/intercal/package.nix index 9d5120c87e29..719d93822924 100644 --- a/pkgs/by-name/in/intercal/package.nix +++ b/pkgs/by-name/in/intercal/package.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://www.catb.org/~esr/intercal/"; license = licenses.gpl2Plus; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/is/isc-cron/package.nix b/pkgs/by-name/is/isc-cron/package.nix index 94d25e516500..d634db1a11d7 100644 --- a/pkgs/by-name/is/isc-cron/package.nix +++ b/pkgs/by-name/is/isc-cron/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Daemon for running commands at specific times"; license = lib.licenses.bsd0; mainProgram = "cron"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/iw/iw/package.nix b/pkgs/by-name/iw/iw/package.nix index bba9d3ffb2a5..38228ed96d31 100644 --- a/pkgs/by-name/iw/iw/package.nix +++ b/pkgs/by-name/iw/iw/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.isc; mainProgram = "iw"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/ja/jam/package.nix b/pkgs/by-name/ja/jam/package.nix index 9fbe6f4c7724..1fb3fc3e1e51 100644 --- a/pkgs/by-name/ja/jam/package.nix +++ b/pkgs/by-name/ja/jam/package.nix @@ -120,7 +120,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ impl orivej - AndersonTorres ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/jo/joe/package.nix b/pkgs/by-name/jo/joe/package.nix index 79437e532c79..0ac9e156d3a1 100644 --- a/pkgs/by-name/jo/joe/package.nix +++ b/pkgs/by-name/jo/joe/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://joe-editor.sourceforge.io"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/jo/jove/package.nix b/pkgs/by-name/jo/jove/package.nix index 0b5bd642649b..e2af8e44261e 100644 --- a/pkgs/by-name/jo/jove/package.nix +++ b/pkgs/by-name/jo/jove/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Jonathan's Own Version of Emacs"; changelog = "https://github.com/jonmacs/jove/releases/tag/${finalAttrs.version}"; license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; # never built on Hydra: https://hydra.nixos.org/job/nixpkgs/trunk/jove.x86_64-darwin broken = stdenv.hostPlatform.isDarwin; diff --git a/pkgs/by-name/ju/jupp/package.nix b/pkgs/by-name/ju/jupp/package.nix index 908eea9d6102..7afa43f08580 100644 --- a/pkgs/by-name/ju/jupp/package.nix +++ b/pkgs/by-name/ju/jupp/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { because these behave better overall. ''; license = lib.licenses.gpl1Only; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = with lib.platforms; unix; }; } diff --git a/pkgs/by-name/jw/jwasm/package.nix b/pkgs/by-name/jw/jwasm/package.nix index 42808118b645..0a3a58da1b45 100644 --- a/pkgs/by-name/jw/jwasm/package.nix +++ b/pkgs/by-name/jw/jwasm/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/Baron-von-Riedesel/JWasm/releases/tag/${finalAttrs.src.rev}"; mainProgram = "jwasm"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; }; diff --git a/pkgs/by-name/ka/katriawm/package.nix b/pkgs/by-name/ka/katriawm/package.nix index 6a658af345bd..a283030e352a 100644 --- a/pkgs/by-name/ka/katriawm/package.nix +++ b/pkgs/by-name/ka/katriawm/package.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Non-reparenting, dynamic window manager with decorations"; license = lib.licenses.mit; mainProgram = "katriawm"; - maintainers = [ lib.maintainers.AndersonTorres ]; + maintainers = [ ]; inherit (libX11.meta) platforms; }; }) diff --git a/pkgs/by-name/ke/kermit-terminal/package.nix b/pkgs/by-name/ke/kermit-terminal/package.nix index 2ca13ef20332..c19cae129bd1 100644 --- a/pkgs/by-name/ke/kermit-terminal/package.nix +++ b/pkgs/by-name/ke/kermit-terminal/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/orhun/kermit/releases/tag/${finalAttrs.version}"; license = lib.licenses.gpl3Only; mainProgram = "kermit"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/ki/kirc/package.nix b/pkgs/by-name/ki/kirc/package.nix index a013880e6c96..16901239032d 100644 --- a/pkgs/by-name/ki/kirc/package.nix +++ b/pkgs/by-name/ki/kirc/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { - Easy customized color scheme definition. ''; license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/la/labwc-tweaks/package.nix b/pkgs/by-name/la/labwc-tweaks/package.nix index cb2cbf07f15c..e84c7d90b9a0 100644 --- a/pkgs/by-name/la/labwc-tweaks/package.nix +++ b/pkgs/by-name/la/labwc-tweaks/package.nix @@ -49,7 +49,6 @@ stdenv.mkDerivation { license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ - AndersonTorres romildo ]; }; diff --git a/pkgs/by-name/la/lavalauncher/package.nix b/pkgs/by-name/la/lavalauncher/package.nix index a990d58eb4df..5f9c60ee55c5 100644 --- a/pkgs/by-name/la/lavalauncher/package.nix +++ b/pkgs/by-name/la/lavalauncher/package.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://git.sr.ht/~leon_plickat/lavalauncher/refs/${finalAttrs.src.rev}"; license = lib.licenses.gpl3Plus; mainProgram = "lavalauncher"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; inherit (wayland.meta) platforms; # meson.build:52:23: ERROR: C shared or static library 'rt' not found # https://logs.ofborg.org/?key=nixos/nixpkgs.340239&attempt_id=1f05cada-67d2-4cfe-b6a8-4bf4571b9375 diff --git a/pkgs/by-name/lb/lbreakout2/package.nix b/pkgs/by-name/lb/lbreakout2/package.nix index fb53778a817a..8e219590d13d 100644 --- a/pkgs/by-name/lb/lbreakout2/package.nix +++ b/pkgs/by-name/lb/lbreakout2/package.nix @@ -49,7 +49,6 @@ stdenv.mkDerivation (finalAttrs: { license = with lib.licenses; [ gpl2Plus ]; mainProgram = "lbreakout2"; maintainers = with lib.maintainers; [ - AndersonTorres ciil ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/lb/lbreakouthd/package.nix b/pkgs/by-name/lb/lbreakouthd/package.nix index e694a3a8ebea..8a3b8c52960e 100644 --- a/pkgs/by-name/lb/lbreakouthd/package.nix +++ b/pkgs/by-name/lb/lbreakouthd/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Widescreen Breakout clone"; license = lib.licenses.gpl2Plus; mainProgram = "lbreakouthd"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; inherit (SDL2.meta) platforms; broken = stdenv.hostPlatform.isDarwin; }; diff --git a/pkgs/by-name/le/lefthook/package.nix b/pkgs/by-name/le/lefthook/package.nix index 55aa9c440931..4c6da4947c57 100644 --- a/pkgs/by-name/le/lefthook/package.nix +++ b/pkgs/by-name/le/lefthook/package.nix @@ -43,6 +43,6 @@ buildGoModule { changelog = "https://github.com/evilmartians/lefthook/raw/v${version}/CHANGELOG.md"; license = lib.licenses.mit; mainProgram = "lefthook"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/by-name/li/libburn/package.nix b/pkgs/by-name/li/libburn/package.nix index 4d4901901ac5..8eafecde7828 100644 --- a/pkgs/by-name/li/libburn/package.nix +++ b/pkgs/by-name/li/libburn/package.nix @@ -47,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ abbradar - AndersonTorres ]; mainProgram = "cdrskin"; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/li/libbytesize/package.nix b/pkgs/by-name/li/libbytesize/package.nix index 2e29b8b29906..ae268b88b83c 100644 --- a/pkgs/by-name/li/libbytesize/package.nix +++ b/pkgs/by-name/li/libbytesize/package.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Tiny library providing a C 'class' for working with arbitrary big sizes in bytes"; license = lib.licenses.lgpl2Plus; mainProgram = "bscalc"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/li/libcaca/package.nix b/pkgs/by-name/li/libcaca/package.nix index f9abf2a3970b..d72b124854f0 100644 --- a/pkgs/by-name/li/libcaca/package.nix +++ b/pkgs/by-name/li/libcaca/package.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { Libcaca was written by Sam Hocevar and Jean-Yves Lamoureux. ''; license = licenses.wtfpl; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/li/libedit/package.nix b/pkgs/by-name/li/libedit/package.nix index 92248a806d25..d320dedcd958 100644 --- a/pkgs/by-name/li/libedit/package.nix +++ b/pkgs/by-name/li/libedit/package.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { similar to those found in GNU Readline. ''; license = with lib.licenses; [ bsd3 ]; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/li/libisoburn/package.nix b/pkgs/by-name/li/libisoburn/package.nix index fec34a434570..c22954354475 100644 --- a/pkgs/by-name/li/libisoburn/package.nix +++ b/pkgs/by-name/li/libisoburn/package.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://dev.lovelyhq.com/libburnia/libisoburn/src/tag/${finalAttrs.src.rev}/ChangeLog"; license = lib.licenses.gpl2Plus; mainProgram = "osirrox"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; inherit (libisofs.meta) platforms; }; }) diff --git a/pkgs/by-name/li/libisofs/package.nix b/pkgs/by-name/li/libisofs/package.nix index 1d8b772eabf9..5e6307f2616d 100644 --- a/pkgs/by-name/li/libisofs/package.nix +++ b/pkgs/by-name/li/libisofs/package.nix @@ -51,7 +51,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ abbradar - AndersonTorres ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/li/libmpdclient/package.nix b/pkgs/by-name/li/libmpdclient/package.nix index eeed2140bf8d..fcc8c2636a47 100644 --- a/pkgs/by-name/li/libmpdclient/package.nix +++ b/pkgs/by-name/li/libmpdclient/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.musicpd.org/libs/libmpdclient/"; changelog = "https://raw.githubusercontent.com/MusicPlayerDaemon/libmpdclient/${finalAttrs.src.rev}/NEWS"; license = with lib.licenses; [ bsd2 ]; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/li/libpkgconf/package.nix b/pkgs/by-name/li/libpkgconf/package.nix index fb9e541fb242..1e2472880193 100644 --- a/pkgs/by-name/li/libpkgconf/package.nix +++ b/pkgs/by-name/li/libpkgconf/package.nix @@ -71,7 +71,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "pkgconf"; maintainers = with lib.maintainers; [ zaninime - AndersonTorres ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/li/libremidi/package.nix b/pkgs/by-name/li/libremidi/package.nix index 0bba569e2343..a5a16f53e338 100644 --- a/pkgs/by-name/li/libremidi/package.nix +++ b/pkgs/by-name/li/libremidi/package.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/jcelerier/libremidi"; description = "Modern C++ MIDI real-time & file I/O library"; license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/li/librep/package.nix b/pkgs/by-name/li/librep/package.nix index 6258682938a5..8cc45aade670 100644 --- a/pkgs/by-name/li/librep/package.nix +++ b/pkgs/by-name/li/librep/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { language but is also suitable for standalone scripts. ''; license = lib.licenses.gpl2Plus; - maintainers = [ lib.maintainers.AndersonTorres ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/li/libtap/package.nix b/pkgs/by-name/li/libtap/package.nix index cda5e0d3bf57..4b41187a7c9c 100644 --- a/pkgs/by-name/li/libtap/package.nix +++ b/pkgs/by-name/li/libtap/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.shlomifish.org/open-source/projects/libtap/"; license = licenses.bsd3; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/li/libtcod/package.nix b/pkgs/by-name/li/libtcod/package.nix index 678ce9c46f5a..78128320f587 100644 --- a/pkgs/by-name/li/libtcod/package.nix +++ b/pkgs/by-name/li/libtcod/package.nix @@ -45,6 +45,6 @@ stdenv.mkDerivation { homepage = "http://roguecentral.org/doryen/libtcod/"; license = lib.licenses.bsd3; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/by-name/li/libverto/package.nix b/pkgs/by-name/li/libverto/package.nix index 2e8bb24fb2ce..7d148878bdf4 100644 --- a/pkgs/by-name/li/libverto/package.nix +++ b/pkgs/by-name/li/libverto/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { offload the choice of the main loop to the application. ''; license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; }) diff --git a/pkgs/by-name/li/libz/package.nix b/pkgs/by-name/li/libz/package.nix index 62c579d2f20b..b403ad43f59d 100644 --- a/pkgs/by-name/li/libz/package.nix +++ b/pkgs/by-name/li/libz/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://sortix.org/libz/"; description = "Clean fork of zlib"; license = [ lib.licenses.zlib ]; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/li/lightning/package.nix b/pkgs/by-name/li/lightning/package.nix index 1256ee1cf3b7..22d5982a28bd 100644 --- a/pkgs/by-name/li/lightning/package.nix +++ b/pkgs/by-name/li/lightning/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { it abstracts over the target CPU, as it exposes to the clients a standardized RISC instruction set inspired by the MIPS and SPARC chips. ''; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; license = with lib.licenses; [ lgpl3Plus ]; platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; # failing tests diff --git a/pkgs/by-name/li/live555/package.nix b/pkgs/by-name/li/live555/package.nix index 2b24804cb33a..617b3e3b711a 100644 --- a/pkgs/by-name/li/live555/package.nix +++ b/pkgs/by-name/li/live555/package.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Set of C++ libraries for multimedia streaming, using open standard protocols (RTP/RTCP, RTSP, SIP)"; changelog = "http://www.live555.com/liveMedia/public/changelog.txt"; license = with lib.licenses; [ lgpl21Plus ]; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/lo/lolcode/package.nix b/pkgs/by-name/lo/lolcode/package.nix index 087c71340fe7..ff96112289c1 100644 --- a/pkgs/by-name/lo/lolcode/package.nix +++ b/pkgs/by-name/lo/lolcode/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { whose keywords are LOLspeak. ''; license = licenses.gpl3; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ ]; mainProgram = "lolcode-lci"; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/lp/lpairs2/package.nix b/pkgs/by-name/lp/lpairs2/package.nix index bed30b7e5f4f..999f346afee1 100644 --- a/pkgs/by-name/lp/lpairs2/package.nix +++ b/pkgs/by-name/lp/lpairs2/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Matching the pairs - a typical Memory Game"; license = with lib.licenses; [ gpl2Plus ]; mainProgram = "lpairs2"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; }; diff --git a/pkgs/by-name/lt/ltris/package.nix b/pkgs/by-name/lt/ltris/package.nix index 07652d992bc8..8e0f4ba3cd5f 100644 --- a/pkgs/by-name/lt/ltris/package.nix +++ b/pkgs/by-name/lt/ltris/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Tetris clone from the LGames series"; license = with lib.licenses; [ gpl2Plus ]; mainProgram = "ltris"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; inherit (SDL.meta) platforms; broken = stdenv.hostPlatform.isDarwin; }; diff --git a/pkgs/by-name/lu/luakit/package.nix b/pkgs/by-name/lu/luakit/package.nix index d9f46d3b79b9..7222f712b1dd 100644 --- a/pkgs/by-name/lu/luakit/package.nix +++ b/pkgs/by-name/lu/luakit/package.nix @@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.gpl3Only; mainProgram = "luakit"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/lu/luckybackup/package.nix b/pkgs/by-name/lu/luckybackup/package.nix index a50ed3c58e1c..725b1376ffc7 100644 --- a/pkgs/by-name/lu/luckybackup/package.nix +++ b/pkgs/by-name/lu/luckybackup/package.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.gpl3Plus; mainProgram = "luckybackup"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/lu/lukesmithxyz-st/package.nix b/pkgs/by-name/lu/lukesmithxyz-st/package.nix index 36007d3f8b87..b4320fbfd81f 100644 --- a/pkgs/by-name/lu/lukesmithxyz-st/package.nix +++ b/pkgs/by-name/lu/lukesmithxyz-st/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/LukeSmithxyz/st"; description = "Luke Smith's fork of st"; license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/lw/lwm/package.nix b/pkgs/by-name/lw/lwm/package.nix index a7706e3c6f72..4e0b71f5cfaf 100644 --- a/pkgs/by-name/lw/lwm/package.nix +++ b/pkgs/by-name/lw/lwm/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://www.jfc.org.uk/software/lwm.html"; license = licenses.gpl2; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ ]; platforms = platforms.linux; mainProgram = "lwm"; }; diff --git a/pkgs/by-name/lz/lzsa/package.nix b/pkgs/by-name/lz/lzsa/package.nix index 54c524d36d32..85866a2243c2 100644 --- a/pkgs/by-name/lz/lzsa/package.nix +++ b/pkgs/by-name/lz/lzsa/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Byte-aligned, efficient lossless packer that is optimized for fast decompression on 8-bit micros"; mainProgram = "lzsa"; license = with lib.licenses; [ cc0 ]; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/ma/marst/package.nix b/pkgs/by-name/ma/marst/package.nix index b1f4fff0dd2a..94cd0cdd2ffe 100644 --- a/pkgs/by-name/ma/marst/package.nix +++ b/pkgs/by-name/ma/marst/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { from some other representations to MARST representation. ''; license = licenses.gpl3Plus; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/mc/mcpp/package.nix b/pkgs/by-name/mc/mcpp/package.nix index 571967e4befe..6ca62d1fe8c7 100644 --- a/pkgs/by-name/mc/mcpp/package.nix +++ b/pkgs/by-name/mc/mcpp/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Matsui's C preprocessor"; mainProgram = "mcpp"; license = licenses.bsd2; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; }) diff --git a/pkgs/by-name/md/md-tangle/package.nix b/pkgs/by-name/md/md-tangle/package.nix index 401b413a2602..8228dade2ef1 100644 --- a/pkgs/by-name/md/md-tangle/package.nix +++ b/pkgs/by-name/md/md-tangle/package.nix @@ -25,6 +25,6 @@ python3.pkgs.buildPythonPackage rec { description = "Generates (\"tangles\") source code from Markdown documents"; mainProgram = "md-tangle"; license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/by-name/md/md4c/package.nix b/pkgs/by-name/md/md4c/package.nix index a7198cc078ad..100d49e21abc 100644 --- a/pkgs/by-name/md/md4c/package.nix +++ b/pkgs/by-name/md/md4c/package.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { ''; changelog = "https://github.com/mity/md4c/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = with lib.licenses; [ mit ]; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "md2html"; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/md/mdds/package.nix b/pkgs/by-name/md/mdds/package.nix index 1424e4117082..55e2f3aa6ebe 100644 --- a/pkgs/by-name/md/mdds/package.nix +++ b/pkgs/by-name/md/mdds/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Collection of multi-dimensional data structure and indexing algorithms"; changelog = "https://gitlab.com/mdds/mdds/-/blob/${finalAttrs.version}/CHANGELOG"; license = licenses.mit; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ ]; platforms = platforms.unix; }; }) diff --git a/pkgs/by-name/me/mednafen-server/package.nix b/pkgs/by-name/me/mednafen-server/package.nix index 59247cf46c59..40302691125b 100644 --- a/pkgs/by-name/me/mednafen-server/package.nix +++ b/pkgs/by-name/me/mednafen-server/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "mednafen-server"; homepage = "https://mednafen.github.io/"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/me/mednafen/package.nix b/pkgs/by-name/me/mednafen/package.nix index d6d0adddf0a0..685bffa05486 100644 --- a/pkgs/by-name/me/mednafen/package.nix +++ b/pkgs/by-name/me/mednafen/package.nix @@ -110,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.gpl2Plus; mainProgram = "mednafen"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/me/mednaffe/package.nix b/pkgs/by-name/me/mednaffe/package.nix index b78646244e74..c21689a9be44 100644 --- a/pkgs/by-name/me/mednaffe/package.nix +++ b/pkgs/by-name/me/mednaffe/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "mednaffe"; homepage = "https://github.com/AmatCoder/mednaffe"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/me/melonDS/package.nix b/pkgs/by-name/me/melonDS/package.nix index 065e886a149e..fee630bfb0d7 100644 --- a/pkgs/by-name/me/melonDS/package.nix +++ b/pkgs/by-name/me/melonDS/package.nix @@ -103,7 +103,6 @@ stdenv.mkDerivation (finalAttrs: { license = with lib.licenses; [ gpl3Plus ]; mainProgram = "melonDS"; maintainers = with lib.maintainers; [ - AndersonTorres artemist benley shamilton diff --git a/pkgs/by-name/mg/mgba/package.nix b/pkgs/by-name/mg/mgba/package.nix index 6ebe1ca2d6ac..70e726916780 100644 --- a/pkgs/by-name/mg/mgba/package.nix +++ b/pkgs/by-name/mg/mgba/package.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://raw.githubusercontent.com/mgba-emu/mgba/${finalAttrs.src.rev}/CHANGES"; license = with lib.licenses; [ mpl20 ]; mainProgram = "mgba"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; broken = enableDiscordRpc; # Some obscure `ld` error }; diff --git a/pkgs/by-name/mk/mksh/package.nix b/pkgs/by-name/mk/mksh/package.nix index 39b4e0d686ee..51ba16bb42cc 100644 --- a/pkgs/by-name/mk/mksh/package.nix +++ b/pkgs/by-name/mk/mksh/package.nix @@ -61,11 +61,8 @@ stdenv.mkDerivation (finalAttrs: { unicode-dfs-2016 ]; maintainers = with lib.maintainers; [ - AndersonTorres joachifm ]; platforms = lib.platforms.unix; }; }) -# TODO [ AndersonTorres ]: lksh -# TODO [ AndersonTorres ]: a more accurate licensing info diff --git a/pkgs/by-name/mo/moe/package.nix b/pkgs/by-name/mo/moe/package.nix index 2ee19530eec9..c897d3d22cdd 100644 --- a/pkgs/by-name/mo/moe/package.nix +++ b/pkgs/by-name/mo/moe/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { delimiter matching, text conversion from/to UTF-8, romanization, etc. ''; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; mainProgram = "moe"; }; diff --git a/pkgs/by-name/mo/monaspace/package.nix b/pkgs/by-name/mo/monaspace/package.nix index 6a5e4757defe..e99a51893513 100644 --- a/pkgs/by-name/mo/monaspace/package.nix +++ b/pkgs/by-name/mo/monaspace/package.nix @@ -54,7 +54,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; homepage = "https://monaspace.githubnext.com/"; license = lib.licenses.ofl; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/mp/mpc/package.nix b/pkgs/by-name/mp/mpc/package.nix index 384f05f75c8e..d88e9438e1fe 100644 --- a/pkgs/by-name/mp/mpc/package.nix +++ b/pkgs/by-name/mp/mpc/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://raw.githubusercontent.com/MusicPlayerDaemon/mpc/refs/heads/master/NEWS"; license = lib.licenses.gpl2Plus; mainProgram = "mpc"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/mp/mpvc/package.nix b/pkgs/by-name/mp/mpvc/package.nix index d6fb6a45aa3c..7780f59e9dd9 100644 --- a/pkgs/by-name/mp/mpvc/package.nix +++ b/pkgs/by-name/mp/mpvc/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Mpc-like control interface for mpv"; license = lib.licenses.mit; mainProgram = "mpvc"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/ms/msr/package.nix b/pkgs/by-name/ms/msr/package.nix index ba2a670356eb..3ff8529f6184 100644 --- a/pkgs/by-name/ms/msr/package.nix +++ b/pkgs/by-name/ms/msr/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { description = "Linux tool to display or modify x86 model-specific registers (MSRs)"; mainProgram = "msr"; license = licenses.bsd0; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = [ "i686-linux" "x86_64-linux" diff --git a/pkgs/by-name/mu/multimarkdown/package.nix b/pkgs/by-name/mu/multimarkdown/package.nix index 0daf9781aca1..20b53464d92c 100644 --- a/pkgs/by-name/mu/multimarkdown/package.nix +++ b/pkgs/by-name/mu/multimarkdown/package.nix @@ -61,6 +61,6 @@ stdenv.mkDerivation rec { ''; license = with licenses; [ mit ]; platforms = platforms.all; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/by-name/mu/muon/package.nix b/pkgs/by-name/mu/muon/package.nix index dc32c0114cfb..1e5957775ee7 100644 --- a/pkgs/by-name/mu/muon/package.nix +++ b/pkgs/by-name/mu/muon/package.nix @@ -133,7 +133,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://muon.build/"; description = "Implementation of Meson build system in C99"; license = licenses.gpl3Only; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; broken = stdenv.hostPlatform.isDarwin; # typical `ar failure` mainProgram = "muon"; diff --git a/pkgs/by-name/na/nanoflann/package.nix b/pkgs/by-name/na/nanoflann/package.nix index 4ce3d156dd21..02e9340aaac0 100644 --- a/pkgs/by-name/na/nanoflann/package.nix +++ b/pkgs/by-name/na/nanoflann/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { ''; changelog = "https://github.com/jlblancoc/nanoflann/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.bsd2; - maintainers = [ lib.maintainers.AndersonTorres ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/na/nawk/package.nix b/pkgs/by-name/na/nawk/package.nix index b7e293db44c1..28a72480722f 100644 --- a/pkgs/by-name/na/nawk/package.nix +++ b/pkgs/by-name/na/nawk/package.nix @@ -56,7 +56,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; mainProgram = "nawk"; maintainers = with lib.maintainers; [ - AndersonTorres konimex ]; platforms = lib.platforms.all; diff --git a/pkgs/by-name/ne/nestopia-ue/package.nix b/pkgs/by-name/ne/nestopia-ue/package.nix index b87aedd3d64b..75798e3d18c4 100644 --- a/pkgs/by-name/ne/nestopia-ue/package.nix +++ b/pkgs/by-name/ne/nestopia-ue/package.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://raw.githubusercontent.com/0ldsk00l/nestopia/${finalAttrs.src.rev}/ChangeLog"; license = lib.licenses.gpl2Plus; mainProgram = "nestopia"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/no/notcurses/package.nix b/pkgs/by-name/no/notcurses/package.nix index a293140681e7..b13ed4f005cb 100644 --- a/pkgs/by-name/no/notcurses/package.nix +++ b/pkgs/by-name/no/notcurses/package.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { replacement for NCURSES on existing systems. ''; license = licenses.asl20; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; inherit (ncurses.meta) platforms; }; } diff --git a/pkgs/by-name/no/notejot/package.nix b/pkgs/by-name/no/notejot/package.nix index d9d3c1a93c6d..9214af6c8fa2 100644 --- a/pkgs/by-name/no/notejot/package.nix +++ b/pkgs/by-name/no/notejot/package.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/lainsce/notejot"; description = "Stupidly-simple notes app"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; mainProgram = "io.github.lainsce.Notejot"; }; diff --git a/pkgs/by-name/nu/nuweb/package.nix b/pkgs/by-name/nu/nuweb/package.nix index 9af6779710d2..a0c1f20a9fb5 100644 --- a/pkgs/by-name/nu/nuweb/package.nix +++ b/pkgs/by-name/nu/nuweb/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { mainProgram = "nuweb"; homepage = "https://nuweb.sourceforge.net"; license = licenses.free; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/nx/nxengine-evo/assets.nix b/pkgs/by-name/nx/nxengine-evo/assets.nix index 9524f42e8dd2..6d72a2dabe3d 100644 --- a/pkgs/by-name/nx/nxengine-evo/assets.nix +++ b/pkgs/by-name/nx/nxengine-evo/assets.nix @@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { license = with lib.licenses; [ unfreeRedistributable ]; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; diff --git a/pkgs/by-name/nx/nxengine-evo/package.nix b/pkgs/by-name/nx/nxengine-evo/package.nix index da64333e784c..ab0129f0f6b1 100644 --- a/pkgs/by-name/nx/nxengine-evo/package.nix +++ b/pkgs/by-name/nx/nxengine-evo/package.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { gpl3Plus ]; mainProgram = "nx"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/of/office-code-pro/package.nix b/pkgs/by-name/of/office-code-pro/package.nix index 4662170b36c0..4413664ead8f 100644 --- a/pkgs/by-name/of/office-code-pro/package.nix +++ b/pkgs/by-name/of/office-code-pro/package.nix @@ -34,6 +34,6 @@ stdenvNoCC.mkDerivation rec { ''; homepage = "https://github.com/nathco/Office-Code-Pro"; license = licenses.ofl; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/og/oguri/package.nix b/pkgs/by-name/og/oguri/package.nix index ef9985bc51e3..30aacb908c85 100644 --- a/pkgs/by-name/og/oguri/package.nix +++ b/pkgs/by-name/og/oguri/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/vilhalmer/oguri/"; description = "Very nice animated wallpaper daemon for Wayland compositors"; license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; inherit (wayland.meta) platforms; broken = stdenv.hostPlatform.isDarwin; # this should be enfoced by wayland platforms in the future }; diff --git a/pkgs/by-name/on/onedrive/package.nix b/pkgs/by-name/on/onedrive/package.nix index 935686a52ecc..5a7aabb7050c 100644 --- a/pkgs/by-name/on/onedrive/package.nix +++ b/pkgs/by-name/on/onedrive/package.nix @@ -86,7 +86,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3Only; mainProgram = "onedrive"; maintainers = with lib.maintainers; [ - AndersonTorres peterhoeg bertof ]; diff --git a/pkgs/by-name/op/openh264/package.nix b/pkgs/by-name/op/openh264/package.nix index 9031086b8700..4776ab103163 100644 --- a/pkgs/by-name/op/openh264/package.nix +++ b/pkgs/by-name/op/openh264/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Codec library which supports H.264 encoding and decoding"; changelog = "https://github.com/cisco/openh264/releases/tag/${finalAttrs.src.rev}"; license = with lib.licenses; [ bsd2 ]; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; # See meson.build platforms = lib.platforms.windows diff --git a/pkgs/by-name/op/openmsx/package.nix b/pkgs/by-name/op/openmsx/package.nix index 7a7014f310e6..7167d5b86642 100644 --- a/pkgs/by-name/op/openmsx/package.nix +++ b/pkgs/by-name/op/openmsx/package.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: { boost gpl2Plus ]; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; mainProgram = "openmsx"; }; diff --git a/pkgs/by-name/pa/paperkey/package.nix b/pkgs/by-name/pa/paperkey/package.nix index 1aba2f19ad8f..a1066a0f2fc1 100644 --- a/pkgs/by-name/pa/paperkey/package.nix +++ b/pkgs/by-name/pa/paperkey/package.nix @@ -35,7 +35,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ - AndersonTorres peterhoeg ]; }; diff --git a/pkgs/by-name/pa/passwdqc/package.nix b/pkgs/by-name/pa/passwdqc/package.nix index 413aa15095a6..3fe047aa6e1e 100644 --- a/pkgs/by-name/pa/passwdqc/package.nix +++ b/pkgs/by-name/pa/passwdqc/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.openwall.com/passwdqc/"; description = "Passphrase strength checking and enforcement"; license = with lib.licenses; [ bsd3 ]; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "passwdqc"; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/pc/pcsx2/package.nix b/pkgs/by-name/pc/pcsx2/package.nix index 90913058a69d..dcbcff5a3408 100644 --- a/pkgs/by-name/pc/pcsx2/package.nix +++ b/pkgs/by-name/pc/pcsx2/package.nix @@ -130,7 +130,6 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { ]; mainProgram = "pcsx2-qt"; maintainers = with lib.maintainers; [ - AndersonTorres hrdinka govanify matteopacini diff --git a/pkgs/by-name/pe/pekwm/package.nix b/pkgs/by-name/pe/pekwm/package.nix index ac08a7cf2e14..d6aea6bd8b9b 100644 --- a/pkgs/by-name/pe/pekwm/package.nix +++ b/pkgs/by-name/pe/pekwm/package.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://raw.githubusercontent.com/pekwm/pekwm/release-${finalAttrs.version}/NEWS.md"; license = lib.licenses.gpl2Plus; mainProgram = "pekwm"; - maintainers = [ lib.maintainers.AndersonTorres ]; + maintainers = [ ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/pf/pforth/package.nix b/pkgs/by-name/pf/pforth/package.nix index 4c7766cc9643..07d9b84abbf5 100644 --- a/pkgs/by-name/pf/pforth/package.nix +++ b/pkgs/by-name/pf/pforth/package.nix @@ -45,7 +45,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/philburk/pforth/blob/v${finalAttrs.version}/RELEASES.md"; license = lib.licenses.bsd0; maintainers = with lib.maintainers; [ - AndersonTorres yrashk ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/pg/pgf-pie/package.nix b/pkgs/by-name/pg/pgf-pie/package.nix index 259735f228dc..07bace2d8bfc 100644 --- a/pkgs/by-name/pg/pgf-pie/package.nix +++ b/pkgs/by-name/pg/pgf-pie/package.nix @@ -28,7 +28,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://github.com/pgf-tikz/pgf-pie"; description = "Some LaTeX macros for pie charts using the PGF/TikZ package"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; }) diff --git a/pkgs/by-name/pg/pgf-umlcd/package.nix b/pkgs/by-name/pg/pgf-umlcd/package.nix index 702f956d743d..0e27c34a656a 100644 --- a/pkgs/by-name/pg/pgf-umlcd/package.nix +++ b/pkgs/by-name/pg/pgf-umlcd/package.nix @@ -28,7 +28,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://github.com/pgf-tikz/pgf-umlcd"; description = "Some LaTeX macros for UML Class Diagrams"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; }) diff --git a/pkgs/by-name/pg/pgf-umlsd/package.nix b/pkgs/by-name/pg/pgf-umlsd/package.nix index ddaced12f87a..d9c92475783c 100644 --- a/pkgs/by-name/pg/pgf-umlsd/package.nix +++ b/pkgs/by-name/pg/pgf-umlsd/package.nix @@ -28,7 +28,7 @@ stdenvNoCC.mkDerivation { homepage = "https://github.com/pgf-tikz/pgf-umlsd"; description = "Some LaTeX macros for UML Sequence Diagrams"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/pg/pgf1/package.nix b/pkgs/by-name/pg/pgf1/package.nix index 11720c4464c6..fb5e7a9a420f 100644 --- a/pkgs/by-name/pg/pgf1/package.nix +++ b/pkgs/by-name/pg/pgf1/package.nix @@ -32,7 +32,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "Portable Graphic Format for TeX - version ${finalAttrs.version}"; branch = lib.versions.major version; license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; }) diff --git a/pkgs/by-name/pg/pgf2/package.nix b/pkgs/by-name/pg/pgf2/package.nix index 99c0bbd99b67..c966046a7f09 100644 --- a/pkgs/by-name/pg/pgf2/package.nix +++ b/pkgs/by-name/pg/pgf2/package.nix @@ -32,7 +32,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "Portable Graphic Format for TeX"; branch = lib.versions.major version; license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; }) diff --git a/pkgs/by-name/pg/pgf3/package.nix b/pkgs/by-name/pg/pgf3/package.nix index 19769574271b..53703cdb7200 100644 --- a/pkgs/by-name/pg/pgf3/package.nix +++ b/pkgs/by-name/pg/pgf3/package.nix @@ -32,7 +32,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "Portable Graphic Format for TeX - version ${finalAttrs.version}"; branch = lib.versions.major version; license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; }) diff --git a/pkgs/by-name/pg/pgfplots/package.nix b/pkgs/by-name/pg/pgfplots/package.nix index 5c6f8a81b99f..2b66bc08c9c2 100644 --- a/pkgs/by-name/pg/pgfplots/package.nix +++ b/pkgs/by-name/pg/pgfplots/package.nix @@ -28,7 +28,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://pgfplots.sourceforge.net"; description = "TeX package to draw plots directly in TeX in two and three dimensions"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; }) diff --git a/pkgs/by-name/pi/pipeworld/package.nix b/pkgs/by-name/pi/pipeworld/package.nix index 364367fb68fa..24d3fc661028 100644 --- a/pkgs/by-name/pi/pipeworld/package.nix +++ b/pkgs/by-name/pi/pipeworld/package.nix @@ -45,7 +45,7 @@ stdenvNoCC.mkDerivation (finalPackages: { terminal emulator. ''; license = with lib.licenses; [ bsd3 ]; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/pp/ppsspp/package.nix b/pkgs/by-name/pp/ppsspp/package.nix index d5272ce0bdd1..f965d598dd3d 100644 --- a/pkgs/by-name/pp/ppsspp/package.nix +++ b/pkgs/by-name/pp/ppsspp/package.nix @@ -172,7 +172,7 @@ stdenv.mkDerivation (finalAttrs: { not run those. ''; license = lib.licenses.gpl2Plus; - maintainers = [ lib.maintainers.AndersonTorres ]; + maintainers = [ ]; mainProgram = "ppsspp"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/pr/previewqt/package.nix b/pkgs/by-name/pr/previewqt/package.nix index 4014fa91050e..d2d9187a10a9 100644 --- a/pkgs/by-name/pr/previewqt/package.nix +++ b/pkgs/by-name/pr/previewqt/package.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://gitlab.com/lspies/previewqt/-/blob/v${finalAttrs.version}/CHANGELOG"; license = lib.licenses.gpl2Plus; mainProgram = "previewqt"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/pr/prio/package.nix b/pkgs/by-name/pr/prio/package.nix index bc41616e738f..c9948112cdd1 100644 --- a/pkgs/by-name/pr/prio/package.nix +++ b/pkgs/by-name/pr/prio/package.nix @@ -32,7 +32,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://github.com/letoram/prio"; description = "Plan9- Rio like Window Manager for Arcan"; license = with lib.licenses; [ bsd3 ]; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/pr/pru/package.nix b/pkgs/by-name/pr/pru/package.nix index f48fc2c32069..ff063fe8dc1a 100644 --- a/pkgs/by-name/pr/pru/package.nix +++ b/pkgs/by-name/pr/pru/package.nix @@ -18,7 +18,7 @@ bundlerApp { grep etc.). ''; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; }; passthru.updateScript = bundlerUpdateScript "pru"; diff --git a/pkgs/by-name/py/pyp/package.nix b/pkgs/by-name/py/pyp/package.nix index 19060a155247..7d0df04993d1 100644 --- a/pkgs/by-name/py/pyp/package.nix +++ b/pkgs/by-name/py/pyp/package.nix @@ -58,7 +58,6 @@ let mainProgram = "pyp"; maintainers = with lib.maintainers; [ rmcgibbo - AndersonTorres ]; }; }; diff --git a/pkgs/by-name/py/pyspread/package.nix b/pkgs/by-name/py/pyspread/package.nix index de0b06f85e08..44744abe8cf2 100644 --- a/pkgs/by-name/py/pyspread/package.nix +++ b/pkgs/by-name/py/pyspread/package.nix @@ -83,6 +83,6 @@ python3.pkgs.buildPythonApplication { ''; license = with lib.licenses; [ gpl3Plus ]; mainProgram = "pyspread"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/by-name/qm/qmplay2/package.nix b/pkgs/by-name/qm/qmplay2/package.nix index b1c87c6993f6..8de3a25b0c95 100644 --- a/pkgs/by-name/qm/qmplay2/package.nix +++ b/pkgs/by-name/qm/qmplay2/package.nix @@ -108,7 +108,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.lgpl3Plus; mainProgram = "qmplay2"; maintainers = with lib.maintainers; [ - AndersonTorres kashw2 ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/qn/qnial/package.nix b/pkgs/by-name/qn/qnial/package.nix index afba39d315f6..8a89062a18c2 100644 --- a/pkgs/by-name/qn/qnial/package.nix +++ b/pkgs/by-name/qn/qnial/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://bitbucket.com/museoa/qnial"; license = lib.licenses.artistic1; mainProgram = "nial"; - maintainers = [ lib.maintainers.AndersonTorres ]; + maintainers = [ ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/qr/qrcodegen/package.nix b/pkgs/by-name/qr/qrcodegen/package.nix index 118d1db277ae..c513d7f5088e 100644 --- a/pkgs/by-name/qr/qrcodegen/package.nix +++ b/pkgs/by-name/qr/qrcodegen/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.nayuki.io/page/qr-code-generator-library"; description = "High-quality QR Code generator library in many languages"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/qu/quickjs-ng/package.nix b/pkgs/by-name/qu/quickjs-ng/package.nix index 92c0aaa57b52..7d28da1262d0 100644 --- a/pkgs/by-name/qu/quickjs-ng/package.nix +++ b/pkgs/by-name/qu/quickjs-ng/package.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Mighty JavaScript engine"; license = lib.licenses.mit; mainProgram = "qjs"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/qu/quickjs/package.nix b/pkgs/by-name/qu/quickjs/package.nix index 8eba3c47e002..c589035588e8 100644 --- a/pkgs/by-name/qu/quickjs/package.nix +++ b/pkgs/by-name/qu/quickjs/package.nix @@ -122,7 +122,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ stesie - AndersonTorres ]; mainProgram = "qjs"; platforms = lib.platforms.all; diff --git a/pkgs/by-name/ra/ratpoison/package.nix b/pkgs/by-name/ra/ratpoison/package.nix index cb53917d7165..3ce693368117 100644 --- a/pkgs/by-name/ra/ratpoison/package.nix +++ b/pkgs/by-name/ra/ratpoison/package.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.gpl2Plus; mainProgram = "ratpoison"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; inherit (libX11.meta) platforms; }; }) diff --git a/pkgs/by-name/rc/rcm/package.nix b/pkgs/by-name/rc/rcm/package.nix index d8c923fbfcfd..eccbec7bbf88 100644 --- a/pkgs/by-name/rc/rcm/package.nix +++ b/pkgs/by-name/rc/rcm/package.nix @@ -27,7 +27,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = with maintainers; [ malyn - AndersonTorres ]; platforms = with platforms; unix; }; diff --git a/pkgs/by-name/re/recutils/package.nix b/pkgs/by-name/re/recutils/package.nix index 47760d402025..1487047257a5 100644 --- a/pkgs/by-name/re/recutils/package.nix +++ b/pkgs/by-name/re/recutils/package.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { records, each record containing an arbitrary number of named fields. ''; license = licenses.gpl3Plus; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/pkgs/by-name/re/renderdoc/package.nix b/pkgs/by-name/re/renderdoc/package.nix index 18fe501df5cc..c2cbc5db66ad 100644 --- a/pkgs/by-name/re/renderdoc/package.nix +++ b/pkgs/by-name/re/renderdoc/package.nix @@ -137,7 +137,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.mit; mainProgram = "renderdoccmd"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.intersectLists lib.platforms.linux (lib.platforms.x86_64 ++ lib.platforms.i686); }; }) diff --git a/pkgs/by-name/re/rep-gtk/package.nix b/pkgs/by-name/re/rep-gtk/package.nix index a4aac2e74b8f..1d619b62c3fd 100644 --- a/pkgs/by-name/re/rep-gtk/package.nix +++ b/pkgs/by-name/re/rep-gtk/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://sawfish.tuxfamily.org"; description = "GTK bindings for librep"; license = lib.licenses.gpl2Plus; - maintainers = [ lib.maintainers.AndersonTorres ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/ro/robotfindskitten/package.nix b/pkgs/by-name/ro/robotfindskitten/package.nix index 327b0aca626b..d1a5520c2d50 100644 --- a/pkgs/by-name/ro/robotfindskitten/package.nix +++ b/pkgs/by-name/ro/robotfindskitten/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://robotfindskitten.org/"; license = lib.licenses.gpl2Plus; mainProgram = "robotfindskitten"; - maintainers = [ lib.maintainers.AndersonTorres ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/ro/rockbox-utility/package.nix b/pkgs/by-name/ro/rockbox-utility/package.nix index 83ee50fbed9c..ad97468206b5 100644 --- a/pkgs/by-name/ro/rockbox-utility/package.nix +++ b/pkgs/by-name/ro/rockbox-utility/package.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { homepage = "https://www.rockbox.org"; description = "Open source firmware for digital music players"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; mainProgram = "RockboxUtility"; platforms = platforms.linux; }; diff --git a/pkgs/by-name/ro/rootbar/package.nix b/pkgs/by-name/ro/rootbar/package.nix index b4f5446672cc..320c9b6db1a8 100644 --- a/pkgs/by-name/ro/rootbar/package.nix +++ b/pkgs/by-name/ro/rootbar/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { was designed to address the lack of good bars for wayland. ''; license = licenses.gpl3Plus; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; broken = stdenv.hostPlatform.isDarwin; }; diff --git a/pkgs/by-name/ro/roxterm/package.nix b/pkgs/by-name/ro/roxterm/package.nix index 355d98b1f3fb..4ba97ffc5a7d 100644 --- a/pkgs/by-name/ro/roxterm/package.nix +++ b/pkgs/by-name/ro/roxterm/package.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: { lgpl3Plus ]; mainProgram = "roxterm"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/rp/rpcemu/package.nix b/pkgs/by-name/rp/rpcemu/package.nix index 648da19c8cef..a625deabb4b2 100644 --- a/pkgs/by-name/rp/rpcemu/package.nix +++ b/pkgs/by-name/rp/rpcemu/package.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.gpl2Plus; maintainers = builtins.attrValues { - inherit (lib.maintainers) AndersonTorres; + inherit (lib.maintainers) ; }; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/rs/rs/package.nix b/pkgs/by-name/rs/rs/package.nix index a6e58905a25f..aaa8a9906121 100644 --- a/pkgs/by-name/rs/rs/package.nix +++ b/pkgs/by-name/rs/rs/package.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { the rows and columns. ''; license = licenses.bsd3; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/rs/rst2html5/package.nix b/pkgs/by-name/rs/rst2html5/package.nix index 988484237490..ac18b38ca5e5 100644 --- a/pkgs/by-name/rs/rst2html5/package.nix +++ b/pkgs/by-name/rs/rst2html5/package.nix @@ -32,7 +32,7 @@ python3.pkgs.buildPythonPackage rec { description = "Converts ReSTructuredText to (X)HTML5"; homepage = "https://rst2html5.readthedocs.io/"; license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; mainProgram = "rst2html5"; }; } diff --git a/pkgs/by-name/rx/rxvt/package.nix b/pkgs/by-name/rx/rxvt/package.nix index 9c0dd2d69c23..040861b42253 100644 --- a/pkgs/by-name/rx/rxvt/package.nix +++ b/pkgs/by-name/rx/rxvt/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { omitting some of its little-used features, like Tektronix 4014 emulation and toolkit-style configurability. ''; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; license = licenses.gpl2; platforms = platforms.linux; knownVulnerabilities = [ diff --git a/pkgs/by-name/sa/sawfish/package.nix b/pkgs/by-name/sa/sawfish/package.nix index 8a0ac60f5541..188221601e9c 100644 --- a/pkgs/by-name/sa/sawfish/package.nix +++ b/pkgs/by-name/sa/sawfish/package.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: { extensibility or redefinition. ''; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/sc/scdoc/package.nix b/pkgs/by-name/sc/scdoc/package.nix index c9a7305b3bcd..c22e194d6390 100644 --- a/pkgs/by-name/sc/scdoc/package.nix +++ b/pkgs/by-name/sc/scdoc/package.nix @@ -45,7 +45,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "scdoc"; maintainers = with lib.maintainers; [ primeos - AndersonTorres ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/sc/scimark/package.nix b/pkgs/by-name/sc/scimark/package.nix index ac6e7ab458d8..775c276b0f19 100644 --- a/pkgs/by-name/sc/scimark/package.nix +++ b/pkgs/by-name/sc/scimark/package.nix @@ -34,8 +34,7 @@ stdenv.mkDerivation (finalAttrs: { downloadPage = "https://math.nist.gov/scimark2/download_c.html"; license = lib.licenses.publicDomain; mainProgram = "scimark4"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; }; }) -# TODO [ AndersonTorres ]: Java version diff --git a/pkgs/by-name/se/setconf/package.nix b/pkgs/by-name/se/setconf/package.nix index fb6aeefd84ae..395fac431b86 100644 --- a/pkgs/by-name/se/setconf/package.nix +++ b/pkgs/by-name/se/setconf/package.nix @@ -25,7 +25,7 @@ let description = "Small utility for changing settings in configuration textfiles"; changelog = "https://github.com/xyproto/setconf/releases/tag/${self.src.rev}"; mainProgram = "setconf"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; }; }; in diff --git a/pkgs/by-name/sh/shfm/package.nix b/pkgs/by-name/sh/shfm/package.nix index 0bd635d4b84a..fb8d84ddaa93 100644 --- a/pkgs/by-name/sh/shfm/package.nix +++ b/pkgs/by-name/sh/shfm/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/dylanaraps/shfm"; description = "POSIX-shell based file manager"; license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; mainProgram = "shfm"; }; diff --git a/pkgs/by-name/si/simh/package.nix b/pkgs/by-name/si/simh/package.nix index 7b0b349cd254..28d03352d3d6 100644 --- a/pkgs/by-name/si/simh/package.nix +++ b/pkgs/by-name/si/simh/package.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { available copies of significant or representative software. ''; license = with licenses; mit; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = with platforms; unix; }; } diff --git a/pkgs/by-name/si/simpleini/package.nix b/pkgs/by-name/si/simpleini/package.nix index 8982c1f53a8d..67141e1a03f3 100644 --- a/pkgs/by-name/si/simpleini/package.nix +++ b/pkgs/by-name/si/simpleini/package.nix @@ -46,7 +46,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ HeitorAugustoLN - AndersonTorres ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/sk/skribilo/package.nix b/pkgs/by-name/sk/skribilo/package.nix index 51544741ad15..2fe0eb835f7a 100644 --- a/pkgs/by-name/sk/skribilo/package.nix +++ b/pkgs/by-name/sk/skribilo/package.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { conventions used in emails, Usenet and text. ''; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/sl/slang/package.nix b/pkgs/by-name/sl/slang/package.nix index 425a5e9a4d8e..aa21473271cf 100644 --- a/pkgs/by-name/sl/slang/package.nix +++ b/pkgs/by-name/sl/slang/package.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://www.jedsoft.org/slang/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; mainProgram = "slsh"; platforms = platforms.unix; }; diff --git a/pkgs/by-name/sm/smallwm/package.nix b/pkgs/by-name/sm/smallwm/package.nix index 2df4596dd7a5..e7cddd10e851 100644 --- a/pkgs/by-name/sm/smallwm/package.nix +++ b/pkgs/by-name/sm/smallwm/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/adamnew123456/SmallWM"; license = lib.licenses.bsd2; mainProgram = "smallwm"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; inherit (libX11.meta) platforms; }; }) diff --git a/pkgs/by-name/sm/smplayer/package.nix b/pkgs/by-name/sm/smplayer/package.nix index 806e504773a3..2a7573a22315 100644 --- a/pkgs/by-name/sm/smplayer/package.nix +++ b/pkgs/by-name/sm/smplayer/package.nix @@ -53,8 +53,8 @@ stdenv.mkDerivation (finalAttrs: { ''; changelog = "https://github.com/smplayer-dev/smplayer/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; }) -# TODO [ AndersonTorres ]: create a wrapper including mplayer/mpv +# TODO [ ]: create a wrapper including mplayer/mpv diff --git a/pkgs/by-name/sn/snes9x/package.nix b/pkgs/by-name/sn/snes9x/package.nix index 3c027f6068e9..970f4a48ee26 100644 --- a/pkgs/by-name/sn/snes9x/package.nix +++ b/pkgs/by-name/sn/snes9x/package.nix @@ -135,7 +135,6 @@ stdenv.mkDerivation (finalAttrs: { }; mainProgram = "snes9x"; maintainers = with lib.maintainers; [ - AndersonTorres qknight thiagokokada sugar700 diff --git a/pkgs/by-name/sn/sng/package.nix b/pkgs/by-name/sn/sng/package.nix index 544a07165d2d..900941ded31d 100644 --- a/pkgs/by-name/sn/sng/package.nix +++ b/pkgs/by-name/sn/sng/package.nix @@ -40,7 +40,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "sng"; maintainers = with lib.maintainers; [ dezgeg - AndersonTorres ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/so/sound-of-sorting/package.nix b/pkgs/by-name/so/sound-of-sorting/package.nix index 735416282a9d..32306937038c 100644 --- a/pkgs/by-name/so/sound-of-sorting/package.nix +++ b/pkgs/by-name/so/sound-of-sorting/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://panthema.net/2013/sound-of-sorting/"; license = lib.licenses.gpl3Plus; mainProgram = "sound-of-sorting"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; inherit (SDL2.meta) platforms; }; }) diff --git a/pkgs/by-name/sp/spigot/package.nix b/pkgs/by-name/sp/spigot/package.nix index fa873ab257b1..e338da58df46 100644 --- a/pkgs/by-name/sp/spigot/package.nix +++ b/pkgs/by-name/sp/spigot/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Command-line exact real calculator"; mainProgram = "spigot"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/sr/src/package.nix b/pkgs/by-name/sr/src/package.nix index d9e089e4ad20..dab956561727 100644 --- a/pkgs/by-name/sr/src/package.nix +++ b/pkgs/by-name/sr/src/package.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://gitlab.com/esr/src/-/raw/${finalAttrs.version}/NEWS.adoc"; license = licenses.bsd2; mainProgram = "src"; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; inherit (python3.meta) platforms; }; }) diff --git a/pkgs/by-name/ss/ssh-askpass-fullscreen/package.nix b/pkgs/by-name/ss/ssh-askpass-fullscreen/package.nix index cb5a89135535..453606e74b76 100644 --- a/pkgs/by-name/ss/ssh-askpass-fullscreen/package.nix +++ b/pkgs/by-name/ss/ssh-askpass-fullscreen/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Small, fullscreen SSH askpass GUI using GTK+2"; license = with lib.licenses; [ gpl2Plus ]; mainProgram = "ssh-askpass-fullscreen"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/st/stacktile/package.nix b/pkgs/by-name/st/stacktile/package.nix index 87579d3caba1..babcab8344bb 100644 --- a/pkgs/by-name/st/stacktile/package.nix +++ b/pkgs/by-name/st/stacktile/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Layout generator for the river Wayland compositor"; license = with lib.licenses; [ gpl3Plus ]; mainProgram = "stacktile"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/st/steghide/package.nix b/pkgs/by-name/st/steghide/package.nix index 86cb3cfb4bb7..b230015d241e 100644 --- a/pkgs/by-name/st/steghide/package.nix +++ b/pkgs/by-name/st/steghide/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/museoa/steghide"; description = "Open source steganography program"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = with platforms; unix; mainProgram = "steghide"; }; diff --git a/pkgs/by-name/st/stella/package.nix b/pkgs/by-name/st/stella/package.nix index ae06a5984f63..9e0a77bef1eb 100644 --- a/pkgs/by-name/st/stella/package.nix +++ b/pkgs/by-name/st/stella/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/stella-emu/stella/releases/tag/${finalAttrs.src.rev}"; license = with lib.licenses; [ gpl2Plus ]; mainProgram = "stella"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/ta/tap-plugins/package.nix b/pkgs/by-name/ta/tap-plugins/package.nix index aeb56d3375b5..8748df20539d 100644 --- a/pkgs/by-name/ta/tap-plugins/package.nix +++ b/pkgs/by-name/ta/tap-plugins/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { TubeWarmth, TAP Vibrato. ''; license = lib.licenses.gpl3Plus; - maintainers = [ lib.maintainers.AndersonTorres ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/te/teapot/package.nix b/pkgs/by-name/te/teapot/package.nix index 8662720a189e..34c24962354d 100644 --- a/pkgs/by-name/te/teapot/package.nix +++ b/pkgs/by-name/te/teapot/package.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { systems. ''; license = licenses.gpl3Plus; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; mainProgram = "teapot"; }; diff --git a/pkgs/by-name/te/tecla/package.nix b/pkgs/by-name/te/tecla/package.nix index c5e666681a4e..493133a2122c 100644 --- a/pkgs/by-name/te/tecla/package.nix +++ b/pkgs/by-name/te/tecla/package.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://sites.astro.caltech.edu/~mcs/tecla/release.html"; license = with lib.licenses; [ mit ]; mainProgram = "enhance"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/th/the-legend-of-edgar/package.nix b/pkgs/by-name/th/the-legend-of-edgar/package.nix index d01766fcf98c..8504e66e4eb7 100644 --- a/pkgs/by-name/th/the-legend-of-edgar/package.nix +++ b/pkgs/by-name/th/the-legend-of-edgar/package.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.gpl1Plus; mainProgram = "edgar"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; }; diff --git a/pkgs/by-name/ti/tilda/package.nix b/pkgs/by-name/ti/tilda/package.nix index b2b503b9eb5a..ac9ad26a3a83 100644 --- a/pkgs/by-name/ti/tilda/package.nix +++ b/pkgs/by-name/ti/tilda/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Gtk based drop down terminal for Linux and Unix"; mainProgram = "tilda"; license = lib.licenses.gpl3Plus; - maintainers = [ lib.maintainers.AndersonTorres ]; + maintainers = [ ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/ti/tiny8086/package.nix b/pkgs/by-name/ti/tiny8086/package.nix index 94b55902c72d..59241d28e736 100644 --- a/pkgs/by-name/ti/tiny8086/package.nix +++ b/pkgs/by-name/ti/tiny8086/package.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { "unobfuscated" version :) ''; license = licenses.mit; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ ]; platforms = platforms.linux; mainProgram = "8086tiny"; }; diff --git a/pkgs/by-name/ti/tinyemu/package.nix b/pkgs/by-name/ti/tinyemu/package.nix index 71a62a2852f8..e7dfc7cd5838 100644 --- a/pkgs/by-name/ti/tinyemu/package.nix +++ b/pkgs/by-name/ti/tinyemu/package.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { mit bsd2 ]; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; }; diff --git a/pkgs/by-name/ti/tinywm/package.nix b/pkgs/by-name/ti/tinywm/package.nix index 6955dd2c2fc0..7acad743f61c 100644 --- a/pkgs/by-name/ti/tinywm/package.nix +++ b/pkgs/by-name/ti/tinywm/package.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.publicDomain; mainProgram = "tinywm"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; inherit (libX11.meta) platforms; }; }) diff --git a/pkgs/by-name/ti/tinyxml-2/package.nix b/pkgs/by-name/ti/tinyxml-2/package.nix index b601e57a17eb..df45e1e60fe8 100644 --- a/pkgs/by-name/ti/tinyxml-2/package.nix +++ b/pkgs/by-name/ti/tinyxml-2/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/leethomason/tinyxml2"; changelog = "https://github.com/leethomason/tinyxml2/releases/tag/${finalAttrs.src.rev}"; license = with lib.licenses; [ zlib ]; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/to/tomato-c/package.nix b/pkgs/by-name/to/tomato-c/package.nix index 613dcfec4b51..1bcab02e9dbd 100644 --- a/pkgs/by-name/to/tomato-c/package.nix +++ b/pkgs/by-name/to/tomato-c/package.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/gabrielzschmitz/Tomato.C"; description = " A pomodoro timer written in pure C"; license = with lib.licenses; [ gpl3Plus ]; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "tomato"; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/to/tomlcpp/package.nix b/pkgs/by-name/to/tomlcpp/package.nix index b98b9c6198e8..508a39429b71 100644 --- a/pkgs/by-name/to/tomlcpp/package.nix +++ b/pkgs/by-name/to/tomlcpp/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/cktan/tomlcpp"; description = "No fanfare TOML C++ Library"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = with lib.platforms; unix; }; } diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix index e8a4c1e51c4a..7fa13c081d06 100644 --- a/pkgs/by-name/tr/trealla/package.nix +++ b/pkgs/by-name/tr/trealla/package.nix @@ -96,7 +96,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ siraben - AndersonTorres ]; mainProgram = "tpl"; platforms = lib.platforms.all; diff --git a/pkgs/by-name/tr/triehash/package.nix b/pkgs/by-name/tr/triehash/package.nix index 47b1d72d672c..007a8040a707 100644 --- a/pkgs/by-name/tr/triehash/package.nix +++ b/pkgs/by-name/tr/triehash/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/julian-klode/triehash"; description = "Order-preserving minimal perfect hash function generator"; license = with licenses; mit; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = perlPackages.perl.meta.platforms; mainProgram = "triehash"; }; diff --git a/pkgs/by-name/tt/tty-solitaire/package.nix b/pkgs/by-name/tt/tty-solitaire/package.nix index 2116103fc096..e6422c153bcb 100644 --- a/pkgs/by-name/tt/tty-solitaire/package.nix +++ b/pkgs/by-name/tt/tty-solitaire/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { license = licenses.mit; homepage = "https://github.com/mpereira/tty-solitaire"; platforms = ncurses.meta.platforms; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ ]; mainProgram = "ttysolitaire"; }; } diff --git a/pkgs/by-name/tw/twolame/package.nix b/pkgs/by-name/tw/twolame/package.nix index 7d7aef89fa83..70825fe7b9a4 100644 --- a/pkgs/by-name/tw/twolame/package.nix +++ b/pkgs/by-name/tw/twolame/package.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation { homepage = "https://www.twolame.org/"; license = with licenses; [ lgpl2Plus ]; platforms = with platforms; unix; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/by-name/tx/txr/package.nix b/pkgs/by-name/tx/txr/package.nix index 9944600d6164..3ddd48886c21 100644 --- a/pkgs/by-name/tx/txr/package.nix +++ b/pkgs/by-name/tx/txr/package.nix @@ -71,7 +71,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://www.kylheku.com/cgit/txr/tree/RELNOTES?h=txr-${finalAttrs.version}"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ - AndersonTorres dtzWill ]; platforms = lib.platforms.all; diff --git a/pkgs/by-name/uc/ucg/package.nix b/pkgs/by-name/uc/ucg/package.nix index 0b8487c312aa..2cf88cebfab6 100644 --- a/pkgs/by-name/uc/ucg/package.nix +++ b/pkgs/by-name/uc/ucg/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.gpl3Plus; mainProgram = "ucg"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isDarwin; }; diff --git a/pkgs/by-name/uc/uclibc-ng/package.nix b/pkgs/by-name/uc/uclibc-ng/package.nix index 55d01fa23a21..e249b33706e0 100644 --- a/pkgs/by-name/uc/uclibc-ng/package.nix +++ b/pkgs/by-name/uc/uclibc-ng/package.nix @@ -148,7 +148,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.lgpl2Plus; maintainers = with lib.maintainers; [ rasendubi - AndersonTorres ]; platforms = lib.platforms.linux; badPlatforms = lib.platforms.aarch64; diff --git a/pkgs/by-name/un/units/package.nix b/pkgs/by-name/un/units/package.nix index 52a004dc888d..e672c87df5fe 100644 --- a/pkgs/by-name/un/units/package.nix +++ b/pkgs/by-name/un/units/package.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = with lib.licenses; [ gpl3Plus ]; mainProgram = "units"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/un/universal-ctags/package.nix b/pkgs/by-name/un/universal-ctags/package.nix index abc808c3ba45..f4a971c55a1e 100644 --- a/pkgs/by-name/un/universal-ctags/package.nix +++ b/pkgs/by-name/un/universal-ctags/package.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: { editors and other tools to locate the indexed items. ''; license = licenses.gpl2Plus; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ ]; platforms = platforms.all; mainProgram = "ctags"; priority = 1; # over the emacs implementation diff --git a/pkgs/by-name/un/unzoo/package.nix b/pkgs/by-name/un/unzoo/package.nix index 0b2fb186b629..8d5671c49c90 100644 --- a/pkgs/by-name/un/unzoo/package.nix +++ b/pkgs/by-name/un/unzoo/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/museoa/unzoo/"; description = "Manipulate archives of files in Zoo compressed form"; license = licenses.publicDomain; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; mainProgram = "unzoo"; }; diff --git a/pkgs/by-name/ur/urjtag/package.nix b/pkgs/by-name/ur/urjtag/package.nix index 31ab00296539..f36d09e20296 100644 --- a/pkgs/by-name/ur/urjtag/package.nix +++ b/pkgs/by-name/ur/urjtag/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { gpl2Plus lgpl21Plus ]; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/ux/uxn/package.nix b/pkgs/by-name/ux/uxn/package.nix index c501306b1a02..93b735f8918d 100644 --- a/pkgs/by-name/ux/uxn/package.nix +++ b/pkgs/by-name/ux/uxn/package.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://wiki.xxiivv.com/site/uxn.html"; description = "Assembler and emulator for the Uxn stack machine"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "uxnemu"; inherit (SDL2.meta) platforms; broken = stdenv.hostPlatform.isDarwin; diff --git a/pkgs/by-name/ve/ventoy/package.nix b/pkgs/by-name/ve/ventoy/package.nix index 97edd77d3a89..5d7fdc46d330 100644 --- a/pkgs/by-name/ve/ventoy/package.nix +++ b/pkgs/by-name/ve/ventoy/package.nix @@ -211,7 +211,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://www.ventoy.net/doc_news.html"; license = lib.licenses.gpl3Plus; mainProgram = "ventoy"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = [ "x86_64-linux" "i686-linux" diff --git a/pkgs/by-name/vi/viw/package.nix b/pkgs/by-name/vi/viw/package.nix index 63cbc2615b6b..d54ef45bb667 100644 --- a/pkgs/by-name/vi/viw/package.nix +++ b/pkgs/by-name/vi/viw/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "VI Worsened, a fun and light clone of VI"; homepage = "https://github.com/lpan/viw"; license = licenses.gpl3Only; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; mainProgram = "viw"; }; } diff --git a/pkgs/by-name/vm/vms-empire/package.nix b/pkgs/by-name/vm/vms-empire/package.nix index d0d8bc5e47e7..b598b5a2f9aa 100644 --- a/pkgs/by-name/vm/vms-empire/package.nix +++ b/pkgs/by-name/vm/vms-empire/package.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.gpl2Only; mainProgram = "vms-empire"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/vn/vnote/package.nix b/pkgs/by-name/vn/vnote/package.nix index 7b96dc26e94f..48d675880deb 100644 --- a/pkgs/by-name/vn/vnote/package.nix +++ b/pkgs/by-name/vn/vnote/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "vnote"; changelog = "https://github.com/vnotex/vnote/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.lgpl3Plus; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/vp/vp/package.nix b/pkgs/by-name/vp/vp/package.nix index de8a7334dc2a..768285c4afed 100644 --- a/pkgs/by-name/vp/vp/package.nix +++ b/pkgs/by-name/vp/vp/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { description = "SDL based picture viewer/slideshow"; license = lib.licenses.gpl3Plus; mainProgram = "vp"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; inherit (SDL.meta) platforms; hydraPlatforms = lib.platforms.linux; # build hangs on both Darwin platforms, needs investigation }; diff --git a/pkgs/by-name/vy/vym/package.nix b/pkgs/by-name/vy/vym/package.nix index b0cc88f17a30..1b54b1452029 100644 --- a/pkgs/by-name/vy/vym/package.nix +++ b/pkgs/by-name/vy/vym/package.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = with lib.licenses; [ gpl2Plus ]; mainProgram = "vym"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/wa/wallutils/package.nix b/pkgs/by-name/wa/wallutils/package.nix index 798bb8827736..5bfe3bee7fd7 100644 --- a/pkgs/by-name/wa/wallutils/package.nix +++ b/pkgs/by-name/wa/wallutils/package.nix @@ -70,7 +70,7 @@ buildGoModule rec { description = "Utilities for handling monitors, resolutions, and (timed) wallpapers"; inherit (src.meta) homepage; license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.AndersonTorres ]; + maintainers = [ ]; inherit (wayland.meta) platforms; badPlatforms = lib.platforms.darwin; }; diff --git a/pkgs/by-name/wa/waybox/package.nix b/pkgs/by-name/wa/waybox/package.nix index 0bae81241e33..d31d642a33ea 100644 --- a/pkgs/by-name/wa/waybox/package.nix +++ b/pkgs/by-name/wa/waybox/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Openbox clone on Wayland"; license = lib.licenses.mit; mainProgram = "waybox"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; inherit (wayland.meta) platforms; }; }) diff --git a/pkgs/by-name/wi/wifish/package.nix b/pkgs/by-name/wi/wifish/package.nix index cc2b979c342a..4477e565f5ab 100644 --- a/pkgs/by-name/wi/wifish/package.nix +++ b/pkgs/by-name/wi/wifish/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { description = "Simple wifi shell script for linux"; mainProgram = "wifish"; license = licenses.wtfpl; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = with platforms; linux; }; } diff --git a/pkgs/by-name/wi/windowmaker/package.nix b/pkgs/by-name/wi/windowmaker/package.nix index 57490959f0f7..3d65bf94c43c 100644 --- a/pkgs/by-name/wi/windowmaker/package.nix +++ b/pkgs/by-name/wi/windowmaker/package.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://www.windowmaker.org/news/"; license = lib.licenses.gpl2Plus; mainProgram = "wmaker"; - maintainers = [ lib.maintainers.AndersonTorres ]; + maintainers = [ ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/wi/wio/package.nix b/pkgs/by-name/wi/wio/package.nix index ff6800243c40..ea8ce6fcf379 100644 --- a/pkgs/by-name/wi/wio/package.nix +++ b/pkgs/by-name/wi/wio/package.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = with lib.licenses; [ bsd3 ]; mainProgram = "wio"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; inherit (wayland.meta) platforms; }; }) diff --git a/pkgs/by-name/wi/with-shell/package.nix b/pkgs/by-name/wi/with-shell/package.nix index e8b5fc506416..31d40475b2f3 100644 --- a/pkgs/by-name/wi/with-shell/package.nix +++ b/pkgs/by-name/wi/with-shell/package.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { To exit use either :q or :exit. ''; license = licenses.asl20; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; mainProgram = "with"; }; diff --git a/pkgs/by-name/wl/wlay/package.nix b/pkgs/by-name/wl/wlay/package.nix index f1bf8dedc1c1..44d20fccb996 100644 --- a/pkgs/by-name/wl/wlay/package.nix +++ b/pkgs/by-name/wl/wlay/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation { homepage = "https://github.com/atx/wlay"; description = "Graphical output management for Wayland"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; inherit (wayland.meta) platforms; mainProgram = "wlay"; }; diff --git a/pkgs/by-name/wl/wlogout/package.nix b/pkgs/by-name/wl/wlogout/package.nix index 3eaf5022eb83..6a50af56cd81 100644 --- a/pkgs/by-name/wl/wlogout/package.nix +++ b/pkgs/by-name/wl/wlogout/package.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/ArtsyMacaw/wlogout/releases/tag/${finalAttrs.src.rev}"; license = with lib.licenses; [ mit ]; mainProgram = "wlogout"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; inherit (wayland.meta) platforms; }; }) diff --git a/pkgs/by-name/wo/worker/package.nix b/pkgs/by-name/wo/worker/package.nix index 9b05c1607701..fe1a7953b7b3 100644 --- a/pkgs/by-name/wo/worker/package.nix +++ b/pkgs/by-name/wo/worker/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = with lib.licenses; [ gpl2Plus ]; mainProgram = "worker"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; inherit (libX11.meta) platforms; }; }) diff --git a/pkgs/by-name/x1/x16/package.nix b/pkgs/by-name/x1/x16/package.nix index 457cc3a3b3b9..a5433fa475f6 100644 --- a/pkgs/by-name/x1/x16/package.nix +++ b/pkgs/by-name/x1/x16/package.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Official emulator of CommanderX16 8-bit computer"; changelog = "https://github.com/X16Community/x16-emulator/blob/r${finalAttrs.version}/RELEASES.md"; license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "x16emu"; inherit (SDL2.meta) platforms; broken = stdenv.hostPlatform.isAarch64; # ofborg fails to compile it diff --git a/pkgs/by-name/x1/x16/rom.nix b/pkgs/by-name/x1/x16/rom.nix index 6caefd021fc3..7102b3199687 100644 --- a/pkgs/by-name/x1/x16/rom.nix +++ b/pkgs/by-name/x1/x16/rom.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/X16Community/x16-rom"; description = "ROM file for CommanderX16 8-bit computer"; license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; inherit (cc65.meta) platforms; broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; diff --git a/pkgs/by-name/x1/x16/run.nix b/pkgs/by-name/x1/x16/run.nix index f88e5f181f27..db5d531fc2e3 100644 --- a/pkgs/by-name/x1/x16/run.nix +++ b/pkgs/by-name/x1/x16/run.nix @@ -32,9 +32,3 @@ symlinkJoin { runScript ]; } -# TODO [ AndersonTorres ]: - -# 1. Parse the command line in order to allow the user to set an optional -# rom-file -# 2. generate runScript based on symlinkJoin (maybe a postBuild?) -# 3. a NixOS module to abstract the runner diff --git a/pkgs/by-name/xa/xa/package.nix b/pkgs/by-name/xa/xa/package.nix index e79418d5e288..97ef84c90f6e 100644 --- a/pkgs/by-name/xa/xa/package.nix +++ b/pkgs/by-name/xa/xa/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { - block structure for label scoping ''; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = with lib.platforms; unix; }; }) diff --git a/pkgs/by-name/xa/xarcan/package.nix b/pkgs/by-name/xa/xarcan/package.nix index cbb284c8716c..bcd244f75960 100644 --- a/pkgs/by-name/xa/xarcan/package.nix +++ b/pkgs/by-name/xa/xarcan/package.nix @@ -121,7 +121,7 @@ stdenv.mkDerivation (finalPackages: { allows running an X session as a window under Arcan. ''; license = with lib.licenses; [ mit ]; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/xe/xemu/package.nix b/pkgs/by-name/xe/xemu/package.nix index 955ecbf94266..d11583b1b588 100644 --- a/pkgs/by-name/xe/xemu/package.nix +++ b/pkgs/by-name/xe/xemu/package.nix @@ -147,7 +147,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/xemu-project/xemu/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl2Plus; mainProgram = "xemu"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/xi/xine-lib/package.nix b/pkgs/by-name/xi/xine-lib/package.nix index f0e26e4fe020..13fdccfeed2a 100644 --- a/pkgs/by-name/xi/xine-lib/package.nix +++ b/pkgs/by-name/xi/xine-lib/package.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: { lgpl2Plus ]; # No useful mainProgram - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/xi/xine-ui/package.nix b/pkgs/by-name/xi/xine-ui/package.nix index ddbd29be94c1..97192466a75d 100644 --- a/pkgs/by-name/xi/xine-ui/package.nix +++ b/pkgs/by-name/xi/xine-ui/package.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Xlib-based frontend for Xine video player"; license = lib.licenses.gpl2Plus; mainProgram = "xine"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/xi/xiphos/package.nix b/pkgs/by-name/xi/xiphos/package.nix index 79d713ddb2fb..b990de90fee8 100644 --- a/pkgs/by-name/xi/xiphos/package.nix +++ b/pkgs/by-name/xi/xiphos/package.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.xiphos.org/"; license = licenses.gpl2Plus; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/xo/xosview/package.nix b/pkgs/by-name/xo/xosview/package.nix index 5969717355c4..4c165f639c51 100644 --- a/pkgs/by-name/xo/xosview/package.nix +++ b/pkgs/by-name/xo/xosview/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Classic system monitoring tool"; license = lib.licenses.gpl2Plus; mainProgram = "xosview"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = with lib.platforms; linux; }; }) diff --git a/pkgs/by-name/xo/xosview2/package.nix b/pkgs/by-name/xo/xosview2/package.nix index f8365c3563ec..ea7631a7ff27 100644 --- a/pkgs/by-name/xo/xosview2/package.nix +++ b/pkgs/by-name/xo/xosview2/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { bsdOriginal ]; mainProgram = "xosview2"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; inherit (libX11.meta) platforms; }; }) diff --git a/pkgs/by-name/xs/xscreensaver/package.nix b/pkgs/by-name/xs/xscreensaver/package.nix index 40c26029e8e7..1e30270b3e51 100644 --- a/pkgs/by-name/xs/xscreensaver/package.nix +++ b/pkgs/by-name/xs/xscreensaver/package.nix @@ -136,7 +136,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ raskin - AndersonTorres ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/ya/yabasic/package.nix b/pkgs/by-name/ya/yabasic/package.nix index 7f63a1c648a3..6068c3cd43d8 100644 --- a/pkgs/by-name/ya/yabasic/package.nix +++ b/pkgs/by-name/ya/yabasic/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { ''; changelog = "https://2484.de/yabasic/whatsnew.html"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/ya/yambar/package.nix b/pkgs/by-name/ya/yambar/package.nix index c87215b84b66..c331e20a8d64 100644 --- a/pkgs/by-name/ya/yambar/package.nix +++ b/pkgs/by-name/ya/yambar/package.nix @@ -123,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: { ''; changelog = "https://codeberg.org/dnkl/yambar/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; mainProgram = "yambar"; }; diff --git a/pkgs/by-name/ya/yapesdl/package.nix b/pkgs/by-name/ya/yapesdl/package.nix index 5a3bc20c1311..6accc8bc563f 100644 --- a/pkgs/by-name/ya/yapesdl/package.nix +++ b/pkgs/by-name/ya/yapesdl/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/calmopyrin/yapesdl/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.gpl2Plus; mainProgram = "yapesdl"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; }; diff --git a/pkgs/by-name/ye/yeahwm/package.nix b/pkgs/by-name/ye/yeahwm/package.nix index 15cb8e7f8529..bfa2b3267973 100644 --- a/pkgs/by-name/ye/yeahwm/package.nix +++ b/pkgs/by-name/ye/yeahwm/package.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "http://phrat.de/README"; license = lib.licenses.isc; mainProgram = "yeahwm"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; inherit (libX11.meta) platforms; }; }) diff --git a/pkgs/by-name/ye/yex-lang/package.nix b/pkgs/by-name/ye/yex-lang/package.nix index 55ef9f067219..7fed29ef4f03 100644 --- a/pkgs/by-name/ye/yex-lang/package.nix +++ b/pkgs/by-name/ye/yex-lang/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/nonamescm/yex-lang"; description = "Functional scripting language written in rust"; license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; mainProgram = "yex"; platforms = platforms.unix; }; diff --git a/pkgs/by-name/yt/ytree/package.nix b/pkgs/by-name/yt/ytree/package.nix index 6e8846302e58..491ac76e1bae 100644 --- a/pkgs/by-name/yt/ytree/package.nix +++ b/pkgs/by-name/yt/ytree/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Curses-based file manager similar to DOS Xtree(TM)"; license = with lib.licenses; [ gpl2Plus ]; mainProgram = "ytree"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/zc/zchunk/package.nix b/pkgs/by-name/zc/zchunk/package.nix index e0450116f5b9..6f1c049e29be 100644 --- a/pkgs/by-name/zc/zchunk/package.nix +++ b/pkgs/by-name/zc/zchunk/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.bsd2; mainProgram = "zck"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/ze/zegrapher/package.nix b/pkgs/by-name/ze/zegrapher/package.nix index d4794550eddf..fa39de2eb551 100644 --- a/pkgs/by-name/ze/zegrapher/package.nix +++ b/pkgs/by-name/ze/zegrapher/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.gpl3Plus; mainProgram = "ZeGrapher"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/ze/zesarux/package.nix b/pkgs/by-name/ze/zesarux/package.nix index a06d19251b40..13caa94a9378 100644 --- a/pkgs/by-name/ze/zesarux/package.nix +++ b/pkgs/by-name/ze/zesarux/package.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { description = "ZX Second-Emulator And Released for UniX"; mainProgram = "zesarux"; license = with lib.licenses; [ gpl3Plus ]; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/zo/zoekt/package.nix b/pkgs/by-name/zo/zoekt/package.nix index 07f63e4ba813..ac1808f7b8b8 100644 --- a/pkgs/by-name/zo/zoekt/package.nix +++ b/pkgs/by-name/zo/zoekt/package.nix @@ -39,7 +39,7 @@ buildGoModule { description = "Fast trigram based code search"; homepage = "https://github.com/sourcegraph/zoekt"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "zoekt"; }; } diff --git a/pkgs/by-name/zy/zydis/package.nix b/pkgs/by-name/zy/zydis/package.nix index 1642ce072cd4..2c8447953be0 100644 --- a/pkgs/by-name/zy/zydis/package.nix +++ b/pkgs/by-name/zy/zydis/package.nix @@ -41,7 +41,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ jbcrail - AndersonTorres athre0z ]; platforms = platforms.all; diff --git a/pkgs/by-name/zz/zziplib/package.nix b/pkgs/by-name/zz/zziplib/package.nix index 50f395031ca4..cad7517b9798 100644 --- a/pkgs/by-name/zz/zziplib/package.nix +++ b/pkgs/by-name/zz/zziplib/package.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { lgpl2Plus mpl11 ]; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index 44f0aee804d5..dcca5ffbc67e 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -65,7 +65,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ peterhoeg - AndersonTorres ]; mainProgram = "zeal"; inherit (qtbase.meta) platforms; diff --git a/pkgs/development/python-modules/py65/default.nix b/pkgs/development/python-modules/py65/default.nix index fe54602a33c4..a6dc3e89fbb8 100644 --- a/pkgs/development/python-modules/py65/default.nix +++ b/pkgs/development/python-modules/py65/default.nix @@ -35,7 +35,6 @@ buildPythonPackage rec { license = lib.licenses.bsd3; mainProgram = "py65mon"; maintainers = with lib.maintainers; [ - AndersonTorres tomasajt ]; }; diff --git a/pkgs/games/2048-cli/default.nix b/pkgs/games/2048-cli/default.nix index c3c1da7c93e7..78710ceb53b7 100644 --- a/pkgs/games/2048-cli/default.nix +++ b/pkgs/games/2048-cli/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/tiehuis/2048-cli"; description = "Game 2048 for your Linux terminal"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.AndersonTorres ]; + maintainers = [ ]; platforms = lib.platforms.unix; mainProgram = "2048"; }; From 0aed334603b6fcd9135f6444ee0bb5c5ec4bcc40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 11 Feb 2025 19:39:23 -0800 Subject: [PATCH 1336/2168] python313Packages.h5netcdf: 1.4.1 -> 1.5.0 Changelog: https://github.com/h5netcdf/h5netcdf/releases/tag/v1.5.0 --- .../python-modules/h5netcdf/default.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/h5netcdf/default.nix b/pkgs/development/python-modules/h5netcdf/default.nix index 30693abfd054..722f5b17a8f8 100644 --- a/pkgs/development/python-modules/h5netcdf/default.nix +++ b/pkgs/development/python-modules/h5netcdf/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, h5py, pytestCheckHook, netcdf4, @@ -12,22 +12,22 @@ buildPythonPackage rec { pname = "h5netcdf"; - version = "1.4.1"; - format = "pyproject"; + version = "1.5.0"; + pyproject = true; - disabled = pythonOlder "3.9"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-fIQBq4B/83yXmO3JDZlGdZWJLmxUGl1avrj1OqtTNf4="; + src = fetchFromGitHub { + owner = "h5netcdf"; + repo = "h5netcdf"; + tag = "v${version}"; + hash = "sha256-fhLL8/XgYQmdHckh5xhYvnlc+MTIc2wcTOZaohFFGlk="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ h5py ]; + dependencies = [ h5py ]; nativeCheckInputs = [ pytestCheckHook @@ -39,9 +39,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "h5netcdf" ]; meta = with lib; { - description = "netCDF4 via h5py"; + description = "Pythonic interface to netCDF4 via h5py"; homepage = "https://github.com/shoyer/h5netcdf"; - changelog = "https://github.com/h5netcdf/h5netcdf/releases/tag/v${version}"; + changelog = "https://github.com/h5netcdf/h5netcdf/releases/tag/${src.tag}"; license = licenses.bsd3; maintainers = [ ]; }; From 00c013d89d61a92572656ace36f4dbce55303381 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 04:14:05 +0000 Subject: [PATCH 1337/2168] regclient: 0.8.0 -> 0.8.1 --- pkgs/by-name/re/regclient/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/regclient/package.nix b/pkgs/by-name/re/regclient/package.nix index a3efc83b06ce..91a0c580d2b3 100644 --- a/pkgs/by-name/re/regclient/package.nix +++ b/pkgs/by-name/re/regclient/package.nix @@ -18,16 +18,16 @@ in buildGoModule rec { pname = "regclient"; - version = "0.8.0"; + version = "0.8.1"; tag = "v${version}"; src = fetchFromGitHub { owner = "regclient"; repo = "regclient"; rev = tag; - sha256 = "sha256-vMMRzCI40d33xodOMp+i1SDl1DakuIFk341+/6blKHk="; + sha256 = "sha256-a0UF0CRGxXRce9e/tJBEL3oC/ZrRxyzEBCaCx8u615c="; }; - vendorHash = "sha256-yEAzv91EGt+//GWQZM7/w2bI6LztEcIxwKviamhMqwo="; + vendorHash = "sha256-SWkrPpjAA32XkToh7ujSPaRNvHtf2ymvx5E7iGD5B8k="; outputs = [ "out" ] ++ bins; From ec32f93eb220a5ddc34bdc04dbe6d5b9fdf07dc0 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 11 Feb 2025 22:20:48 +0100 Subject: [PATCH 1338/2168] workflows/eval-lib-tests: Run on maintainer changes The lib tests also check maintainers, not doing so can cause problems: https://github.com/NixOS/nixpkgs/pull/379894 --- .github/workflows/eval-lib-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/eval-lib-tests.yml b/.github/workflows/eval-lib-tests.yml index 065fe8fdb282..f0f5fbf376c2 100644 --- a/.github/workflows/eval-lib-tests.yml +++ b/.github/workflows/eval-lib-tests.yml @@ -4,6 +4,7 @@ on: pull_request_target: paths: - 'lib/**' + - 'maintainers/**' permissions: {} From 3c55b943fcc175bc925a317c854f0b8c0f443b60 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 04:18:36 +0000 Subject: [PATCH 1339/2168] rancher: 2.10.0 -> 2.10.1 --- pkgs/by-name/ra/rancher/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ra/rancher/package.nix b/pkgs/by-name/ra/rancher/package.nix index 0f95095f780f..f76a46fc5933 100644 --- a/pkgs/by-name/ra/rancher/package.nix +++ b/pkgs/by-name/ra/rancher/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "rancher"; - version = "2.10.0"; + version = "2.10.1"; src = fetchFromGitHub { owner = "rancher"; repo = "cli"; rev = "v${version}"; - hash = "sha256-O+qxWs+3Sbv9l3uC/dYP+Zkn8LeuYBJnyofjgb7Y+cI="; + hash = "sha256-7lsv974XjD8tBt19FrLkKieec0jQ/0wf8ETLSNdQsH0="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { "-static" ]; - vendorHash = "sha256-GS9qkhdU9mNm0+o6ziDlKc6TRfXgUfSknUi/G6mojrI="; + vendorHash = "sha256-t7Gjm9EKpYwSe2ORcFyolsAcyN8Xndtw03zBqFNeePg="; postInstall = '' mv $out/bin/cli $out/bin/rancher From 04f65893c48ba3b0d988c826d54b20e4d5e80830 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Tue, 11 Feb 2025 21:22:25 -0700 Subject: [PATCH 1340/2168] freebsd.procstat: init --- .../os-specific/bsd/freebsd/pkgs/procstat.nix | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/procstat.nix diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/procstat.nix b/pkgs/os-specific/bsd/freebsd/pkgs/procstat.nix new file mode 100644 index 000000000000..a5444442b596 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/procstat.nix @@ -0,0 +1,24 @@ +{ + lib, + mkDerivation, + libxo, + libsbuf, +}: +mkDerivation { + path = "usr.bin/procstat"; + buildInputs = [ + libxo + libsbuf + ]; + + outputs = [ + "out" + "man" + "debug" + ]; + + MK_TESTS = "no"; + + meta.platforms = lib.platforms.freebsd; + meta.mainProgram = "procstat"; +} From c6183c0d8c5968ff21d73bcc47f29d5df5567704 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 04:35:14 +0000 Subject: [PATCH 1341/2168] cargo-shear: 1.1.8 -> 1.1.9 --- pkgs/by-name/ca/cargo-shear/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-shear/package.nix b/pkgs/by-name/ca/cargo-shear/package.nix index 9b54021b8dbb..bbe6bd0a23e5 100644 --- a/pkgs/by-name/ca/cargo-shear/package.nix +++ b/pkgs/by-name/ca/cargo-shear/package.nix @@ -6,7 +6,7 @@ cargo-shear, }: let - version = "1.1.8"; + version = "1.1.9"; in rustPlatform.buildRustPackage { pname = "cargo-shear"; @@ -16,11 +16,11 @@ rustPlatform.buildRustPackage { owner = "Boshen"; repo = "cargo-shear"; rev = "v${version}"; - hash = "sha256-T05BSeVF67T7F6GMwsGDOYyiuz//0aTstTlGoOZndRM="; + hash = "sha256-+FScGNBLEHO12i4szKqIU+8eYQHz3m16FeoYIuT5XDo="; }; useFetchCargoVendor = true; - cargoHash = "sha256-qCTZeMFTnoD1S2jFLZvSZ2mwix6KoPsLREq5JrrdMEk="; + cargoHash = "sha256-6qHUbfx3ej8Srp/BivuLXjQKZcCN1mNOi+aVa0Q7wtY="; # https://github.com/Boshen/cargo-shear/blob/a0535415a3ea94c86642f39f343f91af5cdc3829/src/lib.rs#L20-L23 SHEAR_VERSION = version; From 0dbfcca2d524018f1ed03cf41ff6b62a9e73a73c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 04:35:46 +0000 Subject: [PATCH 1342/2168] vals: 0.39.0 -> 0.39.1 --- pkgs/by-name/va/vals/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/va/vals/package.nix b/pkgs/by-name/va/vals/package.nix index bd7bd9b6111b..39a9aa86bf44 100644 --- a/pkgs/by-name/va/vals/package.nix +++ b/pkgs/by-name/va/vals/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "vals"; - version = "0.39.0"; + version = "0.39.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "helmfile"; repo = pname; - sha256 = "sha256-Og3klt2FvfSbgplHgO4waG41apu+EePaBxVbVxaTPB0="; + sha256 = "sha256-znMgz0E9XBvDzk8QvEICtgz41JJn37O8HIbeyNrckZk="; }; - vendorHash = "sha256-F+eEnYdsXCmFuhJT3qWIrYCOkuEZdz2XFSMIccgz/+o="; + vendorHash = "sha256-E1HaVS0C/CcyN6r1nprB8lHfaTFJbLaxMlqqm5bb2Wo="; proxyVendor = true; From 1329dc05c5356b4a1da330852e31b7fb495d71e8 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Tue, 11 Feb 2025 21:35:42 -0700 Subject: [PATCH 1343/2168] freebsd.fstat: init --- pkgs/os-specific/bsd/freebsd/pkgs/fstat.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/fstat.nix diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/fstat.nix b/pkgs/os-specific/bsd/freebsd/pkgs/fstat.nix new file mode 100644 index 000000000000..dda376e6846a --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/fstat.nix @@ -0,0 +1,16 @@ +{ + lib, + mkDerivation, +}: +mkDerivation { + path = "usr.bin/fstat"; + + outputs = [ + "out" + "man" + "debug" + ]; + + meta.mainProgram = "fstat"; + meta.platforms = lib.platforms.freebsd; +} From 8b18dfdc09451841a8517101437fbcf2bb8cf2c0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 04:40:12 +0000 Subject: [PATCH 1344/2168] fluent-bit: 3.2.5 -> 3.2.6 --- pkgs/by-name/fl/fluent-bit/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fl/fluent-bit/package.nix b/pkgs/by-name/fl/fluent-bit/package.nix index 430ccd6969cf..851a6ca46868 100644 --- a/pkgs/by-name/fl/fluent-bit/package.nix +++ b/pkgs/by-name/fl/fluent-bit/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fluent-bit"; - version = "3.2.5"; + version = "3.2.6"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${finalAttrs.version}"; - hash = "sha256-H3wcKeHfAJNJAEtRcTU8rz93wug39TUqV3XN4wkTqMg="; + hash = "sha256-S0sb954n17z+zrVNkYd6yiV01aNbOLJLOV+34PRkSXQ="; }; # optional only to avoid linux rebuild From e6f863a1888bcdf7211ae274ee5037adc89285fa Mon Sep 17 00:00:00 2001 From: Giovanni Bassi Date: Wed, 12 Feb 2025 02:14:04 -0300 Subject: [PATCH 1345/2168] azure-cli-extensions.containerapp: add new dependency This was added upstream, build was failing. --- pkgs/by-name/az/azure-cli/extensions-manual.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix index 17bc2d60f3b4..4841d16f2cab 100644 --- a/pkgs/by-name/az/azure-cli/extensions-manual.nix +++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix @@ -90,6 +90,7 @@ propagatedBuildInputs = with python3Packages; [ docker pycomposefile + kubernetes ]; meta.maintainers = with lib.maintainers; [ giggio ]; }; From 71c9f2837d784cb3e8f1b3bdcd5083f95f02b961 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 05:24:55 +0000 Subject: [PATCH 1346/2168] python312Packages.ariadne: 0.24 -> 0.25.2 --- pkgs/development/python-modules/ariadne/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ariadne/default.nix b/pkgs/development/python-modules/ariadne/default.nix index 7ce0904f9c09..eb213d69f718 100644 --- a/pkgs/development/python-modules/ariadne/default.nix +++ b/pkgs/development/python-modules/ariadne/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "ariadne"; - version = "0.24"; + version = "0.25.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "mirumee"; repo = "ariadne"; tag = version; - hash = "sha256-QLMPmep/mtw/ZDto3kK1y/9N+7aZwAke8ZHC6dzwUuM="; + hash = "sha256-bkc/Ixqr7+YFCMnVhuS2KsXnacxSUsQpeHRAO93wfio="; }; patches = [ ./remove-opentracing.patch ]; @@ -78,7 +78,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for implementing GraphQL servers using schema-first approach"; homepage = "https://ariadnegraphql.org"; - changelog = "https://github.com/mirumee/ariadne/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/mirumee/ariadne/blob/${src.tag}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ samuela ]; }; From 0e5e1ddee911b367f23f5ae49537e5fa85c49962 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 06:30:00 +0000 Subject: [PATCH 1347/2168] bento: 1.4.1 -> 1.5.0 --- pkgs/by-name/be/bento/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/be/bento/package.nix b/pkgs/by-name/be/bento/package.nix index 9d2f51a3be7b..9e2ac9363474 100644 --- a/pkgs/by-name/be/bento/package.nix +++ b/pkgs/by-name/be/bento/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "bento"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "warpstreamlabs"; repo = "bento"; tag = "v${version}"; - hash = "sha256-ukmmmvc5CWctDO+YaW/PiqWizfXtgbcMlIK6PjhxMm4="; + hash = "sha256-/8d2q810IMajBTTWPzIq/EDx4SRIfuYSzS4JfWs2vgE="; }; - vendorHash = "sha256-G67i4tZoevlrj+LhjCoHReoWkIZUQVt4YBavmj+h2OI="; + vendorHash = "sha256-oh2kI8HnVI76kAERRFJLUtSJoc9w9dZWjCnf+sHKIDI="; subPackages = [ "cmd/bento" From b084e40906cd63d46769d9ee81189a9730dbc317 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 06:42:29 +0000 Subject: [PATCH 1348/2168] jbrowse: 3.0.0 -> 3.0.1 --- pkgs/by-name/jb/jbrowse/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/jb/jbrowse/package.nix b/pkgs/by-name/jb/jbrowse/package.nix index c3befd3c48e0..ccd708999795 100644 --- a/pkgs/by-name/jb/jbrowse/package.nix +++ b/pkgs/by-name/jb/jbrowse/package.nix @@ -6,11 +6,11 @@ let pname = "jbrowse"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { url = "https://github.com/GMOD/jbrowse-components/releases/download/v${version}/jbrowse-desktop-v${version}-linux.AppImage"; - sha256 = "sha256-gg+DR6yjsdWE85nIj5eMjthvlZ3QaeugEugXD2AZeug="; + sha256 = "sha256-QdsBARONNTO2qZbY+DQtRHAJ1HIzjyadK9PhbvKniFs="; }; appimageContents = appimageTools.extractType2 { From 06766e5509aec30208fe97c1eb8826b99e6be7b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 06:54:14 +0000 Subject: [PATCH 1349/2168] kine: 0.13.7 -> 0.13.9 --- pkgs/by-name/ki/kine/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ki/kine/package.nix b/pkgs/by-name/ki/kine/package.nix index 24ef4bdcdeb4..3bb58a9116a8 100644 --- a/pkgs/by-name/ki/kine/package.nix +++ b/pkgs/by-name/ki/kine/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kine"; - version = "0.13.7"; + version = "0.13.9"; src = fetchFromGitHub { owner = "k3s-io"; repo = "kine"; rev = "v${version}"; - hash = "sha256-4Mh86oDi++Bwe64tUh7XpOTAnfSjKCkOmYzQrqtX3us="; + hash = "sha256-oM/L9kFfnS1AGVDQ0upgV7Btdgsz5pMPzPj0MJo3Fy0="; }; - vendorHash = "sha256-OzLbRSbNZ8q2TT6dqKfyqUAM1NmDU7Z9wiwGOnEO+LM="; + vendorHash = "sha256-bvwAzUqezMNAVcd79UWBGLhMLx5iAtN3udIBJKbdWJs="; ldflags = [ "-s" From 2d78f69e8a7c0d9857e663339f88ee06b93b3ae1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 06:54:54 +0000 Subject: [PATCH 1350/2168] dnsproxy: 0.74.1 -> 0.75.0 --- pkgs/by-name/dn/dnsproxy/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/dn/dnsproxy/package.nix b/pkgs/by-name/dn/dnsproxy/package.nix index a0d31cb054b1..61e586a834ea 100644 --- a/pkgs/by-name/dn/dnsproxy/package.nix +++ b/pkgs/by-name/dn/dnsproxy/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.74.1"; + version = "0.75.0"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = "dnsproxy"; rev = "v${version}"; - hash = "sha256-s6VJXlWzrbHu/kOeng3gnySd5YMJFaUelZy/GoL611c="; + hash = "sha256-kaGMudHELG7ggYXvAL1Yz03ZXDnzrVNj+9QN8jDnS3g="; }; vendorHash = "sha256-d1WrUfE31Gvgz8tw7cVdPhWf4OHsuuyEHDSn9bETCjI="; From 6eaa839c3a220dcf15a3d8d2deda1c5e799de1da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 06:55:01 +0000 Subject: [PATCH 1351/2168] kubo: 0.33.0 -> 0.33.1 --- pkgs/by-name/ku/kubo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ku/kubo/package.nix b/pkgs/by-name/ku/kubo/package.nix index f589a5d59d94..b75a19928ab3 100644 --- a/pkgs/by-name/ku/kubo/package.nix +++ b/pkgs/by-name/ku/kubo/package.nix @@ -8,7 +8,7 @@ buildGoModule rec { pname = "kubo"; - version = "0.33.0"; # When updating, also check if the repo version changed and adjust repoVersion below + version = "0.33.1"; # When updating, also check if the repo version changed and adjust repoVersion below rev = "v${version}"; passthru.repoVersion = "16"; # Also update kubo-migrator when changing the repo version @@ -16,7 +16,7 @@ buildGoModule rec { # Kubo makes changes to its source tarball that don't match the git source. src = fetchurl { url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz"; - hash = "sha256-TcjxdeVnGdk+pA1MizIZ3UBKy6PWHI1h66/PNWrY2DA="; + hash = "sha256-ybsQ25tuRPCp5XKZyxpq/a0x/h69P41+SLukro1xuMc="; }; # tarball contains multiple files/directories From 0c2dd5012d56b1ce88c1b713d761ab46bdbcefd8 Mon Sep 17 00:00:00 2001 From: NullCube Date: Tue, 11 Feb 2025 22:56:39 -0800 Subject: [PATCH 1352/2168] maintainers: update nullcube Changed GitHub username --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index dda73802e1e0..72b277ceaf63 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16961,7 +16961,7 @@ nullcube = { email = "nullcub3@gmail.com"; name = "NullCube"; - github = "nullcub3"; + github = "nullcubee"; githubId = 51034487; matrix = "@nullcube:matrix.org"; }; From 78c82458f1e8388a9dc9da7cf7bbf489d012d358 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 07:06:51 +0000 Subject: [PATCH 1353/2168] trufflehog: 3.88.5 -> 3.88.6 --- pkgs/tools/security/trufflehog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index c2e30bfb9967..ebb6bec4f539 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.88.5"; + version = "3.88.6"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; tag = "v${version}"; - hash = "sha256-PydX3Aol+HrKG82g5ILbL69pBp0+Y6sCzqEtqAix0OQ="; + hash = "sha256-hWpHly0iz8Y2myxT0xyYPWlAjZlJHjqzu/mAUR5FIQ4="; }; - vendorHash = "sha256-YsUAu2gEXzpjM/jg4VJ7KTvf1/cLTO04hLOLmUDeYk0="; + vendorHash = "sha256-c2sONHm0xOCV6asMU5MEtkvK85ILJCjsyldOmk+Hcns="; nativeBuildInputs = [ makeWrapper ]; From ca737a1af918187733878ab6c484d108f514c231 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 12 Feb 2025 08:25:04 +0100 Subject: [PATCH 1354/2168] python313Packages.tencentcloud-sdk-python: 3.0.1315 -> 3.0.1316 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1315...3.0.1316 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1316/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 dc0cf2c020be..a71af11de0f8 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.1315"; + version = "3.0.1316"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = version; - hash = "sha256-rnrBlKeBY/D2Z+EQbUVg7zT6ZAwbxOmMbkV8Ig0qj6I="; + hash = "sha256-g3a/WQVfYlAgRecvP+s1jvxEDwNvwx4enDhnkW0UrYo="; }; build-system = [ setuptools ]; From 9d2bd4f2e5533ae7c5df9b71f81cb071ebcb2aad Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 12 Feb 2025 08:31:08 +0100 Subject: [PATCH 1355/2168] cnspec: 11.39.0 -> 11.41.0 Diff: https://github.com/mondoohq/cnspec/compare/refs/tags/v11.39.0...v11.41.0 Changelog: https://github.com/mondoohq/cnspec/releases/tag/v11.41.0 --- pkgs/tools/security/cnspec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index 0d3a2448d0d1..ccedb83598c2 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnspec"; - version = "11.39.0"; + version = "11.41.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; tag = "v${version}"; - hash = "sha256-SnWKaQ/wH04HmqM6WhMIn7tRszIwDz9sQxqMXA4ux8k="; + hash = "sha256-MAJFTlzBa9thdyVKS1zH9PKpIy2HXYESZR5zfOURIgI="; }; proxyVendor = true; - vendorHash = "sha256-uymDz+jlEO7AYurAUiUswZD2X7hjEFW6m2aQ73k/B3Q="; + vendorHash = "sha256-k9/SfOZvq7o0SzY7UP8MD2LUG7//z8p6ZJL6UXUZrIA="; subPackages = [ "apps/cnspec" ]; From bc77c1ebe1142fddfa9b1d48f0efd860fc34eb29 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 12 Feb 2025 08:32:00 +0100 Subject: [PATCH 1356/2168] python313Packages.boto3-stubs: 1.36.16 -> 1.36.18 --- 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 933ab16cc294..66f5c4820e3f 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -359,7 +359,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.36.16"; + version = "1.36.18"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-n+i23D1rM8zEJBvX4oHxFSWkV0OmsL9NqTVUuaR/B9E="; + hash = "sha256-DCTudrNZZbROqp6lsfGrpykwmKcknwKegsFcphoiF7w="; }; build-system = [ setuptools ]; From 48a439ed2e8fafa7ffa7743ac593b9a8c0d514af Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 12 Feb 2025 08:32:03 +0100 Subject: [PATCH 1357/2168] python313Packages.botocore-stubs: 1.36.16 -> 1.36.18 --- pkgs/development/python-modules/botocore-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index e734e7faa4bf..6fee1307e863 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.36.16"; + version = "1.36.18"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-rLSAuo5GlQ1nYLi/Lzj35zwTW9gznAt9nytcYx08rxc="; + hash = "sha256-bSGy/fN1+rJcQD/uY+4xsC+nIlNwnOBkYJM6hpFg/TI="; }; nativeBuildInputs = [ setuptools ]; From f06e9069de202d88635ddb05cc12a44362d06ce9 Mon Sep 17 00:00:00 2001 From: r33drichards Date: Wed, 12 Feb 2025 00:00:39 -0800 Subject: [PATCH 1358/2168] nixos/metabase: add package option (#334804) * add package option to metabase * Update nixos/modules/services/misc/metabase.nix Co-authored-by: Arne Keller --------- Co-authored-by: rw Co-authored-by: Arne Keller --- nixos/modules/services/misc/metabase.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/metabase.nix b/nixos/modules/services/misc/metabase.nix index eebe582548a5..e0c68410081d 100644 --- a/nixos/modules/services/misc/metabase.nix +++ b/nixos/modules/services/misc/metabase.nix @@ -15,6 +15,8 @@ in { services.metabase = { enable = mkEnableOption "Metabase service"; + package = lib.mkPackageOption pkgs "metabase" { }; + listen = { ip = mkOption { type = types.str; @@ -92,7 +94,7 @@ in { serviceConfig = { DynamicUser = true; StateDirectory = baseNameOf dataDir; - ExecStart = "${pkgs.metabase}/bin/metabase"; + ExecStart = lib.getExe cfg.package; }; }; From 3ff372bfa0f27e3c8a190b141f75fdcbcbec537a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Reyrol?= Date: Wed, 12 Feb 2025 08:40:09 +0100 Subject: [PATCH 1359/2168] rustdesk-server: 1.1.12 -> 1.1.14 Diff: https://github.com/rustdesk/rustdesk-server/compare/1.1.12...1.1.14 Changelog: https://github.com/rustdesk/rustdesk-server/releases/tag/1.1.14 --- .../ru}/rustdesk-server/Cargo.lock | 1692 +++++++++++++---- .../ru/rustdesk-server/package.nix} | 13 +- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 1344 insertions(+), 363 deletions(-) rename pkgs/{servers => by-name/ru}/rustdesk-server/Cargo.lock (64%) rename pkgs/{servers/rustdesk-server/default.nix => by-name/ru/rustdesk-server/package.nix} (67%) diff --git a/pkgs/servers/rustdesk-server/Cargo.lock b/pkgs/by-name/ru/rustdesk-server/Cargo.lock similarity index 64% rename from pkgs/servers/rustdesk-server/Cargo.lock rename to pkgs/by-name/ru/rustdesk-server/Cargo.lock index eb4d0342067f..a87da66a2922 100644 --- a/pkgs/servers/rustdesk-server/Cargo.lock +++ b/pkgs/by-name/ru/rustdesk-server/Cargo.lock @@ -1,6 +1,21 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 + +[[package]] +name = "addr2line" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" [[package]] name = "ahash" @@ -15,13 +30,28 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.18" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] +[[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 = "ansi_term" version = "0.12.1" @@ -43,6 +73,19 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" +[[package]] +name = "async-compression" +version = "0.4.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df895a515f70646414f4b45c0b79082783b80552b373a68283012928df56f522" +dependencies = [ + "flate2", + "futures-core", + "memchr", + "pin-project-lite", + "tokio", +] + [[package]] name = "async-speed-limit" version = "0.3.1" @@ -60,9 +103,9 @@ version = "0.1.53" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600" dependencies = [ - "proc-macro2", - "quote", - "syn", + "proc-macro2 1.0.93", + "quote 1.0.38", + "syn 1.0.93", ] [[package]] @@ -80,7 +123,7 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", "winapi", ] @@ -99,7 +142,7 @@ checksum = "00f1e8a972137fad81e2a1a60b86ff17ce0338f8017264e45a9723d0083c39a1" dependencies = [ "async-trait", "axum-core", - "bitflags", + "bitflags 1.3.2", "bytes", "futures-util", "headers", @@ -137,30 +180,86 @@ dependencies = [ "mime", ] +[[package]] +name = "backtrace" +version = "0.3.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" +dependencies = [ + "addr2line", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", + "windows-targets 0.52.6", +] + [[package]] name = "base64" version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + [[package]] name = "bcrypt" version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7e7c93a3fb23b2fdde989b2c9ec4dd153063ec81f408507f84c090cd91c6641" dependencies = [ - "base64", + "base64 0.13.0", "blowfish", "getrandom", "zeroize", ] +[[package]] +name = "bindgen" +version = "0.59.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" +dependencies = [ + "bitflags 1.3.2", + "cexpr", + "clang-sys", + "clap", + "env_logger 0.9.0", + "lazy_static", + "lazycell", + "log", + "peeking_take_while", + "proc-macro2 1.0.93", + "quote 1.0.38", + "regex", + "rustc-hash", + "shlex", + "which", +] + [[package]] name = "bitflags" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1be3f42a67d6d345ecd59f675f3f012d6974981560836e938c22b424b85ce1be" + [[package]] name = "block-buffer" version = "0.10.2" @@ -194,20 +293,37 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.2.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0b3de4a0c5e67e16066a0715723abd91edc2f9001d09c46e1dca929351e130e" +checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" dependencies = [ "serde", ] [[package]] name = "cc" -version = "1.0.73" +version = "1.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +checksum = "c8293772165d9345bdaaa39b45b2109591e63fe5e6fbc23c6ff930a048aa310b" dependencies = [ "jobserver", + "libc", + "shlex", +] + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom 7.1.1", ] [[package]] @@ -218,15 +334,16 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.19" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" +checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825" dependencies = [ - "libc", - "num-integer", + "android-tzdata", + "iana-time-zone", + "js-sys", "num-traits", - "time 0.1.43", - "winapi", + "wasm-bindgen", + "windows-targets 0.52.6", ] [[package]] @@ -239,6 +356,17 @@ dependencies = [ "inout", ] +[[package]] +name = "clang-sys" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" +dependencies = [ + "glob", + "libc", + "libloading", +] + [[package]] name = "clap" version = "2.34.0" @@ -247,13 +375,23 @@ checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ "ansi_term", "atty", - "bitflags", + "bitflags 1.3.2", "strsim", "textwrap", "unicode-width", "vec_map", ] +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + [[package]] name = "config" version = "0.11.0" @@ -267,20 +405,20 @@ dependencies = [ [[package]] name = "confy" -version = "0.4.0" -source = "git+https://github.com/open-trade/confy#630cc28a396cb7d01eefdd9f3824486fe4d8554b" +version = "0.4.0-2" +source = "git+https://github.com/rustdesk-org/confy#83db9ec19a2f97e9718aef69e4fc5611bb382479" dependencies = [ "directories-next", "serde", "thiserror", - "toml", + "toml 0.5.9", ] [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -288,9 +426,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.3" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" @@ -316,6 +454,15 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d0165d2900ae6778e36e80bbc4da3b5eefccee9ba939761f9c2882a5d9af3ff" +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + [[package]] name = "crossbeam" version = "0.8.1" @@ -408,6 +555,16 @@ dependencies = [ "tokio", ] +[[package]] +name = "default_net" +version = "0.1.0" +source = "git+https://github.com/rustdesk-org/default_net#78f8f70cd85151a3a2c4a3230d80d5272703c02e" +dependencies = [ + "anyhow", + "regex", + "winapi", +] + [[package]] name = "digest" version = "0.10.3" @@ -449,6 +606,29 @@ dependencies = [ "winapi", ] +[[package]] +name = "dlopen" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71e80ad39f814a9abe68583cd50a2d45c8a67561c3361ab8da240587dda80937" +dependencies = [ + "dlopen_derive", + "lazy_static", + "libc", + "winapi", +] + +[[package]] +name = "dlopen_derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f236d9e1b1fbd81cea0f9cbdc8dcc7e8ebcd80e6659cd7cb2ad5f6c05946c581" +dependencies = [ + "libc", + "quote 0.6.13", + "syn 0.15.44", +] + [[package]] name = "dlv-list" version = "0.3.0" @@ -484,9 +664,18 @@ dependencies = [ [[package]] name = "either" -version = "1.6.1" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + +[[package]] +name = "encoding_rs" +version = "0.8.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" +dependencies = [ + "cfg-if", +] [[package]] name = "env_logger" @@ -501,6 +690,25 @@ dependencies = [ "termcolor", ] +[[package]] +name = "env_logger" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" +dependencies = [ + "humantime", + "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 = "event-listener" version = "2.5.2" @@ -528,6 +736,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "flate2" +version = "1.0.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + [[package]] name = "flexi_logger" version = "0.22.3" @@ -544,7 +762,25 @@ dependencies = [ "regex", "rustversion", "thiserror", - "time 0.3.9", + "time", +] + +[[package]] +name = "flexi_logger" +version = "0.27.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469e584c031833564840fb0cdbce99bdfe946fd45480a188545e73a76f45461c" +dependencies = [ + "chrono", + "crossbeam-channel", + "crossbeam-queue", + "glob", + "is-terminal", + "lazy_static", + "log", + "nu-ansi-term", + "regex", + "thiserror", ] [[package]] @@ -565,6 +801,21 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + [[package]] name = "form_urlencoded" version = "1.0.1" @@ -640,9 +891,9 @@ version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" dependencies = [ - "proc-macro2", - "quote", - "syn", + "proc-macro2 1.0.93", + "quote 1.0.38", + "syn 1.0.93", ] [[package]] @@ -681,15 +932,6 @@ dependencies = [ "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.5" @@ -702,21 +944,46 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.6" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", - "wasi 0.10.2+wasi-snapshot-preview1", + "wasi", ] +[[package]] +name = "gimli" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" + [[package]] name = "glob" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +[[package]] +name = "h2" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap 2.7.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "hashbrown" version = "0.11.2" @@ -732,6 +999,12 @@ dependencies = [ "ahash", ] +[[package]] +name = "hashbrown" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" + [[package]] name = "hashlink" version = "0.8.0" @@ -746,51 +1019,67 @@ name = "hbb_common" version = "0.1.0" dependencies = [ "anyhow", + "backtrace", + "base64 0.22.1", "bytes", "chrono", "confy", + "default_net", "directories-next", "dirs-next", - "env_logger", + "dlopen", + "env_logger 0.10.2", "filetime", + "flexi_logger 0.27.4", "futures", "futures-util", + "httparse", "lazy_static", + "libc", "log", "mac_address", - "machine-uid", + "machine-uid 0.3.0", + "osascript", "protobuf", "protobuf-codegen", - "quinn", "rand", "regex", + "rustls-pki-types", + "rustls-platform-verifier", "serde", "serde_derive", "serde_json", + "sha2", "socket2 0.3.19", "sodiumoxide", + "sysinfo", + "thiserror", "tokio", - "tokio-socks", - "tokio-util 0.7.1", - "toml", + "tokio-native-tls", + "tokio-rustls 0.26.1", + "tokio-socks 0.5.2-1", + "tokio-util", + "toml 0.7.8", + "url", + "uuid", "winapi", "zstd", ] [[package]] name = "hbbs" -version = "1.1.12" +version = "1.1.14" dependencies = [ "async-speed-limit", "async-trait", "axum", - "base64", + "base64 0.13.0", "bcrypt", "chrono", "clap", "deadpool", "dns-lookup", - "flexi_logger", + "flexi_logger 0.22.3", "hbb_common", "headers", "http", @@ -799,11 +1088,12 @@ dependencies = [ "lazy_static", "local-ip-address", "mac_address", - "machine-uid", + "machine-uid 0.2.0", "minreq", "once_cell", "ping", "regex", + "reqwest", "rust-ini", "serde", "serde_derive", @@ -823,8 +1113,8 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4cff78e5788be1e0ab65b04d306b2ed5092c815ec97ec70f4ebd5aee158aa55d" dependencies = [ - "base64", - "bitflags", + "base64 0.13.0", + "bitflags 1.3.2", "bytes", "headers-core", "http", @@ -860,6 +1150,12 @@ dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + [[package]] name = "hex" version = "0.4.3" @@ -896,9 +1192,9 @@ checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" [[package]] name = "httparse" -version = "1.7.1" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" [[package]] name = "httpdate" @@ -914,27 +1210,78 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.18" +version = "0.14.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b26ae0a80afebe130861d90abf98e3814a4f28a4c6ffeb5ab8ebb2be311e0ef2" +checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7" dependencies = [ "bytes", "futures-channel", "futures-core", "futures-util", + "h2", "http", "http-body", "httparse", "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.4", + "socket2 0.5.8", "tokio", "tower-service", "tracing", "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", + "hyper", + "rustls 0.21.12", + "tokio", + "tokio-rustls 0.24.1", +] + +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper", + "native-tls", + "tokio", + "tokio-native-tls", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" +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 = "idna" version = "0.2.3" @@ -956,6 +1303,16 @@ dependencies = [ "hashbrown 0.11.2", ] +[[package]] +name = "indexmap" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" +dependencies = [ + "equivalent", + "hashbrown 0.15.2", +] + [[package]] name = "inout" version = "0.1.3" @@ -974,6 +1331,12 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "ipnet" +version = "2.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" + [[package]] name = "ipnetwork" version = "0.20.0" @@ -983,6 +1346,17 @@ dependencies = [ "serde", ] +[[package]] +name = "is-terminal" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" +dependencies = [ + "hermit-abi 0.4.0", + "libc", + "windows-sys 0.52.0", +] + [[package]] name = "itertools" version = "0.10.3" @@ -999,20 +1373,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" [[package]] -name = "jobserver" -version = "0.1.24" +name = "jni" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa" +checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" +dependencies = [ + "cesu8", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "jobserver" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.57" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "671a26f820db17c2a2750743f1dd03bafd15b98c9f30c7c2628c024c05d73397" +checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" dependencies = [ + "once_cell", "wasm-bindgen", ] @@ -1022,9 +1417,9 @@ version = "8.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc9051c17f81bae79440afa041b3a278e1de71bfb96d32454b477fd4703ccb6f" dependencies = [ - "base64", + "base64 0.13.0", "pem", - "ring", + "ring 0.16.20", "serde", "serde_json", "simple_asn1", @@ -1036,6 +1431,12 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + [[package]] name = "lexical-core" version = "0.7.6" @@ -1043,7 +1444,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" dependencies = [ "arrayvec", - "bitflags", + "bitflags 1.3.2", "cfg-if", "ryu", "static_assertions", @@ -1051,9 +1452,19 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.125" +version = "0.2.169" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b" +checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" + +[[package]] +name = "libloading" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" +dependencies = [ + "cfg-if", + "windows-targets 0.52.6", +] [[package]] name = "libsodium-sys" @@ -1125,7 +1536,17 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f1595709b0a7386bcd56ba34d250d626e5503917d05d32cdccddcd68603e212" dependencies = [ - "winreg", + "winreg 0.6.2", +] + +[[package]] +name = "machine-uid" +version = "0.3.0" +source = "git+https://github.com/rustdesk-org/machine-uid#381ff579c1dc3a6c54db9dfec47c44bcb0246542" +dependencies = [ + "bindgen", + "cc", + "winreg 0.11.0", ] [[package]] @@ -1142,9 +1563,9 @@ checksum = "73cbba799671b762df5a175adf59ce145165747bb891505c43d09aefbbf38beb" [[package]] name = "memchr" -version = "2.5.0" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memoffset" @@ -1177,6 +1598,15 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" +[[package]] +name = "miniz_oxide" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924" +dependencies = [ + "adler2", +] + [[package]] name = "minreq" version = "2.6.0" @@ -1189,36 +1619,30 @@ dependencies = [ [[package]] name = "mio" -version = "0.7.14" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" +checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" dependencies = [ "libc", - "log", - "miow", - "ntapi", - "winapi", + "wasi", + "windows-sys 0.52.0", ] [[package]] -name = "mio" -version = "0.8.3" +name = "native-tls" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713d550d9b44d89174e066b7a6217ae06234c10cb47819a88290d2b353c31799" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" dependencies = [ "libc", "log", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.36.1", -] - -[[package]] -name = "miow" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", ] [[package]] @@ -1240,10 +1664,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c168194d373b1e134786274020dae7fc5513d565ea2ebb9bc9ff17ffb69106d4" dependencies = [ "either", - "proc-macro2", - "quote", + "proc-macro2 1.0.93", + "quote 1.0.38", "serde", - "syn", + "syn 1.0.93", ] [[package]] @@ -1252,7 +1676,7 @@ version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cc", "cfg-if", "libc", @@ -1282,39 +1706,46 @@ dependencies = [ [[package]] name = "ntapi" -version = "0.3.7" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" +checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" dependencies = [ "winapi", ] [[package]] -name = "num-bigint" -version = "0.4.3" +name = "nu-ansi-term" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "c073d3c1930d0751774acf49e66653acecb416c3a54c6ec095a9b11caddb5a68" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ - "autocfg", "num-integer", "num-traits", ] [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -1325,7 +1756,7 @@ version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", ] @@ -1339,10 +1770,45 @@ dependencies = [ ] [[package]] -name = "once_cell" -version = "1.10.0" +name = "object" +version = "0.36.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" +checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" + +[[package]] +name = "openssl" +version = "0.10.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" +dependencies = [ + "bitflags 2.7.0", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2 1.0.93", + "quote 1.0.38", + "syn 2.0.96", +] [[package]] name = "openssl-probe" @@ -1350,6 +1816,18 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +[[package]] +name = "openssl-sys" +version = "0.9.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + [[package]] name = "ordered-multimap" version = "0.4.3" @@ -1360,6 +1838,17 @@ dependencies = [ "hashbrown 0.12.1", ] +[[package]] +name = "osascript" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38731fa859ef679f1aec66ca9562165926b442f298467f76f5990f431efe87dc" +dependencies = [ + "serde", + "serde_derive", + "serde_json", +] + [[package]] name = "parking_lot" version = "0.11.2" @@ -1414,13 +1903,19 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc" +[[package]] +name = "peeking_take_while" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" + [[package]] name = "pem" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9a3b09a20e374558580a4914d3b7d89bd61b954a5a5e1dcbea98753addb1947" dependencies = [ - "base64", + "base64 0.13.0", ] [[package]] @@ -1431,29 +1926,29 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" [[package]] name = "pin-project" -version = "1.0.10" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e" +checksum = "1e2ec53ad785f4d35dac0adea7f7dc6f1bb277ad84a680c7afefeae05d1f5916" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.10" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb" +checksum = "d56a66c0c55993aa927429d0f8a0abfd74f084e4d9c192cffed01e418d83eefb" dependencies = [ - "proc-macro2", - "quote", - "syn", + "proc-macro2 1.0.93", + "quote 1.0.38", + "syn 2.0.96", ] [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" [[package]] name = "pin-utils" @@ -1486,18 +1981,27 @@ checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" [[package]] name = "proc-macro2" -version = "1.0.38" +version = "0.4.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9027b48e9d4c9175fa2218adf3557f91c1137021739951d4932f5f8268ac48aa" +checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" dependencies = [ - "unicode-xid", + "unicode-xid 0.1.0", +] + +[[package]] +name = "proc-macro2" +version = "1.0.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99" +dependencies = [ + "unicode-ident", ] [[package]] name = "protobuf" -version = "3.1.0" +version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ee4a7d8b91800c8f167a6268d1a1026607368e1adc84e98fe044aeb905302f7" +checksum = "a3a7c64d9bf75b1b8d981124c14c179074e8caa7dfe7b6a12e6222ddcd0c8f72" dependencies = [ "bytes", "once_cell", @@ -1507,9 +2011,9 @@ dependencies = [ [[package]] name = "protobuf-codegen" -version = "3.1.0" +version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07b893e5e7d3395545d5244f8c0d33674025bd566b26c03bfda49b82c6dec45e" +checksum = "e26b833f144769a30e04b1db0146b2aaa53fd2fd83acf10a6b5f996606c18144" dependencies = [ "anyhow", "once_cell", @@ -1522,12 +2026,12 @@ dependencies = [ [[package]] name = "protobuf-parse" -version = "3.1.0" +version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b1447dd751c434cc1b415579837ebd0411ed7d67d465f38010da5d7cd33af4d" +checksum = "322330e133eab455718444b4e033ebfac7c6528972c784fcde28d2cc783c6257" dependencies = [ "anyhow", - "indexmap", + "indexmap 2.7.0", "log", "protobuf", "protobuf-support", @@ -1538,9 +2042,9 @@ dependencies = [ [[package]] name = "protobuf-support" -version = "3.1.0" +version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ca157fe12fc7ee2e315f2f735e27df41b3d97cdd70ea112824dac1ffb08ee1c" +checksum = "b088fd20b938a875ea00843b6faf48579462630015c3788d397ad6a786663252" dependencies = [ "thiserror", ] @@ -1561,66 +2065,21 @@ dependencies = [ ] [[package]] -name = "quinn" -version = "0.8.2" +name = "quote" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d147472bc9a09f13b06c044787b6683cdffa02e2865b7f0fb53d67c49ed2988e" +checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "fxhash", - "quinn-proto", - "quinn-udp", - "rustls", - "thiserror", - "tokio", - "tracing", - "webpki", -] - -[[package]] -name = "quinn-proto" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "359c5eb33845f3ee05c229e65f87cdbc503eea394964b8f1330833d460b4ff3e" -dependencies = [ - "bytes", - "fxhash", - "rand", - "ring", - "rustls", - "rustls-native-certs", - "rustls-pemfile 0.2.1", - "slab", - "thiserror", - "tinyvec", - "tracing", - "webpki", -] - -[[package]] -name = "quinn-udp" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df185e5e5f7611fa6e628ed8f9633df10114b03bbaecab186ec55822c44ac727" -dependencies = [ - "futures-util", - "libc", - "mio 0.7.14", - "quinn-proto", - "socket2 0.4.4", - "tokio", - "tracing", + "proc-macro2 0.4.30", ] [[package]] name = "quote" -version = "1.0.18" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ - "proc-macro2", + "proc-macro2 1.0.93", ] [[package]] @@ -1653,13 +2112,33 @@ dependencies = [ "getrandom", ] +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + [[package]] name = "redox_syscall" version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -1675,9 +2154,21 @@ dependencies = [ [[package]] name = "regex" -version = "1.5.5" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", @@ -1686,9 +2177,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.25" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "remove_dir_all" @@ -1699,6 +2190,53 @@ dependencies = [ "winapi", ] +[[package]] +name = "reqwest" +version = "0.11.23" +source = "git+https://github.com/rustdesk-org/reqwest#9cb758c9fb2f4edc62eb790acfd45a6a3da21ed3" +dependencies = [ + "async-compression", + "base64 0.21.7", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-rustls", + "hyper-tls", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls 0.21.12", + "rustls-native-certs 0.6.2", + "rustls-pemfile 1.0.0", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "system-configuration", + "tokio", + "tokio-native-tls", + "tokio-rustls 0.24.1", + "tokio-socks 0.5.2", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots 0.25.4", + "winreg 0.50.0", +] + [[package]] name = "ring" version = "0.16.20" @@ -1709,11 +2247,25 @@ dependencies = [ "libc", "once_cell", "spin 0.5.2", - "untrusted", + "untrusted 0.7.1", "web-sys", "winapi", ] +[[package]] +name = "ring" +version = "0.17.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9babe80d5c16becf6594aa32ad2be8fe08498e7ae60b77de8df700e67f191d7e" +dependencies = [ + "cc", + "getrandom", + "libc", + "spin 0.9.3", + "untrusted 0.9.0", + "windows-sys 0.48.0", +] + [[package]] name = "rust-ini" version = "0.18.0" @@ -1724,6 +2276,18 @@ dependencies = [ "ordered-multimap", ] +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + [[package]] name = "rustls" version = "0.20.4" @@ -1731,11 +2295,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fbfeb8d0ddb84706bc597a5574ab8912817c52a397f819e5b614e2265206921" dependencies = [ "log", - "ring", + "ring 0.16.20", "sct", "webpki", ] +[[package]] +name = "rustls" +version = "0.21.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" +dependencies = [ + "log", + "ring 0.17.3", + "rustls-webpki 0.101.7", + "sct", +] + +[[package]] +name = "rustls" +version = "0.23.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f287924602bf649d949c63dc8ac8b235fa5387d394020705b80c4eb597ce5b8" +dependencies = [ + "log", + "once_cell", + "ring 0.17.3", + "rustls-pki-types", + "rustls-webpki 0.102.8", + "subtle", + "zeroize", +] + [[package]] name = "rustls-native-certs" version = "0.6.2" @@ -1749,12 +2340,16 @@ dependencies = [ ] [[package]] -name = "rustls-pemfile" -version = "0.2.1" +name = "rustls-native-certs" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9" +checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" dependencies = [ - "base64", + "openssl-probe", + "rustls-pemfile 2.2.0", + "rustls-pki-types", + "schannel", + "security-framework", ] [[package]] @@ -1763,7 +2358,70 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7522c9de787ff061458fe9a829dc790a3f5b22dc571694fc5883f448b94d9a9" dependencies = [ - "base64", + "base64 0.13.0", +] + +[[package]] +name = "rustls-pemfile" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37" + +[[package]] +name = "rustls-platform-verifier" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afbb878bdfdf63a336a5e63561b1835e7a8c91524f51621db870169eac84b490" +dependencies = [ + "core-foundation", + "core-foundation-sys", + "jni", + "log", + "once_cell", + "rustls 0.23.21", + "rustls-native-certs 0.7.3", + "rustls-platform-verifier-android", + "rustls-webpki 0.102.8", + "security-framework", + "security-framework-sys", + "webpki-roots 0.26.7", + "winapi", +] + +[[package]] +name = "rustls-platform-verifier-android" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring 0.17.3", + "untrusted 0.9.0", +] + +[[package]] +name = "rustls-webpki" +version = "0.102.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" +dependencies = [ + "ring 0.17.3", + "rustls-pki-types", + "untrusted 0.9.0", ] [[package]] @@ -1789,12 +2447,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.19" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" +checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" dependencies = [ - "lazy_static", - "winapi", + "windows-sys 0.59.0", ] [[package]] @@ -1809,28 +2466,29 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] name = "security-framework" -version = "2.6.1" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dc14f172faf8a0194a3aded622712b0de276821addc574fa54fc0a1167e10dc" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags", + "bitflags 2.7.0", "core-foundation", "core-foundation-sys", "libc", + "num-bigint", "security-framework-sys", ] [[package]] name = "security-framework-sys" -version = "2.6.1" +version = "2.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" +checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32" dependencies = [ "core-foundation-sys", "libc", @@ -1838,22 +2496,22 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.137" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1" +checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.137" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be" +checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ - "proc-macro2", - "quote", - "syn", + "proc-macro2 1.0.93", + "quote 1.0.38", + "syn 2.0.96", ] [[package]] @@ -1867,6 +2525,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_spanned" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" +dependencies = [ + "serde", +] + [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -1901,6 +2568,12 @@ dependencies = [ "digest", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "signal-hook-registry" version = "1.4.0" @@ -1925,7 +2598,7 @@ dependencies = [ "num-bigint", "num-traits", "thiserror", - "time 0.3.9", + "time", ] [[package]] @@ -1961,6 +2634,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "socket2" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + [[package]] name = "sodiumoxide" version = "0.2.7" @@ -2017,7 +2700,7 @@ checksum = "6b69bf218860335ddda60d6ce85ee39f6cf6e5630e300e19757d1de15886a093" dependencies = [ "ahash", "atoi", - "bitflags", + "bitflags 1.3.2", "byteorder", "bytes", "chrono", @@ -2033,7 +2716,7 @@ dependencies = [ "futures-util", "hashlink", "hex", - "indexmap", + "indexmap 1.8.1", "itoa", "libc", "libsqlite3-sys", @@ -2042,7 +2725,7 @@ dependencies = [ "once_cell", "paste", "percent-encoding", - "rustls", + "rustls 0.20.4", "rustls-pemfile 1.0.0", "serde", "serde_json", @@ -2054,7 +2737,7 @@ dependencies = [ "thiserror", "tokio-stream", "url", - "webpki-roots", + "webpki-roots 0.22.4", ] [[package]] @@ -2067,13 +2750,13 @@ dependencies = [ "either", "heck", "once_cell", - "proc-macro2", - "quote", + "proc-macro2 1.0.93", + "quote 1.0.38", "serde_json", "sha2", "sqlx-core", "sqlx-rt", - "syn", + "syn 1.0.93", "url", ] @@ -2085,7 +2768,7 @@ checksum = "874e93a365a598dc3dadb197565952cb143ae4aa716f7bcc933a8d836f6bf89f" dependencies = [ "once_cell", "tokio", - "tokio-rustls", + "tokio-rustls 0.23.4", ] [[package]] @@ -2110,22 +2793,85 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + +[[package]] +name = "syn" +version = "0.15.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" +dependencies = [ + "proc-macro2 0.4.30", + "quote 0.6.13", + "unicode-xid 0.1.0", +] + [[package]] name = "syn" version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04066589568b72ec65f42d65a1a52436e954b168773148893c020269563decf2" dependencies = [ - "proc-macro2", - "quote", - "unicode-xid", + "proc-macro2 1.0.93", + "quote 1.0.38", + "unicode-xid 0.2.3", +] + +[[package]] +name = "syn" +version = "2.0.96" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80" +dependencies = [ + "proc-macro2 1.0.93", + "quote 1.0.38", + "unicode-ident", ] [[package]] name = "sync_wrapper" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20518fe4a4c9acf048008599e464deb21beeae3d3578418951a189c235a7a9a8" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "sysinfo" +version = "0.29.10" +source = "git+https://github.com/rustdesk-org/sysinfo?branch=rlim_max#90b1705d909a4902dbbbdea37ee64db17841077d" +dependencies = [ + "cfg-if", + "core-foundation-sys", + "libc", + "ntapi", + "once_cell", + "rayon", + "windows", +] + +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] [[package]] name = "tempfile" @@ -2174,19 +2920,9 @@ version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a" dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "time" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" -dependencies = [ - "libc", - "winapi", + "proc-macro2 1.0.93", + "quote 1.0.38", + "syn 1.0.93", ] [[package]] @@ -2225,34 +2961,41 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.20.0" +version = "1.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57aec3cfa4c296db7255446efb4928a6be304b431a806216105542a67b6ca82e" +checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e" dependencies = [ - "autocfg", + "backtrace", "bytes", "libc", - "memchr", - "mio 0.8.3", - "num_cpus", - "once_cell", + "mio", "parking_lot 0.12.0", "pin-project-lite", "signal-hook-registry", - "socket2 0.4.4", + "socket2 0.5.8", "tokio-macros", - "winapi", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "1.7.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7" +checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ - "proc-macro2", - "quote", - "syn", + "proc-macro2 1.0.93", + "quote 1.0.38", + "syn 2.0.96", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", ] [[package]] @@ -2261,15 +3004,35 @@ version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ - "rustls", + "rustls 0.20.4", "tokio", "webpki", ] +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls 0.21.12", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37" +dependencies = [ + "rustls 0.23.21", + "tokio", +] + [[package]] name = "tokio-socks" -version = "0.5.1" -source = "git+https://github.com/open-trade/tokio-socks#3de8300fbce37e2cdaef042e016aa95058d007cf" +version = "0.5.2-1" +source = "git+https://github.com/rustdesk-org/tokio-socks#94e97c6d7c93b0bcbfa54f2dc397c1da0a6e43d3" dependencies = [ "bytes", "either", @@ -2279,7 +3042,19 @@ dependencies = [ "pin-project", "thiserror", "tokio", - "tokio-util 0.6.9", + "tokio-util", +] + +[[package]] +name = "tokio-socks" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f" +dependencies = [ + "either", + "futures-util", + "thiserror", + "tokio", ] [[package]] @@ -2305,20 +3080,6 @@ dependencies = [ "tungstenite", ] -[[package]] -name = "tokio-util" -version = "0.6.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "log", - "pin-project-lite", - "tokio", -] - [[package]] name = "tokio-util" version = "0.7.1" @@ -2345,6 +3106,40 @@ dependencies = [ "serde", ] +[[package]] +name = "toml" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap 2.7.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + [[package]] name = "tower" version = "0.4.12" @@ -2356,7 +3151,7 @@ dependencies = [ "pin-project", "pin-project-lite", "tokio", - "tokio-util 0.7.1", + "tokio-util", "tower-layer", "tower-service", "tracing", @@ -2368,7 +3163,7 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d342c6d58709c0a6d48d48dabbb62d4ef955cf5f0f3bbfd845838e7ae88dbae" dependencies = [ - "bitflags", + "bitflags 1.3.2", "bytes", "futures-core", "futures-util", @@ -2381,7 +3176,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "tokio", - "tokio-util 0.7.1", + "tokio-util", "tower", "tower-layer", "tower-service", @@ -2402,11 +3197,10 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" [[package]] name = "tracing" -version = "0.1.34" +version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ - "cfg-if", "log", "pin-project-lite", "tracing-attributes", @@ -2415,22 +3209,22 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.21" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc6b8ad3567499f98a1db7a752b07a7c8c7c7c34c332ec00effb2b0027974b7c" +checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ - "proc-macro2", - "quote", - "syn", + "proc-macro2 1.0.93", + "quote 1.0.38", + "syn 2.0.96", ] [[package]] name = "tracing-core" -version = "0.1.26" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f" +checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" dependencies = [ - "lazy_static", + "once_cell", ] [[package]] @@ -2445,7 +3239,7 @@ version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d96a2dea40e7570482f28eb57afbe42d97551905da6a9400acc5c328d24004f5" dependencies = [ - "base64", + "base64 0.13.0", "byteorder", "bytes", "http", @@ -2479,6 +3273,12 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" +[[package]] +name = "unicode-ident" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" + [[package]] name = "unicode-normalization" version = "0.1.19" @@ -2500,6 +3300,12 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" +[[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.3" @@ -2518,6 +3324,12 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + [[package]] name = "url" version = "2.2.2" @@ -2538,9 +3350,9 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] name = "uuid" -version = "1.1.2" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f" +checksum = "744018581f9a3454a9e15beb8a33b017183f1e7c0cd170232a2d1453b23a51c4" dependencies = [ "getrandom", ] @@ -2584,12 +3396,6 @@ dependencies = [ "try-lock", ] -[[package]] -name = "wasi" -version = "0.10.2+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -2598,63 +3404,80 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.80" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27370197c907c55e3f1a9fbe26f44e937fe6451368324e009cba39e139dc08ad" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" dependencies = [ "cfg-if", + "once_cell", + "rustversion", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.80" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53e04185bfa3a779273da532f5025e33398409573f348985af9a1cbf3774d3f4" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" dependencies = [ "bumpalo", - "lazy_static", "log", - "proc-macro2", - "quote", - "syn", + "proc-macro2 1.0.93", + "quote 1.0.38", + "syn 2.0.96", "wasm-bindgen-shared", ] [[package]] -name = "wasm-bindgen-macro" -version = "0.2.80" +name = "wasm-bindgen-futures" +version = "0.4.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17cae7ff784d7e83a2fe7611cfe766ecf034111b49deb850a3dc7699c08251f5" +checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61" dependencies = [ - "quote", + "cfg-if", + "js-sys", + "once_cell", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" +dependencies = [ + "quote 1.0.38", "wasm-bindgen-macro-support", ] [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.80" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ - "proc-macro2", - "quote", - "syn", + "proc-macro2 1.0.93", + "quote 1.0.38", + "syn 2.0.96", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.80" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d554b7f530dee5964d9a9468d95c1f8b8acae4f282807e7d27d4b03099a46744" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] [[package]] name = "web-sys" -version = "0.3.57" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b17e741662c70c8bd24ac5c5b18de314a2c26c32bf8346ee1e6f53de919c283" +checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" dependencies = [ "js-sys", "wasm-bindgen", @@ -2666,8 +3489,8 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -2679,6 +3502,21 @@ dependencies = [ "webpki", ] +[[package]] +name = "webpki-roots" +version = "0.25.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" + +[[package]] +name = "webpki-roots" +version = "0.26.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d642ff16b7e79272ae451b7322067cdc17cadf68c23264be9d94a32319efe7e" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "which" version = "4.2.5" @@ -2731,6 +3569,34 @@ 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.6", +] + [[package]] name = "windows-sys" version = "0.36.1" @@ -2750,29 +3616,69 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -2782,9 +3688,15 @@ checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -2794,9 +3706,21 @@ checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -2806,9 +3730,15 @@ checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -2818,15 +3748,27 @@ checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -2836,9 +3778,24 @@ checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] [[package]] name = "winreg" @@ -2850,36 +3807,55 @@ dependencies = [ ] [[package]] -name = "zeroize" -version = "1.5.5" +name = "winreg" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94693807d016b2f2d2e14420eb3bfcca689311ff775dcf113d74ea624b7cdf07" +checksum = "76a1a57ff50e9b408431e8f97d5456f2807f8eb2a2cd79b06068fc87f8ecf189" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" [[package]] name = "zstd" -version = "0.9.2+zstd.1.5.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2390ea1bf6c038c39674f22d95f0564725fc06034a47129179810b2fc58caa54" +checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "4.1.3+zstd.1.5.1" +version = "7.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e99d81b99fb3c2c2c794e3fe56c305c63d5173a16a46b5850b07c935ffc7db79" +checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" dependencies = [ - "libc", "zstd-sys", ] [[package]] name = "zstd-sys" -version = "1.6.2+zstd.1.5.1" +version = "2.0.13+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2daf2f248d9ea44454bfcb2516534e8b8ad2fc91bf818a1885495fc42bc8ac9f" +checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" dependencies = [ "cc", - "libc", + "pkg-config", ] diff --git a/pkgs/servers/rustdesk-server/default.nix b/pkgs/by-name/ru/rustdesk-server/package.nix similarity index 67% rename from pkgs/servers/rustdesk-server/default.nix rename to pkgs/by-name/ru/rustdesk-server/package.nix index 11aae268c537..9f15d8a80ba0 100644 --- a/pkgs/servers/rustdesk-server/default.nix +++ b/pkgs/by-name/ru/rustdesk-server/package.nix @@ -14,21 +14,26 @@ rustPlatform.buildRustPackage rec { pname = "rustdesk-server"; - version = "1.1.12"; + version = "1.1.14"; src = fetchFromGitHub { owner = "rustdesk"; repo = "rustdesk-server"; rev = version; - hash = "sha256-5QyrI3KLZZcQpudYqghrotLrLjSOhdDFR5eqnJC/0fU="; + hash = "sha256-5LRMey1cxmjLg1s9RtVwgPjHjwYLSQHa6Tyv7r/XEQs="; + fetchSubmodules = true; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "async-speed-limit-0.3.1" = "sha256-iOel6XA07RPrBjQAFLnxXX4VBpDrYZaqQc9clnsOorI="; - "confy-0.4.0" = "sha256-e91cvEixhpPzIthAxzTa3fDY6eCsHUy/eZQAqs7QTDo="; - "tokio-socks-0.5.1" = "sha256-inmAJk0fAlsVNIwfD/M+htwIdQHwGSTRrEy6N/mspMI="; + "confy-0.4.0-2" = "sha256-V7BCKISrkJIxWC3WT5+B5Vav86YTQvdO9TO6A++47FU="; + "default_net-0.1.0" = "sha256-wwVcnS99I1NJFeSihy5YrB5p0y+OHXTX81DQ+TtyFBU="; + "machine-uid-0.3.0" = "sha256-rEOyNThg6p5oqE9URnxSkPtzyW8D4zKzLi9pAnzTElE="; + "reqwest-0.11.23" = "sha256-kEUT+gs4ziknDiGdPMLnj5pmxC5SBpLopZ8jZ34GDWc="; + "sysinfo-0.29.10" = "sha256-/UsFAvlWs/F7X1xT+97Fx+pnpCguoPHU3hTynqYMEs4="; + "tokio-socks-0.5.2-1" = "sha256-i1dfNatqN4dinMcyAdLhj9hJWVsT10OWpCXsxl7pifI="; }; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78a1272fc905..ea87dc31c9ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4928,7 +4928,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - rustdesk-server = callPackage ../servers/rustdesk-server { + rustdesk-server = callPackage ../by-name/ru/rustdesk-server/package.nix { inherit (darwin.apple_sdk.frameworks) Security; }; From 988097a256cd6319b2af0bc4cd676aeafa9108d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Reyrol?= Date: Wed, 12 Feb 2025 09:06:00 +0100 Subject: [PATCH 1360/2168] symfony-cli: 5.10.6 -> 5.10.7 Diff: https://github.com/symfony-cli/symfony-cli/compare/v5.10.6...v5.10.7 Changelog: https://github.com/symfony-cli/symfony-cli/releases/tag/v5.10.7 --- pkgs/by-name/sy/symfony-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sy/symfony-cli/package.nix b/pkgs/by-name/sy/symfony-cli/package.nix index 3364aebb692e..69f52746f194 100644 --- a/pkgs/by-name/sy/symfony-cli/package.nix +++ b/pkgs/by-name/sy/symfony-cli/package.nix @@ -11,14 +11,14 @@ buildGoModule rec { pname = "symfony-cli"; - version = "5.10.6"; + version = "5.10.7"; vendorHash = "sha256-UqaRZPCgjiexeeylfP8p0rye6oc+rWac87p8KbVKrdc="; src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; rev = "v${version}"; - hash = "sha256-II8dPbvi8Ys+7JzzLDPipKHMJDxZOFib3Lv/9qLTjg0="; + hash = "sha256-l4atQdFRA2nwh2OXlF6a24Xe2WCAKbOdySu+r+rcTXQ="; leaveDotGit = true; postFetch = '' git --git-dir $out/.git log -1 --pretty=%cd --date=format:'%Y-%m-%dT%H:%M:%SZ' > $out/SOURCE_DATE From 6e3495c9253f661f202f126d52d43720f7c48153 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Tue, 11 Feb 2025 23:21:17 -0500 Subject: [PATCH 1361/2168] gitbutler: 0.14.4 -> 0.14.7 Diff: https://github.com/gitbutlerapp/gitbutler/compare/refs/tags/release/0.14.4...0.14.7 Changelog: https://github.com/gitbutlerapp/gitbutler/releases/tag/release/0.14.7 --- pkgs/by-name/gi/gitbutler/package.nix | 42 ++++++++++++++++----------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/gi/gitbutler/package.nix b/pkgs/by-name/gi/gitbutler/package.nix index f984ca11b2e4..fcaf71596538 100644 --- a/pkgs/by-name/gi/gitbutler/package.nix +++ b/pkgs/by-name/gi/gitbutler/package.nix @@ -35,37 +35,36 @@ in rustPlatform.buildRustPackage rec { pname = "gitbutler"; - version = "0.14.4"; + version = "0.14.7"; src = fetchFromGitHub { owner = "gitbutlerapp"; repo = "gitbutler"; tag = "release/${version}"; - hash = "sha256-JeiiV7OXRI4xTTQp1dXqT1ozTrIc7cltvZ6yVOhcjGU="; + hash = "sha256-4RWZ1eRUvHj+PU9iNnDsq8k5qHpkAn6g4Zn0cXyUEzM="; }; - # Deactivate the upstream updater, set the version, and merge Tauri's - # configuration files + # Let Tauri know what version we're building # # Remove references to non-existent workspaces in `gix` crates + # + # Deactivate the built-in updater postPatch = '' - jq --slurp \ - '.[0] * .[1] - | .version = "${version}" - | .bundle.createUpdaterArtifacts = false - | .plugins.updater.endpoints = [ ]' \ - crates/gitbutler-tauri/tauri.conf{,.release}.json \ - | sponge crates/gitbutler-tauri/tauri.conf.json + tauriConfRelease="crates/gitbutler-tauri/tauri.conf.release.json" + jq '.version = "${version}" | .bundle.createUpdaterArtifacts = false' "$tauriConfRelease" | sponge "$tauriConfRelease" tomlq -ti 'del(.lints) | del(.workspace.lints)' "$cargoDepsCopy"/gix*/Cargo.toml + + substituteInPlace apps/desktop/src/lib/backend/tauri.ts \ + --replace-fail 'checkUpdate = check;' 'checkUpdate = () => null;' ''; useFetchCargoVendor = true; - cargoHash = "sha256-ooe9in3JfEPMbZSMjobVJpWZdqBTf2AsfEkcsQc0Fts="; + cargoHash = "sha256-f7FMJ4h+gFwHnKwisbn1c7Si2/aPJqxhqQ7ablNu3yo="; pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; - hash = "sha256-bLuKG+7QncLwiwKDrlcHKaSrUmDaJUxdvpdv0Jc6UPo="; + hash = "sha256-w7DGB9OlzXMsgikCbhBcsVQzKx2atSqIOAKF+kfNoTM="; }; nativeBuildInputs = [ @@ -96,7 +95,7 @@ rustPlatform.buildRustPackage rec { tauriBuildFlags = [ "--config" - "crates/gitbutler-tauri/tauri.conf.json" + "crates/gitbutler-tauri/tauri.conf.release.json" ]; nativeCheckInputs = [ git ]; @@ -107,9 +106,18 @@ rustPlatform.buildRustPackage rec { [ "--workspace" ] - # Errors with "Lazy instance has previously been poisoned" - ++ excludeSpec "gitbutler-branch-actions" - ++ excludeSpec "gitbutler-stack"; + ++ lib.concatMap excludeSpec [ + # Requires Git directories + "but-core" + # Fails due to the issues above and below + "but-hunk-dependency" + # Errors with "Lazy instance has previously been poisoned" + "gitbutler-branch-actions" + "gitbutler-stack" + # `Expecting driver to be located at "../../target/debug/gitbutler-cli" - we also assume a certain crate location` + # We're not (usually) building in debug mode and always have a different target directory, so... + "gitbutler-edit-mode" + ]; env = { # Make sure `crates/gitbutler-tauri/inject-git-binaries.sh` can find our From 0b117a31eca0dc9c9c9f897dd4a181535b657790 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakob=20Sch=C3=B6ttl?= Date: Wed, 12 Feb 2025 09:15:24 +0100 Subject: [PATCH 1362/2168] bookstack: fix syntax in option example --- nixos/modules/services/web-apps/bookstack.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/bookstack.nix b/nixos/modules/services/web-apps/bookstack.nix index 696f486cd90a..8c9a776c56f7 100644 --- a/nixos/modules/services/web-apps/bookstack.nix +++ b/nixos/modules/services/web-apps/bookstack.nix @@ -249,7 +249,7 @@ in { OIDC_NAME = "MyLogin"; OIDC_DISPLAY_NAME_CLAIMS = "name"; OIDC_CLIENT_ID = "bookstack"; - OIDC_CLIENT_SECRET = {_secret = "/run/keys/oidc_secret"}; + OIDC_CLIENT_SECRET = {_secret = "/run/keys/oidc_secret";}; OIDC_ISSUER = "https://keycloak.example.com/auth/realms/My%20Realm"; OIDC_ISSUER_DISCOVER = true; } From 6c938f6c5d4690d623005d8141d672766dfd2c77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Reyrol?= Date: Wed, 12 Feb 2025 09:19:46 +0100 Subject: [PATCH 1363/2168] ipatool: 2.1.5 -> 2.1.6 Diff: https://github.com/majd/ipatool/compare/v2.1.5...v2.1.6 Changelog: https://github.com/majd/ipatool/blob/v2.1.6/CHANGELOG.md --- pkgs/by-name/ip/ipatool/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ip/ipatool/package.nix b/pkgs/by-name/ip/ipatool/package.nix index b3803294619b..91610e91f4e3 100644 --- a/pkgs/by-name/ip/ipatool/package.nix +++ b/pkgs/by-name/ip/ipatool/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "ipatool"; - version = "2.1.5"; + version = "2.1.6"; src = fetchFromGitHub { owner = "majd"; repo = "ipatool"; rev = "v${version}"; - hash = "sha256-HniMGlT4RaX7OGcQ6z8Ms6O78dWN4iK+ODzmYfxFNPw="; + hash = "sha256-NdxYrTy8SzPmy3C9wOQYMdzKKumDMeYe+k8Nu2ku/RY="; }; vendorHash = "sha256-/uB4mviMaPyYX59XrRqigOI0YK3necdRC2ZPErai1NU="; From d78e81b69e2a2490d5434844abec7b5c4d2c371c Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Wed, 12 Feb 2025 09:25:38 +0100 Subject: [PATCH 1364/2168] distribution: 3.0.0-rc.2 -> 3.0.0-rc.3 Signed-off-by: Paul Meyer --- pkgs/by-name/di/distribution/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/di/distribution/package.nix b/pkgs/by-name/di/distribution/package.nix index 15e7ec085d51..5ebcba6b3c2b 100644 --- a/pkgs/by-name/di/distribution/package.nix +++ b/pkgs/by-name/di/distribution/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "distribution"; - version = "3.0.0-rc.2"; + version = "3.0.0-rc.3"; src = fetchFromGitHub { owner = "distribution"; repo = "distribution"; tag = "v${version}"; - hash = "sha256-OIym8qenQl/50qUNGKlROyLnbaxfzcVaQhHyIRpEjpA="; + hash = "sha256-GcgEYYBljhRyKiEex6FL4FScg+v0k7Qe7Tq6IsgXVhM="; }; vendorHash = null; From 1708b35228fed3458805fb5cf879d55a1b7d8a9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Reyrol?= Date: Wed, 12 Feb 2025 09:36:53 +0100 Subject: [PATCH 1365/2168] kickstart: add missing cli feature --- pkgs/by-name/ki/kickstart/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ki/kickstart/package.nix b/pkgs/by-name/ki/kickstart/package.nix index aa91fbfe5288..464de7d1ec80 100644 --- a/pkgs/by-name/ki/kickstart/package.nix +++ b/pkgs/by-name/ki/kickstart/package.nix @@ -21,6 +21,8 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-J9sGXJbGbO9UgZfgqxqzbiJz9j6WMpq3qC2ys7OJnII="; + buildFeatures = [ "cli" ]; + checkFlags = [ # remote access "--skip=generation::tests::can_generate_from_remote_repo_with_subdir" From 7b58efdeb98c6508a75226b277b1f4a602612bfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Tue, 11 Feb 2025 08:05:44 +0100 Subject: [PATCH 1366/2168] cinny-{unwrapped,desktop}: 4.2.3 -> 4.3.0 --- pkgs/by-name/ci/cinny-desktop/package.nix | 24 +++++++++------------ pkgs/by-name/ci/cinny-unwrapped/package.nix | 13 +++-------- 2 files changed, 13 insertions(+), 24 deletions(-) diff --git a/pkgs/by-name/ci/cinny-desktop/package.nix b/pkgs/by-name/ci/cinny-desktop/package.nix index b47901d00e9e..e11bf85c123d 100644 --- a/pkgs/by-name/ci/cinny-desktop/package.nix +++ b/pkgs/by-name/ci/cinny-desktop/package.nix @@ -1,7 +1,6 @@ { lib, stdenv, - darwin, fetchFromGitHub, rustPlatform, cargo-tauri_1, @@ -14,33 +13,34 @@ dbus, glib, glib-networking, - libayatana-appindicator, webkitgtk_4_0, }: rustPlatform.buildRustPackage rec { pname = "cinny-desktop"; # We have to be using the same version as cinny-web or this isn't going to work. - version = "4.2.3"; + # TODO: this is temporarily not true for Cinny Desktop v4.3.1 + version = "4.3.1"; src = fetchFromGitHub { owner = "cinnyapp"; repo = "cinny-desktop"; tag = "v${version}"; - hash = "sha256-yNGzgkZXz/VroGGnZFqo5n2v3cE6/tvpQv5U4p27row="; + hash = "sha256-lVBKzajxsQ33zC6NhRLMbWK81GxCbIQPtSR61yJHUL4="; }; sourceRoot = "${src.name}/src-tauri"; useFetchCargoVendor = true; - cargoHash = "sha256-79MO2JaOBKVfiE7OLFR3kobnE2yH5g44mRt2TKIEfxA="; + cargoHash = "sha256-a2IyJ5a11cxgHpb2WRDxVF+aoL8kNnjBNwaQpgT3goo="; postPatch = let cinny' = - assert lib.assertMsg ( - cinny.version == version - ) "cinny.version (${cinny.version}) != cinny-desktop.version (${version})"; + # TODO: temporarily disabled for Cinny Desktop v4.3.1 (cinny-unwrapped is still at 4.3.0) + # assert lib.assertMsg ( + # cinny.version == version + # ) "cinny.version (${cinny.version}) != cinny-desktop.version (${version})"; cinny.override { conf = { hashRouter.enabled = true; @@ -82,16 +82,12 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - dbus - glib ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + dbus + glib glib-networking webkitgtk_4_0 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.DarwinTools - darwin.apple_sdk.frameworks.WebKit ]; meta = { diff --git a/pkgs/by-name/ci/cinny-unwrapped/package.nix b/pkgs/by-name/ci/cinny-unwrapped/package.nix index 7705885f3699..9978f08c32ab 100644 --- a/pkgs/by-name/ci/cinny-unwrapped/package.nix +++ b/pkgs/by-name/ci/cinny-unwrapped/package.nix @@ -9,26 +9,20 @@ cairo, pango, stdenv, - olm, - nodejs_20, }: buildNpmPackage rec { pname = "cinny-unwrapped"; - version = "4.2.3"; + version = "4.3.0"; src = fetchFromGitHub { owner = "cinnyapp"; repo = "cinny"; rev = "v${version}"; - hash = "sha256-BoUQURCfEu5kocMm8T25cVl8hgZGxcxrMzQZOl2fAbY="; + hash = "sha256-cRsjzIq8uFipyYYmxK4JzmG3Ba/0NaScyiebGqoZJFE="; }; - # canvas, a transitive dependency of cinny, fails to build with Node 22 - # https://github.com/Automattic/node-canvas/issues/2448 - nodejs = nodejs_20; - - npmDepsHash = "sha256-fDoia6evCmXZgeIKL0coRo3yunX1dfud31ROgmop2Sc="; + npmDepsHash = "sha256-ZmeXZN9sW17y4aIeIthvs4YiFF77xabeVXGwr6O49lQ="; nativeBuildInputs = [ python3 @@ -55,6 +49,5 @@ buildNpmPackage rec { maintainers = with lib.maintainers; [ abbe ]; license = lib.licenses.agpl3Only; platforms = lib.platforms.all; - inherit (olm.meta) knownVulnerabilities; }; } From 7811100be841d4af298096eff44ab7e0baf09051 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marijan=20Petri=C4=8Devi=C4=87?= Date: Thu, 30 Jan 2025 11:11:55 +0100 Subject: [PATCH 1367/2168] soupault: remove references to ocaml --- pkgs/by-name/so/soupault/package.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/so/soupault/package.nix b/pkgs/by-name/so/soupault/package.nix index 74a42cc54af4..583ced6bbe5d 100644 --- a/pkgs/by-name/so/soupault/package.nix +++ b/pkgs/by-name/so/soupault/package.nix @@ -3,6 +3,8 @@ darwin, fetchzip, ocamlPackages, + ocaml, + removeReferencesTo, soupault, stdenv, testers, @@ -22,9 +24,11 @@ ocamlPackages.buildDunePackage rec { hash = "sha256-UABbrNNcNaN9NgtAjCs4HUoNXMaK4QvCuWERuEnMG6I="; }; - nativeBuildInputs = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ - darwin.sigtool - ]; + nativeBuildInputs = + [ removeReferencesTo ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ + darwin.sigtool + ]; buildInputs = with ocamlPackages; [ base64 @@ -48,6 +52,10 @@ ocamlPackages.buildDunePackage rec { yaml ]; + postFixup = '' + find "$out" -type f -exec remove-references-to -t ${ocaml} '{}' + + ''; + passthru.tests.version = testers.testVersion { package = soupault; command = "soupault --version-number"; From ca22d0a6d5edaefe75d7bbc94e2f0d21824a3c96 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 09:21:45 +0000 Subject: [PATCH 1368/2168] python312Packages.type-infer: 0.0.20 -> 0.0.21 --- pkgs/development/python-modules/type-infer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/type-infer/default.nix b/pkgs/development/python-modules/type-infer/default.nix index 80bc703c8405..eb9f370a0415 100644 --- a/pkgs/development/python-modules/type-infer/default.nix +++ b/pkgs/development/python-modules/type-infer/default.nix @@ -28,7 +28,7 @@ let ]; }; - version = "0.0.20"; + version = "0.0.21"; tag = "v${version}"; in buildPythonPackage rec { @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "mindsdb"; repo = "type_infer"; inherit tag; - hash = "sha256-2Y+NPwUnQMj0oXoCMfUOG40lqduy9GTcqxfyuFDOkHc="; + hash = "sha256-Q5f4WihaT88R+x4jMUuRNBvWglkGdS5oi+o9jOk+tSE="; }; pythonRelaxDeps = [ From 4430156e4115057eac5cb5e1caace7c657498554 Mon Sep 17 00:00:00 2001 From: Pablo Ovelleiro Corral Date: Wed, 12 Feb 2025 10:33:07 +0100 Subject: [PATCH 1369/2168] zk: 0.14.1 -> 0.14.2 --- pkgs/by-name/zk/zk/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/zk/zk/package.nix b/pkgs/by-name/zk/zk/package.nix index ed3381218a5a..4f02ee01d544 100644 --- a/pkgs/by-name/zk/zk/package.nix +++ b/pkgs/by-name/zk/zk/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "zk"; - version = "0.14.1"; + version = "0.14.2"; src = fetchFromGitHub { owner = "zk-org"; repo = "zk"; rev = "v${version}"; - sha256 = "sha256-PbF2k7b03Oo3fIWIN4BHUZJ625HUeX+htT9FTINowIs="; + sha256 = "sha256-h6qQcaAgxWeBzMjxGk7b8vrVu5NO/V6b/ZvZMWtZTpg="; }; - vendorHash = "sha256-UZsJa5hmMQwe9lhrp4ey8GGTkWUF8xJW+LPWMR0qfoo="; + vendorHash = "sha256-2PlaIw7NaW4pAVIituSVWhssSBKjowLOLuBV/wz829I="; doCheck = false; From 2e5112ad438ae58fcb7d3a729ebe30392413dd13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=B9=82=E0=B8=97=E0=B8=AA=E0=B8=BA=E0=B8=95=E0=B8=B1?= =?UTF-8?q?=E0=B8=A5?= Date: Wed, 12 Feb 2025 16:33:47 +0700 Subject: [PATCH 1370/2168] h2o: wrap executables with perl --- pkgs/by-name/h2/h2o/package.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix index c1f29fc62e27..9fbe8b8ca21a 100644 --- a/pkgs/by-name/h2/h2o/package.nix +++ b/pkgs/by-name/h2/h2o/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, pkg-config, cmake, + makeWrapper, ninja, perl, brotli, @@ -35,18 +36,27 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config cmake + makeWrapper ninja - perl ]; buildInputs = [ brotli openssl libcap libuv + perl zlib wslay ]; + postInstall = '' + EXES="$(find "$out/share/h2o" -type f -executable)" + for exe in $EXES; do + wrapProgram "$exe" \ + --set "H2O_PERL" "${lib.getExe perl}" + done + ''; + meta = with lib; { description = "Optimized HTTP/1.x, HTTP/2, HTTP/3 server"; homepage = "https://h2o.examp1e.net"; From bbfa15a71d06c3afea8efa70ddee4232e76b04cf Mon Sep 17 00:00:00 2001 From: NullCube Date: Wed, 12 Feb 2025 01:49:44 -0800 Subject: [PATCH 1371/2168] ckan: add nullcube to maintainers --- pkgs/by-name/ck/ckan/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ck/ckan/package.nix b/pkgs/by-name/ck/ckan/package.nix index d7e846f579a6..14fce13de723 100644 --- a/pkgs/by-name/ck/ckan/package.nix +++ b/pkgs/by-name/ck/ckan/package.nix @@ -83,6 +83,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ Baughn ymarkus + nullcube ]; platforms = platforms.all; }; From 3cef8df29527334e752e06c9c38ac3b5e68c72aa Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 11 Feb 2025 00:03:10 +0100 Subject: [PATCH 1372/2168] python312Packages.miniupnpc: fix build --- .../python-modules/miniupnpc/default.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/miniupnpc/default.nix b/pkgs/development/python-modules/miniupnpc/default.nix index 1169a7a0c946..eb3d302411d3 100644 --- a/pkgs/development/python-modules/miniupnpc/default.nix +++ b/pkgs/development/python-modules/miniupnpc/default.nix @@ -3,6 +3,8 @@ lib, buildPythonPackage, fetchPypi, + fetchpatch, + setuptools, cctools, which, }: @@ -10,13 +12,26 @@ buildPythonPackage rec { pname = "miniupnpc"; version = "2.3.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-AvnUqth2igy4xGvDC+C6jOwUi2005NDvmfrbec+JrzE="; }; + patches = [ + # TODO: remove this patch when updating to the next release + (fetchpatch { + url = "https://github.com/miniupnp/miniupnp/commit/f79ae6738d10af633844dcf3ecd9c587e8f9508d.patch"; + stripLen = 1; + hash = "sha256-g+D9Cw5knTy5a7M0wAQkw8MZ6iZR8RQUT6A0WAc6Q5U="; + }) + ]; + + build-system = [ + setuptools + ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ cctools which From 7309a1da2598f7e791cd7fea932b30f88492cdef Mon Sep 17 00:00:00 2001 From: Pablo Ovelleiro Corral Date: Wed, 12 Feb 2025 10:35:26 +0100 Subject: [PATCH 1373/2168] Add update script --- pkgs/by-name/zk/zk/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/zk/zk/package.nix b/pkgs/by-name/zk/zk/package.nix index 4f02ee01d544..78cfb7ae281a 100644 --- a/pkgs/by-name/zk/zk/package.nix +++ b/pkgs/by-name/zk/zk/package.nix @@ -2,6 +2,7 @@ lib, fetchFromGitHub, buildGoModule, + nix-update-script, }: buildGoModule rec { @@ -28,6 +29,8 @@ buildGoModule rec { "-X=main.Version=${version}" ]; + passthru.updateScript = nix-update-script { }; + tags = [ "fts5" ]; meta = with lib; { From 0892003d799c8c2f6ff58aa395ba0c4cc75e2902 Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Wed, 12 Feb 2025 09:56:26 +0000 Subject: [PATCH 1374/2168] mastodon: remove workspace package with broken symlinks --- pkgs/servers/mastodon/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/servers/mastodon/default.nix b/pkgs/servers/mastodon/default.nix index 6c71ac6e7b4f..f1f96a2d0b4b 100644 --- a/pkgs/servers/mastodon/default.nix +++ b/pkgs/servers/mastodon/default.nix @@ -74,6 +74,10 @@ stdenv.mkDerivation rec { yarn cache clean --all rm -rf ~/node_modules/.cache + # Remove workspace "package" as it contains broken symlinks + # See https://github.com/NixOS/nixpkgs/issues/380366 + rm -rf ~/node_modules/@mastodon + # Remove execute permissions find ~/public/assets -type f ! -perm 0555 \ -exec chmod 0444 {} ';' From e381ae76647f05aad7c76651acf0fef2b35aa63b Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 12 Feb 2025 11:13:58 +0100 Subject: [PATCH 1375/2168] webdav: 5.7.2 -> 5.7.3 Diff: https://github.com/hacdias/webdav/compare/refs/tags/v5.7.2...v5.7.3 --- pkgs/by-name/we/webdav/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/we/webdav/package.nix b/pkgs/by-name/we/webdav/package.nix index 6f29b60882a4..1e30d40a9776 100644 --- a/pkgs/by-name/we/webdav/package.nix +++ b/pkgs/by-name/we/webdav/package.nix @@ -2,13 +2,13 @@ buildGo123Module rec { pname = "webdav"; - version = "5.7.2"; + version = "5.7.3"; src = fetchFromGitHub { owner = "hacdias"; repo = "webdav"; tag = "v${version}"; - hash = "sha256-Xr42ZGzgwt0ipllpsnTsEOP1IxCBaDMd19rYpI7R19o="; + hash = "sha256-f/EYuaLuF9HuoC2S4JHjtgau2ZmOocRIAtxXqnUpUE8="; }; vendorHash = "sha256-x5CUy46c4SunzMw/v2DWpdahuXFZnJdGInQ0lSho/es="; @@ -18,6 +18,7 @@ buildGo123Module rec { meta = { description = "Simple WebDAV server"; homepage = "https://github.com/hacdias/webdav"; + changelog = "https://github.com/hacdias/webdav/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ pmy From 9d3b731919337f5bd0cc51a611ab533e6b89798c Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 12 Feb 2025 11:35:24 +0100 Subject: [PATCH 1376/2168] treewide: (erratum) remove AndersonTorres from maintainers --- pkgs/by-name/gm/gmic/package.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/by-name/gm/gmic/package.nix b/pkgs/by-name/gm/gmic/package.nix index 8e9097c95bf0..0a56e72ae815 100644 --- a/pkgs/by-name/gm/gmic/package.nix +++ b/pkgs/by-name/gm/gmic/package.nix @@ -144,9 +144,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Open and full-featured framework for image processing"; mainProgram = "gmic"; license = lib.licenses.cecill21; - maintainers = [ - lib.maintainers. - ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; }) From 7bb6d75d5d09b2f6ab90a82673556523c5d2469e Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 12 Feb 2025 11:49:54 +0100 Subject: [PATCH 1377/2168] python312Packages.scim2-client: fix build --- pkgs/development/python-modules/scim2-client/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/scim2-client/default.nix b/pkgs/development/python-modules/scim2-client/default.nix index 4ccad9101413..47a056103ca8 100644 --- a/pkgs/development/python-modules/scim2-client/default.nix +++ b/pkgs/development/python-modules/scim2-client/default.nix @@ -12,6 +12,7 @@ scim2-server, httpx, werkzeug, + cacert, }: buildPythonPackage rec { @@ -39,6 +40,7 @@ buildPythonPackage rec { pytest-asyncio scim2-server werkzeug + cacert ] ++ optional-dependencies.httpx; # Werkzeug returns 500, didn't deem it worth it to investigate From 41a6a8957404830427c65ac7e8d9ba9562da49f4 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 12 Feb 2025 11:49:59 +0100 Subject: [PATCH 1378/2168] python312Packages.scim2-tester: fix build --- pkgs/development/python-modules/scim2-tester/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/scim2-tester/default.nix b/pkgs/development/python-modules/scim2-tester/default.nix index 2125a7706e86..29a4853f8a5f 100644 --- a/pkgs/development/python-modules/scim2-tester/default.nix +++ b/pkgs/development/python-modules/scim2-tester/default.nix @@ -9,6 +9,7 @@ werkzeug, scim2-server, pytest-httpserver, + cacert, }: buildPythonPackage rec { @@ -34,6 +35,7 @@ buildPythonPackage rec { werkzeug scim2-server pytest-httpserver + cacert ] ++ optional-dependencies.httpx; pythonImportsCheck = [ "scim2_tester" ]; From 75f37a75239c8eb11aa3dc5bc7f6920c1e8b6efe Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Wed, 12 Feb 2025 11:22:44 +0000 Subject: [PATCH 1379/2168] write-good: remove `node_modules/.bin` Fixes the build by removing broken symlinks. --- pkgs/by-name/wr/write-good/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/wr/write-good/package.nix b/pkgs/by-name/wr/write-good/package.nix index 96799b30e910..c682e732de98 100644 --- a/pkgs/by-name/wr/write-good/package.nix +++ b/pkgs/by-name/wr/write-good/package.nix @@ -19,6 +19,11 @@ buildNpmPackage rec { dontNpmBuild = true; + postInstall = '' + # Remove the .bin directory as it contains broken symlinks + rm -rf $out/lib/node_modules/write-good/node_modules/.bin + ''; + meta = { description = "Naive linter for English prose"; homepage = "https://github.com/btford/write-good"; From f3b55381f2c1739de62a95bca77248f97aba55b7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 11:23:52 +0000 Subject: [PATCH 1380/2168] python312Packages.discovery30303: 0.3.2 -> 0.3.3 --- pkgs/development/python-modules/discovery30303/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/discovery30303/default.nix b/pkgs/development/python-modules/discovery30303/default.nix index 15b5a1fc89b7..1b877818e397 100644 --- a/pkgs/development/python-modules/discovery30303/default.nix +++ b/pkgs/development/python-modules/discovery30303/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "discovery30303"; - version = "0.3.2"; + version = "0.3.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "discovery30303"; tag = "v${version}"; - hash = "sha256-P31P5GjIrMotdIXqqZ6LCbk5MIl2Kq4MzlWDw+aOcrE="; + hash = "sha256-QIGLRe+nUV3tUOs+pu6Qk/2Amh9IVcQq89o2JeKiTvM="; }; postPatch = '' @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to discover devices that respond on port 30303"; homepage = "https://github.com/bdraco/discovery30303"; - changelog = "https://github.com/bdraco/discovery30303/releases/tag/v${version}"; + changelog = "https://github.com/bdraco/discovery30303/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; From ca4211745090043851e2bb7ffb1c853d755e081c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Wed, 12 Feb 2025 10:23:19 +0100 Subject: [PATCH 1381/2168] haskellPackages.pango: patch to make gtk build with newer (>= 1.56) pango --- pkgs/development/haskell-modules/configuration-common.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 36a5285a6482..25016b493040 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -206,6 +206,14 @@ self: super: { # Too strict lower bound on lens, drop with LTS 23 provide = doJailbreak super.provide; # Too strict bounds on quickcheck-instances/tasty-qickcheck, drop with LTS 23 + + # make gtk build with pango >= 1.56: https://github.com/gtk2hs/gtk2hs/issues/337 + pango = appendPatch (pkgs.fetchpatch { + url = "https://github.com/gtk2hs/gtk2hs/pull/336/commits/ca7f98bd3e9462deac3661244dc76004a36fc8c3.patch"; + hash = "sha256-fsZIwh4MY3Jnr3Gv4vZKl/LwUsJ+H+7KJ8unARQBifE="; + stripLen = 1; + }) super.pango; + lawful-conversions = doJailbreak super.lawful-conversions; # Out of date test data: https://github.com/ocharles/weeder/issues/176 From 055d481453a81170a796b3e8576c4dbfe690f16e Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Tue, 11 Feb 2025 17:16:05 +0100 Subject: [PATCH 1382/2168] xnec2c: use finalAttrs pattern --- pkgs/by-name/xn/xnec2c/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/xn/xnec2c/package.nix b/pkgs/by-name/xn/xnec2c/package.nix index aa9ad3322f3e..7e6e13526de7 100644 --- a/pkgs/by-name/xn/xnec2c/package.nix +++ b/pkgs/by-name/xn/xnec2c/package.nix @@ -13,12 +13,12 @@ assert (!blas.isILP64) && (!lapack.isILP64); -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xnec2c"; version = "4.4.16"; src = fetchurl { - url = "https://www.xnec2c.org/releases/${pname}-v${version}.tar.gz"; + url = "https://www.xnec2c.org/releases/${finalAttrs.pname}-v${finalAttrs.version}.tar.gz"; hash = "sha256-XiZi8pfmfHjGpePkRy/pF1TA+5RdxX4AGuKzG5Wqrmk="; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { # Darwin support likely to be fixed upstream in the next release broken = stdenv.hostPlatform.isDarwin; }; -} +}) From 00c05c84d9499de1f1f8df2c8da750454d9c4ede Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Tue, 11 Feb 2025 17:16:54 +0100 Subject: [PATCH 1383/2168] xnec2c: remove use of with lib; --- pkgs/by-name/xn/xnec2c/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/xn/xnec2c/package.nix b/pkgs/by-name/xn/xnec2c/package.nix index 7e6e13526de7..4e877ab95eda 100644 --- a/pkgs/by-name/xn/xnec2c/package.nix +++ b/pkgs/by-name/xn/xnec2c/package.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation (finalAttrs: { lapack ]; - meta = with lib; { + meta = { homepage = "https://www.xnec2c.org/"; description = "Graphical antenna simulation"; mainProgram = "xnec2c"; - license = licenses.gpl3; - maintainers = with maintainers; [ mvs ]; - platforms = platforms.unix; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ mvs ]; + platforms = lib.platforms.unix; # Darwin support likely to be fixed upstream in the next release broken = stdenv.hostPlatform.isDarwin; From 4e16ef2206ff55fc14102f50e3f54b5751f01917 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Wed, 12 Feb 2025 11:32:46 +0100 Subject: [PATCH 1384/2168] xnec2c: switch to GitHub source --- pkgs/by-name/xn/xnec2c/package.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/xn/xnec2c/package.nix b/pkgs/by-name/xn/xnec2c/package.nix index 4e877ab95eda..ac7d37291269 100644 --- a/pkgs/by-name/xn/xnec2c/package.nix +++ b/pkgs/by-name/xn/xnec2c/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, autoreconfHook, wrapGAppsHook3, pkg-config, @@ -17,9 +17,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "xnec2c"; version = "4.4.16"; - src = fetchurl { - url = "https://www.xnec2c.org/releases/${finalAttrs.pname}-v${finalAttrs.version}.tar.gz"; - hash = "sha256-XiZi8pfmfHjGpePkRy/pF1TA+5RdxX4AGuKzG5Wqrmk="; + src = fetchFromGitHub { + owner = "KJ7LNW"; + repo = "xnec2c"; + tag = "v${finalAttrs.version}"; + hash = "sha256-W8JwbCSXt5cjgncOzV1wltPnJxwWC6B29eaT8emIU9Y="; }; nativeBuildInputs = [ From ceb84ba454f3f2562f4fe71e6c22046ac82d3708 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Wed, 12 Feb 2025 11:33:12 +0100 Subject: [PATCH 1385/2168] xnec2c: provide update script --- pkgs/by-name/xn/xnec2c/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/xn/xnec2c/package.nix b/pkgs/by-name/xn/xnec2c/package.nix index ac7d37291269..5daa9c72b5f4 100644 --- a/pkgs/by-name/xn/xnec2c/package.nix +++ b/pkgs/by-name/xn/xnec2c/package.nix @@ -9,6 +9,7 @@ gtk3, blas, lapack, + nix-update-script, }: assert (!blas.isILP64) && (!lapack.isILP64); @@ -36,6 +37,8 @@ stdenv.mkDerivation (finalAttrs: { lapack ]; + passthru.updateScript = nix-update-script { }; + meta = { homepage = "https://www.xnec2c.org/"; description = "Graphical antenna simulation"; From 27415d9ccd19f5a65f3504d0d1f08fe62871bcf7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 11:59:14 +0000 Subject: [PATCH 1386/2168] crowdin-cli: 4.5.2 -> 4.6.0 --- pkgs/by-name/cr/crowdin-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cr/crowdin-cli/package.nix b/pkgs/by-name/cr/crowdin-cli/package.nix index 6cdea35be0bf..1ce35eae61b8 100644 --- a/pkgs/by-name/cr/crowdin-cli/package.nix +++ b/pkgs/by-name/cr/crowdin-cli/package.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "crowdin-cli"; - version = "4.5.2"; + version = "4.6.0"; src = fetchurl { url = "https://github.com/crowdin/crowdin-cli/releases/download/${finalAttrs.version}/crowdin-cli.zip"; - hash = "sha256-gg9cBN0N4KGHW6i56uO5+UE1YJFMa2aQ8nJV8JPSvmU="; + hash = "sha256-+0UrYb3gz7rcbL2Z/SLLcJVkSnNr/5Mmfsl0vbfOQcI="; }; nativeBuildInputs = [ From fbc4985a3d332fa446b25b582a601aad48d6543c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 12:02:56 +0000 Subject: [PATCH 1387/2168] containerlab: 0.62.2 -> 0.64.0 --- pkgs/by-name/co/containerlab/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/containerlab/package.nix b/pkgs/by-name/co/containerlab/package.nix index 4811830f1fa4..344de3f1a181 100644 --- a/pkgs/by-name/co/containerlab/package.nix +++ b/pkgs/by-name/co/containerlab/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "containerlab"; - version = "0.62.2"; + version = "0.64.0"; src = fetchFromGitHub { owner = "srl-labs"; repo = "containerlab"; rev = "v${version}"; - hash = "sha256-RUe/IHHhZKbxtNVxiS29/OPvpCCOzaz2d5Qh3vVll3U="; + hash = "sha256-ijqylVQKt7N3rc+HVc34XfU3LMXAtn+mhVWIzZZIikw="; }; - vendorHash = "sha256-G9W4iC04R5Rvl3hAJtMlUKJKo7AAIE33Y2c+0HedXU8="; + vendorHash = "sha256-9p4J9qkIQCubn3W4b3qNHfq1M2kMiqG0eGFaBxGdrAk="; nativeBuildInputs = [ installShellFiles ]; From 373763f960303dfc44e5f9f2d017c51797c0976b Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Tue, 11 Feb 2025 14:22:34 +0100 Subject: [PATCH 1388/2168] coqPackages.vcfloat: 2.2 -> 2.3 --- pkgs/development/coq-modules/vcfloat/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/coq-modules/vcfloat/default.nix b/pkgs/development/coq-modules/vcfloat/default.nix index 7e9aca3ea7d9..099efcfc6bb9 100644 --- a/pkgs/development/coq-modules/vcfloat/default.nix +++ b/pkgs/development/coq-modules/vcfloat/default.nix @@ -21,6 +21,10 @@ let defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { + case = isEq "8.20"; + out = "2.3"; + } { case = isEq "8.19"; out = "2.2"; @@ -30,6 +34,7 @@ let out = "2.1.1"; } ] null; + release."2.3".sha256 = "sha256-fV7w/kYTpcBxrHFzEvx+eydDHbGH05/seucrgSjKK3w="; release."2.2".sha256 = "sha256-PyMm84ZYh+dOnl8Kk2wlYsQ+S/d1Hsp6uv2twTedEPg="; release."2.1.1".sha256 = "sha256-bd/XSQhyFUAnSm2bhZEZBWB6l4/Ptlm9JrWu6w9BOpw="; releaseRev = v: "v${v}"; From 36282bc158cc425a3323caabe02d7642eb5d9fd3 Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Tue, 11 Feb 2025 14:26:16 +0100 Subject: [PATCH 1389/2168] coqPackages.gappalib: 1.1.5 -> 1.6.0 --- pkgs/development/coq-modules/gappalib/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/gappalib/default.nix b/pkgs/development/coq-modules/gappalib/default.nix index 0a35f9951125..1cb79667346e 100644 --- a/pkgs/development/coq-modules/gappalib/default.nix +++ b/pkgs/development/coq-modules/gappalib/default.nix @@ -13,7 +13,8 @@ mkCoqDerivation { owner = "gappa"; domain = "gitlab.inria.fr"; inherit version; - defaultVersion = if lib.versions.range "8.8" "8.20" coq.coq-version then "1.5.5" else null; + defaultVersion = if lib.versions.range "8.8" "8.20" coq.coq-version then "1.6.0" else null; + release."1.6.0".sha256 = "sha256-GQls31TT4y3h18RUxAX+LpHIKon5UvDfW1GuURRKeKA="; release."1.5.5".sha256 = "sha256-qxi2Kg3N3o6+ncq7aPNEg98dBmQC5WCa86zROPJSDdo="; release."1.5.4".sha256 = "sha256-9PlkXqCu4rbFD7qnMF1GSpPCVmwJ3r593RfAvkJbbdA="; release."1.5.3".sha256 = "sha256-SuMopX5sm4jh2uBuE7zr6vhWhHYZYnab+epjqYJqg+s="; From a69b193a613c1efc77382e3d8e1967b78186f5fd Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Tue, 11 Feb 2025 14:31:05 +0100 Subject: [PATCH 1390/2168] coqPackages.autosubst-ocaml: 1.1+8.19 -> 1.1+8.20 --- pkgs/development/coq-modules/autosubst-ocaml/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/coq-modules/autosubst-ocaml/default.nix b/pkgs/development/coq-modules/autosubst-ocaml/default.nix index 85b440c12168..cdf649a82704 100644 --- a/pkgs/development/coq-modules/autosubst-ocaml/default.nix +++ b/pkgs/development/coq-modules/autosubst-ocaml/default.nix @@ -9,12 +9,17 @@ mkCoqDerivation { pname = "autosubst-ocaml"; owner = "uds-psl"; + release."1.1+8.20".sha256 = "sha256-S3uKkwbGFsvauP9lKc3UsdszHahbZQhlOOK3fCBXlSE="; release."1.1+8.19".sha256 = "sha256-AGbhw/6lg4GpDE6hZBhau9DLW7HVXa0UzGvJfSV8oHE="; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { + case = isEq "8.20"; + out = "1.1+8.20"; + } { case = isEq "8.19"; out = "1.1+8.19"; From e09c5f4a4ba8eebdbb7301e0e1af59bc801b0981 Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Tue, 11 Feb 2025 14:36:59 +0100 Subject: [PATCH 1391/2168] coqPackages.flocq: 4.2.0 -> 4.2.1 --- pkgs/development/coq-modules/flocq/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/coq-modules/flocq/default.nix b/pkgs/development/coq-modules/flocq/default.nix index 9cbf093b7273..091b5275d7a4 100644 --- a/pkgs/development/coq-modules/flocq/default.nix +++ b/pkgs/development/coq-modules/flocq/default.nix @@ -16,6 +16,10 @@ mkCoqDerivation { defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { + case = range "8.15" "9.0"; + out = "4.2.1"; + } { case = range "8.14" "8.20"; out = "4.2.0"; @@ -41,6 +45,7 @@ mkCoqDerivation { out = "2.6.1"; } ] null; + release."4.2.1".sha256 = "sha256-W5hcAm0GGmNsvre79/iGNcoBwFzStC4G177hZ3ds/4E="; release."4.2.0".sha256 = "sha256-uTeo4GCs6wTLN3sLKsj0xLlt1fUDYfozXtq6iooLUgM="; release."4.1.4".sha256 = "sha256-Use6Mlx79yef1CkCPyGoOItsD69B9KR+mQArCtmre4s="; release."4.1.3".sha256 = "sha256-os3cI885xNpxI+1p5rb8fSNnxKr7SFxqh83+3AM3t4I="; From dc9ccaf403f5a5f8d3ecd4b1c06466dd5f018c74 Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Tue, 11 Feb 2025 14:38:36 +0100 Subject: [PATCH 1392/2168] coqPackages/coquelicot: 3.4.2 -> 3.4.3 --- pkgs/development/coq-modules/coquelicot/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/coq-modules/coquelicot/default.nix b/pkgs/development/coq-modules/coquelicot/default.nix index 680e154de68a..806d7d1304b9 100644 --- a/pkgs/development/coq-modules/coquelicot/default.nix +++ b/pkgs/development/coq-modules/coquelicot/default.nix @@ -15,6 +15,10 @@ mkCoqDerivation { defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { + case = range "8.12" "9.0"; + out = "3.4.3"; + } { case = range "8.12" "8.20"; out = "3.4.2"; @@ -40,6 +44,7 @@ mkCoqDerivation { out = "3.0.2"; } ] null; + release."3.4.3".sha256 = "sha256-bzzAIENU2OYTtmdBU9Xw8zyBvz9vqTiqjWSm7RnXXRA="; release."3.4.2".sha256 = "sha256-aBTF8ZKu67Rb3ryCqFyejUXf/65KgG8i5je/ZMFSrj4="; release."3.4.1".sha256 = "sha256-REhvIBl3EaL8CQqI34Gn7Xjf9NhPI3nrUAO26pSLbm0="; release."3.4.0".sha256 = "sha256-LIj2SwTvVBxSAO58VYCQix/uxQQe8ey6hqFOSh3PNcg="; From 2085f632ea5c5e55b78519d1f4f2f56042e85f18 Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Tue, 11 Feb 2025 14:43:45 +0100 Subject: [PATCH 1393/2168] coqPackages.metacoq: 1.3.4-8.20 -> 1.3.4-9.0 --- pkgs/development/coq-modules/ElmExtraction/default.nix | 2 +- pkgs/development/coq-modules/metacoq/default.nix | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/ElmExtraction/default.nix b/pkgs/development/coq-modules/ElmExtraction/default.nix index 73b526cc0a67..cb4bc717f1d2 100644 --- a/pkgs/development/coq-modules/ElmExtraction/default.nix +++ b/pkgs/development/coq-modules/ElmExtraction/default.nix @@ -25,7 +25,7 @@ mkCoqDerivation { [ { cases = [ - (range "8.17" "9.0") + (range "8.17" "8.20") (range "1.3.1" "1.3.4") ]; out = "0.1.0"; diff --git a/pkgs/development/coq-modules/metacoq/default.nix b/pkgs/development/coq-modules/metacoq/default.nix index ba94bf8c5d1f..ea39fb8f9b38 100644 --- a/pkgs/development/coq-modules/metacoq/default.nix +++ b/pkgs/development/coq-modules/metacoq/default.nix @@ -49,6 +49,10 @@ let case = "8.20"; out = "1.3.4-8.20"; } + { + case = "9.0"; + out = "1.3.4-9.0"; + } ] null; release = { "1.0-beta2-8.11".sha256 = "sha256-I9YNk5Di6Udvq5/xpLSNflfjRyRH8fMnRzbo3uhpXNs="; @@ -69,6 +73,7 @@ let "1.3.2-8.20".sha256 = "sha256-4J7Ly4Fc2E/I6YqvzTLntVVls5t94OUOjVMKJyyJdw8="; "1.3.3-8.19".sha256 = "sha256-SBTv49zQXZ+oGvIqWM53hjBKru9prFgZRv8gVgls40k="; "1.3.4-8.20".sha256 = "sha256-ofRP0Uo48G2LBuIy/5ZLyK+iVZXleKiwfMEBD0rX9fQ="; + "1.3.4-9.0".sha256 = "sha256-BiAeuwL6WvDNs+ZGzPWj59kTS69J4kjrS3XIZyzpLOQ="; }; releaseRev = v: "v${v}"; From 297c1be31e20ad287bcee77267ca51f189d34af1 Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Tue, 11 Feb 2025 14:46:36 +0100 Subject: [PATCH 1394/2168] coqPackages.corn: 8.19 -> 8.20 --- pkgs/development/coq-modules/corn/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/coq-modules/corn/default.nix b/pkgs/development/coq-modules/corn/default.nix index 05da9b148cb5..a6f8ab00d043 100644 --- a/pkgs/development/coq-modules/corn/default.nix +++ b/pkgs/development/coq-modules/corn/default.nix @@ -14,6 +14,10 @@ defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { + case = (range "8.18" "8.20"); + out = "8.20.0"; + } { case = (range "8.17" "8.20"); out = "8.19.0"; @@ -42,6 +46,7 @@ "8.16.0".sha256 = "sha256-ZE/EEIndxHfo/9Me5NX4ZfcH0ZAQ4sRfZY7LRZfLXBQ="; "8.18.0".sha256 = "sha256-ow3mfarZ1PvBGf5WLnI8LdF3E+8A6fN7cOcXHrZJLo0="; "8.19.0".sha256 = "sha256-h5MlfRuv2hTbxGmpLUEGQO1YqQTwUNEHZzCfvdOU1TA="; + "8.20.0".sha256 = "sha256-tl68REU6xTbSOzhPucQPd9A3YnnaMNbSY8gl4Seyp10="; }; configureScript = "./configure.sh"; From 9b34de6f44656d917c478c7e3674550aad11ba0a Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Tue, 11 Feb 2025 14:48:00 +0100 Subject: [PATCH 1395/2168] coqPackages.multinomials: compiles on rocq 9.0 --- pkgs/development/coq-modules/multinomials/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/multinomials/default.nix b/pkgs/development/coq-modules/multinomials/default.nix index b79561b17ada..e20117d8393a 100644 --- a/pkgs/development/coq-modules/multinomials/default.nix +++ b/pkgs/development/coq-modules/multinomials/default.nix @@ -26,7 +26,7 @@ mkCoqDerivation { [ { cases = [ - (range "8.17" "8.20") + (range "8.17" "9.0") (isGe "2.1.0") ]; out = "2.3.0"; From 82dc1d72251cca2e45e654fc1cfe62aee9b69538 Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Tue, 11 Feb 2025 14:54:17 +0100 Subject: [PATCH 1396/2168] coqPackages.VST: 2.14 -> 2.15 --- pkgs/development/coq-modules/VST/default.nix | 7 ++++++- pkgs/top-level/coq-packages.nix | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/coq-modules/VST/default.nix b/pkgs/development/coq-modules/VST/default.nix index d82699847d01..a7d8b805f067 100644 --- a/pkgs/development/coq-modules/VST/default.nix +++ b/pkgs/development/coq-modules/VST/default.nix @@ -36,6 +36,10 @@ mkCoqDerivation { defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { + case = range "8.19" "8.20"; + out = "2.15"; + } { case = range "8.15" "8.19"; out = "2.14"; @@ -57,6 +61,7 @@ mkCoqDerivation { out = "2.8"; } ] null; + release."2.15".sha256 = "sha256-51k2W4efMaEO4nZ0rdkRT9rA8ZJLpot1YpFmd6RIAXw="; release."2.14".sha256 = "sha256-NHc1ZQ2VmXZy4lK2+mtyeNz1Qr9Nhj2QLxkPhhQB7Iw="; release."2.13".sha256 = "sha256-i6rvP3cpayBln5KHZOpeNfraYU5h0O9uciBQ4jRH4XA="; release."2.12".sha256 = "sha256-4HL0U4HA5/usKNXC0Dis1UZY/Hb/LRd2IGOrqrvdWkw="; @@ -71,7 +76,7 @@ mkCoqDerivation { preConfigure = '' patchShebangs util substituteInPlace Makefile \ - --replace 'COQVERSION= ' 'COQVERSION= 8.19.2 or-else 8.17.1 or-else 8.16.1 or-else 8.16.0 or-else 8.15.2 or-else 8.15.1 or-else '\ + --replace 'COQVERSION= ' 'COQVERSION= 8.20.1 or-else 8.19.2 or-else 8.17.1 or-else 8.16.1 or-else 8.16.0 or-else 8.15.2 or-else 8.15.1 or-else '\ --replace 'FLOYD_FILES=' 'FLOYD_FILES= ${toString extra_floyd_files}' ''; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 1974d65304fa..372c95eb3df4 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -171,7 +171,7 @@ let (lib.versionAtLeast self.coq.version "8.14") { compcert = self.compcert.override { version = with lib.versions; lib.switch self.coq.version [ - { case = range "8.15" "8.19"; out = "3.13.1"; } + { case = range "8.15" "8.18"; out = "3.13.1"; } { case = isEq "8.14"; out = "3.11"; } ] null; }; From d63e1f3f4d41644fa8dac1031403b11142363d82 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Wed, 12 Feb 2025 13:08:35 +0100 Subject: [PATCH 1397/2168] gitlab: 17.8.1 -> 17.8.2 https://about.gitlab.com/releases/2025/02/12/patch-release-gitlab-17-8-2-released/ --- .../applications/version-management/gitlab/data.json | 12 ++++++------ .../gitlab/gitlab-workhorse/default.nix | 2 +- pkgs/by-name/gi/gitaly/package.nix | 4 ++-- pkgs/by-name/gi/gitlab-pages/package.nix | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 2e9a7042d6e3..585267211f07 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "17.8.1", - "repo_hash": "17m0aw8gd58gs1vxzk6pbqnhrhkvc172kn47pj5p6sgq3li3mcgf", + "version": "17.8.2", + "repo_hash": "09f9dmj4rhifkbxrc350479v6f8ibd2yb5vsn9nzxfmd8zjn00zz", "yarn_hash": "0d1nzgji3y90gcx92pl0bnqlj5h9ra3r7k1z673fvsj6lzppnx8v", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v17.8.1-ee", + "rev": "v17.8.2-ee", "passthru": { - "GITALY_SERVER_VERSION": "17.8.1", - "GITLAB_PAGES_VERSION": "17.8.1", + "GITALY_SERVER_VERSION": "17.8.2", + "GITLAB_PAGES_VERSION": "17.8.2", "GITLAB_SHELL_VERSION": "14.39.0", "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.4.0", - "GITLAB_WORKHORSE_VERSION": "17.8.1" + "GITLAB_WORKHORSE_VERSION": "17.8.2" } } diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index cb1d66938b5c..d3c675ae46ba 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "17.8.1"; + version = "17.8.2"; # nixpkgs-update: no auto update src = fetchFromGitLab { diff --git a/pkgs/by-name/gi/gitaly/package.nix b/pkgs/by-name/gi/gitaly/package.nix index 559fdd8166a3..882c3d883051 100644 --- a/pkgs/by-name/gi/gitaly/package.nix +++ b/pkgs/by-name/gi/gitaly/package.nix @@ -7,7 +7,7 @@ }: let - version = "17.8.1"; + version = "17.8.2"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -21,7 +21,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-ahYvfA1PvB/OP3swTABH++pZubejsb3Cohy+Z5fcAo4="; + hash = "sha256-/bUXtdczGbbLQWvhDOM9Un9SowIRImct9LNQ0gD4hHw="; }; vendorHash = "sha256-rR3dsKUoIVDj0NviN8p8g3mSAW8PTNChBacqd23yDf8="; diff --git a/pkgs/by-name/gi/gitlab-pages/package.nix b/pkgs/by-name/gi/gitlab-pages/package.nix index cd7a28d1b957..af3484a40697 100644 --- a/pkgs/by-name/gi/gitlab-pages/package.nix +++ b/pkgs/by-name/gi/gitlab-pages/package.nix @@ -6,14 +6,14 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "17.8.1"; + version = "17.8.2"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-h+8sgBWYBClrfIsvnD1cUMRE9cxOtfjrGpss2tYdzDg="; + hash = "sha256-NbqdgCl/dxwOkjaKYAUipN5/b+/dMINFVkv/zynBXdI="; }; vendorHash = "sha256-2UtdooVoyoWr4yOPCRBAjkftn29DhJonpJSguHwfHNE="; From b8fe8bd73d55b737ec00614e447b5ed03b9c8ce7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 12:18:17 +0000 Subject: [PATCH 1398/2168] gomi: 1.1.8 -> 1.3.2 --- pkgs/by-name/go/gomi/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/gomi/package.nix b/pkgs/by-name/go/gomi/package.nix index 51d5fdf850cd..c54911b62e9f 100644 --- a/pkgs/by-name/go/gomi/package.nix +++ b/pkgs/by-name/go/gomi/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "gomi"; - version = "1.1.8"; + version = "1.3.2"; src = fetchFromGitHub { owner = "b4b4r07"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AIH5ADJPkZEbYLHPyMRPMeO78Y+JQDTzfvrtLTKjrsY="; + sha256 = "sha256-mLsAT3V6rY7MGs7bq5YctSAEadQ3Ocgm/rdT1Zn6Vo0="; }; - vendorHash = "sha256-/9VuRb0dtKJccJYM7Jasm+xyFxphtN77YQvQkDZ8FcE="; + vendorHash = "sha256-GHxBoY09od1qrfSVSjWjSC0fDT2HQkmg5ig4iCFH/bo="; subPackages = [ "." ]; From 9b87702839a0ac51dabff09a4e458388c0af1c60 Mon Sep 17 00:00:00 2001 From: Philipp Schuster Date: Wed, 12 Feb 2025 12:52:36 +0100 Subject: [PATCH 1399/2168] libvirt: enable to set START_DELAY from NixOS module Follow-up to f9ae842f. The NixOS module already provides that option since 2a848b37, but it never worked until now. Also, I've added a comment to add some explicitly. --- pkgs/development/libraries/libvirt/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index d5c6f1b6cf17..e83fd20e995f 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -352,11 +352,14 @@ stdenv.mkDerivation rec { substituteInPlace $out/bin/virt-xml-validate \ --replace xmllint ${libxml2}/bin/xmllint + # Enable to set some options from the corresponding NixOS module (or other + # places) via environment variables. substituteInPlace $out/libexec/libvirt-guests.sh \ --replace 'ON_BOOT="start"' 'ON_BOOT=''${ON_BOOT:-start}' \ --replace 'ON_SHUTDOWN="suspend"' 'ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}' \ --replace 'PARALLEL_SHUTDOWN=0' 'PARALLEL_SHUTDOWN=''${PARALLEL_SHUTDOWN:-0}' \ --replace 'SHUTDOWN_TIMEOUT=300' 'SHUTDOWN_TIMEOUT=''${SHUTDOWN_TIMEOUT:-300}' \ + --replace 'START_DELAY=0' 'START_DELAY=''${START_DELAY:-0}' \ --replace "$out/bin" '${gettext}/bin' \ --replace 'lock/subsys' 'lock' \ --replace 'gettext.sh' 'gettext.sh From 1e6034ed48a161816aca2460de7ccc31ea5ba473 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 12:32:57 +0000 Subject: [PATCH 1400/2168] python312Packages.bluetooth-sensor-state-data: 1.7.1 -> 1.7.5 --- .../python-modules/bluetooth-sensor-state-data/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 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 339f20b5a306..0a42ad1da817 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.7.1"; + version = "1.7.5"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "bluetooth-sensor-state-data"; tag = "v${version}"; - hash = "sha256-Gsg6Gbb+nvrKr7vn9zUuPTPtSjqFJyMk7oLt7LUUn5A="; + hash = "sha256-W+gU9YlxoCh5zRht44Ovq3Doms8UtCvUNLlSUpzsQwA="; }; postPatch = '' @@ -42,7 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Models for storing and converting Bluetooth Sensor State Data"; homepage = "https://github.com/bluetooth-devices/bluetooth-sensor-state-data"; - changelog = "https://github.com/Bluetooth-Devices/bluetooth-sensor-state-data/releases/tag/v${version}"; + changelog = "https://github.com/Bluetooth-Devices/bluetooth-sensor-state-data/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; From 93839aed56813ac32c7416768f255f6a4aebd7d4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 12:42:39 +0000 Subject: [PATCH 1401/2168] cargo-autoinherit: 0.1.5 -> 0.1.6 --- pkgs/by-name/ca/cargo-autoinherit/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-autoinherit/package.nix b/pkgs/by-name/ca/cargo-autoinherit/package.nix index 290d2cd7c410..f444b846eb5f 100644 --- a/pkgs/by-name/ca/cargo-autoinherit/package.nix +++ b/pkgs/by-name/ca/cargo-autoinherit/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-autoinherit"; - version = "0.1.5"; + version = "0.1.6"; src = fetchFromGitHub { owner = "mainmatter"; repo = "cargo-autoinherit"; rev = "v${version}"; - hash = "sha256-ai2BqBfZlCOA1DIlzZerH71sbUMi6C65FRv5VDU0DPU="; + hash = "sha256-A4Ooqt/Cb8yyc4Y9DKZuFEVUux1ot+IVkPsSDylM6G4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Yw9W7ewdDRVOEXy2GXBC+LoaWTJMDCADvbazUxg3ZoE="; + cargoHash = "sha256-TUW0DdTVNrFpRaTGWM9XD0kW1CjmSAfWrbZxFGn1jJw="; meta = with lib; { description = "Automatically DRY up your Rust dependencies"; From 409492b1527a3fdcb4c67ffaab48e33346b6d0f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 12:55:08 +0000 Subject: [PATCH 1402/2168] c-blosc2: 2.15.2 -> 2.16.0 --- pkgs/development/libraries/c-blosc/2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/c-blosc/2.nix b/pkgs/development/libraries/c-blosc/2.nix index 518dd25e06ea..a6bf0dc79d65 100644 --- a/pkgs/development/libraries/c-blosc/2.nix +++ b/pkgs/development/libraries/c-blosc/2.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "c-blosc2"; - version = "2.15.2"; + version = "2.16.0"; src = fetchFromGitHub { owner = "Blosc"; repo = "c-blosc2"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-Xac0meyaHfdCIu0ut2ioPDFYtAGpOBRb/G8ZK/jmeJ4="; + sha256 = "sha256-Ag5541Qf9y91fHvst9NkF+NkPbRam4z+ngjZCTttVNw="; }; # https://github.com/NixOS/nixpkgs/issues/144170 From fce2a98f1df56ed67a15a53370077562d48f16f3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 13:00:31 +0000 Subject: [PATCH 1403/2168] moq: 0.5.1 -> 0.5.2 --- pkgs/by-name/mo/moq/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mo/moq/package.nix b/pkgs/by-name/mo/moq/package.nix index 533a8cbbda31..dad45fddff90 100644 --- a/pkgs/by-name/mo/moq/package.nix +++ b/pkgs/by-name/mo/moq/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "moq"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "matryer"; repo = "moq"; rev = "v${version}"; - sha256 = "sha256-lvM1socSv30URsqnYy4nF4AEf/14Z7aZUuYfCFpWr2Y="; + sha256 = "sha256-Y81EPb0h66lx3ISJsfb6iUqek/Ztni8ZITHtn5h34jU="; }; - vendorHash = "sha256-Kp0mRLmOlV3UpYSQJoc54tYU78sg+RZ5qy/1ime7j7w="; + vendorHash = "sha256-Mwx2Z2oVFepNr911zERuoM79NlpXu13pVpXPJox86BA="; subPackages = [ "." ]; From 568c903529ac1ba8ac26baec03a1bdb770f53d1b Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Wed, 12 Feb 2025 12:19:37 +0000 Subject: [PATCH 1404/2168] texpresso: remove broken `nextonic` symlink --- pkgs/tools/typesetting/tex/texpresso/tectonic.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/tools/typesetting/tex/texpresso/tectonic.nix b/pkgs/tools/typesetting/tex/texpresso/tectonic.nix index d06f8de181e2..f5550e2a8c82 100644 --- a/pkgs/tools/typesetting/tex/texpresso/tectonic.nix +++ b/pkgs/tools/typesetting/tex/texpresso/tectonic.nix @@ -18,6 +18,14 @@ tectonic-unwrapped.override (old: { cargoHash = "sha256-mqhbIv5r/5EDRDfP2BymXv9se2NCKxzRGqNqwqbD9A0="; # binary has a different name, bundled tests won't work doCheck = false; + postInstall = '' + ${args.postInstall or ""} + + # Remove the broken `nextonic` symlink + # It points to `tectonic`, which doesn't exist because the exe is + # renamed to texpresso-tonic + rm $out/bin/nextonic + ''; meta.mainProgram = "texpresso-tonic"; } ); From 732c1d6b5f9f269ce6ed3880aeba2ffdaf135c94 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 13:20:31 +0000 Subject: [PATCH 1405/2168] grafana-loki: 3.3.2 -> 3.4.0 --- pkgs/servers/monitoring/loki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index 9824daa195b4..d5434daeef38 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -10,14 +10,14 @@ }: buildGoModule rec { - version = "3.3.2"; + version = "3.4.0"; pname = "grafana-loki"; src = fetchFromGitHub { owner = "grafana"; repo = "loki"; rev = "v${version}"; - hash = "sha256-Xz8157x6cjKbQWyJUYPcOixYMfWr5QzVfxAXEFQxY9w="; + hash = "sha256-fFdp2QZQgrLPcgzY833TfGvW7QPR/Omq0wwvcejMXac="; }; vendorHash = null; From 49ab4eccc811310bb27dfe9b5c315d96d64b128c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 13:25:20 +0000 Subject: [PATCH 1406/2168] k3d: 5.8.1 -> 5.8.2 --- pkgs/by-name/k3/k3d/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/k3/k3d/package.nix b/pkgs/by-name/k3/k3d/package.nix index 144d50ae0466..368f9ca87b5e 100644 --- a/pkgs/by-name/k3/k3d/package.nix +++ b/pkgs/by-name/k3/k3d/package.nix @@ -16,13 +16,13 @@ let in buildGoModule rec { pname = "k3d"; - version = "5.8.1"; + version = "5.8.2"; src = fetchFromGitHub { owner = "k3d-io"; repo = "k3d"; tag = "v${version}"; - hash = "sha256-o56kBcuTOrDG8ZovGsIK+LIMi2Wps3kYJrqQuJHMd+A="; + hash = "sha256-O/dAD49SACJBLSYr0tNtUv1NEQuNHRapdLbY/bb2C8o="; }; vendorHash = "sha256-lFmIRtkUiohva2Vtg4AqHaB5McVOWW5+SFShkNqYVZ8="; From 03d1586cafee4498020fc810355514bd17ff2306 Mon Sep 17 00:00:00 2001 From: misilelab Date: Wed, 12 Feb 2025 22:40:26 +0900 Subject: [PATCH 1407/2168] gh: 2.66.1 -> 2.67.0 Signed-off-by: misilelab --- pkgs/by-name/gh/gh/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gh/gh/package.nix b/pkgs/by-name/gh/gh/package.nix index 4b732fa496d5..12e6d1d4b514 100644 --- a/pkgs/by-name/gh/gh/package.nix +++ b/pkgs/by-name/gh/gh/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "gh"; - version = "2.66.1"; + version = "2.67.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; tag = "v${version}"; - hash = "sha256-+aXA7/UHkiwMAUBsMzbk2NPN8Yoku0vO2IObJIFSM1o="; + hash = "sha256-fX2iYfJVwJSBIHRRCsAiQRqmCPgWZB3WwNKu2B//56s="; }; - vendorHash = "sha256-gLFPr6b9zkkvmhcljnuB23MAMa9xELsUHtcP8xTfWFE="; + vendorHash = "sha256-TuhTM7v1PrcRFVFuGr9CUnm/btisiHsRFeFxGiNSKjQ="; nativeBuildInputs = [ installShellFiles ]; From 7d1aada7dd3993207850fc321d813762ac4716bd Mon Sep 17 00:00:00 2001 From: Heitor Pascoal de Bittencourt Date: Wed, 12 Feb 2025 10:42:36 -0300 Subject: [PATCH 1408/2168] darktable: 5.0.0 -> 5.0.1 https://github.com/darktable-org/darktable/releases/tag/release-5.0.1 Fix #380973 --- pkgs/by-name/da/darktable/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/da/darktable/package.nix b/pkgs/by-name/da/darktable/package.nix index 523f2aaa1541..2ab187fa7fe2 100644 --- a/pkgs/by-name/da/darktable/package.nix +++ b/pkgs/by-name/da/darktable/package.nix @@ -80,12 +80,12 @@ }: stdenv.mkDerivation rec { - version = "5.0.0"; + version = "5.0.1"; pname = "darktable"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - hash = "sha256-6qE25uYku1MScoLiaq+gRBq8wYm1U3FGXh9aikk/o6E="; + hash = "sha256-SpGNCU67qYPvZ6EMxxXD1+jKc4AJkgqf9l0zQXtt2YQ="; }; nativeBuildInputs = [ From f080eb230d91dfbd3e64d3d91845839bbdcec1c3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 13:48:30 +0000 Subject: [PATCH 1409/2168] nixos-anywhere: 1.6.0 -> 1.7.0 --- pkgs/by-name/ni/nixos-anywhere/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ni/nixos-anywhere/package.nix b/pkgs/by-name/ni/nixos-anywhere/package.nix index a9d60383bad4..f440abf148c6 100644 --- a/pkgs/by-name/ni/nixos-anywhere/package.nix +++ b/pkgs/by-name/ni/nixos-anywhere/package.nix @@ -31,12 +31,12 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "nixos-anywhere"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixos-anywhere"; rev = finalAttrs.version; - hash = "sha256-aoTJqEImmpgsol+TyDASuyHW6tuL7NIS8gusUJ/kxyk="; + hash = "sha256-noRVvCgGxgZLCL9d3Pqfn6jEq5U7uF1OugrVPuIDR00="; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' From 5660e174315a5aa10a2de6fb958d227dd541866c Mon Sep 17 00:00:00 2001 From: misilelab Date: Wed, 12 Feb 2025 23:03:44 +0900 Subject: [PATCH 1410/2168] podman: 5.3.1 -> 5.4.0 Signed-off-by: misilelab --- pkgs/by-name/po/podman/package.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/po/podman/package.nix b/pkgs/by-name/po/podman/package.nix index 428c57edbd5a..f21b7ff4b861 100644 --- a/pkgs/by-name/po/podman/package.nix +++ b/pkgs/by-name/po/podman/package.nix @@ -75,13 +75,13 @@ let in buildGoModule rec { pname = "podman"; - version = "5.3.1"; + version = "5.4.0"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - hash = "sha256-kABP10QX4r11UDUcd6Sukb+9+LRm/ba3iATz6DTOJYw="; + hash = "sha256-iEO4njjNByLkhXFLgZ8tO8M8RkwT+Lb0zyfedQDHcNc="; }; patches = [ @@ -91,15 +91,6 @@ buildGoModule rec { # we intentionally don't build and install the helper so we shouldn't display messages to users about it ./rm-podman-mac-helper-msg.patch - - # backport of fix for https://github.com/containers/storage/issues/2184 - # https://github.com/containers/storage/pull/2185 - (fetchpatch2 { - url = "https://github.com/containers/storage/commit/99b0d2d423c8093807d8a1464437152cd04d7d95.diff?full_index=1"; - hash = "sha256-aahYXnDf3qCOlb6MfVDqFKCcQG257r5sbh5qnL0T40I="; - stripLen = 1; - extraPrefix = "vendor/github.com/containers/storage/"; - }) ]; vendorHash = null; From e72a2c35a8d8b72d739fc89e16534b33913b01ea Mon Sep 17 00:00:00 2001 From: misilelab Date: Wed, 12 Feb 2025 23:08:58 +0900 Subject: [PATCH 1411/2168] basedpyright: 1.27.0 -> 1.27.1 Signed-off-by: misilelab --- pkgs/by-name/ba/basedpyright/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ba/basedpyright/package.nix b/pkgs/by-name/ba/basedpyright/package.nix index 9102a2efab1a..17925d011d54 100644 --- a/pkgs/by-name/ba/basedpyright/package.nix +++ b/pkgs/by-name/ba/basedpyright/package.nix @@ -16,13 +16,13 @@ buildNpmPackage rec { pname = "basedpyright"; - version = "1.27.0"; + version = "1.27.1"; src = fetchFromGitHub { owner = "detachhead"; repo = "basedpyright"; tag = "v${version}"; - hash = "sha256-2lQ/uOojY/u43Yf/rqLdzTn4fs8/HHxztH5ua7fOXsk="; + hash = "sha256-Rl3BcSbTDZERUUOjhf1LXgxni4gB3XiSMMp53OJ7sT8="; }; npmDepsHash = "sha256-4EFl0hOI6DcpzcSedanQBOrNbHTxR0G7C8L4+7EnESE="; From 842a8bffe2be2487d42af97b39026571b8dcbe65 Mon Sep 17 00:00:00 2001 From: Felix Zieger <67903933+felixzieger@users.noreply.github.com> Date: Wed, 12 Feb 2025 15:09:40 +0100 Subject: [PATCH 1412/2168] scooter: 0.2.1 -> 0.2.3 --- pkgs/by-name/sc/scooter/package.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sc/scooter/package.nix b/pkgs/by-name/sc/scooter/package.nix index 03f082d63121..988c42fc62ff 100644 --- a/pkgs/by-name/sc/scooter/package.nix +++ b/pkgs/by-name/sc/scooter/package.nix @@ -6,17 +6,23 @@ rustPlatform.buildRustPackage rec { pname = "scooter"; - version = "0.2.1"; + version = "0.2.3"; src = fetchFromGitHub { owner = "thomasschafer"; repo = "scooter"; rev = "v${version}"; - hash = "sha256-dojVVBdXBtWvD/YIfouRmnsf1AWgfB3CYjH2KhtCsvI="; + hash = "sha256-1BotQpkcw0RwPmHjQ/uoHKwerToxQ3OzHCvE/mbnSug"; }; useFetchCargoVendor = true; - cargoHash = "sha256-yQhnN1GoosUx8YjUJsjtg2okDbSOFx0sUV26ggRDGI8="; + cargoHash = "sha256-BN5h6IENeogkM79uZONNushEFLM/vw+QFyPjz1V1vVk"; + + checkFlags = [ + # failed only for buildRustPackage + # might be related to https://ryantm.github.io/nixpkgs/languages-frameworks/rust/#tests-relying-on-the-structure-of-the-target-directory + "--skip=test_search_current_dir" + ]; meta = { description = "Interactive find and replace in the terminal"; From 512644d83d4b871d1d09c1a87f223644e2c650c2 Mon Sep 17 00:00:00 2001 From: binarydigitz01 Date: Tue, 11 Feb 2025 19:02:29 +0530 Subject: [PATCH 1413/2168] guile-websocket: init at 0.2.0 --- pkgs/by-name/gu/guile-websocket/package.nix | 40 +++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 pkgs/by-name/gu/guile-websocket/package.nix diff --git a/pkgs/by-name/gu/guile-websocket/package.nix b/pkgs/by-name/gu/guile-websocket/package.nix new file mode 100644 index 000000000000..9c2a8ec5a38e --- /dev/null +++ b/pkgs/by-name/gu/guile-websocket/package.nix @@ -0,0 +1,40 @@ +{ + lib, + stdenv, + fetchurl, + guile, + guile-gnutls, + texinfo, + pkg-config, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "guile-websocket"; + version = "0.2.0"; + + src = fetchurl { + url = "https://files.dthompson.us/releases/guile-websocket/guile-websocket-${finalAttrs.version}.tar.gz"; + hash = "sha256-7jxj+I5WpqtGu99zrzl92eIZUThy69A4CsLzXnp4dpA="; + }; + + strictDeps = true; + nativeBuildInputs = [ + guile + pkg-config + texinfo + ]; + buildInputs = [ + guile + guile-gnutls + ]; + doCheck = true; + makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; + + meta = { + description = "Provides an implementation of the WebSocket protocol in Guile"; + homepage = "https://dthompson.us/projects/guile-websocket.html"; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ binarydigitz01 ]; + platforms = lib.platforms.all; + }; +}) From 4a97c4beeb7fdf5dbfb46878506f0fd051f3955e Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Wed, 12 Feb 2025 15:26:34 +0100 Subject: [PATCH 1414/2168] jrl-cmakemodule: 0-unstable-2024-11-20 -> 0-unstable-2025-01-29 --- pkgs/by-name/jr/jrl-cmakemodules/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/jr/jrl-cmakemodules/package.nix b/pkgs/by-name/jr/jrl-cmakemodules/package.nix index 71d9e27ad7f5..ef1489066436 100644 --- a/pkgs/by-name/jr/jrl-cmakemodules/package.nix +++ b/pkgs/by-name/jr/jrl-cmakemodules/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation { pname = "jrl-cmakemodules"; - version = "0-unstable-2024-11-20"; + version = "0-unstable-2025-01-29"; src = fetchFromGitHub { owner = "jrl-umi3218"; repo = "jrl-cmakemodules"; - rev = "29c0eb4e659304f44d55a0389e2749812d858659"; - hash = "sha256-a23x0IIvIXJAsi8Z2/ku63hrHuSEC45FqzhxCy/T5tw="; + rev = "2ede15d1cb9d66401ba96788444ad64c44ffccd8"; + hash = "sha256-0o5DKt9BxZlAYTHp/BjzF6eJRP/d6lVlaV5P4xlzKnA="; }; nativeBuildInputs = [ cmake ]; From c31e83ecd21c4b78f3f09ad3bef91ebab808e512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 7 Feb 2025 11:27:19 +0100 Subject: [PATCH 1415/2168] python312Packages.tree-sitter: patch segfaulting code, enable tests --- .../python-modules/tree-sitter/default.nix | 14 ++++++++------ .../python-modules/tree-sitter/segfault-patch.diff | 13 +++++++++++++ 2 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/python-modules/tree-sitter/segfault-patch.diff diff --git a/pkgs/development/python-modules/tree-sitter/default.nix b/pkgs/development/python-modules/tree-sitter/default.nix index 3ec5c58411e6..1ca0885a73ac 100644 --- a/pkgs/development/python-modules/tree-sitter/default.nix +++ b/pkgs/development/python-modules/tree-sitter/default.nix @@ -28,6 +28,11 @@ buildPythonPackage rec { fetchSubmodules = true; }; + # see https://github.com/tree-sitter/py-tree-sitter/issues/330#issuecomment-2629403946 + patches = lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [ + ./segfault-patch.diff + ]; + build-system = [ setuptools ]; nativeCheckInputs = [ @@ -51,14 +56,11 @@ buildPythonPackage rec { "test_dot_graphs" ]; - # Segfaults explosively for some reason, but dependents seem to work? - doCheck = !stdenv.hostPlatform.isAarch64; - - meta = with lib; { + meta = { description = "Python bindings to the Tree-sitter parsing library"; homepage = "https://github.com/tree-sitter/py-tree-sitter"; changelog = "https://github.com/tree-sitter/py-tree-sitter/releases/tag/${src.tag}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/tree-sitter/segfault-patch.diff b/pkgs/development/python-modules/tree-sitter/segfault-patch.diff new file mode 100644 index 000000000000..9d325ac532c0 --- /dev/null +++ b/pkgs/development/python-modules/tree-sitter/segfault-patch.diff @@ -0,0 +1,13 @@ +--- i/tree_sitter/core/lib/src/parser.c ++++ w/tree_sitter/core/lib/src/parser.c +@@ -2084,6 +2084,10 @@ void ts_parser_reset(TSParser *self) { + self->parse_state = (TSParseState) {0}; + } + ++// FIXME: see tree-sitter/py-tree-sitter#330 ++#if __GNUC__ >= 14 && defined(__aarch64__) && defined(__OPTIMIZE__) && !defined(__OPTIMIZE_SIZE__) ++__attribute__((optimize(2))) ++#endif + TSTree *ts_parser_parse( + TSParser *self, + const TSTree *old_tree, From 0905d15700ad5b91ad2453e392d4f24d92ec225e Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Wed, 12 Feb 2025 15:29:41 +0100 Subject: [PATCH 1416/2168] python3Packages.eigenpy: 3.10.2 -> 3.10.3 Diff: https://github.com/stack-of-tasks/eigenpy/compare/refs/tags/v3.10.2...v3.10.3 Changelog: https://github.com/stack-of-tasks/eigenpy/releases/tag/v3.10.3 --- pkgs/development/python-modules/eigenpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eigenpy/default.nix b/pkgs/development/python-modules/eigenpy/default.nix index dc56e8fe4fcf..93c882e51644 100644 --- a/pkgs/development/python-modules/eigenpy/default.nix +++ b/pkgs/development/python-modules/eigenpy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "eigenpy"; - version = "3.10.2"; + version = "3.10.3"; pyproject = false; # Built with cmake src = fetchFromGitHub { owner = "stack-of-tasks"; repo = "eigenpy"; tag = "v${version}"; - hash = "sha256-MronJ6yJc+bPIVAgZyFF/VtTig3OWPhpUw9oNB9Ez+o="; + hash = "sha256-bO1SwBMEopJTKKLhuLQnoAs1X5RPmnyV7fbb11S2doo="; }; outputs = [ From 9059896f70ab351d744302191483597b01a9ac02 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Wed, 12 Feb 2025 15:35:22 +0100 Subject: [PATCH 1417/2168] coal: 3.0.0 -> 3.0.1 Diff: https://github.com/coal-library/coal/compare/refs/tags/v3.0.0...v3.0.1 Changelog: https://github.com/coal-library/coal/releases/tag/v3.0.1 --- pkgs/by-name/co/coal/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/coal/package.nix b/pkgs/by-name/co/coal/package.nix index 474197d2520e..24e269a1e9fb 100644 --- a/pkgs/by-name/co/coal/package.nix +++ b/pkgs/by-name/co/coal/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "coal"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "coal-library"; repo = "coal"; tag = "v${finalAttrs.version}"; - hash = "sha256-7LfeBQX9k0HY/muIl3FNq3xQv66KnwV9BChi0LxFcAQ="; + hash = "sha256-2X1chL4tYQXo50W/C5z+IVA1DGPcPdA378lh+7Bs2OE="; }; strictDeps = true; From af9d267b586d772860db6e3e0bf4a252df995475 Mon Sep 17 00:00:00 2001 From: daspk04 Date: Wed, 12 Feb 2025 21:40:56 +0700 Subject: [PATCH 1418/2168] python3Packages.odc-geo: init at 0.4.9 --- .../python-modules/odc-geo/default.nix | 117 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 119 insertions(+) create mode 100644 pkgs/development/python-modules/odc-geo/default.nix diff --git a/pkgs/development/python-modules/odc-geo/default.nix b/pkgs/development/python-modules/odc-geo/default.nix new file mode 100644 index 000000000000..922b1aeb21bc --- /dev/null +++ b/pkgs/development/python-modules/odc-geo/default.nix @@ -0,0 +1,117 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + affine, + cachetools, + numpy, + pyproj, + shapely, + + # optional-dependencies + azure-storage-blob, + boto3, + dask, + distributed, + rasterio, + tifffile, + xarray, + + # tests + geopandas, + matplotlib, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "odc-geo"; + version = "0.4.9"; + pyproject = true; + + src = fetchFromGitHub { + owner = "opendatacube"; + repo = "odc-geo"; + tag = "v${version}"; + hash = "sha256-7OhXx+lPvZSHP+aP3ucIkVBvW5De0FLNa+azc3Ar050="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + affine + cachetools + numpy + pyproj + shapely + ]; + + optional-dependencies = { + xr = [ xarray ]; + wrap = [ rasterio ]; + tiff = [ + dask + distributed + rasterio + tifffile + xarray + ]; + s3 = [ boto3 ]; + az = [ azure-storage-blob ]; + all = [ + azure-storage-blob + boto3 + dask + distributed + rasterio + tifffile + xarray + ]; + }; + + nativeCheckInputs = [ + geopandas + matplotlib + pytestCheckHook + ] ++ optional-dependencies.all; + + pytestFlagsArray = [ "-m 'not network'" ]; + + disabledTests = [ + # AttributeError (fixes: https://github.com/opendatacube/odc-geo/pull/202) + "test_azure_multipart_upload" + # network access + "test_empty_cog" + # urllib url open error + "test_country_geom" + "test_from_geopandas" + "test_geoboxtiles_intersect" + "test_warp_nan" + # requires imagecodecs package (currently not available on nixpkgs) + "test_cog_with_dask_smoke_test" + ]; + + pythonImportsCheck = [ + "odc.geo" + "odc.geo.xr" + ]; + + meta = { + description = "GeoBox and geometry utilities extracted from datacube-core"; + longDescription = '' + This library combines geometry shape classes from `shapely` with CRS from + `pyproj` to provide a number of data types and utilities useful for working + with geospatial metadata and geo-registered `xarray` rasters. + ''; + homepage = "https://github.com/opendatacube/odc-geo/"; + changelog = "https://github.com/opendatacube/odc-geo/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ daspk04 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a128bbcc871e..a73d8d24b387 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9650,6 +9650,8 @@ self: super: with self; { od = callPackage ../development/python-modules/od { }; + odc-geo = callPackage ../development/python-modules/odc-geo { }; + oddsprout = callPackage ../development/python-modules/oddsprout { }; odfpy = callPackage ../development/python-modules/odfpy { }; From 6b2689b8ede6ab912c1b7885ee72dcdfdf17e5c3 Mon Sep 17 00:00:00 2001 From: rein Date: Wed, 12 Feb 2025 20:11:07 +0530 Subject: [PATCH 1419/2168] unifont-csur: init at v16.0.02 RESOLVES #379591 --- pkgs/by-name/un/unifont-csur/package.nix | 31 ++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 pkgs/by-name/un/unifont-csur/package.nix diff --git a/pkgs/by-name/un/unifont-csur/package.nix b/pkgs/by-name/un/unifont-csur/package.nix new file mode 100644 index 000000000000..576f48bd0d22 --- /dev/null +++ b/pkgs/by-name/un/unifont-csur/package.nix @@ -0,0 +1,31 @@ +{ + lib, + stdenvNoCC, + fetchurl, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "unifont-csur"; + version = "16.0.02"; + + src = fetchurl { + url = "https://unifoundry.com/pub/unifont/unifont-${finalAttrs.version}/font-builds/unifont_csur-${finalAttrs.version}.otf"; + hash = "sha256-orLV0a0dQUAnzWnSTD1ALfbAsqWtFscH3rMCDyaXNfo="; + }; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + install -Dm644 $src $out/share/fonts/truetype/unifont_csur.ttf + runHook postInstall + ''; + + meta = { + description = "Unifont CSUR - Private Use Area font covering ConScript Unicode Registry"; + homepage = "https://unifoundry.com/unifont/"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.qxrein ]; + }; +}) From fbe520b3a9bce08262f269241809f210565849a5 Mon Sep 17 00:00:00 2001 From: liberodark Date: Wed, 12 Feb 2025 15:29:48 +0100 Subject: [PATCH 1420/2168] nixos/glpi-agent: fix missing directory --- nixos/modules/services/monitoring/glpi-agent.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/nixos/modules/services/monitoring/glpi-agent.nix b/nixos/modules/services/monitoring/glpi-agent.nix index 8ee18b5599bf..78c4d85a16e5 100644 --- a/nixos/modules/services/monitoring/glpi-agent.nix +++ b/nixos/modules/services/monitoring/glpi-agent.nix @@ -77,6 +77,16 @@ in } ]; + systemd.tmpfiles.settings."10-glpi-agent" = { + ${cfg.stateDir} = { + d = { + mode = "0755"; + user = "root"; + group = "root"; + }; + }; + }; + systemd.services.glpi-agent = { description = "GLPI Agent"; wantedBy = [ "multi-user.target" ]; From ad4bd13c644428aeffb0b5c96b94216e7c5a8f4e Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 12 Feb 2025 21:09:20 +0800 Subject: [PATCH 1421/2168] pantheon.elementary-settings-daemon: 8.1.1 -> 8.2.0 https://github.com/elementary/settings-daemon/compare/8.1.1...8.2.0 --- .../pantheon/services/elementary-settings-daemon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index 5d2052b055f7..5e93b90feb9d 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "elementary-settings-daemon"; - version = "8.1.1"; + version = "8.2.0"; src = fetchFromGitHub { owner = "elementary"; repo = "settings-daemon"; rev = version; - sha256 = "sha256-HOmV3RBVn8xah/Bzt7OOXVE145uwn1SEFzvcVSLMHtE="; + sha256 = "sha256-mLchzYp2HB4QEJS/Jz9o7ZSKUJtbUUUbFCTHwHZYCEE="; }; nativeBuildInputs = [ From e109175c7d4bd458f7f3d46eae702a264bc10255 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 15:09:41 +0000 Subject: [PATCH 1422/2168] glooctl: 1.18.6 -> 1.18.7 --- pkgs/by-name/gl/glooctl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gl/glooctl/package.nix b/pkgs/by-name/gl/glooctl/package.nix index 4f6b10e09f54..549a594d806a 100644 --- a/pkgs/by-name/gl/glooctl/package.nix +++ b/pkgs/by-name/gl/glooctl/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "glooctl"; - version = "1.18.6"; + version = "1.18.7"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-kxNlTVU4VFqEhismth5qb0Ar335TYhO/2oE8tt9km3c="; + hash = "sha256-JloV4Qmyq/AQz9q4syIFDvZm7oczZIaOanu7y0wyzaI="; }; - vendorHash = "sha256-AEfDeUD7A4ZFgctNa8b1XeJMFnmcQCLvlQqNFM/gSCc="; + vendorHash = "sha256-lcnsmeZ2XobBE95KqIhUZCKmevg2WEGuZC4qUVkdafM="; subPackages = [ "projects/gloo/cli/cmd" ]; From ddddc24bf3f2e81ffee82fe56068a163152bea7e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 15:09:44 +0000 Subject: [PATCH 1423/2168] cargo-binstall: 1.10.22 -> 1.10.23 --- pkgs/by-name/ca/cargo-binstall/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-binstall/package.nix b/pkgs/by-name/ca/cargo-binstall/package.nix index b0190b840c15..9bd45fe704ce 100644 --- a/pkgs/by-name/ca/cargo-binstall/package.nix +++ b/pkgs/by-name/ca/cargo-binstall/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-binstall"; - version = "1.10.22"; + version = "1.10.23"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; rev = "v${version}"; - hash = "sha256-b2Cn5FWXmI5ij98A8Y0KUm8LGB73Ho2UzhrOd+7eCEg="; + hash = "sha256-3Guk5yUd9VTUiuaESadFJ+mr9a13l//HPaUOx78tZUs="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Aik6avD2hddfffUkAMoRIeuGUSDo7en4NT6IoPmAMGU="; + cargoHash = "sha256-mTkHKuKqk2HvSKqwCheNBUqe0c/oqZYy8WCWW2iYQJk="; nativeBuildInputs = [ pkg-config From f810504d283f65ec984e57b8b6012632ef5c4968 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Wed, 12 Feb 2025 16:13:57 +0100 Subject: [PATCH 1424/2168] python3Packages.shamir-mnemonic: 0.2.2 -> 0.3.0 --- .../shamir-mnemonic/default.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/shamir-mnemonic/default.nix b/pkgs/development/python-modules/shamir-mnemonic/default.nix index 11d580eaf889..13303cceba89 100644 --- a/pkgs/development/python-modules/shamir-mnemonic/default.nix +++ b/pkgs/development/python-modules/shamir-mnemonic/default.nix @@ -1,36 +1,31 @@ { lib, buildPythonPackage, - isPy3k, fetchFromGitHub, - attrs, + poetry-core, click, colorama, - pytestCheckHook, }: buildPythonPackage rec { pname = "shamir-mnemonic"; - version = "0.2.2"; - format = "setuptools"; - - disabled = !isPy3k; + version = "0.3.0"; + format = "pyproject"; src = fetchFromGitHub { owner = "trezor"; repo = "python-${pname}"; - rev = "v${version}"; - hash = "sha256-b9tBXN9dBdAeGg3xf5ZBdd6kPpFzseJl6wRTTfNZEwo="; + tag = "v${version}"; + hash = "sha256-KjZbxA92h25ghbItdmPvkSPvDZUSRWkl4vnJDBMN71s="; }; + build-system = [ poetry-core ]; + propagatedBuildInputs = [ - attrs click colorama ]; - nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "shamir_mnemonic" ]; meta = with lib; { From 68ed22f8e15a0fbf9b63e29733f12bbab33e7218 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Wed, 12 Feb 2025 16:14:23 +0100 Subject: [PATCH 1425/2168] python3Packages.slip10: init at 1.0.1 --- .../python-modules/slip10/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/slip10/default.nix diff --git a/pkgs/development/python-modules/slip10/default.nix b/pkgs/development/python-modules/slip10/default.nix new file mode 100644 index 000000000000..57478107a20d --- /dev/null +++ b/pkgs/development/python-modules/slip10/default.nix @@ -0,0 +1,39 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + poetry-core, + base58, + cryptography, + ecdsa, +}: + +buildPythonPackage rec { + pname = "slip10"; + version = "1.0.1"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-ArNQrlV7WReRQosXVR+V16xX6SEfN969yBTJC0oSOlQ="; + }; + + build-system = [ poetry-core ]; + + propagatedBuildInputs = [ + base58 + cryptography + ecdsa + ]; + + pythonImportsCheck = [ "slip10" ]; + + meta = with lib; { + description = "Minimalistic implementation of SLIP109"; + homepage = "https://github.com/trezor/python-slip10"; + license = licenses.bsd3; + maintainers = with maintainers; [ + prusnak + ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ad9734cfcfd0..afbfb0900cc3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15114,6 +15114,8 @@ self: super: with self; { slicerator = callPackage ../development/python-modules/slicerator { }; + slip10 = callPackage ../development/python-modules/slip10 { }; + slither-analyzer = callPackage ../development/python-modules/slither-analyzer { }; slimit = callPackage ../development/python-modules/slimit { }; From ec2d600c176209b5c59f07286ccdcf749581a18e Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Wed, 12 Feb 2025 16:14:39 +0100 Subject: [PATCH 1426/2168] python3Packages.trezor: 0.13.9 -> 0.13.10 --- pkgs/development/python-modules/trezor/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index 62c94ce4bd7c..2b3147874c59 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -6,11 +6,14 @@ click, construct, construct-classes, + cryptography, ecdsa, libusb1, mnemonic, requests, setuptools, + shamir-mnemonic, + slip10, typing-extensions, trezor-udev-rules, pytestCheckHook, @@ -18,12 +21,12 @@ buildPythonPackage rec { pname = "trezor"; - version = "0.13.9"; + version = "0.13.10"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-lFC9e7nSPl4zo8nljhjwWLRMnZw0ymZLSYGnlaqfse8="; + hash = "sha256-egtq5GKN0MMaXOtRJYkY2bvdOthROIg3IlgmsijuUE8="; }; build-system = [ setuptools ]; @@ -32,10 +35,13 @@ buildPythonPackage rec { click construct construct-classes + cryptography ecdsa libusb1 mnemonic requests + shamir-mnemonic + slip10 typing-extensions ] ++ lib.optionals stdenv.hostPlatform.isLinux [ trezor-udev-rules ]; From 524bddb19552c84bdbb9670d5db9445557a57c33 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 12 Feb 2025 16:22:11 +0100 Subject: [PATCH 1427/2168] gpt4all: remove polygon from maintainers https://github.com/NixOS/nixpkgs/pull/381298#issuecomment-2652600887 --- pkgs/by-name/gp/gpt4all/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/gp/gpt4all/package.nix b/pkgs/by-name/gp/gpt4all/package.nix index ec3fc70a8e00..35b32f300c39 100644 --- a/pkgs/by-name/gp/gpt4all/package.nix +++ b/pkgs/by-name/gp/gpt4all/package.nix @@ -111,7 +111,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; mainProgram = "gpt4all"; maintainers = with lib.maintainers; [ - polygon titaniumtown ]; }; From 93ebd6d321ac64c49366b378e47d387cad430d99 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 15:27:12 +0000 Subject: [PATCH 1428/2168] repgrep: 0.15.0 -> 0.16.0 --- pkgs/by-name/re/repgrep/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/re/repgrep/package.nix b/pkgs/by-name/re/repgrep/package.nix index b4d44b79b16e..0850105f181c 100644 --- a/pkgs/by-name/re/repgrep/package.nix +++ b/pkgs/by-name/re/repgrep/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "repgrep"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "acheronfail"; repo = "repgrep"; rev = version; - hash = "sha256-6ba7EJUts0Ni9EA3ENlK+a2FaPo7JohtCyqwR9DdL1E="; + hash = "sha256-Hg6N5ruf6MTf2/jSmDgaNFWnnaSb8ZCQ6hivYAeadfc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-K0HSVmVB7IGIqf+omM83fqJRKNOoMf4a1ZtsDmGR9us="; + cargoHash = "sha256-Of0JyAm/XxyfRLBznAHzy701w4fA1d0QMQqOjqIzG00="; nativeBuildInputs = [ asciidoctor @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { popd '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - # As it can be seen here: https://github.com/acheronfail/repgrep/blob/0.15.0/.github/workflows/release.yml#L206, the completions are just the same as ripgrep + # As it can be seen here: https://github.com/acheronfail/repgrep/blob/0.16.0/.github/workflows/release.yml#L206, the completions are just the same as ripgrep installShellCompletion --cmd rgr \ --bash <(${lib.getExe ripgrep} --generate complete-bash | sed 's/-c rg/-c rgr/') \ --zsh <(${lib.getExe ripgrep} --generate complete-zsh | sed 's/-c rg/-c rgr/') \ From 4a55655a94b9f8a7716f49e24e75b9a7e37ab098 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 15:35:27 +0000 Subject: [PATCH 1429/2168] wasmserve: 1.1.0 -> 1.2.0 --- pkgs/by-name/wa/wasmserve/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/wasmserve/package.nix b/pkgs/by-name/wa/wasmserve/package.nix index 8369096b78dd..9e641f9fe1cf 100644 --- a/pkgs/by-name/wa/wasmserve/package.nix +++ b/pkgs/by-name/wa/wasmserve/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "wasmserve"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "hajimehoshi"; repo = "wasmserve"; rev = "v${version}"; - hash = "sha256-e+pHwk+xJVc+Ki0iJC2B+W8ZN4mEawEQNyGhwITBDlo="; + hash = "sha256-k8g5ZCMm0xek+rToq9azE7mOUHU5eF8PxgBcXs6LrJk="; }; vendorHash = null; From 13687235fcee4d3078bcc0cda5708f0d87fc60c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Wed, 12 Feb 2025 10:47:55 -0500 Subject: [PATCH 1430/2168] gossip: set update script --- pkgs/by-name/go/gossip/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/go/gossip/package.nix b/pkgs/by-name/go/gossip/package.nix index e97f13075ca9..8f8d5f4d9058 100644 --- a/pkgs/by-name/go/gossip/package.nix +++ b/pkgs/by-name/go/gossip/package.nix @@ -16,6 +16,7 @@ stdenv, wayland, wayland-scanner, + nix-update-script, xorg, }: @@ -130,6 +131,8 @@ rustPlatform.buildRustPackage rec { }) ]; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Desktop client for nostr, an open social media protocol"; downloadPage = "https://github.com/mikedilger/gossip/releases/tag/${version}"; From 03434db537d78cd1c4db5a94b8660b54077e878f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Wed, 12 Feb 2025 10:48:10 -0500 Subject: [PATCH 1431/2168] gossip: 0.12.0 -> 0.13.0 --- pkgs/by-name/go/gossip/Cargo.lock | 7243 ---------------------------- pkgs/by-name/go/gossip/package.nix | 40 +- 2 files changed, 16 insertions(+), 7267 deletions(-) delete mode 100644 pkgs/by-name/go/gossip/Cargo.lock diff --git a/pkgs/by-name/go/gossip/Cargo.lock b/pkgs/by-name/go/gossip/Cargo.lock deleted file mode 100644 index b2b5029a6766..000000000000 --- a/pkgs/by-name/go/gossip/Cargo.lock +++ /dev/null @@ -1,7243 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "ab_glyph" -version = "0.2.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79faae4620f45232f599d9bc7b290f88247a0834162c4495ab2f02d60004adfb" -dependencies = [ - "ab_glyph_rasterizer", - "owned_ttf_parser", -] - -[[package]] -name = "ab_glyph_rasterizer" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" - -[[package]] -name = "accesskit" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74a4b14f3d99c1255dcba8f45621ab1a2e7540a0009652d33989005a4d0bfc6b" -dependencies = [ - "enumn", - "serde", -] - -[[package]] -name = "accesskit_consumer" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c17cca53c09fbd7288667b22a201274b9becaa27f0b91bf52a526db95de45e6" -dependencies = [ - "accesskit", -] - -[[package]] -name = "accesskit_macos" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd3b6ae1eabbfbced10e840fd3fce8a93ae84f174b3e4ba892ab7bcb42e477a7" -dependencies = [ - "accesskit", - "accesskit_consumer", - "objc2 0.3.0-beta.3.patch-leaks.3", - "once_cell", -] - -[[package]] -name = "accesskit_unix" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09f46c18d99ba61ad7123dd13eeb0c104436ab6af1df6a1cd8c11054ed394a08" -dependencies = [ - "accesskit", - "accesskit_consumer", - "async-channel", - "async-once-cell", - "atspi", - "futures-lite 1.13.0", - "once_cell", - "serde", - "zbus", -] - -[[package]] -name = "accesskit_windows" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afcae27ec0974fc7c3b0b318783be89fd1b2e66dd702179fe600166a38ff4a0b" -dependencies = [ - "accesskit", - "accesskit_consumer", - "once_cell", - "paste", - "static_assertions", - "windows 0.48.0", -] - -[[package]] -name = "accesskit_winit" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5284218aca17d9e150164428a0ebc7b955f70e3a9a78b4c20894513aabf98a67" -dependencies = [ - "accesskit", - "accesskit_macos", - "accesskit_unix", - "accesskit_windows", - "winit", -] - -[[package]] -name = "addr2line" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" -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 = "aes" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" -dependencies = [ - "cfg-if", - "cipher", - "cpufeatures", -] - -[[package]] -name = "ahash" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" -dependencies = [ - "getrandom 0.2.15", - "once_cell", - "version_check", -] - -[[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if", - "const-random", - "getrandom 0.2.15", - "once_cell", - "serde", - "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 = "aligned-vec" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1" - -[[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.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" - -[[package]] -name = "android-activity" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" -dependencies = [ - "android-properties", - "bitflags 2.6.0", - "cc", - "cesu8", - "jni", - "jni-sys", - "libc", - "log", - "ndk", - "ndk-context", - "ndk-sys", - "num_enum", - "thiserror", -] - -[[package]] -name = "android-properties" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" - -[[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 = "anyhow" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" - -[[package]] -name = "arbitrary" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" - -[[package]] -name = "arboard" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb4009533e8ff8f1450a5bcbc30f4242a1d34442221f72314bea1f5dc9c7f89" -dependencies = [ - "clipboard-win", - "log", - "objc2 0.5.2", - "objc2-app-kit", - "objc2-foundation", - "parking_lot", - "x11rb", -] - -[[package]] -name = "arg_enum_proc_macro" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.72", -] - -[[package]] -name = "arrayref" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" - -[[package]] -name = "arrayvec" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" - -[[package]] -name = "as-raw-xcb-connection" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" - -[[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 = "async-broadcast" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" -dependencies = [ - "event-listener 2.5.3", - "futures-core", -] - -[[package]] -name = "async-channel" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" -dependencies = [ - "concurrent-queue", - "event-listener-strategy", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-compression" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa" -dependencies = [ - "brotli", - "flate2", - "futures-core", - "memchr", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "async-executor" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" -dependencies = [ - "async-task", - "concurrent-queue", - "fastrand 2.1.0", - "futures-lite 2.3.0", - "slab", -] - -[[package]] -name = "async-fs" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" -dependencies = [ - "async-lock 2.8.0", - "autocfg", - "blocking", - "futures-lite 1.13.0", -] - -[[package]] -name = "async-io" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" -dependencies = [ - "async-lock 2.8.0", - "autocfg", - "cfg-if", - "concurrent-queue", - "futures-lite 1.13.0", - "log", - "parking", - "polling 2.8.0", - "rustix 0.37.27", - "slab", - "socket2 0.4.10", - "waker-fn", -] - -[[package]] -name = "async-io" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" -dependencies = [ - "async-lock 3.4.0", - "cfg-if", - "concurrent-queue", - "futures-io", - "futures-lite 2.3.0", - "parking", - "polling 3.7.3", - "rustix 0.38.34", - "slab", - "tracing", - "windows-sys 0.52.0", -] - -[[package]] -name = "async-lock" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" -dependencies = [ - "event-listener 2.5.3", -] - -[[package]] -name = "async-lock" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" -dependencies = [ - "event-listener 5.3.1", - "event-listener-strategy", - "pin-project-lite", -] - -[[package]] -name = "async-once-cell" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9338790e78aa95a416786ec8389546c4b6a1dfc3dc36071ed9518a9413a542eb" - -[[package]] -name = "async-process" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" -dependencies = [ - "async-io 1.13.0", - "async-lock 2.8.0", - "async-signal", - "blocking", - "cfg-if", - "event-listener 3.1.0", - "futures-lite 1.13.0", - "rustix 0.38.34", - "windows-sys 0.48.0", -] - -[[package]] -name = "async-recursion" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.72", -] - -[[package]] -name = "async-signal" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfb3634b73397aa844481f814fad23bbf07fdb0eabec10f2eb95e58944b1ec32" -dependencies = [ - "async-io 2.3.3", - "async-lock 3.4.0", - "atomic-waker", - "cfg-if", - "futures-core", - "futures-io", - "rustix 0.38.34", - "signal-hook-registry", - "slab", - "windows-sys 0.52.0", -] - -[[package]] -name = "async-task" -version = "4.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" - -[[package]] -name = "async-trait" -version = "0.1.81" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.72", -] - -[[package]] -name = "atomic-waker" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" - -[[package]] -name = "atspi" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6059f350ab6f593ea00727b334265c4dfc7fd442ee32d264794bd9bdc68e87ca" -dependencies = [ - "atspi-common", - "atspi-connection", - "atspi-proxies", -] - -[[package]] -name = "atspi-common" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92af95f966d2431f962bc632c2e68eda7777330158bf640c4af4249349b2cdf5" -dependencies = [ - "enumflags2", - "serde", - "static_assertions", - "zbus", - "zbus_names", - "zvariant", -] - -[[package]] -name = "atspi-connection" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c65e7d70f86d4c0e3b2d585d9bf3f979f0b19d635a336725a88d279f76b939" -dependencies = [ - "atspi-common", - "atspi-proxies", - "futures-lite 1.13.0", - "zbus", -] - -[[package]] -name = "atspi-proxies" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6495661273703e7a229356dcbe8c8f38223d697aacfaf0e13590a9ac9977bb52" -dependencies = [ - "atspi-common", - "serde", - "zbus", -] - -[[package]] -name = "autocfg" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" - -[[package]] -name = "av1-grain" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6678909d8c5d46a42abcf571271e15fdbc0a225e3646cf23762cd415046c78bf" -dependencies = [ - "anyhow", - "arrayvec", - "log", - "nom", - "num-rational", - "v_frame", -] - -[[package]] -name = "avif-serialize" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876c75a42f6364451a033496a14c44bffe41f5f4a8236f697391f11024e596d2" -dependencies = [ - "arrayvec", -] - -[[package]] -name = "backtrace" -version = "0.3.73" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" - -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - -[[package]] -name = "base64" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" - -[[package]] -name = "base64ct" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" - -[[package]] -name = "bech32" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d86b93f97252c47b41663388e6d155714a9d0c398b99f1005cbc5f978b29f445" - -[[package]] -name = "bech32" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d965446196e3b7decd44aa7ee49e31d630118f90ef12f97900f262eb915c951d" - -[[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.69.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" -dependencies = [ - "bitflags 2.6.0", - "cexpr", - "clang-sys", - "itertools 0.12.1", - "lazy_static", - "lazycell", - "proc-macro2", - "quote", - "regex", - "rustc-hash 1.1.0", - "shlex", - "syn 2.0.72", -] - -[[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 = "bit_field" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" - -[[package]] -name = "bitcoin" -version = "0.30.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1945a5048598e4189e239d3f809b19bdad4845c4b2ba400d304d2dcf26d2c462" -dependencies = [ - "bech32 0.9.1", - "bitcoin-private", - "bitcoin_hashes 0.12.0", - "hex_lit", - "secp256k1 0.27.0", -] - -[[package]] -name = "bitcoin-private" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73290177011694f38ec25e165d0387ab7ea749a4b81cd4c80dae5988229f7a57" - -[[package]] -name = "bitcoin_hashes" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d7066118b13d4b20b23645932dfb3a81ce7e29f95726c2036fa33cd7b092501" -dependencies = [ - "bitcoin-private", -] - -[[package]] -name = "bitcoin_hashes" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb18c03d0db0247e147a21a6faafd5a7eb851c743db062de72018b6b7e8e4d16" -dependencies = [ - "hex-conservative 0.2.1", -] - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" -dependencies = [ - "serde", -] - -[[package]] -name = "bitstream-io" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcde5f311c85b8ca30c2e4198d4326bc342c76541590106f5fa4a50946ea499" - -[[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 = "block-sys" -version = "0.1.0-beta.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa55741ee90902547802152aaf3f8e5248aab7e21468089560d4c8840561146" -dependencies = [ - "objc-sys 0.2.0-beta.2", -] - -[[package]] -name = "block-sys" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7" -dependencies = [ - "objc-sys 0.3.5", -] - -[[package]] -name = "block2" -version = "0.2.0-alpha.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dd9e63c1744f755c2f60332b88de39d341e5e86239014ad839bd71c106dec42" -dependencies = [ - "block-sys 0.1.0-beta.1", - "objc2-encode 2.0.0-pre.2", -] - -[[package]] -name = "block2" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68" -dependencies = [ - "block-sys 0.2.1", - "objc2 0.4.1", -] - -[[package]] -name = "block2" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" -dependencies = [ - "objc2 0.5.2", -] - -[[package]] -name = "blocking" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" -dependencies = [ - "async-channel", - "async-task", - "futures-io", - "futures-lite 2.3.0", - "piper", -] - -[[package]] -name = "brotli" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", - "brotli-decompressor", -] - -[[package]] -name = "brotli-decompressor" -version = "4.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", -] - -[[package]] -name = "built" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "236e6289eda5a812bc6b53c3b024039382a2895fbbeef2d748b2931546d392c4" - -[[package]] -name = "bumpalo" -version = "3.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" - -[[package]] -name = "bytemuck" -version = "1.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "102087e286b4677862ea56cf8fc58bb2cdfa8725c40ffb80fe3a008eb7f2fc83" -dependencies = [ - "bytemuck_derive", -] - -[[package]] -name = "bytemuck_derive" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.72", -] - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "byteorder-lite" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" - -[[package]] -name = "bytes" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" - -[[package]] -name = "calloop" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" -dependencies = [ - "bitflags 2.6.0", - "log", - "polling 3.7.3", - "rustix 0.38.34", - "slab", - "thiserror", -] - -[[package]] -name = "calloop" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" -dependencies = [ - "bitflags 2.6.0", - "log", - "polling 3.7.3", - "rustix 0.38.34", - "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 0.12.4", - "rustix 0.38.34", - "wayland-backend", - "wayland-client", -] - -[[package]] -name = "calloop-wayland-source" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" -dependencies = [ - "calloop 0.13.0", - "rustix 0.38.34", - "wayland-backend", - "wayland-client", -] - -[[package]] -name = "cbc" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" -dependencies = [ - "cipher", -] - -[[package]] -name = "cc" -version = "1.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504bdec147f2cc13c8b57ed9401fd8a147cc66b67ad5cb241394244f2c947549" -dependencies = [ - "jobserver", - "libc", -] - -[[package]] -name = "cesu8" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" - -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - -[[package]] -name = "cfg-expr" -version = "0.15.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" -dependencies = [ - "smallvec", - "target-lexicon", -] - -[[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 = "cgl" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ced0551234e87afee12411d535648dd89d2e7f34c78b753395567aff3d447ff" -dependencies = [ - "libc", -] - -[[package]] -name = "chacha20" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" -dependencies = [ - "cfg-if", - "cipher", - "cpufeatures", -] - -[[package]] -name = "chacha20poly1305" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" -dependencies = [ - "aead", - "chacha20", - "cipher", - "poly1305", - "zeroize", -] - -[[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", - "js-sys", - "num-traits", - "wasm-bindgen", - "windows-targets 0.52.6", -] - -[[package]] -name = "cipher" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" -dependencies = [ - "crypto-common", - "inout", - "zeroize", -] - -[[package]] -name = "clang-sys" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" -dependencies = [ - "glob", - "libc", - "libloading 0.8.5", -] - -[[package]] -name = "clipboard-win" -version = "5.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892" -dependencies = [ - "error-code", -] - -[[package]] -name = "cmake" -version = "0.1.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" -dependencies = [ - "cc", -] - -[[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 = "com" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e17887fd17353b65b1b2ef1c526c83e26cd72e74f598a8dc1bee13a48f3d9f6" -dependencies = [ - "com_macros", -] - -[[package]] -name = "com_macros" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d375883580a668c7481ea6631fc1a8863e33cc335bf56bfad8d7e6d4b04b13a5" -dependencies = [ - "com_macros_support", - "proc-macro2", - "syn 1.0.109", -] - -[[package]] -name = "com_macros_support" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad899a1087a9296d5644792d7cb72b8e34c1bec8e7d4fbc002230169a6e8710c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "combine" -version = "4.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" -dependencies = [ - "bytes", - "memchr", -] - -[[package]] -name = "concurrent-queue" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "const-random" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" -dependencies = [ - "const-random-macro", -] - -[[package]] -name = "const-random-macro" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" -dependencies = [ - "getrandom 0.2.15", - "once_cell", - "tiny-keccak", -] - -[[package]] -name = "constant_time_eq" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" - -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - -[[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" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-graphics-types", - "foreign-types 0.5.0", - "libc", -] - -[[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 = "core-net" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40b0cbe828edee956fb81da4df1c5c515b86401b0720740977a952fec794b5e3" - -[[package]] -name = "core_maths" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b02505ccb8c50b0aa21ace0fc08c3e53adebd4e58caa18a36152803c7709a3" -dependencies = [ - "libm", -] - -[[package]] -name = "cpufeatures" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" -dependencies = [ - "libc", -] - -[[package]] -name = "crc32fast" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" -dependencies = [ - "cfg-if", -] - -[[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.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" - -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "rand_core 0.6.4", - "typenum", -] - -[[package]] -name = "cursor-icon" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" - -[[package]] -name = "dashmap" -version = "6.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28" -dependencies = [ - "cfg-if", - "crossbeam-utils", - "hashbrown 0.14.5", - "lock_api", - "once_cell", - "parking_lot_core", -] - -[[package]] -name = "data-encoding" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" - -[[package]] -name = "data-url" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5" - -[[package]] -name = "data-url" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" - -[[package]] -name = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", -] - -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "derive_more" -version = "0.99.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" -dependencies = [ - "convert_case", - "proc-macro2", - "quote", - "rustc_version", - "syn 2.0.72", -] - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "crypto-common", - "subtle", -] - -[[package]] -name = "directories" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users", - "windows-sys 0.48.0", -] - -[[package]] -name = "dispatch" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" - -[[package]] -name = "dlib" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" -dependencies = [ - "libloading 0.8.5", -] - -[[package]] -name = "document-features" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0" -dependencies = [ - "litrs", -] - -[[package]] -name = "downcast-rs" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" - -[[package]] -name = "doxygen-rs" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "415b6ec780d34dcf624666747194393603d0373b7141eef01d12ee58881507d9" -dependencies = [ - "phf", -] - -[[package]] -name = "ecolor" -version = "0.28.1" -source = "git+https://github.com/bu5hm4nn/egui?rev=f40370c48ae2e07d2bc1d7ec33d094d29dc34e70#f40370c48ae2e07d2bc1d7ec33d094d29dc34e70" -dependencies = [ - "bytemuck", - "emath", - "serde", -] - -[[package]] -name = "eframe" -version = "0.28.1" -source = "git+https://github.com/bu5hm4nn/egui?rev=f40370c48ae2e07d2bc1d7ec33d094d29dc34e70#f40370c48ae2e07d2bc1d7ec33d094d29dc34e70" -dependencies = [ - "ahash 0.8.11", - "bytemuck", - "directories", - "document-features", - "egui", - "egui-wgpu", - "egui-winit", - "egui_glow", - "glow", - "glutin", - "glutin-winit", - "image", - "js-sys", - "log", - "objc2 0.5.2", - "objc2-app-kit", - "objc2-foundation", - "parking_lot", - "percent-encoding", - "pollster", - "raw-window-handle 0.5.2", - "raw-window-handle 0.6.2", - "ron", - "serde", - "static_assertions", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "web-time", - "wgpu", - "winapi", - "winit", -] - -[[package]] -name = "egui" -version = "0.28.1" -source = "git+https://github.com/bu5hm4nn/egui?rev=f40370c48ae2e07d2bc1d7ec33d094d29dc34e70#f40370c48ae2e07d2bc1d7ec33d094d29dc34e70" -dependencies = [ - "accesskit", - "ahash 0.8.11", - "emath", - "epaint", - "log", - "nohash-hasher", - "ron", - "serde", -] - -[[package]] -name = "egui-video" -version = "0.1.0" -source = "git+https://github.com/mikedilger/egui-video?rev=2485b2b09372a1e254a4f2c51edab3fc62d79c3a#2485b2b09372a1e254a4f2c51edab3fc62d79c3a" -dependencies = [ - "anyhow", - "chrono", - "egui", - "ffmpeg-next", - "itertools 0.10.5", - "parking_lot", - "ringbuf", - "sdl2", - "tempfile", - "timer", -] - -[[package]] -name = "egui-wgpu" -version = "0.28.1" -source = "git+https://github.com/bu5hm4nn/egui?rev=f40370c48ae2e07d2bc1d7ec33d094d29dc34e70#f40370c48ae2e07d2bc1d7ec33d094d29dc34e70" -dependencies = [ - "ahash 0.8.11", - "bytemuck", - "document-features", - "egui", - "epaint", - "log", - "thiserror", - "type-map", - "web-time", - "wgpu", - "winit", -] - -[[package]] -name = "egui-winit" -version = "0.28.1" -source = "git+https://github.com/bu5hm4nn/egui?rev=f40370c48ae2e07d2bc1d7ec33d094d29dc34e70#f40370c48ae2e07d2bc1d7ec33d094d29dc34e70" -dependencies = [ - "accesskit_winit", - "ahash 0.8.11", - "arboard", - "egui", - "log", - "raw-window-handle 0.6.2", - "serde", - "smithay-clipboard", - "web-time", - "webbrowser", - "winit", -] - -[[package]] -name = "egui_extras" -version = "0.28.1" -source = "git+https://github.com/bu5hm4nn/egui?rev=f40370c48ae2e07d2bc1d7ec33d094d29dc34e70#f40370c48ae2e07d2bc1d7ec33d094d29dc34e70" -dependencies = [ - "ahash 0.8.11", - "egui", - "enum-map", - "log", - "mime_guess2", - "serde", - "syntect", -] - -[[package]] -name = "egui_glow" -version = "0.28.1" -source = "git+https://github.com/bu5hm4nn/egui?rev=f40370c48ae2e07d2bc1d7ec33d094d29dc34e70#f40370c48ae2e07d2bc1d7ec33d094d29dc34e70" -dependencies = [ - "ahash 0.8.11", - "bytemuck", - "egui", - "glow", - "log", - "memoffset 0.9.1", - "wasm-bindgen", - "web-sys", - "winit", -] - -[[package]] -name = "either" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" - -[[package]] -name = "emath" -version = "0.28.1" -source = "git+https://github.com/bu5hm4nn/egui?rev=f40370c48ae2e07d2bc1d7ec33d094d29dc34e70#f40370c48ae2e07d2bc1d7ec33d094d29dc34e70" -dependencies = [ - "bytemuck", - "serde", -] - -[[package]] -name = "encoding_rs" -version = "0.8.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "enum-map" -version = "2.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6866f3bfdf8207509a033af1a75a7b08abda06bbaaeae6669323fd5a097df2e9" -dependencies = [ - "enum-map-derive", - "serde", -] - -[[package]] -name = "enum-map-derive" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.72", -] - -[[package]] -name = "enumflags2" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" -dependencies = [ - "enumflags2_derive", - "serde", -] - -[[package]] -name = "enumflags2_derive" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.72", -] - -[[package]] -name = "enumn" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f9ed6b3789237c8a0c1c505af1c7eb2c560df6186f01b098c3a1064ea532f38" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.72", -] - -[[package]] -name = "epaint" -version = "0.28.1" -source = "git+https://github.com/bu5hm4nn/egui?rev=f40370c48ae2e07d2bc1d7ec33d094d29dc34e70#f40370c48ae2e07d2bc1d7ec33d094d29dc34e70" -dependencies = [ - "ab_glyph", - "ahash 0.8.11", - "bytemuck", - "ecolor", - "emath", - "log", - "nohash-hasher", - "parking_lot", - "serde", -] - -[[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.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "error-code" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" - -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[package]] -name = "event-listener" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener" -version = "5.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener-strategy" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" -dependencies = [ - "event-listener 5.3.1", - "pin-project-lite", -] - -[[package]] -name = "exr" -version = "1.72.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4" -dependencies = [ - "bit_field", - "flume", - "half", - "lebe", - "miniz_oxide", - "rayon-core", - "smallvec", - "zune-inflate", -] - -[[package]] -name = "fancy-regex" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b95f7c0680e4142284cf8b22c14a476e87d61b004a3a0861872b32ef7ead40a2" -dependencies = [ - "bit-set", - "regex", -] - -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "fastrand" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" - -[[package]] -name = "fdeflate" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" -dependencies = [ - "simd-adler32", -] - -[[package]] -name = "ffmpeg-next" -version = "7.0.4" -source = "git+https://github.com/mikedilger/rust-ffmpeg.git?rev=8974928ecf53e69777f85ee5c8780c907b7aa0a4#8974928ecf53e69777f85ee5c8780c907b7aa0a4" -dependencies = [ - "bitflags 2.6.0", - "ffmpeg-sys-next", - "libc", -] - -[[package]] -name = "ffmpeg-sys-next" -version = "7.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db1b7546e70609ead8c06b2b4c618a1ba352364675f81608f431dd4f321fe3f1" -dependencies = [ - "bindgen", - "cc", - "libc", - "num_cpus", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "filetime" -version = "0.2.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf401df4a4e3872c4fe8151134cf483738e74b67fc934d6532c882b3d24a4550" -dependencies = [ - "cfg-if", - "libc", - "libredox 0.1.3", - "windows-sys 0.59.0", -] - -[[package]] -name = "flate2" -version = "1.0.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "float-cmp" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" - -[[package]] -name = "flume" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" -dependencies = [ - "spin", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "fontconfig-parser" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1fcfcd44ca6e90c921fee9fa665d530b21ef1327a4c1a6c5250ea44b776ada7" -dependencies = [ - "roxmltree 0.20.0", -] - -[[package]] -name = "fontdb" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af8d8cbea8f21307d7e84bca254772981296f058a1d36b461bf4d83a7499fc9e" -dependencies = [ - "fontconfig-parser", - "log", - "memmap2 0.6.2", - "slotmap", - "tinyvec", - "ttf-parser 0.19.2", -] - -[[package]] -name = "fontdb" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37be9fc20d966be438cd57a45767f73349477fb0f85ce86e000557f787298afb" -dependencies = [ - "fontconfig-parser", - "log", - "memmap2 0.9.4", - "slotmap", - "tinyvec", - "ttf-parser 0.24.1", -] - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared 0.1.1", -] - -[[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 0.3.1", -] - -[[package]] -name = "foreign-types-macros" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.72", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[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 = "fuchsia-cprng" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" - -[[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-lite" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" -dependencies = [ - "fastrand 1.9.0", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] - -[[package]] -name = "futures-lite" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" -dependencies = [ - "fastrand 2.1.0", - "futures-core", - "futures-io", - "parking", - "pin-project-lite", -] - -[[package]] -name = "futures-macro" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.72", -] - -[[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 = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "gethostname" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" -dependencies = [ - "libc", - "windows-targets 0.48.5", -] - -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", -] - -[[package]] -name = "gif" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" -dependencies = [ - "color_quant", - "weezl", -] - -[[package]] -name = "gif" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" -dependencies = [ - "color_quant", - "weezl", -] - -[[package]] -name = "gimli" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" - -[[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" -version = "0.31.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fcd4ae4e86d991ad1300b8f57166e5be0c95ef1f63f3f5b827f8a164548746" -dependencies = [ - "bitflags 2.6.0", - "cfg_aliases", - "cgl", - "core-foundation", - "dispatch", - "glutin_egl_sys", - "glutin_glx_sys", - "glutin_wgl_sys", - "icrate", - "libloading 0.8.5", - "objc2 0.4.1", - "once_cell", - "raw-window-handle 0.5.2", - "wayland-sys", - "windows-sys 0.48.0", - "x11-dl", -] - -[[package]] -name = "glutin-winit" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ebcdfba24f73b8412c5181e56f092b5eff16671c514ce896b258a0a64bd7735" -dependencies = [ - "cfg_aliases", - "glutin", - "raw-window-handle 0.5.2", - "winit", -] - -[[package]] -name = "glutin_egl_sys" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77cc5623f5309ef433c3dd4ca1223195347fe62c413da8e2fdd0eb76db2d9bcd" -dependencies = [ - "gl_generator", - "windows-sys 0.48.0", -] - -[[package]] -name = "glutin_glx_sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a165fd686c10dcc2d45380b35796e577eacfd43d4660ee741ec8ebe2201b3b4f" -dependencies = [ - "gl_generator", - "x11-dl", -] - -[[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 = "gossip" -version = "0.12.0" -dependencies = [ - "bech32 0.11.0", - "chrono", - "eframe", - "egui-video", - "egui-winit", - "egui_extras", - "gossip-lib", - "humansize", - "image", - "lazy_static", - "memoize", - "nostr-types", - "paste", - "qrcode", - "resvg 0.35.0", - "rpassword", - "sdl2", - "serde", - "serde_json", - "time", - "tiny-skia 0.10.0", - "tokio", - "tracing", - "tracing-subscriber", - "url", - "usvg 0.35.0", - "zeroize", -] - -[[package]] -name = "gossip-lib" -version = "0.12.0" -dependencies = [ - "base64 0.22.1", - "bech32 0.11.0", - "dashmap", - "dirs", - "encoding_rs", - "filetime", - "futures", - "futures-util", - "heed", - "hex", - "http", - "image", - "kamadak-exif", - "lazy_static", - "linkify", - "mime", - "normpath", - "nostr-types", - "parking_lot", - "paste", - "rand 0.8.5", - "regex", - "reqwest", - "resvg 0.43.0", - "rhai", - "sdl2", - "serde", - "serde_json", - "sha2", - "speedy", - "tempdir", - "textnonce", - "tiny-skia 0.11.4", - "tokio", - "tokio-tungstenite", - "tracing", - "tungstenite", - "url", - "usvg 0.43.0", - "watcher", - "zeroize", -] - -[[package]] -name = "gpu-alloc" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" -dependencies = [ - "bitflags 2.6.0", - "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.6.0", -] - -[[package]] -name = "gpu-allocator" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f56f6318968d03c18e1bcf4857ff88c61157e9da8e47c5f29055d60e1228884" -dependencies = [ - "log", - "presser", - "thiserror", - "winapi", - "windows 0.52.0", -] - -[[package]] -name = "gpu-descriptor" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c08c1f623a8d0b722b8b99f821eb0ba672a1618f0d3b16ddbee1cedd2dd8557" -dependencies = [ - "bitflags 2.6.0", - "gpu-descriptor-types", - "hashbrown 0.14.5", -] - -[[package]] -name = "gpu-descriptor-types" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91" -dependencies = [ - "bitflags 2.6.0", -] - -[[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" -dependencies = [ - "ahash 0.7.8", -] - -[[package]] -name = "hashbrown" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" -dependencies = [ - "ahash 0.8.11", - "allocator-api2", -] - -[[package]] -name = "hassle-rs" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890" -dependencies = [ - "bitflags 2.6.0", - "com", - "libc", - "libloading 0.8.5", - "thiserror", - "widestring", - "winapi", -] - -[[package]] -name = "heck" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - -[[package]] -name = "heed" -version = "0.20.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc30da4a93ff8cb98e535d595d6de42731d4719d707bc1c86f579158751a24e" -dependencies = [ - "bitflags 2.6.0", - "byteorder", - "heed-traits", - "heed-types", - "libc", - "lmdb-master-sys", - "once_cell", - "page_size", - "serde", - "synchronoise", - "url", -] - -[[package]] -name = "heed-traits" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3130048d404c57ce5a1ac61a903696e8fcde7e8c2991e9fcfc1f27c3ef74ff" - -[[package]] -name = "heed-types" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d3f528b053a6d700b2734eabcd0fd49cb8230647aa72958467527b0b7917114" -dependencies = [ - "bincode", - "byteorder", - "heed-traits", - "serde", - "serde_json", -] - -[[package]] -name = "hermit-abi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - -[[package]] -name = "hermit-abi" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "hex-conservative" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212ab92002354b4819390025006c897e8140934349e8635c9b077f47b4dcbd20" - -[[package]] -name = "hex-conservative" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5313b072ce3c597065a808dbf612c4c8e8590bdbf8b579508bf7a762c5eae6cd" -dependencies = [ - "arrayvec", -] - -[[package]] -name = "hex_lit" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3011d1213f159867b13cfd6ac92d2cd5f1345762c63be3554e84092d85a50bbd" - -[[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 = "http" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" -dependencies = [ - "bytes", - "http", -] - -[[package]] -name = "http-body-util" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" -dependencies = [ - "bytes", - "futures-util", - "http", - "http-body", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" - -[[package]] -name = "humansize" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cb51c9a029ddc91b07a787f1d86b53ccfa49b0e86688c946ebe8d3555685dd7" -dependencies = [ - "libm", -] - -[[package]] -name = "hyper" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "http", - "http-body", - "httparse", - "itoa", - "pin-project-lite", - "smallvec", - "tokio", - "want", -] - -[[package]] -name = "hyper-rustls" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" -dependencies = [ - "futures-util", - "http", - "hyper", - "hyper-util", - "rustls", - "rustls-native-certs", - "rustls-pki-types", - "tokio", - "tokio-rustls", - "tower-service", - "webpki-roots", -] - -[[package]] -name = "hyper-tls" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" -dependencies = [ - "bytes", - "http-body-util", - "hyper", - "hyper-util", - "native-tls", - "tokio", - "tokio-native-tls", - "tower-service", -] - -[[package]] -name = "hyper-util" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "http", - "http-body", - "hyper", - "pin-project-lite", - "socket2 0.5.7", - "tokio", - "tower", - "tower-service", - "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", -] - -[[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 = "icrate" -version = "0.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" -dependencies = [ - "block2 0.3.0", - "dispatch", - "objc2 0.4.1", -] - -[[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 = "image" -version = "0.25.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" -dependencies = [ - "bytemuck", - "byteorder-lite", - "color_quant", - "exr", - "gif 0.13.1", - "image-webp", - "num-traits", - "png", - "qoi", - "ravif", - "rayon", - "rgb", - "tiff", - "zune-core", - "zune-jpeg", -] - -[[package]] -name = "image-webp" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f79afb8cbee2ef20f59ccd477a218c12a93943d075b492015ecb1bb81f8ee904" -dependencies = [ - "byteorder-lite", - "quick-error", -] - -[[package]] -name = "imagesize" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" - -[[package]] -name = "imagesize" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edcd27d72f2f071c64249075f42e205ff93c9a4c5f6c6da53e79ed9f9832c285" - -[[package]] -name = "imgref" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126" - -[[package]] -name = "indexmap" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0" -dependencies = [ - "equivalent", - "hashbrown 0.14.5", -] - -[[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 = "instant" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "interpolate_name" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.72", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.9", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "ipnet" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" - -[[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 = "jni" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" -dependencies = [ - "cesu8", - "cfg-if", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", - "windows-sys 0.45.0", -] - -[[package]] -name = "jni-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" - -[[package]] -name = "jobserver" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" -dependencies = [ - "libc", -] - -[[package]] -name = "jpeg-decoder" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" - -[[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 = "kamadak-exif" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef4fc70d0ab7e5b6bafa30216a6b48705ea964cdfc29c050f2412295eba58077" -dependencies = [ - "mutate_once", -] - -[[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.5", - "pkg-config", -] - -[[package]] -name = "khronos_api" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" - -[[package]] -name = "kurbo" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" -dependencies = [ - "arrayvec", -] - -[[package]] -name = "kurbo" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e5aa9f0f96a938266bdb12928a67169e8d22c6a786fda8ed984b85e6ba93c3c" -dependencies = [ - "arrayvec", - "smallvec", -] - -[[package]] -name = "lazy_static" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" - -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] -name = "lebe" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" - -[[package]] -name = "libc" -version = "0.2.155" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" - -[[package]] -name = "libfuzzer-sys" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7" -dependencies = [ - "arbitrary", - "cc", - "once_cell", -] - -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] - -[[package]] -name = "libloading" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" -dependencies = [ - "cfg-if", - "windows-targets 0.48.5", -] - -[[package]] -name = "libm" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" - -[[package]] -name = "libredox" -version = "0.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" -dependencies = [ - "bitflags 2.6.0", - "libc", - "redox_syscall 0.4.1", -] - -[[package]] -name = "libredox" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" -dependencies = [ - "bitflags 2.6.0", - "libc", - "redox_syscall 0.5.3", -] - -[[package]] -name = "lightning" -version = "0.0.123-beta" -source = "git+https://github.com/mikedilger/rust-lightning?rev=7a62cb4106d449bc4d1724920b73918d501bb3a9#7a62cb4106d449bc4d1724920b73918d501bb3a9" -dependencies = [ - "bitcoin", - "hex-conservative 0.1.2", - "musig2", -] - -[[package]] -name = "lightning-invoice" -version = "0.31.0-beta" -source = "git+https://github.com/mikedilger/rust-lightning?rev=7a62cb4106d449bc4d1724920b73918d501bb3a9#7a62cb4106d449bc4d1724920b73918d501bb3a9" -dependencies = [ - "bech32 0.9.1", - "bitcoin", - "lightning", - "secp256k1 0.27.0", -] - -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - -[[package]] -name = "linkify" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1dfa36d52c581e9ec783a7ce2a5e0143da6237be5811a0b3153fedfdbe9f780" -dependencies = [ - "memchr", -] - -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "linux-raw-sys" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" - -[[package]] -name = "litrs" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" - -[[package]] -name = "lmdb-master-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57640c190703d5ccf4a86aff4aeb749b2d287a8cb1723c76b51f39d77ab53b24" -dependencies = [ - "cc", - "doxygen-rs", - "libc", -] - -[[package]] -name = "lock_api" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" - -[[package]] -name = "loop9" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062" -dependencies = [ - "imgref", -] - -[[package]] -name = "lru" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a" -dependencies = [ - "hashbrown 0.12.3", -] - -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - -[[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 = "maybe-rayon" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "memchr" -version = "2.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" - -[[package]] -name = "memmap2" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d28bba84adfe6646737845bc5ebbfa2c08424eb1c37e94a1fd2a82adb56a872" -dependencies = [ - "libc", -] - -[[package]] -name = "memmap2" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" -dependencies = [ - "libc", -] - -[[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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoize" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5df4051db13d0816cf23196d3baa216385ae099339f5d0645a8d9ff2305e82b8" -dependencies = [ - "lazy_static", - "lru", - "memoize-inner", -] - -[[package]] -name = "memoize-inner" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27bdece7e91f0d1e33df7b46ec187a93ea0d4e642113a1039ac8bfdd4a3273ac" -dependencies = [ - "lazy_static", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "metal" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5637e166ea14be6063a3f8ba5ccb9a4159df7d8f6d61c02fc3d480b1f90dcfcb" -dependencies = [ - "bitflags 2.6.0", - "block", - "core-graphics-types", - "foreign-types 0.5.0", - "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_guess2" -version = "2.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25a3333bb1609500601edc766a39b4c1772874a4ce26022f4d866854dc020c41" -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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" -dependencies = [ - "adler", - "simd-adler32", -] - -[[package]] -name = "mio" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" -dependencies = [ - "hermit-abi 0.3.9", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.52.0", -] - -[[package]] -name = "musig2" -version = "0.1.0" -source = "git+https://github.com/arik-so/rust-musig2?rev=cff11e3#cff11e3b1af1691f721a120dc6acb921afa31f89" -dependencies = [ - "bitcoin", -] - -[[package]] -name = "mutate_once" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" - -[[package]] -name = "naga" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e536ae46fcab0876853bd4a632ede5df4b1c2527a58f6c5a4150fe86be858231" -dependencies = [ - "arrayvec", - "bit-set", - "bitflags 2.6.0", - "codespan-reporting", - "hexf-parse", - "indexmap", - "log", - "num-traits", - "rustc-hash 1.1.0", - "spirv", - "termcolor", - "thiserror", - "unicode-xid", -] - -[[package]] -name = "native-tls" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" -dependencies = [ - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "ndk" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" -dependencies = [ - "bitflags 2.6.0", - "jni-sys", - "log", - "ndk-sys", - "num_enum", - "raw-window-handle 0.5.2", - "raw-window-handle 0.6.2", - "thiserror", -] - -[[package]] -name = "ndk-context" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" - -[[package]] -name = "ndk-sys" -version = "0.5.0+25.2.9519653" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" -dependencies = [ - "jni-sys", -] - -[[package]] -name = "new_debug_unreachable" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" - -[[package]] -name = "nip44" -version = "0.1.0" -source = "git+https://github.com/mikedilger/nip44?rev=a55cd3850634d7e462c107a37a068f829670d6a2#a55cd3850634d7e462c107a37a068f829670d6a2" -dependencies = [ - "base64 0.22.1", - "chacha20", - "constant_time_eq", - "hkdf", - "hmac", - "rand_core 0.6.4", - "secp256k1 0.29.0", - "sha2", - "thiserror", -] - -[[package]] -name = "nix" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset 0.7.1", -] - -[[package]] -name = "nohash-hasher" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" - -[[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 = "noop_proc_macro" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" - -[[package]] -name = "normpath" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8911957c4b1549ac0dc74e30db9c8b0e66ddcd6d7acc33098f4c63a64a6d7ed" -dependencies = [ - "windows-sys 0.59.0", -] - -[[package]] -name = "nostr-types" -version = "0.8.0-unstable" -source = "git+https://github.com/mikedilger/nostr-types?rev=013a1657258d786196cc0b63bf7af8a0a588d004#013a1657258d786196cc0b63bf7af8a0a588d004" -dependencies = [ - "aes", - "base64 0.22.1", - "bech32 0.11.0", - "cbc", - "chacha20", - "chacha20poly1305", - "core-net", - "derive_more", - "hex", - "hmac", - "lazy_static", - "lightning-invoice", - "linkify", - "nip44", - "num_cpus", - "pbkdf2", - "rand 0.8.5", - "rand_core 0.6.4", - "regex", - "scrypt", - "secp256k1 0.29.0", - "serde", - "serde_json", - "sha2", - "speedy", - "thiserror", - "thread-priority", - "unicode-normalization", - "url", - "zeroize", -] - -[[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.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" -dependencies = [ - "num-integer", - "num-traits", -] - -[[package]] -name = "num-conv" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" - -[[package]] -name = "num-derive" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.72", -] - -[[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-rational" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" -dependencies = [ - "num-bigint", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -dependencies = [ - "autocfg", -] - -[[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.9", - "libc", -] - -[[package]] -name = "num_enum" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" -dependencies = [ - "num_enum_derive", -] - -[[package]] -name = "num_enum_derive" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" -dependencies = [ - "proc-macro-crate 3.1.0", - "proc-macro2", - "quote", - "syn 2.0.72", -] - -[[package]] -name = "objc" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" -dependencies = [ - "malloc_buf", -] - -[[package]] -name = "objc-sys" -version = "0.2.0-beta.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7" - -[[package]] -name = "objc-sys" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" - -[[package]] -name = "objc2" -version = "0.3.0-beta.3.patch-leaks.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e01640f9f2cb1220bbe80325e179e532cb3379ebcd1bf2279d703c19fe3a468" -dependencies = [ - "block2 0.2.0-alpha.6", - "objc-sys 0.2.0-beta.2", - "objc2-encode 2.0.0-pre.2", -] - -[[package]] -name = "objc2" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" -dependencies = [ - "objc-sys 0.3.5", - "objc2-encode 3.0.0", -] - -[[package]] -name = "objc2" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" -dependencies = [ - "objc-sys 0.3.5", - "objc2-encode 4.0.3", -] - -[[package]] -name = "objc2-app-kit" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" -dependencies = [ - "bitflags 2.6.0", - "block2 0.5.1", - "libc", - "objc2 0.5.2", - "objc2-core-data", - "objc2-core-image", - "objc2-foundation", - "objc2-quartz-core", -] - -[[package]] -name = "objc2-core-data" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" -dependencies = [ - "bitflags 2.6.0", - "block2 0.5.1", - "objc2 0.5.2", - "objc2-foundation", -] - -[[package]] -name = "objc2-core-image" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" -dependencies = [ - "block2 0.5.1", - "objc2 0.5.2", - "objc2-foundation", - "objc2-metal", -] - -[[package]] -name = "objc2-encode" -version = "2.0.0-pre.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512" -dependencies = [ - "objc-sys 0.2.0-beta.2", -] - -[[package]] -name = "objc2-encode" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" - -[[package]] -name = "objc2-encode" -version = "4.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" - -[[package]] -name = "objc2-foundation" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" -dependencies = [ - "bitflags 2.6.0", - "block2 0.5.1", - "libc", - "objc2 0.5.2", -] - -[[package]] -name = "objc2-metal" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" -dependencies = [ - "bitflags 2.6.0", - "block2 0.5.1", - "objc2 0.5.2", - "objc2-foundation", -] - -[[package]] -name = "objc2-quartz-core" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" -dependencies = [ - "bitflags 2.6.0", - "block2 0.5.1", - "objc2 0.5.2", - "objc2-foundation", - "objc2-metal", -] - -[[package]] -name = "object" -version = "0.36.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "opaque-debug" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" - -[[package]] -name = "openssl" -version = "0.10.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" -dependencies = [ - "bitflags 2.6.0", - "cfg-if", - "foreign-types 0.3.2", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.72", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-sys" -version = "0.9.103" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - -[[package]] -name = "orbclient" -version = "0.3.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52f0d54bde9774d3a51dcf281a5def240c71996bc6ca05d2c847ec8b2b216166" -dependencies = [ - "libredox 0.0.2", -] - -[[package]] -name = "ordered-stream" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" -dependencies = [ - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[package]] -name = "owned_ttf_parser" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "490d3a563d3122bf7c911a59b0add9389e5ec0f5f0c3ac6b91ff235a0e6a7f90" -dependencies = [ - "ttf-parser 0.24.1", -] - -[[package]] -name = "page_size" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d5b2194ed13191c1999ae0704b7839fb18384fa22e49b57eeaa97d79ce40da" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "parking" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" - -[[package]] -name = "parking_lot" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.5.3", - "smallvec", - "windows-targets 0.52.6", -] - -[[package]] -name = "password-hash" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" -dependencies = [ - "base64ct", - "rand_core 0.6.4", - "subtle", -] - -[[package]] -name = "paste" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" - -[[package]] -name = "pbkdf2" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" -dependencies = [ - "digest", - "hmac", - "password-hash", - "sha2", -] - -[[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_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 0.8.5", -] - -[[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", - "quote", - "syn 2.0.72", -] - -[[package]] -name = "phf_shared" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" -dependencies = [ - "siphasher 0.3.11", -] - -[[package]] -name = "pico-args" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" - -[[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.72", -] - -[[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" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "piper" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" -dependencies = [ - "atomic-waker", - "fastrand 2.1.0", - "futures-io", -] - -[[package]] -name = "pkg-config" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" - -[[package]] -name = "plist" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" -dependencies = [ - "base64 0.22.1", - "indexmap", - "quick-xml 0.32.0", - "serde", - "time", -] - -[[package]] -name = "png" -version = "0.17.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" -dependencies = [ - "bitflags 1.3.2", - "crc32fast", - "fdeflate", - "flate2", - "miniz_oxide", -] - -[[package]] -name = "polling" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" -dependencies = [ - "autocfg", - "bitflags 1.3.2", - "cfg-if", - "concurrent-queue", - "libc", - "log", - "pin-project-lite", - "windows-sys 0.48.0", -] - -[[package]] -name = "polling" -version = "3.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" -dependencies = [ - "cfg-if", - "concurrent-queue", - "hermit-abi 0.4.0", - "pin-project-lite", - "rustix 0.38.34", - "tracing", - "windows-sys 0.59.0", -] - -[[package]] -name = "pollster" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2" - -[[package]] -name = "poly1305" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" -dependencies = [ - "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.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" -dependencies = [ - "zerocopy", -] - -[[package]] -name = "presser" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" - -[[package]] -name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit 0.19.15", -] - -[[package]] -name = "proc-macro-crate" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" -dependencies = [ - "toml_edit 0.21.1", -] - -[[package]] -name = "proc-macro2" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "profiling" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" -dependencies = [ - "profiling-procmacros", -] - -[[package]] -name = "profiling-procmacros" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" -dependencies = [ - "quote", - "syn 2.0.72", -] - -[[package]] -name = "qoi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" -dependencies = [ - "bytemuck", -] - -[[package]] -name = "qrcode" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d68782463e408eb1e668cf6152704bd856c78c5b6417adaee3203d8f4c1fc9ec" -dependencies = [ - "image", -] - -[[package]] -name = "quick-error" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" - -[[package]] -name = "quick-xml" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2" -dependencies = [ - "memchr", -] - -[[package]] -name = "quick-xml" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f24d770aeca0eacb81ac29dfbc55ebcc09312fdd1f8bbecdc7e4a84e000e3b4" -dependencies = [ - "memchr", -] - -[[package]] -name = "quinn" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156" -dependencies = [ - "bytes", - "pin-project-lite", - "quinn-proto", - "quinn-udp", - "rustc-hash 2.0.0", - "rustls", - "socket2 0.5.7", - "thiserror", - "tokio", - "tracing", -] - -[[package]] -name = "quinn-proto" -version = "0.11.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd" -dependencies = [ - "bytes", - "rand 0.8.5", - "ring", - "rustc-hash 2.0.0", - "rustls", - "slab", - "thiserror", - "tinyvec", - "tracing", -] - -[[package]] -name = "quinn-udp" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285" -dependencies = [ - "libc", - "once_cell", - "socket2 0.5.7", - "tracing", - "windows-sys 0.52.0", -] - -[[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.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" -dependencies = [ - "fuchsia-cprng", - "libc", - "rand_core 0.3.1", - "rdrand", - "winapi", -] - -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -dependencies = [ - "rand_core 0.4.2", -] - -[[package]] -name = "rand_core" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom 0.2.15", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rav1e" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd87ce80a7665b1cce111f8a16c1f3929f6547ce91ade6addf4ec86a8dda5ce9" -dependencies = [ - "arbitrary", - "arg_enum_proc_macro", - "arrayvec", - "av1-grain", - "bitstream-io", - "built", - "cfg-if", - "interpolate_name", - "itertools 0.12.1", - "libc", - "libfuzzer-sys", - "log", - "maybe-rayon", - "new_debug_unreachable", - "noop_proc_macro", - "num-derive", - "num-traits", - "once_cell", - "paste", - "profiling", - "rand 0.8.5", - "rand_chacha 0.3.1", - "simd_helpers", - "system-deps", - "thiserror", - "v_frame", - "wasm-bindgen", -] - -[[package]] -name = "ravif" -version = "0.11.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f0bfd976333248de2078d350bfdf182ff96e168a24d23d2436cef320dd4bdd" -dependencies = [ - "avif-serialize", - "imgref", - "loop9", - "quick-error", - "rav1e", - "rgb", -] - -[[package]] -name = "raw-window-handle" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" - -[[package]] -name = "raw-window-handle" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" - -[[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 = "rctree" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" - -[[package]] -name = "rdrand" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - -[[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_syscall" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" -dependencies = [ - "bitflags 2.6.0", -] - -[[package]] -name = "redox_users" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" -dependencies = [ - "getrandom 0.2.15", - "libredox 0.1.3", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata 0.4.7", - "regex-syntax 0.8.4", -] - -[[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.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.8.4", -] - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" - -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] - -[[package]] -name = "renderdoc-sys" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" - -[[package]] -name = "reqwest" -version = "0.12.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" -dependencies = [ - "async-compression", - "base64 0.22.1", - "bytes", - "futures-core", - "futures-util", - "http", - "http-body", - "http-body-util", - "hyper", - "hyper-rustls", - "hyper-tls", - "hyper-util", - "ipnet", - "js-sys", - "log", - "mime", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "quinn", - "rustls", - "rustls-native-certs", - "rustls-pemfile", - "rustls-pki-types", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "tokio", - "tokio-native-tls", - "tokio-rustls", - "tokio-util", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "webpki-roots", - "winreg", -] - -[[package]] -name = "resvg" -version = "0.35.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6554f47c38eca56827eea7f285c2a3018b4e12e0e195cc105833c008be338f1" -dependencies = [ - "gif 0.12.0", - "jpeg-decoder", - "log", - "pico-args", - "png", - "rgb", - "svgtypes 0.11.0", - "tiny-skia 0.10.0", - "usvg 0.35.0", -] - -[[package]] -name = "resvg" -version = "0.43.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7314563c59c7ce31c18e23ad3dd092c37b928a0fa4e1c0a1a6504351ab411d1" -dependencies = [ - "gif 0.13.1", - "image-webp", - "log", - "pico-args", - "rgb", - "svgtypes 0.15.1", - "tiny-skia 0.11.4", - "usvg 0.43.0", - "zune-jpeg", -] - -[[package]] -name = "rgb" -version = "0.8.48" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f86ae463694029097b846d8f99fd5536740602ae00022c0c50c5600720b2f71" -dependencies = [ - "bytemuck", -] - -[[package]] -name = "rhai" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61797318be89b1a268a018a92a7657096d83f3ecb31418b9e9c16dcbb043b702" -dependencies = [ - "ahash 0.8.11", - "bitflags 2.6.0", - "instant", - "num-traits", - "once_cell", - "rhai_codegen", - "smallvec", - "smartstring", - "thin-vec", -] - -[[package]] -name = "rhai_codegen" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5a11a05ee1ce44058fa3d5961d05194fdbe3ad6b40f904af764d81b86450e6b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.72", -] - -[[package]] -name = "ring" -version = "0.17.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" -dependencies = [ - "cc", - "cfg-if", - "getrandom 0.2.15", - "libc", - "spin", - "untrusted", - "windows-sys 0.52.0", -] - -[[package]] -name = "ringbuf" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79abed428d1fd2a128201cec72c5f6938e2da607c6f3745f769fabea399d950a" -dependencies = [ - "crossbeam-utils", -] - -[[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.6.0", - "serde", - "serde_derive", -] - -[[package]] -name = "roxmltree" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "862340e351ce1b271a378ec53f304a5558f7db87f3769dc655a8f6ecbb68b302" -dependencies = [ - "xmlparser", -] - -[[package]] -name = "roxmltree" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" - -[[package]] -name = "rpassword" -version = "7.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80472be3c897911d0137b2d2b9055faf6eeac5b14e324073d83bc17b191d7e3f" -dependencies = [ - "libc", - "rtoolbox", - "windows-sys 0.48.0", -] - -[[package]] -name = "rtoolbox" -version = "0.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c247d24e63230cdb56463ae328478bd5eac8b8faa8c69461a77e8e323afac90e" -dependencies = [ - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustc-hash" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] -name = "rustix" -version = "0.37.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustix" -version = "0.38.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" -dependencies = [ - "bitflags 2.6.0", - "errno", - "libc", - "linux-raw-sys 0.4.14", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustls" -version = "0.23.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" -dependencies = [ - "once_cell", - "ring", - "rustls-pki-types", - "rustls-webpki", - "subtle", - "zeroize", -] - -[[package]] -name = "rustls-native-certs" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a88d6d420651b496bdd98684116959239430022a115c1240e6c3993be0b15fba" -dependencies = [ - "openssl-probe", - "rustls-pemfile", - "rustls-pki-types", - "schannel", - "security-framework", -] - -[[package]] -name = "rustls-pemfile" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" -dependencies = [ - "base64 0.22.1", - "rustls-pki-types", -] - -[[package]] -name = "rustls-pki-types" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" - -[[package]] -name = "rustls-webpki" -version = "0.102.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" -dependencies = [ - "ring", - "rustls-pki-types", - "untrusted", -] - -[[package]] -name = "rustversion" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" - -[[package]] -name = "rustybuzz" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "162bdf42e261bee271b3957691018634488084ef577dddeb6420a9684cab2a6a" -dependencies = [ - "bitflags 1.3.2", - "bytemuck", - "smallvec", - "ttf-parser 0.18.1", - "unicode-bidi-mirroring 0.1.0", - "unicode-ccc 0.1.2", - "unicode-general-category", - "unicode-script", -] - -[[package]] -name = "rustybuzz" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85d1ccd519e61834798eb52c4e886e8c2d7d698dd3d6ce0b1b47eb8557f1181" -dependencies = [ - "bitflags 2.6.0", - "bytemuck", - "core_maths", - "log", - "smallvec", - "ttf-parser 0.24.1", - "unicode-bidi-mirroring 0.3.0", - "unicode-ccc 0.3.0", - "unicode-properties", - "unicode-script", -] - -[[package]] -name = "ryu" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" - -[[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 = "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 = "sctk-adwaita" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70b31447ca297092c5a9916fc3b955203157b37c19ca8edde4f52e9843e602c7" -dependencies = [ - "ab_glyph", - "log", - "memmap2 0.9.4", - "smithay-client-toolkit 0.18.1", - "tiny-skia 0.11.4", -] - -[[package]] -name = "sdl2" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b498da7d14d1ad6c839729bd4ad6fc11d90a57583605f3b4df2cd709a9cd380" -dependencies = [ - "bitflags 1.3.2", - "lazy_static", - "libc", - "sdl2-sys", -] - -[[package]] -name = "sdl2-sys" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "951deab27af08ed9c6068b7b0d05a93c91f0a8eb16b6b816a5e73452a43521d3" -dependencies = [ - "cfg-if", - "cmake", - "libc", - "version-compare 0.1.1", -] - -[[package]] -name = "secp256k1" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25996b82292a7a57ed3508f052cfff8640d38d32018784acd714758b43da9c8f" -dependencies = [ - "bitcoin_hashes 0.12.0", - "secp256k1-sys 0.8.1", -] - -[[package]] -name = "secp256k1" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e0cc0f1cf93f4969faf3ea1c7d8a9faed25918d96affa959720823dfe86d4f3" -dependencies = [ - "bitcoin_hashes 0.14.0", - "rand 0.8.5", - "secp256k1-sys 0.10.0", - "serde", -] - -[[package]] -name = "secp256k1-sys" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70a129b9e9efbfb223753b9163c4ab3b13cff7fd9c7f010fbac25ab4099fa07e" -dependencies = [ - "cc", -] - -[[package]] -name = "secp256k1-sys" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1433bd67156263443f14d603720b082dd3121779323fce20cba2aa07b874bc1b" -dependencies = [ - "cc", -] - -[[package]] -name = "security-framework" -version = "2.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" -dependencies = [ - "bitflags 2.6.0", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "semver" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" - -[[package]] -name = "serde" -version = "1.0.205" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33aedb1a7135da52b7c21791455563facbbcc43d0f0f66165b42c21b3dfb150" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.205" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692d6f5ac90220161d6774db30c662202721e64aed9058d2c394f451261420c1" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.72", -] - -[[package]] -name = "serde_json" -version = "1.0.122" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" -dependencies = [ - "itoa", - "memchr", - "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 2.0.72", -] - -[[package]] -name = "serde_spanned" -version = "0.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" -dependencies = [ - "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 = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "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 = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[package]] -name = "signal-hook-registry" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" -dependencies = [ - "libc", -] - -[[package]] -name = "simd-adler32" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" - -[[package]] -name = "simd_helpers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95890f873bec569a0362c235787f3aca6e1e887302ba4840839bcc6459c42da6" -dependencies = [ - "quote", -] - -[[package]] -name = "simplecss" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a11be7c62927d9427e9f40f3444d5499d868648e2edbc4e2116de69e7ec0e89d" -dependencies = [ - "log", -] - -[[package]] -name = "siphasher" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" - -[[package]] -name = "siphasher" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" - -[[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", -] - -[[package]] -name = "smallvec" -version = "1.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - -[[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", -] - -[[package]] -name = "smithay-client-toolkit" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" -dependencies = [ - "bitflags 2.6.0", - "calloop 0.12.4", - "calloop-wayland-source 0.2.0", - "cursor-icon", - "libc", - "log", - "memmap2 0.9.4", - "rustix 0.38.34", - "thiserror", - "wayland-backend", - "wayland-client", - "wayland-csd-frame", - "wayland-cursor", - "wayland-protocols 0.31.2", - "wayland-protocols-wlr 0.2.0", - "wayland-scanner", - "xkeysym", -] - -[[package]] -name = "smithay-client-toolkit" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016" -dependencies = [ - "bitflags 2.6.0", - "calloop 0.13.0", - "calloop-wayland-source 0.3.0", - "cursor-icon", - "libc", - "log", - "memmap2 0.9.4", - "rustix 0.38.34", - "thiserror", - "wayland-backend", - "wayland-client", - "wayland-csd-frame", - "wayland-cursor", - "wayland-protocols 0.32.3", - "wayland-protocols-wlr 0.3.3", - "wayland-scanner", - "xkeysym", -] - -[[package]] -name = "smithay-clipboard" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc8216eec463674a0e90f29e0ae41a4db573ec5b56b1c6c1c71615d249b6d846" -dependencies = [ - "libc", - "smithay-client-toolkit 0.19.2", - "wayland-backend", -] - -[[package]] -name = "smol_str" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead" -dependencies = [ - "serde", -] - -[[package]] -name = "socket2" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "socket2" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "speedy" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da1992073f0e55aab599f4483c460598219b4f9ff0affa124b33580ab511e25a" -dependencies = [ - "memoffset 0.9.1", - "speedy-derive", -] - -[[package]] -name = "speedy-derive" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658f2ca5276b92c3dfd65fa88316b4e032ace68f88d7570b43967784c0bac5ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.72", -] - -[[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.3.0+sdk-1.3.268.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" -dependencies = [ - "bitflags 2.6.0", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "strict-num" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" -dependencies = [ - "float-cmp", -] - -[[package]] -name = "subtle" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" - -[[package]] -name = "svgtypes" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed4b0611e7f3277f68c0fa18e385d9e2d26923691379690039548f867cef02a7" -dependencies = [ - "kurbo 0.9.5", - "siphasher 0.3.11", -] - -[[package]] -name = "svgtypes" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fae3064df9b89391c9a76a0425a69d124aee9c5c28455204709e72c39868a43c" -dependencies = [ - "kurbo 0.11.0", - "siphasher 1.0.1", -] - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.72" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "sync_wrapper" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" - -[[package]] -name = "synchronoise" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dbc01390fc626ce8d1cffe3376ded2b72a11bb70e1c75f404a210e4daa4def2" -dependencies = [ - "crossbeam-queue", -] - -[[package]] -name = "syntect" -version = "5.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "874dcfa363995604333cf947ae9f751ca3af4522c60886774c4963943b4746b1" -dependencies = [ - "bincode", - "bitflags 1.3.2", - "fancy-regex", - "flate2", - "fnv", - "once_cell", - "plist", - "regex-syntax 0.8.4", - "serde", - "serde_derive", - "serde_json", - "thiserror", - "walkdir", - "yaml-rust", -] - -[[package]] -name = "system-deps" -version = "6.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" -dependencies = [ - "cfg-expr", - "heck", - "pkg-config", - "toml", - "version-compare 0.2.0", -] - -[[package]] -name = "target-lexicon" -version = "0.12.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" - -[[package]] -name = "tempdir" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" -dependencies = [ - "rand 0.4.6", - "remove_dir_all", -] - -[[package]] -name = "tempfile" -version = "3.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" -dependencies = [ - "cfg-if", - "fastrand 2.1.0", - "once_cell", - "rustix 0.38.34", - "windows-sys 0.59.0", -] - -[[package]] -name = "termcolor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "textnonce" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7743f8d70cd784ed1dc33106a18998d77758d281dc40dc3e6d050cf0f5286683" -dependencies = [ - "base64 0.12.3", - "rand 0.7.3", -] - -[[package]] -name = "thin-vec" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a38c90d48152c236a3ab59271da4f4ae63d678c5d7ad6b7714d7cb9760be5e4b" - -[[package]] -name = "thiserror" -version = "1.0.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.72", -] - -[[package]] -name = "thread-priority" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d3b04d33c9633b8662b167b847c7ab521f83d1ae20f2321b65b5b925e532e36" -dependencies = [ - "bitflags 2.6.0", - "cfg-if", - "libc", - "log", - "rustversion", - "winapi", -] - -[[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 = "tiff" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" -dependencies = [ - "flate2", - "jpeg-decoder", - "weezl", -] - -[[package]] -name = "time" -version = "0.3.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" -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.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" -dependencies = [ - "num-conv", - "time-core", -] - -[[package]] -name = "timer" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31d42176308937165701f50638db1c31586f183f1aab416268216577aec7306b" -dependencies = [ - "chrono", -] - -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - -[[package]] -name = "tiny-skia" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7db11798945fa5c3e5490c794ccca7c6de86d3afdd54b4eb324109939c6f37bc" -dependencies = [ - "arrayref", - "arrayvec", - "bytemuck", - "cfg-if", - "log", - "png", - "tiny-skia-path 0.10.0", -] - -[[package]] -name = "tiny-skia" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab" -dependencies = [ - "arrayref", - "arrayvec", - "bytemuck", - "cfg-if", - "log", - "png", - "tiny-skia-path 0.11.4", -] - -[[package]] -name = "tiny-skia-path" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f60aa35c89ac2687ace1a2556eaaea68e8c0d47408a2e3e7f5c98a489e7281c" -dependencies = [ - "arrayref", - "bytemuck", - "strict-num", -] - -[[package]] -name = "tiny-skia-path" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93" -dependencies = [ - "arrayref", - "bytemuck", - "strict-num", -] - -[[package]] -name = "tinyvec" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" -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 = "tokio" -version = "1.39.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "parking_lot", - "pin-project-lite", - "signal-hook-registry", - "socket2 0.5.7", - "tokio-macros", - "windows-sys 0.52.0", -] - -[[package]] -name = "tokio-macros" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.72", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-rustls" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" -dependencies = [ - "rustls", - "rustls-pki-types", - "tokio", -] - -[[package]] -name = "tokio-tungstenite" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6989540ced10490aaf14e6bad2e3d33728a2813310a0c71d1574304c49631cd" -dependencies = [ - "futures-util", - "log", - "native-tls", - "rustls", - "rustls-native-certs", - "rustls-pki-types", - "tokio", - "tokio-native-tls", - "tokio-rustls", - "tungstenite", - "webpki-roots", -] - -[[package]] -name = "tokio-util" -version = "0.7.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "toml" -version = "0.8.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.22.20", -] - -[[package]] -name = "toml_datetime" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.22.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow 0.6.18", -] - -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "pin-project", - "pin-project-lite", - "tokio", - "tower-layer", - "tower-service", -] - -[[package]] -name = "tower-layer" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" - -[[package]] -name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[package]] -name = "tracing" -version = "0.1.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", - "quote", - "syn 2.0.72", -] - -[[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 = "try-lock" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" - -[[package]] -name = "ttf-parser" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0609f771ad9c6155384897e1df4d948e692667cc0588548b68eb44d052b27633" - -[[package]] -name = "ttf-parser" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49d64318d8311fc2668e48b63969f4343e0a85c4a109aa8460d6672e364b8bd1" - -[[package]] -name = "ttf-parser" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be21190ff5d38e8b4a2d3b6a3ae57f612cc39c96e83cedeaf7abc338a8bac4a" -dependencies = [ - "core_maths", -] - -[[package]] -name = "tungstenite" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8" -dependencies = [ - "byteorder", - "bytes", - "data-encoding", - "http", - "httparse", - "log", - "native-tls", - "rand 0.8.5", - "rustls", - "rustls-native-certs", - "rustls-pki-types", - "sha1", - "thiserror", - "utf-8", - "webpki-roots", -] - -[[package]] -name = "type-map" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deb68604048ff8fa93347f02441e4487594adc20bb8a084f9e564d2b827a0a9f" -dependencies = [ - "rustc-hash 1.1.0", -] - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "uds_windows" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" -dependencies = [ - "memoffset 0.9.1", - "tempfile", - "winapi", -] - -[[package]] -name = "unicase" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - -[[package]] -name = "unicode-bidi-mirroring" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694" - -[[package]] -name = "unicode-bidi-mirroring" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64af057ad7466495ca113126be61838d8af947f41d93a949980b2389a118082f" - -[[package]] -name = "unicode-ccc" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" - -[[package]] -name = "unicode-ccc" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "260bc6647b3893a9a90668360803a15f96b85a5257b1c3a0c3daf6ae2496de42" - -[[package]] -name = "unicode-general-category" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2281c8c1d221438e373249e065ca4989c4c36952c211ff21a0ee91c44a3869e7" - -[[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.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-properties" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" - -[[package]] -name = "unicode-script" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd" - -[[package]] -name = "unicode-segmentation" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" - -[[package]] -name = "unicode-vo" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" - -[[package]] -name = "unicode-width" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" - -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[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.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "usvg" -version = "0.35.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d09ddfb0d93bf84824c09336d32e42f80961a9d1680832eb24fdf249ce11e6" -dependencies = [ - "base64 0.21.7", - "log", - "pico-args", - "usvg-parser", - "usvg-text-layout", - "usvg-tree", - "xmlwriter", -] - -[[package]] -name = "usvg" -version = "0.43.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6803057b5cbb426e9fb8ce2216f3a9b4ca1dd2c705ba3cbebc13006e437735fd" -dependencies = [ - "base64 0.22.1", - "data-url 0.3.1", - "flate2", - "fontdb 0.21.0", - "imagesize 0.13.0", - "kurbo 0.11.0", - "log", - "pico-args", - "roxmltree 0.20.0", - "rustybuzz 0.18.0", - "simplecss", - "siphasher 1.0.1", - "strict-num", - "svgtypes 0.15.1", - "tiny-skia-path 0.11.4", - "unicode-bidi", - "unicode-script", - "unicode-vo", - "xmlwriter", -] - -[[package]] -name = "usvg-parser" -version = "0.35.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d19bf93d230813599927d88557014e0908ecc3531666d47c634c6838bc8db408" -dependencies = [ - "data-url 0.2.0", - "flate2", - "imagesize 0.12.0", - "kurbo 0.9.5", - "log", - "roxmltree 0.18.1", - "simplecss", - "siphasher 0.3.11", - "svgtypes 0.11.0", - "usvg-tree", -] - -[[package]] -name = "usvg-text-layout" -version = "0.35.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "035044604e89652c0a2959b8b356946997a52649ba6cade45928c2842376feb4" -dependencies = [ - "fontdb 0.14.1", - "kurbo 0.9.5", - "log", - "rustybuzz 0.7.0", - "unicode-bidi", - "unicode-script", - "unicode-vo", - "usvg-tree", -] - -[[package]] -name = "usvg-tree" -version = "0.35.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7939a7e4ed21cadb5d311d6339730681c3e24c3e81d60065be80e485d3fc8b92" -dependencies = [ - "rctree", - "strict-num", - "svgtypes 0.11.0", - "tiny-skia-path 0.10.0", -] - -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - -[[package]] -name = "v_frame" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6f32aaa24bacd11e488aa9ba66369c7cd514885742c9fe08cfe85884db3e92b" -dependencies = [ - "aligned-vec", - "num-traits", - "wasm-bindgen", -] - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "version-compare" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" - -[[package]] -name = "version-compare" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" - -[[package]] -name = "version_check" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" - -[[package]] -name = "waker-fn" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" - -[[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 = "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.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.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 2.0.72", - "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 2.0.72", - "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 = "watcher" -version = "0.1.0" -source = "git+https://github.com/mikedilger/watcher?rev=a4e7e70c396bca4630aa0ba0a15d54ea103cb0e9#a4e7e70c396bca4630aa0ba0a15d54ea103cb0e9" -dependencies = [ - "parking_lot", - "tokio", -] - -[[package]] -name = "wayland-backend" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f90e11ce2ca99c97b940ee83edbae9da2d56a08f9ea8158550fd77fa31722993" -dependencies = [ - "cc", - "downcast-rs", - "rustix 0.38.34", - "scoped-tls", - "smallvec", - "wayland-sys", -] - -[[package]] -name = "wayland-client" -version = "0.31.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e321577a0a165911bdcfb39cf029302479d7527b517ee58ab0f6ad09edf0943" -dependencies = [ - "bitflags 2.6.0", - "rustix 0.38.34", - "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.6.0", - "cursor-icon", - "wayland-backend", -] - -[[package]] -name = "wayland-cursor" -version = "0.31.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ef9489a8df197ebf3a8ce8a7a7f0a2320035c3743f3c1bd0bdbccf07ce64f95" -dependencies = [ - "rustix 0.38.34", - "wayland-client", - "xcursor", -] - -[[package]] -name = "wayland-protocols" -version = "0.31.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" -dependencies = [ - "bitflags 2.6.0", - "wayland-backend", - "wayland-client", - "wayland-scanner", -] - -[[package]] -name = "wayland-protocols" -version = "0.32.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62989625a776e827cc0f15d41444a3cea5205b963c3a25be48ae1b52d6b4daaa" -dependencies = [ - "bitflags 2.6.0", - "wayland-backend", - "wayland-client", - "wayland-scanner", -] - -[[package]] -name = "wayland-protocols-plasma" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" -dependencies = [ - "bitflags 2.6.0", - "wayland-backend", - "wayland-client", - "wayland-protocols 0.31.2", - "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.6.0", - "wayland-backend", - "wayland-client", - "wayland-protocols 0.31.2", - "wayland-scanner", -] - -[[package]] -name = "wayland-protocols-wlr" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd993de54a40a40fbe5601d9f1fbcaef0aebcc5fda447d7dc8f6dcbaae4f8953" -dependencies = [ - "bitflags 2.6.0", - "wayland-backend", - "wayland-client", - "wayland-protocols 0.32.3", - "wayland-scanner", -] - -[[package]] -name = "wayland-scanner" -version = "0.31.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7b56f89937f1cf2ee1f1259cf2936a17a1f45d8f0aa1019fae6d470d304cfa6" -dependencies = [ - "proc-macro2", - "quick-xml 0.34.0", - "quote", -] - -[[package]] -name = "wayland-sys" -version = "0.31.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43676fe2daf68754ecf1d72026e4e6c15483198b5d24e888b74d3f22f887a148" -dependencies = [ - "dlib", - "log", - "once_cell", - "pkg-config", -] - -[[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 = "web-time" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webbrowser" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "425ba64c1e13b1c6e8c5d2541c8fac10022ca584f33da781db01b5756aef1f4e" -dependencies = [ - "block2 0.5.1", - "core-foundation", - "home", - "jni", - "log", - "ndk-context", - "objc2 0.5.2", - "objc2-foundation", - "url", - "web-sys", -] - -[[package]] -name = "webpki-roots" -version = "0.26.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" -dependencies = [ - "rustls-pki-types", -] - -[[package]] -name = "weezl" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" - -[[package]] -name = "wgpu" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e37c7b9921b75dfd26dd973fdcbce36f13dfa6e2dc82aece584e0ed48c355c" -dependencies = [ - "arrayvec", - "cfg-if", - "cfg_aliases", - "document-features", - "js-sys", - "log", - "naga", - "parking_lot", - "profiling", - "raw-window-handle 0.6.2", - "smallvec", - "static_assertions", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "wgpu-core", - "wgpu-hal", - "wgpu-types", -] - -[[package]] -name = "wgpu-core" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d50819ab545b867d8a454d1d756b90cd5f15da1f2943334ca314af10583c9d39" -dependencies = [ - "arrayvec", - "bit-vec", - "bitflags 2.6.0", - "cfg_aliases", - "codespan-reporting", - "document-features", - "indexmap", - "log", - "naga", - "once_cell", - "parking_lot", - "profiling", - "raw-window-handle 0.6.2", - "rustc-hash 1.1.0", - "smallvec", - "thiserror", - "web-sys", - "wgpu-hal", - "wgpu-types", -] - -[[package]] -name = "wgpu-hal" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "172e490a87295564f3fcc0f165798d87386f6231b04d4548bca458cbbfd63222" -dependencies = [ - "android_system_properties", - "arrayvec", - "ash", - "bitflags 2.6.0", - "block", - "cfg_aliases", - "core-graphics-types", - "glow", - "glutin_wgl_sys", - "gpu-alloc", - "gpu-allocator", - "gpu-descriptor", - "hassle-rs", - "js-sys", - "khronos-egl", - "libc", - "libloading 0.8.5", - "log", - "metal", - "naga", - "ndk-sys", - "objc", - "once_cell", - "parking_lot", - "profiling", - "raw-window-handle 0.6.2", - "renderdoc-sys", - "rustc-hash 1.1.0", - "smallvec", - "thiserror", - "wasm-bindgen", - "web-sys", - "wgpu-types", - "winapi", -] - -[[package]] -name = "wgpu-types" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1353d9a46bff7f955a680577f34c69122628cc2076e1d6f3a9be6ef00ae793ef" -dependencies = [ - "bitflags 2.6.0", - "js-sys", - "web-sys", -] - -[[package]] -name = "widestring" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" - -[[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.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" -dependencies = [ - "windows-sys 0.59.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" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-implement", - "windows-interface", - "windows-targets 0.48.5", -] - -[[package]] -name = "windows" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" -dependencies = [ - "windows-core", - "windows-targets 0.52.6", -] - -[[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.6", -] - -[[package]] -name = "windows-implement" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e2ee588991b9e7e6c8338edf3333fbe4da35dc72092643958ebb43f0ab2c49c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "windows-interface" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6fb8df20c9bcaa8ad6ab513f7b40104840c8867d5751126e4df3b08388d0cc7" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "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-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.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.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[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.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[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.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_msvc" -version = "0.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.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[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.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[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.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[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.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" - -[[package]] -name = "winit" -version = "0.29.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d59ad965a635657faf09c8f062badd885748428933dad8e8bdd64064d92e5ca" -dependencies = [ - "ahash 0.8.11", - "android-activity", - "atomic-waker", - "bitflags 2.6.0", - "bytemuck", - "calloop 0.12.4", - "cfg_aliases", - "core-foundation", - "core-graphics", - "cursor-icon", - "icrate", - "js-sys", - "libc", - "log", - "memmap2 0.9.4", - "ndk", - "ndk-sys", - "objc2 0.4.1", - "once_cell", - "orbclient", - "percent-encoding", - "raw-window-handle 0.5.2", - "raw-window-handle 0.6.2", - "redox_syscall 0.3.5", - "rustix 0.38.34", - "sctk-adwaita", - "smithay-client-toolkit 0.18.1", - "smol_str", - "unicode-segmentation", - "wasm-bindgen", - "wasm-bindgen-futures", - "wayland-backend", - "wayland-client", - "wayland-protocols 0.31.2", - "wayland-protocols-plasma", - "web-sys", - "web-time", - "windows-sys 0.48.0", - "x11-dl", - "x11rb", - "xkbcommon-dl", -] - -[[package]] -name = "winnow" -version = "0.5.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] - -[[package]] -name = "winnow" -version = "0.6.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" -dependencies = [ - "memchr", -] - -[[package]] -name = "winreg" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "x11-dl" -version = "2.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" -dependencies = [ - "libc", - "once_cell", - "pkg-config", -] - -[[package]] -name = "x11rb" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" -dependencies = [ - "as-raw-xcb-connection", - "gethostname", - "libc", - "libloading 0.8.5", - "once_cell", - "rustix 0.38.34", - "x11rb-protocol", -] - -[[package]] -name = "x11rb-protocol" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" - -[[package]] -name = "xcursor" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f513f231f0810b04d988f0df4fb16ef0b6b25d23248f2c4b56b074e6b1b0ffe4" - -[[package]] -name = "xdg-home" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" -dependencies = [ - "libc", - "windows-sys 0.59.0", -] - -[[package]] -name = "xkbcommon-dl" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" -dependencies = [ - "bitflags 2.6.0", - "dlib", - "log", - "once_cell", - "xkeysym", -] - -[[package]] -name = "xkeysym" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56" - -[[package]] -name = "xml-rs" -version = "0.8.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "539a77ee7c0de333dcc6da69b177380a0b81e0dacfa4f7344c465a36871ee601" - -[[package]] -name = "xmlparser" -version = "0.13.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" - -[[package]] -name = "xmlwriter" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" - -[[package]] -name = "yaml-rust" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -dependencies = [ - "linked-hash-map", -] - -[[package]] -name = "zbus" -version = "3.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" -dependencies = [ - "async-broadcast", - "async-executor", - "async-fs", - "async-io 1.13.0", - "async-lock 2.8.0", - "async-process", - "async-recursion", - "async-task", - "async-trait", - "blocking", - "byteorder", - "derivative", - "enumflags2", - "event-listener 2.5.3", - "futures-core", - "futures-sink", - "futures-util", - "hex", - "nix", - "once_cell", - "ordered-stream", - "rand 0.8.5", - "serde", - "serde_repr", - "sha1", - "static_assertions", - "tracing", - "uds_windows", - "winapi", - "xdg-home", - "zbus_macros", - "zbus_names", - "zvariant", -] - -[[package]] -name = "zbus_macros" -version = "3.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "regex", - "syn 1.0.109", - "zvariant_utils", -] - -[[package]] -name = "zbus_names" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" -dependencies = [ - "serde", - "static_assertions", - "zvariant", -] - -[[package]] -name = "zerocopy" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" -dependencies = [ - "byteorder", - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.72", -] - -[[package]] -name = "zeroize" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" - -[[package]] -name = "zune-core" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" - -[[package]] -name = "zune-inflate" -version = "0.2.54" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" -dependencies = [ - "simd-adler32", -] - -[[package]] -name = "zune-jpeg" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16099418600b4d8f028622f73ff6e3deaabdff330fb9a2a131dea781ee8b0768" -dependencies = [ - "zune-core", -] - -[[package]] -name = "zvariant" -version = "3.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db" -dependencies = [ - "byteorder", - "enumflags2", - "libc", - "serde", - "static_assertions", - "zvariant_derive", -] - -[[package]] -name = "zvariant_derive" -version = "3.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "syn 1.0.109", - "zvariant_utils", -] - -[[package]] -name = "zvariant_utils" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] diff --git a/pkgs/by-name/go/gossip/package.nix b/pkgs/by-name/go/gossip/package.nix index 8f8d5f4d9058..b967ffb65cdd 100644 --- a/pkgs/by-name/go/gossip/package.nix +++ b/pkgs/by-name/go/gossip/package.nix @@ -17,33 +17,25 @@ wayland, wayland-scanner, nix-update-script, - xorg, + libX11, + libXcursor, + libXi, + libXrandr, }: rustPlatform.buildRustPackage rec { pname = "gossip"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "mikedilger"; repo = "gossip"; tag = "v${version}"; - hash = "sha256-mPM5HYPEUQ+cGrJ3G/0pmSN4ZQ9SvSNACJRTkgqTAeY="; + hash = "sha256-GhkILnt573deQU42uN4YnhzDxirEvCpsvBnp6hF06v4="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "egui-video-0.1.0" = "sha256-mks5wYl9s8AjaEtYx3hjOPoV7g+SbK2sC/cnqsc6sM4="; - "nostr-types-0.8.0-unstable" = "sha256-ewwOmJaGGRZ25xIM+8fGtB3m46MDQ2WpP0fGF6F5yR4="; - "ecolor-0.28.1" = "sha256-X0cUCNBCsWpeoiqbEp8o9QVl29DzIVe9jjNEq9SQ7kM="; - "ffmpeg-next-7.0.4" = "sha256-ED7zY944YLVR9dgRvXuCC2n7szKkPMH8DJX4jVBNRIQ="; - "watcher-0.1.0" = "sha256-SdwmbP8JrhkBbHEzSFALf0dF2T2xHigORizRRoPVblA="; - "lightning-0.0.123-beta" = "sha256-gngH0mOC9USzwUGP4bjb1foZAvg6QHuzODv7LG49MsA="; - "musig2-0.1.0" = "sha256-++1x7uHHR7KEhl8LF3VywooULiTzKeDu3e+0/c/8p9Y="; - "nip44-0.1.0" = "sha256-u2ALoHQrPVNoX0wjJmQ+BYRzIKsi0G5xPbYjgsNZZ7A="; - }; - }; + useFetchCargoVendor = true; + cargoHash = "sha256-gKyGDk64EJMSFovBLFhkOHRoWrYRERTH2O2McHe2fMM="; # See https://github.com/mikedilger/gossip/blob/0.9/README.md. RUSTFLAGS = "--cfg tokio_unstable"; @@ -84,10 +76,10 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXrandr + libX11 + libXcursor + libXi + libXrandr ]; # Tests rely on local files, so disable them. (I'm too lazy to patch it.) @@ -133,13 +125,13 @@ rustPlatform.buildRustPackage rec { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { description = "Desktop client for nostr, an open social media protocol"; downloadPage = "https://github.com/mikedilger/gossip/releases/tag/${version}"; homepage = "https://github.com/mikedilger/gossip"; - license = licenses.mit; + license = lib.licenses.mit; mainProgram = "gossip"; - maintainers = with maintainers; [ msanft ]; - platforms = platforms.unix; + maintainers = with lib.maintainers; [ msanft ]; + platforms = lib.platforms.unix; }; } From 368575f250a02c929c3f48f5767d78627b857fb5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 16:05:59 +0000 Subject: [PATCH 1432/2168] python312Packages.types-awscrt: 0.23.9 -> 0.23.10 --- pkgs/development/python-modules/types-awscrt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-awscrt/default.nix b/pkgs/development/python-modules/types-awscrt/default.nix index bc77713be8aa..462a5182e9a4 100644 --- a/pkgs/development/python-modules/types-awscrt/default.nix +++ b/pkgs/development/python-modules/types-awscrt/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "types-awscrt"; - version = "0.23.9"; + version = "0.23.10"; pyproject = true; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "types_awscrt"; inherit version; - hash = "sha256-V+xo1F74c0WN9zB+yAV4pjNGlvCIVJqzScPWVefjVis="; + hash = "sha256-llZZJgWZtCFWQgS4lUZ2hBBKLAMRu6z9PCQjuLDT8+k="; }; build-system = [ setuptools ]; From ba0743560d49e11e019c663fdc6541cf673052c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 12 Feb 2025 17:13:42 +0100 Subject: [PATCH 1433/2168] bruno-cli: fix build with noBrokenSymlinks --- pkgs/by-name/br/bruno-cli/package.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/br/bruno-cli/package.nix b/pkgs/by-name/br/bruno-cli/package.nix index c5203edbfe3a..5540328dcc12 100644 --- a/pkgs/by-name/br/bruno-cli/package.nix +++ b/pkgs/by-name/br/bruno-cli/package.nix @@ -51,12 +51,21 @@ buildNpmPackage { echo "Removing unnecessary files" pushd $out/lib/node_modules/usebruno - rm -rfv packages/bruno-{app,electron,tests,toml,schema,docs} - rm -rfv packages/*/node_modules/typescript - rm -rfv node_modules/{next,@next,@tabler,pdfjs-dist,*redux*,*babel*,prettier,@types*,*react*,*graphiql*} + + # packages used by the GUI app, unused by CLI + rm -r packages/bruno-{app,electron,tests,toml,schema,docs} + rm node_modules/bruno + rm node_modules/@usebruno/{app,tests,toml,schema} + + # heavy dependencies that seem to be unused + rm -rf node_modules/{@tabler,pdfjs-dist,*redux*,*babel*,prettier,@types*,*react*,*graphiql*} + rm -r node_modules/.bin + + # unused file types for pattern in '*.map' '*.map.js' '*.ts'; do - find . -type f -name "$pattern" -exec rm -v {} + + find . -type f -name "$pattern" -exec rm {} + done + popd echo "Removed unnecessary files" ''; From 899ec2eda4c9fd385ebb8e2f8b2c102bfdda651f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 16:16:19 +0000 Subject: [PATCH 1434/2168] python312Packages.python-nomad: 2.0.1 -> 2.1.0 --- pkgs/development/python-modules/python-nomad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-nomad/default.nix b/pkgs/development/python-modules/python-nomad/default.nix index 2f4cfc1fef7f..e504c4c2896d 100644 --- a/pkgs/development/python-modules/python-nomad/default.nix +++ b/pkgs/development/python-modules/python-nomad/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "python-nomad"; - version = "2.0.1"; + version = "2.1.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "python_nomad"; inherit version; - hash = "sha256-TXCm6FxYoavjN3ASioQ7yXQVsDDXedDKBgGGP8ghQdM="; + hash = "sha256-U+bZ7G9mtnKunW0DWRokvi2LVFDdf9vhADgxy5t3+Ec="; }; build-system = [ setuptools ]; From 6d29edca8e2761204e0a1f9cdd5a34c073b60a1a Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Wed, 12 Feb 2025 17:32:40 +0100 Subject: [PATCH 1435/2168] pinocchio: 3.3.1 -> 3.4.0 --- pkgs/by-name/pi/pinocchio/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pi/pinocchio/package.nix b/pkgs/by-name/pi/pinocchio/package.nix index 47d4cde8e6f0..86349e6fe450 100644 --- a/pkgs/by-name/pi/pinocchio/package.nix +++ b/pkgs/by-name/pi/pinocchio/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pinocchio"; - version = "3.3.1"; + version = "3.4.0"; src = fetchFromGitHub { owner = "stack-of-tasks"; repo = "pinocchio"; rev = "v${finalAttrs.version}"; - hash = "sha256-dm5xfYAnn5N/8ZKTMyZNFM5/j3LLBrG+NOgmtxCAI6I="; + hash = "sha256-myhMisXzYd2WGIBQ7SIQmQkjUmxRfVuxTPPGvBzkt8I="; }; outputs = [ From 32ef3b938902e189487e864f1ce9464affd57fb1 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Wed, 12 Feb 2025 15:45:11 +0100 Subject: [PATCH 1436/2168] crocoddyl: deactivate failing tests on darwin for now --- pkgs/by-name/cr/crocoddyl/package.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/cr/crocoddyl/package.nix b/pkgs/by-name/cr/crocoddyl/package.nix index 9b91fd7cb5d7..773898277627 100644 --- a/pkgs/by-name/cr/crocoddyl/package.nix +++ b/pkgs/by-name/cr/crocoddyl/package.nix @@ -59,11 +59,17 @@ stdenv.mkDerivation (finalAttrs: { python3Packages.scipy ]; - cmakeFlags = [ - (lib.cmakeBool "INSTALL_DOCUMENTATION" true) - (lib.cmakeBool "BUILD_EXAMPLES" pythonSupport) - (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport) - ]; + cmakeFlags = + [ + (lib.cmakeBool "INSTALL_DOCUMENTATION" true) + (lib.cmakeBool "BUILD_EXAMPLES" pythonSupport) + (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport) + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # ref. https://github.com/stack-of-tasks/pinocchio/issues/2563 + # remove this for crocoddyl >= 3.0.0 + (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;test_pybinds_*") + ]; prePatch = '' substituteInPlace \ From 10ac8238922e92547795efeff23ee49a9cda67ea Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 29 Nov 2024 19:40:08 -0500 Subject: [PATCH 1437/2168] krunker: init at 2.1.3 --- pkgs/by-name/kr/krunker/darwin.nix | 32 ++++++++++++++++ pkgs/by-name/kr/krunker/linux.nix | 30 +++++++++++++++ pkgs/by-name/kr/krunker/package.nix | 32 ++++++++++++++++ pkgs/by-name/kr/krunker/update.sh | 58 +++++++++++++++++++++++++++++ 4 files changed, 152 insertions(+) create mode 100644 pkgs/by-name/kr/krunker/darwin.nix create mode 100644 pkgs/by-name/kr/krunker/linux.nix create mode 100644 pkgs/by-name/kr/krunker/package.nix create mode 100755 pkgs/by-name/kr/krunker/update.sh diff --git a/pkgs/by-name/kr/krunker/darwin.nix b/pkgs/by-name/kr/krunker/darwin.nix new file mode 100644 index 000000000000..e5c0be3a8c46 --- /dev/null +++ b/pkgs/by-name/kr/krunker/darwin.nix @@ -0,0 +1,32 @@ +{ + stdenvNoCC, + fetchurl, + makeBinaryWrapper, + undmg, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "krunker"; + version = "2.1.3"; + + src = fetchurl { + url = "https://client2.krunker.io/Official%20Krunker.io%20Client-${finalAttrs.version}.dmg"; + hash = "sha512-brvrOPCsXkkrUGcRxsa8bzpFsrY7GF3llt29ZIax6dC0XBsILKXUleESJ5LpurMOgSBsfxNYjZLPJhicIAtuUA=="; + }; + + sourceRoot = "."; + + nativeBuildInputs = [ + makeBinaryWrapper + undmg + ]; + + postInstall = '' + mkdir -p $out/Applications + cp -r *.app $out/Applications + + makeBinaryWrapper \ + $out/Applications/Official\ Krunker.io\ Client.app/Contents/MacOS/Official\ Krunker.io\ Client \ + $out/bin/krunker + ''; +}) diff --git a/pkgs/by-name/kr/krunker/linux.nix b/pkgs/by-name/kr/krunker/linux.nix new file mode 100644 index 000000000000..53ba2687952f --- /dev/null +++ b/pkgs/by-name/kr/krunker/linux.nix @@ -0,0 +1,30 @@ +{ appimageTools, fetchurl }: + +let + pname = "krunker"; + version = "2.1.3"; + + appId = "io.krunker.desktop"; + + src = fetchurl { + url = "https://client2.krunker.io/Official%20Krunker.io%20Client-${version}.AppImage"; + hash = "sha512-a8E5heLsKXOtv/wRKlrnV0GD48cY1mOiSSDW93c7YZ+HoeuBQDxtRaHKg5EqU51Yi+d4tPF5nOh10jZW36c7WQ=="; + }; + + appimageContents = appimageTools.extractType2 { + inherit pname version src; + }; +in + +appimageTools.wrapType2 { + inherit pname version src; + + extraInstallCommands = '' + mkdir -p $out/share/{applications,pixmaps} + install -Dm644 ${appimageContents}/${appId}.desktop -t $out/share/applications + install -Dm644 ${appimageContents}/${appId}.png -t $out/share/pixmaps + + substituteInPlace $out/share/applications/${appId}.desktop \ + --replace-fail 'Exec=AppRun' "Exec=$pname" + ''; +} diff --git a/pkgs/by-name/kr/krunker/package.nix b/pkgs/by-name/kr/krunker/package.nix new file mode 100644 index 000000000000..76430102a0e6 --- /dev/null +++ b/pkgs/by-name/kr/krunker/package.nix @@ -0,0 +1,32 @@ +{ + lib, + stdenv, + callPackage, +}: + +let + package = + if stdenv.hostPlatform.isDarwin then callPackage ./darwin.nix { } else callPackage ./linux.nix { }; +in + +package.overrideAttrs ( + finalAttrs: oldAttrs: { + passthru = { + updateScript = ./update.sh; + } // oldAttrs.passthru or { }; + + # Point `nix edit`, etc. to the file that defines the attribute, not this + # entry point + pos = builtins.unsafeGetAttrPos "pname" finalAttrs; + + meta = { + description = "Easy to get into fully moddable First Person Shooter with advanced movement mechanics"; + homepage = "https://krunker.io"; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ getchoo ]; + mainProgram = "krunker"; + platforms = [ "x86_64-linux" ] ++ lib.platforms.darwin; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + } // oldAttrs.meta or { }; + } +) diff --git a/pkgs/by-name/kr/krunker/update.sh b/pkgs/by-name/kr/krunker/update.sh new file mode 100755 index 000000000000..9d68f1239f73 --- /dev/null +++ b/pkgs/by-name/kr/krunker/update.sh @@ -0,0 +1,58 @@ +#!/usr/bin/env nix-shell +#! nix-shell --pure -i bash -p bash cacert common-updater-scripts curl yq +# shellcheck shell=bash +set -euo pipefail + +root=$(readlink -f "$0" | xargs dirname) +script_name="krunker-update" +updater_url="client2.krunker.io" + +log() { + echo "$script_name: $*" +} + +panic() { + log "$*" + exit 1 +} + +update() { + platform="${1:-}" + if [ -z "$platform" ]; then + panic "error: a platform must be supplied to \`update()\`!" + fi + + nixfile="$root"/"$platform".nix + if [ ! -f "$nixfile" ]; then + panic "error: $platform is not supported!" + fi + + electron_suffix="" + system="x86_64-linux" + if [ "$platform" == "darwin" ]; then + electron_suffix="-mac" + system="aarch64-darwin" + elif [ "$platform" == "linux" ]; then + electron_suffix="-linux" + fi + + url="https://$updater_url/latest${electron_suffix}.yml" + log "fetching update information from from $url" + response="$(curl -sSL "$url")" + version="$(yq --raw-output '.version' <<<"$response")" + sha512="$(yq \ + --raw-output \ + '.files | map(select(.url | contains("dmg") or contains("AppImage"))) | first | .sha512' \ + <<<"$response")" + + update-source-version krunker "$version" sha512-"$sha512" --file="$nixfile" --system="$system" +} + +supported_platforms=( + "darwin" + "linux" +) + +for platform in "${supported_platforms[@]}"; do + update "$platform" +done From e97b930738ce50229dda77118824fac521329b0b Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Wed, 12 Feb 2025 11:36:41 -0500 Subject: [PATCH 1438/2168] mangohud: format using nixfmt-rfc-style --- pkgs/tools/graphics/mangohud/default.nix | 156 +++++++++++++---------- 1 file changed, 88 insertions(+), 68 deletions(-) diff --git a/pkgs/tools/graphics/mangohud/default.nix b/pkgs/tools/graphics/mangohud/default.nix index 034d74d7fbd3..81411fb132fe 100644 --- a/pkgs/tools/graphics/mangohud/default.nix +++ b/pkgs/tools/graphics/mangohud/default.nix @@ -1,39 +1,40 @@ -{ lib -, stdenv -, fetchFromGitLab -, fetchFromGitHub -, fetchurl -, replaceVars -, coreutils -, curl -, gnugrep -, gnused -, xdg-utils -, dbus -, hwdata -, mangohud32 -, addDriverRunpath -, appstream -, git -, glslang -, mako -, mesa-demos -, meson -, ninja -, pkg-config -, unzip -, libXNVCtrl -, wayland -, libX11 -, nlohmann_json -, spdlog -, glew -, glfw -, xorg -, gamescopeSupport ? true # build mangoapp and mangohudctl -, lowerBitnessSupport ? stdenv.hostPlatform.isx86_64 # Support 32 bit on 64bit -, nix-update-script -, libxkbcommon +{ + lib, + stdenv, + fetchFromGitLab, + fetchFromGitHub, + fetchurl, + replaceVars, + coreutils, + curl, + gnugrep, + gnused, + xdg-utils, + dbus, + hwdata, + mangohud32, + addDriverRunpath, + appstream, + git, + glslang, + mako, + mesa-demos, + meson, + ninja, + pkg-config, + unzip, + libXNVCtrl, + wayland, + libX11, + nlohmann_json, + spdlog, + glew, + glfw, + xorg, + gamescopeSupport ? true, # build mangoapp and mangohudctl + lowerBitnessSupport ? stdenv.hostPlatform.isx86_64, # Support 32 bit on 64bit + nix-update-script, + libxkbcommon, }: let @@ -104,7 +105,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-cj/F/DWUDm2AHTJvHgkKa+KdIrfxPWLzI570Dp4VFhs="; }; - outputs = [ "out" "doc" "man" ]; + outputs = [ + "out" + "doc" + "man" + ]; # Unpack subproject sources postUnpack = '' @@ -145,11 +150,16 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace bin/mangohud.in \ - --subst-var-by libraryPath ${lib.makeSearchPath "lib/mangohud" ([ - (placeholder "out") - ] ++ lib.optionals lowerBitnessSupport [ - mangohud32 - ])} \ + --subst-var-by libraryPath ${ + lib.makeSearchPath "lib/mangohud" ( + [ + (placeholder "out") + ] + ++ lib.optionals lowerBitnessSupport [ + mangohud32 + ] + ) + } \ --subst-var-by version "${finalAttrs.version}" \ --subst-var-by dataDir ${placeholder "out"}/share @@ -161,15 +171,17 @@ stdenv.mkDerivation (finalAttrs: { ) ''; - mesonFlags = [ - "-Dwith_wayland=enabled" - "-Duse_system_spdlog=enabled" - "-Dtests=${if finalAttrs.finalPackage.doCheck then "enabled" else "disabled"}" - ] ++ lib.optionals gamescopeSupport [ - "-Dmangoapp=true" - "-Dmangoapp_layer=true" - "-Dmangohudctl=true" - ]; + mesonFlags = + [ + "-Dwith_wayland=enabled" + "-Duse_system_spdlog=enabled" + "-Dtests=${if finalAttrs.finalPackage.doCheck then "enabled" else "disabled"}" + ] + ++ lib.optionals gamescopeSupport [ + "-Dmangoapp=true" + "-Dmangoapp_layer=true" + "-Dmangohudctl=true" + ]; nativeBuildInputs = [ addDriverRunpath @@ -188,16 +200,18 @@ stdenv.mkDerivation (finalAttrs: { libX11 ]; - buildInputs = [ - dbus - nlohmann_json - spdlog - ] ++ lib.optionals gamescopeSupport [ - glew - glfw - xorg.libXrandr - libxkbcommon - ]; + buildInputs = + [ + dbus + nlohmann_json + spdlog + ] + ++ lib.optionals gamescopeSupport [ + glew + glfw + xorg.libXrandr + libxkbcommon + ]; doCheck = true; @@ -224,20 +238,23 @@ stdenv.mkDerivation (finalAttrs: { "i686-linux" = "x86"; }; layerPlatform = archMap."${stdenv.hostPlatform.system}" or null; - # We need to give the different layers separate names or else the loader - # might try the 32-bit one first, fail and not attempt to load the 64-bit - # layer under the same name. in + # We need to give the different layers separate names or else the loader + # might try the 32-bit one first, fail and not attempt to load the 64-bit + # layer under the same name. lib.optionalString (layerPlatform != null) '' substituteInPlace $out/share/vulkan/implicit_layer.d/MangoHud.${layerPlatform}.json \ --replace "VK_LAYER_MANGOHUD_overlay" "VK_LAYER_MANGOHUD_overlay_${toString stdenv.hostPlatform.parsed.cpu.bits}" - '' + '' + '' + + '' # Add OpenGL driver and libXNVCtrl paths to RUNPATH to support NVIDIA cards addDriverRunpath "$out/lib/mangohud/libMangoHud.so" patchelf --add-rpath ${libXNVCtrl}/lib "$out/lib/mangohud/libMangoHud.so" - '' + lib.optionalString gamescopeSupport '' + '' + + lib.optionalString gamescopeSupport '' addDriverRunpath "$out/bin/mangoapp" - '' + lib.optionalString finalAttrs.finalPackage.doCheck '' + '' + + lib.optionalString finalAttrs.finalPackage.doCheck '' # libcmocka.so is only used for tests rm "$out/lib/libcmocka.so" ''; @@ -250,6 +267,9 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/flightlessmango/MangoHud/releases/tag/v${finalAttrs.version}"; platforms = platforms.linux; license = licenses.mit; - maintainers = with maintainers; [ kira-bruneau zeratax ]; + maintainers = with maintainers; [ + kira-bruneau + zeratax + ]; }; }) From b25b77a07c549b8b70dbeab2df2fd4e8d4b3edf4 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Tue, 11 Feb 2025 15:56:18 -0500 Subject: [PATCH 1439/2168] mangohud: 0.7.2 -> 0.8.0 https://github.com/flightlessmango/MangoHud/releases/tag/v0.8.0 --- pkgs/tools/graphics/mangohud/default.nix | 77 ++++++------------- .../mangohud/hardcode-dependencies.patch | 4 +- .../mangohud/preload-nix-workaround.patch | 24 ++---- 3 files changed, 33 insertions(+), 72 deletions(-) diff --git a/pkgs/tools/graphics/mangohud/default.nix b/pkgs/tools/graphics/mangohud/default.nix index 81411fb132fe..15ebc4ea4fe6 100644 --- a/pkgs/tools/graphics/mangohud/default.nix +++ b/pkgs/tools/graphics/mangohud/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, - fetchFromGitLab, fetchFromGitHub, fetchurl, replaceVars, @@ -15,17 +14,15 @@ mangohud32, addDriverRunpath, appstream, - git, glslang, mako, - mesa-demos, meson, ninja, pkg-config, unzip, + libX11, libXNVCtrl, wayland, - libX11, nlohmann_json, spdlog, glew, @@ -38,13 +35,18 @@ }: let - # Derived from subprojects/cmocka.wrap - cmocka = { - src = fetchFromGitLab { - owner = "cmocka"; - repo = "cmocka"; - rev = "59dc0013f9f29fcf212fe4911c78e734263ce24c"; - hash = "sha256-IbAZOC0Q60PrKlKVWsgg/PFDV0PLb/yy+Iz/4Iziny0="; + # Derived from subprojects/imgui.wrap + imgui = rec { + version = "1.89.9"; + src = fetchFromGitHub { + owner = "ocornut"; + repo = "imgui"; + tag = "v${version}"; + hash = "sha256-0k9jKrJUrG9piHNFQaBBY3zgNIKM23ZA879NY+MNYTU="; + }; + patch = fetchurl { + url = "https://wrapdb.mesonbuild.com/v2/imgui_${version}-1/get_patch"; + hash = "sha256-myEpDFl9dr+NTus/n/oCSxHZ6mxh6R1kjMyQtChD1YQ="; }; }; @@ -54,7 +56,7 @@ let src = fetchFromGitHub { owner = "epezent"; repo = "implot"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-/wkVsgz3wiUVZBCgRl2iDD6GWb+AoHN+u0aeqHHgem0="; }; patch = fetchurl { @@ -63,28 +65,13 @@ let }; }; - # Derived from subprojects/imgui.wrap - imgui = rec { - version = "1.89.9"; - src = fetchFromGitHub { - owner = "ocornut"; - repo = "imgui"; - rev = "refs/tags/v${version}"; - hash = "sha256-0k9jKrJUrG9piHNFQaBBY3zgNIKM23ZA879NY+MNYTU="; - }; - patch = fetchurl { - url = "https://wrapdb.mesonbuild.com/v2/imgui_${version}-1/get_patch"; - hash = "sha256-myEpDFl9dr+NTus/n/oCSxHZ6mxh6R1kjMyQtChD1YQ="; - }; - }; - # Derived from subprojects/vulkan-headers.wrap vulkan-headers = rec { version = "1.2.158"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Headers"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-5uyk2nMwV1MjXoa3hK/WUeGLwpINJJEvY16kc5DEaks="; }; patch = fetchurl { @@ -95,14 +82,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "mangohud"; - version = "0.7.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "flightlessmango"; repo = "MangoHud"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-cj/F/DWUDm2AHTJvHgkKa+KdIrfxPWLzI570Dp4VFhs="; + hash = "sha256-yITiu+2l7PItAmL+6gX9p5Tvf/P8ovttGIo6kJAOqxs="; }; outputs = [ @@ -115,11 +102,8 @@ stdenv.mkDerivation (finalAttrs: { postUnpack = '' ( cd "$sourceRoot/subprojects" - ${lib.optionalString finalAttrs.finalPackage.doCheck '' - cp -R --no-preserve=mode,ownership ${cmocka.src} cmocka - ''} - cp -R --no-preserve=mode,ownership ${implot.src} implot-${implot.version} cp -R --no-preserve=mode,ownership ${imgui.src} imgui-${imgui.version} + cp -R --no-preserve=mode,ownership ${implot.src} implot-${implot.version} cp -R --no-preserve=mode,ownership ${vulkan-headers.src} Vulkan-Headers-${vulkan-headers.version} ) ''; @@ -133,13 +117,11 @@ stdenv.mkDerivation (finalAttrs: { # Hard code dependencies. Can't use makeWrapper since the Vulkan # layer can be used without the mangohud executable by setting MANGOHUD=1. (replaceVars ./hardcode-dependencies.patch { - path = lib.makeBinPath [ coreutils curl gnugrep gnused - mesa-demos xdg-utils ]; @@ -155,9 +137,7 @@ stdenv.mkDerivation (finalAttrs: { [ (placeholder "out") ] - ++ lib.optionals lowerBitnessSupport [ - mangohud32 - ] + ++ lib.optional lowerBitnessSupport mangohud32 ) } \ --subst-var-by version "${finalAttrs.version}" \ @@ -165,8 +145,8 @@ stdenv.mkDerivation (finalAttrs: { ( cd subprojects - unzip ${implot.patch} unzip ${imgui.patch} + unzip ${implot.patch} unzip ${vulkan-headers.patch} ) ''; @@ -175,17 +155,15 @@ stdenv.mkDerivation (finalAttrs: { [ "-Dwith_wayland=enabled" "-Duse_system_spdlog=enabled" - "-Dtests=${if finalAttrs.finalPackage.doCheck then "enabled" else "disabled"}" + "-Dtests=disabled" # amdgpu test segfaults in nix sandbox ] ++ lib.optionals gamescopeSupport [ "-Dmangoapp=true" - "-Dmangoapp_layer=true" "-Dmangohudctl=true" ]; nativeBuildInputs = [ addDriverRunpath - git glslang mako meson @@ -195,9 +173,9 @@ stdenv.mkDerivation (finalAttrs: { # Only the headers are used from these packages # The corresponding libraries are loaded at runtime from the app's runpath + libX11 libXNVCtrl wayland - libX11 ]; buildInputs = @@ -224,11 +202,6 @@ stdenv.mkDerivation (finalAttrs: { postInstall = lib.optionalString lowerBitnessSupport '' ln -s ${mangohud32}/share/vulkan/implicit_layer.d/MangoHud.x86.json \ "$out/share/vulkan/implicit_layer.d" - - ${lib.optionalString gamescopeSupport '' - ln -s ${mangohud32}/share/vulkan/implicit_layer.d/libMangoApp.x86.json \ - "$out/share/vulkan/implicit_layer.d" - ''} ''; postFixup = @@ -253,10 +226,6 @@ stdenv.mkDerivation (finalAttrs: { '' + lib.optionalString gamescopeSupport '' addDriverRunpath "$out/bin/mangoapp" - '' - + lib.optionalString finalAttrs.finalPackage.doCheck '' - # libcmocka.so is only used for tests - rm "$out/lib/libcmocka.so" ''; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/tools/graphics/mangohud/hardcode-dependencies.patch b/pkgs/tools/graphics/mangohud/hardcode-dependencies.patch index 4b7954a3ee5e..c19b2081c97f 100644 --- a/pkgs/tools/graphics/mangohud/hardcode-dependencies.patch +++ b/pkgs/tools/graphics/mangohud/hardcode-dependencies.patch @@ -12,10 +12,10 @@ index 7379af1..4eef3fe 100644 return false; } diff --git a/src/logging.cpp b/src/logging.cpp -index 7d4cb98..256128c 100644 +index ca986d4..c4d99ea 100644 --- a/src/logging.cpp +++ b/src/logging.cpp -@@ -27,8 +27,12 @@ string exec(string command) { +@@ -28,8 +28,12 @@ string exec(string command) { #endif std::array buffer; std::string result; diff --git a/pkgs/tools/graphics/mangohud/preload-nix-workaround.patch b/pkgs/tools/graphics/mangohud/preload-nix-workaround.patch index 5aa538b4c4c7..fe3761cdf54e 100644 --- a/pkgs/tools/graphics/mangohud/preload-nix-workaround.patch +++ b/pkgs/tools/graphics/mangohud/preload-nix-workaround.patch @@ -1,27 +1,19 @@ diff --git a/bin/mangohud.in b/bin/mangohud.in -index 53c72ef..18240ea 100755 +index 4cffeed..c19b635 100755 --- a/bin/mangohud.in +++ b/bin/mangohud.in -@@ -13,13 +13,15 @@ fi +@@ -13,7 +13,9 @@ fi DISABLE_LD_PRELOAD="cs2.sh - some_other_exe" + " --MANGOHUD_LIB_NAME="@ld_libdir_mangohud@libMangoHud_opengl.so" +-MANGOHUD_LIB_NAME="@ld_libdir_mangohud@libMangoHud_shim.so" +LD_LIBRARY_PATH="@libraryPath@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" +XDG_DATA_DIRS="@dataDir@${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}" -+MANGOHUD_LIB_NAME="libMangoHud_opengl.so" - - if [ "$1" = "--dlsym" ]; then -- MANGOHUD_LIB_NAME="@ld_libdir_mangohud@libMangoHud_dlsym.so:${MANGOHUD_LIB_NAME}" -+ MANGOHUD_LIB_NAME="libMangoHud_dlsym.so:${MANGOHUD_LIB_NAME}" - shift # shift will only be executed if $1 is "--dlsym" - elif [ "$MANGOHUD_DLSYM" = "1" ]; then -- MANGOHUD_LIB_NAME="@ld_libdir_mangohud@libMangoHud_dlsym.so:${MANGOHUD_LIB_NAME}" -+ MANGOHUD_LIB_NAME="libMangoHud_dlsym.so:${MANGOHUD_LIB_NAME}" - fi ++MANGOHUD_LIB_NAME="libMangoHud_shim.so" if [ "$1" = "--version" ]; then -@@ -41,7 +43,7 @@ for exe in $DISABLE_LD_PRELOAD; do + echo @version@ +@@ -39,7 +41,7 @@ for exe in $DISABLE_LD_PRELOAD; do done if [ "$disable_preload" = true ]; then @@ -30,7 +22,7 @@ index 53c72ef..18240ea 100755 else # Make sure we don't append mangohud lib multiple times # otherwise, this could cause issues with the steam runtime -@@ -54,5 +56,5 @@ else +@@ -52,5 +54,5 @@ else LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}${MANGOHUD_LIB_NAME}" esac From 40f8433da41a0e8d7f6c252ab436c0d23b48f6e3 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 10 Feb 2025 13:49:30 +0000 Subject: [PATCH 1440/2168] nixos-rebuild-ng: improve types in nix.switch_to_configuration --- pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py index 79048f83e7fd..04ddaa6e762f 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py @@ -8,7 +8,7 @@ from importlib.resources import files from pathlib import Path from string import Template from subprocess import PIPE, CalledProcessError -from typing import Final +from typing import Final, Literal from uuid import uuid4 from . import tmpdir @@ -554,7 +554,7 @@ def set_profile( def switch_to_configuration( path_to_config: Path, - action: Action, + action: Literal[Action.SWITCH, Action.BOOT, Action.TEST, Action.DRY_ACTIVATE], target_host: Remote | None, sudo: bool, install_bootloader: bool = False, From 5e34addab5b436920629e35674358680742cda64 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 12 Feb 2025 16:52:22 +0000 Subject: [PATCH 1441/2168] nixos-rebuild-ng: mock test correctly --- .../nixos-rebuild-ng/src/tests/test_main.py | 41 +++++++++++++++++-- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py index c95840345a51..afb5929f00ce 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py @@ -586,14 +586,49 @@ def test_execute_switch_rollback(mock_run: Any, tmp_path: Path) -> None: nixpkgs_path = tmp_path / "nixpkgs" nixpkgs_path.touch() + def run_side_effect(args: list[str], **kwargs: Any) -> CompletedProcess[str]: + if args[0] == "nix-instantiate": + return CompletedProcess([], 0, str(nixpkgs_path)) + elif args[0] == "git": + return CompletedProcess([], 0, "") + else: + return CompletedProcess([], 0) + + mock_run.side_effect = run_side_effect + nr.execute( - ["nixos-rebuild", "switch", "--rollback", "--install-bootloader", "--no-reexec"] + [ + "nixos-rebuild", + "switch", + "--rollback", + "--install-bootloader", + "--no-reexec", + "--no-flake", + ] ) - assert mock_run.call_count >= 2 - # ignoring update_nixpkgs_rev calls + assert mock_run.call_count == 4 mock_run.assert_has_calls( [ + call( + ["nix-instantiate", "--find-file", "nixpkgs"], + check=False, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "git", + "-C", + nixpkgs_path, + "rev-parse", + "--short", + "HEAD", + ], + check=False, + capture_output=True, + **DEFAULT_RUN_KWARGS, + ), call( [ "nix-env", From ff0595332eb41241957ab6b12a0db14550a7c9cb Mon Sep 17 00:00:00 2001 From: Jean-Francois Labonte Date: Wed, 12 Feb 2025 11:44:04 -0500 Subject: [PATCH 1442/2168] vscode: 1.97.0 -> 1.97.1 --- pkgs/applications/editors/vscode/vscode.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 8f8948429251..a82406dd1e6d 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -36,22 +36,22 @@ let sha256 = { - x86_64-linux = "0a4siy3is9bzbzmhhaf4l2djabv1yxjb20yp48i094wk0lpwbgcm"; - x86_64-darwin = "1pdx07ibylfk8zx71cjfjmsd8650kpd8rvkknixg1nm1jar9zsb3"; - aarch64-linux = "0x2qg7ixgkq637qvd218zk8ykfq97l55az17fqgp9dm9g73xn85f"; - aarch64-darwin = "0jlfkkc99wv875n2h5v3lnyhjhh74w53yd07jp02fbg4hs8sds92"; - armv7l-linux = "13a7s1il860g7v41wwdac3zdawc9w0bkrg9yif99s5ll0nakfs88"; + x86_64-linux = "0gr2z4vzms6fv4kcc8dzc7l3inpb5hasnzdfr1zc2n4i3nl8z8vw"; + x86_64-darwin = "1qplpjazjds5kns0kmp5qa6zfix30cqa93bl4bcpvblb2x9fh1v8"; + aarch64-linux = "1jhrmwrnxzwvhqgfrs35kyd5hhg2b7dyq3p5k88jhm8607nkds79"; + aarch64-darwin = "072lg4nvq3cdjzrwngaxnz9p952zkxsknsb39zjh55vzrij55g9x"; + armv7l-linux = "06bvh72bq4ippr2k8ifcfqhkhhh6na4vxsz1k50swr1k2kzwwr5d"; } .${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.97.0"; + version = "1.97.1"; pname = "vscode" + lib.optionalString isInsiders "-insiders"; # This is used for VS Code - Remote SSH test - rev = "33fc5a94a3f99ebe7087e8fe79fbe1d37a251016"; + rev = "e249dada235c2083c83813bd65b7f4707fb97b76"; executableName = "code" + lib.optionalString isInsiders "-insiders"; longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; @@ -75,7 +75,7 @@ callPackage ./generic.nix rec { src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - sha256 = "1vqqrcyrb8kigdwap5rkpil8lrahngix16hyqpvsmf0gsyjh46h0"; + sha256 = "01snzahh794ygpgwh4r57c8mnisp6a4fc3v5x76cdhxw2hd9s26n"; }; stdenv = stdenvNoCC; }; From dcb8946a58b891c9b77c749b39722936183b88d1 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 12 Feb 2025 16:57:26 +0000 Subject: [PATCH 1443/2168] nixos-rebuild-ng: fix missing mock --- pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py index 31d72396c8c4..e02fc69848fb 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py @@ -117,9 +117,14 @@ def test_flake_from_arg(mock_node: Any, monkeypatch: MonkeyPatch, tmpdir: Path) autospec=True, return_value=False, ), + patch( + get_qualified_name(m.discover_git, m), + autospec=True, + return_value="/etc/nixos", + ), ): assert m.Flake.from_arg(None, None) == m.Flake( - Path("/etc/nixos"), "nixosConfigurations.hostname" + "git+file:///etc/nixos", "nixosConfigurations.hostname" ) with ( From f6677aeede3c8311360ea74b8fa9bed262ba6a0a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 17:12:37 +0000 Subject: [PATCH 1444/2168] python312Packages.pymunk: 6.11.0 -> 6.11.1 --- pkgs/development/python-modules/pymunk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymunk/default.nix b/pkgs/development/python-modules/pymunk/default.nix index 36c0bccd31f6..ae16a5f5dd54 100644 --- a/pkgs/development/python-modules/pymunk/default.nix +++ b/pkgs/development/python-modules/pymunk/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pymunk"; - version = "6.11.0"; + version = "6.11.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-OsbnC5goH/6AINeu+VBBjPOBG5BNOhHFRVz02G7M95Y="; + hash = "sha256-GReEn2Ph9pnfIdah9dHCUK3duuJenBJPC+12UVTJTvg="; }; nativeBuildInputs = [ cffi ]; From de6b21c59a2bb7794a8710248969f21412086932 Mon Sep 17 00:00:00 2001 From: Ethan Carter Edwards Date: Tue, 11 Feb 2025 15:37:53 -0500 Subject: [PATCH 1445/2168] difftastic: 0.62.0 -> 0.63.0 Removes unneeded Cargo.lock and fetchpatch as well. Signed-off-by: Ethan Carter Edwards --- pkgs/by-name/di/difftastic/Cargo.lock | 1514 ------------------------ pkgs/by-name/di/difftastic/package.nix | 29 +- 2 files changed, 5 insertions(+), 1538 deletions(-) delete mode 100644 pkgs/by-name/di/difftastic/Cargo.lock diff --git a/pkgs/by-name/di/difftastic/Cargo.lock b/pkgs/by-name/di/difftastic/Cargo.lock deleted file mode 100644 index ce5827f60468..000000000000 --- a/pkgs/by-name/di/difftastic/Cargo.lock +++ /dev/null @@ -1,1514 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if", - "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 = "assert_cmd" -version = "2.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9834fcc22e0874394a010230586367d4a3e9f11b560f469262678547e1d2575e" -dependencies = [ - "bstr", - "doc-comment", - "predicates", - "predicates-core", - "predicates-tree", - "wait-timeout", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "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", - "serde", -] - -[[package]] -name = "bumpalo" -version = "3.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" - -[[package]] -name = "cc" -version = "1.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31a0499c1dc64f458ad13872de75c0eb7e3fdb0e67964610c914b034fc5956e" -dependencies = [ - "shlex", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "clap" -version = "3.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" -dependencies = [ - "atty", - "bitflags 1.3.2", - "clap_lex", - "indexmap 1.9.3", - "once_cell", - "strsim", - "termcolor", - "terminal_size", - "textwrap", -] - -[[package]] -name = "clap_lex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] - -[[package]] -name = "const_format" -version = "0.2.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673" -dependencies = [ - "const_format_proc_macros", -] - -[[package]] -name = "const_format_proc_macros" -version = "0.2.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500" -dependencies = [ - "proc-macro2", - "quote", - "unicode-xid", -] - -[[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 = "crossterm" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" -dependencies = [ - "bitflags 2.5.0", - "crossterm_winapi", - "libc", - "mio", - "parking_lot", - "signal-hook", - "signal-hook-mio", - "winapi", -] - -[[package]] -name = "crossterm_winapi" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" -dependencies = [ - "winapi", -] - -[[package]] -name = "diff" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" - -[[package]] -name = "difflib" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" - -[[package]] -name = "difftastic" -version = "0.62.0" -dependencies = [ - "assert_cmd", - "bumpalo", - "cc", - "clap", - "const_format", - "crossterm", - "glob", - "hashbrown 0.14.3", - "home", - "humansize", - "ignore", - "itertools 0.11.0", - "lazy_static", - "libc", - "libmimalloc-sys", - "line-numbers", - "log", - "mimalloc", - "owo-colors", - "predicates", - "pretty_assertions", - "pretty_env_logger", - "radix-heap", - "rayon", - "regex", - "rustc-hash", - "serde", - "serde_json", - "smallvec", - "streaming-iterator", - "strsim", - "strum", - "tree-sitter", - "tree-sitter-bash", - "tree-sitter-c", - "tree-sitter-c-sharp", - "tree-sitter-cpp", - "tree-sitter-css", - "tree-sitter-go", - "tree-sitter-haskell", - "tree-sitter-html", - "tree-sitter-java", - "tree-sitter-javascript", - "tree-sitter-json", - "tree-sitter-julia", - "tree-sitter-language", - "tree-sitter-lua", - "tree-sitter-objc", - "tree-sitter-ocaml", - "tree-sitter-php", - "tree-sitter-python", - "tree-sitter-ruby", - "tree-sitter-scala", - "tree-sitter-toml-ng", - "tree-sitter-typescript", - "tree-sitter-xml", - "tree_magic_mini", - "typed-arena", - "unicode-width", - "version_check", - "wu-diff", -] - -[[package]] -name = "doc-comment" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" - -[[package]] -name = "either" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" - -[[package]] -name = "env_logger" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" -dependencies = [ - "humantime", - "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.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" -dependencies = [ - "libc", - "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 = "float-cmp" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" -dependencies = [ - "num-traits", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[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", - "regex-syntax", -] - -[[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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" -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 = "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.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - -[[package]] -name = "home" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" -dependencies = [ - "windows-sys 0.48.0", -] - -[[package]] -name = "humansize" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cb51c9a029ddc91b07a787f1d86b53ccfa49b0e86688c946ebe8d3555685dd7" -dependencies = [ - "libm", -] - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "ignore" -version = "0.4.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d" -dependencies = [ - "crossbeam-utils", - "globset", - "lazy_static", - "log", - "memchr", - "regex", - "same-file", - "thread_local", - "walkdir", - "winapi-util", -] - -[[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", -] - -[[package]] -name = "indexmap" -version = "2.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" -dependencies = [ - "equivalent", - "hashbrown 0.14.3", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.9", - "libc", - "windows-sys 0.48.0", -] - -[[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.9", - "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 = "itoa" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.155" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" - -[[package]] -name = "libm" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" - -[[package]] -name = "libmimalloc-sys" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7705fc40f6ed493f73584abbb324e74f96b358ff60dfe5659a0f8fc12c590a69" -dependencies = [ - "cc", -] - -[[package]] -name = "line-numbers" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b25f5068853805faa3c19f44d0c401446e4eb3f47cc808fa331eec30f0ba35c" - -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[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 = "memchr" -version = "2.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" - -[[package]] -name = "mimalloc" -version = "0.1.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0dfa131390c2f6bdb3242f65ff271fcdaca5ff7b6c08f28398be7f2280e3926" -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 = "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 = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "normalize-line-endings" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" - -[[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -dependencies = [ - "autocfg", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "os_str_bytes" -version = "6.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" - -[[package]] -name = "owo-colors" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" - -[[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", - "libc", - "redox_syscall", - "smallvec", - "windows-targets 0.48.5", -] - -[[package]] -name = "petgraph" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" -dependencies = [ - "fixedbitset", - "indexmap 2.2.6", -] - -[[package]] -name = "predicates" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5aab5be6e4732b473071984b3164dbbfb7a3674d30ea5ff44410b6bcd960c3c" -dependencies = [ - "difflib", - "float-cmp", - "itertools 0.10.5", - "normalize-line-endings", - "predicates-core", - "regex", -] - -[[package]] -name = "predicates-core" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" - -[[package]] -name = "predicates-tree" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" -dependencies = [ - "predicates-core", - "termtree", -] - -[[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 = "pretty_env_logger" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "865724d4dbe39d9f3dd3b52b88d859d66bcb2d6a0acfd5ea68a65fb66d4bdc1c" -dependencies = [ - "env_logger", - "log", -] - -[[package]] -name = "proc-macro2" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "radix-heap" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ffec9df464013295b499298811e6a3de31bf8128092135826517db12dee601" - -[[package]] -name = "rayon" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "regex" -version = "1.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" - -[[package]] -name = "rustc-hash" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" - -[[package]] -name = "rustix" -version = "0.37.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys 0.48.0", -] - -[[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.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 = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "serde" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.114" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[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-mio" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" -dependencies = [ - "libc", - "mio", - "signal-hook", -] - -[[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 = "smallvec" -version = "1.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - -[[package]] -name = "streaming-iterator" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2231b7c3057d5e4ad0156fb3dc807d900806020c5ffa3ee6ff2c8c76fb8520" - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[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", - "quote", - "rustversion", - "syn", -] - -[[package]] -name = "syn" -version = "2.0.55" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "002a1b3dbf967edfafc32655d0f377ab0bb7b994aa1d32c8cc7e9b8bf3ebb8f0" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "termcolor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "terminal_size" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" -dependencies = [ - "rustix", - "windows-sys 0.48.0", -] - -[[package]] -name = "termtree" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" - -[[package]] -name = "textwrap" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" -dependencies = [ - "terminal_size", -] - -[[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 = "tree-sitter" -version = "0.24.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ac95b18f0f727aaaa012bd5179a1916706ee3ed071920fdbda738750b0c0bf5" -dependencies = [ - "cc", - "regex", - "regex-syntax", - "streaming-iterator", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-bash" -version = "0.23.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "329a4d48623ac337d42b1df84e81a1c9dbb2946907c102ca72db158c1964a52e" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-c" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afd2b1bf1585dc2ef6d69e87d01db8adb059006649dd5f96f31aa789ee6e9c71" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-c-sharp" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67f06accca7b45351758663b8215089e643d53bd9a660ce0349314263737fcb0" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-cpp" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df2196ea9d47b4ab4a31b9297eaa5a5d19a0b121dceb9f118f6790ad0ab94743" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-css" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25435a275adb3226b6fddab891bbc50d1a500774a44ceb97022a39666ccda75d" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-go" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b13d476345220dbe600147dd444165c5791bf85ef53e28acbedd46112ee18431" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-haskell" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "977c51e504548cba13fc27cb5a2edab2124cf6716a1934915d07ab99523b05a4" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-html" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "261b708e5d92061ede329babaaa427b819329a9d427a1d710abb0f67bbef63ee" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-java" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f9b24494d5f386acb2c086e0541c1b145692e0e012101ddb8257737b83c2803" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-javascript" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf40bf599e0416c16c125c3cec10ee5ddc7d1bb8b0c60fa5c4de249ad34dc1b1" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-json" -version = "0.24.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d727acca406c0020cffc6cf35516764f36c8e3dc4408e5ebe2cb35a947ec471" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-julia" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4144731a178812ee867619b1e98b3b91e54c1652304b26e5ebe3175b701de323" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-language" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c199356c799a8945965bb5f2c55b2ad9d9aa7c4b4f6e587fe9dea0bc715e5f9c" - -[[package]] -name = "tree-sitter-lua" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb9adf0965fec58e7660cbb3a059dbb12ebeec9459e6dcbae3db004739641e" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-objc" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ca8bb556423fc176f0535e79d525f783a6684d3c9da81bf9d905303c129e1d2" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-ocaml" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93c104a23d175906dd0cf1f872745d2b4ec10f29a75194a3556501b2f66ce377" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-php" -version = "0.23.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f066e94e9272cfe4f1dcb07a1c50c66097eca648f2d7233d299c8ae9ed8c130c" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-python" -version = "0.23.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70beaa47e19e1529e8787fc0a80ebbae5a9fdaefc5fcc8972c885c9abf6ab0f0" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-ruby" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be0484ea4ef6bb9c575b4fdabde7e31340a8d2dbc7d52b321ac83da703249f95" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-scala" -version = "0.23.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab837c0df7ffb6c315fd1cd792164375b3ec0c282ea35f639231f138044f8d0c" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-toml-ng" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9adc2c898ae49730e857d75be403da3f92bb81d8e37a2f918a08dd10de5ebb1" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-typescript" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c5f76ed8d947a75cc446d5fccd8b602ebf0cde64ccf2ffa434d873d7a575eff" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-xml" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e670041f591d994f54d597ddcd8f4ebc930e282c4c76a42268743b71f0c8b6b3" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree_magic_mini" -version = "3.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469a727cac55b41448315cc10427c069c618ac59bb6a4480283fcd811749bdc2" -dependencies = [ - "fnv", - "home", - "memchr", - "nom", - "once_cell", - "petgraph", -] - -[[package]] -name = "typed-arena" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[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.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "wait-timeout" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" -dependencies = [ - "libc", -] - -[[package]] -name = "walkdir" -version = "2.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 = "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-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.4", -] - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" -dependencies = [ - "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.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.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.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.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.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.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.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 = "wu-diff" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e3e6735fcde06432870db8dc9d7e3ab1b93727c14eaef329969426299f28893" - -[[package]] -name = "yansi" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" - -[[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", -] diff --git a/pkgs/by-name/di/difftastic/package.nix b/pkgs/by-name/di/difftastic/package.nix index 490c3938ca5b..3aa35e2a39e5 100644 --- a/pkgs/by-name/di/difftastic/package.nix +++ b/pkgs/by-name/di/difftastic/package.nix @@ -1,54 +1,35 @@ { lib, - fetchpatch, rustPlatform, fetchFromGitHub, - testers, - difftastic, - nix-update-script, versionCheckHook, + nix-update-script, }: -let - mimallocPatch = fetchpatch { - # fixes compilation error on x86_64-darwin - # remove after update to libmimalloc-sys >= 0.1.29 - # (fixed in mimalloc >= 1.7.6 which is included with libmimalloc-sys >= 0.1.29) - url = "https://github.com/microsoft/mimalloc/commit/40e0507a5959ee218f308d33aec212c3ebeef3bb.patch"; - hash = "sha256-DK0LqsVXXiEVQSQCxZ5jyZMg0UJJx9a/WxzCroYSHZc="; - }; -in rustPlatform.buildRustPackage rec { pname = "difftastic"; - version = "0.62.0"; + version = "0.63.0"; src = fetchFromGitHub { owner = "wilfred"; repo = "difftastic"; tag = version; - hash = "sha256-AAnlopJTb+tjkACISK9OC0k59BDt+8michzt37P1lL8="; + hash = "sha256-BxWCSkSeDyiiGBY2u0ahPrIhYq2lbujoPPtZGq/OkI0="; }; - cargoLock = { - lockFile = ./Cargo.lock; - }; + useFetchCargoVendor = true; + cargoHash = "sha256-kIqaZ8truDivMV6uo1+j9bmXQReREZjHSr89ZvVDWCw="; # skip flaky tests checkFlags = [ "--skip=options::tests::test_detect_display_width" ]; - postPatch = '' - patch -d $cargoDepsCopy/libmimalloc-sys-0.1.24/c_src/mimalloc \ - -p1 < ${mimallocPatch} - ''; - nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/difft"; versionCheckProgramArg = "--version"; doInstallCheck = true; - passthru.tests.version = testers.testVersion { package = difftastic; }; passthru.updateScript = nix-update-script { }; meta = { From 146f02f7fb865adbda0190af5d6a7419259cc5e5 Mon Sep 17 00:00:00 2001 From: Ethan Carter Edwards Date: Tue, 11 Feb 2025 15:38:50 -0500 Subject: [PATCH 1446/2168] difftastic: add defelo as maintainer Defelo requested to be added as a maintainer in code review. Signed-off-by: Ethan Carter Edwards --- pkgs/by-name/di/difftastic/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/di/difftastic/package.nix b/pkgs/by-name/di/difftastic/package.nix index 3aa35e2a39e5..1bdc604a48de 100644 --- a/pkgs/by-name/di/difftastic/package.nix +++ b/pkgs/by-name/di/difftastic/package.nix @@ -41,6 +41,7 @@ rustPlatform.buildRustPackage rec { ethancedwards8 figsoda matthiasbeyer + defelo ]; mainProgram = "difft"; }; From 8e44f7b61c92f084a6b66cdae7d9fa63c10ebd31 Mon Sep 17 00:00:00 2001 From: Brian Lee Date: Wed, 12 Feb 2025 09:21:26 -0800 Subject: [PATCH 1447/2168] lnd: add maintainer --- pkgs/by-name/ln/lnd/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ln/lnd/package.nix b/pkgs/by-name/ln/lnd/package.nix index 21f768dbd32b..94bc7324c870 100644 --- a/pkgs/by-name/ln/lnd/package.nix +++ b/pkgs/by-name/ln/lnd/package.nix @@ -46,6 +46,7 @@ buildGoModule rec { homepage = "https://github.com/lightningnetwork/lnd"; license = licenses.mit; maintainers = with maintainers; [ + bleetube cypherpunk2140 prusnak ]; From 9dd84caa6e8be94074fdd3919cf29598a47be7c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 12 Feb 2025 09:36:19 -0800 Subject: [PATCH 1448/2168] python313Packages.zarr: skip bulk update --- pkgs/development/python-modules/zarr/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix index cc38c78b3c48..d7d232ebf2bd 100644 --- a/pkgs/development/python-modules/zarr/default.nix +++ b/pkgs/development/python-modules/zarr/default.nix @@ -46,6 +46,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "zarr" ]; + # FIXME remove once zarr's reverse dependencies support v3 + passthru.skipBulkUpdate = true; + meta = { description = "Implementation of chunked, compressed, N-dimensional arrays for Python"; homepage = "https://github.com/zarr-developers/zarr"; From 4b4a93752a560491d573236e249c6381d2f77433 Mon Sep 17 00:00:00 2001 From: Jean-Francois Labonte Date: Wed, 12 Feb 2025 12:00:39 -0500 Subject: [PATCH 1449/2168] maintainers: update jefflabonte details --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 44e4b1111ed0..34c4d3253ef0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10752,7 +10752,7 @@ name = "Jeffrey David Johnson"; }; jefflabonte = { - email = "grimsleepless@protonmail.com"; + email = "jean-francois.labonte@brightonlabs.ai"; github = "JeffLabonte"; githubId = 9425955; name = "Jean-François Labonté"; From 6efa0791551dab3dc540045b71d58bc81ae06f22 Mon Sep 17 00:00:00 2001 From: Jean-Francois Labonte Date: Wed, 12 Feb 2025 12:01:16 -0500 Subject: [PATCH 1450/2168] vscode: Add jefflabonte to maintainers --- pkgs/applications/editors/vscode/vscode.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index a82406dd1e6d..d002b3a0c34d 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -110,6 +110,7 @@ callPackage ./generic.nix rec { synthetica bobby285271 johnrtitor + jefflabonte ]; platforms = [ "x86_64-linux" From 8fa9a9bf44ff0df8b709f28962fc9596e71c7c7d Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Wed, 12 Feb 2025 18:36:24 +0100 Subject: [PATCH 1451/2168] sympa: remove mmilata from maintainers --- nixos/modules/services/mail/sympa.nix | 1 - nixos/tests/sympa.nix | 2 +- pkgs/by-name/sy/sympa/package.nix | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/modules/services/mail/sympa.nix b/nixos/modules/services/mail/sympa.nix index c1a833528b0f..f8cd19691926 100644 --- a/nixos/modules/services/mail/sympa.nix +++ b/nixos/modules/services/mail/sympa.nix @@ -656,7 +656,6 @@ in }; meta.maintainers = with lib.maintainers; [ - mmilata sorki ]; } diff --git a/nixos/tests/sympa.nix b/nixos/tests/sympa.nix index fea12926cdad..57284b75643e 100644 --- a/nixos/tests/sympa.nix +++ b/nixos/tests/sympa.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ( { pkgs, lib, ... }: { name = "sympa"; - meta.maintainers = with lib.maintainers; [ mmilata ]; + meta.maintainers = with lib.maintainers; [ ]; nodes.machine = { ... }: diff --git a/pkgs/by-name/sy/sympa/package.nix b/pkgs/by-name/sy/sympa/package.nix index 83018f0c72e0..7af75ae5ad18 100644 --- a/pkgs/by-name/sy/sympa/package.nix +++ b/pkgs/by-name/sy/sympa/package.nix @@ -123,7 +123,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ sorki - mmilata ]; platforms = platforms.all; }; From 9b8f134668b9265916e3d8d192fd0ac564537b68 Mon Sep 17 00:00:00 2001 From: Brian Lee Date: Wed, 12 Feb 2025 09:39:41 -0800 Subject: [PATCH 1452/2168] lnd: 0.18.4 -> 0.18.5 --- pkgs/by-name/ln/lnd/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ln/lnd/package.nix b/pkgs/by-name/ln/lnd/package.nix index 94bc7324c870..ec161dd4219f 100644 --- a/pkgs/by-name/ln/lnd/package.nix +++ b/pkgs/by-name/ln/lnd/package.nix @@ -23,16 +23,16 @@ buildGoModule rec { pname = "lnd"; - version = "0.18.4-beta"; + version = "0.18.5-beta"; src = fetchFromGitHub { owner = "lightningnetwork"; repo = "lnd"; rev = "v${version}"; - hash = "sha256-vZ5A0AsxZ8gpvXB4tH+GQIIvlJbSFvk38UbR24BVOPc="; + hash = "sha256-7Y1GcZoj7Uk0PGd0B0J4hXpb5voqmM2f/Ie4FRHI3iQ="; }; - vendorHash = "sha256-Irlf2dwI0QZyzMFeBVr2I5iUe0PJyv20HX4rPOE8M54="; + vendorHash = "sha256-IY7lcEYeFlknyFWEy+lEsbOYfvhN5ApJUnJX0gmIV/w="; subPackages = [ "cmd/lncli" From 300ce7487b5867e56eaa9ca66b2ac8a7e13af528 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 12 Feb 2025 18:49:22 +0100 Subject: [PATCH 1453/2168] alpine-make-vm-image: 0.13.1 -> 0.13.2 --- pkgs/by-name/al/alpine-make-vm-image/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/al/alpine-make-vm-image/package.nix b/pkgs/by-name/al/alpine-make-vm-image/package.nix index 683ab090a018..ea1270252e1a 100644 --- a/pkgs/by-name/al/alpine-make-vm-image/package.nix +++ b/pkgs/by-name/al/alpine-make-vm-image/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "alpine-make-vm-image"; - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = "alpinelinux"; repo = "alpine-make-vm-image"; rev = "v${version}"; - sha256 = "sha256-bm9r/zM9Em1eTBwc8tL7M6yKGpat1IDcruob0IXFUyA="; + hash = "sha256-N7S9MlTpLIL5Od+buS7q64v8fmN+wbYK1FH/YW+nMP8="; }; nativeBuildInputs = [ makeWrapper ]; From 4ac85d1fc6f3e0cf6ad1872e3f5ea9573d5cae9a Mon Sep 17 00:00:00 2001 From: Ludovico Piero Date: Thu, 13 Feb 2025 03:25:11 +0900 Subject: [PATCH 1454/2168] ArchiSteamFarm: 6.1.1.3 -> 6.1.2.3 Changelog: https://github.com/JustArchiNET/ArchiSteamFarm/releases/tag/6.1.2.3 Signed-off-by: Ludovico Piero --- .../misc/ArchiSteamFarm/default.nix | 4 +- .../misc/ArchiSteamFarm/deps.json | 154 ++++++++++-------- .../misc/ArchiSteamFarm/web-ui/default.nix | 6 +- 3 files changed, 87 insertions(+), 77 deletions(-) diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index b48ff429f651..7419c240d111 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -11,13 +11,13 @@ buildDotnetModule rec { pname = "ArchiSteamFarm"; # nixpkgs-update: no auto update - version = "6.1.1.3"; + version = "6.1.2.3"; src = fetchFromGitHub { owner = "JustArchiNET"; repo = "ArchiSteamFarm"; rev = version; - hash = "sha256-e0LzM0N5N7BHyQDRQIPziQrAilJN1aUttKyLod/T8rU="; + hash = "sha256-FYh54KE42DizwpleBquDP7CNLHJySSz5pjsfjpn63u8="; }; dotnet-runtime = dotnetCorePackages.aspnetcore_9_0; diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps.json b/pkgs/applications/misc/ArchiSteamFarm/deps.json index 6bb07afcc405..ee6678a59cd2 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps.json +++ b/pkgs/applications/misc/ArchiSteamFarm/deps.json @@ -281,14 +281,19 @@ }, { "pname": "Markdig.Signed", - "version": "0.39.1", - "hash": "sha256-jofkP6JUp4xuUjJ6B6+HDfBJ3+V2vgECt2CWmFq62k4=" + "version": "0.40.0", + "hash": "sha256-msd36cVKi3MTkT1QQg/b5yW4oLM3e8hbahPPkvhzRZw=" }, { "pname": "Microsoft.ApplicationInsights", "version": "2.22.0", "hash": "sha256-mUQ63atpT00r49ca50uZu2YCiLg3yd6r3HzTryqcuEA=" }, + { + "pname": "Microsoft.AspNetCore.OpenApi", + "version": "9.0.1", + "hash": "sha256-L93MBkDOrxiQx0YRZrxDwli7to5Va5+7VJFffyhk8cE=" + }, { "pname": "Microsoft.Bcl.AsyncInterfaces", "version": "6.0.0", @@ -296,8 +301,8 @@ }, { "pname": "Microsoft.CodeAnalysis.ResxSourceGenerator", - "version": "3.11.0-beta1.24527.2", - "hash": "sha256-NVqJ5cRa9G+ilWKazOTA8Xfm6ExOPpst8HMIFBC1/BU=" + "version": "3.11.0-beta1.24605.2", + "hash": "sha256-N+A3i0qC364THr1rmehG168V3W+3xXaQYIjgFE1zO6Q=" }, { "pname": "Microsoft.CodeCoverage", @@ -426,23 +431,23 @@ }, { "pname": "Microsoft.IdentityModel.Abstractions", - "version": "8.3.0", - "hash": "sha256-LSZ91DbPswCWibHNSGWC3Jh3KQwAthVaU3r7XQJyutM=" + "version": "8.3.1", + "hash": "sha256-K2ahV9EZFZD7idRzF0wKD/5FD7BuSiRtSNuFAqauo1Y=" }, { "pname": "Microsoft.IdentityModel.JsonWebTokens", - "version": "8.3.0", - "hash": "sha256-Hiiv10LSOMIt7KsQSsteJV4DFkLebHMYmoISn/pl2F8=" + "version": "8.3.1", + "hash": "sha256-laNV7ziGznCb7TuYO6987C62To870os1az4YbhG84vc=" }, { "pname": "Microsoft.IdentityModel.Logging", - "version": "8.3.0", - "hash": "sha256-0P14ilpV+9yp+nqZWI/ilkTnRas4pic8NjNVcYxuXWs=" + "version": "8.3.1", + "hash": "sha256-uLgVE2ZCiz5F3/SMes+nNEqXNEdDH0vfUk3eOv3MXbU=" }, { "pname": "Microsoft.IdentityModel.Tokens", - "version": "8.3.0", - "hash": "sha256-+TzBeZH2Tgs0EMoU5QuCdOD/5V8xM7MHClX578AUIxw=" + "version": "8.3.1", + "hash": "sha256-C9Aj8YZ7corhP6LOCx/fBXbyAR9baqzQtFvhsGeQ/Mo=" }, { "pname": "Microsoft.NET.Test.Sdk", @@ -454,6 +459,11 @@ "version": "5.0.0", "hash": "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c=" }, + { + "pname": "Microsoft.OpenApi", + "version": "1.6.17", + "hash": "sha256-Wx9PwlEJPNMq1kp59nJJnLHQ+yNhqCTudcokmlP+tSk=" + }, { "pname": "Microsoft.OpenApi", "version": "1.6.22", @@ -461,28 +471,28 @@ }, { "pname": "Microsoft.Testing.Extensions.Telemetry", - "version": "1.5.0", - "hash": "sha256-aKKGFpsp88Yy29GLbWRWnEil2M2WEHjRXZ62Q8x5QRQ=" + "version": "1.5.3", + "hash": "sha256-bIXwPSa3jkr2b6xINOqMUs6/uj/r4oVFM7xq3uVIZDU=" }, { "pname": "Microsoft.Testing.Extensions.TrxReport.Abstractions", - "version": "1.5.0", - "hash": "sha256-oiePvWpZMkT2AnEpfzWgvaXJai6crgHdoUSMZct3JB0=" + "version": "1.5.3", + "hash": "sha256-IfMRfcyaIKEMRtx326ICKtinDBEfGw/Sv8ZHawJ96Yc=" }, { "pname": "Microsoft.Testing.Extensions.VSTestBridge", - "version": "1.5.0", - "hash": "sha256-XauIF+r05RDgORsnxEp6Cq0WZjLycJ1hPH79QUi/SgM=" + "version": "1.5.3", + "hash": "sha256-XpM/yFjhLSsuzyDV+xKubs4V1zVVYiV05E0+N4S1h0g=" }, { "pname": "Microsoft.Testing.Platform", - "version": "1.5.0", - "hash": "sha256-67ZNhvMifCIM7SFnwDN25EanRNKsjAFQWugrrYWAkrM=" + "version": "1.5.3", + "hash": "sha256-y61Iih6w5D79dmrj2V675mcaeIiHoj1HSa1FRit2BLM=" }, { "pname": "Microsoft.Testing.Platform.MSBuild", - "version": "1.5.0", - "hash": "sha256-nJ5fv8MwFw2PeJIZA9qKLfGPWYKmHww1CtVFICz6S00=" + "version": "1.5.3", + "hash": "sha256-YspvjE5Jfi587TAfsvfDVJXNrFOkx1B3y1CKV6m7YLY=" }, { "pname": "Microsoft.TestPlatform.ObjectModel", @@ -501,23 +511,23 @@ }, { "pname": "MSTest", - "version": "3.7.0", - "hash": "sha256-z302okYPT36ebQhReEihire5fyig5pLkrx09nLyVuME=" + "version": "3.7.3", + "hash": "sha256-0fFXB4ZYX+RFntYFin9SrgiW/neD7iXEHF+nJoN6Iys=" }, { "pname": "MSTest.Analyzers", - "version": "3.7.0", - "hash": "sha256-TVMFle7oE2ZU6U+VkJ0G9iNjJxnRU4rDIJCtZFwDhz0=" + "version": "3.7.3", + "hash": "sha256-6mNfHtx9FBWA6/QrRUepwbxXWG/54GRyeZYazDiMacg=" }, { "pname": "MSTest.TestAdapter", - "version": "3.7.0", - "hash": "sha256-b6JCu2yyZmTZwZVd4MHaIwa01eQGWpFd8mNzHUBS6Tg=" + "version": "3.7.3", + "hash": "sha256-3O/AXeS+3rHWstinivt73oa0QDp+xQpTc9p46EF+Mtc=" }, { "pname": "MSTest.TestFramework", - "version": "3.7.0", - "hash": "sha256-fIHwuc/zimd8oxvTiA3gmUzmJAj7JsQYh9IOb8NRJ/Y=" + "version": "3.7.3", + "hash": "sha256-RweCMMf14GI6HqjDIP68JM67IaJKYQTZy0jk5Q4DFxs=" }, { "pname": "Newtonsoft.Json", @@ -546,23 +556,23 @@ }, { "pname": "NLog", - "version": "5.3.4", - "hash": "sha256-Cwr1Wu9VbOcRz3GdVKkt7lIpNwC1E4Hdb0g+qEkEr3k=" + "version": "5.4.0", + "hash": "sha256-l2R0UHHCL02KPMC96e62AL2ONFD0PAty619y9UnD25A=" }, { "pname": "NLog.Extensions.Logging", - "version": "5.3.15", - "hash": "sha256-otzOJncsEmzeGkJ9yxuwQgYFlKIG9ALX+DaKJ/Jhux4=" + "version": "5.4.0", + "hash": "sha256-9pVBguAKnjmbtKM3wBVBEzovXkoEXgqvB4IhiayAkVo=" }, { "pname": "NLog.Web.AspNetCore", - "version": "5.3.15", - "hash": "sha256-JaxCAfsgYM8N7bmAciDowSdOxtMS3eoMszODqWPcqao=" + "version": "5.4.0", + "hash": "sha256-tDCsOqYNVg+dNBk85HjNgbZuQwMgGPIdsMqoPhhPROk=" }, { "pname": "OpenTelemetry", - "version": "1.10.0", - "hash": "sha256-ucUy3vIabYb0TGDhraqMEzT+LLPmXrO1NgAjEeyVCO8=" + "version": "1.11.1", + "hash": "sha256-Z4U/FCSlY+qdQRS2haJDSYyxI624mDCwHZhf5At2Atk=" }, { "pname": "OpenTelemetry", @@ -571,13 +581,13 @@ }, { "pname": "OpenTelemetry.Api", - "version": "1.10.0", - "hash": "sha256-ZSpQFnNgkk3dO8Q7yokJ/VSl4wp5PuIv9nduxgC6UxU=" + "version": "1.11.1", + "hash": "sha256-1qDEHEvelvySuCPcevWgO7N9ZEmPXwnFog+tiWXr2qU=" }, { "pname": "OpenTelemetry.Api.ProviderBuilderExtensions", - "version": "1.10.0", - "hash": "sha256-hLw3Sf1fviAlVJYhaMudVJEdG5pjX5JvVrqv9DgYAk8=" + "version": "1.11.1", + "hash": "sha256-rioqazZAS6aZ7W8jJ4owu58rcnRbQyPrWVTBoqu1zPc=" }, { "pname": "OpenTelemetry.Api.ProviderBuilderExtensions", @@ -591,38 +601,38 @@ }, { "pname": "OpenTelemetry.Extensions.Hosting", - "version": "1.10.0", - "hash": "sha256-+O9oaAUYaKUItLAaT7yQUs2nrHVDNkj8YcFuUxiTy6M=" + "version": "1.11.1", + "hash": "sha256-eHQaUToWOpmJgD5XCHDCWsUcChKH3roaO8ZTAIulJVk=" }, { "pname": "OpenTelemetry.Instrumentation.AspNetCore", - "version": "1.10.1", - "hash": "sha256-HqMFDpFsMaPlgyFt1MU3Un+BysEoj5qPc8HVxTlt0mE=" + "version": "1.11.0", + "hash": "sha256-F3WTwCPVUe+VppF1ZOAdBKaSseKmFZEU7D81uegqpGo=" }, { "pname": "OpenTelemetry.Instrumentation.Http", - "version": "1.10.0", - "hash": "sha256-U9ojqPSJu4OQEAfRJ+7MjzxayzsGWI0Ep8CPAcpkhhA=" + "version": "1.11.0", + "hash": "sha256-4J7ZvginaiISaLB4M9tTK2o6avBz2dSI+fAhyfraBQ4=" }, { "pname": "OpenTelemetry.Instrumentation.Runtime", - "version": "1.10.0", - "hash": "sha256-cCTYKxHh1Qzu8X51B8gGsrxwKhVSqJfiql/+o4TWrwg=" + "version": "1.11.0", + "hash": "sha256-VBSSJ3eORWUlVH12xzubtMtrDACAsyd1nSfgUt5ltCg=" }, { "pname": "protobuf-net", - "version": "3.2.45", - "hash": "sha256-rWitxe3uP3SOyoG1fwM5n00RpR5IL1V6u1zXMI0p0JA=" + "version": "3.2.46", + "hash": "sha256-NirxAUXEIUQz0HHLS+KS4fgOZwJy1zJZYGcjPa5ujTs=" }, { "pname": "protobuf-net.Core", - "version": "3.2.45", - "hash": "sha256-bsMGUmd0yno8g0H0637jJboKJwyyHLHoHg45+bt9pLQ=" + "version": "3.2.46", + "hash": "sha256-Srg7pP7rleL462idLPFUxgXBLrywWeHFyEvSV+keA4E=" }, { "pname": "SteamKit2", - "version": "3.0.0", - "hash": "sha256-bRRdX8WFo9k+QCZWh0KHb3TULpJxpR4Hg9FDXKBW6d4=" + "version": "3.0.2", + "hash": "sha256-bRiLFaq/hsr+7BKtSKoD2+pf0VCGhBYe/rO3DgqMZpo=" }, { "pname": "Swashbuckle.AspNetCore", @@ -661,33 +671,33 @@ }, { "pname": "System.Composition", - "version": "9.0.0", - "hash": "sha256-FehOkQ2u1p8mQ0/wn3cZ+24HjhTLdck8VZYWA1CcgbM=" + "version": "9.0.1", + "hash": "sha256-KUJnkjMNNJ2b/1664xflRM9AmAs00PkmXLfbTnNdL6U=" }, { "pname": "System.Composition.AttributedModel", - "version": "9.0.0", - "hash": "sha256-a7y7H6zj+kmYkllNHA402DoVfY9IaqC3Ooys8Vzl24M=" + "version": "9.0.1", + "hash": "sha256-93Q8jFzbF0tEhk+UAHoULA+DWiwgrKiBxcm8k/dQ75M=" }, { "pname": "System.Composition.Convention", - "version": "9.0.0", - "hash": "sha256-tw4vE5JRQ60ubTZBbxoMPhtjOQCC3XoDFUH7NHO7o8U=" + "version": "9.0.1", + "hash": "sha256-FQihbXN3FkEiPprS5XLDIbYLye3RI0yHba099oDuIxY=" }, { "pname": "System.Composition.Hosting", - "version": "9.0.0", - "hash": "sha256-oOxU+DPEEfMCuNLgW6wSkZp0JY5gYt44FJNnWt+967s=" + "version": "9.0.1", + "hash": "sha256-jas95z5TZo4VtLIev6Ixqfh0Xv54CI7zCzJ8867bpVE=" }, { "pname": "System.Composition.Runtime", - "version": "9.0.0", - "hash": "sha256-AyIe+di1TqwUBbSJ/sJ8Q8tzsnTN+VBdJw4K8xZz43s=" + "version": "9.0.1", + "hash": "sha256-wAciMAsH7WR8ETiulgFhBRLBihdNEXb8Zjtzook2UQ4=" }, { "pname": "System.Composition.TypedParts", - "version": "9.0.0", - "hash": "sha256-F5fpTUs3Rr7yP/NyIzr+Xn5NdTXXp8rrjBnF9UBBUog=" + "version": "9.0.1", + "hash": "sha256-fyLCfmGKgUSIpizl6OiSX61Td9xmLjii/PDQAowCihc=" }, { "pname": "System.Diagnostics.DiagnosticSource", @@ -701,8 +711,8 @@ }, { "pname": "System.IO.Hashing", - "version": "8.0.0", - "hash": "sha256-szOGt0TNBo6dEdC3gf6H+e9YW3Nw0woa6UnCGGGK5cE=" + "version": "9.0.1", + "hash": "sha256-IJru9BdFNsNs7FbG+F9djJdkkWdpoz2IxQ+GgvKvUOs=" }, { "pname": "System.Linq.Async", @@ -726,8 +736,8 @@ }, { "pname": "System.Security.Cryptography.ProtectedData", - "version": "9.0.0", - "hash": "sha256-gPgPU7k/InTqmXoRzQfUMEKL3QuTnOKowFqmXTnWaBQ=" + "version": "9.0.1", + "hash": "sha256-U2c8q6vD+O42zNTGRSAbsdj+r3+nXegoDYdB/Qm4nvU=" }, { "pname": "System.Security.Principal.Windows", diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix index 6d0c35262370..dd7420c46fb1 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix @@ -7,7 +7,7 @@ buildNpmPackage rec { pname = "asf-ui"; - version = "6be24065cd4904389d94140f4ed1f6738b1f7fbb"; + version = "fbdc518fa1e82c16b9de0a5e2228898796d3f5a2"; src = fetchFromGitHub { owner = "JustArchiNET"; @@ -15,10 +15,10 @@ buildNpmPackage rec { # updated by the update script # this is always the commit that should be used with asf-ui from the latest asf version rev = version; - hash = "sha256-DFl+DCNj4JFKZG1awX5rlsHzj+67OFyBj9d16zDiKRA="; + hash = "sha256-n9V5xUHIByspVSkpcwkohgcPlk22UfA2FBZq7CG1LmE="; }; - npmDepsHash = "sha256-jZSiWZDckfGfgrBMHTX/sm7Pcl5ap3lfmwGi8SHXqu8="; + npmDepsHash = "sha256-lJZgHVO770aYwnudUj2wkUqrSV6rbSDJ9zwtCe+36k8="; installPhase = '' runHook preInstall From 5df5ff8fd234921c56c9a418ddf2cb285a061590 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 12 Feb 2025 18:04:25 +0000 Subject: [PATCH 1455/2168] nixos-rebuild-ng: fix non-flake remote build evaluation Fix: #381457. --- .../src/nixos_rebuild/__init__.py | 15 +- .../nixos-rebuild-ng/src/nixos_rebuild/nix.py | 4 +- .../nixos-rebuild-ng/src/tests/test_main.py | 201 +++++++++++++++++- .../ni/nixos-rebuild-ng/src/tests/test_nix.py | 4 +- 4 files changed, 211 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index 1c725b60f617..7709f1af8742 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -389,8 +389,6 @@ def execute(argv: list[str]) -> None: dry_run = action == Action.DRY_BUILD no_link = action in (Action.SWITCH, Action.BOOT) - build_flags |= {"no_out_link": no_link, "dry_run": dry_run} - flake_build_flags |= {"no_link": no_link, "dry_run": dry_run} rollback = bool(args.rollback) def validate_image_variant(variants: ImageVariants) -> None: @@ -444,29 +442,32 @@ def execute(argv: list[str]) -> None: flake, build_host, eval_flags=flake_common_flags, - flake_build_flags=flake_build_flags, + flake_build_flags=flake_build_flags + | {"no_link": no_link, "dry_run": dry_run}, copy_flags=copy_flags, ) case (_, False, None, Flake(_)): path_to_config = nix.build_flake( attr, flake, - flake_build_flags=flake_build_flags, + flake_build_flags=flake_build_flags + | {"no_link": no_link, "dry_run": dry_run}, ) case (_, False, Remote(_), None): path_to_config = nix.build_remote( attr, build_attr, build_host, - instantiate_flags=common_flags, + realise_flags=common_flags, + instantiate_flags=build_flags, copy_flags=copy_flags, - build_flags=build_flags, ) case (_, False, None, None): path_to_config = nix.build( attr, build_attr, - build_flags=build_flags, + build_flags=build_flags + | {"no_out_link": no_link, "dry_run": dry_run}, ) case never: # should never happen, but mypy is not smart enough to diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py index 04ddaa6e762f..c7b2010229ab 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py @@ -77,7 +77,7 @@ def build_remote( attr: str, build_attr: BuildAttr, build_host: Remote | None, - build_flags: Args | None = None, + realise_flags: Args | None = None, instantiate_flags: Args | None = None, copy_flags: Args | None = None, ) -> Path: @@ -112,7 +112,7 @@ def build_remote( drv, "--add-root", remote_tmpdir / uuid4().hex, - *dict_to_flags(build_flags), + *dict_to_flags(realise_flags), ], remote=build_host, stdout=PIPE, diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py index afb5929f00ce..9ae6bf50a080 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py @@ -1,5 +1,6 @@ import logging import textwrap +import uuid from pathlib import Path from subprocess import PIPE, CompletedProcess from typing import Any @@ -390,6 +391,202 @@ def test_execute_nix_switch_flake(mock_run: Any, tmp_path: Path) -> None: ) +@patch.dict(nr.process.os.environ, {}, clear=True) +@patch(get_qualified_name(nr.process.subprocess.run), autospec=True) +@patch(get_qualified_name(nr.cleanup_ssh, nr), autospec=True) +@patch(get_qualified_name(nr.nix.uuid4, nr.nix), autospec=True) +def test_execute_nix_switch_build_target_host( + mock_uuid4: Any, + mock_cleanup_ssh: Any, + mock_run: Any, + tmp_path: Path, +) -> None: + config_path = tmp_path / "test" + config_path.touch() + + def run_side_effect(args: list[str], **kwargs: Any) -> CompletedProcess[str]: + if args[0] == "nix": + return CompletedProcess([], 0, str(config_path)) + elif args[0] == "nix-instantiate" and "--find-file" in args: + return CompletedProcess([], 1) + elif args[0] == "nix-instantiate": + return CompletedProcess([], 0, str(config_path)) + elif args[0] == "ssh" and "nix-store" in args: + return CompletedProcess([], 0, "/tmp/tmpdir/config") + elif args[0] == "ssh" and "mktemp" in args: + return CompletedProcess([], 0, "/tmp/tmpdir") + elif args[0] == "ssh" and "readlink" in args: + return CompletedProcess([], 0, str(config_path)) + else: + return CompletedProcess([], 0) + + mock_run.side_effect = run_side_effect + mock_uuid4.return_value = uuid.UUID(int=0) + + nr.execute( + [ + "nixos-rebuild", + "switch", + "--no-flake", + "--sudo", + "--build-host", + "user@build-host", + "--target-host", + "user@target-host", + "--no-reexec", + # https://github.com/NixOS/nixpkgs/issues/381457 + "-I", + "nixos-config=./configuration.nix", + "-I", + "nixpkgs=$HOME/.nix-defexpr/channels/pinned_nixpkgs", + ] + ) + + assert mock_run.call_count == 10 + mock_run.assert_has_calls( + [ + call( + [ + "nix-instantiate", + "--find-file", + "nixpkgs", + "--include", + "nixos-config=./configuration.nix", + "--include", + "nixpkgs=$HOME/.nix-defexpr/channels/pinned_nixpkgs", + ], + check=False, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "nix-instantiate", + "", + "--attr", + "config.system.build.toplevel", + "--add-root", + nr.tmpdir.TMPDIR_PATH / "00000000000000000000000000000000", + "--include", + "nixos-config=./configuration.nix", + "--include", + "nixpkgs=$HOME/.nix-defexpr/channels/pinned_nixpkgs", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + ["nix-copy-closure", "--to", "user@build-host", config_path], + check=True, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "ssh", + *nr.process.SSH_DEFAULT_OPTS, + "user@build-host", + "--", + "mktemp", + "-d", + "-t", + "nixos-rebuild.XXXXX", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "ssh", + *nr.process.SSH_DEFAULT_OPTS, + "user@build-host", + "--", + "nix-store", + "--realise", + str(config_path), + "--add-root", + "/tmp/tmpdir/00000000000000000000000000000000", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "ssh", + *nr.process.SSH_DEFAULT_OPTS, + "user@build-host", + "--", + "readlink", + "-f", + "/tmp/tmpdir/config", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "ssh", + *nr.process.SSH_DEFAULT_OPTS, + "user@build-host", + "--", + "rm", + "-rf", + "/tmp/tmpdir", + ], + check=False, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "nix", + "copy", + "--from", + "ssh://user@build-host", + "--to", + "ssh://user@target-host", + config_path, + ], + check=True, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "ssh", + *nr.process.SSH_DEFAULT_OPTS, + "user@target-host", + "--", + "sudo", + "nix-env", + "-p", + "/nix/var/nix/profiles/system", + "--set", + str(config_path), + ], + check=True, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "ssh", + *nr.process.SSH_DEFAULT_OPTS, + "user@target-host", + "--", + "sudo", + "env", + "NIXOS_INSTALL_BOOTLOADER=0", + str(config_path / "bin/switch-to-configuration"), + "switch", + ], + check=True, + **DEFAULT_RUN_KWARGS, + ), + ] + ) + + @patch.dict(nr.process.os.environ, {}, clear=True) @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) @patch(get_qualified_name(nr.cleanup_ssh, nr), autospec=True) @@ -469,7 +666,7 @@ def test_execute_nix_switch_flake_target_host( "sudo", "env", "NIXOS_INSTALL_BOOTLOADER=0", - f"{config_path / 'bin/switch-to-configuration'}", + str(config_path / "bin/switch-to-configuration"), "switch", ], check=True, @@ -493,7 +690,7 @@ def test_execute_nix_switch_flake_build_host( def run_side_effect(args: list[str], **kwargs: Any) -> CompletedProcess[str]: if args[0] == "nix" and "eval" in args: return CompletedProcess([], 0, str(config_path)) - if args[0] == "ssh" and "nix" in args: + elif args[0] == "ssh" and "nix" in args: return CompletedProcess([], 0, str(config_path)) else: return CompletedProcess([], 0) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py index a2bf189ad716..35fea00cbeef 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py @@ -104,7 +104,7 @@ def test_build_remote(mock_uuid4: Any, mock_run: Any, monkeypatch: MonkeyPatch) "config.system.build.toplevel", m.BuildAttr("", "preAttr"), build_host, - build_flags={"build": True}, + realise_flags={"realise": True}, instantiate_flags={"inst": True}, copy_flags={"copy": True}, ) == Path("/path/to/config") @@ -147,7 +147,7 @@ def test_build_remote(mock_uuid4: Any, mock_run: Any, monkeypatch: MonkeyPatch) Path("/path/to/file"), "--add-root", Path("/tmp/tmpdir/00000000000000000000000000000002"), - "--build", + "--realise", ], remote=build_host, stdout=PIPE, From e4e065b719b628b0296236f63354bf41185d5be3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 18:27:40 +0000 Subject: [PATCH 1456/2168] grimblast: 0.1-unstable-2025-01-29 -> 0.1-unstable-2025-02-10 --- pkgs/by-name/gr/grimblast/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gr/grimblast/package.nix b/pkgs/by-name/gr/grimblast/package.nix index 7252d1a96951..b7ced95956d1 100644 --- a/pkgs/by-name/gr/grimblast/package.nix +++ b/pkgs/by-name/gr/grimblast/package.nix @@ -18,13 +18,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "grimblast"; - version = "0.1-unstable-2025-01-29"; + version = "0.1-unstable-2025-02-10"; src = fetchFromGitHub { owner = "hyprwm"; repo = "contrib"; - rev = "d449f6e1fc31084437ebc0c45057ee656f593efd"; - hash = "sha256-8ytokHHcKusbspRaiGP38s7fHU105JRvO9GRTzcRklg="; + rev = "8724de5851da5cdb1ab8a913a664d004c1e26368"; + hash = "sha256-DUqU/X18hBRH/yB56ijTdtshX/+qchQR6XU+Xp5Z+l0="; }; strictDeps = true; From eb75114522c38cdb28268d212d81119cfaccb098 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 18:28:41 +0000 Subject: [PATCH 1457/2168] python312Packages.rclone-python: 0.1.20 -> 0.1.21 --- pkgs/development/python-modules/rclone-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rclone-python/default.nix b/pkgs/development/python-modules/rclone-python/default.nix index fed23e85c3a0..6d0a508c3fc2 100644 --- a/pkgs/development/python-modules/rclone-python/default.nix +++ b/pkgs/development/python-modules/rclone-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "rclone-python"; - version = "0.1.20"; + version = "0.1.21"; pyproject = true; src = fetchFromGitHub { owner = "Johannes11833"; repo = "rclone_python"; tag = "v${version}"; - hash = "sha256-TGSASkvlh4ku7gZ7JhKX5yEKgSZp5VDyNz962gG6Lk0="; + hash = "sha256-lYrPSDBWGVQmT2/MgzbtZ6hHNZXINCmmFP+ZHFZQDw8="; }; build-system = [ setuptools ]; From 8442e980a9861ef1ffaf48ec3365ad017872bda6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 18:32:05 +0000 Subject: [PATCH 1458/2168] remind: 05.02.03 -> 05.03.01 --- pkgs/by-name/re/remind/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/remind/package.nix b/pkgs/by-name/re/remind/package.nix index 35ae4e26e132..d71b8867667d 100644 --- a/pkgs/by-name/re/remind/package.nix +++ b/pkgs/by-name/re/remind/package.nix @@ -16,14 +16,14 @@ tcl.mkTclDerivation rec { pname = "remind"; - version = "05.02.03"; + version = "05.03.01"; src = fetchFromGitea { domain = "git.skoll.ca"; owner = "Skollsoft-Public"; repo = "Remind"; rev = version; - hash = "sha256-4OKLBY5OcaUaSsxbOUN1b9LeUqj0rYBWsZNJ70DvcrQ="; + hash = "sha256-hthr6BELNGnFd1JB+fA10FYIsy8Cs9pPs6J4yOfy+d0="; }; propagatedBuildInputs = lib.optionals withGui [ From 4e1dd62cc9d6c71cdd6a0167b9dc02fc2c7e99a2 Mon Sep 17 00:00:00 2001 From: "j.r" Date: Wed, 12 Feb 2025 19:43:12 +0100 Subject: [PATCH 1459/2168] gotosocial: 0.17.3 -> 0.17.4 Version 0.17.4 fixes a severe security issue, see https://gts.superseriousbusiness.org/@gotosocial/statuses/01JKXJPCK9XZ7NKDVBTYRJNNNE --- pkgs/by-name/go/gotosocial/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/gotosocial/package.nix b/pkgs/by-name/go/gotosocial/package.nix index da157305bb37..9bc64a89725f 100644 --- a/pkgs/by-name/go/gotosocial/package.nix +++ b/pkgs/by-name/go/gotosocial/package.nix @@ -9,11 +9,11 @@ let owner = "superseriousbusiness"; repo = "gotosocial"; - version = "0.17.3"; + version = "0.17.4"; web-assets = fetchurl { url = "https://github.com/${owner}/${repo}/releases/download/v${version}/${repo}_${version}_web-assets.tar.gz"; - hash = "sha256-85CmcWjcX8a+hZxkyRTfXErmkIx64R2scaaS2Fpf668"; + hash = "sha256-esip1xGB0NroYRlKLNEs/o3J2G2nQyOIZTdDpVuY5Ag="; }; in buildGoModule rec { @@ -23,7 +23,7 @@ buildGoModule rec { src = fetchFromGitHub { inherit owner repo; tag = "v${version}"; - hash = "sha256-ql0tDaMc/1NgsLUpPHZB6GoXJj9DwUpadTX3AYufR/o="; + hash = "sha256-OikJkTc2UK74eGy8AjEAk8cyRL57QReM0J6tXr9EAjw="; }; vendorHash = null; From 40f9597859616a590342cb96f1859bc195d17ec9 Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Sat, 8 Feb 2025 18:04:00 +0100 Subject: [PATCH 1460/2168] zoom-us: add simple test This test starts zoom with an Xvfb X server and verifies that the "Zoom Workplace" window is created. zoom is started with `prlimit` to avoid problems like https://github.com/NixOS/nixpkgs/issues/371488 . Note: During my experiments, it turned out that if certain libraries are missing (I don't recall which ones), then zoom still opens its Workplace window, then immediatelly closes it again. To reduce the likelihood of the test passing in that scenario, another "sleep 20" is included. --- pkgs/by-name/zo/zoom-us/package.nix | 2 ++ pkgs/by-name/zo/zoom-us/test.nix | 44 +++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 pkgs/by-name/zo/zoom-us/test.nix diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix index 7cc46715e99c..96419e7ad8b9 100644 --- a/pkgs/by-name/zo/zoom-us/package.nix +++ b/pkgs/by-name/zo/zoom-us/package.nix @@ -40,6 +40,7 @@ pulseaudioSupport ? true, libpulseaudio, pulseaudio, + callPackage, }: let @@ -220,6 +221,7 @@ stdenv.mkDerivation { dontPatchELF = true; passthru.updateScript = ./update.sh; + passthru.tests.startwindow = callPackage ./test.nix { }; meta = with lib; { homepage = "https://zoom.us/"; diff --git a/pkgs/by-name/zo/zoom-us/test.nix b/pkgs/by-name/zo/zoom-us/test.nix new file mode 100644 index 000000000000..98ededc27563 --- /dev/null +++ b/pkgs/by-name/zo/zoom-us/test.nix @@ -0,0 +1,44 @@ +{ + lib, + xvfb-run, + zoom-us, + runCommand, + writeShellApplication, + xorg, +}: + +let + testScript = writeShellApplication { + name = "zoom-us-test-script"; + runtimeInputs = [ + xorg.xwininfo + zoom-us + ]; + text = '' + function is_zoom_window_present { + echo + xwininfo -root -tree \ + | sed 's/.*0x[0-9a-f]* \"\([^\"]*\)\".*/\1/; t; d' \ + | tee window-names + grep -q "Zoom Workplace" window-names + } + # don't let zoom eat all RAM, like it did + # https://github.com/NixOS/nixpkgs/issues/371488 + prlimit --{as,data}=$((4*2**30)):$((4*2**30)) zoom-us & + for _ in {0..900} ; do + if is_zoom_window_present ; then + break + fi + sleep 1 + done + # if libraries are missing, the window still appears, + # but disappears again immediatelly; check for that too: + sleep 20 + is_zoom_window_present + ''; + }; +in +runCommand "zoom-us-test" { buildInputs = [ xvfb-run ]; } '' + HOME=$PWD xvfb-run ${lib.getExe testScript} + touch ${placeholder "out"} +'' From e08317b18d899402db370f6d8a7c16baf2f68be7 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Mon, 6 Jan 2025 00:14:39 +0000 Subject: [PATCH 1461/2168] openbsd.reboot: init --- pkgs/os-specific/bsd/openbsd/pkgs/reboot.nix | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/reboot.nix diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/reboot.nix b/pkgs/os-specific/bsd/openbsd/pkgs/reboot.nix new file mode 100644 index 000000000000..946f8427b87a --- /dev/null +++ b/pkgs/os-specific/bsd/openbsd/pkgs/reboot.nix @@ -0,0 +1,4 @@ +{ mkDerivation }: +mkDerivation { + path = "sbin/reboot"; +} From f3f5493bce5467e1c22b664d94ca38f85509b6cf Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Mon, 6 Jan 2025 00:17:10 +0000 Subject: [PATCH 1462/2168] openbsd.wall: init --- pkgs/os-specific/bsd/openbsd/pkgs/wall.nix | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/wall.nix diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/wall.nix b/pkgs/os-specific/bsd/openbsd/pkgs/wall.nix new file mode 100644 index 000000000000..a579efb9a8d5 --- /dev/null +++ b/pkgs/os-specific/bsd/openbsd/pkgs/wall.nix @@ -0,0 +1,9 @@ +{ mkDerivation }: +mkDerivation { + path = "usr.bin/wall"; + + postPatch = '' + sed -i /BINMODE/d $BSDSRCDIR/usr.bin/wall/Makefile + sed -i /BINGRP/d $BSDSRCDIR/usr.bin/wall/Makefile + ''; +} From cd0f0637025118e47c9b2db9eb6eb765c23a2372 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Mon, 6 Jan 2025 00:21:21 +0000 Subject: [PATCH 1463/2168] openbsd.shutdown: Set paths for halt, reboot, wall --- pkgs/os-specific/bsd/openbsd/pkgs/shutdown.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/shutdown.nix b/pkgs/os-specific/bsd/openbsd/pkgs/shutdown.nix index 15c602455866..7dd7125a8823 100644 --- a/pkgs/os-specific/bsd/openbsd/pkgs/shutdown.nix +++ b/pkgs/os-specific/bsd/openbsd/pkgs/shutdown.nix @@ -1,8 +1,17 @@ -{ mkDerivation }: +{ + mkDerivation, + reboot, + wall, +}: mkDerivation { path = "sbin/shutdown"; - preBuild = '' - sed -i 's/4550/0550/' Makefile + postPatch = '' + sed -i 's/4550/0550/' $BSDSRCDIR/sbin/shutdown/Makefile + + substituteInPlace $BSDSRCDIR/sbin/shutdown/pathnames.h \ + --replace-fail /sbin/halt ${reboot}/bin/halt \ + --replace-fail /sbin/reboot ${reboot}/bin/reboot \ + --replace-fail /usr/bin/wall ${wall}/bin/wall ''; } From 835eed699a89ffa19aeda0afeb17d15a54fe1c0c Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 12 Feb 2025 22:14:21 +0300 Subject: [PATCH 1464/2168] path-of-building.data: 2.49.2 -> 2.50.0 Diff: https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.49.2...v2.50.0 --- pkgs/games/path-of-building/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/path-of-building/default.nix b/pkgs/games/path-of-building/default.nix index 3c946a1548b3..0b872870022c 100644 --- a/pkgs/games/path-of-building/default.nix +++ b/pkgs/games/path-of-building/default.nix @@ -17,13 +17,13 @@ let data = stdenv.mkDerivation (finalAttrs: { pname = "path-of-building-data"; - version = "2.49.2"; + version = "2.50.0"; src = fetchFromGitHub { owner = "PathOfBuildingCommunity"; repo = "PathOfBuilding"; rev = "v${finalAttrs.version}"; - hash = "sha256-rxvReL2ofdaQdKmIg2lMDT0thN1IkeJMf1B7+HWlQaI="; + hash = "sha256-mclbLRYFNWgn/f4CyaINJlLq06uWh0+ks82Lger4w9w="; }; nativeBuildInputs = [ unzip ]; From 42f41dba33db2dd3fc74e7493a47125e99ed790f Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 12 Feb 2025 22:23:09 +0300 Subject: [PATCH 1465/2168] kdePackages.kwin: backport patch recommended by upstream --- pkgs/kde/plasma/kwin/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/kde/plasma/kwin/default.nix b/pkgs/kde/plasma/kwin/default.nix index 0d78ac721cf2..97906adebdfb 100644 --- a/pkgs/kde/plasma/kwin/default.nix +++ b/pkgs/kde/plasma/kwin/default.nix @@ -1,5 +1,6 @@ { mkKdeDerivation, + fetchpatch, pkg-config, qtquick3d, qtsensors, @@ -29,6 +30,13 @@ mkKdeDerivation { ./0003-plugins-qpa-allow-using-nixos-wrapper.patch ./0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch ./0001-Lower-CAP_SYS_NICE-from-the-ambient-set.patch + + # Backport recommended crash fix + # FIXME: remove in 6.3.1 + (fetchpatch { + url = "https://invent.kde.org/plasma/kwin/-/commit/c97bc26ca9de8b1462f6ccb05fb2dafe01cd82cb.patch"; + hash = "sha256-g8CsSKt3flTXAm80NbFuq+sT8l93mfyUBl2aBpP5zqY="; + }) ]; postPatch = '' From a4a3b20f20909ef755139541b7d9609db8aa6ef0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Wed, 12 Feb 2025 20:16:44 +0100 Subject: [PATCH 1466/2168] ansible_2_16: fix build the setuptools version restriction doesn't exist in 2_16 removed patch as it breaks the build --- pkgs/top-level/all-packages.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78a1272fc905..133f5159410b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7465,6 +7465,13 @@ with pkgs; inherit version; hash = "sha256-WeSqQO1azbTvm789BYkY//k/ZqFJNz2BWciilgRBC9o="; }; + + postPatch = '' + substituteInPlace lib/ansible/executor/task_executor.py \ + --replace "[python," "[" + + patchShebangs --build packaging/cli-doc/build.py + ''; })); ansible-builder = with python3Packages; toPythonApplication ansible-builder; From 7b30dbddcc6ebe592a8895d365c305b2d0b0daa3 Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Wed, 12 Feb 2025 20:23:54 +0100 Subject: [PATCH 1467/2168] zoom-us: provide pipewire program to fix error message Without `pipewire` being in PATH, zoom complains > sh: pipewire: not found --- pkgs/by-name/zo/zoom-us/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix index 96419e7ad8b9..24308f72809e 100644 --- a/pkgs/by-name/zo/zoom-us/package.nix +++ b/pkgs/by-name/zo/zoom-us/package.nix @@ -123,6 +123,7 @@ let coreutils glib.dev pciutils + pipewire procps util-linux ] From 8c0cd03d07938fd318c24160425b54942d13cc33 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 08:18:09 +0000 Subject: [PATCH 1468/2168] python312Packages.spacy-transformers: 1.3.6 -> 1.3.8 --- .../python-modules/spacy-transformers/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/spacy-transformers/default.nix b/pkgs/development/python-modules/spacy-transformers/default.nix index 8254b415a4bd..8c3b63f2a738 100644 --- a/pkgs/development/python-modules/spacy-transformers/default.nix +++ b/pkgs/development/python-modules/spacy-transformers/default.nix @@ -17,16 +17,16 @@ buildPythonPackage rec { pname = "spacy-transformers"; - version = "1.3.6"; + version = "1.3.8"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "explosion"; repo = "spacy-transformers"; tag = "release-v${version}"; - hash = "sha256-VZEx7mDTqcJ7c0qqDYc3GZzesqi/MwJawAZDUGdXMB0="; + hash = "sha256-VhFF+cbZL+sod1t4fqyVDEDdGHXqVJsOGUj81EErdMA="; }; build-system = [ @@ -54,11 +54,11 @@ buildPythonPackage rec { passthru.tests.annotation = callPackage ./annotation-test { }; - meta = with lib; { + meta = { description = "spaCy pipelines for pretrained BERT, XLNet and GPT-2"; homepage = "https://github.com/explosion/spacy-transformers"; - changelog = "https://github.com/explosion/spacy-transformers/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ nickcao ]; + changelog = "https://github.com/explosion/spacy-transformers/releases/tag/${src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ nickcao ]; }; } From 3f58227a38fa6f3931ef82541572123dc49958f6 Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Sat, 8 Feb 2025 17:22:54 +0100 Subject: [PATCH 1469/2168] zoom-us (x86-64): don't touch the core `zoom` binary Without the commit at hand, zoom-us stops working and instead simply maxes out RAM when updated from version 6.2.11.5069 to version 6.3.0.5527 . https://github.com/NixOS/nixpkgs/issues/371488 Some experimenting yielded these observations regarding newer (problematic) zoom-us versions on NixOS: * They still work if started via flatpak (which creates a virtual FHS-compatible environment) * They still work if started with `buildFHSEnv` with all libraries provided in `multiPkgs`. * They still work if the unmodified zoom binary is started by manually invoking the `ld-linux` elf interpreter. However, this again requires that libraries are available via `LD_PRELOAD_PATH`. It seems very much that the `patchelf --set-interpreter` call on the `zoom` binary breaks something inside the binary. The commit at hand removes `zoom` from the list of binaries that are to be patched. To ensure that program can still be executed, the `makeWrapper` call (which is already there to wrap `zoom`) is extended such that is explicitely uses the elf interpreter. Unfortunatelly, when zoom tries to find its data files (e.g. ring tones), it determines its data directory by looking at `/proc/self/exe`. If we start zoom by calling the elf interpreter, `/proc/self/exe` acutally points to that interpreter. The only solution is to copy the interpreter into the zoom data directory (a symlink isn't enough here). --- pkgs/by-name/zo/zoom-us/package.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix index 24308f72809e..33841a2b01f4 100644 --- a/pkgs/by-name/zo/zoom-us/package.nix +++ b/pkgs/by-name/zo/zoom-us/package.nix @@ -181,7 +181,7 @@ stdenv.mkDerivation { substituteInPlace $out/share/applications/Zoom.desktop \ --replace-fail "Exec=/usr/bin/zoom" "Exec=$out/bin/zoom" - for i in aomhost zopen zoom ZoomLauncher ZoomWebviewHost; do + for i in aomhost zopen ZoomLauncher ZoomWebviewHost; do if [ -f $out/opt/zoom/$i ]; then patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/opt/zoom/$i fi @@ -189,8 +189,14 @@ stdenv.mkDerivation { # ZoomLauncher sets LD_LIBRARY_PATH before execing zoom # IPC breaks if the executable name does not end in 'zoom' + # zoom binary does not like being touched by patchelf + # => we call it indirectly via the dynamic linker + # zoom binary inspects /proc/self/exe to find its data files + # => we must place a copy (not symlink) of the linker in zoom's data dir mv $out/opt/zoom/zoom $out/opt/zoom/.zoom - makeWrapper $out/opt/zoom/.zoom $out/opt/zoom/zoom \ + cp "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/opt/zoom/ld.so + makeWrapper $out/opt/zoom/ld.so $out/opt/zoom/zoom \ + --add-flags $out/opt/zoom/.zoom \ --prefix LD_LIBRARY_PATH ":" ${libs} rm $out/bin/zoom From 4357610c85ccd36a3b7f0450e7332e70104d21a8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Jan 2025 00:10:42 +0000 Subject: [PATCH 1470/2168] zoom-us: 6.2.11.5069 -> 6.3.6.6315 --- pkgs/by-name/zo/zoom-us/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix index 33841a2b01f4..828afbbbd62b 100644 --- a/pkgs/by-name/zo/zoom-us/package.nix +++ b/pkgs/by-name/zo/zoom-us/package.nix @@ -51,23 +51,23 @@ let # and often with different versions. We write them on three lines # like this (rather than using {}) so that the updater script can # find where to edit them. - versions.aarch64-darwin = "6.3.1.45300"; - versions.x86_64-darwin = "6.3.1.45300"; - versions.x86_64-linux = "6.2.11.5069"; + versions.aarch64-darwin = "6.3.6.47101"; + versions.x86_64-darwin = "6.3.6.47101"; + versions.x86_64-linux = "6.3.6.6315"; srcs = { aarch64-darwin = fetchurl { url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; name = "zoomusInstallerFull.pkg"; - hash = "sha256-WPhqYof/XR6TDkuA4NK2a30ksdhN7NBfs4KCQwqKJ0g="; + hash = "sha256-tqDf3Z5RRf4aRvtINWdM3oppZXbDdtihhPBHu4QxzDM="; }; x86_64-darwin = fetchurl { url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-BywBvJCcNXARHTkO/UJbOFRjuiXRkmFWmSuZsW9t1pk="; + hash = "sha256-BZkBx5eZ3c3p9JIz+ChyJrGM12HwyNToSuS86f9QnF0="; }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-k8T/lmfgAFxW1nwEyh61lagrlHP5geT2tA7e5j61+qw="; + hash = "sha256-QJR8SsMtyYBvd5G+mEjEEISkJJukCYeHErKrgs1uDQc="; }; }; From 8358ae9852fc89176d362b555a345a5676df7a13 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 19:28:51 +0000 Subject: [PATCH 1471/2168] python312Packages.llama-index-llms-ollama: 0.5.0 -> 0.5.2 --- .../python-modules/llama-index-llms-ollama/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-llms-ollama/default.nix b/pkgs/development/python-modules/llama-index-llms-ollama/default.nix index 4cd284af9199..056517653663 100644 --- a/pkgs/development/python-modules/llama-index-llms-ollama/default.nix +++ b/pkgs/development/python-modules/llama-index-llms-ollama/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-llms-ollama"; - version = "0.5.0"; + version = "0.5.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_llms_ollama"; inherit version; - hash = "sha256-88DaBPhUB5Az7jwbER4JdFYAW5o4Z+1LtJuNKOSg8zY="; + hash = "sha256-hhno+/neUXbbW7oN/3ENAnYh85q5oUskRHHMQBQHU40="; }; build-system = [ poetry-core ]; From f47cb5ab347006fa03bc87d8a76e242acbbcb73c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Wed, 12 Feb 2025 20:31:56 +0100 Subject: [PATCH 1472/2168] ansible_2_17: use correct version --- pkgs/top-level/all-packages.nix | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 133f5159410b..74a0806edebc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7457,8 +7457,25 @@ with pkgs; anybadge = with python3Packages; toPythonApplication anybadge; - ansible = ansible_2_17; - ansible_2_17 = python3Packages.toPythonApplication python3Packages.ansible-core; + ansible = ansible_2_18; + ansible_2_18 = python3Packages.toPythonApplication python3Packages.ansible-core; + ansible_2_17 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec { + version = "2.17.8"; + src = oldAttrs.src.override { + inherit version; + hash = "sha256-Ob6KeYaix9NgabDZciC8L2eDxl/qfG1+Di0A0ayK+Hc="; + }; + + postPatch = '' + substituteInPlace lib/ansible/executor/task_executor.py \ + --replace "[python," "[" + + patchShebangs --build packaging/cli-doc/build.py + + substituteInPlace pyproject.toml \ + --replace-fail "setuptools >= 66.1.0, <= 75.8.0" setuptools + ''; + })); ansible_2_16 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec { version = "2.16.8"; src = oldAttrs.src.override { From 38000bd86b983bc492deb7ecdfe8cc87affa8729 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 12 Feb 2025 22:38:35 +0300 Subject: [PATCH 1473/2168] path-of-building: fix missing dependency --- pkgs/games/path-of-building/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/path-of-building/default.nix b/pkgs/games/path-of-building/default.nix index 0b872870022c..1e30bcc831fe 100644 --- a/pkgs/games/path-of-building/default.nix +++ b/pkgs/games/path-of-building/default.nix @@ -70,6 +70,7 @@ stdenv.mkDerivation { qtbase luajit luajit.pkgs.lua-curl + luajit.pkgs.luautf8 ]; installPhase = '' From 93d420de32cf12a52f9a519319daf0323ed6a0d7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 Feb 2025 20:49:00 +0100 Subject: [PATCH 1474/2168] flexoptix-app: update hash for udev rules --- pkgs/by-name/fl/flexoptix-app/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/fl/flexoptix-app/package.nix b/pkgs/by-name/fl/flexoptix-app/package.nix index 930be1b6d497..402f7cc52d0c 100644 --- a/pkgs/by-name/fl/flexoptix-app/package.nix +++ b/pkgs/by-name/fl/flexoptix-app/package.nix @@ -16,7 +16,7 @@ let udevRules = fetchurl { url = "https://www.flexoptix.net/static/frontend/Flexoptix/default/en_US/files/99-tprogrammer.rules"; - hash = "sha256-OZe5dV50xq99olImbo7JQxPjRd7hGyBIVwFvtR9cIVc="; + hash = "sha256-faowRYdrk88WUpOpaEfedzybBgxVRZhvAaYP9HAuzAE="; }; appimageContents = (appimageTools.extract { inherit pname version src; }).overrideAttrs (oA: { From 4185cf8ade72351e14152de9027a4634232f4512 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:15:54 -0500 Subject: [PATCH 1475/2168] nixos/mchprs: fix documentation link formatting --- nixos/modules/services/games/mchprs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/games/mchprs.nix b/nixos/modules/services/games/mchprs.nix index 53d070327fd4..cb59aa089f58 100644 --- a/nixos/modules/services/games/mchprs.nix +++ b/nixos/modules/services/games/mchprs.nix @@ -78,7 +78,7 @@ in Automatically restart the server after {option}`services.mchprs.maxRuntime`. The time span format is described here: - https://www.freedesktop.org/software/systemd/man/systemd.time.html#Parsing%20Time%20Spans. + . If `null`, then the server is not restarted automatically. ''; }; From 0bf7fb12184d7eafe561110d816af40feaf1e001 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:16:03 -0500 Subject: [PATCH 1476/2168] nixos/asusd: fix documentation link formatting --- nixos/modules/services/hardware/asusd.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/hardware/asusd.nix b/nixos/modules/services/hardware/asusd.nix index 07b39bce64f4..fccb0c04a5d7 100644 --- a/nixos/modules/services/hardware/asusd.nix +++ b/nixos/modules/services/hardware/asusd.nix @@ -64,7 +64,7 @@ in default = null; description = '' The content of /etc/asusd/anime.ron. - See https://asus-linux.org/asusctl/#anime-control. + See . ''; }; @@ -73,7 +73,7 @@ in default = null; description = '' The content of /etc/asusd/asusd.ron. - See https://asus-linux.org/asusctl/. + See . ''; }; @@ -82,7 +82,7 @@ in default = { }; description = '' The content of /etc/asusd/aura_.ron. - See https://asus-linux.org/asusctl/#led-keyboard-control. + See . ''; }; @@ -91,7 +91,7 @@ in default = null; description = '' The content of /etc/asusd/profile.ron. - See https://asus-linux.org/asusctl/#profiles. + See . ''; }; @@ -100,7 +100,7 @@ in default = null; description = '' The content of /etc/asusd/fan_curves.ron. - See https://asus-linux.org/asusctl/#fan-curves. + See . ''; }; @@ -109,7 +109,7 @@ in default = null; description = '' The content of /etc/asusd/asusd-user-ledmodes.ron. - See https://asus-linux.org/asusctl/#led-keyboard-control. + See . ''; }; }; From 48be34d02dd1f54bf757aeea823598ea87910c81 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:16:18 -0500 Subject: [PATCH 1477/2168] nixos/display: fix documentation link formatting --- nixos/modules/services/hardware/display.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/hardware/display.nix b/nixos/modules/services/hardware/display.nix index 9aeb9d8fab09..29e205c81de9 100644 --- a/nixos/modules/services/hardware/display.nix +++ b/nixos/modules/services/hardware/display.nix @@ -63,7 +63,7 @@ in type = with lib.types; attrsOf (listOf str); default = { }; description = '' - Exposes EDID files from users-sourced database at https://github.com/linuxhw/EDID + Exposes EDID files from users-sourced database at Attribute names will be mapped to EDID filenames `.bin`. @@ -100,7 +100,7 @@ in Attribute set of XFree86 Modelines automatically converted and exposed as `edid/.bin` files in initrd. See for more information: - - https://en.wikipedia.org/wiki/XFree86_Modeline + - ''; example = lib.literalExpression '' { From c5a30a0de7ccba4e825d62b5a0e1c56897b3d0f0 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:16:29 -0500 Subject: [PATCH 1478/2168] nixos/supergfxd: fix documentation link formatting --- nixos/modules/services/hardware/supergfxd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/hardware/supergfxd.nix b/nixos/modules/services/hardware/supergfxd.nix index dd571b4fa546..136b78d0f77b 100644 --- a/nixos/modules/services/hardware/supergfxd.nix +++ b/nixos/modules/services/hardware/supergfxd.nix @@ -19,7 +19,7 @@ in default = null; description = '' The content of /etc/supergfxd.conf. - See https://gitlab.com/asus-linux/supergfxctl/#config-options-etcsupergfxdconf. + See . ''; }; }; From 1d57cecb746646fdb7584454c3bf778f0007faf0 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:16:33 -0500 Subject: [PATCH 1479/2168] nixos/evcc: fix documentation link formatting --- nixos/modules/services/home-automation/evcc.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/home-automation/evcc.nix b/nixos/modules/services/home-automation/evcc.nix index df64f99f5b02..2a82b21bb580 100644 --- a/nixos/modules/services/home-automation/evcc.nix +++ b/nixos/modules/services/home-automation/evcc.nix @@ -32,7 +32,7 @@ in description = '' evcc configuration as a Nix attribute set. - Check for possible options in the sample [evcc.dist.yaml](https://github.com/andig/evcc/blob/${package.version}/evcc.dist.yaml]. + Check for possible options in the sample [evcc.dist.yaml](https://github.com/andig/evcc/blob/${package.version}/evcc.dist.yaml). ''; }; }; From 52bab06cd005544f81c363720ccb8f8d7b64db55 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:16:40 -0500 Subject: [PATCH 1480/2168] nixos/sourcehut: fix documentation link formatting --- nixos/modules/services/misc/sourcehut/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/sourcehut/default.nix b/nixos/modules/services/misc/sourcehut/default.nix index ebce033fd55c..e9178d153b9e 100644 --- a/nixos/modules/services/misc/sourcehut/default.nix +++ b/nixos/modules/services/misc/sourcehut/default.nix @@ -613,11 +613,11 @@ in }; options."meta.sr.ht::billing" = { enabled = mkEnableOption "the billing system"; - stripe-public-key = mkOptionNullOrStr "Public key for Stripe. Get your keys at https://dashboard.stripe.com/account/apikeys"; + stripe-public-key = mkOptionNullOrStr "Public key for Stripe. Get your keys at "; stripe-secret-key = mkOptionNullOrStr '' An absolute file path (which should be outside the Nix-store) - to a secret key for Stripe. Get your keys at https://dashboard.stripe.com/account/apikeys + to a secret key for Stripe. Get your keys at '' // { apply = mapNullable (s: "<" + toString s); From d1905f4a064e6df9f836b3f087cf4d2b07b74868 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:16:44 -0500 Subject: [PATCH 1481/2168] nixos/bepasty: fix documentation link formatting --- nixos/modules/services/misc/bepasty.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/bepasty.nix b/nixos/modules/services/misc/bepasty.nix index d890fe507ae7..b9ab598d93dd 100644 --- a/nixos/modules/services/misc/bepasty.nix +++ b/nixos/modules/services/misc/bepasty.nix @@ -64,7 +64,7 @@ in description = '' Extra configuration for bepasty server to be appended on the configuration. - see https://bepasty-server.readthedocs.org/en/latest/quickstart.html#configuring-bepasty + see for all options. ''; default = ""; From d3f92fba7f20aca0a32b1d8ed819bdfbf87cecea Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:16:50 -0500 Subject: [PATCH 1482/2168] nixos/dysnomia: fix documentation link formatting --- nixos/modules/services/misc/dysnomia.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/dysnomia.nix b/nixos/modules/services/misc/dysnomia.nix index 8d96f4264ede..d9e774822593 100644 --- a/nixos/modules/services/misc/dysnomia.nix +++ b/nixos/modules/services/misc/dysnomia.nix @@ -195,7 +195,7 @@ in modules for compatibility reasons! If you rely on these modules, consider migrating to better alternatives. - More information: https://raw.githubusercontent.com/svanderburg/dysnomia/f65a9a84827bcc4024d6b16527098b33b02e4054/README-legacy.md + More information: If you have migrated already or don't rely on these Dysnomia modules, you can disable legacy mode with the following NixOS configuration option: From 44f86c533107ffa20526b33886ba265decc364a9 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:16:55 -0500 Subject: [PATCH 1483/2168] nixos/gitlab: fix documentation link formatting --- nixos/modules/services/misc/gitlab.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 6acc2a6f6987..3e345f69d50a 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -644,7 +644,7 @@ in { authentication = mkOption { type = with types; nullOr str; default = null; - description = "Authentication type to use, see http://api.rubyonrails.org/classes/ActionMailer/Base.html"; + description = "Authentication type to use, see "; }; enableStartTLSAuto = mkOption { @@ -662,7 +662,7 @@ in { opensslVerifyMode = mkOption { type = types.str; default = "peer"; - description = "How OpenSSL checks the certificate, see http://api.rubyonrails.org/classes/ActionMailer/Base.html"; + description = "How OpenSSL checks the certificate, see "; }; }; From 28b67e4c43bf146bfe652169a24acde889f80d90 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:16:59 -0500 Subject: [PATCH 1484/2168] nixos/homepage-dashboard: fix documentation link formatting --- .../services/misc/homepage-dashboard.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/misc/homepage-dashboard.nix b/nixos/modules/services/misc/homepage-dashboard.nix index d4f601700ad3..db21a57989ad 100644 --- a/nixos/modules/services/misc/homepage-dashboard.nix +++ b/nixos/modules/services/misc/homepage-dashboard.nix @@ -38,7 +38,7 @@ in See the upstream documentation: - https://gethomepage.dev/installation/docker/#using-environment-secrets + ''; default = ""; }; @@ -48,7 +48,7 @@ in description = '' Custom CSS for styling Homepage. - See https://gethomepage.dev/configs/custom-css-js/. + See . ''; default = ""; }; @@ -58,7 +58,7 @@ in description = '' Custom Javascript for Homepage. - See https://gethomepage.dev/configs/custom-css-js/. + See . ''; default = ""; }; @@ -68,7 +68,7 @@ in description = '' Homepage bookmarks configuration. - See https://gethomepage.dev/configs/bookmarks/. + See . ''; # Defaults: https://github.com/gethomepage/homepage/blob/main/src/skeleton/bookmarks.yaml example = [ @@ -105,7 +105,7 @@ in description = '' Homepage services configuration. - See https://gethomepage.dev/configs/services/. + See . ''; # Defaults: https://github.com/gethomepage/homepage/blob/main/src/skeleton/services.yaml example = [ @@ -138,7 +138,7 @@ in description = '' Homepage widgets configuration. - See https://gethomepage.dev/widgets/. + See . ''; # Defaults: https://github.com/gethomepage/homepage/blob/main/src/skeleton/widgets.yaml example = [ @@ -164,7 +164,7 @@ in description = '' Homepage kubernetes configuration. - See https://gethomepage.dev/configs/kubernetes/. + See . ''; default = { }; }; @@ -174,7 +174,7 @@ in description = '' Homepage docker configuration. - See https://gethomepage.dev/configs/docker/. + See . ''; default = { }; }; @@ -184,7 +184,7 @@ in description = '' Homepage settings. - See https://gethomepage.dev/configs/settings/. + See . ''; # Defaults: https://github.com/gethomepage/homepage/blob/main/src/skeleton/settings.yaml default = { }; From 6e62a2703ac77f006c1131f0b7403193ac21d047 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:17:16 -0500 Subject: [PATCH 1485/2168] nixos/input-remapper: fix documentation link formatting --- nixos/modules/services/misc/input-remapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/input-remapper.nix b/nixos/modules/services/misc/input-remapper.nix index 9ab41547705a..4908abd0bd40 100644 --- a/nixos/modules/services/misc/input-remapper.nix +++ b/nixos/modules/services/misc/input-remapper.nix @@ -12,7 +12,7 @@ in services.input-remapper = { enable = lib.mkEnableOption "input-remapper, an easy to use tool to change the mapping of your input device buttons"; package = lib.mkPackageOption pkgs "input-remapper" { }; - enableUdevRules = lib.mkEnableOption "udev rules added by input-remapper to handle hotplugged devices. Currently disabled by default due to https://github.com/sezanzeb/input-remapper/issues/140"; + enableUdevRules = lib.mkEnableOption "udev rules added by input-remapper to handle hotplugged devices. Currently disabled by default due to "; serviceWantedBy = lib.mkOption { default = [ "graphical.target" ]; example = [ "multi-user.target" ]; From d8e1beecaaa33f854863982f25a789e9c8810369 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:17:24 -0500 Subject: [PATCH 1486/2168] nixos/invidious-router: fix documentation link formatting --- nixos/modules/services/misc/invidious-router.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/invidious-router.nix b/nixos/modules/services/misc/invidious-router.nix index 0300d1190f6b..f28538981e27 100644 --- a/nixos/modules/services/misc/invidious-router.nix +++ b/nixos/modules/services/misc/invidious-router.nix @@ -66,7 +66,7 @@ in }; description = '' Configuration for invidious-router. - Check https://gitlab.com/gaincoder/invidious-router#configuration + Check for configuration options. ''; }; From 61a15a28f90d65ba8fe037803b680bf7999fe1ab Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:17:29 -0500 Subject: [PATCH 1487/2168] nixos/languagetool: fix documentation link formatting --- nixos/modules/services/misc/languagetool.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/languagetool.nix b/nixos/modules/services/misc/languagetool.nix index feb2d0d90f9d..938a937af6c4 100644 --- a/nixos/modules/services/misc/languagetool.nix +++ b/nixos/modules/services/misc/languagetool.nix @@ -60,7 +60,7 @@ in jvmOptions = lib.mkOption { description = '' Extra command line options for the JVM running languagetool. - More information can be found here: https://docs.oracle.com/en/java/javase/19/docs/specs/man/java.html#standard-options-for-java + More information can be found here: ''; default = [ ]; type = lib.types.listOf lib.types.str; From 612dc95881490057e3c041a401d1950d7dde2072 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:18:22 -0500 Subject: [PATCH 1488/2168] nixos/nitter: fix documentation link formatting --- nixos/modules/services/misc/nitter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/nitter.nix b/nixos/modules/services/misc/nitter.nix index 65aea391bcb5..39aa069936f1 100644 --- a/nixos/modules/services/misc/nitter.nix +++ b/nixos/modules/services/misc/nitter.nix @@ -318,7 +318,7 @@ in Add settings here to override NixOS module generated settings. Check the official repository for the available settings: - https://github.com/zedeus/nitter/blob/master/nitter.example.conf + ''; }; @@ -334,7 +334,7 @@ in {"oauth_token":"some_token","oauth_token_secret":"some_secret_key"} - See https://github.com/zedeus/nitter/wiki/Guest-Account-Branch-Deployment + See for more information on guest accounts and how to generate them. ''; }; From 32579269a42496872c1e51f3b52637cc65a69068 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:18:26 -0500 Subject: [PATCH 1489/2168] nixos/ollama: fix documentation link formatting --- nixos/modules/services/misc/ollama.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/ollama.nix b/nixos/modules/services/misc/ollama.nix index b26d5b37002d..9fd876ec5869 100644 --- a/nixos/modules/services/misc/ollama.nix +++ b/nixos/modules/services/misc/ollama.nix @@ -158,7 +158,7 @@ in This creates a systemd unit `ollama-model-loader.service`. - Search for models of your choice from: https://ollama.com/library + Search for models of your choice from: ''; }; openFirewall = lib.mkOption { From a4959c465e9a9c7500ef7e49031e6173b02e6fd3 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:18:31 -0500 Subject: [PATCH 1490/2168] nixos/open-webui: fix documentation link formatting --- nixos/modules/services/misc/open-webui.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/open-webui.nix b/nixos/modules/services/misc/open-webui.nix index 89c2f34b6699..f3eb5dff9c45 100644 --- a/nixos/modules/services/misc/open-webui.nix +++ b/nixos/modules/services/misc/open-webui.nix @@ -56,7 +56,7 @@ in ''; description = '' Extra environment variables for Open-WebUI. - For more details see https://docs.openwebui.com/getting-started/advanced-topics/env-configuration/ + For more details see ''; }; From 2b78a852e6987961e44e662a3bfadda2004c93eb Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:18:41 -0500 Subject: [PATCH 1491/2168] nixos/pinnwand: fix documentation link formatting --- nixos/modules/services/misc/pinnwand.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/pinnwand.nix b/nixos/modules/services/misc/pinnwand.nix index 1e54a35b4d82..1ec33f773e06 100644 --- a/nixos/modules/services/misc/pinnwand.nix +++ b/nixos/modules/services/misc/pinnwand.nix @@ -34,7 +34,7 @@ in default = "sqlite:////var/lib/pinnwand/pinnwand.db"; example = "sqlite:///:memory"; description = '' - Database URI compatible with [SQLAlchemyhttps://docs.sqlalchemy.org/en/14/core/engines.html#database-urls]. + Database URI compatible with [SQLAlchemy](https://docs.sqlalchemy.org/en/14/core/engines.html#database-urls). Additional packages may need to be introduced into the environment for certain databases. ''; From f2ed072641757c29c6b14ce4aa1a2bc577161b93 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:18:46 -0500 Subject: [PATCH 1492/2168] nixos/uhub: fix documentation link formatting --- nixos/modules/services/misc/uhub.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/uhub.nix b/nixos/modules/services/misc/uhub.nix index befebdc20cdb..7e9130c8ff4d 100644 --- a/nixos/modules/services/misc/uhub.nix +++ b/nixos/modules/services/misc/uhub.nix @@ -46,7 +46,7 @@ in inherit (settingsFormat) type; description = '' Configuration of uhub. - See https://www.uhub.org/doc/config.php for a list of options. + See for a list of options. ''; default = { }; example = { From fa7399c6505aef5c77dfd6865b8cb79be26ff1e7 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:19:46 -0500 Subject: [PATCH 1493/2168] nixos/prometheus/exporters: fix documentation link formatting --- .../services/monitoring/prometheus/exporters/idrac.nix | 4 ++-- .../services/monitoring/prometheus/exporters/nginxlog.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/monitoring/prometheus/exporters/idrac.nix b/nixos/modules/services/monitoring/prometheus/exporters/idrac.nix index 58bb4954c253..30e46d063006 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/idrac.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/idrac.nix @@ -30,7 +30,7 @@ in Mutually exclusive with `configuration` option. - Configuration reference: https://github.com/mrlhansen/idrac_exporter/#configuration + Configuration reference: ''; }; configuration = mkOption { @@ -38,7 +38,7 @@ in description = '' Configuration for iDRAC exporter, as a nix attribute set. - Configuration reference: https://github.com/mrlhansen/idrac_exporter/#configuration + Configuration reference: Mutually exclusive with `configurationPath` option. ''; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/nginxlog.nix b/nixos/modules/services/monitoring/prometheus/exporters/nginxlog.nix index 8a01b07d9fec..84360df180c9 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/nginxlog.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/nginxlog.nix @@ -40,7 +40,7 @@ in All settings of nginxlog expressed as an Nix attrset. Check the official documentation for the corresponding YAML - settings that can all be used here: https://github.com/martin-helmich/prometheus-nginxlog-exporter + settings that can all be used here: The `listen` object is already generated by `port`, `listenAddress` and `metricsEndpoint` and will be merged with the value of `settings` before writing it as JSON. From 77ee6059486c56c19aa5b2949a56d8629dce023f Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:19:55 -0500 Subject: [PATCH 1494/2168] nixos/prometheus: fix documentation link formatting --- .../services/monitoring/prometheus/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix index ea2b11e6cf66..d906a3c82296 100644 --- a/nixos/modules/services/monitoring/prometheus/default.nix +++ b/nixos/modules/services/monitoring/prometheus/default.nix @@ -546,7 +546,7 @@ let authentication_method = mkDefOpt (types.enum [ "OAuth" "ManagedIdentity" ]) "OAuth" '' The authentication method, either OAuth or ManagedIdentity. - See https://docs.microsoft.com/en-us/azure/active-directory/managed-identities-azure-resources/overview + See ''; subscription_id = mkOption { @@ -973,8 +973,8 @@ let ) ) '' Optional label and field selectors to limit the discovery process to a subset of available resources. - See https://kubernetes.io/docs/concepts/overview/working-with-objects/field-selectors/ - and https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ to learn more about the possible + See + and to learn more about the possible filters that can be used. Endpoints role supports pod, service and endpoints selectors, other roles only support selectors matching the role itself (e.g. node role can only contain node selectors). @@ -1210,7 +1210,7 @@ let type = types.str; description = '' Puppet Query Language (PQL) query. Only resources are supported. - https://puppet.com/docs/puppetdb/latest/api/query/v4/pql.html + ''; }; @@ -1238,12 +1238,12 @@ let access_key = mkOption { type = types.str; description = '' - Access key to use. https://console.scaleway.com/project/credentials + Access key to use. ''; }; secret_key = mkOpt types.str '' - Secret key to use when listing targets. https://console.scaleway.com/project/credentials + Secret key to use when listing targets. It is mutually exclusive with `secret_key_file`. ''; From 359c9a41d5c66acf5c0bfde6205ee11577d475c9 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:19:58 -0500 Subject: [PATCH 1495/2168] nixos/bosun: fix documentation link formatting --- nixos/modules/services/monitoring/bosun.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/bosun.nix b/nixos/modules/services/monitoring/bosun.nix index d701a1a52544..3a1f24fdddc1 100644 --- a/nixos/modules/services/monitoring/bosun.nix +++ b/nixos/modules/services/monitoring/bosun.nix @@ -104,7 +104,7 @@ in option. A detailed description of the supported syntax can be found at-spi2-atk - https://bosun.org/configuration.html + ''; }; From 4ac1cca61ad1f0c6ca59a69b718f9a3f84a470a4 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:20:02 -0500 Subject: [PATCH 1496/2168] nixos/glances: fix documentation link formatting --- nixos/modules/services/monitoring/glances.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/glances.nix b/nixos/modules/services/monitoring/glances.nix index fd976ce2f060..76f3a8f34e78 100644 --- a/nixos/modules/services/monitoring/glances.nix +++ b/nixos/modules/services/monitoring/glances.nix @@ -57,7 +57,7 @@ in description = '' Extra command-line arguments to pass to glances. - See https://glances.readthedocs.io/en/latest/cmds.html for all available options. + See for all available options. ''; }; }; From 27971205fd2cdbeaa8565204c45fe73120355fad Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:20:10 -0500 Subject: [PATCH 1497/2168] nixos/librenms: fix documentation link formatting --- nixos/modules/services/monitoring/librenms.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/monitoring/librenms.nix b/nixos/modules/services/monitoring/librenms.nix index e3f0d486ae69..599117b07356 100644 --- a/nixos/modules/services/monitoring/librenms.nix +++ b/nixos/modules/services/monitoring/librenms.nix @@ -344,9 +344,9 @@ in }; description = '' Attrset of the LibreNMS configuration. - See https://docs.librenms.org/Support/Configuration/ for reference. + See for reference. All possible options are listed [here](https://github.com/librenms/librenms/blob/master/misc/config_definitions.json). - See https://docs.librenms.org/Extensions/Authentication/ for setting other authentication methods. + See for setting other authentication methods. ''; default = { }; example = { @@ -361,7 +361,7 @@ in default = null; description = '' Additional config for LibreNMS that will be appended to the `config.php`. See - https://github.com/librenms/librenms/blob/master/misc/config_definitions.json + for possible options. Useful if you want to use PHP-Functions in your config. ''; }; From fc931a8419b9c26d3c0ae797691a25425943ab12 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:20:14 -0500 Subject: [PATCH 1498/2168] nixos/longview: fix documentation link formatting --- nixos/modules/services/monitoring/longview.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/monitoring/longview.nix b/nixos/modules/services/monitoring/longview.nix index 6123b2ccbaed..b4a690a7f1d3 100644 --- a/nixos/modules/services/monitoring/longview.nix +++ b/nixos/modules/services/monitoring/longview.nix @@ -30,7 +30,7 @@ in example = "01234567-89AB-CDEF-0123456789ABCDEF"; description = '' Longview API key. To get this, look in Longview settings which - are found at https://manager.linode.com/longview/. + are found at . Warning: this secret is stored in the world-readable Nix store! Use {option}`apiKeyFile` instead. @@ -44,7 +44,7 @@ in description = '' A file containing the Longview API key. To get this, look in Longview settings which - are found at https://manager.linode.com/longview/. + are found at . {option}`apiKeyFile` takes precedence over {option}`apiKey`. ''; From 376f9ab6821c820c2cf2eda76953eaa9969746a3 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:20:23 -0500 Subject: [PATCH 1499/2168] nixos/opentelemetry-collector: fix documentation link formatting --- nixos/modules/services/monitoring/opentelemetry-collector.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/opentelemetry-collector.nix b/nixos/modules/services/monitoring/opentelemetry-collector.nix index 55502a77366b..125dec00b6cf 100644 --- a/nixos/modules/services/monitoring/opentelemetry-collector.nix +++ b/nixos/modules/services/monitoring/opentelemetry-collector.nix @@ -32,7 +32,7 @@ in description = '' Specify the configuration for Opentelemetry Collector in Nix. - See https://opentelemetry.io/docs/collector/configuration/ for available options. + See for available options. ''; }; From d4151d6a2ea8e0350f32969ccac87b2dc3ad90bd Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:20:28 -0500 Subject: [PATCH 1500/2168] nixos/osquery: fix documentation link formatting --- nixos/modules/services/monitoring/osquery.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/monitoring/osquery.nix b/nixos/modules/services/monitoring/osquery.nix index fbe6f45b9d8e..fe6c79a79fe5 100644 --- a/nixos/modules/services/monitoring/osquery.nix +++ b/nixos/modules/services/monitoring/osquery.nix @@ -40,7 +40,7 @@ in default = { }; description = '' Configuration to be written to the osqueryd JSON configuration file. - To understand the configuration format, refer to https://osquery.readthedocs.io/en/stable/deployment/configuration/#configuration-components. + To understand the configuration format, refer to . ''; example = { options.utc = false; @@ -52,7 +52,7 @@ in default = { }; description = '' Attribute set of flag names and values to be written to the osqueryd flagfile. - For more information, refer to https://osquery.readthedocs.io/en/stable/installation/cli-flags. + For more information, refer to . ''; example = { config_refresh = "10"; From e5df3a75077f68200a665b7f12ecaa77d1836d33 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:20:33 -0500 Subject: [PATCH 1501/2168] nixos/scrutiny: fix documentation link formatting --- nixos/modules/services/monitoring/scrutiny.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/monitoring/scrutiny.nix b/nixos/modules/services/monitoring/scrutiny.nix index 37a991674dae..3265d94f6cd3 100644 --- a/nixos/modules/services/monitoring/scrutiny.nix +++ b/nixos/modules/services/monitoring/scrutiny.nix @@ -35,7 +35,7 @@ in description = '' Scrutiny settings to be rendered into the configuration file. - See https://github.com/AnalogJ/scrutiny/blob/master/example.scrutiny.yaml. + See . ''; default = { }; type = submodule { @@ -129,7 +129,7 @@ in description = '' Collector settings to be rendered into the collector configuration file. - See https://github.com/AnalogJ/scrutiny/blob/master/example.collector.yaml. + See . ''; default = { }; type = submodule { From 5194bc27aecd4fea29e787c12a1a0281ade86d08 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:20:38 -0500 Subject: [PATCH 1502/2168] nixos/glusterfs: fix documentation link formatting --- nixos/modules/services/network-filesystems/glusterfs.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/network-filesystems/glusterfs.nix b/nixos/modules/services/network-filesystems/glusterfs.nix index 87a979f79a87..cd0ce42bba63 100644 --- a/nixos/modules/services/network-filesystems/glusterfs.nix +++ b/nixos/modules/services/network-filesystems/glusterfs.nix @@ -59,8 +59,8 @@ in You may want to turn it off to reduce the attack surface for DDoS reflection attacks. - See https://davelozier.com/glusterfs-and-rpcbind-portmap-ddos-reflection-attacks/ - and https://bugzilla.redhat.com/show_bug.cgi?id=1426842 for details. + See + and for details. ''; default = true; }; @@ -123,7 +123,7 @@ in Enabling this will create a file {file}`/var/lib/glusterd/secure-access`. Disabling will delete this file again. - See also: https://gluster.readthedocs.io/en/latest/Administrator%20Guide/SSL/ + See also: ''; default = null; type = lib.types.nullOr ( From 961e7dd1dbbd2d4e969f9c5e348fa1085e59b1a7 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:20:47 -0500 Subject: [PATCH 1503/2168] nixos/nghttpx: fix documentation link formatting --- .../nghttpx/backend-params-submodule.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/networking/nghttpx/backend-params-submodule.nix b/nixos/modules/services/networking/nghttpx/backend-params-submodule.nix index bbf8691bb678..16db3fb26bd8 100644 --- a/nixos/modules/services/networking/nghttpx/backend-params-submodule.nix +++ b/nixos/modules/services/networking/nghttpx/backend-params-submodule.nix @@ -11,7 +11,7 @@ This option configures the protocol the backend server expects to use. - Please see https://nghttp2.org/documentation/nghttpx.1.html#cmdoption-nghttpx-b + Please see for more detail. ''; }; @@ -24,7 +24,7 @@ connection with a backend server using TLS or not. The burden is on the backend server to provide the TLS certificate! - Please see https://nghttp2.org/documentation/nghttpx.1.html#cmdoption-nghttpx-b + Please see for more detail. ''; }; @@ -36,7 +36,7 @@ Override the TLS SNI field value. This value (in nghttpx) defaults to the host value of the backend configuration. - Please see https://nghttp2.org/documentation/nghttpx.1.html#cmdoption-nghttpx-b + Please see for more detail. ''; }; @@ -50,7 +50,7 @@ balancing. If N is 0 the backend is never excluded from load balancing. - Please see https://nghttp2.org/documentation/nghttpx.1.html#cmdoption-nghttpx-b + Please see for more detail. ''; }; @@ -65,7 +65,7 @@ re-included in load balancing. If N is 0 a backend is never reconsidered for load balancing once it falls. - Please see https://nghttp2.org/documentation/nghttpx.1.html#cmdoption-nghttpx-b + Please see for more detail. ''; }; @@ -90,7 +90,7 @@ one of the backend gets unreachable, or backend settings are reloaded or replaced by API. - Please see https://nghttp2.org/documentation/nghttpx.1.html#cmdoption-nghttpx-b + Please see for more detail. ''; }; @@ -107,7 +107,7 @@ "dns" is true, name resolution of a backend's host name at start up, or configuration reload is skipped. - Please see https://nghttp2.org/documentation/nghttpx.1.html#cmdoption-nghttpx-b + Please see for more detail. ''; }; @@ -130,7 +130,7 @@ pattern. It is advised to set "redirect-if-no-tls" parameter to all backends explicitly if this feature is desired. - Please see https://nghttp2.org/documentation/nghttpx.1.html#cmdoption-nghttpx-b + Please see for more detail. ''; }; From 5fb7bc8c5f7e0a1f30329a4a6790c076689a1561 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:20:52 -0500 Subject: [PATCH 1504/2168] nixos/3proxy: fix documentation link formatting --- nixos/modules/services/networking/3proxy.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/3proxy.nix b/nixos/modules/services/networking/3proxy.nix index e15abb63aec4..aa76e57417fb 100644 --- a/nixos/modules/services/networking/3proxy.nix +++ b/nixos/modules/services/networking/3proxy.nix @@ -40,7 +40,7 @@ in test2:CR:$1$rkpibm5J$Aq1.9VtYAn0JrqZ8M.1ME. ``` - You can generate md5-crypted passwords via https://unix4lyfe.org/crypt/ + You can generate md5-crypted passwords via Note that htpasswd tool generates incompatible md5-crypted passwords. Consult [documentation](https://github.com/z3APA3A/3proxy/wiki/How-To-%28incomplete%29#USERS) for more information. ''; From ce335f7a6c5f9e27c8d8385d772092fd2dcf4dd1 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:20:55 -0500 Subject: [PATCH 1505/2168] nixos/atticd: fix documentation link formatting --- nixos/modules/services/networking/atticd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/atticd.nix b/nixos/modules/services/networking/atticd.nix index 3984c434c60e..43d66ef06238 100644 --- a/nixos/modules/services/networking/atticd.nix +++ b/nixos/modules/services/networking/atticd.nix @@ -103,7 +103,7 @@ in settings = lib.mkOption { description = '' Structured configurations of atticd. - See https://github.com/zhaofengli/attic/blob/main/server/src/config-template.toml + See ''; type = format.type; default = { }; From 85ca769c726c0acf44ac3a8a71f761a0ad2af079 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:20:59 -0500 Subject: [PATCH 1506/2168] nixos/coturn: fix documentation link formatting --- nixos/modules/services/networking/coturn.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/coturn.nix b/nixos/modules/services/networking/coturn.nix index 8a0d08f6d9cb..2c89c3a12fb5 100644 --- a/nixos/modules/services/networking/coturn.nix +++ b/nixos/modules/services/networking/coturn.nix @@ -171,7 +171,7 @@ in This feature can be used with the long-term authentication mechanism, only. This feature purpose is to support "TURN Server REST API", see "TURN REST API" link in the project's page - https://github.com/coturn/coturn/ + This option is used with timestamp: From 7e6083be99988cc9126a682f779b8988f38375cc Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:21:04 -0500 Subject: [PATCH 1507/2168] nixos/ddclient: fix documentation link formatting --- nixos/modules/services/networking/ddclient.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix index 31c85770ee59..4e6197164731 100644 --- a/nixos/modules/services/networking/ddclient.nix +++ b/nixos/modules/services/networking/ddclient.nix @@ -123,7 +123,7 @@ in default = "dyndns2"; type = str; description = '' - Protocol to use with dynamic DNS provider (see https://ddclient.net/protocols.html ). + Protocol to use with dynamic DNS provider (see ). ''; }; From 91980b93cf0e46603607302cc5750fce2d114c84 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:21:08 -0500 Subject: [PATCH 1508/2168] nixos/ddns-updater: fix documentation link formatting --- nixos/modules/services/networking/ddns-updater.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/ddns-updater.nix b/nixos/modules/services/networking/ddns-updater.nix index 85daa59fe66d..641325118945 100644 --- a/nixos/modules/services/networking/ddns-updater.nix +++ b/nixos/modules/services/networking/ddns-updater.nix @@ -16,7 +16,7 @@ in environment = lib.mkOption { type = lib.types.attrsOf lib.types.str; - description = "Environment variables to be set for the ddns-updater service. DATADIR is ignored to enable using systemd DynamicUser. For full list see https://github.com/qdm12/ddns-updater"; + description = "Environment variables to be set for the ddns-updater service. DATADIR is ignored to enable using systemd DynamicUser. For full list see "; default = { }; }; }; From 5d48ee0d4bad4d5e653e5967d865677322ec315d Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:21:12 -0500 Subject: [PATCH 1509/2168] nixos/deconz: fix documentation link formatting --- nixos/modules/services/networking/deconz.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/deconz.nix b/nixos/modules/services/networking/deconz.nix index 88e294f86c2d..c26565efcac2 100644 --- a/nixos/modules/services/networking/deconz.nix +++ b/nixos/modules/services/networking/deconz.nix @@ -76,7 +76,7 @@ in ]; description = '' Extra command line arguments for deCONZ, see - https://github.com/dresden-elektronik/deconz-rest-plugin/wiki/deCONZ-command-line-parameters. + . ''; }; }; From 70c805c634a2708325a0517b406f34a48900d778 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:21:17 -0500 Subject: [PATCH 1510/2168] nixos/epmd: fix documentation link formatting --- nixos/modules/services/networking/epmd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/epmd.nix b/nixos/modules/services/networking/epmd.nix index d1794e8c2e26..c17a7c974fa7 100644 --- a/nixos/modules/services/networking/epmd.nix +++ b/nixos/modules/services/networking/epmd.nix @@ -25,7 +25,7 @@ in default = "[::]:4369"; description = '' the listenStream used by the systemd socket. - see https://www.freedesktop.org/software/systemd/man/systemd.socket.html#ListenStream= for more information. + see for more information. use this to change the port epmd will run on. if not defined, epmd will use "[::]:4369" ''; From f53cf94cab4970b212e0ec850b55bb9904846c66 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:21:21 -0500 Subject: [PATCH 1511/2168] nixos/firewall: fix documentation link formatting --- nixos/modules/services/networking/firewall.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix index bf3119292eee..af41f49ac554 100644 --- a/nixos/modules/services/networking/firewall.nix +++ b/nixos/modules/services/networking/firewall.nix @@ -245,7 +245,7 @@ in Loading of helpers is recommended to be done through the CT target. More info: - https://home.regit.org/netfilter-en/secure-use-of-helpers/ + ''; }; From 3dd73303bbfd17ad4f3d85898448f8f729d5f209 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:21:25 -0500 Subject: [PATCH 1512/2168] nixos/headscale: fix documentation link formatting --- nixos/modules/services/networking/headscale.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/headscale.nix b/nixos/modules/services/networking/headscale.nix index bca8493c867f..bd17f005f69b 100644 --- a/nixos/modules/services/networking/headscale.nix +++ b/nixos/modules/services/networking/headscale.nix @@ -228,7 +228,7 @@ in default = true; description = '' Enable WAL mode for SQLite. This is recommended for production environments. - https://www.sqlite.org/wal.html + ''; example = true; }; From af8af80782014a9c705c5cac4c156c6f8742cf39 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:21:29 -0500 Subject: [PATCH 1513/2168] nixos/opengfw: fix documentation link formatting --- nixos/modules/services/networking/opengfw.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/opengfw.nix b/nixos/modules/services/networking/opengfw.nix index 1866e75487dd..3cb1e9c63d7d 100644 --- a/nixos/modules/services/networking/opengfw.nix +++ b/nixos/modules/services/networking/opengfw.nix @@ -172,7 +172,7 @@ in ruleset = mkOption { description = '' The path to load specific local geoip/geosite db files. - If not set, they will be automatically downloaded from (Loyalsoldier/v2ray-rules-dat)[https://github.com/Loyalsoldier/v2ray-rules-dat]. + If not set, they will be automatically downloaded from [Loyalsoldier/v2ray-rules-dat](https://github.com/Loyalsoldier/v2ray-rules-dat). ''; default = { }; type = types.submodule { From f3acac425df038a3d8b6eae8acfb0c471d8d7e26 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:21:37 -0500 Subject: [PATCH 1514/2168] nixos/wg-access-server: fix documentation link formatting --- nixos/modules/services/networking/wg-access-server.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/wg-access-server.nix b/nixos/modules/services/networking/wg-access-server.nix index a0777fd86e30..d27f891d3d2e 100644 --- a/nixos/modules/services/networking/wg-access-server.nix +++ b/nixos/modules/services/networking/wg-access-server.nix @@ -43,7 +43,7 @@ in }; }; }; - description = "See https://www.freie-netze.org/wg-access-server/2-configuration/ for possible options"; + description = "See for possible options"; }; secretsFile = mkOption { From 6aa47a42fe534c0ff3040ed0c1145c738af2e82c Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:21:42 -0500 Subject: [PATCH 1515/2168] nixos/zerotierone: fix documentation link formatting --- nixos/modules/services/networking/zerotierone.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/zerotierone.nix b/nixos/modules/services/networking/zerotierone.nix index ad6a74cc1b44..ebf800cf3f26 100644 --- a/nixos/modules/services/networking/zerotierone.nix +++ b/nixos/modules/services/networking/zerotierone.nix @@ -43,7 +43,7 @@ in description = '' Optional configuration to be written to the Zerotier JSON-based local.conf. If set, the configuration will be symlinked to `/var/lib/zerotier-one/local.conf` at build time. - To understand the configuration format, refer to https://docs.zerotier.com/config/#local-configuration-options. + To understand the configuration format, refer to . ''; example = { settings.allowTcpFallbackRelay = false; From 956a5cedd43110d4c9b95501721094bb1031058a Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:21:47 -0500 Subject: [PATCH 1516/2168] nixos/tempo: fix documentation link formatting --- nixos/modules/services/tracing/tempo.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/tracing/tempo.nix b/nixos/modules/services/tracing/tempo.nix index 5d329cc7f530..d5a5568d8f33 100644 --- a/nixos/modules/services/tracing/tempo.nix +++ b/nixos/modules/services/tracing/tempo.nix @@ -27,7 +27,7 @@ in description = '' Specify the configuration for Tempo in Nix. - See https://grafana.com/docs/tempo/latest/configuration/ for available options. + See for available options. ''; }; From e0de6da14a10fc40509d3e2a8b0c26d50755b22f Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:21:52 -0500 Subject: [PATCH 1517/2168] nixos/wivrn: fix documentation link formatting --- nixos/modules/services/video/wivrn.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/video/wivrn.nix b/nixos/modules/services/video/wivrn.nix index da6edd02f5b2..f2b986720c87 100644 --- a/nixos/modules/services/video/wivrn.nix +++ b/nixos/modules/services/video/wivrn.nix @@ -144,7 +144,7 @@ in Note that the application option must be either a package or a list with package as the first element. - See https://github.com/WiVRn/WiVRn/blob/master/docs/configuration.md + See ''; default = { }; example = literalExpression '' From d73589e65ea7e2cd0a463f886411f8eb59af8a47 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:21:58 -0500 Subject: [PATCH 1518/2168] nixos/changedetection-io: fix documentation link formatting --- nixos/modules/services/web-apps/changedetection-io.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-apps/changedetection-io.nix b/nixos/modules/services/web-apps/changedetection-io.nix index c4866839a97f..5fd340a0ead0 100644 --- a/nixos/modules/services/web-apps/changedetection-io.nix +++ b/nixos/modules/services/web-apps/changedetection-io.nix @@ -92,7 +92,7 @@ in ::: {.note} Playwright can currently leak memory. - See https://github.com/dgtlmoon/changedetection.io/wiki/Playwright-content-fetcher#playwright-memory-leak + See ::: ''; }; @@ -106,7 +106,7 @@ in ::: {.note} Playwright can currently leak memory. - See https://github.com/dgtlmoon/changedetection.io/wiki/Playwright-content-fetcher#playwright-memory-leak + See ::: ''; }; From 9f0c8c6e9e864563bcee354c1e19a13f06bbadd1 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:22:03 -0500 Subject: [PATCH 1519/2168] nixos/cryptpad: fix documentation link formatting --- nixos/modules/services/web-apps/cryptpad.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/cryptpad.nix b/nixos/modules/services/web-apps/cryptpad.nix index 5f308f6e0a34..f2493d57e3cf 100644 --- a/nixos/modules/services/web-apps/cryptpad.nix +++ b/nixos/modules/services/web-apps/cryptpad.nix @@ -51,7 +51,7 @@ in settings = mkOption { description = '' Cryptpad configuration settings. - See https://github.com/cryptpad/cryptpad/blob/main/config/config.example.js for a more extensive + See for a more extensive reference documentation. Test your deployed instance through `https:///checkup/`. ''; From 79ea0ba6026ad9763a88f9ec86cdce392cd82cf4 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:22:09 -0500 Subject: [PATCH 1520/2168] nixos/dependency-track: fix documentation link formatting --- .../services/web-apps/dependency-track.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/web-apps/dependency-track.nix b/nixos/modules/services/web-apps/dependency-track.nix index ba3dbee97288..b1b22f14d134 100644 --- a/nixos/modules/services/web-apps/dependency-track.nix +++ b/nixos/modules/services/web-apps/dependency-track.nix @@ -194,7 +194,7 @@ in default = "openid profile email"; description = '' Defines the scopes to request for OpenID Connect. - See also: https://openid.net/specs/openid-connect-basic-1_0.html#Scopes + See also: ''; }; flow = lib.mkOption { @@ -209,8 +209,8 @@ in Usage of the implicit flow is strongly discouraged, but may be necessary when the IdP of choice does not support the Code+PKCE flow. See also: - - https://oauth.net/2/grant-types/implicit/ - - https://oauth.net/2/pkce/ + - + - ''; }; loginButtonText = lib.mkOption { @@ -218,7 +218,7 @@ in default = "Login with OpenID Connect"; description = '' Defines the scopes to request for OpenID Connect. - See also: https://openid.net/specs/openid-connect-basic-1_0.html#Scopes + See also: ''; }; usernameClaim = lib.mkOption { @@ -228,7 +228,7 @@ in description = '' Defines the name of the claim that contains the username in the provider's userinfo endpoint. Common claims are "name", "username", "preferred_username" or "nickname". - See also: https://openid.net/specs/openid-connect-core-1_0.html#UserInfoResponse + See also: ''; }; userProvisioning = lib.mkOption { @@ -426,8 +426,8 @@ in Defines the issuer URL to be used for OpenID Connect. This issuer MUST support provider configuration via the /.well-known/openid-configuration endpoint. See also: - - https://openid.net/specs/openid-connect-discovery-1_0.html#ProviderMetadata - - https://openid.net/specs/openid-connect-discovery-1_0.html#ProviderConfig + - + - ''; }; "alpine.oidc.username.claim" = lib.mkOption { @@ -437,7 +437,7 @@ in description = '' Defines the name of the claim that contains the username in the provider's userinfo endpoint. Common claims are "name", "username", "preferred_username" or "nickname". - See also: https://openid.net/specs/openid-connect-core-1_0.html#UserInfoResponse + See also: ''; }; "alpine.oidc.user.provisioning" = lib.mkOption { @@ -495,7 +495,7 @@ in }; }; default = { }; - description = "See https://docs.dependencytrack.org/getting-started/configuration/#default-configuration for possible options"; + description = "See for possible options"; }; }; From 370bb6bd6045f682604c6d6dcaa161b5d366ab50 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:22:13 -0500 Subject: [PATCH 1521/2168] nixos/discourse: fix documentation link formatting --- nixos/modules/services/web-apps/discourse.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-apps/discourse.nix b/nixos/modules/services/web-apps/discourse.nix index d91249aa0ddf..1d7b3c2ff7be 100644 --- a/nixos/modules/services/web-apps/discourse.nix +++ b/nixos/modules/services/web-apps/discourse.nix @@ -427,7 +427,7 @@ in ]); default = null; description = '' - Authentication type to use, see https://api.rubyonrails.org/classes/ActionMailer/Base.html + Authentication type to use, see ''; }; @@ -443,7 +443,7 @@ in type = lib.types.str; default = "peer"; description = '' - How OpenSSL checks the certificate, see https://api.rubyonrails.org/classes/ActionMailer/Base.html + How OpenSSL checks the certificate, see ''; }; From b9203ecad9e5e6d54743a98c46bd83d1d4a02608 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:22:17 -0500 Subject: [PATCH 1522/2168] nixos/engelsystem: fix documentation link formatting --- nixos/modules/services/web-apps/engelsystem.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/engelsystem.nix b/nixos/modules/services/web-apps/engelsystem.nix index 887bee6f292a..6528d17469b2 100644 --- a/nixos/modules/services/web-apps/engelsystem.nix +++ b/nixos/modules/services/web-apps/engelsystem.nix @@ -85,7 +85,7 @@ in picture of this: in the resulting config.php file, the email.password key will be set to the contents of the /var/keys/engelsystem/mail file. - See https://engelsystem.de/doc/admin/configuration/ for available options. + See for available options. Note that the admin user login credentials cannot be set here - they always default to admin:asdfasdf. Log in and change them immediately. From be2c87eea09018b33bbade3e3df141e9e2911e32 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:22:21 -0500 Subject: [PATCH 1523/2168] nixos/flarum: fix documentation link formatting --- nixos/modules/services/web-apps/flarum.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/flarum.nix b/nixos/modules/services/web-apps/flarum.nix index c466d2700b1c..c60416970a27 100644 --- a/nixos/modules/services/web-apps/flarum.nix +++ b/nixos/modules/services/web-apps/flarum.nix @@ -124,7 +124,7 @@ in description = '' Create the database and database user locally, and run installation. - WARNING: Due to https://github.com/flarum/framework/issues/4018, this option is set + WARNING: Due to , this option is set to false by default. The 'flarum install' command may delete existing database tables. Only set this to true if you are certain you are working with a fresh, empty database. ''; From 16d3323694a2bd11a0cf87ea8e7140068f08994f Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:22:25 -0500 Subject: [PATCH 1524/2168] nixos/gancio: fix documentation link formatting --- nixos/modules/services/web-apps/gancio.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/gancio.nix b/nixos/modules/services/web-apps/gancio.nix index 997384521e8a..a1ec26e2b247 100644 --- a/nixos/modules/services/web-apps/gancio.nix +++ b/nixos/modules/services/web-apps/gancio.nix @@ -148,7 +148,7 @@ in }; description = '' Override default locales within gancio. - See [https://framagit.org/les/gancio/tree/master/locales](default languages and locales). + See [default languages and locales](https://framagit.org/les/gancio/tree/master/locales). ''; }; From 40371dd1315954151979f24fb198ba168565ecec Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:22:34 -0500 Subject: [PATCH 1525/2168] nixos/gotify-server: fix documentation link formatting --- nixos/modules/services/web-apps/gotify-server.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/gotify-server.nix b/nixos/modules/services/web-apps/gotify-server.nix index 5f5a9f9f86bb..785d8751b30d 100644 --- a/nixos/modules/services/web-apps/gotify-server.nix +++ b/nixos/modules/services/web-apps/gotify-server.nix @@ -44,7 +44,7 @@ in }; description = '' Config environment variables for the gotify-server. - See https://gotify.net/docs/config for more details. + See for more details. ''; }; From 384a6720d72a2a7357d5d187a6bc0683c26637b5 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:22:41 -0500 Subject: [PATCH 1526/2168] nixos/invidious: fix documentation link formatting --- nixos/modules/services/web-apps/invidious.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-apps/invidious.nix b/nixos/modules/services/web-apps/invidious.nix index 1429a131e5d1..64bd8751bb3d 100644 --- a/nixos/modules/services/web-apps/invidious.nix +++ b/nixos/modules/services/web-apps/invidious.nix @@ -343,7 +343,7 @@ in description = '' How many invidious instances to run. - See https://docs.invidious.io/improve-public-instance/#2-multiple-invidious-processes for more details + See for more details on how this is intended to work. All instances beyond the first one have the options `channel_threads` and `feed_threads` set to 0 to avoid conflicts with multiple instances refreshing subscriptions. Instances will be configured to bind to consecutive ports starting with {option}`services.invidious.port` for the @@ -449,7 +449,7 @@ in If {option}`services.invidious.nginx.enable` is used, nginx will be configured automatically. If not, you need to configure a reverse proxy yourself according to - https://docs.invidious.io/improve-public-instance/#3-speed-up-video-playback-with-http3-ytproxy. + . ''; }; From 91283c6fe73d176cda0db9bb4ac01219c660a2e4 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:22:46 -0500 Subject: [PATCH 1527/2168] nixos/kimai: fix documentation link formatting --- nixos/modules/services/web-apps/kimai.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/kimai.nix b/nixos/modules/services/web-apps/kimai.nix index 91735b282fcc..7db1cdaa538d 100644 --- a/nixos/modules/services/web-apps/kimai.nix +++ b/nixos/modules/services/web-apps/kimai.nix @@ -112,7 +112,7 @@ let description = '' MySQL *exact* version string. Not used if `createdLocally` is set, but must be set otherwise. See - https://www.kimai.org/documentation/installation.html#column-table_name-in-where-clause-is-ambiguous + for how to set this value, especially if you're using MariaDB. ''; }; From c3abba577a85e23e14880b11c39bc36b1776de90 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:22:52 -0500 Subject: [PATCH 1528/2168] nixos/mastodon: fix documentation link formatting --- nixos/modules/services/web-apps/mastodon.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/mastodon.nix b/nixos/modules/services/web-apps/mastodon.nix index a3a2bbd1eca6..532202497e73 100644 --- a/nixos/modules/services/web-apps/mastodon.nix +++ b/nixos/modules/services/web-apps/mastodon.nix @@ -652,7 +652,7 @@ in { description = '' Automatically remove remote media attachments and preview cards older than the configured amount of days. - Recommended in https://docs.joinmastodon.org/admin/setup/. + Recommended in . ''; }; From fe6a8e7b09ed8b896eda654b0903fdf4ce65d470 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:22:57 -0500 Subject: [PATCH 1529/2168] nixos/mattermost: fix documentation link formatting --- nixos/modules/services/web-apps/mattermost.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/mattermost.nix b/nixos/modules/services/web-apps/mattermost.nix index 56799a744806..b1352778fee0 100644 --- a/nixos/modules/services/web-apps/mattermost.nix +++ b/nixos/modules/services/web-apps/mattermost.nix @@ -706,7 +706,7 @@ in ]; description = '' Set commandline parameters to pass to matterircd. See - https://github.com/42wim/matterircd#usage for more information. + for more information. ''; }; }; From 82d4e0086fc90067e7c02221b96bc0c755653503 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:23:05 -0500 Subject: [PATCH 1530/2168] nixos/nextcloud: fix documentation link formatting --- nixos/modules/services/web-apps/nextcloud.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 7e884357cbc8..b8e79022588d 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -634,7 +634,7 @@ in { description = '' Whether to load the Redis module into PHP. You still need to enable Redis in your config.php. - See https://docs.nextcloud.com/server/14/admin_manual/configuration_server/caching_configuration.html + See ''; }; memcached = mkOption { @@ -643,7 +643,7 @@ in { description = '' Whether to load the Memcached module into PHP. You still need to enable Memcached in your config.php. - See https://docs.nextcloud.com/server/14/admin_manual/configuration_server/caching_configuration.html + See ''; }; }; From aea7a63d8f87553e9fdb2a790cdba5be97a10bf7 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:23:14 -0500 Subject: [PATCH 1531/2168] nixos/nextjs-ollama-llm-ui: fix documentation link formatting --- nixos/modules/services/web-apps/nextjs-ollama-llm-ui.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/nextjs-ollama-llm-ui.nix b/nixos/modules/services/web-apps/nextjs-ollama-llm-ui.nix index cbb0ce813a34..b656362cf192 100644 --- a/nixos/modules/services/web-apps/nextjs-ollama-llm-ui.nix +++ b/nixos/modules/services/web-apps/nextjs-ollama-llm-ui.nix @@ -18,7 +18,7 @@ in on your personal computer. This service is stateless and doesn't store any data on the server; all data is kept locally in your web browser. - See https://github.com/jakobhoeg/nextjs-ollama-llm-ui. + See . Required: You need the Ollama backend service running by having "services.nextjs-ollama-llm-ui.ollamaUrl" point to the correct url. From 88b108f32863886efd6f1ad1037aa29eec38dfa1 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:23:21 -0500 Subject: [PATCH 1532/2168] nixos/outline: fix documentation link formatting --- nixos/modules/services/web-apps/outline.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/web-apps/outline.nix b/nixos/modules/services/web-apps/outline.nix index 78ebc71eb206..801af166b0ff 100644 --- a/nixos/modules/services/web-apps/outline.nix +++ b/nixos/modules/services/web-apps/outline.nix @@ -212,7 +212,7 @@ in slackAuthentication = lib.mkOption { description = '' To configure Slack auth, you'll need to create an Application at - https://api.slack.com/apps + When configuring the Client ID, add a redirect URL under "OAuth & Permissions" to `https://[publicUrl]/auth/slack.callback`. @@ -237,7 +237,7 @@ in googleAuthentication = lib.mkOption { description = '' To configure Google auth, you'll need to create an OAuth Client ID at - https://console.cloud.google.com/apis/credentials + When configuring the Client ID, add an Authorized redirect URI to `https://[publicUrl]/auth/google.callback`. @@ -428,7 +428,7 @@ in description = '' For a complete Slack integration with search and posting to channels this configuration is also needed. See here for details: - https://wiki.generaloutline.com/share/be25efd1-b3ef-4450-b8e5-c4a4fc11e02a + ''; default = null; type = lib.types.nullOr ( From 600900c77c39e6a2c268e1bf65591d73f4fc8cdf Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:23:25 -0500 Subject: [PATCH 1533/2168] nixos/peering-manager: fix documentation link formatting --- nixos/modules/services/web-apps/peering-manager.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/peering-manager.nix b/nixos/modules/services/web-apps/peering-manager.nix index dd70567adab0..b912ccedc27c 100644 --- a/nixos/modules/services/web-apps/peering-manager.nix +++ b/nixos/modules/services/web-apps/peering-manager.nix @@ -52,7 +52,7 @@ in Enable Peering Manager. This module requires a reverse proxy that serves `/static` separately. - See this [example](https://github.com/peering-manager/contrib/blob/main/nginx.conf on how to configure this. + See this [example](https://github.com/peering-manager/contrib/blob/main/nginx.conf) on how to configure this. ''; }; From f40ba2f28ced4e82447f5c836f411a7e9920a02f Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:23:30 -0500 Subject: [PATCH 1534/2168] nixos/plausible: fix documentation link formatting --- nixos/modules/services/web-apps/plausible.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/web-apps/plausible.nix b/nixos/modules/services/web-apps/plausible.nix index 2640c9e53cf7..a4b84c56d2e4 100644 --- a/nixos/modules/services/web-apps/plausible.nix +++ b/nixos/modules/services/web-apps/plausible.nix @@ -68,8 +68,7 @@ in description = '' Path to the secret used by the `phoenix`-framework. Instructions how to generate one are documented in the - [ - framework docs](https://hexdocs.pm/phoenix/Mix.Tasks.Phx.Gen.Secret.html#content). + [framework docs](https://hexdocs.pm/phoenix/Mix.Tasks.Phx.Gen.Secret.html#content). ''; }; listenAddress = mkOption { @@ -92,9 +91,7 @@ in Public URL where plausible is available. Note that `/path` components are currently ignored: - [ - https://github.com/plausible/analytics/issues/1182 - ](https://github.com/plausible/analytics/issues/1182). + . ''; }; }; From d907fcd3f1796a86e6908e0c47ed339223a15d56 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:23:34 -0500 Subject: [PATCH 1535/2168] nixos/screego: fix documentation link formatting --- nixos/modules/services/web-apps/screego.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/screego.nix b/nixos/modules/services/web-apps/screego.nix index 9258e63c5d47..f692c7ff7958 100644 --- a/nixos/modules/services/web-apps/screego.nix +++ b/nixos/modules/services/web-apps/screego.nix @@ -50,7 +50,7 @@ in Screego settings passed as Nix attribute set, they will be merged with the defaults. Settings will be passed as environment variables. - See https://screego.net/#/config for possible values + See for possible values ''; default = defaultSettings; example = { From 28968693a92e9cabd87b768a0a7494ca6418b579 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:23:39 -0500 Subject: [PATCH 1536/2168] nixos/slskd: fix documentation link formatting --- nixos/modules/services/web-apps/slskd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/slskd.nix b/nixos/modules/services/web-apps/slskd.nix index 7d4bc66c7399..208deee88b4d 100644 --- a/nixos/modules/services/web-apps/slskd.nix +++ b/nixos/modules/services/web-apps/slskd.nix @@ -52,7 +52,7 @@ in { Web interface credentials should also be set here in `SLSKD_USERNAME` and `SLSKD_PASSWORD`. Other, optional credentials like SOCKS5 with `SLSKD_SLSK_PROXY_USERNAME` and `SLSKD_SLSK_PROXY_PASSWORD` should all reside here instead of in the world-readable nix store. - Variables are documented at https://github.com/slskd/slskd/blob/master/docs/config.md + Variables are documented at ''; }; From f552ef9849d8702da7bcfdbfede05aa5f7234522 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:23:44 -0500 Subject: [PATCH 1537/2168] nixos/stirling-pdf: fix documentation link formatting --- nixos/modules/services/web-apps/stirling-pdf.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/stirling-pdf.nix b/nixos/modules/services/web-apps/stirling-pdf.nix index 03946c6254dc..d6ecc8ccb9c3 100644 --- a/nixos/modules/services/web-apps/stirling-pdf.nix +++ b/nixos/modules/services/web-apps/stirling-pdf.nix @@ -28,7 +28,7 @@ in }; description = '' Environment variables for the stirling-pdf app. - See https://github.com/Stirling-Tools/Stirling-PDF#customisation for available options. + See for available options. ''; }; From 839a4277250b1ac62cb5923be61c25440eb6c85a Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:23:49 -0500 Subject: [PATCH 1538/2168] nixos/youtrack: fix documentation link formatting --- nixos/modules/services/web-apps/youtrack.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-apps/youtrack.nix b/nixos/modules/services/web-apps/youtrack.nix index 989d9e4fbaff..1c9347ce8747 100644 --- a/nixos/modules/services/web-apps/youtrack.nix +++ b/nixos/modules/services/web-apps/youtrack.nix @@ -88,7 +88,7 @@ in type = with lib.types; listOf str; description = '' General configuration parameters and other JVM options. - See https://www.jetbrains.com/help/youtrack/server/2023.3/youtrack-java-start-parameters.html#general-parameters + See for more information. ''; example = lib.literalExpression '' @@ -124,7 +124,7 @@ in }; description = '' Environmental configuration parameters, set imperatively. The values doesn't get removed, when removed in Nix. - See https://www.jetbrains.com/help/youtrack/server/2023.3/youtrack-java-start-parameters.html#environmental-parameters + See for more information. ''; example = lib.literalExpression '' From c58bf61fc22cf85414083703ee13ea4a7613fabd Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:23:54 -0500 Subject: [PATCH 1539/2168] nixos/zitadel: fix documentation link formatting --- nixos/modules/services/web-apps/zitadel.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-apps/zitadel.nix b/nixos/modules/services/web-apps/zitadel.nix index 2ddd0a52dc9c..c097d36d9039 100644 --- a/nixos/modules/services/web-apps/zitadel.nix +++ b/nixos/modules/services/web-apps/zitadel.nix @@ -136,7 +136,7 @@ in ''; description = '' Contents of the runtime configuration file. See - https://zitadel.com/docs/self-hosting/manage/configure for more + for more details. ''; }; @@ -168,7 +168,7 @@ in ''; description = '' Contents of the database initialization config file. See - https://zitadel.com/docs/self-hosting/manage/configure for more + for more details. ''; }; From 4851d05999aaa96b14e90e8280508d1ec4f2518c Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 12 Feb 2025 11:24:04 -0500 Subject: [PATCH 1540/2168] nixos/lighttpd/cgit: fix documentation link formatting --- nixos/modules/services/web-servers/lighttpd/cgit.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/lighttpd/cgit.nix b/nixos/modules/services/web-servers/lighttpd/cgit.nix index fed636f62fa5..ebd4c219222f 100644 --- a/nixos/modules/services/web-servers/lighttpd/cgit.nix +++ b/nixos/modules/services/web-servers/lighttpd/cgit.nix @@ -57,7 +57,7 @@ in description = '' Verbatim contents of the cgit runtime configuration file. Documentation (with cgitrc example file) is available in "man cgitrc". Or online: - http://git.zx2c4.com/cgit/tree/cgitrc.5.txt + ''; }; From dc9233d9284e2f0fef002096a3bdfd5558f0d971 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 12 Feb 2025 23:11:20 +0300 Subject: [PATCH 1541/2168] linux-firmware: 20250109 -> 20250211 --- pkgs/os-specific/linux/firmware/linux-firmware/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/linux-firmware/default.nix b/pkgs/os-specific/linux/firmware/linux-firmware/default.nix index cf0856ed3b6b..7845b828b5a0 100644 --- a/pkgs/os-specific/linux/firmware/linux-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/linux-firmware/default.nix @@ -20,11 +20,11 @@ let ''; in stdenvNoCC.mkDerivation rec { pname = "linux-firmware"; - version = "20250109"; + version = "20250211"; src = fetchzip { url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${version}.tar.gz"; - hash = "sha256-eVcHnqYXJwuz6flBB4YTllcmFKiCJXKFgZs1FumUJoA="; + hash = "sha256-ZEXCMz789MtJLBjf4PjUJygURbZVV1XNZoG+5QHpHCQ="; }; postUnpack = '' From e17baf2e9f74eac61f0de2b7c9c8de18f6bc727b Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 12 Feb 2025 23:31:01 +0300 Subject: [PATCH 1542/2168] lowfi: fix source hash, switch to useFetchCargoVendor The source hash was not updated when the original PR changed from version 1.5.3 to 1.5.6. --- pkgs/by-name/lo/lowfi/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lo/lowfi/package.nix b/pkgs/by-name/lo/lowfi/package.nix index fb5988e05ddd..6ca7e2c2465b 100644 --- a/pkgs/by-name/lo/lowfi/package.nix +++ b/pkgs/by-name/lo/lowfi/package.nix @@ -17,10 +17,11 @@ rustPlatform.buildRustPackage rec { owner = "talwat"; repo = "lowfi"; tag = version; - hash = "sha256-pfvTOoWsXukZTfev9+Ifcp3YYIqtYZgmEVPHuqD4IsM="; + hash = "sha256-lR22UN9LiuJknq2KTNOXcybXwi2KvLRe0KHocFWL0GM="; }; - cargoHash = "sha256-TGj3xH18xanhA25r+gTtLPa7KQKS9WEyGl412pnFZdw="; + useFetchCargoVendor = true; + cargoHash = "sha256-xMksujaZgOPJsBiv6//4zeiUcWEV2Pc7daBaPUh3cYc="; buildFeatures = [ "mpris" ]; From 9aae517513c32643717a82a505a92aecb647f88e Mon Sep 17 00:00:00 2001 From: lyranico Date: Tue, 11 Feb 2025 02:52:23 +0800 Subject: [PATCH 1543/2168] mihomo-party: remove wrapGAppsHook3 --- pkgs/by-name/mi/mihomo-party/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/mi/mihomo-party/package.nix b/pkgs/by-name/mi/mihomo-party/package.nix index 9dcf3279ca42..c510a4dd2f8b 100644 --- a/pkgs/by-name/mi/mihomo-party/package.nix +++ b/pkgs/by-name/mi/mihomo-party/package.nix @@ -3,7 +3,6 @@ stdenv, fetchurl, dpkg, - wrapGAppsHook3, autoPatchelfHook, nss, nspr, @@ -43,7 +42,6 @@ stdenv.mkDerivation { nativeBuildInputs = [ dpkg - wrapGAppsHook3 autoPatchelfHook ]; From 2da5248f84020065c1ade1cf3d2342e292fcbcaa Mon Sep 17 00:00:00 2001 From: lyranico Date: Tue, 11 Feb 2025 02:54:42 +0800 Subject: [PATCH 1544/2168] mihomo-party: use patchelf --- pkgs/by-name/mi/mihomo-party/package.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/mi/mihomo-party/package.nix b/pkgs/by-name/mi/mihomo-party/package.nix index c510a4dd2f8b..b4e8203ed352 100644 --- a/pkgs/by-name/mi/mihomo-party/package.nix +++ b/pkgs/by-name/mi/mihomo-party/package.nix @@ -54,30 +54,27 @@ stdenv.mkDerivation { (lib.getLib stdenv.cc.cc) ]; - runtimeDependencies = map lib.getLib [ - udev - libayatana-appindicator - ]; - installPhase = '' runHook preInstall - mkdir $out + mkdir -p $out/bin cp -r opt/mihomo-party usr/share $out substituteInPlace $out/share/applications/mihomo-party.desktop \ --replace-fail "/opt/mihomo-party/mihomo-party" "mihomo-party" + ln -s $out/mihomo-party/mihomo-party $out/bin/mihomo-party runHook postInstall ''; preFixup = '' - mkdir $out/bin - makeWrapper $out/mihomo-party/mihomo-party $out/bin/mihomo-party \ - --prefix LD_LIBRARY_PATH : "${ + patchelf --add-needed libGL.so.1 \ + --add-rpath ${ lib.makeLibraryPath [ libGL + udev + libayatana-appindicator ] - }" + } $out/mihomo-party/mihomo-party ''; meta = { From 09e97e00caf77f3035bf9d1df2f276a7e5729e4d Mon Sep 17 00:00:00 2001 From: lyranico Date: Tue, 11 Feb 2025 02:58:46 +0800 Subject: [PATCH 1545/2168] mihomo-party: refactor --- pkgs/by-name/mi/mihomo-party/package.nix | 35 ++++++++++++------------ pkgs/by-name/mi/mihomo-party/update.sh | 2 +- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/mi/mihomo-party/package.nix b/pkgs/by-name/mi/mihomo-party/package.nix index b4e8203ed352..02467ca6ebd1 100644 --- a/pkgs/by-name/mi/mihomo-party/package.nix +++ b/pkgs/by-name/mi/mihomo-party/package.nix @@ -13,32 +13,28 @@ libayatana-appindicator, libGL, }: -let + +stdenv.mkDerivation rec { + pname = "mihomo-party"; version = "1.7.1"; + src = let - inherit (stdenv.hostPlatform) system; - selectSystem = attrs: attrs.${system}; - suffix = selectSystem { + selectSystem = + attrs: + attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + arch = selectSystem { x86_64-linux = "amd64"; aarch64-linux = "arm64"; }; + in + fetchurl { + url = "https://github.com/mihomo-party-org/mihomo-party/releases/download/v${version}/mihomo-party-linux-${version}-${arch}.deb"; hash = selectSystem { x86_64-linux = "sha256-fVPW4lk+1uY+zTPk0wNeHz7ILKB+7p9hunHrqnuPI6w="; aarch64-linux = "sha256-wEOOP5ha7R0z0DCTCsmn5lfwJdzEWtNGdWNjVB5cI6k="; }; - in - fetchurl { - url = "https://github.com/mihomo-party-org/mihomo-party/releases/download/v${version}/mihomo-party-linux-${version}-${suffix}.deb"; - inherit hash; }; -in -stdenv.mkDerivation { - inherit version src; - - pname = "mihomo-party"; - - passthru.updateScript = ./update.sh; nativeBuildInputs = [ dpkg @@ -58,10 +54,11 @@ stdenv.mkDerivation { runHook preInstall mkdir -p $out/bin - cp -r opt/mihomo-party usr/share $out + cp -r opt $out/opt + cp -r usr/share $out/share substituteInPlace $out/share/applications/mihomo-party.desktop \ --replace-fail "/opt/mihomo-party/mihomo-party" "mihomo-party" - ln -s $out/mihomo-party/mihomo-party $out/bin/mihomo-party + ln -s $out/opt/mihomo-party/mihomo-party $out/bin/mihomo-party runHook postInstall ''; @@ -74,9 +71,11 @@ stdenv.mkDerivation { udev libayatana-appindicator ] - } $out/mihomo-party/mihomo-party + } $out/opt/mihomo-party/mihomo-party ''; + passthru.updateScript = ./update.sh; + meta = { description = "Another Mihomo GUI"; homepage = "https://github.com/mihomo-party-org/mihomo-party"; diff --git a/pkgs/by-name/mi/mihomo-party/update.sh b/pkgs/by-name/mi/mihomo-party/update.sh index 380b997c2512..406680fd0208 100755 --- a/pkgs/by-name/mi/mihomo-party/update.sh +++ b/pkgs/by-name/mi/mihomo-party/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p bash nixVersions.latest curl coreutils jq common-updater-scripts +#!nix-shell -i bash -p bash nix curl coreutils jq common-updater-scripts latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/mihomo-party-org/mihomo-party/releases/latest | jq -r ".tag_name") latestVersion="$(expr "$latestTag" : 'v\(.*\)')" From 97bee299fe8d4db90b0b0924f693dd540e5a6c5d Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Wed, 12 Feb 2025 21:55:39 +0100 Subject: [PATCH 1546/2168] aporetic: 1.0.0 -> 1.1.0 --- pkgs/by-name/ap/aporetic/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ap/aporetic/package.nix b/pkgs/by-name/ap/aporetic/package.nix index 58614af2320f..acfd47d95aca 100644 --- a/pkgs/by-name/ap/aporetic/package.nix +++ b/pkgs/by-name/ap/aporetic/package.nix @@ -14,12 +14,12 @@ let "serif" ]; pname = "aporetic"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "protesilaos"; repo = pname; rev = version; - sha256 = "sha256-5m4iT77FFsJf6N1FIsCtk5Z0IEOVUGCceXiT2n5dZUg="; + sha256 = "sha256-5lPViAo9SztOdds6HEmKJpT17tgcxmU/voXDffxTMDI="; }; privateBuildPlan = src.outPath + "/private-build-plans.toml"; makeIosevkaFont = From c747b86a8ec74e94d8b5b4c69368c6f7ad328ac8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 20:59:42 +0000 Subject: [PATCH 1547/2168] python312Packages.google-cloud-securitycenter: 1.36.0 -> 1.37.0 --- .../python-modules/google-cloud-securitycenter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index cd31bf8e9e48..18301c5cedb1 100644 --- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.36.0"; + version = "1.37.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_securitycenter"; inherit version; - hash = "sha256-z5Q9ScyCLfNQlByW0xgBb9XtDLx/ZZngiwO8FUZFCAI="; + hash = "sha256-98EpC9bqtcgd/5k++gbH2fRLGEAUvW80l6tcWOdnrDU="; }; build-system = [ setuptools ]; From d38afbcf6015b672d57c800f32a335eaf1fdca1e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 21:02:36 +0000 Subject: [PATCH 1548/2168] python312Packages.parallel-ssh: 2.13.0 -> 2.14.0 --- pkgs/development/python-modules/parallel-ssh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/parallel-ssh/default.nix b/pkgs/development/python-modules/parallel-ssh/default.nix index 107d5548d9cf..cf73fe716fb8 100644 --- a/pkgs/development/python-modules/parallel-ssh/default.nix +++ b/pkgs/development/python-modules/parallel-ssh/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "parallel-ssh"; - version = "2.13.0"; + version = "2.14.0"; src = fetchFromGitHub { owner = "ParallelSSH"; repo = "parallel-ssh"; tag = version; - hash = "sha256-J/rwlJ9BOcENngIVz5cU+uA34hEEw7QsgsPnpNbbZbk="; + hash = "sha256-TeNQitaNVbK96Aui8OcKin2sHpF8VlMQmb5ODT2lQh4="; }; build-system = [ @@ -39,7 +39,7 @@ buildPythonPackage rec { meta = { description = "Asynchronous parallel SSH client library"; homepage = "https://github.com/ParallelSSH/parallel-ssh"; - changelog = "https://github.com/ParallelSSH/parallel-ssh/blob/${version}/Changelog.rst"; + changelog = "https://github.com/ParallelSSH/parallel-ssh/blob/${src.tag}/Changelog.rst"; license = lib.licenses.lgpl21Only; maintainers = with lib.maintainers; [ infinidoge ]; }; From 9b55ba2caad82598a3fde2dec1422776005b7cdf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 21:09:35 +0000 Subject: [PATCH 1549/2168] python312Packages.ssh2-python: 1.1.2 -> 1.1.2.post1 --- pkgs/development/python-modules/ssh2-python/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ssh2-python/default.nix b/pkgs/development/python-modules/ssh2-python/default.nix index 275e0250810e..341f08480241 100644 --- a/pkgs/development/python-modules/ssh2-python/default.nix +++ b/pkgs/development/python-modules/ssh2-python/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "ssh2-python"; - version = "1.1.2"; + version = "1.1.2.post1"; src = fetchFromGitHub { owner = "ParallelSSH"; repo = "ssh2-python"; tag = version; - hash = "sha256-nNMe7BTHI4O9Ueyq2YxtHat4BrrtiWGFkKHwUu/NtkM="; + hash = "sha256-LHIj0lSAMJ+tUvIyMl0xT/i0N4U+HbiiD62WIXzboMU="; }; build-system = [ setuptools ]; @@ -39,7 +39,7 @@ buildPythonPackage rec { meta = { description = "Python bindings for libssh2 C library"; homepage = "https://github.com/ParallelSSH/ssh2-python"; - changelog = "https://github.com/ParallelSSH/ssh2-python/blob/${version}/Changelog.rst"; + changelog = "https://github.com/ParallelSSH/ssh2-python/blob/${src.tag}/Changelog.rst"; license = lib.licenses.lgpl21Only; maintainers = with lib.maintainers; [ infinidoge ]; }; From 03adb1693730ba78082d8847763884aba4ec44e9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 21:16:22 +0000 Subject: [PATCH 1550/2168] parseable: 1.7.1 -> 1.7.3 --- pkgs/by-name/pa/parseable/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pa/parseable/package.nix b/pkgs/by-name/pa/parseable/package.nix index d501c1f4e6dd..0cb6e5fccf5c 100644 --- a/pkgs/by-name/pa/parseable/package.nix +++ b/pkgs/by-name/pa/parseable/package.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "parseable"; - version = "1.7.1"; + version = "1.7.3"; src = fetchFromGitHub { owner = "parseablehq"; repo = "parseable"; tag = "v${version}"; - hash = "sha256-Uoejniv6hUpxTZ6gosP+LHTo4FD+o1AlUEWopdpz5M0="; + hash = "sha256-arRaib5jzU2mtSJI70UphVqPN+hOGoag++jopgx/zCw="; }; LOCAL_ASSETS_PATH = fetchzip { @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { }; useFetchCargoVendor = true; - cargoHash = "sha256-rT/ORTOPsOgYlS8VCMBXo/cjfSJYcCtJofcPEIlc/cI="; + cargoHash = "sha256-j+v3lf3x3eW1PAjYdPHfma6PnUsb4m6ZBRj+5jdPxCs="; nativeBuildInputs = [ pkg-config ]; From 0e638b5ab9aa610514455cc714b481f34c782a82 Mon Sep 17 00:00:00 2001 From: emaryn <197520219+emaryn@users.noreply.github.com> Date: Wed, 12 Feb 2025 21:15:08 +0000 Subject: [PATCH 1551/2168] intiface-central: 2.6.4 -> 2.6.5 --- pkgs/by-name/in/intiface-central/package.nix | 6 +- .../in/intiface-central/pubspec.lock.json | 74 ++++++++++++------- 2 files changed, 50 insertions(+), 30 deletions(-) diff --git a/pkgs/by-name/in/intiface-central/package.nix b/pkgs/by-name/in/intiface-central/package.nix index f79235ba55f0..ea01452438b3 100644 --- a/pkgs/by-name/in/intiface-central/package.nix +++ b/pkgs/by-name/in/intiface-central/package.nix @@ -12,12 +12,12 @@ }: flutterPackages.stable.buildFlutterApplication rec { pname = "intiface-central"; - version = "2.6.4"; + version = "2.6.5"; src = fetchFromGitHub { owner = "intiface"; repo = "intiface-central"; rev = "v${version}"; - hash = "sha256-QBNEKhjBfKxArBykUq/fE4lftCYzGdAaWYD1F7rar5Y="; + hash = "sha256-goN0750EvGw5G8cb4jy6wWnjlLwlwMeTz4GQEilbwpY="; }; patches = [ ./corrosion.patch @@ -29,7 +29,7 @@ flutterPackages.stable.buildFlutterApplication rec { name = "${pname}-${version}-cargo-deps"; inherit src; sourceRoot = "${src.name}/intiface-engine-flutter-bridge"; - hash = "sha256-1j1maTrR7V/Tlu7uimTJuoEtxhn5Hn0VmR0GnJuKIoo="; + hash = "sha256-goN0750EvGw5G8cb4jy6wWnjlLwlwMeTz4GQEilbwpY="; }; cargoRoot = "intiface-engine-flutter-bridge"; diff --git a/pkgs/by-name/in/intiface-central/pubspec.lock.json b/pkgs/by-name/in/intiface-central/pubspec.lock.json index 7e4a916a879b..8c97f04835e0 100644 --- a/pkgs/by-name/in/intiface-central/pubspec.lock.json +++ b/pkgs/by-name/in/intiface-central/pubspec.lock.json @@ -4,27 +4,27 @@ "dependency": "transitive", "description": { "name": "_fe_analyzer_shared", - "sha256": "f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834", + "sha256": "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab", "url": "https://pub.dev" }, "source": "hosted", - "version": "72.0.0" + "version": "76.0.0" }, "_macros": { "dependency": "transitive", "description": "dart", "source": "sdk", - "version": "0.3.2" + "version": "0.3.3" }, "analyzer": { "dependency": "transitive", "description": { "name": "analyzer", - "sha256": "b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139", + "sha256": "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.7.0" + "version": "6.11.0" }, "archive": { "dependency": "transitive", @@ -76,6 +76,16 @@ "source": "hosted", "version": "2.1.1" }, + "buffer": { + "dependency": "transitive", + "description": { + "name": "buffer", + "sha256": "389da2ec2c16283c8787e0adaede82b1842102f8c8aae2f49003a766c5c6b3d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.3" + }, "build": { "dependency": "transitive", "description": { @@ -230,11 +240,11 @@ "dependency": "transitive", "description": { "name": "collection", - "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a", + "sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.18.0" + "version": "1.19.0" }, "console": { "dependency": "transitive", @@ -316,6 +326,16 @@ "source": "hosted", "version": "7.0.1" }, + "discord_rich_presence": { + "dependency": "direct main", + "description": { + "name": "discord_rich_presence", + "sha256": "ed30f3aa310fb96afe1d410ac0263f4f3013943981935332db08a037f340f4fd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, "easy_debounce": { "dependency": "direct main", "description": { @@ -668,21 +688,21 @@ "dependency": "transitive", "description": { "name": "leak_tracker", - "sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05", + "sha256": "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.0.5" + "version": "10.0.7" }, "leak_tracker_flutter_testing": { "dependency": "transitive", "description": { "name": "leak_tracker_flutter_testing", - "sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806", + "sha256": "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.5" + "version": "3.0.8" }, "leak_tracker_testing": { "dependency": "transitive", @@ -728,11 +748,11 @@ "dependency": "transitive", "description": { "name": "macros", - "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536", + "sha256": "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.2-main.4" + "version": "0.1.3-main.0" }, "markdown": { "dependency": "direct main", @@ -1258,7 +1278,7 @@ "dependency": "transitive", "description": "flutter", "source": "sdk", - "version": "0.0.99" + "version": "0.0.0" }, "source_gen": { "dependency": "transitive", @@ -1304,11 +1324,11 @@ "dependency": "transitive", "description": { "name": "stack_trace", - "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", + "sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.11.1" + "version": "1.12.0" }, "stream_channel": { "dependency": "transitive", @@ -1334,11 +1354,11 @@ "dependency": "transitive", "description": { "name": "string_scanner", - "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde", + "sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.0" + "version": "1.3.0" }, "term_glyph": { "dependency": "transitive", @@ -1354,11 +1374,11 @@ "dependency": "transitive", "description": { "name": "test_api", - "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb", + "sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.2" + "version": "0.7.3" }, "timezone": { "dependency": "transitive", @@ -1394,11 +1414,11 @@ "dependency": "transitive", "description": { "name": "typed_data", - "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c", + "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.2" + "version": "1.4.0" }, "url_launcher": { "dependency": "direct main", @@ -1484,11 +1504,11 @@ "dependency": "transitive", "description": { "name": "uuid", - "sha256": "83d37c7ad7aaf9aa8e275490669535c8080377cfa7a7004c24dfac53afffaa90", + "sha256": "a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.4.2" + "version": "4.5.1" }, "vector_math": { "dependency": "transitive", @@ -1514,11 +1534,11 @@ "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d", + "sha256": "f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b", "url": "https://pub.dev" }, "source": "hosted", - "version": "14.2.5" + "version": "14.3.0" }, "watcher": { "dependency": "transitive", @@ -1622,7 +1642,7 @@ } }, "sdks": { - "dart": ">=3.5.0-259.0.dev <4.0.0", + "dart": ">=3.5.3 <4.0.0", "flutter": ">=3.22.0" } } From b17b1f67c1a0e85f8f298ef1237e20148dae4e74 Mon Sep 17 00:00:00 2001 From: emaryn <197520219+emaryn@users.noreply.github.com> Date: Wed, 12 Feb 2025 21:16:54 +0000 Subject: [PATCH 1552/2168] intiface-central: refactor --- pkgs/by-name/in/intiface-central/package.nix | 31 ++++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/in/intiface-central/package.nix b/pkgs/by-name/in/intiface-central/package.nix index ea01452438b3..26ae0d211eba 100644 --- a/pkgs/by-name/in/intiface-central/package.nix +++ b/pkgs/by-name/in/intiface-central/package.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, - flutterPackages, + flutter327, corrosion, rustPlatform, cargo, @@ -10,15 +10,18 @@ copyDesktopItems, makeDesktopItem, }: -flutterPackages.stable.buildFlutterApplication rec { + +flutter327.buildFlutterApplication rec { pname = "intiface-central"; version = "2.6.5"; + src = fetchFromGitHub { owner = "intiface"; repo = "intiface-central"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-goN0750EvGw5G8cb4jy6wWnjlLwlwMeTz4GQEilbwpY="; }; + patches = [ ./corrosion.patch ]; @@ -29,8 +32,9 @@ flutterPackages.stable.buildFlutterApplication rec { name = "${pname}-${version}-cargo-deps"; inherit src; sourceRoot = "${src.name}/intiface-engine-flutter-bridge"; - hash = "sha256-goN0750EvGw5G8cb4jy6wWnjlLwlwMeTz4GQEilbwpY="; + hash = "sha256-z9i0xT0e8G9spOmXpI2yFee/y3ZEh69YqL+7zRWszzA="; }; + cargoRoot = "intiface-engine-flutter-bridge"; preConfigure = '' @@ -45,19 +49,14 @@ flutterPackages.stable.buildFlutterApplication rec { copyDesktopItems ]; - buildInputs = [ - udev - ]; + buildInputs = [ udev ]; # without this, only the splash screen will be shown and the logs will contain the # line `Failed to load dynamic library 'lib/libintiface_engine_flutter_bridge.so'` - # Environmental variables don't quite eval outside of hooks so use pname and - # version directly. - extraWrapProgramArgs = "--chdir $out/app/${pname}"; + extraWrapProgramArgs = "--chdir $out/app/intiface-central"; postInstall = '' - mkdir -p $out/share/pixmaps - cp $out/app/$pname/data/flutter_assets/assets/icons/intiface_central_icon.png $out/share/pixmaps/intiface-central.png + install -Dm644 $out/app/intiface-central/data/flutter_assets/assets/icons/intiface_central_icon.png $out/share/pixmaps/intiface-central.png ''; desktopItems = [ @@ -70,12 +69,12 @@ flutterPackages.stable.buildFlutterApplication rec { }) ]; - meta = with lib; { + meta = { mainProgram = "intiface_central"; description = "Intiface Central (Buttplug Frontend) Application for Desktop"; homepage = "https://intiface.com/"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ _999eagle ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ _999eagle ]; + platforms = lib.platforms.linux; }; } From a4016310457d819bb9523557ec67a663d32a6cbe Mon Sep 17 00:00:00 2001 From: emaryn Date: Wed, 5 Feb 2025 07:27:12 +0800 Subject: [PATCH 1553/2168] sqlpage: 0.29.0 -> 0.32.1 --- pkgs/by-name/sq/sqlpage/package.nix | 50 ++++++++++++----------------- 1 file changed, 20 insertions(+), 30 deletions(-) diff --git a/pkgs/by-name/sq/sqlpage/package.nix b/pkgs/by-name/sq/sqlpage/package.nix index 2b925fdb2333..4da6b416f5da 100644 --- a/pkgs/by-name/sq/sqlpage/package.nix +++ b/pkgs/by-name/sq/sqlpage/package.nix @@ -10,8 +10,8 @@ let apexcharts = fetchurl { - url = "https://cdn.jsdelivr.net/npm/apexcharts@3.52.0/dist/apexcharts.min.js"; - hash = "sha256-2sxp9+shRA5LMxzhgx+fpeQPIY2ZWgBdt4mp5V2Yn+E="; + url = "https://cdn.jsdelivr.net/npm/apexcharts@4.3.0/dist/apexcharts.min.js"; + hash = "sha256-zceUTsCKa8Y2SqjqZjLjifXQDnqsvKRTmT8fTIUix/4="; }; tablerCss = fetchurl { url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/css/tabler.min.css"; @@ -22,37 +22,33 @@ let hash = "sha256-Aa7AUOaz6hJLiUzQStZTy2VPOZyg0ViSo2MCzpDU1tY="; }; tablerJs = fetchurl { - url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/js/tabler.min.js"; - hash = "sha256-ygO5OTRUtYxDDkERRwBCfq+fmakhM6ybwfl6gCCPlAQ="; - }; - listJsFixed = fetchurl { - url = "https://cdn.jsdelivr.net/npm/list.js-fixed@2.3.4/dist/list.min.js"; - hash = "sha256-sYy7qNJW7RTuaNA0jq6Yrtfs57ypYrItZ3f8T7kqfPM="; + url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta21/dist/js/tabler.min.js"; + hash = "sha256-c01wM5Q9GIKYbvvjIaxt67o1CpIBkFMMmz1Dgsi0K7A="; }; tablerIcons = fetchurl { - url = "https://cdn.jsdelivr.net/npm/@tabler/icons-sprite@3.10.0/dist/tabler-sprite.svg"; - hash = "sha256-lEUAtxI+NffqLDllirLgcCRjEgbeCaz9Gkn3Tu9e9F4="; + url = "https://cdn.jsdelivr.net/npm/@tabler/icons-sprite@3.21.0/dist/tabler-sprite.svg"; + hash = "sha256-TUlx6LLnZ7sDN7Xzt+/zAuxLYgUkQSqRgdQm8H4cohY="; }; tomselect = fetchurl { - url = "https://cdn.jsdelivr.net/npm/tom-select@2.3.1/dist/js/tom-select.popular.min.js"; - hash = "sha256-51NcdIM8GseVFFmg8mUWDxfhjLCA+n8kw/Ojyo+6Hjk="; + url = "https://cdn.jsdelivr.net/npm/tom-select@2.4.1/dist/js/tom-select.popular.min.js"; + hash = "sha256-Cb1Xmb9qQO8I1mMVkz4t2bT8l7HX+1JeKncGBSytSHQ="; }; in rustPlatform.buildRustPackage rec { pname = "sqlpage"; - version = "0.29.0"; + version = "0.32.1"; src = fetchFromGitHub { owner = "lovasoa"; repo = "SQLpage"; - rev = "v${version}"; - hash = "sha256-wI+nXrjX98vqyCE6Ofa5KxKUvpLfHqd7KFCsILuOnGk="; + tag = "v${version}"; + hash = "sha256-PfBZCfwXL5/ItBFrEod27BIuWbWR9gVGTfbdxQ/IIuQ="; }; postPatch = '' substituteInPlace sqlpage/apexcharts.js \ - --replace-fail '/* !include https://cdn.jsdelivr.net/npm/apexcharts@3.52.0/dist/apexcharts.min.js */' \ + --replace-fail '/* !include https://cdn.jsdelivr.net/npm/apexcharts@4.3.0/dist/apexcharts.min.js */' \ "$(cat ${apexcharts})" substituteInPlace sqlpage/sqlpage.css \ --replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/css/tabler.min.css */' \ @@ -61,39 +57,33 @@ rustPlatform.buildRustPackage rec { --replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/css/tabler-vendors.min.css */' \ "$(cat ${tablerVendorsCss})" substituteInPlace sqlpage/sqlpage.js \ - --replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/js/tabler.min.js */' \ + --replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta21/dist/js/tabler.min.js */' \ "$(cat ${tablerJs})" - substituteInPlace sqlpage/sqlpage.js \ - --replace-fail '/* !include https://cdn.jsdelivr.net/npm/list.js-fixed@2.3.4/dist/list.min.js */' \ - "$(cat ${listJsFixed})" substituteInPlace sqlpage/tabler-icons.svg \ - --replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/icons-sprite@3.10.0/dist/tabler-sprite.svg */' \ + --replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/icons-sprite@3.21.0/dist/tabler-sprite.svg */' \ "$(cat ${tablerIcons})" substituteInPlace sqlpage/tomselect.js \ - --replace-fail '/* !include https://cdn.jsdelivr.net/npm/tom-select@2.3.1/dist/js/tom-select.popular.min.js */' \ + --replace-fail '/* !include https://cdn.jsdelivr.net/npm/tom-select@2.4.1/dist/js/tom-select.popular.min.js */' \ "$(cat ${tomselect})" ''; useFetchCargoVendor = true; - cargoHash = "sha256-pXmWXHoGbo1YRUjHGVEMZDk4YYqP8XwcDSPWX474Z2c="; - nativeBuildInputs = [ - pkg-config - ]; + cargoHash = "sha256-HbNVBMysowIV62l7eSHu4YaBMIku+IT11jlEgWrjaWE="; + + nativeBuildInputs = [ pkg-config ]; buildInputs = [ sqlite zstd ]; - env = { - ZSTD_SYS_USE_PKG_CONFIG = true; - }; + env.ZSTD_SYS_USE_PKG_CONFIG = true; meta = { description = "SQL-only webapp builder, empowering data analysts to build websites and applications quickly"; homepage = "https://github.com/lovasoa/SQLpage"; - changelog = "https://github.com/lovasoa/SQLpage/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/lovasoa/SQLpage/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dit7ya ]; mainProgram = "sqlpage"; From 6106bc7d42f465cfd7c240a6d6d957e59dc13751 Mon Sep 17 00:00:00 2001 From: emaryn Date: Thu, 6 Feb 2025 11:05:36 +0800 Subject: [PATCH 1554/2168] ardour: format with nixfmt --- pkgs/applications/audio/ardour/default.nix | 288 +++++++++++---------- 1 file changed, 152 insertions(+), 136 deletions(-) diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index b24da8fb3297..bae0b9b9ce4f 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -1,65 +1,66 @@ -{ lib -, stdenv -, fetchgit -, fetchzip -, alsa-lib -, aubio -, boost -, cairomm -, cppunit -, curl -, dbus -, doxygen -, ffmpeg -, fftw -, fftwSinglePrec -, flac -, fluidsynth -, glibc -, glibmm -, graphviz -, gtkmm2 -, harvid -, hidapi -, itstool -, kissfft -, libarchive -, libjack2 -, liblo -, libltc -, libogg -, libpulseaudio -, librdf_rasqal -, libsamplerate -, libsigcxx -, libsndfile -, libusb1 -, libuv -, libwebsockets -, libxml2 -, libxslt -, lilv -, lrdf -, lv2 -, makeWrapper -, pango -, perl -, pkg-config -, python3 -, qm-dsp -, readline -, rubberband -, serd -, sord -, soundtouch -, sratom -, suil -, taglib -, vamp-plugin-sdk -, wafHook -, xjadeo -, optimize ? true # disable to print Lua DSP script output to stdout -, videoSupport ? true +{ + lib, + stdenv, + fetchgit, + fetchzip, + alsa-lib, + aubio, + boost, + cairomm, + cppunit, + curl, + dbus, + doxygen, + ffmpeg, + fftw, + fftwSinglePrec, + flac, + fluidsynth, + glibc, + glibmm, + graphviz, + gtkmm2, + harvid, + hidapi, + itstool, + kissfft, + libarchive, + libjack2, + liblo, + libltc, + libogg, + libpulseaudio, + librdf_rasqal, + libsamplerate, + libsigcxx, + libsndfile, + libusb1, + libuv, + libwebsockets, + libxml2, + libxslt, + lilv, + lrdf, + lv2, + makeWrapper, + pango, + perl, + pkg-config, + python3, + qm-dsp, + readline, + rubberband, + serd, + sord, + soundtouch, + sratom, + suil, + taglib, + vamp-plugin-sdk, + wafHook, + xjadeo, + optimize ? true, # disable to print Lua DSP script output to stdout + videoSupport ? true, }: stdenv.mkDerivation rec { pname = "ardour"; @@ -93,8 +94,8 @@ stdenv.mkDerivation rec { sed 's|/usr/include/libintl.h|${glibc.dev}/include/libintl.h|' -i wscript patchShebangs ./tools/ substituteInPlace libs/ardour/video_tools_paths.cc \ - --replace 'ffmpeg_exe = X_("");' 'ffmpeg_exe = X_("${ffmpeg}/bin/ffmpeg");' \ - --replace 'ffprobe_exe = X_("");' 'ffprobe_exe = X_("${ffmpeg}/bin/ffprobe");' + --replace-fail 'ffmpeg_exe = X_("");' 'ffmpeg_exe = X_("${ffmpeg}/bin/ffmpeg");' \ + --replace-fail 'ffprobe_exe = X_("");' 'ffprobe_exe = X_("${ffmpeg}/bin/ffprobe");' ''; nativeBuildInputs = [ @@ -108,56 +109,61 @@ stdenv.mkDerivation rec { wafHook ]; - buildInputs = [ - alsa-lib - aubio - boost - cairomm - cppunit - curl - dbus - ffmpeg - fftw - fftwSinglePrec - flac - fluidsynth - glibmm - gtkmm2 - hidapi - itstool - kissfft - libarchive - libjack2 - liblo - libltc - libogg - libpulseaudio - librdf_rasqal - libsamplerate - libsigcxx - libsndfile - libusb1 - libuv - libwebsockets - libxml2 - libxslt - lilv - lrdf - lv2 - pango - perl - python3 - qm-dsp - readline - rubberband - serd - sord - soundtouch - sratom - suil - taglib - vamp-plugin-sdk - ] ++ lib.optionals videoSupport [ harvid xjadeo ]; + buildInputs = + [ + alsa-lib + aubio + boost + cairomm + cppunit + curl + dbus + ffmpeg + fftw + fftwSinglePrec + flac + fluidsynth + glibmm + gtkmm2 + hidapi + itstool + kissfft + libarchive + libjack2 + liblo + libltc + libogg + libpulseaudio + librdf_rasqal + libsamplerate + libsigcxx + libsndfile + libusb1 + libuv + libwebsockets + libxml2 + libxslt + lilv + lrdf + lv2 + pango + perl + python3 + qm-dsp + readline + rubberband + serd + sord + soundtouch + sratom + suil + taglib + vamp-plugin-sdk + ] + ++ lib.optionals videoSupport [ + harvid + xjadeo + ]; wafConfigureFlags = [ "--cxx17" @@ -175,29 +181,36 @@ stdenv.mkDerivation rec { # "--use-external-libs" ] ++ lib.optional optimize "--optimize"; - postInstall = '' - # wscript does not install these for some reason - install -vDm 644 "build/gtk2_ardour/ardour.xml" \ - -t "$out/share/mime/packages" - install -vDm 644 "build/gtk2_ardour/ardour${lib.versions.major version}.desktop" \ - -t "$out/share/applications" - for size in 16 22 32 48 256 512; do - install -vDm 644 "gtk2_ardour/resources/Ardour-icon_''${size}px.png" \ - "$out/share/icons/hicolor/''${size}x''${size}/apps/ardour${lib.versions.major version}.png" - done - install -vDm 644 "ardour.1"* -t "$out/share/man/man1" + postInstall = + '' + # wscript does not install these for some reason + install -vDm 644 "build/gtk2_ardour/ardour.xml" \ + -t "$out/share/mime/packages" + install -vDm 644 "build/gtk2_ardour/ardour${lib.versions.major version}.desktop" \ + -t "$out/share/applications" + for size in 16 22 32 48 256 512; do + install -vDm 644 "gtk2_ardour/resources/Ardour-icon_''${size}px.png" \ + "$out/share/icons/hicolor/''${size}x''${size}/apps/ardour${lib.versions.major version}.png" + done + install -vDm 644 "ardour.1"* -t "$out/share/man/man1" - # install additional bundled beats, chords and progressions - cp -rp "${bundledContent}"/* "$out/share/ardour${lib.versions.major version}/media" - '' + lib.optionalString videoSupport '' - # `harvid` and `xjadeo` must be accessible in `PATH` for video to work. - wrapProgram "$out/bin/ardour${lib.versions.major version}" \ - --prefix PATH : "${lib.makeBinPath [ harvid xjadeo ]}" - ''; + # install additional bundled beats, chords and progressions + cp -rp "${bundledContent}"/* "$out/share/ardour${lib.versions.major version}/media" + '' + + lib.optionalString videoSupport '' + # `harvid` and `xjadeo` must be accessible in `PATH` for video to work. + wrapProgram "$out/bin/ardour${lib.versions.major version}" \ + --prefix PATH : "${ + lib.makeBinPath [ + harvid + xjadeo + ] + }" + ''; LINKFLAGS = "-lpthread"; - meta = with lib; { + meta = { description = "Multi-track hard disk recording software"; longDescription = '' Ardour is a digital audio workstation (DAW), You can use it to @@ -209,9 +222,12 @@ stdenv.mkDerivation rec { https://community.ardour.org/donate ''; homepage = "https://ardour.org/"; - license = licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; mainProgram = "ardour8"; - platforms = platforms.linux; - maintainers = with maintainers; [ magnetophon mitchmindtree ]; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + magnetophon + mitchmindtree + ]; }; } From c0148636adf0ca76b1e39d88b9d9a5abf23e4891 Mon Sep 17 00:00:00 2001 From: emaryn Date: Thu, 6 Feb 2025 11:07:58 +0800 Subject: [PATCH 1555/2168] ardour: 8.10 -> 8.11 --- pkgs/applications/audio/ardour/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index bae0b9b9ce4f..45e8e95d2c0a 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -64,14 +64,14 @@ }: stdenv.mkDerivation rec { pname = "ardour"; - version = "8.10"; + version = "8.11"; # We can't use `fetchFromGitea` here, as attempting to fetch release archives from git.ardour.org # result in an empty archive. See https://tracker.ardour.org/view.php?id=7328 for more info. src = fetchgit { url = "git://git.ardour.org/ardour/ardour.git"; rev = version; - hash = "sha256-y4eNo0ukRL6v0T1XvJ46sYnsiVSdL527punnkmf/TIU="; + hash = "sha256-z+rIWFVua1IG4GZ8kH3quKaBbN+I7Yr62vukJZk6KAg="; }; bundledContent = fetchzip { From 9fb53cf2943617f6ac81fb711b75fdede484dcc7 Mon Sep 17 00:00:00 2001 From: emaryn Date: Tue, 11 Feb 2025 20:28:30 +0800 Subject: [PATCH 1556/2168] v2raya: add update script --- pkgs/by-name/v2/v2raya/package.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/by-name/v2/v2raya/package.nix b/pkgs/by-name/v2/v2raya/package.nix index 2d54d4271225..8d12dc057cbd 100644 --- a/pkgs/by-name/v2/v2raya/package.nix +++ b/pkgs/by-name/v2/v2raya/package.nix @@ -14,6 +14,7 @@ v2ray, v2ray-geoip, v2ray-domain-list-community, + nix-update-script, }: let pname = "v2raya"; @@ -87,6 +88,16 @@ buildGoModule { --prefix XDG_DATA_DIRS ":" ${assetsDir}/share ''; + passthru = { + inherit web; + updateScript = nix-update-script { + extraArgs = [ + "--subpackage" + "web" + ]; + }; + }; + meta = { description = "Linux web GUI client of Project V which supports V2Ray, Xray, SS, SSR, Trojan and Pingtunnel"; homepage = "https://github.com/v2rayA/v2rayA"; From d191dc38708b586513c2d2ab2078cc9132cd3269 Mon Sep 17 00:00:00 2001 From: emaryn Date: Tue, 11 Feb 2025 12:32:24 +0000 Subject: [PATCH 1557/2168] v2raya: 2.2.6.3 -> 2.2.6.6 --- pkgs/by-name/v2/v2raya/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/v2/v2raya/package.nix b/pkgs/by-name/v2/v2raya/package.nix index 8d12dc057cbd..5ec5a2eddecb 100644 --- a/pkgs/by-name/v2/v2raya/package.nix +++ b/pkgs/by-name/v2/v2raya/package.nix @@ -18,13 +18,13 @@ }: let pname = "v2raya"; - version = "2.2.6.3"; + version = "2.2.6.6"; src = fetchFromGitHub { owner = "v2rayA"; repo = "v2rayA"; tag = "v${version}"; - hash = "sha256-Du7DqOkneOFBiPK5BeQtnKRsX0Tcuhq8iiugDMGTk7o="; + hash = "sha256-OXydUg9prJ3Rc5yecEqHfv+kyx/rMzzDQdz+lHvPG6k="; postFetch = "sed -i -e 's/npmmirror/yarnpkg/g' $out/gui/yarn.lock"; }; @@ -35,7 +35,7 @@ let offlineCache = fetchYarnDeps { yarnLock = "${src}/gui/yarn.lock"; - hash = "sha256-AexW4FFGkQBQlci/FAm9rpfbPn76v+O3nMX3xHymhPw="; + hash = "sha256-g+hI9n+nfXAcuEpjvDDaHg/DfjtNusOaw3S6kC1QDn4="; }; env.OUTPUT_DIR = placeholder "out"; @@ -61,7 +61,7 @@ buildGoModule { sourceRoot = "${src.name}/service"; - vendorHash = "sha256-kK99Y0CgesvlaM2WsFIPgdtWo2975m9TqyJXoNv43yU="; + vendorHash = "sha256-uiURsB1V4IB77YKLu5gdaqw9Fuja6fC5adWYDE3OE+Q="; ldflags = [ "-s" From 3063e2dafd95b414bdc304c6a1f07cbfb78a3c89 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 21:33:12 +0000 Subject: [PATCH 1558/2168] dinish: 4.005 -> 4.006 --- pkgs/by-name/di/dinish/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/di/dinish/package.nix b/pkgs/by-name/di/dinish/package.nix index 7e316fc56e1a..959fca388c00 100644 --- a/pkgs/by-name/di/dinish/package.nix +++ b/pkgs/by-name/di/dinish/package.nix @@ -7,12 +7,12 @@ stdenvNoCC.mkDerivation rec { pname = "dinish"; - version = "4.005"; + version = "4.006"; src = fetchzip { url = "https://github.com/playbeing/dinish/releases/download/v${version}/dinish-ttf.zip"; stripRoot = false; - hash = "sha256-K4JzqzlxOpy4rIF9kdrQlCIyrykDhnF1p1Q8CDMWBqg="; + hash = "sha256-IWguCiDSeQ+f/saNoyk2pUF/k0pEiFweXinoqOEVWEI="; }; installPhase = '' From b6f382b94c2d4335099ff623f412d2382278e1ae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Jan 2025 20:56:27 +0000 Subject: [PATCH 1559/2168] p3x-onenote: 2024.10.117 -> 2025.4.124 --- pkgs/by-name/p3/p3x-onenote/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/p3/p3x-onenote/package.nix b/pkgs/by-name/p3/p3x-onenote/package.nix index a10c9de5ef66..aaa9908feea4 100644 --- a/pkgs/by-name/p3/p3x-onenote/package.nix +++ b/pkgs/by-name/p3/p3x-onenote/package.nix @@ -8,7 +8,7 @@ let pname = "p3x-onenote"; - version = "2024.10.117"; + version = "2025.4.124"; plat = { @@ -20,9 +20,9 @@ let hash = { - aarch64-linux = "sha256-rBoSdbZhOnpX7mr7Uz5XuO5PB4PKcNMPQP9NqCwiIBc="; - armv7l-linux = "sha256-8XZ3dpYgHCpo5HjDF4R+U5bO6Fidsf0PlEhOoRB1JA0="; - x86_64-linux = "sha256-+VxNxSn4awChWZfsICSiyhoTkEjSz4Ft/Wrech1dY14="; + aarch64-linux = "sha256-SHQEMXyXwaarWJHPDJkkEJNYpHuN093VZn7+qCgsqHI="; + armv7l-linux = "sha256-k++Xfg0/DeGjLlLsdSQGSLs67DVJJmE8FjoS5ycB7UE="; + x86_64-linux = "sha256-A2DGoMj8ET2tXN+uqjwwMwCH7ZmeqZVPKx3CHdcl34I="; } .${stdenv.hostPlatform.system}; From a73aa4dff895f3415b5fad6df58c82a57223211e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 21:37:43 +0000 Subject: [PATCH 1560/2168] cables: 0.5.2 -> 0.5.6 --- pkgs/by-name/ca/cables/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ca/cables/package.nix b/pkgs/by-name/ca/cables/package.nix index 9a77b0a13369..7d13cacc17ea 100644 --- a/pkgs/by-name/ca/cables/package.nix +++ b/pkgs/by-name/ca/cables/package.nix @@ -7,12 +7,12 @@ let pname = "cables"; - version = "0.5.2"; + version = "0.5.6"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/cables-gl/cables_electron/releases/download/v${version}/cables-${version}-linux-x64.AppImage"; - sha256 = "sha256-TJRhuruNo8LtLm0IS0KJRo4upgYowOtvMviHmfsVltc="; + sha256 = "sha256-9kbGcyLl9VC8GJfGB6d5njyIefR0hmMjL/z8E2BnHsQ="; }; appimageContents = appimageTools.extract { From e732ab934f7b68f92b0d470e39747f14a0b51ff5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 21:46:52 +0000 Subject: [PATCH 1561/2168] python312Packages.google-cloud-webrisk: 1.16.0 -> 1.17.0 --- .../python-modules/google-cloud-webrisk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-webrisk/default.nix b/pkgs/development/python-modules/google-cloud-webrisk/default.nix index 4c27bdd30e7b..5f5e8a404200 100644 --- a/pkgs/development/python-modules/google-cloud-webrisk/default.nix +++ b/pkgs/development/python-modules/google-cloud-webrisk/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-webrisk"; - version = "1.16.0"; + version = "1.17.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_webrisk"; inherit version; - hash = "sha256-pF0iqlwXq7wevsmnzkO76I1DlcQdOegmmVo2uF0QAho="; + hash = "sha256-Qcw5LyPhu9ZbYSz3Jnkr8byXiTZfW7BtQapT7MhkEug="; }; build-system = [ setuptools ]; From 914f4e549a2ab540d8449e45f2dd8958e4ef46f2 Mon Sep 17 00:00:00 2001 From: emaryn Date: Sun, 9 Feb 2025 23:03:58 +0800 Subject: [PATCH 1562/2168] wcslib: fix noBrokenSymlinks --- pkgs/by-name/wc/wcslib/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/wc/wcslib/package.nix b/pkgs/by-name/wc/wcslib/package.nix index 95bb428218ca..d4f7dafa7bcf 100644 --- a/pkgs/by-name/wc/wcslib/package.nix +++ b/pkgs/by-name/wc/wcslib/package.nix @@ -23,6 +23,15 @@ stdenv.mkDerivation rec { "man" ]; + # DOCDIR is set to the path $out/share/doc/wcslib, and DOCLINK points + # to the same location. + # `$(LN_S) $(notdir $(DOCDIR)) $(DOCLINK)` effectively running: + # `ln -s wcslib $out/share/doc/wcslib` + # This produces a broken link because the target location already exists + postInstall = '' + rm $out/share/doc/wcslib/wcslib + ''; + meta = { homepage = "https://www.atnf.csiro.au/people/mcalabre/WCS/"; description = "World Coordinate System library for astronomy"; From 9cddbd5a5fc277a91714b8a87ae78df8d4ed3218 Mon Sep 17 00:00:00 2001 From: Raroh73 <96078496+Raroh73@users.noreply.github.com> Date: Wed, 12 Feb 2025 22:48:44 +0100 Subject: [PATCH 1563/2168] vscode-extensions: use sri hashes in update script --- .../editors/vscode/extensions/update_installed_exts.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/update_installed_exts.sh b/pkgs/applications/editors/vscode/extensions/update_installed_exts.sh index 17fe10604340..dd2e8ef24789 100755 --- a/pkgs/applications/editors/vscode/extensions/update_installed_exts.sh +++ b/pkgs/applications/editors/vscode/extensions/update_installed_exts.sh @@ -43,8 +43,8 @@ function get_vsixpkg() { curl --silent --show-error --retry 3 --fail -X GET -o "$EXTTMP/$N.zip" "$URL" # Unpack the file we need to stdout then pull out the version VER=$(jq -r '.version' <(unzip -qc "$EXTTMP/$N.zip" "extension/package.json")) - # Calculate the SHA - SHA=$(nix-hash --flat --base32 --type sha256 "$EXTTMP/$N.zip") + # Calculate the hash + HASH=$(nix-hash --flat --sri --type sha256 "$EXTTMP/$N.zip") # Clean up. rm -Rf "$EXTTMP" @@ -55,7 +55,7 @@ function get_vsixpkg() { name = "$2"; publisher = "$1"; version = "$VER"; - sha256 = "$SHA"; + hash = "$HASH"; } EOF } From 7154fddcc90611e73a3c6a8d99ac583c3ce4de60 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 21:59:56 +0000 Subject: [PATCH 1564/2168] python312Packages.google-cloud-workstations: 0.5.11 -> 0.5.12 --- .../python-modules/google-cloud-workstations/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-workstations/default.nix b/pkgs/development/python-modules/google-cloud-workstations/default.nix index eb5dd99d91c9..258cf40d910a 100644 --- a/pkgs/development/python-modules/google-cloud-workstations/default.nix +++ b/pkgs/development/python-modules/google-cloud-workstations/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-cloud-workstations"; - version = "0.5.11"; + version = "0.5.12"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_workstations"; inherit version; - hash = "sha256-nJ19hGiBvoNz820kdvHd9pCCy9VRQDouG0cWcnELIDE="; + hash = "sha256-WSfi5W4QovtgOT9fJA8UKIrUepGHGkwz5BIgy/Miiw0="; }; build-system = [ setuptools ]; From 95917979db2a16f7e5401043fc9fdcc67ac6522f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 12 Feb 2025 19:02:06 -0300 Subject: [PATCH 1565/2168] vimix-icon-theme: 2023-06-26 -> 2025.02.10 Diff: https://github.com/vinceliuice/vimix-icon-theme/compare/2023-06-26...2025.02.10 --- pkgs/by-name/vi/vimix-icon-theme/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vi/vimix-icon-theme/package.nix b/pkgs/by-name/vi/vimix-icon-theme/package.nix index 9c0e0d9b9f7f..eefc7aed915a 100644 --- a/pkgs/by-name/vi/vimix-icon-theme/package.nix +++ b/pkgs/by-name/vi/vimix-icon-theme/package.nix @@ -29,13 +29,13 @@ lib.checkListOfEnum "${pname}: color variants" stdenvNoCC.mkDerivation rec { inherit pname; - version = "2023-06-26"; + version = "2025.02.10"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "5pTYsWdmjSDyrEK+Jbg/9dQ1FHI2rdnr1n0Ysd5mg/U="; + hash = "sha256-HNwEqp6G9nZDIJo9b6FD4d5NSXUx523enENM0NVwviA="; }; nativeBuildInputs = [ From 35f91859e194b7ba16e1abf6d20de68c241d9c9e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 22:04:28 +0000 Subject: [PATCH 1566/2168] python312Packages.google-cloud-shell: 1.11.0 -> 1.12.0 --- .../development/python-modules/google-cloud-shell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-shell/default.nix b/pkgs/development/python-modules/google-cloud-shell/default.nix index e998a0a0c176..3710d414e70f 100644 --- a/pkgs/development/python-modules/google-cloud-shell/default.nix +++ b/pkgs/development/python-modules/google-cloud-shell/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-shell"; - version = "1.11.0"; + version = "1.12.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_shell"; inherit version; - hash = "sha256-3afGvjHYLw5zSjBDdd3TjxJHippIhA8ITQNeSgpz/DU="; + hash = "sha256-PQzFvc/ZGAp6SsMGT2mMQJN5feaI5E7WSODWccRNYx4="; }; build-system = [ setuptools ]; From 7105e40ef413895fb4910c98ca174d27c4c676af Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 22:04:32 +0000 Subject: [PATCH 1567/2168] python312Packages.google-cloud-workflows: 1.16.0 -> 1.17.0 --- .../python-modules/google-cloud-workflows/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-workflows/default.nix b/pkgs/development/python-modules/google-cloud-workflows/default.nix index 46052fe8efd3..039d0920a014 100644 --- a/pkgs/development/python-modules/google-cloud-workflows/default.nix +++ b/pkgs/development/python-modules/google-cloud-workflows/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "google-cloud-workflows"; - version = "1.16.0"; + version = "1.17.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_workflows"; inherit version; - hash = "sha256-R53c1m6VYhkLlWl1jTR++R5ahWUTvEvtsRUPQ1F3Das="; + hash = "sha256-RPQLMizULGQBwxdKfvInbEA9O7+JsWjg9dFwkFj29IM="; }; build-system = [ setuptools ]; From 84532bff9aa47816e954d219c5af6eb2ac8a3462 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 22:23:36 +0000 Subject: [PATCH 1568/2168] python312Packages.yolink-api: 0.4.7 -> 0.4.8 --- pkgs/development/python-modules/yolink-api/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/yolink-api/default.nix b/pkgs/development/python-modules/yolink-api/default.nix index 80834f03b2e6..9567a71e43ed 100644 --- a/pkgs/development/python-modules/yolink-api/default.nix +++ b/pkgs/development/python-modules/yolink-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "yolink-api"; - version = "0.4.7"; + version = "0.4.8"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "YoSmart-Inc"; repo = "yolink-api"; tag = "v${version}"; - hash = "sha256-VJqKORyAlTBIRsHaeUrLDuvVAU/EX/Zzh8u7xxmD2IE="; + hash = "sha256-hPvw0jCLaySWE9/9YRP4/PZPxpMpvgXeUywKD2InHf8="; }; build-system = [ setuptools ]; @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to interface with Yolink"; homepage = "https://github.com/YoSmart-Inc/yolink-api"; - changelog = "https://github.com/YoSmart-Inc/yolink-api/releases/tag/v${version}"; + changelog = "https://github.com/YoSmart-Inc/yolink-api/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From d6e849ee03d1849bd5151c651e66a8731a0c4891 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 12 Feb 2025 22:27:53 +0000 Subject: [PATCH 1569/2168] nixos-rebuild-ng: {assert_called_with,assert_has_calls} -> {call_args,call_args_list} This allow usage of pytest's `assert`, allowing for better diffs when there are errors, and also removes the need of asserting for `call_count`. --- .../nixos-rebuild-ng/src/tests/test_main.py | 1031 ++++++++--------- .../nixos-rebuild-ng/src/tests/test_models.py | 10 +- .../ni/nixos-rebuild-ng/src/tests/test_nix.py | 327 +++--- .../src/tests/test_process.py | 13 +- 4 files changed, 677 insertions(+), 704 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py index 9ae6bf50a080..823bc9bff536 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py @@ -4,7 +4,7 @@ import uuid from pathlib import Path from subprocess import PIPE, CompletedProcess from typing import Any -from unittest.mock import ANY, call, patch +from unittest.mock import ANY, Mock, call, patch import pytest @@ -127,7 +127,7 @@ def test_parse_args() -> None: @patch.dict(nr.process.os.environ, {}, clear=True) @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) -def test_execute_nix_boot(mock_run: Any, tmp_path: Path) -> None: +def test_execute_nix_boot(mock_run: Mock, tmp_path: Path) -> None: nixpkgs_path = tmp_path / "nixpkgs" nixpkgs_path.mkdir() config_path = tmp_path / "test" @@ -147,62 +147,59 @@ def test_execute_nix_boot(mock_run: Any, tmp_path: Path) -> None: nr.execute(["nixos-rebuild", "boot", "--no-flake", "-vvv", "--no-reexec"]) - assert mock_run.call_count == 6 - mock_run.assert_has_calls( - [ - call( - ["nix-instantiate", "--find-file", "nixpkgs", "-vvv"], - stdout=PIPE, - check=False, - **DEFAULT_RUN_KWARGS, - ), - call( - ["git", "-C", nixpkgs_path, "rev-parse", "--short", "HEAD"], - check=False, - capture_output=True, - **DEFAULT_RUN_KWARGS, - ), - call( - ["git", "-C", nixpkgs_path, "diff", "--quiet"], - check=False, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "nix-build", - "", - "--attr", - "config.system.build.toplevel", - "-vvv", - "--no-out-link", - ], - check=True, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "nix-env", - "-p", - Path("/nix/var/nix/profiles/system"), - "--set", - config_path, - ], - check=True, - **DEFAULT_RUN_KWARGS, - ), - call( - [config_path / "bin/switch-to-configuration", "boot"], - check=True, - **(DEFAULT_RUN_KWARGS | {"env": {"NIXOS_INSTALL_BOOTLOADER": "0"}}), - ), - ] - ) + assert mock_run.call_args_list == [ + call( + ["nix-instantiate", "--find-file", "nixpkgs", "-vvv"], + stdout=PIPE, + check=False, + **DEFAULT_RUN_KWARGS, + ), + call( + ["git", "-C", nixpkgs_path, "rev-parse", "--short", "HEAD"], + check=False, + capture_output=True, + **DEFAULT_RUN_KWARGS, + ), + call( + ["git", "-C", nixpkgs_path, "diff", "--quiet"], + check=False, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "nix-build", + "", + "--attr", + "config.system.build.toplevel", + "-vvv", + "--no-out-link", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "nix-env", + "-p", + Path("/nix/var/nix/profiles/system"), + "--set", + config_path, + ], + check=True, + **DEFAULT_RUN_KWARGS, + ), + call( + [config_path / "bin/switch-to-configuration", "boot"], + check=True, + **(DEFAULT_RUN_KWARGS | {"env": {"NIXOS_INSTALL_BOOTLOADER": "0"}}), + ), + ] @patch.dict(nr.process.os.environ, {}, clear=True) @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) -def test_execute_nix_build_vm(mock_run: Any, tmp_path: Path) -> None: +def test_execute_nix_build_vm(mock_run: Mock, tmp_path: Path) -> None: config_path = tmp_path / "test" config_path.touch() @@ -227,31 +224,28 @@ def test_execute_nix_build_vm(mock_run: Any, tmp_path: Path) -> None: ] ) - assert mock_run.call_count == 1 - mock_run.assert_has_calls( - [ - call( - [ - "nix-build", - "", - "--attr", - "config.system.build.vm", - "--include", - "nixos-config=./configuration.nix", - "--include", - "nixpkgs=$HOME/.nix-defexpr/channels/pinned_nixpkgs", - ], - check=True, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ) - ] - ) + assert mock_run.call_args_list == [ + call( + [ + "nix-build", + "", + "--attr", + "config.system.build.vm", + "--include", + "nixos-config=./configuration.nix", + "--include", + "nixpkgs=$HOME/.nix-defexpr/channels/pinned_nixpkgs", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ) + ] @patch.dict(nr.process.os.environ, {}, clear=True) @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) -def test_execute_nix_build_image_flake(mock_run: Any, tmp_path: Path) -> None: +def test_execute_nix_build_image_flake(mock_run: Mock, tmp_path: Path) -> None: config_path = tmp_path / "test" config_path.touch() @@ -285,42 +279,39 @@ def test_execute_nix_build_image_flake(mock_run: Any, tmp_path: Path) -> None: ] ) - assert mock_run.call_count == 2 - mock_run.assert_has_calls( - [ - call( - [ - "nix", - "eval", - "--json", - "/path/to/config#nixosConfigurations.hostname.config.system.build.images", - "--apply", - "builtins.mapAttrs (n: v: v.passthru.filePath)", - ], - check=True, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "nix", - "--extra-experimental-features", - "nix-command flakes", - "build", - "--print-out-paths", - "/path/to/config#nixosConfigurations.hostname.config.system.build.images.azure", - ], - check=True, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ), - ] - ) + assert mock_run.call_args_list == [ + call( + [ + "nix", + "eval", + "--json", + "/path/to/config#nixosConfigurations.hostname.config.system.build.images", + "--apply", + "builtins.mapAttrs (n: v: v.passthru.filePath)", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "nix", + "--extra-experimental-features", + "nix-command flakes", + "build", + "--print-out-paths", + "/path/to/config#nixosConfigurations.hostname.config.system.build.images.azure", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + ] @patch.dict(nr.process.os.environ, {}, clear=True) @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) -def test_execute_nix_switch_flake(mock_run: Any, tmp_path: Path) -> None: +def test_execute_nix_switch_flake(mock_run: Mock, tmp_path: Path) -> None: config_path = tmp_path / "test" config_path.touch() @@ -349,46 +340,43 @@ def test_execute_nix_switch_flake(mock_run: Any, tmp_path: Path) -> None: ] ) - assert mock_run.call_count == 3 - mock_run.assert_has_calls( - [ - call( - [ - "nix", - "--extra-experimental-features", - "nix-command flakes", - "build", - "--print-out-paths", - "/path/to/config#nixosConfigurations.hostname.config.system.build.toplevel", - "-v", - "--option", - "narinfo-cache-negative-ttl", - "1200", - "--no-link", - ], - check=True, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "sudo", - "nix-env", - "-p", - Path("/nix/var/nix/profiles/system"), - "--set", - config_path, - ], - check=True, - **DEFAULT_RUN_KWARGS, - ), - call( - ["sudo", config_path / "bin/switch-to-configuration", "switch"], - check=True, - **(DEFAULT_RUN_KWARGS | {"env": {"NIXOS_INSTALL_BOOTLOADER": "1"}}), - ), - ] - ) + assert mock_run.call_args_list == [ + call( + [ + "nix", + "--extra-experimental-features", + "nix-command flakes", + "build", + "--print-out-paths", + "/path/to/config#nixosConfigurations.hostname.config.system.build.toplevel", + "-v", + "--option", + "narinfo-cache-negative-ttl", + "1200", + "--no-link", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "sudo", + "nix-env", + "-p", + Path("/nix/var/nix/profiles/system"), + "--set", + config_path, + ], + check=True, + **DEFAULT_RUN_KWARGS, + ), + call( + ["sudo", config_path / "bin/switch-to-configuration", "switch"], + check=True, + **(DEFAULT_RUN_KWARGS | {"env": {"NIXOS_INSTALL_BOOTLOADER": "1"}}), + ), + ] @patch.dict(nr.process.os.environ, {}, clear=True) @@ -396,9 +384,9 @@ def test_execute_nix_switch_flake(mock_run: Any, tmp_path: Path) -> None: @patch(get_qualified_name(nr.cleanup_ssh, nr), autospec=True) @patch(get_qualified_name(nr.nix.uuid4, nr.nix), autospec=True) def test_execute_nix_switch_build_target_host( - mock_uuid4: Any, - mock_cleanup_ssh: Any, - mock_run: Any, + mock_uuid4: Mock, + mock_cleanup_ssh: Mock, + mock_run: Mock, tmp_path: Path, ) -> None: config_path = tmp_path / "test" @@ -442,157 +430,154 @@ def test_execute_nix_switch_build_target_host( ] ) - assert mock_run.call_count == 10 - mock_run.assert_has_calls( - [ - call( - [ - "nix-instantiate", - "--find-file", - "nixpkgs", - "--include", - "nixos-config=./configuration.nix", - "--include", - "nixpkgs=$HOME/.nix-defexpr/channels/pinned_nixpkgs", - ], - check=False, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "nix-instantiate", - "", - "--attr", - "config.system.build.toplevel", - "--add-root", - nr.tmpdir.TMPDIR_PATH / "00000000000000000000000000000000", - "--include", - "nixos-config=./configuration.nix", - "--include", - "nixpkgs=$HOME/.nix-defexpr/channels/pinned_nixpkgs", - ], - check=True, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ), - call( - ["nix-copy-closure", "--to", "user@build-host", config_path], - check=True, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "ssh", - *nr.process.SSH_DEFAULT_OPTS, - "user@build-host", - "--", - "mktemp", - "-d", - "-t", - "nixos-rebuild.XXXXX", - ], - check=True, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "ssh", - *nr.process.SSH_DEFAULT_OPTS, - "user@build-host", - "--", - "nix-store", - "--realise", - str(config_path), - "--add-root", - "/tmp/tmpdir/00000000000000000000000000000000", - ], - check=True, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "ssh", - *nr.process.SSH_DEFAULT_OPTS, - "user@build-host", - "--", - "readlink", - "-f", - "/tmp/tmpdir/config", - ], - check=True, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "ssh", - *nr.process.SSH_DEFAULT_OPTS, - "user@build-host", - "--", - "rm", - "-rf", - "/tmp/tmpdir", - ], - check=False, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "nix", - "copy", - "--from", - "ssh://user@build-host", - "--to", - "ssh://user@target-host", - config_path, - ], - check=True, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "ssh", - *nr.process.SSH_DEFAULT_OPTS, - "user@target-host", - "--", - "sudo", - "nix-env", - "-p", - "/nix/var/nix/profiles/system", - "--set", - str(config_path), - ], - check=True, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "ssh", - *nr.process.SSH_DEFAULT_OPTS, - "user@target-host", - "--", - "sudo", - "env", - "NIXOS_INSTALL_BOOTLOADER=0", - str(config_path / "bin/switch-to-configuration"), - "switch", - ], - check=True, - **DEFAULT_RUN_KWARGS, - ), - ] - ) + assert mock_run.call_args_list == [ + call( + [ + "nix-instantiate", + "--find-file", + "nixpkgs", + "--include", + "nixos-config=./configuration.nix", + "--include", + "nixpkgs=$HOME/.nix-defexpr/channels/pinned_nixpkgs", + ], + check=False, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "nix-instantiate", + "", + "--attr", + "config.system.build.toplevel", + "--add-root", + nr.tmpdir.TMPDIR_PATH / "00000000000000000000000000000000", + "--include", + "nixos-config=./configuration.nix", + "--include", + "nixpkgs=$HOME/.nix-defexpr/channels/pinned_nixpkgs", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + ["nix-copy-closure", "--to", "user@build-host", config_path], + check=True, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "ssh", + *nr.process.SSH_DEFAULT_OPTS, + "user@build-host", + "--", + "mktemp", + "-d", + "-t", + "nixos-rebuild.XXXXX", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "ssh", + *nr.process.SSH_DEFAULT_OPTS, + "user@build-host", + "--", + "nix-store", + "--realise", + str(config_path), + "--add-root", + "/tmp/tmpdir/00000000000000000000000000000000", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "ssh", + *nr.process.SSH_DEFAULT_OPTS, + "user@build-host", + "--", + "readlink", + "-f", + "/tmp/tmpdir/config", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "ssh", + *nr.process.SSH_DEFAULT_OPTS, + "user@build-host", + "--", + "rm", + "-rf", + "/tmp/tmpdir", + ], + check=False, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "nix", + "copy", + "--from", + "ssh://user@build-host", + "--to", + "ssh://user@target-host", + config_path, + ], + check=True, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "ssh", + *nr.process.SSH_DEFAULT_OPTS, + "user@target-host", + "--", + "sudo", + "nix-env", + "-p", + "/nix/var/nix/profiles/system", + "--set", + str(config_path), + ], + check=True, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "ssh", + *nr.process.SSH_DEFAULT_OPTS, + "user@target-host", + "--", + "sudo", + "env", + "NIXOS_INSTALL_BOOTLOADER=0", + str(config_path / "bin/switch-to-configuration"), + "switch", + ], + check=True, + **DEFAULT_RUN_KWARGS, + ), + ] @patch.dict(nr.process.os.environ, {}, clear=True) @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) @patch(get_qualified_name(nr.cleanup_ssh, nr), autospec=True) def test_execute_nix_switch_flake_target_host( - mock_cleanup_ssh: Any, - mock_run: Any, + mock_cleanup_ssh: Mock, + mock_run: Mock, tmp_path: Path, ) -> None: config_path = tmp_path / "test" @@ -619,69 +604,66 @@ def test_execute_nix_switch_flake_target_host( ] ) - assert mock_run.call_count == 4 - mock_run.assert_has_calls( - [ - call( - [ - "nix", - "--extra-experimental-features", - "nix-command flakes", - "build", - "--print-out-paths", - "/path/to/config#nixosConfigurations.hostname.config.system.build.toplevel", - "--no-link", - ], - check=True, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ), - call( - ["nix-copy-closure", "--to", "user@localhost", config_path], - check=True, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "ssh", - *nr.process.SSH_DEFAULT_OPTS, - "user@localhost", - "--", - "sudo", - "nix-env", - "-p", - "/nix/var/nix/profiles/system", - "--set", - str(config_path), - ], - check=True, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "ssh", - *nr.process.SSH_DEFAULT_OPTS, - "user@localhost", - "--", - "sudo", - "env", - "NIXOS_INSTALL_BOOTLOADER=0", - str(config_path / "bin/switch-to-configuration"), - "switch", - ], - check=True, - **DEFAULT_RUN_KWARGS, - ), - ] - ) + assert mock_run.call_args_list == [ + call( + [ + "nix", + "--extra-experimental-features", + "nix-command flakes", + "build", + "--print-out-paths", + "/path/to/config#nixosConfigurations.hostname.config.system.build.toplevel", + "--no-link", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + ["nix-copy-closure", "--to", "user@localhost", config_path], + check=True, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "ssh", + *nr.process.SSH_DEFAULT_OPTS, + "user@localhost", + "--", + "sudo", + "nix-env", + "-p", + "/nix/var/nix/profiles/system", + "--set", + str(config_path), + ], + check=True, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "ssh", + *nr.process.SSH_DEFAULT_OPTS, + "user@localhost", + "--", + "sudo", + "env", + "NIXOS_INSTALL_BOOTLOADER=0", + str(config_path / "bin/switch-to-configuration"), + "switch", + ], + check=True, + **DEFAULT_RUN_KWARGS, + ), + ] @patch.dict(nr.process.os.environ, {}, clear=True) @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) @patch(get_qualified_name(nr.cleanup_ssh, nr), autospec=True) def test_execute_nix_switch_flake_build_host( - mock_cleanup_ssh: Any, - mock_run: Any, + mock_cleanup_ssh: Mock, + mock_run: Mock, tmp_path: Path, ) -> None: config_path = tmp_path / "test" @@ -709,77 +691,74 @@ def test_execute_nix_switch_flake_build_host( ] ) - assert mock_run.call_count == 6 - mock_run.assert_has_calls( - [ - call( - [ - "nix", - "--extra-experimental-features", - "nix-command flakes", - "eval", - "--raw", - "/path/to/config#nixosConfigurations.hostname.config.system.build.toplevel.drvPath", - ], - check=True, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ), - call( - ["nix-copy-closure", "--to", "user@localhost", config_path], - check=True, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "ssh", - *nr.process.SSH_DEFAULT_OPTS, - "user@localhost", - "--", - "nix", - "--extra-experimental-features", - "'nix-command flakes'", - "build", - f"'{config_path}^*'", - "--print-out-paths", - "--no-link", - ], - check=True, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "nix-copy-closure", - "--from", - "user@localhost", - config_path, - ], - check=True, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "nix-env", - "-p", - Path("/nix/var/nix/profiles/system"), - "--set", - config_path, - ], - check=True, - **DEFAULT_RUN_KWARGS, - ), - call( - [config_path / "bin/switch-to-configuration", "switch"], - check=True, - **DEFAULT_RUN_KWARGS, - ), - ] - ) + assert mock_run.call_args_list == [ + call( + [ + "nix", + "--extra-experimental-features", + "nix-command flakes", + "eval", + "--raw", + "/path/to/config#nixosConfigurations.hostname.config.system.build.toplevel.drvPath", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + ["nix-copy-closure", "--to", "user@localhost", config_path], + check=True, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "ssh", + *nr.process.SSH_DEFAULT_OPTS, + "user@localhost", + "--", + "nix", + "--extra-experimental-features", + "'nix-command flakes'", + "build", + f"'{config_path}^*'", + "--print-out-paths", + "--no-link", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "nix-copy-closure", + "--from", + "user@localhost", + config_path, + ], + check=True, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "nix-env", + "-p", + Path("/nix/var/nix/profiles/system"), + "--set", + config_path, + ], + check=True, + **DEFAULT_RUN_KWARGS, + ), + call( + [config_path / "bin/switch-to-configuration", "switch"], + check=True, + **DEFAULT_RUN_KWARGS, + ), + ] @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) -def test_execute_switch_rollback(mock_run: Any, tmp_path: Path) -> None: +def test_execute_switch_rollback(mock_run: Mock, tmp_path: Path) -> None: nixpkgs_path = tmp_path / "nixpkgs" nixpkgs_path.touch() @@ -804,52 +783,49 @@ def test_execute_switch_rollback(mock_run: Any, tmp_path: Path) -> None: ] ) - assert mock_run.call_count == 4 - mock_run.assert_has_calls( - [ - call( - ["nix-instantiate", "--find-file", "nixpkgs"], - check=False, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "git", - "-C", - nixpkgs_path, - "rev-parse", - "--short", - "HEAD", - ], - check=False, - capture_output=True, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "nix-env", - "--rollback", - "-p", - Path("/nix/var/nix/profiles/system"), - ], - check=True, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - Path("/nix/var/nix/profiles/system/bin/switch-to-configuration"), - "switch", - ], - check=True, - **DEFAULT_RUN_KWARGS, - ), - ] - ) + assert mock_run.call_args_list == [ + call( + ["nix-instantiate", "--find-file", "nixpkgs"], + check=False, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "git", + "-C", + nixpkgs_path, + "rev-parse", + "--short", + "HEAD", + ], + check=False, + capture_output=True, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "nix-env", + "--rollback", + "-p", + Path("/nix/var/nix/profiles/system"), + ], + check=True, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + Path("/nix/var/nix/profiles/system/bin/switch-to-configuration"), + "switch", + ], + check=True, + **DEFAULT_RUN_KWARGS, + ), + ] @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) -def test_execute_build(mock_run: Any, tmp_path: Path) -> None: +def test_execute_build(mock_run: Mock, tmp_path: Path) -> None: config_path = tmp_path / "test" config_path.touch() mock_run.side_effect = [ @@ -859,26 +835,23 @@ def test_execute_build(mock_run: Any, tmp_path: Path) -> None: nr.execute(["nixos-rebuild", "build", "--no-flake", "--no-reexec"]) - assert mock_run.call_count == 1 - mock_run.assert_has_calls( - [ - call( - [ - "nix-build", - "", - "--attr", - "config.system.build.toplevel", - ], - check=True, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ) - ] - ) + assert mock_run.call_args_list == [ + call( + [ + "nix-build", + "", + "--attr", + "config.system.build.toplevel", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ) + ] @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) -def test_execute_test_flake(mock_run: Any, tmp_path: Path) -> None: +def test_execute_test_flake(mock_run: Mock, tmp_path: Path) -> None: config_path = tmp_path / "test" config_path.touch() @@ -894,38 +867,35 @@ def test_execute_test_flake(mock_run: Any, tmp_path: Path) -> None: ["nixos-rebuild", "test", "--flake", "github:user/repo#hostname", "--no-reexec"] ) - assert mock_run.call_count == 2 - mock_run.assert_has_calls( - [ - call( - [ - "nix", - "--extra-experimental-features", - "nix-command flakes", - "build", - "--print-out-paths", - "github:user/repo#nixosConfigurations.hostname.config.system.build.toplevel", - ], - check=True, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ), - call( - [config_path / "bin/switch-to-configuration", "test"], - check=True, - **DEFAULT_RUN_KWARGS, - ), - ] - ) + assert mock_run.call_args_list == [ + call( + [ + "nix", + "--extra-experimental-features", + "nix-command flakes", + "build", + "--print-out-paths", + "github:user/repo#nixosConfigurations.hostname.config.system.build.toplevel", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + [config_path / "bin/switch-to-configuration", "test"], + check=True, + **DEFAULT_RUN_KWARGS, + ), + ] @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) @patch(get_qualified_name(nr.nix.Path.exists, nr.nix), autospec=True, return_value=True) @patch(get_qualified_name(nr.nix.Path.mkdir, nr.nix), autospec=True) def test_execute_test_rollback( - mock_path_mkdir: Any, - mock_path_exists: Any, - mock_run: Any, + mock_path_mkdir: Mock, + mock_path_exists: Mock, + mock_run: Mock, ) -> None: def run_side_effect(args: list[str], **kwargs: Any) -> CompletedProcess[str]: if args[0] == "nix-env": @@ -947,29 +917,26 @@ def test_execute_test_rollback( ["nixos-rebuild", "test", "--rollback", "--profile-name", "foo", "--no-reexec"] ) - assert mock_run.call_count == 2 - mock_run.assert_has_calls( - [ - call( - [ - "nix-env", - "-p", - Path("/nix/var/nix/profiles/system-profiles/foo"), - "--list-generations", - ], - check=True, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - Path( - "/nix/var/nix/profiles/system-profiles/foo-2083-link/bin/switch-to-configuration" - ), - "test", - ], - check=True, - **DEFAULT_RUN_KWARGS, - ), - ] - ) + assert mock_run.call_args_list == [ + call( + [ + "nix-env", + "-p", + Path("/nix/var/nix/profiles/system-profiles/foo"), + "--list-generations", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + Path( + "/nix/var/nix/profiles/system-profiles/foo-2083-link/bin/switch-to-configuration" + ), + "test", + ], + check=True, + **DEFAULT_RUN_KWARGS, + ), + ] diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py index e02fc69848fb..cb318192fc2e 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py @@ -1,8 +1,7 @@ import platform import subprocess from pathlib import Path -from typing import Any -from unittest.mock import patch +from unittest.mock import Mock, patch from pytest import MonkeyPatch @@ -79,7 +78,9 @@ def test_flake_to_attr() -> None: @patch(get_qualified_name(platform.node), autospec=True) -def test_flake_from_arg(mock_node: Any, monkeypatch: MonkeyPatch, tmpdir: Path) -> None: +def test_flake_from_arg( + mock_node: Mock, monkeypatch: MonkeyPatch, tmpdir: Path +) -> None: mock_node.return_value = "hostname" # Flake string @@ -161,11 +162,12 @@ def test_flake_from_arg(mock_node: Any, monkeypatch: MonkeyPatch, tmpdir: Path) @patch(get_qualified_name(m.Path.mkdir, m), autospec=True) -def test_profile_from_arg(mock_mkdir: Any) -> None: +def test_profile_from_arg(mock_mkdir: Mock) -> None: assert m.Profile.from_arg("system") == m.Profile( "system", Path("/nix/var/nix/profiles/system"), ) + mock_mkdir.assert_not_called() assert m.Profile.from_arg("something") == m.Profile( "something", diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py index 35fea00cbeef..861ba7ae0617 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py @@ -3,7 +3,7 @@ import uuid from pathlib import Path from subprocess import PIPE, CompletedProcess from typing import Any -from unittest.mock import ANY, call, patch +from unittest.mock import ANY, Mock, call, patch import pytest from pytest import MonkeyPatch @@ -20,13 +20,13 @@ from .helpers import get_qualified_name autospec=True, return_value=CompletedProcess([], 0, stdout=" \n/path/to/file\n "), ) -def test_build(mock_run: Any) -> None: +def test_build(mock_run: Mock) -> None: assert n.build( "config.system.build.attr", m.BuildAttr("", None), {"nix_flag": "foo"}, ) == Path("/path/to/file") - mock_run.assert_called_with( + assert mock_run.call_args == call( [ "nix-build", "", @@ -38,13 +38,17 @@ def test_build(mock_run: Any) -> None: stdout=PIPE, ) + mock_run.reset_mock() + assert n.build( "config.system.build.attr", m.BuildAttr(Path("file"), "preAttr") ) == Path("/path/to/file") - mock_run.assert_called_with( - ["nix-build", Path("file"), "--attr", "preAttr.config.system.build.attr"], - stdout=PIPE, - ) + assert mock_run.call_args_list == [ + call( + ["nix-build", Path("file"), "--attr", "preAttr.config.system.build.attr"], + stdout=PIPE, + ) + ] @patch( @@ -52,7 +56,7 @@ def test_build(mock_run: Any) -> None: autospec=True, return_value=CompletedProcess([], 0, stdout=" \n/path/to/file\n "), ) -def test_build_flake(mock_run: Any, monkeypatch: MonkeyPatch, tmpdir: Path) -> None: +def test_build_flake(mock_run: Mock, monkeypatch: MonkeyPatch, tmpdir: Path) -> None: monkeypatch.chdir(tmpdir) flake = m.Flake.parse(".#hostname") @@ -61,7 +65,7 @@ def test_build_flake(mock_run: Any, monkeypatch: MonkeyPatch, tmpdir: Path) -> N flake, {"no_link": True, "nix_flag": "foo"}, ) == Path("/path/to/file") - mock_run.assert_called_with( + assert mock_run.call_args == call( [ "nix", "--extra-experimental-features", @@ -79,7 +83,9 @@ def test_build_flake(mock_run: Any, monkeypatch: MonkeyPatch, tmpdir: Path) -> N @patch(get_qualified_name(n.run_wrapper, n), autospec=True) @patch(get_qualified_name(n.uuid4, n), autospec=True) -def test_build_remote(mock_uuid4: Any, mock_run: Any, monkeypatch: MonkeyPatch) -> None: +def test_build_remote( + mock_uuid4: Mock, mock_run: Mock, monkeypatch: MonkeyPatch +) -> None: build_host = m.Remote("user@host", [], None) monkeypatch.setenv("NIX_SSHOPTS", "--ssh opts") @@ -108,58 +114,53 @@ def test_build_remote(mock_uuid4: Any, mock_run: Any, monkeypatch: MonkeyPatch) instantiate_flags={"inst": True}, copy_flags={"copy": True}, ) == Path("/path/to/config") - - mock_run.assert_has_calls( - [ - call( - [ - "nix-instantiate", - "", - "--attr", - "preAttr.config.system.build.toplevel", - "--add-root", - n.tmpdir.TMPDIR_PATH / "00000000000000000000000000000001", - "--inst", - ], - stdout=PIPE, - ), - call( - [ - "nix-copy-closure", - "--copy", - "--to", - "user@host", - Path("/path/to/file"), - ], - extra_env={ - "NIX_SSHOPTS": " ".join([*p.SSH_DEFAULT_OPTS, "--ssh opts"]) - }, - ), - call( - ["mktemp", "-d", "-t", "nixos-rebuild.XXXXX"], - remote=build_host, - stdout=PIPE, - ), - call( - [ - "nix-store", - "--realise", - Path("/path/to/file"), - "--add-root", - Path("/tmp/tmpdir/00000000000000000000000000000002"), - "--realise", - ], - remote=build_host, - stdout=PIPE, - ), - call( - ["readlink", "-f", "/tmp/tmpdir/config"], - remote=build_host, - stdout=PIPE, - ), - call(["rm", "-rf", Path("/tmp/tmpdir")], remote=build_host, check=False), - ] - ) + assert mock_run.call_args_list == [ + call( + [ + "nix-instantiate", + "", + "--attr", + "preAttr.config.system.build.toplevel", + "--add-root", + n.tmpdir.TMPDIR_PATH / "00000000000000000000000000000001", + "--inst", + ], + stdout=PIPE, + ), + call( + [ + "nix-copy-closure", + "--copy", + "--to", + "user@host", + Path("/path/to/file"), + ], + extra_env={"NIX_SSHOPTS": " ".join([*p.SSH_DEFAULT_OPTS, "--ssh opts"])}, + ), + call( + ["mktemp", "-d", "-t", "nixos-rebuild.XXXXX"], + remote=build_host, + stdout=PIPE, + ), + call( + [ + "nix-store", + "--realise", + Path("/path/to/file"), + "--add-root", + Path("/tmp/tmpdir/00000000000000000000000000000002"), + "--realise", + ], + remote=build_host, + stdout=PIPE, + ), + call( + ["readlink", "-f", "/tmp/tmpdir/config"], + remote=build_host, + stdout=PIPE, + ), + call(["rm", "-rf", Path("/tmp/tmpdir")], remote=build_host, check=False), + ] @patch( @@ -168,7 +169,7 @@ def test_build_remote(mock_uuid4: Any, mock_run: Any, monkeypatch: MonkeyPatch) return_value=CompletedProcess([], 0, stdout=" \n/path/to/file\n "), ) def test_build_remote_flake( - mock_run: Any, monkeypatch: MonkeyPatch, tmpdir: Path + mock_run: Mock, monkeypatch: MonkeyPatch, tmpdir: Path ) -> None: monkeypatch.chdir(tmpdir) flake = m.Flake.parse(".#hostname") @@ -183,47 +184,43 @@ def test_build_remote_flake( copy_flags={"copy": True}, flake_build_flags={"build": True}, ) == Path("/path/to/file") - mock_run.assert_has_calls( - [ - call( - [ - "nix", - "--extra-experimental-features", - "nix-command flakes", - "eval", - "--raw", - ".#nixosConfigurations.hostname.config.system.build.toplevel.drvPath", - "--flake", - ], - stdout=PIPE, - ), - call( - [ - "nix-copy-closure", - "--copy", - "--to", - "user@host", - Path("/path/to/file"), - ], - extra_env={ - "NIX_SSHOPTS": " ".join([*p.SSH_DEFAULT_OPTS, "--ssh opts"]) - }, - ), - call( - [ - "nix", - "--extra-experimental-features", - "nix-command flakes", - "build", - "/path/to/file^*", - "--print-out-paths", - "--build", - ], - remote=build_host, - stdout=PIPE, - ), - ] - ) + assert mock_run.call_args_list == [ + call( + [ + "nix", + "--extra-experimental-features", + "nix-command flakes", + "eval", + "--raw", + ".#nixosConfigurations.hostname.config.system.build.toplevel.drvPath", + "--flake", + ], + stdout=PIPE, + ), + call( + [ + "nix-copy-closure", + "--copy", + "--to", + "user@host", + Path("/path/to/file"), + ], + extra_env={"NIX_SSHOPTS": " ".join([*p.SSH_DEFAULT_OPTS, "--ssh opts"])}, + ), + call( + [ + "nix", + "--extra-experimental-features", + "nix-command flakes", + "build", + "/path/to/file^*", + "--print-out-paths", + "--build", + ], + remote=build_host, + stdout=PIPE, + ), + ] def test_copy_closure(monkeypatch: MonkeyPatch) -> None: @@ -236,7 +233,7 @@ def test_copy_closure(monkeypatch: MonkeyPatch) -> None: build_host = m.Remote("user@build.host", [], None) with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run: n.copy_closure(closure, target_host) - mock_run.assert_called_with( + assert mock_run.call_args == call( ["nix-copy-closure", "--to", "user@target.host", closure], extra_env={"NIX_SSHOPTS": " ".join(p.SSH_DEFAULT_OPTS)}, ) @@ -244,7 +241,7 @@ def test_copy_closure(monkeypatch: MonkeyPatch) -> None: monkeypatch.setenv("NIX_SSHOPTS", "--ssh build-opt") with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run: n.copy_closure(closure, None, build_host, {"copy_flag": True}) - mock_run.assert_called_with( + assert mock_run.call_args == call( ["nix-copy-closure", "--copy-flag", "--from", "user@build.host", closure], extra_env={ "NIX_SSHOPTS": " ".join([*p.SSH_DEFAULT_OPTS, "--ssh build-opt"]) @@ -258,7 +255,7 @@ def test_copy_closure(monkeypatch: MonkeyPatch) -> None: } with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run: n.copy_closure(closure, target_host, build_host, {"copy_flag": True}) - mock_run.assert_called_with( + assert mock_run.call_args == call( [ "nix", "copy", @@ -275,26 +272,24 @@ def test_copy_closure(monkeypatch: MonkeyPatch) -> None: monkeypatch.setattr(n, "WITH_NIX_2_18", False) with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run: n.copy_closure(closure, target_host, build_host) - mock_run.assert_has_calls( - [ - call( - ["nix-copy-closure", "--from", "user@build.host", closure], - extra_env=extra_env, - ), - call( - ["nix-copy-closure", "--to", "user@target.host", closure], - extra_env=extra_env, - ), - ] - ) + assert mock_run.call_args_list == [ + call( + ["nix-copy-closure", "--from", "user@build.host", closure], + extra_env=extra_env, + ), + call( + ["nix-copy-closure", "--to", "user@target.host", closure], + extra_env=extra_env, + ), + ] @patch(get_qualified_name(n.run_wrapper, n), autospec=True) -def test_edit(mock_run: Any, monkeypatch: MonkeyPatch, tmpdir: Path) -> None: +def test_edit(mock_run: Mock, monkeypatch: MonkeyPatch, tmpdir: Path) -> None: # Flake flake = m.Flake.parse(f"{tmpdir}#attr") n.edit(flake, {"commit_lock_file": True}) - mock_run.assert_called_with( + assert mock_run.call_args == call( [ "nix", "--extra-experimental-features", @@ -316,7 +311,7 @@ def test_edit(mock_run: Any, monkeypatch: MonkeyPatch, tmpdir: Path) -> None: mp.setenv("EDITOR", "editor") n.edit(None) - mock_run.assert_called_with(["editor", default_nix], check=False) + assert mock_run.call_args == call(["editor", default_nix], check=False) @patch( @@ -333,13 +328,13 @@ def test_edit(mock_run: Any, monkeypatch: MonkeyPatch, tmpdir: Path) -> None: """, ), ) -def test_get_build_image_variants(mock_run: Any, tmp_path: Path) -> None: +def test_get_build_image_variants(mock_run: Mock, tmp_path: Path) -> None: build_attr = m.BuildAttr("", None) assert n.get_build_image_variants(build_attr) == { "azure": "nixos-image-azure-25.05.20250102.6df2492-x86_64-linux.vhd", "vmware": "nixos-image-vmware-25.05.20250102.6df2492-x86_64-linux.vmdk", } - mock_run.assert_called_with( + assert mock_run.call_args == call( [ "nix-instantiate", "--eval", @@ -357,12 +352,14 @@ def test_get_build_image_variants(mock_run: Any, tmp_path: Path) -> None: stdout=PIPE, ) + mock_run.reset_mock() + build_attr = m.BuildAttr(Path(tmp_path), "preAttr") assert n.get_build_image_variants(build_attr, {"inst_flag": True}) == { "azure": "nixos-image-azure-25.05.20250102.6df2492-x86_64-linux.vhd", "vmware": "nixos-image-vmware-25.05.20250102.6df2492-x86_64-linux.vmdk", } - mock_run.assert_called_with( + assert mock_run.call_args == call( [ "nix-instantiate", "--eval", @@ -396,13 +393,13 @@ def test_get_build_image_variants(mock_run: Any, tmp_path: Path) -> None: """, ), ) -def test_get_build_image_variants_flake(mock_run: Any) -> None: +def test_get_build_image_variants_flake(mock_run: Mock) -> None: flake = m.Flake(Path("flake.nix"), "myAttr") assert n.get_build_image_variants_flake(flake, {"eval_flag": True}) == { "azure": "nixos-image-azure-25.05.20250102.6df2492-x86_64-linux.vhd", "vmware": "nixos-image-vmware-25.05.20250102.6df2492-x86_64-linux.vmdk", } - mock_run.assert_called_with( + assert mock_run.call_args == call( [ "nix", "eval", @@ -427,7 +424,7 @@ def test_get_nixpkgs_rev() -> None: side_effect=[CompletedProcess([], 0, "")], ) as mock_run: assert n.get_nixpkgs_rev(path) is None - mock_run.assert_called_with( + assert mock_run.call_args == call( ["git", "-C", path, "rev-parse", "--short", "HEAD"], check=False, capture_output=True, @@ -454,7 +451,7 @@ def test_get_nixpkgs_rev() -> None: ], ) as mock_run: assert n.get_nixpkgs_rev(path) == ".git.0f7c82403fd6" - mock_run.assert_has_calls(expected_calls) + assert mock_run.call_args_list == expected_calls with patch( get_qualified_name(n.run_wrapper, n), @@ -465,7 +462,7 @@ def test_get_nixpkgs_rev() -> None: ], ) as mock_run: assert n.get_nixpkgs_rev(path) == ".git.0f7c82403fd6M" - mock_run.assert_has_calls(expected_calls) + assert mock_run.call_args_list == expected_calls def test_get_generations(tmp_path: Path) -> None: @@ -506,7 +503,7 @@ def test_get_generations_from_nix_env(tmp_path: Path) -> None: m.Generation(id=2083, current=False, timestamp="2024-11-07 22:59:41"), m.Generation(id=2084, current=True, timestamp="2024-11-07 23:54:17"), ] - mock_run.assert_called_with( + assert mock_run.call_args == call( ["nix-env", "-p", path, "--list-generations"], stdout=PIPE, remote=None, @@ -524,7 +521,7 @@ def test_get_generations_from_nix_env(tmp_path: Path) -> None: m.Generation(id=2083, current=False, timestamp="2024-11-07 22:59:41"), m.Generation(id=2084, current=True, timestamp="2024-11-07 23:54:17"), ] - mock_run.assert_called_with( + assert mock_run.call_args == call( ["nix-env", "-p", path, "--list-generations"], stdout=PIPE, remote=remote, @@ -548,7 +545,7 @@ def test_get_generations_from_nix_env(tmp_path: Path) -> None: ), ], ) -def test_list_generations(mock_get_generations: Any, tmp_path: Path) -> None: +def test_list_generations(mock_get_generations: Mock, tmp_path: Path) -> None: # Probably better to test this function in a real system, this test is # mostly to make sure it doesn't break horribly assert n.list_generations(m.Profile("system", tmp_path)) == [ @@ -574,18 +571,20 @@ def test_list_generations(mock_get_generations: Any, tmp_path: Path) -> None: @patch(get_qualified_name(n.run_wrapper, n), autospec=True) -def test_repl(mock_run: Any) -> None: +def test_repl(mock_run: Mock) -> None: n.repl("attr", m.BuildAttr("", None), {"nix_flag": True}) - mock_run.assert_called_with( + assert mock_run.call_args == call( ["nix", "repl", "--file", "", "--nix-flag"] ) n.repl("attr", m.BuildAttr(Path("file.nix"), "myAttr")) - mock_run.assert_called_with(["nix", "repl", "--file", Path("file.nix"), "myAttr"]) + assert mock_run.call_args == call( + ["nix", "repl", "--file", Path("file.nix"), "myAttr"] + ) @patch(get_qualified_name(n.run_wrapper, n), autospec=True) -def test_repl_flake(mock_run: Any) -> None: +def test_repl_flake(mock_run: Mock) -> None: n.repl_flake("attr", m.Flake(Path("flake.nix"), "myAttr"), {"nix_flag": True}) # See nixos-rebuild-ng.tests.repl for a better test, # this is mostly for sanity check @@ -593,14 +592,14 @@ def test_repl_flake(mock_run: Any) -> None: @patch(get_qualified_name(n.run_wrapper, n), autospec=True) -def test_rollback(mock_run: Any, tmp_path: Path) -> None: +def test_rollback(mock_run: Mock, tmp_path: Path) -> None: path = tmp_path / "test" path.touch() profile = m.Profile("system", path) assert n.rollback(profile, None, False) == profile.path - mock_run.assert_called_with( + assert mock_run.call_args == call( ["nix-env", "--rollback", "-p", path], remote=None, sudo=False, @@ -608,7 +607,7 @@ def test_rollback(mock_run: Any, tmp_path: Path) -> None: target_host = m.Remote("user@localhost", [], None) assert n.rollback(profile, target_host, True) == profile.path - mock_run.assert_called_with( + assert mock_run.call_args == call( ["nix-env", "--rollback", "-p", path], remote=target_host, sudo=True, @@ -620,8 +619,10 @@ def test_rollback_temporary_profile(tmp_path: Path) -> None: path.touch() profile = m.Profile("system", path) - with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run: - mock_run.return_value = CompletedProcess( + with patch( + get_qualified_name(n.run_wrapper, n), + autospec=True, + return_value=CompletedProcess( [], 0, stdout=textwrap.dedent("""\ @@ -629,12 +630,13 @@ def test_rollback_temporary_profile(tmp_path: Path) -> None: 2083 2024-11-07 22:59:41 2084 2024-11-07 23:54:17 (current) """), - ) + ), + ) as mock_run: assert ( n.rollback_temporary_profile(m.Profile("system", path), None, False) == path.parent / "system-2083-link" ) - mock_run.assert_called_with( + assert mock_run.call_args == call( [ "nix-env", "-p", @@ -651,7 +653,7 @@ def test_rollback_temporary_profile(tmp_path: Path) -> None: n.rollback_temporary_profile(m.Profile("foo", path), target_host, True) == path.parent / "foo-2083-link" ) - mock_run.assert_called_with( + assert mock_run.call_args == call( [ "nix-env", "-p", @@ -663,13 +665,16 @@ def test_rollback_temporary_profile(tmp_path: Path) -> None: sudo=True, ) - with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run: - mock_run.return_value = CompletedProcess([], 0, stdout="") + with patch( + get_qualified_name(n.run_wrapper, n), + autospec=True, + return_value=CompletedProcess([], 0, stdout=""), + ) as mock_run: assert n.rollback_temporary_profile(profile, None, False) is None @patch(get_qualified_name(n.run_wrapper, n), autospec=True) -def test_set_profile(mock_run: Any) -> None: +def test_set_profile(mock_run: Mock) -> None: profile_path = Path("/path/to/profile") config_path = Path("/path/to/config") n.set_profile( @@ -679,7 +684,7 @@ def test_set_profile(mock_run: Any) -> None: sudo=False, ) - mock_run.assert_called_with( + assert mock_run.call_args == call( ["nix-env", "-p", profile_path, "--set", config_path], remote=None, sudo=False, @@ -687,7 +692,7 @@ def test_set_profile(mock_run: Any) -> None: @patch(get_qualified_name(n.run_wrapper, n), autospec=True) -def test_switch_to_configuration(mock_run: Any, monkeypatch: MonkeyPatch) -> None: +def test_switch_to_configuration(mock_run: Mock, monkeypatch: MonkeyPatch) -> None: profile_path = Path("/path/to/profile") config_path = Path("/path/to/config") @@ -702,7 +707,7 @@ def test_switch_to_configuration(mock_run: Any, monkeypatch: MonkeyPatch) -> Non specialisation=None, install_bootloader=False, ) - mock_run.assert_called_with( + assert mock_run.call_args == call( [profile_path / "bin/switch-to-configuration", "switch"], extra_env={"NIXOS_INSTALL_BOOTLOADER": "0"}, sudo=False, @@ -736,7 +741,7 @@ def test_switch_to_configuration(mock_run: Any, monkeypatch: MonkeyPatch) -> Non install_bootloader=True, specialisation="special", ) - mock_run.assert_called_with( + assert mock_run.call_args == call( [ config_path / "specialisation/special/bin/switch-to-configuration", "test", @@ -757,17 +762,17 @@ def test_switch_to_configuration(mock_run: Any, monkeypatch: MonkeyPatch) -> Non ], ) @patch(get_qualified_name(n.Path.is_dir, n), autospec=True, return_value=True) -def test_upgrade_channels(mock_is_dir: Any, mock_glob: Any) -> None: +def test_upgrade_channels(mock_is_dir: Mock, mock_glob: Mock) -> None: with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run: n.upgrade_channels(False) - mock_run.assert_called_with(["nix-channel", "--update", "nixos"], check=False) + assert mock_run.call_args == call(["nix-channel", "--update", "nixos"], check=False) + + mock_run.reset_mock() with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run: n.upgrade_channels(True) - mock_run.assert_has_calls( - [ - call(["nix-channel", "--update", "nixos"], check=False), - call(["nix-channel", "--update", "nixos-hardware"], check=False), - call(["nix-channel", "--update", "home-manager"], check=False), - ] - ) + assert mock_run.call_args_list == [ + call(["nix-channel", "--update", "nixos"], check=False), + call(["nix-channel", "--update", "nixos-hardware"], check=False), + call(["nix-channel", "--update", "home-manager"], check=False), + ] diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py index bfd5b180fd5a..a3a6824871ff 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py @@ -1,5 +1,4 @@ -from typing import Any -from unittest.mock import patch +from unittest.mock import Mock, call, patch from pytest import MonkeyPatch @@ -10,9 +9,9 @@ from .helpers import get_qualified_name @patch(get_qualified_name(p.subprocess.run), autospec=True) -def test_run(mock_run: Any) -> None: +def test_run(mock_run: Mock) -> None: p.run_wrapper(["test", "--with", "flags"], check=True) - mock_run.assert_called_with( + assert mock_run.call_args == call( ["test", "--with", "flags"], check=True, text=True, @@ -28,7 +27,7 @@ def test_run(mock_run: Any) -> None: sudo=True, extra_env={"FOO": "bar"}, ) - mock_run.assert_called_with( + assert mock_run.call_args == call( ["sudo", "test", "--with", "flags"], check=False, text=True, @@ -45,7 +44,7 @@ def test_run(mock_run: Any) -> None: check=True, remote=m.Remote("user@localhost", ["--ssh", "opt"], "password"), ) - mock_run.assert_called_with( + assert mock_run.call_args == call( [ "ssh", "--ssh", @@ -71,7 +70,7 @@ def test_run(mock_run: Any) -> None: extra_env={"FOO": "bar"}, remote=m.Remote("user@localhost", ["--ssh", "opt"], "password"), ) - mock_run.assert_called_with( + assert mock_run.call_args == call( [ "ssh", "--ssh", From c2d04bc487c782da9004f8f1d055ac04aa2bf191 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 Feb 2025 23:28:55 +0100 Subject: [PATCH 1570/2168] python313Packages.deebot-client: 12.0.0 -> 12.1.0 https://github.com/DeebotUniverse/client.py/releases/tag/12.1.0 --- pkgs/development/python-modules/deebot-client/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/deebot-client/default.nix b/pkgs/development/python-modules/deebot-client/default.nix index 196a2b5f3a88..cc47f6e7bd15 100644 --- a/pkgs/development/python-modules/deebot-client/default.nix +++ b/pkgs/development/python-modules/deebot-client/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "deebot-client"; - version = "12.0.0"; + version = "12.1.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -32,12 +32,12 @@ buildPythonPackage rec { owner = "DeebotUniverse"; repo = "client.py"; tag = version; - hash = "sha256-/lGLrFlKKneauC15eFQYQxxHY7Py5s626yrThkqNAps="; + hash = "sha256-K5dsu4n3ClU7CPYkqSrvocQAPzV0tMrlBapueVBstQ0="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-oSvosZsGM0R5DRc43KvCNcqNIh4gbvzqgnrIJjAN+/k="; + hash = "sha256-mrAPalyxEhJFE1VYNOZRjjdviXqU0JeeGuY3vFZYSNE="; }; pythonRelaxDeps = [ From 23655aa62f4f15860c978b29ee17e34f165f282e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 Feb 2025 23:29:21 +0100 Subject: [PATCH 1571/2168] python313Packages.hass-nabucasa: 0.89.0 -> 0.90.0 https://github.com/NabuCasa/hass-nabucasa/releases/tag/0.90.0 --- pkgs/development/python-modules/hass-nabucasa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index 2468d243f598..5a60e8a71fff 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.89.0"; + version = "0.90.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "nabucasa"; repo = "hass-nabucasa"; tag = version; - hash = "sha256-o6VUfg0mtaXw5isF4Q1afCZrOMSW9FSjbOOUcBne+dY="; + hash = "sha256-OP+KUh0WsE6I0hKUvUBHhzrLCKM7jc5GhO++9OrLh4s="; }; pythonRelaxDeps = [ "acme" ]; From 076dd7b56f9c7893d24319e6bae84061e7de533d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 Feb 2025 23:29:39 +0100 Subject: [PATCH 1572/2168] python313Packages.pyenphase: 1.23.1 -> 1.25.4 https://github.com/pyenphase/pyenphase/blob/v1.25.4/CHANGELOG.md --- pkgs/development/python-modules/pyenphase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyenphase/default.nix b/pkgs/development/python-modules/pyenphase/default.nix index 985da8e22a30..7d05195d4a68 100644 --- a/pkgs/development/python-modules/pyenphase/default.nix +++ b/pkgs/development/python-modules/pyenphase/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "pyenphase"; - version = "1.23.1"; + version = "1.25.4"; pyproject = true; disabled = pythonOlder "3.11"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "pyenphase"; repo = "pyenphase"; tag = "v${version}"; - hash = "sha256-xiwoFfKMZVgpMfh2CjzhkuZPxCD/NC2nK67r6Miu0eg="; + hash = "sha256-J7MxHoFffdmPESxyt5CnFd9Y9klP5PiRhG8nzPMaYxw="; }; pythonRelaxDeps = [ "tenacity" ]; From e02d71a970af11fbe0b1abd7fe507e3d8dd71201 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 22:30:05 +0000 Subject: [PATCH 1573/2168] python312Packages.pyemvue: 0.18.6 -> 0.18.7 --- pkgs/development/python-modules/pyemvue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyemvue/default.nix b/pkgs/development/python-modules/pyemvue/default.nix index c2b6ac4d22ce..3b43c1628d36 100644 --- a/pkgs/development/python-modules/pyemvue/default.nix +++ b/pkgs/development/python-modules/pyemvue/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "pyemvue"; - version = "0.18.6"; + version = "0.18.7"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-FQ34pKRK1HDLoupMDfVaNxAhn1HbZHYi6se4ewlUWGA="; + hash = "sha256-tDLI1j5WAP93A+FKx1m6QBOu/eNeCCV6Y4I2N6BgLD0="; }; nativeBuildInputs = [ hatchling ]; From ae9a4e7bb62ed28c838d23de7b5ebd6ea667f91b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 Feb 2025 23:30:08 +0100 Subject: [PATCH 1574/2168] python313Packages.sentry-sdk_1: 1.45.0 -> 1.45.1 https://github.com/getsentry/sentry-python/blob/1.45.1/CHANGELOG.md --- pkgs/development/python-modules/sentry-sdk/1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sentry-sdk/1.nix b/pkgs/development/python-modules/sentry-sdk/1.nix index 0141a90c8876..c50af450b272 100644 --- a/pkgs/development/python-modules/sentry-sdk/1.nix +++ b/pkgs/development/python-modules/sentry-sdk/1.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.45.0"; + version = "1.45.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -48,7 +48,7 @@ buildPythonPackage rec { owner = "getsentry"; repo = "sentry-python"; rev = "refs/tags/${version}"; - hash = "sha256-OWoMqJlf0vmBHWWsW6mF4u5X9USzxkFmCJyX7Ws0dD0="; + hash = "sha256-ZNJsxbQcW5g/bKqN18z+BspKyI34+vkj6vQ9akE1Ook="; }; build-system = [ setuptools ]; From 27a7aa6114b6ea425c3e729903ac53b75220461d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 22:33:31 +0000 Subject: [PATCH 1575/2168] python312Packages.google-cloud-texttospeech: 2.24.0 -> 2.25.0 --- .../python-modules/google-cloud-texttospeech/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index 72ef09fd9610..a9b597f989e2 100644 --- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "2.24.0"; + version = "2.25.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_texttospeech"; inherit version; - hash = "sha256-yfXzvL5NNF4mcBVTGJD0+ZHXbBnLm2v63A5jxgCxA04="; + hash = "sha256-d25wtYOFyMNLhCXHrbJ+lGqFg3fCJ7lRUzFddSY8HiM="; }; build-system = [ setuptools ]; From 6ab21960d63ca4464cffce6a3a22f0b012b9b4c5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 22:33:44 +0000 Subject: [PATCH 1576/2168] python312Packages.google-cloud-websecurityscanner: 1.16.0 -> 1.17.0 --- .../google-cloud-websecurityscanner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix index 119cdb45d588..0f7cb6551e74 100644 --- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "google-cloud-websecurityscanner"; - version = "1.16.0"; + version = "1.17.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_websecurityscanner"; inherit version; - hash = "sha256-bZMP5SFE9g1FQa/z4eusS1ohvtblCuzNA2RNURx31D0="; + hash = "sha256-JqKKtjBeJ/jyGZZ9SGhQ9a89khuZKSJMPhqc5BOnFcg="; }; build-system = [ setuptools ]; From abe0554c2f242ef7ccbd5c28553851536addfc90 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 Feb 2025 23:36:37 +0100 Subject: [PATCH 1577/2168] python313Packages.zeroconf: 0.143.0 -> 0.144.1 https://github.com/python-zeroconf/python-zeroconf/blob/0.144.1/CHANGELOG.md --- pkgs/development/python-modules/zeroconf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index c060ffc8bbbf..54da13320331 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.143.0"; + version = "0.144.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; tag = version; - hash = "sha256-yN5N+SosNDcwotEH2oyVMRI717LXIRKtzHQ4VI4WoMQ="; + hash = "sha256-OpylhsMjM7Xc1/vVv2kNuxeO7XknjQjJ8jFVS2+3188="; }; build-system = [ From ae88fbbda13761f951ecb4e5d6a52c9e1ba8dc32 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 Feb 2025 23:37:26 +0100 Subject: [PATCH 1578/2168] home-assistant: 2025.2.2 -> 2025.2.3 https://github.com/home-assistant/core/releases/tag/2025.2.3 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 85b12d7e2ac3..dce16055ac29 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2025.2.2"; + version = "2025.2.3"; components = { "3_day_blinds" = ps: with ps; [ diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index ba8028397562..a0a24e45fc1c 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -369,7 +369,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2025.2.2"; + hassVersion = "2025.2.3"; in python.pkgs.buildPythonApplication rec { @@ -390,13 +390,13 @@ python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-aCGfxWJnDJ4V5FjrFV3TLHBtPQDyNh1qjDKFL/bHBz0="; + hash = "sha256-1hCNkBIqRg3YDQn6TSytugxkQwve4/Z7p1/BY4Zwcv0="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-9bdkcDMTQtaRlyLK65fwVDlV4s1GpxqbTYDNxstST4w="; + hash = "sha256-4LojranZ9xLR3kpBvvzZ/XJchbgr9ZVYydntNoBkCVE="; }; build-system = with python.pkgs; [ From a79ee8c78b4ed4561240f1ee68d51c64978e78f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 22:49:25 +0000 Subject: [PATCH 1579/2168] python312Packages.google-cloud-trace: 1.15.0 -> 1.16.0 --- .../development/python-modules/google-cloud-trace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-trace/default.nix b/pkgs/development/python-modules/google-cloud-trace/default.nix index 2a8cedcca90e..ad6913e56796 100644 --- a/pkgs/development/python-modules/google-cloud-trace/default.nix +++ b/pkgs/development/python-modules/google-cloud-trace/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-trace"; - version = "1.15.0"; + version = "1.16.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_trace"; inherit version; - hash = "sha256-wgy+9eUr6MpiiiL+vmW49F/dpoW7Rv/KNvTs6keOxKM="; + hash = "sha256-nSexY3cVcrVh6/dTpeR5H5nSXlTtrUywEheriC899Bo="; }; build-system = [ setuptools ]; From 7289d440823666d6ca92fa3b2557669798044b0e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 22:49:40 +0000 Subject: [PATCH 1580/2168] python312Packages.google-cloud-bigquery-logging: 1.5.0 -> 1.6.0 --- .../python-modules/google-cloud-bigquery-logging/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix index 81739ef91b60..623a6c202b19 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-logging"; - version = "1.5.0"; + version = "1.6.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_bigquery_logging"; inherit version; - hash = "sha256-4eDfCpkZBDZySWq92C/fr0FKeKdbkymN6sbl+/qzKfg="; + hash = "sha256-xcYpIj1xSrNOfBirrlJwc4ccLU9iI2XSz1Bl//EQt1Q="; }; build-system = [ setuptools ]; From 4bbce7c4bc5312619302c01d77a89e7fb1c76240 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 22:56:45 +0000 Subject: [PATCH 1581/2168] python312Packages.google-cloud-artifact-registry: 1.14.0 -> 1.15.0 --- .../python-modules/google-cloud-artifact-registry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix b/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix index 0e3bf68348b6..a9d46fd75778 100644 --- a/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix +++ b/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "google-cloud-artifact-registry"; - version = "1.14.0"; + version = "1.15.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_artifact_registry"; inherit version; - hash = "sha256-xn4OBhidFxwfNHcCoXecZqMbGyFNIJ75f5u75Fi5yQ4="; + hash = "sha256-K2oFG+shUXcgg/UDzpgF9LcLuDkhSLUYwQrXfxJUDW8="; }; build-system = [ setuptools ]; From fa345dc7ca7aa2899cf240560982f1ba685f2ca1 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Wed, 12 Feb 2025 17:58:19 -0500 Subject: [PATCH 1582/2168] kubernetes-helm: 3.17.0 -> 3.17.1 Diff: https://github.com/helm/helm/compare/v3.17.0...v3.17.1 --- pkgs/applications/networking/cluster/helm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 816923ed2462..c994b155d469 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -9,15 +9,15 @@ buildGoModule rec { pname = "kubernetes-helm"; - version = "3.17.0"; + version = "3.17.1"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "sha256-kLiYzZFqJQGkqpjFPTB9BHQf7yWiWRUvWDpF5WkfJEU="; + sha256 = "sha256-wGORNOlfnBt8iApAP5s5tvy4Zfk87fOTpLSY5XYnzQM="; }; - vendorHash = "sha256-mARUYjnbn5dmR0cKAXiHFJcYNx1ROabLv9Z7KCY9PRM="; + vendorHash = "sha256-dZN1rOcGDIvhqXi35904kTBQ8RPeS1PFgspzn/j1ZQU="; subPackages = [ "cmd/helm" ]; ldflags = [ From e62ebfa8205172edb13334076714dfdf8b451ccc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 22:59:12 +0000 Subject: [PATCH 1583/2168] python312Packages.google-cloud-videointelligence: 2.15.0 -> 2.16.0 --- .../python-modules/google-cloud-videointelligence/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix index 089cb724dd3c..1b358234f1a2 100644 --- a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix +++ b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-videointelligence"; - version = "2.15.0"; + version = "2.16.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_videointelligence"; inherit version; - hash = "sha256-9Jed85BWq6LiZQZCo5hI7Wn8jxRd8N2CPkdDw2JovyU="; + hash = "sha256-eqHNqa9pFHE+MoeH6rOro2G0E0iLCOCqxXqNoi3tH2I="; }; build-system = [ setuptools ]; From ecc601b47d5d897433db3c66027dae2c0d52074b Mon Sep 17 00:00:00 2001 From: Alexey Orlenko Date: Wed, 12 Feb 2025 23:47:48 +0100 Subject: [PATCH 1584/2168] prisma: fix dangling symlinks Make sure we don't leave dangling symlinks in `$out` when building `prisma`. 1. We remove the original `node_modules` after buliding the packages to re-install the runtime dependencies without the dev dependencies. The way it was done was incorrect: only the root `node_modules` directory was removed but not the nested ones inside the packages. The follow-up `pnpm install` command didn't re-create or empty them and only created new files within, so we were left with tons of dangling symlinks from the first, full, `pnpm install` invocation. 2. `.pnpm/node_modules` inside the root `node_modules` contains symlinks to each workspace member package. However, we don't copy every package to `$out`, so we need to clean up this directory to remove the references to the missing packages. Fixes: https://github.com/NixOS/nixpkgs/issues/380427 --- pkgs/by-name/pr/prisma/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/prisma/package.nix b/pkgs/by-name/pr/prisma/package.nix index a1cea0b3c3e8..5240f890a1a7 100644 --- a/pkgs/by-name/pr/prisma/package.nix +++ b/pkgs/by-name/pr/prisma/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { deps=$(jq -r '[.. | strings | select(startswith("link:../")) | sub("^link:../"; "")] | unique[]' <<< "$deps_json") # Remove unnecessary external dependencies - rm -rf node_modules + find . -name node_modules -type d -prune -exec rm -rf {} + pnpm install --offline --ignore-scripts --frozen-lockfile --prod cp -r node_modules $out/lib/prisma @@ -72,10 +72,14 @@ stdenv.mkDerivation (finalAttrs: { for package in cli $deps; do filename=$(npm pack --json ./packages/$package | jq -r '.[].filename') mkdir -p $out/lib/prisma/packages/$package - cp -r packages/$package/node_modules $out/lib/prisma/packages/$package + [ -d "packages/$package/node_modules" ] && \ + cp -r packages/$package/node_modules $out/lib/prisma/packages/$package tar xf $filename --strip-components=1 -C $out/lib/prisma/packages/$package done + # Remove dangling symlinks to packages we didn't copy to $out + find $out/lib/prisma/node_modules/.pnpm/node_modules -type l -exec test ! -e {} \; -delete + makeWrapper "${lib.getExe nodejs}" "$out/bin/prisma" \ --add-flags "$out/lib/prisma/packages/cli/build/index.js" \ --set PRISMA_SCHEMA_ENGINE_BINARY ${prisma-engines}/bin/schema-engine \ From 925a8d8c8712852d115260362f68e2abe290f5ec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 23:05:14 +0000 Subject: [PATCH 1585/2168] python312Packages.google-cloud-language: 2.16.0 -> 2.17.0 --- .../python-modules/google-cloud-language/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-language/default.nix b/pkgs/development/python-modules/google-cloud-language/default.nix index b208bd43afb1..08afa0a23d05 100644 --- a/pkgs/development/python-modules/google-cloud-language/default.nix +++ b/pkgs/development/python-modules/google-cloud-language/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "google-cloud-language"; - version = "2.16.0"; + version = "2.17.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_language"; inherit version; - hash = "sha256-Zdf8a0V47VJuwql9TXEEFyrbaiDYucs2D8kcY6X8hB4="; + hash = "sha256-jOIWh7py71jOWHB67egWQlj53rR3kfJJzCqdT4yQdhs="; }; build-system = [ setuptools ]; From 5485a051be4bac12d34e73cbebeab53b430f6ee8 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 12 Feb 2025 23:09:18 +0000 Subject: [PATCH 1586/2168] nixos-rebuild-ng: add missing autospec --- pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py index a3a6824871ff..a62ee2355153 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py @@ -105,7 +105,7 @@ def test_remote_from_name(monkeypatch: MonkeyPatch) -> None: # get_qualified_name doesn't work because getpass is aliased to another # function - with patch(f"{p.__name__}.getpass", return_value="password"): + with patch(f"{p.__name__}.getpass", autospec=True, return_value="password"): monkeypatch.setenv("NIX_SSHOPTS", "-f foo -b bar -t") assert m.Remote.from_arg("user@localhost", True, True) == m.Remote( "user@localhost", From d0af2e5fe402b1632899fe587cb9fa7aa4b655ba Mon Sep 17 00:00:00 2001 From: Defelo Date: Thu, 13 Feb 2025 00:10:11 +0100 Subject: [PATCH 1587/2168] samply: remove readme patch The problem has been fixed upstream in linux-perf-data 0.9.0 and linux-perf-event-reader 0.10.0 --- pkgs/by-name/sa/samply/package.nix | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/pkgs/by-name/sa/samply/package.nix b/pkgs/by-name/sa/samply/package.nix index c8e4c86e66f8..0a85af8003b5 100644 --- a/pkgs/by-name/sa/samply/package.nix +++ b/pkgs/by-name/sa/samply/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchCrate, - jq, - moreutils, stdenv, darwin, }: @@ -21,29 +19,6 @@ rustPlatform.buildRustPackage rec { # https://github.com/NixOS/nixpkgs/issues/377986 cargoLock.lockFile = ./Cargo.lock; - # the dependencies linux-perf-data and linux-perf-event-reader contains both README.md and Readme.md, - # which causes a hash mismatch on systems with a case-insensitive filesystem - # this removes the readme files and updates cargo's checksum file accordingly - depsExtraArgs = { - nativeBuildInputs = [ - jq - moreutils - ]; - - postBuild = '' - for crate in linux-perf-data linux-perf-event-reader; do - pushd $name/$crate - - rm -f README.md Readme.md - jq 'del(.files."README.md") | del(.files."Readme.md")' \ - .cargo-checksum.json -c \ - | sponge .cargo-checksum.json - - popd - done - ''; - }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; From 60bde6ae54f1cdc57a44863759f13092e5f6cf22 Mon Sep 17 00:00:00 2001 From: Defelo Date: Thu, 13 Feb 2025 00:19:24 +0100 Subject: [PATCH 1588/2168] samply: useFetchCargoVendor --- pkgs/by-name/sa/samply/Cargo.lock | 2497 ---------------------------- pkgs/by-name/sa/samply/package.nix | 5 +- 2 files changed, 2 insertions(+), 2500 deletions(-) delete mode 100644 pkgs/by-name/sa/samply/Cargo.lock diff --git a/pkgs/by-name/sa/samply/Cargo.lock b/pkgs/by-name/sa/samply/Cargo.lock deleted file mode 100644 index c8a43ddb2fdb..000000000000 --- a/pkgs/by-name/sa/samply/Cargo.lock +++ /dev/null @@ -1,2497 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" -dependencies = [ - "gimli 0.28.1", -] - -[[package]] -name = "addr2line" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" -dependencies = [ - "fallible-iterator 0.3.0", - "gimli 0.29.0", -] - -[[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", - "once_cell", - "version_check", - "zerocopy", -] - -[[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 = "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 = "arrayvec" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" - -[[package]] -name = "async-compression" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07dbbf24db18d609b1462965249abdf49129ccad073ec257da372adc83259c60" -dependencies = [ - "brotli", - "flate2", - "futures-core", - "futures-io", - "memchr", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "autocfg" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" - -[[package]] -name = "backtrace" -version = "0.3.71" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" -dependencies = [ - "addr2line 0.21.0", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object 0.32.2", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" - -[[package]] -name = "binary-merge" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597bb81c80a54b6a4381b23faba8d7774b144c94cbd1d6fe3f1329bd776554ab" - -[[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 = "bitvec" -version = "0.19.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55f93d0ef3363c364d5976646a38f04cf67cfe1d4c8d160cdea02cab2c116b33" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] - -[[package]] -name = "brotli" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "125740193d7fee5cc63ab9e16c2fdc4e07c74ba755cc53b327d6ea029e9fc569" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", - "brotli-decompressor", -] - -[[package]] -name = "brotli-decompressor" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65622a320492e09b5e0ac436b14c54ff68199bac392d0e89a6832c4518eea525" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", -] - -[[package]] -name = "bstr" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" -dependencies = [ - "memchr", - "regex-automata", - "serde", -] - -[[package]] -name = "bumpalo" -version = "3.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "bytes" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" - -[[package]] -name = "cab" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "171228650e6721d5acc0868a462cd864f49ac5f64e4a42cde270406e64e404d2" -dependencies = [ - "byteorder", - "flate2", - "lzxd", - "time", -] - -[[package]] -name = "cc" -version = "1.0.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2678b2e3449475e95b0aa6f9b506a28e61b3dc8996592b983695e8ebb58a8b41" - -[[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 = "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", -] - -[[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 2.0.58", -] - -[[package]] -name = "clap_lex" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[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 = "cpp_demangle" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8227005286ec39567949b33df9896bcadfa6051bccca2488129f108ca23119" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crc" -version = "3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" -dependencies = [ - "crc-catalog", -] - -[[package]] -name = "crc-catalog" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" - -[[package]] -name = "crc32fast" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" -dependencies = [ - "cfg-if", -] - -[[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-utils" -version = "0.8.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" - -[[package]] -name = "debugid" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" -dependencies = [ - "uuid", -] - -[[package]] -name = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", -] - -[[package]] -name = "derive_more" -version = "0.99.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "dirs" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users", - "windows-sys 0.48.0", -] - -[[package]] -name = "elsa" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d98e71ae4df57d214182a2e5cb90230c0192c6ddfcaa05c36453d46a54713e10" -dependencies = [ - "stable_deref_trait", -] - -[[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", - "syn 2.0.58", -] - -[[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 = "fallible-iterator" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" - -[[package]] -name = "fallible-iterator" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" - -[[package]] -name = "fastrand" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" - -[[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 = "framehop" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775adc24f975a49a55a31d53664838836e70d8bafac569ee19f5fd9b6403eb88" -dependencies = [ - "arrayvec", - "cfg-if", - "fallible-iterator 0.3.0", - "gimli 0.29.0", - "macho-unwind-info", - "pe-unwind-info", - "thiserror", - "thiserror-no-std", -] - -[[package]] -name = "fs4" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21dabded2e32cd57ded879041205c60a4a4c4bab47bd0fd2fa8b01f30849f02b" -dependencies = [ - "rustix", - "windows-sys 0.52.0", -] - -[[package]] -name = "funty" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" - -[[package]] -name = "futures-channel" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" -dependencies = [ - "futures-core", -] - -[[package]] -name = "futures-core" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" - -[[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", - "quote", - "syn 2.0.58", -] - -[[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-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 = "fxprof-processed-profile" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce20bbb48248608ba4908b45fe36e17e40f56f8c6bb385ecf5d3c4a1e8b05a22" -dependencies = [ - "bitflags 2.5.0", - "debugid", - "fxhash", - "serde", - "serde_derive", - "serde_json", -] - -[[package]] -name = "getrandom" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "gimli" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" - -[[package]] -name = "gimli" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" -dependencies = [ - "fallible-iterator 0.3.0", - "stable_deref_trait", -] - -[[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", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "hashbrown" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" -dependencies = [ - "ahash", -] - -[[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 = "http" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" -dependencies = [ - "bytes", - "http", -] - -[[package]] -name = "http-body-util" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" -dependencies = [ - "bytes", - "futures-core", - "http", - "http-body", - "pin-project-lite", -] - -[[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 = "hyper" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f24ce812868d86d19daa79bf3bf9175bc44ea323391147a5e3abde2a283871b" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "smallvec", - "tokio", - "want", -] - -[[package]] -name = "hyper-rustls" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" -dependencies = [ - "futures-util", - "http", - "hyper", - "hyper-util", - "rustls", - "rustls-pki-types", - "tokio", - "tokio-rustls", - "tower-service", -] - -[[package]] -name = "hyper-util" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "http", - "http-body", - "hyper", - "pin-project-lite", - "socket2", - "tokio", - "tower", - "tower-service", - "tracing", -] - -[[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 = "indexmap" -version = "2.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" -dependencies = [ - "equivalent", - "hashbrown", -] - -[[package]] -name = "inplace-vec-builder" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf64c2edc8226891a71f127587a2861b132d2b942310843814d5001d99a1d307" -dependencies = [ - "smallvec", -] - -[[package]] -name = "ipnet" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" - -[[package]] -name = "itoa" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - -[[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 = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.153" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" - -[[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 = "linear-map" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfae20f6b19ad527b550c223fddc3077a547fc70cda94b9b566575423fd303ee" - -[[package]] -name = "linux-perf-data" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4533101fd9e7cdabbdb80e09b45cf200ee3c2252a5d4aadaae5325ab46769747" -dependencies = [ - "byteorder", - "linear-map", - "linux-perf-event-reader", - "memchr", - "thiserror", -] - -[[package]] -name = "linux-perf-event-reader" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41064623ecf100db029bd29e4a1cdec25fc513d45c15619ecd03504e2ffb1687" -dependencies = [ - "bitflags 2.5.0", - "byteorder", - "memchr", - "thiserror", -] - -[[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 = "lzma-rs" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "297e814c836ae64db86b36cf2a557ba54368d03f6afcd7d947c266692f71115e" -dependencies = [ - "byteorder", - "crc", -] - -[[package]] -name = "lzxd" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de7336a183103429ad66d11d56d8bdc9c4a2916f6b85a8f11e5b127bde12001" - -[[package]] -name = "mach" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" -dependencies = [ - "libc", -] - -[[package]] -name = "macho-unwind-info" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b6086acc74bc23f56b60e88bb082d505e23849d68d6c0f12bb6a7ad5c60e03e" -dependencies = [ - "thiserror", - "zerocopy", - "zerocopy-derive", -] - -[[package]] -name = "maybe-owned" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4facc753ae494aeb6e3c22f839b158aebd4f9270f55cd3c79906c45476c47ab4" - -[[package]] -name = "memchr" -version = "2.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" - -[[package]] -name = "memmap2" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" -dependencies = [ - "libc", -] - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.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 = "msvc-demangler" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2588c982e3a7fbfbd73b21f824cacc43fc6392a1103c709ffd6001c0bf33fdb3" -dependencies = [ - "bitflags 2.5.0", -] - -[[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 = "nix-base32" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8548db8274cf1b2b4c093557783f99e9ad64ffdaaa29a6c1af0abc9895c15612" - -[[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 = "normpath" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5831952a9476f2fed74b77d74182fa5ddc4d21c72ec45a333b250e3ed0272804" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "num-conv" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" - -[[package]] -name = "num-traits" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "object" -version = "0.32.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" -dependencies = [ - "memchr", -] - -[[package]] -name = "object" -version = "0.35.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e" -dependencies = [ - "crc32fast", - "flate2", - "hashbrown", - "indexmap", - "memchr", - "ruzstd", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "opener" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9901cb49d7fc923b256db329ee26ffed69130bf05d74b9efdd1875c92d6af01" -dependencies = [ - "bstr", - "normpath", - "windows-sys 0.52.0", -] - -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - -[[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", - "libc", - "redox_syscall", - "smallvec", - "windows-targets 0.48.5", -] - -[[package]] -name = "pdb-addr2line" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb51ef7ed9998e108891711812822831daac0b17d67768c3bdc69aa909366123" -dependencies = [ - "bitflags 2.5.0", - "elsa", - "maybe-owned", - "pdb2", - "range-collections", - "thiserror", -] - -[[package]] -name = "pdb2" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00e30e131bcab0d41a2e471cf777ea9b1402f2a0764bcf1780251eab1b0d175d" -dependencies = [ - "fallible-iterator 0.2.0", - "scroll", - "uuid", -] - -[[package]] -name = "pe-unwind-info" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ec3b43050c38ffb9de87e17d874e9956e3a9131b343c9b7b7002597727c3891" -dependencies = [ - "arrayvec", - "bitflags 2.5.0", - "thiserror", - "zerocopy", - "zerocopy-derive", -] - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[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.58", -] - -[[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" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[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 = "proc-macro2" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -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.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-collections" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca9edd21e2db51000ac63eccddabba622f826e631a60be7bade9bd6a76b69537" -dependencies = [ - "binary-merge", - "inplace-vec-builder", - "ref-cast", - "smallvec", -] - -[[package]] -name = "rangemap" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684" - -[[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 = "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", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "regex-automata" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" - -[[package]] -name = "reqwest" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e6cc1e89e689536eb5aeede61520e874df5a4707df811cd5da4aa5fbb2aae19" -dependencies = [ - "async-compression", - "base64", - "bytes", - "futures-core", - "futures-util", - "http", - "http-body", - "http-body-util", - "hyper", - "hyper-rustls", - "hyper-util", - "ipnet", - "js-sys", - "log", - "mime", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls", - "rustls-pemfile", - "rustls-pki-types", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "tokio", - "tokio-rustls", - "tokio-util", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-streams", - "web-sys", - "webpki-roots", - "winreg", -] - -[[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 = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[package]] -name = "rustix" -version = "0.38.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" -dependencies = [ - "bitflags 2.5.0", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustls" -version = "0.22.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99008d7ad0bbbea527ec27bddbc0e432c5b87d8175178cee68d2eec9c4a1813c" -dependencies = [ - "log", - "ring", - "rustls-pki-types", - "rustls-webpki", - "subtle", - "zeroize", -] - -[[package]] -name = "rustls-pemfile" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" -dependencies = [ - "base64", - "rustls-pki-types", -] - -[[package]] -name = "rustls-pki-types" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247" - -[[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 = "ruzstd" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5174a470eeb535a721ae9fdd6e291c2411a906b96592182d05217591d5c5cf7b" -dependencies = [ - "byteorder", - "derive_more", - "twox-hash", -] - -[[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 = "samply" -version = "0.12.0" -dependencies = [ - "byteorder", - "clap", - "crossbeam-channel", - "debugid", - "dirs", - "flate2", - "framehop", - "futures-util", - "fxhash", - "fxprof-processed-profile", - "http-body-util", - "hyper", - "hyper-util", - "lazy_static", - "libc", - "linux-perf-data", - "mach", - "memchr", - "memmap2", - "mio", - "nix", - "nix-base32", - "num_cpus", - "object 0.35.0", - "once_cell", - "opener", - "parking_lot", - "percent-encoding", - "rand", - "serde", - "serde_derive", - "serde_json", - "signal-hook", - "sysctl", - "tempfile", - "thiserror", - "tokio", - "tokio-util", - "uname", - "uuid", - "wholesym", -] - -[[package]] -name = "samply-api" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ba2d4cd2e2684f911e234613f0659e2df56db773609ab940b1b02e984bda886" -dependencies = [ - "samply-symbols", - "serde", - "serde_derive", - "serde_json", - "thiserror", - "yaxpeax-arch", - "yaxpeax-arm", - "yaxpeax-x86", -] - -[[package]] -name = "samply-symbols" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "992d7259f93744ea3f094eea6f0f2be59facc45245fd8e0f693fad1e69ea5d16" -dependencies = [ - "addr2line 0.22.0", - "bitflags 2.5.0", - "cpp_demangle", - "debugid", - "elsa", - "flate2", - "gimli 0.29.0", - "linux-perf-data", - "lzma-rs", - "macho-unwind-info", - "memchr", - "msvc-demangler", - "nom", - "object 0.35.0", - "pdb-addr2line", - "rangemap", - "rustc-demangle", - "scala-native-demangle", - "srcsrv", - "thiserror", - "uuid", - "yoke", - "yoke-derive", - "zerocopy", - "zerocopy-derive", -] - -[[package]] -name = "scala-native-demangle" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a4416eddc0eaf31e04aa4039bd3db4288ea1ba613955d86cf9c310049c5d1e2" - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "scroll" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da" - -[[package]] -name = "serde" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "serde_json" -version = "1.0.115" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "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 = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - -[[package]] -name = "socket2" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" - -[[package]] -name = "srcsrv" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "022437a70e522e49b1952cb1d923589d629cb4aee97eb56d65ce938c04e8ac70" -dependencies = [ - "memchr", - "thiserror", -] - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - -[[package]] -name = "subtle" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" - -[[package]] -name = "symsrv" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "098492916b4954d05c9f195d073714401a48ad9d0c1d4690a4074146c9924804" -dependencies = [ - "async-compression", - "cab", - "dirs", - "fs4", - "futures-util", - "http", - "reqwest", - "scopeguard", - "thiserror", - "tokio", -] - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - -[[package]] -name = "synstructure" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "sysctl" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7dddc5f0fee506baf8b9fdb989e242f17e4b11c61dfbb0635b705217199eea" -dependencies = [ - "bitflags 2.5.0", - "byteorder", - "enum-as-inner", - "libc", - "thiserror", - "walkdir", -] - -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - -[[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 = "thiserror" -version = "1.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "thiserror-impl-no-std" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58e6318948b519ba6dc2b442a6d0b904ebfb8d411a3ad3e07843615a72249758" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "thiserror-no-std" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3ad459d94dd517257cc96add8a43190ee620011bb6e6cdc82dafd97dfafafea" -dependencies = [ - "thiserror-impl-no-std", -] - -[[package]] -name = "time" -version = "0.3.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" -dependencies = [ - "deranged", - "num-conv", - "powerfmt", - "serde", - "time-core", -] - -[[package]] -name = "time-core" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - -[[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 = "tokio" -version = "1.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "num_cpus", - "pin-project-lite", - "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", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "tokio-rustls" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" -dependencies = [ - "rustls", - "rustls-pki-types", - "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-sink", - "pin-project-lite", - "tokio", - "tracing", -] - -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "pin-project", - "pin-project-lite", - "tokio", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-layer" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" - -[[package]] -name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[package]] -name = "tracing" -version = "0.1.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" -dependencies = [ - "log", - "pin-project-lite", - "tracing-core", -] - -[[package]] -name = "tracing-core" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", -] - -[[package]] -name = "try-lock" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" - -[[package]] -name = "twox-hash" -version = "1.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" -dependencies = [ - "cfg-if", - "static_assertions", -] - -[[package]] -name = "uname" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b72f89f0ca32e4db1c04e2a72f5345d59796d4866a1ee0609084569f73683dc8" -dependencies = [ - "libc", -] - -[[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-normalization" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - -[[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", -] - -[[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" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[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 = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.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 2.0.58", - "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 2.0.58", - "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-streams" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" -dependencies = [ - "futures-util", - "js-sys", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[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 = "wholesym" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dd2331e4836f219a2da809a672abbd7f1d3ee33e0db30a28357a5a0fd6f4157" -dependencies = [ - "bytes", - "core-foundation", - "core-foundation-sys", - "debugid", - "futures-util", - "libc", - "memmap2", - "reqwest", - "samply-api", - "samply-symbols", - "symsrv", - "tokio", - "uuid", - "yoke", - "yoke-derive", -] - -[[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-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.4", -] - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" -dependencies = [ - "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.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.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.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.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.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.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.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.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "wyz" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" - -[[package]] -name = "yaxpeax-arch" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1ba5c2f163fa2f866c36750c6c931566c6d93231ae9410083b0738953b609d5" -dependencies = [ - "num-traits", -] - -[[package]] -name = "yaxpeax-arm" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0430c0047803b6aabfa3cb62f84a78d05b933e62bfcee97c7491bf634df9123" -dependencies = [ - "bitvec", - "yaxpeax-arch", -] - -[[package]] -name = "yaxpeax-x86" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9107477944697db42c41326f82d4c65b769b32512cdad1e086f36f0e0f25ff45" -dependencies = [ - "cfg-if", - "num-traits", - "yaxpeax-arch", -] - -[[package]] -name = "yoke" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e71b2e4f287f467794c671e2b8f8a5f3716b3c829079a1c44740148eff07e4" -dependencies = [ - "serde", - "stable_deref_trait", - "zerofrom", -] - -[[package]] -name = "yoke-derive" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e6936f0cce458098a201c245a11bef556c6a0181129c7034d10d76d1ec3a2b8" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", - "synstructure", -] - -[[package]] -name = "zerocopy" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" -dependencies = [ - "byteorder", - "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 2.0.58", -] - -[[package]] -name = "zerofrom" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "655b0814c5c0b19ade497851070c640773304939a6c0fd5f5fb43da0696d05b7" - -[[package]] -name = "zeroize" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" diff --git a/pkgs/by-name/sa/samply/package.nix b/pkgs/by-name/sa/samply/package.nix index 0a85af8003b5..790c83058fbe 100644 --- a/pkgs/by-name/sa/samply/package.nix +++ b/pkgs/by-name/sa/samply/package.nix @@ -15,9 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-7bf1lDIZGhRpvnn8rHNwzH2GBY8CwtYCjuRAUTQgbsA="; }; - # Can't use fetchCargoVendor: - # https://github.com/NixOS/nixpkgs/issues/377986 - cargoLock.lockFile = ./Cargo.lock; + useFetchCargoVendor = true; + cargoHash = "sha256-o9YGKHxcC7msF7OPiUiFMLw1XX2WJ0/KVvkSwKNhU/E="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices From 2971d96d7e2945c2fce233efeb66dd231386df1e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 23:19:30 +0000 Subject: [PATCH 1589/2168] python312Packages.google-cloud-translate: 3.19.0 -> 3.20.0 --- .../python-modules/google-cloud-translate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix index 960686697f4b..27e7526e77fd 100644 --- a/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "google-cloud-translate"; - version = "3.19.0"; + version = "3.20.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_translate"; inherit version; - hash = "sha256-SNHDNsJsEl0EFnhj0hCtgBOtgenhZC/mUjR0gty/3DE="; + hash = "sha256-3Qr2qhpUKeFaGvepErDd0XSweKp5V3ZZrcZWKL6aDPQ="; }; build-system = [ setuptools ]; From 38e2916d1d58b82874d9782d152ca49ab39d9d6d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 23:19:31 +0000 Subject: [PATCH 1590/2168] python312Packages.google-cloud-automl: 2.15.0 -> 2.16.0 --- .../python-modules/google-cloud-automl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix index 0118acaed64a..345e076fe352 100644 --- a/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "google-cloud-automl"; - version = "2.15.0"; + version = "2.16.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_automl"; inherit version; - hash = "sha256-uVR7WyqVmIerI/l4lIZKCeqIqgPMOhdD6+kBBfHZVRU="; + hash = "sha256-IFUU3K+3hgPcjW+vcV8frKOvqJxp4s9o/Zshb0c0DWk="; }; build-system = [ setuptools ]; From a1f11928e7df9099c306cec7cff5415e759ff48d Mon Sep 17 00:00:00 2001 From: Defelo Date: Thu, 13 Feb 2025 00:21:22 +0100 Subject: [PATCH 1591/2168] samply: refactor --- pkgs/by-name/sa/samply/package.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/sa/samply/package.nix b/pkgs/by-name/sa/samply/package.nix index 790c83058fbe..b442478cf278 100644 --- a/pkgs/by-name/sa/samply/package.nix +++ b/pkgs/by-name/sa/samply/package.nix @@ -4,6 +4,8 @@ fetchCrate, stdenv, darwin, + versionCheckHook, + nix-update-script, }: rustPlatform.buildRustPackage rec { @@ -22,15 +24,21 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.CoreServices ]; - meta = with lib; { + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { description = "Command line profiler for macOS and Linux"; - mainProgram = "samply"; homepage = "https://github.com/mstange/samply"; changelog = "https://github.com/mstange/samply/releases/tag/samply-v${version}"; - license = with licenses; [ + license = with lib.licenses; [ asl20 mit ]; - maintainers = with maintainers; [ figsoda ]; + maintainers = with lib.maintainers; [ figsoda ]; + mainProgram = "samply"; }; } From 8b9bbf8b6dd25f82cfbf925aca2d0e9e52cd00d5 Mon Sep 17 00:00:00 2001 From: Defelo Date: Thu, 13 Feb 2025 00:29:12 +0100 Subject: [PATCH 1592/2168] samply: 0.12.0 -> 0.13.1 --- pkgs/by-name/sa/samply/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sa/samply/package.nix b/pkgs/by-name/sa/samply/package.nix index b442478cf278..b0fba4887cd4 100644 --- a/pkgs/by-name/sa/samply/package.nix +++ b/pkgs/by-name/sa/samply/package.nix @@ -10,15 +10,15 @@ rustPlatform.buildRustPackage rec { pname = "samply"; - version = "0.12.0"; + version = "0.13.1"; src = fetchCrate { inherit pname version; - hash = "sha256-7bf1lDIZGhRpvnn8rHNwzH2GBY8CwtYCjuRAUTQgbsA="; + hash = "sha256-zTwAsE6zXY3esO7x6UTCO2DbzdUSKZ6qc5Rr9qcI+Z8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-o9YGKHxcC7msF7OPiUiFMLw1XX2WJ0/KVvkSwKNhU/E="; + cargoHash = "sha256-mQykzO9Ldokd3PZ1fY4pK/GtLmYMVas2iHj1Pqi9WqQ="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices From 989efeac178cd73ef14fbd472eeb648a616ccb4d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 23:34:21 +0000 Subject: [PATCH 1593/2168] python312Packages.google-cloud-tasks: 2.18.0 -> 2.19.0 --- .../development/python-modules/google-cloud-tasks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix index ab7f27516afc..7514504fe4c1 100644 --- a/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "2.18.0"; + version = "2.19.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_tasks"; inherit version; - hash = "sha256-EaJrW0hzNAXMTqBmtPgaw1Pl+4VmQZubTTXUvRzuxYw="; + hash = "sha256-SI75LvdCvyebJVRglJyCrv1FnxzgiBAj2eNzOsfHWy0="; }; build-system = [ setuptools ]; From 3fd2f9b036c971d709abe7a90cd34be87c43b589 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 13 Feb 2025 00:03:07 +0100 Subject: [PATCH 1594/2168] python312Packages.pomegranate: 0.14.8 -> 1.1.0 Diff: https://github.com/jmschrei/pomegranate/compare/refs/tags/v0.14.8...v1.1.0 Changelog: https://github.com/jmschrei/pomegranate/releases/tag/v1.1.0 --- .../python-modules/pomegranate/default.nix | 55 +++++++++++++------ 1 file changed, 37 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/pomegranate/default.nix b/pkgs/development/python-modules/pomegranate/default.nix index 071c15c7e100..cbf7630bfa6b 100644 --- a/pkgs/development/python-modules/pomegranate/default.nix +++ b/pkgs/development/python-modules/pomegranate/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, @@ -7,45 +8,63 @@ setuptools, # dependencies - numpy, - joblib, + apricot-select, networkx, + numpy, + scikit-learn, scipy, - pyyaml, - cython, + torch, + + # tests + pytestCheckHook, }: buildPythonPackage rec { pname = "pomegranate"; - version = "0.14.8"; + version = "1.1.0"; pyproject = true; src = fetchFromGitHub { repo = pname; owner = "jmschrei"; - # no tags for recent versions: https://github.com/jmschrei/pomegranate/issues/974 tag = "v${version}"; - hash = "sha256-PoDAtNm/snq4isotkoCTVYUuwr9AKKwiXIojUFMH/YE="; + hash = "sha256-p2Gn0FXnsAHvRUeAqx4M1KH0+XvDl3fmUZZ7MiMvPSs="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ - numpy - joblib + dependencies = [ + apricot-select networkx + numpy + scikit-learn scipy - pyyaml - cython + torch ]; - # https://github.com/etal/cnvkit/issues/815 - passthru.skipBulkUpdate = true; + pythonImportsCheck = [ "pomegranate" ]; - meta = with lib; { + nativeCheckInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ + # AssertionError: Arrays are not almost equal to 6 decimals + "--deselect=tests/distributions/test_normal_full.py::test_fit" + "--deselect=tests/distributions/test_normal_full.py::test_from_summaries" + "--deselect=tests/distributions/test_normal_full.py::test_serialization" + ]; + + disabledTests = [ + # AssertionError: Arrays are not almost equal to 6 decimals + "test_sample" + ]; + + meta = { description = "Probabilistic and graphical models for Python, implemented in cython for speed"; homepage = "https://github.com/jmschrei/pomegranate"; - license = licenses.mit; - maintainers = with maintainers; [ rybern ]; + changelog = "https://github.com/jmschrei/pomegranate/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ rybern ]; }; } From 5867ccafa1a17f3e3dd3bb8eca2d2b05804b2a27 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 23:40:17 +0000 Subject: [PATCH 1595/2168] python312Packages.google-cloud-os-config: 1.19.0 -> 1.20.0 --- .../python-modules/google-cloud-os-config/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-os-config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix index 7573d50d5275..91640d71efc5 100644 --- a/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "google-cloud-os-config"; - version = "1.19.0"; + version = "1.20.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_os_config"; inherit version; - hash = "sha256-P5yHBm5FGxpzQuJsVDBAuhidu6PzXlJ6k62kr7XKnIU="; + hash = "sha256-GczIpzo161rJ+TxU9LB9wcvtLXfopSRofeO9UyS4tMQ="; }; build-system = [ setuptools ]; From 545c5dd68b7e7a86203df097866fa388cf9815d5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 23:47:17 +0000 Subject: [PATCH 1596/2168] python312Packages.google-cloud-appengine-logging: 1.5.0 -> 1.6.0 --- .../python-modules/google-cloud-appengine-logging/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix index 6c0dee2d5a9d..4c60425d242a 100644 --- a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-appengine-logging"; - version = "1.5.0"; + version = "1.6.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_appengine_logging"; inherit version; - hash = "sha256-OaLfaU2XmB7QDvXfVB98/MqSCpJJZwdVfysHu3up1no="; + hash = "sha256-L271LfqI7KO+oHi8PCtV6mH/CLXgw3kSAn+7Kl8tkc4="; }; build-system = [ setuptools ]; From 321eb37d4f5e0f580bf211cb0ddcface6bfa78d3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 23:48:19 +0000 Subject: [PATCH 1597/2168] python312Packages.google-cloud-vpc-access: 1.12.0 -> 1.13.0 --- .../python-modules/google-cloud-vpc-access/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-vpc-access/default.nix b/pkgs/development/python-modules/google-cloud-vpc-access/default.nix index 031a283d1fbb..5f09ae85dd2c 100644 --- a/pkgs/development/python-modules/google-cloud-vpc-access/default.nix +++ b/pkgs/development/python-modules/google-cloud-vpc-access/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-vpc-access"; - version = "1.12.0"; + version = "1.13.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_vpc_access"; inherit version; - hash = "sha256-SmtqD6b5VnHMrL8kmWeFZZTt/WMRzMEc4VxX9FYmUiE="; + hash = "sha256-jMZtqtbNtocz6NeUJupU+Gkk2L48S5FfrvRrQ5/SZx8="; }; build-system = [ setuptools ]; From e0a45023d7785947c86fba0bee73be50bcbed824 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 23:53:34 +0000 Subject: [PATCH 1598/2168] python312Packages.google-cloud-netapp: 0.3.18 -> 0.3.19 --- .../python-modules/google-cloud-netapp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-netapp/default.nix b/pkgs/development/python-modules/google-cloud-netapp/default.nix index 53f0662def48..058015cb1b5f 100644 --- a/pkgs/development/python-modules/google-cloud-netapp/default.nix +++ b/pkgs/development/python-modules/google-cloud-netapp/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-netapp"; - version = "0.3.18"; + version = "0.3.19"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_netapp"; inherit version; - hash = "sha256-fj4o5EzA7G9MtNbSphZPBi7Zq2T/QrFOWXxZ+9ep/Dw="; + hash = "sha256-88A1HJbm3ngNWXS+kJ/nmX5ctwZBqAe9VckC5AMmWuU="; }; build-system = [ setuptools ]; From be208c66f98e61d50065b41fba656f5524b92512 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 23:59:35 +0000 Subject: [PATCH 1599/2168] python312Packages.google-cloud-datacatalog: 3.24.1 -> 3.25.0 --- .../python-modules/google-cloud-datacatalog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index bcf48bb812d5..145683193c59 100644 --- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-cloud-datacatalog"; - version = "3.24.1"; + version = "3.25.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_datacatalog"; inherit version; - hash = "sha256-JYcOb+suHqXNPGNoGhXm1GI33UWFM3lo766HXf9mek8="; + hash = "sha256-NBLojGvNx1m6rT2z7h1sj7bXlo8gUMwvyYGquzy1u0g="; }; build-system = [ setuptools ]; From ff91f196b1dcabdd1278b0641488acf3f4f466f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 00:08:10 +0000 Subject: [PATCH 1600/2168] python312Packages.google-cloud-vision: 3.9.0 -> 3.10.0 --- .../python-modules/google-cloud-vision/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix index 1a599bab4a1e..632cd4558e65 100644 --- a/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "google-cloud-vision"; - version = "3.9.0"; + version = "3.10.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_vision"; inherit version; - hash = "sha256-ISJqrJy0ukW/icwuEHrqGeT3j5c26x3laDfgwpif7P8="; + hash = "sha256-HwseF62mj3slfu88t8kaAsjyHiVPi9uP84sOZ9Jc46U="; }; build-system = [ setuptools ]; From 26d0abe4d61f5800c19be005cadb7cb3303e8b95 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 00:16:30 +0000 Subject: [PATCH 1601/2168] python312Packages.google-cloud-asset: 3.28.0 -> 3.29.0 --- .../development/python-modules/google-cloud-asset/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix index 670606040710..aa8b06d4a7f3 100644 --- a/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "3.28.0"; + version = "3.29.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_asset"; inherit version; - hash = "sha256-nzRadnCw08rgj9IPqe6qMq5JKDtKsG3zyNc9joI2tOQ="; + hash = "sha256-CltrB+0/1yu1ginnGDX98brGXeWDh6mBZbCC+3qn7Uw="; }; build-system = [ setuptools ]; From 6816845f7f84681eb6e31ec0eaaed7695c5a0e68 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 00:20:05 +0000 Subject: [PATCH 1602/2168] python312Packages.google-cloud-secret-manager: 2.22.1 -> 2.23.0 --- .../python-modules/google-cloud-secret-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index 6b695863332c..64b203ecb65c 100644 --- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "2.22.1"; + version = "2.23.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_secret_manager"; inherit version; - hash = "sha256-8kXlBbQpmQOI8Pks1KJNQkpMTNwqy4ZuUsJOdoDRXnc="; + hash = "sha256-Akn0M7bwiZteKt/EleWy1KdsSEk3ytfCfis3S+v48kg="; }; build-system = [ setuptools ]; From d8519b0be891e8fd7521ace0f81b652438eed1a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 00:26:46 +0000 Subject: [PATCH 1603/2168] python312Packages.google-cloud-compute: 1.23.0 -> 1.25.0 --- .../python-modules/google-cloud-compute/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-compute/default.nix b/pkgs/development/python-modules/google-cloud-compute/default.nix index a76c25b1933e..87f232533051 100644 --- a/pkgs/development/python-modules/google-cloud-compute/default.nix +++ b/pkgs/development/python-modules/google-cloud-compute/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "google-cloud-compute"; - version = "1.23.0"; + version = "1.25.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_compute"; inherit version; - hash = "sha256-LLAlY69Sj3Rg8sjJBSMJloc+KE//5pzP4uR4kPnlSQs="; + hash = "sha256-Z1I34qVG+OX6WMGccxDgladTgzgxKoKLGXDyrwlb84c="; }; build-system = [ setuptools ]; From be6f48bc3942ec2a2a26778365f6b4ca7ad696d4 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Tue, 11 Feb 2025 07:34:43 -0700 Subject: [PATCH 1604/2168] nixos-render-docs: move pytestCheckHook to nativeCheckInputs Previously, it was in nativeBuildInputs which caused tests to run while cross compiling. This attempts to run host python on the build machine. --- pkgs/by-name/ni/nixos-render-docs/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ni/nixos-render-docs/package.nix b/pkgs/by-name/ni/nixos-render-docs/package.nix index 9e58c3561c16..2b417bf86383 100644 --- a/pkgs/by-name/ni/nixos-render-docs/package.nix +++ b/pkgs/by-name/ni/nixos-render-docs/package.nix @@ -38,9 +38,12 @@ python.pkgs.buildPythonApplication rec { src = ./src; }; - nativeBuildInputs = with python.pkgs; [ - setuptools - pytestCheckHook + nativeCheckInputs = [ + python.pkgs.pytestCheckHook + ]; + + build-system = [ + python.pkgs.setuptools ]; propagatedBuildInputs = with python.pkgs; [ From fd640fe6a92bd829e0794873990d91141c1a3d2d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Feb 2025 01:10:53 +0100 Subject: [PATCH 1605/2168] wyoming-satellite: 1.3.0 -> 1.4.1 https://github.com/rhasspy/wyoming-satellite/blob/refs/tags/v1.4.1/CHANGELOG.md --- pkgs/by-name/wy/wyoming-satellite/package.nix | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/wy/wyoming-satellite/package.nix b/pkgs/by-name/wy/wyoming-satellite/package.nix index d0186822ab7d..adf4d0b7c029 100644 --- a/pkgs/by-name/wy/wyoming-satellite/package.nix +++ b/pkgs/by-name/wy/wyoming-satellite/package.nix @@ -2,6 +2,7 @@ lib, python3Packages, fetchFromGitHub, + fetchpatch2, }: let @@ -21,16 +22,24 @@ let in python.pkgs.buildPythonApplication rec { pname = "wyoming-satellite"; - version = "1.3.0"; + version = "1.4.1"; pyproject = true; src = fetchFromGitHub { owner = "rhasspy"; repo = "wyoming-satellite"; tag = "v${version}"; - hash = "sha256-9UgfD0Hs/IgOszd/QBbe6DYY6kBWh7q/e57gghQ1/Bk="; + hash = "sha256-sAtyyS60Fr6iFE3tTxEgAjhmX6O5WjWwb9rk+phzrtM="; }; + patches = [ + (fetchpatch2 { + # https://github.com/rhasspy/wyoming-satellite/pull/285 + url = "https://github.com/rhasspy/wyoming-satellite/commit/69465fd56011179cb92e7ce95da2e79fb06a83fb.patch"; + hash = "sha256-njJ8kIVGOpYK6bDeGow3OSNHxKQ9NsUKAR3+lEUH3GE="; + }) + ]; + build-system = with python.pkgs; [ setuptools ]; @@ -46,14 +55,19 @@ python.pkgs.buildPythonApplication rec { zeroconf ]; - optional-dependencies = { + optional-dependencies = lib.fix (self: { + all = self.silerovad ++ self.webrtc; + respeaker = with python3Packages; [ + gpiozero + spidev + ]; silerovad = with python3Packages; [ pysilero-vad ]; webrtc = with python3Packages; [ webrtc-noise-gain ]; - }; + }); pythonImportsCheck = [ "wyoming_satellite" From 7e5d18b1b15164f083134c5ccd70cea2ea7f78e1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 00:32:32 +0000 Subject: [PATCH 1606/2168] gnustep-back: 0.31.0 -> 0.32.0 --- pkgs/by-name/gn/gnustep-back/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnustep-back/package.nix b/pkgs/by-name/gn/gnustep-back/package.nix index 3ba7512c4b67..94b4cdf356e5 100644 --- a/pkgs/by-name/gn/gnustep-back/package.nix +++ b/pkgs/by-name/gn/gnustep-back/package.nix @@ -14,11 +14,11 @@ clangStdenv.mkDerivation (finalAttrs: { pname = "gnustep-back"; - version = "0.31.0"; + version = "0.32.0"; src = fetchzip { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-CjcoXlKiPVPJMOdrBKjxiNauTZvLcId5Lb8DzbgBbBg="; + sha256 = "sha256-E9rg3ySRUXSVgdPLeg1WrMO8u+SHHmM2Kb/XDAYqIOQ="; }; nativeBuildInputs = [ From 5252a8268e3adc55cea5974721b2dcf7f814ec84 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 00:39:18 +0000 Subject: [PATCH 1607/2168] blst: 0.3.13 -> 0.3.14 --- pkgs/by-name/bl/blst/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bl/blst/package.nix b/pkgs/by-name/bl/blst/package.nix index 0148fe0d0a94..34c66eeb0eb5 100644 --- a/pkgs/by-name/bl/blst/package.nix +++ b/pkgs/by-name/bl/blst/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "blst"; - version = "0.3.13"; + version = "0.3.14"; src = fetchFromGitHub { owner = "supranational"; repo = "blst"; rev = "v${finalAttrs.version}"; - hash = "sha256-+Ae2cCVVEXnV/ftVOApxDcXM3COf/4DXXd1AOuGS5uc="; + hash = "sha256-IlbNMLBjs/dvGogcdbWQIL+3qwy7EXJbIDpo4xBd4bY="; }; buildPhase = '' From 4ee8be94120c52ef5ddfecbe0eeb24b38f031975 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 00:40:07 +0000 Subject: [PATCH 1608/2168] gnustep-gui: 0.31.1 -> 0.32.0 --- pkgs/by-name/gn/gnustep-gui/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnustep-gui/package.nix b/pkgs/by-name/gn/gnustep-gui/package.nix index 560daf72581f..5ade6dec4b51 100644 --- a/pkgs/by-name/gn/gnustep-gui/package.nix +++ b/pkgs/by-name/gn/gnustep-gui/package.nix @@ -7,12 +7,12 @@ }: clangStdenv.mkDerivation (finalAttrs: { - version = "0.31.1"; + version = "0.32.0"; pname = "gnustep-gui"; src = fetchzip { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-gui-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-+4XEJ6PKpantbIbyNroFMaNBTFffkuW/ajSocGQO9Mo="; + sha256 = "sha256-HEH80P51mnLRt4+d+gzpGCv4u6oOdf+x68CcvkR6G/o="; }; nativeBuildInputs = [ wrapGNUstepAppsHook ]; From ae0ca1c65a0b1253ff3c3625f199bf0ebb590c45 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 13 Feb 2025 00:18:24 +0100 Subject: [PATCH 1609/2168] python312.cnvkit: cleanup & fix --- .../python-modules/cnvkit/default.nix | 110 ++++++++++-------- 1 file changed, 59 insertions(+), 51 deletions(-) diff --git a/pkgs/development/python-modules/cnvkit/default.nix b/pkgs/development/python-modules/cnvkit/default.nix index 168ba0b0882b..4911f8b004cd 100644 --- a/pkgs/development/python-modules/cnvkit/default.nix +++ b/pkgs/development/python-modules/cnvkit/default.nix @@ -1,31 +1,31 @@ { lib, - fetchFromGitHub, - rPackages, buildPythonPackage, + fetchFromGitHub, + fetchpatch, + + # dependencies + R, biopython, - numpy, - scipy, - scikit-learn, - pandas, matplotlib, - reportlab, - pysam, - future, - pillow, + numpy, + pandas, pomegranate, pyfaidx, - python, - pythonOlder, - R, + pysam, + rPackages, + reportlab, + scikit-learn, + scipy, + + # tests + pytestCheckHook, }: buildPythonPackage rec { pname = "cnvkit"; version = "0.9.12"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + pyproject = true; src = fetchFromGitHub { owner = "etal"; @@ -34,50 +34,58 @@ buildPythonPackage rec { hash = "sha256-ZdE3EUNZpEXRHTRKwVhuj3BWQWczpdFbg4pVr0+AHiQ="; }; - postPatch = '' - # see https://github.com/etal/cnvkit/issues/589 - substituteInPlace setup.py \ - --replace 'joblib < 1.0' 'joblib' - # see https://github.com/etal/cnvkit/issues/680 - substituteInPlace test/test_io.py \ - --replace 'test_read_vcf' 'dont_test_read_vcf' - ''; - - propagatedBuildInputs = [ - biopython - numpy - scipy - scikit-learn - pandas - matplotlib - reportlab - pyfaidx - pysam - future - pillow - pomegranate - rPackages.DNAcopy + patches = [ + (fetchpatch { + name = "fix-numpy2-compat"; + url = "https://github.com/etal/cnvkit/commit/5cb6aeaf40ea5572063cf9914c456c307b7ddf7a.patch"; + hash = "sha256-VwGAMGKuX2Kx9xL9GX/PB94/7LkT0dSLbWIfVO8F9NI="; + }) ]; - nativeCheckInputs = [ R ]; + pythonRelaxDeps = [ + # https://github.com/etal/cnvkit/issues/815 + "pomegranate" + ]; - checkPhase = '' - pushd test/ - ${python.interpreter} test_io.py - ${python.interpreter} test_genome.py - ${python.interpreter} test_cnvlib.py - ${python.interpreter} test_commands.py - ${python.interpreter} test_r.py - popd # test/ + # Numpy 2 compatibility + postPatch = '' + substituteInPlace skgenome/intersect.py \ + --replace-fail "np.string_" "np.bytes_" ''; + dependencies = [ + biopython + matplotlib + numpy + pandas + pomegranate + pyfaidx + pysam + rPackages.DNAcopy + reportlab + scikit-learn + scipy + ]; + pythonImportsCheck = [ "cnvlib" ]; - meta = with lib; { + nativeCheckInputs = [ + pytestCheckHook + R + ]; + + disabledTests = [ + # AttributeError: module 'pomegranate' has no attribute 'NormalDistribution' + # https://github.com/etal/cnvkit/issues/815 + "test_batch" + "test_segment_hmm" + ]; + + meta = { homepage = "https://cnvkit.readthedocs.io"; description = "Python library and command-line software toolkit to infer and visualize copy number from high-throughput DNA sequencing data"; changelog = "https://github.com/etal/cnvkit/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = [ maintainers.jbedo ]; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.jbedo ]; }; } From cdea5670aa783cd5f68ac527745efb7c9bbd1ee5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 12 Feb 2025 21:47:03 -0300 Subject: [PATCH 1610/2168] reversal-icon-theme: temporarily set dontCheckForBrokenSymlinks --- pkgs/by-name/re/reversal-icon-theme/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/re/reversal-icon-theme/package.nix b/pkgs/by-name/re/reversal-icon-theme/package.nix index c56104e4c288..c7e445851e60 100644 --- a/pkgs/by-name/re/reversal-icon-theme/package.nix +++ b/pkgs/by-name/re/reversal-icon-theme/package.nix @@ -60,6 +60,9 @@ lib.checkListOfEnum "${pname}: color variants" dontPatchELF = true; dontRewriteSymlinks = true; + # FIXME: https://github.com/yeyushengfan258/Reversal-icon-theme/issues/108 + dontCheckForBrokenSymlinks = true; + postPatch = '' patchShebangs install.sh ''; From 8ec9c084ceb4ba1ded50070325d574317c83a9e3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 00:57:36 +0000 Subject: [PATCH 1611/2168] pulldown-cmark: 0.12.2 -> 0.13.0 --- pkgs/by-name/pu/pulldown-cmark/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pu/pulldown-cmark/package.nix b/pkgs/by-name/pu/pulldown-cmark/package.nix index 75b63ccfd216..6adf7b8fbe62 100644 --- a/pkgs/by-name/pu/pulldown-cmark/package.nix +++ b/pkgs/by-name/pu/pulldown-cmark/package.nix @@ -6,15 +6,15 @@ rustPlatform.buildRustPackage rec { pname = "pulldown-cmark"; - version = "0.12.2"; + version = "0.13.0"; src = fetchCrate { inherit pname version; - hash = "sha256-dsSt0JC3e1IItyY16tosxD83XUdttHVIT40QsW9iUFU="; + hash = "sha256-lp0ywX/3phfC30QvYkO2wFZNSinP4cdm4HY744EZ02o="; }; useFetchCargoVendor = true; - cargoHash = "sha256-5AXEXuw3aKT8ghzEclwZYSOQvKcy90OvZbAVVkNJq1U="; + cargoHash = "sha256-ek6Eczqb/kxxoZFakGcwrgqXAtNCtQxDX2PHdOcIUjU="; meta = { description = "Pull parser for CommonMark written in Rust"; From cd99068bb0dcef264ccfc55095ab81ef09c63a37 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 01:08:48 +0000 Subject: [PATCH 1612/2168] gnu-shepherd: 1.0.1 -> 1.0.2 --- pkgs/by-name/gn/gnu-shepherd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnu-shepherd/package.nix b/pkgs/by-name/gn/gnu-shepherd/package.nix index 4b573b1712f1..964176154388 100644 --- a/pkgs/by-name/gn/gnu-shepherd/package.nix +++ b/pkgs/by-name/gn/gnu-shepherd/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gnu-shepherd"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { url = "mirror://gnu/shepherd/shepherd-${version}.tar.gz"; - hash = "sha256-iV0AUeHMRzsfefY5E3d7TRX4nxbQpyN3QXbaEC4nEMU="; + hash = "sha256-30usBLSwR2+o+e0TgpKsLMVLQwS17v2FntSJLU+ZJL8="; }; configureFlags = [ "--localstatedir=/" ]; From 80ab7b5622da71bd02eb9768f712192cda29491f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 01:09:05 +0000 Subject: [PATCH 1613/2168] steamguard-cli: 0.15.0 -> 0.16.0 --- pkgs/by-name/st/steamguard-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/steamguard-cli/package.nix b/pkgs/by-name/st/steamguard-cli/package.nix index e85c2268b53a..392738266173 100644 --- a/pkgs/by-name/st/steamguard-cli/package.nix +++ b/pkgs/by-name/st/steamguard-cli/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "steamguard-cli"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "dyc3"; repo = pname; rev = "v${version}"; - hash = "sha256-Cxl6FczWr5kAYt+q1m3HLEKCBeQz3TcW/aaOxsBcuwc="; + hash = "sha256-gPw0D5/XpT1bRYgG6GgDSP47Pa6MR3qzKhVwB4MrLKU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-ku5O7coA9OKCLNIkp/WPSgYsTO546/v3RZ/PcNkGRmA="; + cargoHash = "sha256-uu+Ngz5hfH1Pg2KcumpHW3BDggBGJgRh0W06a6fPrfg="; nativeBuildInputs = [ installShellFiles ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' From 4ec54a16d6acfbf1be9473253bb0a74c1aef5b3e Mon Sep 17 00:00:00 2001 From: RedEtherbloom Date: Wed, 4 Dec 2024 15:08:07 +0100 Subject: [PATCH 1614/2168] =?UTF-8?q?git-sync:=200-unstable-2024-02-15=20?= =?UTF-8?q?=E2=86=92=200-unstable-2024-11-30?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/gi/git-sync/package.nix | 33 +++++++++++++++++++--------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/gi/git-sync/package.nix b/pkgs/by-name/gi/git-sync/package.nix index 1534cfb81c1e..c08f3f6857b8 100644 --- a/pkgs/by-name/gi/git-sync/package.nix +++ b/pkgs/by-name/gi/git-sync/package.nix @@ -1,14 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, coreutils, git, gnugrep, gnused, makeWrapper, inotify-tools }: +{ + lib, + stdenv, + fetchFromGitHub, + coreutils, + git, + gnugrep, + gnused, + makeWrapper, + inotify-tools, +}: stdenv.mkDerivation rec { pname = "git-sync"; - version = "0-unstable-2024-02-15"; + version = "0-unstable-2024-11-30"; src = fetchFromGitHub { owner = "simonthum"; repo = "git-sync"; - rev = "493b0155fb974b477b6ea623d6e41e13ddad8500"; - hash = "sha256-hsq+kpB+akjbFKBeHMsP8ibrtygEG2Yf2QW9vFFIano="; + rev = "7242291edf543ecc1bb9de8f47086bb69a5cb9f7"; + hash = "sha256-t1NVgp+ELmTMK0N1fFFJCoKQd8mSYSMAIDG9+kNs3Ok="; }; nativeBuildInputs = [ makeWrapper ]; @@ -21,12 +31,15 @@ stdenv.mkDerivation rec { cp -a contrib/git-* $out/bin/ ''; - wrapperPath = lib.makeBinPath ([ - coreutils - git - gnugrep - gnused - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ inotify-tools ]); + wrapperPath = lib.makeBinPath ( + [ + coreutils + git + gnugrep + gnused + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ inotify-tools ] + ); postFixup = '' wrap_path="${wrapperPath}":$out/bin From 8a3176ac2775b40ae62a80b574f2ed01c55ad677 Mon Sep 17 00:00:00 2001 From: RedEtherbloom Date: Wed, 4 Dec 2024 15:19:21 +0100 Subject: [PATCH 1615/2168] git-sync: enable automatic package update --- pkgs/by-name/gi/git-sync/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/gi/git-sync/package.nix b/pkgs/by-name/gi/git-sync/package.nix index c08f3f6857b8..3b4f43dc1f23 100644 --- a/pkgs/by-name/gi/git-sync/package.nix +++ b/pkgs/by-name/gi/git-sync/package.nix @@ -8,6 +8,7 @@ gnused, makeWrapper, inotify-tools, + nix-update-script, }: stdenv.mkDerivation rec { @@ -51,6 +52,10 @@ stdenv.mkDerivation rec { --prefix PATH : $wrap_path ''; + passthru = { + updateScript = nix-update-script { }; + }; + meta = { description = "Script to automatically synchronize a git repository"; homepage = "https://github.com/simonthum/git-sync"; From ddcf23f0eedf592e064ab783a82df9075b1dda21 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Wed, 12 Feb 2025 18:26:28 -0700 Subject: [PATCH 1616/2168] llvm: use prebuilt tblgen for NATIVE build as well This fixes an issue building cross for OpenBSD where it would link the NATIVE tblgen with the host zlib. --- pkgs/development/compilers/llvm/common/llvm/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix index 2e248209819a..a5db5c8b2c8a 100644 --- a/pkgs/development/compilers/llvm/common/llvm/default.nix +++ b/pkgs/development/compilers/llvm/common/llvm/default.nix @@ -349,9 +349,10 @@ stdenv.mkDerivation (finalAttrs: { "-DLLVM_ENABLE_RTTI=ON" ] ++ optionals enableSharedLibraries [ "-DLLVM_LINK_LLVM_DYLIB=ON" + ] ++ [ + "-DLLVM_TABLEGEN=${buildLlvmTools.tblgen}/bin/llvm-tblgen" ]; in flagsForLlvmConfig ++ [ - "-DLLVM_TABLEGEN=${buildLlvmTools.tblgen}/bin/llvm-tblgen" "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc "-DLLVM_BUILD_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" "-DLLVM_ENABLE_FFI=ON" From 598aa1f95454c62d8f3f5d088834cbf8b36903a5 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Wed, 12 Feb 2025 18:27:31 -0700 Subject: [PATCH 1617/2168] xz: run autoreconfHook on OpenBSD This cannot be made unconditional as it causes infinite recursion, but the old libtool being used messes up the distribution of OpenBSD shared libraries. --- pkgs/tools/compression/xz/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index 658e8d8216a8..74d8e9b85423 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + autoreconfHook, enableStatic ? stdenv.hostPlatform.isStatic, writeScript, testers, @@ -37,6 +38,10 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; doCheck = true; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isOpenBSD [ + autoreconfHook + ]; + # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion # necessary for FreeBSD code path in configure postPatch = '' From 67f475548563a7bd42b64ac5da29ae0d1b159016 Mon Sep 17 00:00:00 2001 From: Emily Trau Date: Thu, 13 Feb 2025 12:29:11 +1100 Subject: [PATCH 1618/2168] goresym: 2.7.4 -> 3.0.2 --- pkgs/by-name/go/goresym/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/goresym/package.nix b/pkgs/by-name/go/goresym/package.nix index 80ed06fd0fb8..e498701b9707 100644 --- a/pkgs/by-name/go/goresym/package.nix +++ b/pkgs/by-name/go/goresym/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "goresym"; - version = "2.7.4"; + version = "3.0.2"; src = fetchFromGitHub { owner = "mandiant"; - repo = pname; + repo = "goresym"; rev = "v${version}"; - sha256 = "sha256-qFDacInIiV1thuYMjyzTG7ru5bkd2Af1iao7Oes1mRg="; + hash = "sha256-tt13vHe6wE27kv+1HVXytY1hKmOt6rWJaMBgLRCvO2E="; }; subPackages = [ "." ]; From 9f355b12e5502ab60e40e7eaa713f6cf3c52df88 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Sat, 11 Jan 2025 21:42:32 -0700 Subject: [PATCH 1619/2168] openbsd.libc: add libkvm This package is also included in libc on FreeBSD. --- pkgs/os-specific/bsd/openbsd/pkgs/dmesg.nix | 4 +--- pkgs/os-specific/bsd/openbsd/pkgs/libc.nix | 2 ++ pkgs/os-specific/bsd/openbsd/pkgs/libkvm.nix | 2 ++ pkgs/os-specific/bsd/openbsd/pkgs/pkill.nix | 5 ----- pkgs/os-specific/bsd/openbsd/pkgs/ps.nix | 3 +-- pkgs/os-specific/bsd/openbsd/pkgs/vmstat.nix | 3 +-- 6 files changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/dmesg.nix b/pkgs/os-specific/bsd/openbsd/pkgs/dmesg.nix index d4f9430c8b31..7ba6460d6bcd 100644 --- a/pkgs/os-specific/bsd/openbsd/pkgs/dmesg.nix +++ b/pkgs/os-specific/bsd/openbsd/pkgs/dmesg.nix @@ -1,9 +1,7 @@ -{ mkDerivation, libkvm }: +{ mkDerivation }: mkDerivation { path = "sbin/dmesg"; - buildInputs = [ libkvm ]; - postPatch = '' sed -i /DPADD/d $BSDSRCDIR/sbin/dmesg/Makefile ''; diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/libc.nix b/pkgs/os-specific/bsd/openbsd/pkgs/libc.nix index 7bb0516729d0..b0362f434693 100644 --- a/pkgs/os-specific/bsd/openbsd/pkgs/libc.nix +++ b/pkgs/os-specific/bsd/openbsd/pkgs/libc.nix @@ -8,6 +8,7 @@ librpcsvc, libutil, libexecinfo, + libkvm, rtld, version, }: @@ -38,6 +39,7 @@ symlinkJoin rec { librpcsvc libutil libexecinfo + libkvm ] ++ (lib.optional (!stdenvNoLibc.hostPlatform.isStatic) rtld) ); diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/libkvm.nix b/pkgs/os-specific/bsd/openbsd/pkgs/libkvm.nix index 3fe8a1b2fdd2..6fa352705b13 100644 --- a/pkgs/os-specific/bsd/openbsd/pkgs/libkvm.nix +++ b/pkgs/os-specific/bsd/openbsd/pkgs/libkvm.nix @@ -3,4 +3,6 @@ }: mkDerivation { path = "lib/libkvm"; + + libcMinimal = true; } diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/pkill.nix b/pkgs/os-specific/bsd/openbsd/pkgs/pkill.nix index b217de6a7b00..f54baf19c2c3 100644 --- a/pkgs/os-specific/bsd/openbsd/pkgs/pkill.nix +++ b/pkgs/os-specific/bsd/openbsd/pkgs/pkill.nix @@ -1,14 +1,9 @@ { mkDerivation, - libkvm, }: mkDerivation { path = "usr.bin/pkill"; - buildInputs = [ - libkvm - ]; - postPatch = '' sed -i /DPADD/d $BSDSRCDIR/usr.bin/pkill/Makefile ''; diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/ps.nix b/pkgs/os-specific/bsd/openbsd/pkgs/ps.nix index 402d86b723eb..c6afa3fe9f17 100644 --- a/pkgs/os-specific/bsd/openbsd/pkgs/ps.nix +++ b/pkgs/os-specific/bsd/openbsd/pkgs/ps.nix @@ -1,8 +1,7 @@ -{ mkDerivation, libkvm }: +{ mkDerivation }: mkDerivation { path = "bin/ps"; - buildInputs = [ libkvm ]; postPatch = '' sed -i /DPADD/d $BSDSRCDIR/bin/ps/Makefile ''; diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/vmstat.nix b/pkgs/os-specific/bsd/openbsd/pkgs/vmstat.nix index bc654ad650e6..6b8d54cd851d 100644 --- a/pkgs/os-specific/bsd/openbsd/pkgs/vmstat.nix +++ b/pkgs/os-specific/bsd/openbsd/pkgs/vmstat.nix @@ -1,8 +1,7 @@ -{ mkDerivation, libkvm }: +{ mkDerivation }: mkDerivation { path = "usr.bin/vmstat"; - buildInputs = [ libkvm ]; postPatch = '' sed -i /DPADD/d $BSDSRCDIR/usr.bin/vmstat/Makefile ''; From ffecf553ecffe27c0d5f88d70fc44dce940db7eb Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Sat, 23 Nov 2024 14:56:43 -0700 Subject: [PATCH 1620/2168] freebsd.makefs: uncomment code which can copy device info from an mtree --- .../freebsd/patches/14.1/makefs-rdev.patch | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 pkgs/os-specific/bsd/freebsd/patches/14.1/makefs-rdev.patch diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/makefs-rdev.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/makefs-rdev.patch new file mode 100644 index 000000000000..5d89942c2aae --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/patches/14.1/makefs-rdev.patch @@ -0,0 +1,30 @@ +The freebsd makefs code is imported directly from netbsd, with minor changes. +One of these changes is commenting out a piece of code we need in order to +cross-build filesystem images for openbsd with nix: the ability to copy device +node information from an mtree. This is especially important in nix because the +only other way to generate device nodes is to have them be resident on the +build system's filesystem, which is not possible without root, and openbsd does +not have a devfs and requires that all device nodes are simply present on the +root filesystem in order to boot. + +Uncomment it. + +diff --git a/usr.sbin/makefs/walk.c b/usr.sbin/makefs/walk.c +index 56e2d19c6f00..c3bf8faac2aa 100644 +--- a/usr.sbin/makefs/walk.c ++++ b/usr.sbin/makefs/walk.c +@@ -540,12 +540,12 @@ apply_specentry(const char *dir, NODE *specnode, fsnode *dirnode) + dirnode->inode->st.st_flags = specnode->st_flags; + } + #endif +-/* if (specnode->flags & F_DEV) { ++ if (specnode->flags & F_DEV) { + ASEPRINT("rdev", "%#llx", + (unsigned long long)dirnode->inode->st.st_rdev, + (unsigned long long)specnode->st_rdev); + dirnode->inode->st.st_rdev = specnode->st_rdev; +- }*/ ++ } + #undef ASEPRINT + + dirnode->flags |= FSNODE_F_HASSPEC; From 8b08408e9794f94e932b9cfd844c1d14dabdf2b8 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Sat, 30 Nov 2024 00:44:02 -0700 Subject: [PATCH 1621/2168] openbsd.makedev: init MAKEDEV is a shell script that can generate OpenBSD device nodes. It is useful on an OpenBSD system for disaster recovery and also on a non-OpenBSD system for cross-compilation. --- .../bsd/openbsd/pkgs/makedev/bash.patch | 18 +++++++++ .../bsd/openbsd/pkgs/makedev/package.nix | 37 +++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/makedev/bash.patch create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/makedev/package.nix diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/makedev/bash.patch b/pkgs/os-specific/bsd/openbsd/pkgs/makedev/bash.patch new file mode 100644 index 000000000000..06993c0066d7 --- /dev/null +++ b/pkgs/os-specific/bsd/openbsd/pkgs/makedev/bash.patch @@ -0,0 +1,18 @@ +diff --git a/etc/MAKEDEV.common b/etc/MAKEDEV.common +index 1e7bb3d235a..1cc64a38985 100644 +--- a/etc/MAKEDEV.common ++++ b/etc/MAKEDEV.common +@@ -315,10 +315,10 @@ _mkdev(pty, pty*, {-if [ $U -gt 15 ]; then + echo bad unit for pty in: $i + continue + fi +- set -A letters p q r s t u v w x y z P Q R S T +- set -A suffixes 0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k l m n o p q \ ++ letters=(p q r s t u v w x y z P Q R S T) ++ suffixes=(0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k l m n o p q \ + r s t u v w x y z A B C D E F G H I J K L M N O P Q R S T U V W X \ +- Y Z ++ Y Z) + + name=${letters[$U]} + n=0 diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/makedev/package.nix b/pkgs/os-specific/bsd/openbsd/pkgs/makedev/package.nix new file mode 100644 index 000000000000..48f5b7176b20 --- /dev/null +++ b/pkgs/os-specific/bsd/openbsd/pkgs/makedev/package.nix @@ -0,0 +1,37 @@ +{ + mkDerivation, + runtimeShell, + m4, +}: + +mkDerivation { + pname = "MAKEDEV"; + path = "etc"; + + patches = [ ./bash.patch ]; + + extraNativeBuildInputs = [ + m4 + ]; + + preBuild = '' + mkdir -p $out/share/doc + ''; + buildTargets = [ "MAKEDEV" ]; + + # patch some build artifacts + # gnu m4 doesn't seem to recognize the expr() macro but it's only used for simple arithmetic so we convert it to bash + postBuild = '' + substituteInPlace etc.$TARGET_MACHINE_ARCH/MAKEDEV --replace-fail "/bin/sh -" "${runtimeShell}" + sed -E -i -e '/^PATH=.*/d' -e 's/expr\((.*)\)/$((\1))/g' etc.$TARGET_MACHINE_ARCH/MAKEDEV + ''; + + # The install procedure is also weird since this is supposed to live in /dev + postInstall = '' + mkdir -p $out/bin + cp etc.$TARGET_MACHINE_ARCH/MAKEDEV $out/bin + chmod +x $out/bin/MAKEDEV + ''; + + meta.mainProgram = "MAKEDEV"; +} From 3c8536f7ee1b9418978f9b4ec97647a3af59335a Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Fri, 20 Dec 2024 23:42:55 -0700 Subject: [PATCH 1622/2168] openbsd.rc: init This includes a somewhat substantial patch for nixpkgs-appropriatness. See patch file for details. --- .../bsd/openbsd/pkgs/rc/boot-phases.patch | 146 ++++++++++++++++++ .../bsd/openbsd/pkgs/rc/package.nix | 18 +++ 2 files changed, 164 insertions(+) create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/rc/boot-phases.patch create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/rc/package.nix diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/rc/boot-phases.patch b/pkgs/os-specific/bsd/openbsd/pkgs/rc/boot-phases.patch new file mode 100644 index 000000000000..5838905273a4 --- /dev/null +++ b/pkgs/os-specific/bsd/openbsd/pkgs/rc/boot-phases.patch @@ -0,0 +1,146 @@ +OpenBSD's rc is supremely, supremely uncooperative when it comes to +customization and configuration, providing exactly two places to inject +services (pkg_scripts from rc.conf and /etc/rc.local), which are very much not +useful for configuring more intimate parts of the boot process. This patch +pulls the scripts to start at various injection points from /etc/rc.order. It +also removes some of the parts of the boot script which are inappropriate for a +nix-based system, for example, re-linking code objects and setting PATH. + +diff --git a/etc/rc b/etc/rc +index 9d87fac8caf..581c1e3f4ab 100644 +--- a/etc/rc ++++ b/etc/rc +@@ -9,6 +9,10 @@ set +o sh + + # Subroutines (have to come first). + ++daemon_phase() { ++ . /etc/rc.order/$1 ++} ++ + # Strip in- and whole-line comments from a file. + # Strip leading and trailing whitespace if IFS is set. + # Usage: stripcom /path/to/file +@@ -337,7 +341,6 @@ trap : 3 # Shouldn't be needed. + + export HOME=/ + export INRC=1 +-export PATH=/sbin:/bin:/usr/sbin:/usr/bin + + # /etc/myname contains my symbolic name. + if [[ -f /etc/myname ]]; then +@@ -413,17 +416,12 @@ fi + # From now on, allow user to interrupt (^C) the boot process. + trap "echo 'Boot interrupted.'; exit 1" 3 + +-# Unmount all filesystems except root. +-umount -a >/dev/null 2>&1 +- + # Mount all filesystems except those of type NFS and VND. + mount -a -t nonfs,vnd + + # Re-mount the root filesystem read/writeable. (root on nfs requires this, + # others aren't hurt.) + mount -uw / +-chmod og-rwx /bsd +-ln -fh /bsd /bsd.booted + + rm -f /fastboot + +@@ -483,9 +481,9 @@ mount -s /var >/dev/null 2>&1 # cannot be on NFS + mount -s /var/log >/dev/null 2>&1 # cannot be on NFS + mount -s /usr >/dev/null 2>&1 # if NFS, fstab must use IP address + +-reorder_libs 2>&1 |& ++daemon_phase 10 + +-start_daemon slaacd dhcpleased resolvd >/dev/null 2>&1 ++daemon_phase 20 + + echo 'starting network' + +@@ -495,12 +493,10 @@ ifconfig -g carp carpdemote 128 + + sh /etc/netstart + +-start_daemon unwind >/dev/null 2>&1 ++daemon_phase 30 + + random_seed + +-wait_reorder_libs +- + # Load pf rules and bring up pfsync interface. + if [[ $pf != NO ]]; then + if [[ -f /etc/pf.conf ]]; then +@@ -522,8 +518,7 @@ dmesg >/var/run/dmesg.boot + make_keys + + echo -n 'starting early daemons:' +-start_daemon syslogd ldattach pflogd nsd unbound ntpd +-start_daemon iscsid isakmpd iked sasyncd ldapd npppd ++daemon_phase 40 + echo '.' + + # Load IPsec rules. +@@ -532,11 +527,7 @@ if [[ $ipsec != NO && -f /etc/ipsec.conf ]]; then + fi + + echo -n 'starting RPC daemons:' +-start_daemon portmap +-if [[ -n $(domainname) ]]; then +- start_daemon ypldap ypserv ypbind +-fi +-start_daemon mountd nfsd lockd statd amd ++daemon_phase 50 + echo '.' + + # Check and mount remaining file systems and enable additional swap. +@@ -626,43 +617,24 @@ echo 'preserving editor files.'; /usr/libexec/vi.recover + run_upgrade_script sysmerge + + echo -n 'starting network daemons:' +-start_daemon ldomd sshd snmpd ldpd ripd ospfd ospf6d bgpd ifstated +-start_daemon relayd dhcpd dhcrelay mrouted dvmrpd radiusd eigrpd route6d +-start_daemon rad hostapd lpd smtpd slowcgi bgplgd httpd ftpd +-start_daemon ftpproxy ftpproxy6 tftpd tftpproxy identd inetd rarpd bootparamd +-start_daemon rbootd mopd vmd spamd spamlogd sndiod ++daemon_phase 60 + echo '.' + + # If rc.firsttime exists, run it just once, and make sure it is deleted. + run_upgrade_script firsttime + +-# Run rc.d(8) scripts from packages. +-if [[ -n $pkg_scripts ]]; then +- echo -n 'starting package daemons:' +- for _daemon in $pkg_scripts; do +- if [[ -x /etc/rc.d/$_daemon ]]; then +- start_daemon $_daemon +- else +- echo -n " ${_daemon}(absent)" +- fi +- done +- echo '.' +-fi +- + [[ -f /etc/rc.local ]] && sh /etc/rc.local + ++daemon_phase 70 ++ + # Disable carp interlock. + ifconfig -g carp -carpdemote 128 + + mixerctl_conf + + echo -n 'starting local daemons:' +-start_daemon apmd sensorsd hotplugd watchdogd cron wsmoused xenodm ++daemon_phase 80 + echo '.' + +-# Re-link the kernel, placing the objects in a random order. +-# Replace current with relinked kernel and inform root about it. +-/usr/libexec/reorder_kernel & +- + date + exit 0 diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/rc/package.nix b/pkgs/os-specific/bsd/openbsd/pkgs/rc/package.nix new file mode 100644 index 000000000000..2baf4be5923c --- /dev/null +++ b/pkgs/os-specific/bsd/openbsd/pkgs/rc/package.nix @@ -0,0 +1,18 @@ +{ + mkDerivation, +}: +mkDerivation { + pname = "rc"; + path = "etc"; + + patches = [ ./boot-phases.patch ]; + + buildPhase = ":"; + + installPhase = '' + mkdir -p $out/etc/rc.d + cp rc $out/etc + cp rc.d/rc.subr $out/etc/rc.d + chmod +x $out/etc/rc + ''; +} From 57324a5cf6e06a7b106977e536ff60f654aae143 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 02:10:33 +0000 Subject: [PATCH 1623/2168] mendeley: 2.129.0 -> 2.130.0 --- pkgs/applications/office/mendeley/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 5db268a26a33..a11d13efaaaf 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -8,13 +8,13 @@ let pname = "mendeley"; - version = "2.129.0"; + version = "2.130.0"; executableName = "${pname}-reference-manager"; src = fetchurl { url = "https://static.mendeley.com/bin/desktop/mendeley-reference-manager-${version}-x86_64.AppImage"; - hash = "sha256-lA3ald0pgNd6az7nP5MPMrs12EEvJaHpEypXFfCvKCQ="; + hash = "sha256-ldlMWitLe3pcA1ip+/NZuswKvPdpn9l8tVSCOOr4pbc="; }; appimageContents = appimageTools.extractType2 { From f9aa79dafc308a7b79491b4e197cf4ed4cab7ca8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 02:39:48 +0000 Subject: [PATCH 1624/2168] zimfw: 1.17.0 -> 1.17.1 --- pkgs/by-name/zi/zimfw/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/zi/zimfw/package.nix b/pkgs/by-name/zi/zimfw/package.nix index b12b74bea670..d10264923d5a 100644 --- a/pkgs/by-name/zi/zimfw/package.nix +++ b/pkgs/by-name/zi/zimfw/package.nix @@ -6,14 +6,14 @@ stdenv.mkDerivation rec { pname = "zimfw"; - version = "1.17.0"; + version = "1.17.1"; src = fetchFromGitHub { owner = "zimfw"; repo = "zimfw"; rev = "v${version}"; ## zim only needs this one file to be installed. sparseCheckout = [ "zimfw.zsh" ]; - hash = "sha256-h8VhnUxelnc67TngQzmKY/098uKgvopBA1YleTiJhWc="; + hash = "sha256-W0yjDebHyhsjPQF8CZMAUv+nJ/oLx/mxolxiCNvAs00="; }; strictDeps = true; dontConfigure = true; From 79da88a08a15a7e3167a9dd872a6a394b44ab20a Mon Sep 17 00:00:00 2001 From: Matt Moriarity Date: Wed, 12 Feb 2025 19:11:12 -0700 Subject: [PATCH 1625/2168] peertube: remove broken symlinks --- pkgs/servers/peertube/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/peertube/default.nix b/pkgs/servers/peertube/default.nix index a43d959baff1..e62bf9005deb 100644 --- a/pkgs/servers/peertube/default.nix +++ b/pkgs/servers/peertube/default.nix @@ -77,9 +77,6 @@ stdenv.mkDerivation rec { hash = "sha256-x5qFCprn8q0xC88HudLV7W53X1Nkbz3F52RMp2PxIu8="; }; - # There are broken symlinks in the node_modules - dontCheckForBrokenSymlinks = true; - outputs = [ "out" "cli" @@ -171,6 +168,14 @@ stdenv.mkDerivation rec { mv ~/packages/typescript-utils/{dist,package.json} $out/packages/typescript-utils mv ~/{config,support,CREDITS.md,FAQ.md,LICENSE,README.md,package.json,yarn.lock} $out + # Remove broken symlinks in node_modules from workspace packages that aren't needed + # by the built artifact. If any new packages break the check for broken symlinks, + # they should be checked before adding them here to make sure they aren't likely to + # be needed, either now or in the future. If they might be, then we probably want + # to move the package to $out above instead of removing the broken symlink. + rm $out/node_modules/@peertube/{peertube-server,peertube-transcription-devtools,peertube-types-generator,tests} + rm $out/client/node_modules/@peertube/{peertube-transcription-devtools,peertube-types-generator,tests} + mkdir -p $cli/bin mv ~/apps/peertube-cli/{dist,node_modules,package.json,yarn.lock} $cli ln -s $cli/dist/peertube.js $cli/bin/peertube-cli From 2ca887931074ca3c0570ead6a19e4609097746cf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 02:50:34 +0000 Subject: [PATCH 1626/2168] mark: 12.0.0 -> 12.0.1 --- pkgs/by-name/ma/mark/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/mark/package.nix b/pkgs/by-name/ma/mark/package.nix index c84e8c9eed6f..8039b639a3a5 100644 --- a/pkgs/by-name/ma/mark/package.nix +++ b/pkgs/by-name/ma/mark/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "mark"; - version = "12.0.0"; + version = "12.0.1"; src = fetchFromGitHub { owner = "kovetskiy"; repo = "mark"; rev = version; - sha256 = "sha256-kMP6+L7kfK/qfVI49ssD6Ar1c7ugKgiXUIk9yjQYXE8="; + sha256 = "sha256-2vY1s4ZR6y+R/tRUsM/1hmqRdmrFXmalk9eAAGL2ElQ="; }; - vendorHash = "sha256-40hYy3rXyTqrmTp6lNsLI5c2GWZ6Aoi3KRPJV0Ry5Ds="; + vendorHash = "sha256-XPTnsV0JVSatfHzI4ajq8nnN2HTKc8FeKwmOIuXo2GU="; ldflags = [ "-s" From e61496ff4b8397c20beca1de6ada6c50c18023db Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 03:13:36 +0000 Subject: [PATCH 1627/2168] prometheus-ipmi-exporter: 1.9.0 -> 1.10.0 --- pkgs/servers/monitoring/prometheus/ipmi-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix b/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix index 9432dcd839b1..26ff81f60e32 100644 --- a/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "ipmi_exporter"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "prometheus-community"; repo = "ipmi_exporter"; rev = "v${version}"; - hash = "sha256-0JNt3XbXGbAfaBQ13X/vrBhhN39hY4kwoBQ9obxsAd0="; + hash = "sha256-Go47Txf/NX9ytMvvFQeNVCw0ORWqbsg2sIWK4MVRyIA="; }; - vendorHash = "sha256-dUf++LhoKWJxQfu9Latr8mCkeid5EAi+6yRdWDkTeP8="; + vendorHash = "sha256-OXVUFamFv1BZTXuIfmaYHc1y9B9j4ndo1/2CGLNavh0="; nativeBuildInputs = [ makeWrapper ]; From cbe0036b35cbeef2fc0819c0799949a2da40136e Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 12 Feb 2025 22:13:49 -0500 Subject: [PATCH 1628/2168] quark-engine: 25.1.1 -> 25.2.1, relax dependency on androguard Diff: https://github.com/quark-engine/quark-engine/compare/refs/tags/v25.1.1...v25.2.1 Changelog: https://github.com/quark-engine/quark-engine/releases/tag/v25.2.1 --- pkgs/by-name/qu/quark-engine/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/qu/quark-engine/package.nix b/pkgs/by-name/qu/quark-engine/package.nix index 4055484a4c11..1230eb4f7ca2 100644 --- a/pkgs/by-name/qu/quark-engine/package.nix +++ b/pkgs/by-name/qu/quark-engine/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "quark-engine"; - version = "25.1.1"; + version = "25.2.1"; pyproject = true; src = fetchFromGitHub { owner = "quark-engine"; repo = "quark-engine"; tag = "v${version}"; - hash = "sha256-+Qp0u4mayzBh55yXG2RspRRiW2cQtMA2vrqP7Zvnbl4="; + hash = "sha256-avQT6m6DjVham+IMkY2Gcjnb1K1L5PuOxvkqAeLNNhQ="; }; build-system = with python3.pkgs; [ setuptools ]; @@ -35,7 +35,10 @@ python3.pkgs.buildPythonApplication rec { tqdm ]; - pythonRelaxDeps = [ "r2pipe" ]; + pythonRelaxDeps = [ + "r2pipe" + "androguard" + ]; # Project has no tests doCheck = false; From f04dfa398db34fc56d27a88880a012ecd4166c81 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 03:22:52 +0000 Subject: [PATCH 1629/2168] skopeo: 1.17.0 -> 1.18.0 --- pkgs/by-name/sk/skopeo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sk/skopeo/package.nix b/pkgs/by-name/sk/skopeo/package.nix index 977909cff72f..abb2a27d74eb 100644 --- a/pkgs/by-name/sk/skopeo/package.nix +++ b/pkgs/by-name/sk/skopeo/package.nix @@ -19,13 +19,13 @@ buildGoModule rec { pname = "skopeo"; - version = "1.17.0"; + version = "1.18.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - hash = "sha256-IoYeCGiGOjz+8HPzYPXUWsHADtrWHvJm9YhKeMJJf0k="; + hash = "sha256-Ws01dYx2Jq/zB8rWiWSnV4ZgcxyBWHWvE3DfG7gvFOc="; }; outputs = [ From a40e2985e838f335014e0662ac3c971b41563cc0 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 12 Feb 2025 22:21:32 -0500 Subject: [PATCH 1630/2168] python312Packages.docling: disable tests requiring network access --- pkgs/development/python-modules/docling/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/docling/default.nix b/pkgs/development/python-modules/docling/default.nix index 7dc476f7edf1..a0996e6f1636 100644 --- a/pkgs/development/python-modules/docling/default.nix +++ b/pkgs/development/python-modules/docling/default.nix @@ -138,6 +138,8 @@ buildPythonPackage rec { "test_convert_stream" "test_compare_legacy_output" "test_ocr_coverage_threshold" + # requires network access + "test_page_range" ]; meta = { From 3b65e736c1146fa416598f6b2e8d1ab94b1fa534 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 03:25:29 +0000 Subject: [PATCH 1631/2168] taproot-assets: 0.5.0 -> 0.5.1 --- pkgs/by-name/ta/taproot-assets/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ta/taproot-assets/package.nix b/pkgs/by-name/ta/taproot-assets/package.nix index a91bf5c2aa7b..2ab0bf31e5e5 100644 --- a/pkgs/by-name/ta/taproot-assets/package.nix +++ b/pkgs/by-name/ta/taproot-assets/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "taproot-assets"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "lightninglabs"; repo = "taproot-assets"; rev = "v${version}"; - hash = "sha256-XOEbrz0kFJKoYG91VUeSAuMVJRfGRNTQ8jucMtnvxJo="; + hash = "sha256-R6x8M69HM7mC0XG5cAH5SwTzeoSicNwZx0ExAKwcI80="; }; - vendorHash = "sha256-hDmRyWSf4jokomfJQBLlIbm9I3v2/sg/xD52BW3Wvy4="; + vendorHash = "sha256-aak2TNwAXpQLsMgOkeAyQM9f6logR5U+LS10g2Jtq1U="; subPackages = [ "cmd/tapcli" From 35f27cfb2b564429cb5168db0338fc68ffa27039 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 03:29:54 +0000 Subject: [PATCH 1632/2168] broot: 1.44.6 -> 1.44.7 --- pkgs/by-name/br/broot/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/br/broot/package.nix b/pkgs/by-name/br/broot/package.nix index 9d3a37a10bae..0a13cf83a336 100644 --- a/pkgs/by-name/br/broot/package.nix +++ b/pkgs/by-name/br/broot/package.nix @@ -15,17 +15,17 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.44.6"; + version = "1.44.7"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - hash = "sha256-cvrWcfQj5Pc2tyaQjhhTK9Ko240Bz6dbUe+OFLTz/+M="; + hash = "sha256-GaOPC1lIu48qFo99AQ99f49e8qH/TEQubpluptLc0jY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-k0H68lvciLjfRx2J1s1dKA8kijFkSBryoGWXCVAR6Ic="; + cargoHash = "sha256-J7zc1aTH62nL96cSb9CiIk8uJdR7nk9EnERiAfMvqNM="; nativeBuildInputs = [ installShellFiles From 03122787a2a9adad7ce14c5addd31211b60f3def Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 03:31:47 +0000 Subject: [PATCH 1633/2168] python312Packages.internetarchive: 5.2.0 -> 5.2.1 --- pkgs/development/python-modules/internetarchive/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix index 9b61c2bb55b1..bc23a5c41e72 100644 --- a/pkgs/development/python-modules/internetarchive/default.nix +++ b/pkgs/development/python-modules/internetarchive/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "internetarchive"; - version = "5.2.0"; + version = "5.2.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "jjjake"; repo = "internetarchive"; tag = "v${version}"; - hash = "sha256-xi3cR/j25gRe+muWjk8towzELgDciqLxGvBIpRqJHd0="; + hash = "sha256-2CShbIS5hq+queeHHlE53Vf8sl4HQySp1ZU8mz67Qbc="; }; build-system = [ setuptools ]; @@ -64,7 +64,7 @@ buildPythonPackage rec { meta = { description = "Python and Command-Line Interface to Archive.org"; homepage = "https://github.com/jjjake/internetarchive"; - changelog = "https://github.com/jjjake/internetarchive/blob/v${version}/HISTORY.rst"; + changelog = "https://github.com/jjjake/internetarchive/blob/${src.tag}/HISTORY.rst"; license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ pyrox0 ]; mainProgram = "ia"; From fe8c356feca45bf9cdd017bd41b108b890a50c1d Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 12 Feb 2025 22:23:36 -0500 Subject: [PATCH 1634/2168] python312Packages.datashader: 0.16.3 -> 0.17.0 --- .../python-modules/datashader/default.nix | 99 +++++++------------ 1 file changed, 36 insertions(+), 63 deletions(-) diff --git a/pkgs/development/python-modules/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix index 7940e62cb371..470cd51401c9 100644 --- a/pkgs/development/python-modules/datashader/default.nix +++ b/pkgs/development/python-modules/datashader/default.nix @@ -1,101 +1,74 @@ { lib, buildPythonPackage, - fetchPypi, - dask, - bokeh, - toolz, - datashape, + pythonOlder, + fetchFromGitHub, + hatchling, + hatch-vcs, + colorcet, + multipledispatch, numba, numpy, pandas, - pillow, - xarray, - colorcet, param, pyct, + requests, scipy, + toolz, + packaging, + xarray, pytestCheckHook, - pythonOlder, - nbsmoke, - fastparquet, - nbconvert, pytest-xdist, - netcdf4, + writableTmpDirAsHomeHook, }: buildPythonPackage rec { pname = "datashader"; - version = "0.16.3"; - format = "setuptools"; + version = "0.17.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; - src = fetchPypi { - inherit pname version; - hash = "sha256-nQBAx4h/elpe3TdMKXQC/SCKYr9oReh2MbVPA7muR50="; + src = fetchFromGitHub { + owner = "holoviz"; + repo = "datashader"; + tag = "v${version}"; + hash = "sha256-ZmVuDqmFTjq2cgnG+Eve07pynMkEyqFkLtNiCXSandA="; }; - propagatedBuildInputs = [ - dask - bokeh - toolz - datashape + build-system = [ + hatchling + hatch-vcs + ]; + + dependencies = [ + colorcet + multipledispatch numba numpy pandas - pillow - xarray - colorcet param pyct + requests scipy - ] ++ dask.optional-dependencies.complete; + toolz + packaging + xarray + ]; nativeCheckInputs = [ pytestCheckHook pytest-xdist - nbsmoke - fastparquet - nbconvert - netcdf4 - ]; - - # The complete extra is for usage with conda, which we - # don't care about - postPatch = '' - substituteInPlace setup.py \ - --replace "dask[complete]" "dask" \ - --replace "xarray >=0.9.6" "xarray" - ''; - - preCheck = '' - export HOME=$TMPDIR - ''; - - pytestFlagsArray = [ "datashader" ]; - - disabledTests = [ - # Not compatible with current version of bokeh - # see: https://github.com/holoviz/datashader/issues/1031 - "test_interactive_image_update" - # Latest dask broken array marshalling - # see: https://github.com/holoviz/datashader/issues/1032 - "test_raster_quadmesh_autorange_reversed" - ]; - - disabledTestPaths = [ - # 31/50 tests fail with TypeErrors - "datashader/tests/test_datatypes.py" + writableTmpDirAsHomeHook ]; pythonImportsCheck = [ "datashader" ]; - meta = with lib; { + meta = { description = "Data visualization toolchain based on aggregating into a grid"; mainProgram = "datashader"; homepage = "https://datashader.org"; - license = licenses.bsd3; - maintainers = [ ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ nickcao ]; }; } From 7a9191988f86e6fb5f957519eab7d4488fbfa80f Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Sat, 8 Feb 2025 12:35:08 -0500 Subject: [PATCH 1635/2168] python312Packages.open-hypergraphs: init at 0.1.2 --- .../open-hypergraphs/default.nix | 54 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/development/python-modules/open-hypergraphs/default.nix diff --git a/pkgs/development/python-modules/open-hypergraphs/default.nix b/pkgs/development/python-modules/open-hypergraphs/default.nix new file mode 100644 index 000000000000..03a336abf818 --- /dev/null +++ b/pkgs/development/python-modules/open-hypergraphs/default.nix @@ -0,0 +1,54 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + numpy, + scipy, + hypothesis, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "open-hypergraphs"; + version = "0.1.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "statusfailed"; + repo = "open-hypergraphs"; + tag = "pypi-${version}"; + hash = "sha256-ifcQXZDnOvo2XL7WYVFLv2iHWhImUSp3jqAPPYySNjU="; + }; + + build-system = [ + hatchling + ]; + + dependencies = [ + numpy + scipy + ]; + + pythonRelaxDeps = [ + "numpy" + "scipy" + ]; + + nativeCheckInputs = [ + pytestCheckHook + hypothesis + ]; + + pythonImportsCheck = [ + "open_hypergraphs" + ]; + + meta = { + description = "Implementation of open hypergraphs for string diagrams"; + homepage = "https://github.com/statusfailed/open-hypergraphs"; + changelog = "https://github.com/statusfailed/open-hypergraphs/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8fa9970c21b2..3827d3121da2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9733,6 +9733,8 @@ self: super: with self; { open-garage = callPackage ../development/python-modules/open-garage { }; + open-hypergraphs = callPackage ../development/python-modules/open-hypergraphs { }; + open-interpreter = callPackage ../development/python-modules/open-interpreter { }; open-meteo = callPackage ../development/python-modules/open-meteo { }; From a71964835b0aa3d21d9f2636cd1e8fb8206a58bb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 03:40:01 +0000 Subject: [PATCH 1636/2168] pay-respects: 0.6.12 -> 0.6.13 --- pkgs/by-name/pa/pay-respects/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pa/pay-respects/package.nix b/pkgs/by-name/pa/pay-respects/package.nix index dd5c3b3857e0..87347e27f763 100644 --- a/pkgs/by-name/pa/pay-respects/package.nix +++ b/pkgs/by-name/pa/pay-respects/package.nix @@ -8,18 +8,18 @@ }: rustPlatform.buildRustPackage rec { pname = "pay-respects"; - version = "0.6.12"; + version = "0.6.13"; src = fetchFromGitea { domain = "codeberg.org"; owner = "iff"; repo = "pay-respects"; rev = "v${version}"; - hash = "sha256-lDIhI9CnWwVVGyAJAS3gDUEkeXShTvPd8JKC1j9/9yU="; + hash = "sha256-uiNGx0+tN75pGZy3kW0ibZfjT9Cs+P2M5fT5CtFwJDo="; }; useFetchCargoVendor = true; - cargoHash = "sha256-z0nHq5qiT59bCgOWb7D3h25LcejwJlp64j5zaUx9jb0="; + cargoHash = "sha256-ItXWks18xxb+bP35hBdB3UL5TNSo4vCc/Tm4+EX8NUs="; nativeBuildInputs = [ pkg-config From 6933f63d0696e200093688914c0dc23519d86538 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 03:53:52 +0000 Subject: [PATCH 1637/2168] netbird-ui: 0.36.5 -> 0.36.6 --- pkgs/tools/networking/netbird/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index 284d79489090..70616fad3b71 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -35,16 +35,16 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.36.5"; + version = "0.36.6"; src = fetchFromGitHub { owner = "netbirdio"; repo = "netbird"; tag = "v${version}"; - hash = "sha256-3k41lydp6bIfANblvdYK07xY/B3SbXwipbLAIUxmf9I="; + hash = "sha256-qXwpYGFAQvOKor/acJJqjgNiFNf2YxDsawFne3dkfYc="; }; - vendorHash = "sha256-30KSccdeQ+DrYjotCR0w0LvY1jCBBJIAy5rKQtSsD9Q="; + vendorHash = "sha256-/8SoQAQoFuuHTi+rTkmQSZxCt9sAl0yDCVccrqlx4VE="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; From 7b1ff3b7b530581394d21312d2cce8d2cd433578 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 03:54:07 +0000 Subject: [PATCH 1638/2168] python312Packages.google-cloud-bigquery-datatransfer: 3.18.0 -> 3.19.0 --- .../google-cloud-bigquery-datatransfer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index 9fc7a4856091..9324adcc0835 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.18.0"; + version = "3.19.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_bigquery_datatransfer"; inherit version; - hash = "sha256-K4Hiiy7PotLAS0pmU1K/osLufp0tQypWy12BhICrwC0="; + hash = "sha256-qQ330hnnZyC4X+QvlrSF+Z/FGCsaETzP47CgzAHHS+0="; }; build-system = [ setuptools ]; From f7954dc3824ad6cc5cc3c62c5486411f9ab98378 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 03:56:48 +0000 Subject: [PATCH 1639/2168] python312Packages.google-cloud-monitoring: 2.26.0 -> 2.27.0 --- .../python-modules/google-cloud-monitoring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/pkgs/development/python-modules/google-cloud-monitoring/default.nix index 878c69c14ec7..df4d2ae4719b 100644 --- a/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-cloud-monitoring"; - version = "2.26.0"; + version = "2.27.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_monitoring"; inherit version; - hash = "sha256-KQQf3/2y24bIvlRayYXHSQwXDpEQtDZfC9YIjGhEGIQ="; + hash = "sha256-9mVSUogS57ap8vt+C3w+eQTMDBNQT0/LQgNXIrXaK8Q="; }; build-system = [ setuptools ]; From d704f439e529dc68065eff4536d89096efd22b17 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 03:59:33 +0000 Subject: [PATCH 1640/2168] trealla: 2.63.33 -> 2.63.35 --- pkgs/by-name/tr/trealla/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix index 7fa13c081d06..157615cab1e8 100644 --- a/pkgs/by-name/tr/trealla/package.nix +++ b/pkgs/by-name/tr/trealla/package.nix @@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [ ]; stdenv.mkDerivation (finalAttrs: { pname = "trealla"; - version = "2.63.33"; + version = "2.63.35"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${finalAttrs.version}"; - hash = "sha256-ivbjnYKuZW3xvyPxOF3Ov/0obI71lri/itsVFJ4Cb4k="; + hash = "sha256-7mdA6p4jalxVmL89mE3WB0wgOZPADOhvZ6P8wijGFt0="; }; postPatch = '' From 8089f50126b4cd8b340ac871beac71fa93267863 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 04:02:09 +0000 Subject: [PATCH 1641/2168] python312Packages.google-cloud-container: 2.55.0 -> 2.56.0 --- .../python-modules/google-cloud-container/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index 2dc8dd2a3de5..6a39f3f66822 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.55.0"; + version = "2.56.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_container"; inherit version; - hash = "sha256-ZAJAHnGb3k62B7H+FT/bKTHKwo+cWdkS8RSkiy5YA5g="; + hash = "sha256-BD2e/4aDhyY5Cs95YZwAO1sJK7t+s9VCYwbpsrlQDg8="; }; build-system = [ setuptools ]; From a52a8d77d543c5cf01e2216a0df2fd83f9e1d6c1 Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Thu, 13 Feb 2025 05:46:30 +0100 Subject: [PATCH 1642/2168] google-amber: unstable-2024-08-21 -> unstable-2025-02-03 (#381140) --- pkgs/by-name/go/google-amber/package.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/go/google-amber/package.nix b/pkgs/by-name/go/google-amber/package.nix index 9cc066bb09c3..187ba46ab539 100644 --- a/pkgs/by-name/go/google-amber/package.nix +++ b/pkgs/by-name/go/google-amber/package.nix @@ -18,8 +18,8 @@ let glslang = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "e8dd0b6903b34f1879520b444634c75ea2deedf5"; - hash = "sha256-B6jVCeoFjd2H6+7tIses+Kj8DgHS6E2dkVzQAIzDHEc="; + rev = "340bf88f3fdb4f4a25b7071cd2c1205035fc6eaa"; + hash = "sha256-3h27yE6k4BgUAugQCkpUYO5aIHpK6Anyh90y3q+aYpM="; }; lodepng = fetchFromGitHub { @@ -32,34 +32,34 @@ let shaderc = fetchFromGitHub { owner = "google"; repo = "shaderc"; - rev = "f59f0d11b80fd622383199c867137ededf89d43b"; - hash = "sha256-kHz8Io5GZDWv1FjPyBWRpnKhGygKhSU4L9zl/AKXZlU="; + rev = "690d259384193c90c01b52288e280b05a8481121"; + hash = "sha256-p4tP/8lRy0tpdDHIuh2/tWPIBBr2ludFRSr+Q2TbUic="; }; spirv-headers = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "5e3ad389ee56fca27c9705d093ae5387ce404df4"; - hash = "sha256-gjF5mVTXqU/GZzr2S6oKGChgvqqHcQSrEq/ePP2yJys="; + rev = "3f17b2af6784bfa2c5aa5dbb8e0e74a607dd8b3b"; + hash = "sha256-MCQ+i9ymjnxRZP/Agk7rOGdHcB4p67jT4J4athWUlcI="; }; spirv-tools = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "9241a58a8028c49510bc174b6c970e3c2b4b8e51"; - hash = "sha256-0qHUpwNDJI2jV4h68QaTNPIwTPxwTt0iAUnMXqFCiJE="; + rev = "13b59bf1d84054b8ccd29cdc6b1303f69e8f9e77"; + hash = "sha256-k/mTHiLbZdnslC24fjcrzqsZYMyVaAADGEqngqJcC2c="; }; in stdenv.mkDerivation (finalAttrs: { pname = "amber"; - version = "unstable-2024-08-21"; + version = "unstable-2025-02-03"; src = fetchFromGitHub { owner = "google"; repo = "amber"; - rev = "66399a35927606a435bf7a59756e87e6cb5a0013"; - hash = "sha256-PCO64zI/vzp4HyGz5WpeYpCBeaWjTvz1punWsTz1yiM="; + rev = "3f078e41d86ca1a5881560f00e26198f59bb8ac0"; + hash = "sha256-pAotVFmtEGp9GKmDD0vrbfbO+Xt2URmM8gYCjl0LEnk="; }; buildInputs = [ From 74e5990bc730783a9d38ee7b215a0fdcedd97c97 Mon Sep 17 00:00:00 2001 From: daspk04 Date: Thu, 13 Feb 2025 12:34:05 +0700 Subject: [PATCH 1643/2168] python3Packages.odc-stac: init at 0.3.11 --- .../python-modules/odc-stac/default.nix | 95 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 97 insertions(+) create mode 100644 pkgs/development/python-modules/odc-stac/default.nix diff --git a/pkgs/development/python-modules/odc-stac/default.nix b/pkgs/development/python-modules/odc-stac/default.nix new file mode 100644 index 000000000000..a5d9f8f94b31 --- /dev/null +++ b/pkgs/development/python-modules/odc-stac/default.nix @@ -0,0 +1,95 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + affine, + dask, + numpy, + odc-geo, + pandas, + pystac, + rasterio, + toolz, + xarray, + + # optional-dependencies + botocore, + + # tests + geopandas, + distributed, + pystac-client, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "odc-stac"; + version = "0.3.11"; + pyproject = true; + + src = fetchFromGitHub { + owner = "opendatacube"; + repo = "odc-stac"; + tag = "v${version}"; + hash = "sha256-uudBzxVGt3RW4ppDrFYfA9LMa2xPfs3FTBzVS19FjB4="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + affine + dask + numpy + odc-geo + pandas + pystac + rasterio + toolz + xarray + ]; + + optional-dependencies = { + botocore = [ botocore ]; + }; + + nativeCheckInputs = [ + geopandas + distributed + pystac-client + pytestCheckHook + ] ++ optional-dependencies.botocore; + + pytestFlagsArray = [ "-m 'not network'" ]; + + disabledTests = [ + # pystac href error (possible related to network) + "test_extract_md" + "test_parse_item" + "test_parse_item_no_proj" + # urllib url open error + "test_norm_geom" + "test_output_geobox" + "test_mem_reader" + "test_memreader_zarr" + + ]; + + pythonImportsCheck = [ + "odc.stac" + ]; + + meta = { + description = "Load STAC items into xarray Datasets."; + homepage = "https://github.com/opendatacube/odc-stac/"; + changelog = "https://github.com/opendatacube/odc-stac/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ daspk04 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0b6c5cbe3a6b..407966a91eca 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9650,6 +9650,8 @@ self: super: with self; { odc-geo = callPackage ../development/python-modules/odc-geo { }; + odc-stac = callPackage ../development/python-modules/odc-stac { }; + oddsprout = callPackage ../development/python-modules/oddsprout { }; odfpy = callPackage ../development/python-modules/odfpy { }; From 4274ff3b5075254534ff6dba8e53362b0b17b28c Mon Sep 17 00:00:00 2001 From: Anna Aurora Date: Sat, 1 Oct 2022 22:51:02 +0200 Subject: [PATCH 1644/2168] dotherside: init at 0.9.0 Co-authored-by: Fabian Affolter Co-authored-by: Donovan Glover Co-authored-by: toastal --- pkgs/by-name/do/dotherside/package.nix | 42 ++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100755 pkgs/by-name/do/dotherside/package.nix diff --git a/pkgs/by-name/do/dotherside/package.nix b/pkgs/by-name/do/dotherside/package.nix new file mode 100755 index 000000000000..f4457f0ed127 --- /dev/null +++ b/pkgs/by-name/do/dotherside/package.nix @@ -0,0 +1,42 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + libsForQt5, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "dotherside"; + version = "0.9.0"; + + outputs = [ + "out" + "dev" + ]; + + src = fetchFromGitHub { + owner = "filcuc"; + repo = "dotherside"; + tag = "v${finalAttrs.version}"; + hash = "sha256-o6RMjJz9vtfCsm+F9UYIiYPEaQn+6EU5jOTLhNHCwo4="; + }; + + buildInputs = [ + libsForQt5.qtbase + libsForQt5.qtquickcontrols2 + ]; + + nativeBuildInputs = [ + cmake + libsForQt5.wrapQtAppsHook + ]; + + meta = with lib; { + description = "C language library for creating bindings for the Qt QML language"; + homepage = "https://filcuc.github.io/dotherside"; + license = licenses.lgpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ toastal ]; + }; +}) From bb7d35e53ab9ce4d147da02e11b7cb17b28c9552 Mon Sep 17 00:00:00 2001 From: K4rlosReyes Date: Thu, 13 Feb 2025 07:39:42 +0100 Subject: [PATCH 1645/2168] maintainers: add kr7x --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8f987f50ebad..cb92784c1923 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12545,6 +12545,12 @@ githubId = 787421; name = "Kevin Quick"; }; + kr7x = { + name = "Carlos Reyes"; + email = "carlosreyesml18@gmail.com"; + github = "K4rlosReyes"; + githubId = 108368394; + }; kraanzu = { name = "Murli Tawari"; email = "kraanzu@gmail.com"; From cab22b674f9b958fb9b636adc662e457d0c98445 Mon Sep 17 00:00:00 2001 From: K4rlosReyes Date: Thu, 13 Feb 2025 07:40:08 +0100 Subject: [PATCH 1646/2168] python312Packages.metaflow: init at 2.13.9 --- .../python-modules/metaflow/default.nix | 55 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 57 insertions(+) create mode 100644 pkgs/development/python-modules/metaflow/default.nix diff --git a/pkgs/development/python-modules/metaflow/default.nix b/pkgs/development/python-modules/metaflow/default.nix new file mode 100644 index 000000000000..6e356c81b47d --- /dev/null +++ b/pkgs/development/python-modules/metaflow/default.nix @@ -0,0 +1,55 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + boto3, + requests, + setuptools, + python, +}: + +buildPythonPackage rec { + pname = "metaflow"; + version = "2.13.9"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Netflix"; + repo = "metaflow"; + tag = version; + hash = "sha256-f/cWZl59i1PRqNqLV5LtcZoDKdovdCKoQJNxzXKczgs="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + boto3 + requests + ]; + + checkPhase = '' + runHook preCheck + + export HOME="$TMPDIR" + export USER="metaflow-test-user" + + pushd test/core + ${python.interpreter} run_tests.py --num-parallel $NIX_BUILD_CORES \ + --tests FlowOptionsTest,BasicLogTest + popd + + runHook postCheck + ''; + + pythonImportsCheck = [ "metaflow" ]; + + meta = { + description = "Open Source AI/ML Platform"; + homepage = "https://metaflow.org/"; + changelog = "https://github.com/Netflix/metaflow/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ kr7x ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ac494ea9806f..042bdddeddf3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8199,6 +8199,8 @@ self: super: with self; { messagebird = callPackage ../development/python-modules/messagebird { }; + metaflow = callPackage ../development/python-modules/metaflow { }; + metakernel = callPackage ../development/python-modules/metakernel { }; metar = callPackage ../development/python-modules/metar { }; From 91db543d57e53dbcbe414db3a641b2bec7b64d58 Mon Sep 17 00:00:00 2001 From: misilelab Date: Wed, 12 Feb 2025 22:24:23 +0900 Subject: [PATCH 1647/2168] edgedb: 6.1.1 -> 6.1.2 https://github.com/edgedb/edgedb-cli/releases/tag/v6.1.2 Signed-off-by: misilelab --- pkgs/by-name/ed/edgedb/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ed/edgedb/package.nix b/pkgs/by-name/ed/edgedb/package.nix index 52c76368ba9e..9348ca320028 100644 --- a/pkgs/by-name/ed/edgedb/package.nix +++ b/pkgs/by-name/ed/edgedb/package.nix @@ -16,19 +16,19 @@ }: rustPlatform.buildRustPackage rec { pname = "edgedb"; - version = "6.1.1"; + version = "6.1.2"; src = fetchFromGitHub { owner = "edgedb"; repo = "edgedb-cli"; tag = "v${version}"; - hash = "sha256-cNjt66CTJq3q1leuQ7z1WreJVG0gdUmMW+pH+FozFz0="; + hash = "sha256-7epi7cF6u3Y/Fomcd1+lQfIIRKzuqL6Qk3gTZGZnjv8="; fetchSubmodules = true; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-fAr/cTF8LqLAxbKW1Vq4H8fFX1kUa/rZDSVz3/wl44E="; + hash = "sha256-Iq960LU3Xxu5LHBENsZ48diPVJrdTHxtChtSp7yghCw="; }; nativeBuildInputs = [ From 94878cc319d39919f50d3a64b82f6edf25295cef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 11 Feb 2025 17:18:32 +0100 Subject: [PATCH 1648/2168] smartmontools: update drivedb rev 5388 -> 5661 Update the drive database header to the latest version. --- pkgs/tools/system/smartmontools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index b8c594dde470..0ef4f8d72c5c 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -13,11 +13,11 @@ }: let - dbrev = "5388"; + dbrev = "5661"; drivedbBranch = "RELEASE_7_3_DRIVEDB"; driverdb = fetchurl { url = "https://sourceforge.net/p/smartmontools/code/${dbrev}/tree/branches/${drivedbBranch}/smartmontools/drivedb.h?format=raw"; - sha256 = "sha256-0dtLev4JjeHsS259+qOgg19rz4yjkeX4D3ooUgS4RTI="; + sha256 = "sha256-/U3ym9kTG7W+JZxjxORhSV/neJ/hvVEX1hi083UB1K4="; name = "smartmontools-drivedb.h"; }; scriptPath = lib.makeBinPath ( From 39bd82fb954433d6a04bd2fcee76d1e6345cfcdd Mon Sep 17 00:00:00 2001 From: misilelab Date: Thu, 13 Feb 2025 15:48:51 +0900 Subject: [PATCH 1649/2168] uv: 0.5.30 -> 0.5.31 Signed-off-by: misilelab --- pkgs/by-name/uv/uv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 86dab7f846da..39ca6935e304 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -17,17 +17,17 @@ rustPlatform.buildRustPackage rec { pname = "uv"; - version = "0.5.30"; + version = "0.5.31"; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = version; - hash = "sha256-a56y7sf2Os5ygTSu+iNZFjWwKi3HQ9VKo7p7e6LXmUc="; + hash = "sha256-Gxn/fBXPoehLkKN1PAg31sL/eMxqQMk1+oineuAO17g="; }; useFetchCargoVendor = true; - cargoHash = "sha256-rodzLpaCuokvHWvwXLB2qgPnDJaP+Qff1T4LfNCQsYM="; + cargoHash = "sha256-dop61TB9w2r+our4DiKzPvw9lI07cx9bT0Ujtvhko1E="; nativeBuildInputs = [ cmake From 5216309c25c6b082f35585640325972d6cc0d049 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Thu, 13 Feb 2025 08:02:51 +0100 Subject: [PATCH 1650/2168] komikku: 1.69.0 -> 1.70.0 --- pkgs/by-name/ko/komikku/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ko/komikku/package.nix b/pkgs/by-name/ko/komikku/package.nix index 3512c4742ba3..4adc8364adfd 100644 --- a/pkgs/by-name/ko/komikku/package.nix +++ b/pkgs/by-name/ko/komikku/package.nix @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { pname = "komikku"; - version = "1.69.0"; + version = "1.70.0"; pyproject = false; src = fetchFromGitea { @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { owner = "valos"; repo = "Komikku"; rev = "v${version}"; - hash = "sha256-YrqoUU2BYM6AMD5s6FJn8GV+UmyeKV2mFQyfJjLI8HA="; + hash = "sha256-JkuA7He3gVhKZGsZGZkfQad8jUDlG7MaLlfkuhpcd3w="; }; nativeBuildInputs = [ From 74ea9987e7f8600624a322f354ad2e4df490eaf9 Mon Sep 17 00:00:00 2001 From: Jan Votava Date: Thu, 13 Feb 2025 07:03:23 +0000 Subject: [PATCH 1651/2168] timoni: 0.23.0 -> 0.24.0 --- pkgs/applications/networking/cluster/timoni/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/timoni/default.nix b/pkgs/applications/networking/cluster/timoni/default.nix index 3e34edc3c519..75977b38cdaa 100644 --- a/pkgs/applications/networking/cluster/timoni/default.nix +++ b/pkgs/applications/networking/cluster/timoni/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "timoni"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "stefanprodan"; repo = "timoni"; rev = "v${version}"; - hash = "sha256-WlsBW8c6x68oM6g/bVXzPgIglMn+rPcfJKXmUZPC0n0="; + hash = "sha256-nI0yy/zhsJUvisHo+C+/uNRF96ZQ1Ve8VWpE8ZvUeJc="; }; - vendorHash = "sha256-mv9H0D99am/VXTP01sXQ+4Dt513Zmo0VffkUVPyF3Kk="; + vendorHash = "sha256-YpwESaR+X2eOyaPdR+I3mURD7yvwzmpPmgPoSPrXjH8="; subPackages = [ "cmd/timoni" ]; nativeBuildInputs = [ installShellFiles ]; From 2ee7b5ee169e9634ea8c331ac67ada859a386676 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Thu, 13 Feb 2025 08:10:08 +0100 Subject: [PATCH 1652/2168] signal-desktop: 7.41.0 -> 7.42.0 --- pkgs/by-name/si/signal-desktop/signal-desktop.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/signal-desktop/signal-desktop.nix b/pkgs/by-name/si/signal-desktop/signal-desktop.nix index 8d2e187c6f14..4a703e4e17d3 100644 --- a/pkgs/by-name/si/signal-desktop/signal-desktop.nix +++ b/pkgs/by-name/si/signal-desktop/signal-desktop.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop"; dir = "Signal"; - version = "7.41.0"; + version = "7.42.0"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - hash = "sha256-au0a//9P0dNDZnh1LzuHhpimWAzKRj5oJmUHls5mSxU="; + hash = "sha256-LuqE2SE6RurcwU5fl3uOJNtNZTBTR+xO2W6z98Gv53A="; } From c2d39e074cf56d9e0385384c99fec6d26efa3419 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Thu, 13 Feb 2025 08:10:22 +0100 Subject: [PATCH 1653/2168] signal-desktop(darwin): 7.41.0 -> 7.42.0 --- pkgs/by-name/si/signal-desktop/signal-desktop-darwin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/signal-desktop/signal-desktop-darwin.nix b/pkgs/by-name/si/signal-desktop/signal-desktop-darwin.nix index 304124fce886..1e822d96cd28 100644 --- a/pkgs/by-name/si/signal-desktop/signal-desktop-darwin.nix +++ b/pkgs/by-name/si/signal-desktop/signal-desktop-darwin.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "signal-desktop"; - version = "7.41.0"; + version = "7.42.0"; src = fetchurl { url = "https://updates.signal.org/desktop/signal-desktop-mac-universal-${finalAttrs.version}.dmg"; - hash = "sha256-0nolZgoTlmfsAUWUXITTa1FzBHyfHWTZRO2LjccdjNg="; + hash = "sha256-N/BgLpEvpcl29+AN0zZDBGBwkYqYqjW953jfdwm5+/4="; }; sourceRoot = "."; From 3d229753d66bd46ca0cf307f72786daa520dc5ff Mon Sep 17 00:00:00 2001 From: Markus Theil Date: Thu, 13 Feb 2025 09:00:48 +0100 Subject: [PATCH 1654/2168] mstflint_access: 4.30.0-1 -> 4.31.0-1; mstflint: 4.30.0-1 -> 4.31.0-1 Contains many fixes for mlxfwreset on Bluefields. Signed-off-by: Markus Theil --- pkgs/by-name/ms/mstflint/package.nix | 13 +++++++++++-- pkgs/os-specific/linux/mstflint_access/default.nix | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ms/mstflint/package.nix b/pkgs/by-name/ms/mstflint/package.nix index 94b752e662d5..d1b05fed31cd 100644 --- a/pkgs/by-name/ms/mstflint/package.nix +++ b/pkgs/by-name/ms/mstflint/package.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , rdma-core , openssl , zlib @@ -27,13 +28,21 @@ stdenv.mkDerivation rec { pname = "mstflint"; # if you update the version of this package, also update the input hash in mstflint_access! - version = "4.30.0-1"; + version = "4.31.0-1"; src = fetchurl { url = "https://github.com/Mellanox/mstflint/releases/download/v${version}/mstflint-${version}.tar.gz"; - hash = "sha256-8v0aeVy1ZGbzNdL71V1qm6sgEy0e3eb2F1DP8L3m2ns="; + hash = "sha256-wBUkFOdYChiSXHcH6+LLZZ06Hte4ABWjW+pNcjtk+Oc="; }; + patches = [ + # fixes build errors due to missing declarations in headers + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/Mellanox/mstflint/pull/1131.patch"; + sha256 = "sha256-tn8EO9HkDrMroV6byUPgjclBIK8tq4xGyi4Kx/rIj+w="; + }) + ]; + nativeBuildInputs = [ autoconf automake diff --git a/pkgs/os-specific/linux/mstflint_access/default.nix b/pkgs/os-specific/linux/mstflint_access/default.nix index 75ad6034fbd9..c2b22feb99ba 100644 --- a/pkgs/os-specific/linux/mstflint_access/default.nix +++ b/pkgs/os-specific/linux/mstflint_access/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/Mellanox/mstflint/releases/download/v${version}/kernel-mstflint-${version}.tar.gz"; - hash = "sha256-DfXaU31itartFgTeCtWNZrskjUqc1a62dRO/gTfgCHk="; + hash = "sha256-kQBv/67miw6lSHIcCVYy66B7OHVofFs2N+evtsQ3Ovk="; }; nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies; From b2415c564541f15cb577727fb0be66216fb4121c Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 11 Feb 2025 02:34:31 +0100 Subject: [PATCH 1655/2168] nginxModules.zstd: 0.1.1 -> 2024-04-22 Fixes ordering issue that breaks SSI. --- pkgs/servers/http/nginx/modules.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 44575bb91b57..2565cfc465e6 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -1025,8 +1025,8 @@ let self = { name = "zstd"; owner = "tokers"; repo = "zstd-nginx-module"; - rev = "0.1.1"; - hash = "sha256-1gCV7uUsuYnZfb9e8VfjWkUloVINOUH5qzeJ03kIHgs="; + rev = "f4ba115e0b0eaecde545e5f37db6aa18917d8f4b"; + hash = "sha256-N8D3KRpd79O8sdlPngtK9Ii7XT2imS4F+nkqsHMHw/w="; }; inputs = [ zstd ]; From 60174a6bfe05fba27493e6509d10ebb29d751352 Mon Sep 17 00:00:00 2001 From: Pratham Patel Date: Thu, 13 Feb 2025 13:43:01 +0530 Subject: [PATCH 1656/2168] uboot: 2024.10 -> 2025.01 --- pkgs/misc/uboot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 7de987053784..c3fc877c7479 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -29,10 +29,10 @@ }: let - defaultVersion = "2024.10"; + defaultVersion = "2025.01"; defaultSrc = fetchurl { url = "https://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2"; - hash = "sha256-so2vSsF+QxVjYweL9RApdYQTf231D87ZsS3zT2GpL7A="; + hash = "sha256-ze99UHyT8bvZ8BXqm8IfoHQmhIFAVQGUWrxvhU1baG8="; }; # Dependencies for the tools need to be included as either native or cross, From 2cbbe29f20dff808e4482fa6c4ae6ca3e41ffcba Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 2 Jan 2025 21:40:14 +0100 Subject: [PATCH 1657/2168] python312Packages.pycrdt: 0.10.9 -> 0.12.8 Diff: https://github.com/jupyter-server/pycrdt/compare/refs/tags/0.10.9...0.12.8 Changelog: https://github.com/jupyter-server/pycrdt/blob/0.12.8/CHANGELOG.md --- .../python-modules/pycrdt/Cargo.lock | 119 +++++++++--------- .../python-modules/pycrdt/default.nix | 4 +- 2 files changed, 63 insertions(+), 60 deletions(-) diff --git a/pkgs/development/python-modules/pycrdt/Cargo.lock b/pkgs/development/python-modules/pycrdt/Cargo.lock index c2e62969d489..2a9f8480eb79 100644 --- a/pkgs/development/python-modules/pycrdt/Cargo.lock +++ b/pkgs/development/python-modules/pycrdt/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "arc-swap" @@ -21,9 +21,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.83" +version = "0.1.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" +checksum = "3f934833b4b7233644e5848f235df3f57ed8c80f1528a26c3dfa13d2147fa056" dependencies = [ "proc-macro2", "quote", @@ -38,15 +38,15 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "bitflags" -version = "2.6.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36" [[package]] name = "bumpalo" -version = "3.16.0" +version = "3.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" +checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" [[package]] name = "cfg-if" @@ -65,9 +65,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.20" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "dashmap" @@ -85,9 +85,9 @@ dependencies = [ [[package]] name = "event-listener" -version = "5.3.1" +version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +checksum = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae" dependencies = [ "concurrent-queue", "parking", @@ -152,9 +152,9 @@ checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" [[package]] name = "js-sys" -version = "0.3.76" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7" +checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" dependencies = [ "once_cell", "wasm-bindgen", @@ -162,9 +162,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.168" +version = "0.2.169" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d" +checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" [[package]] name = "lock_api" @@ -178,9 +178,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.22" +version = "0.4.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f" [[package]] name = "memchr" @@ -224,9 +224,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" [[package]] name = "portable-atomic" @@ -236,16 +236,16 @@ checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6" [[package]] name = "proc-macro2" -version = "1.0.92" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99" dependencies = [ "unicode-ident", ] [[package]] name = "pycrdt" -version = "0.10.9" +version = "0.12.8" dependencies = [ "pyo3", "yrs", @@ -253,9 +253,9 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.23.3" +version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e484fd2c8b4cb67ab05a318f1fd6fa8f199fcc30819f08f07d200809dba26c15" +checksum = "57fe09249128b3173d092de9523eaa75136bf7ba85e0d69eca241c7939c933cc" dependencies = [ "cfg-if", "indoc", @@ -271,9 +271,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.23.3" +version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc0e0469a84f208e20044b98965e1561028180219e35352a2afaf2b942beff3b" +checksum = "1cd3927b5a78757a0d71aa9dff669f903b1eb64b54142a9bd9f757f8fde65fd7" dependencies = [ "once_cell", "target-lexicon", @@ -281,9 +281,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.23.3" +version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1547a7f9966f6f1a0f0227564a9945fe36b90da5a93b3933fc3dc03fae372d" +checksum = "dab6bb2102bd8f991e7749f130a70d05dd557613e39ed2deeee8e9ca0c4d548d" dependencies = [ "libc", "pyo3-build-config", @@ -291,9 +291,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.23.3" +version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdb6da8ec6fa5cedd1626c886fc8749bdcbb09424a86461eb8cdf096b7c33257" +checksum = "91871864b353fd5ffcb3f91f2f703a22a9797c91b9ab497b1acac7b07ae509c7" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -303,9 +303,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.23.3" +version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38a385202ff5a92791168b1136afae5059d3ac118457bb7bc304c197c2d33e7d" +checksum = "43abc3b80bc20f3facd86cd3c60beed58c3e2aa26213f3cda368de39c60a27e4" dependencies = [ "heck", "proc-macro2", @@ -316,9 +316,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] @@ -334,9 +334,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" +checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd" [[package]] name = "scopeguard" @@ -346,18 +346,18 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.216" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e" +checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.216" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e" +checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ "proc-macro2", "quote", @@ -366,9 +366,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.133" +version = "1.0.138" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" +checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949" dependencies = [ "itoa", "memchr", @@ -393,9 +393,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "syn" -version = "2.0.90" +version = "2.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" +checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80" dependencies = [ "proc-macro2", "quote", @@ -430,9 +430,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.14" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" +checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034" [[package]] name = "unindent" @@ -448,9 +448,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" dependencies = [ "cfg-if", "once_cell", @@ -459,9 +459,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" dependencies = [ "bumpalo", "log", @@ -473,9 +473,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -483,9 +483,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", @@ -496,9 +496,12 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] [[package]] name = "windows-targets" @@ -566,9 +569,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "yrs" -version = "0.21.3" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81de5913bca29f43a1d12ca92a7b39a2945e9420e01602a7563917c7bfc60f70" +checksum = "34419a20030ca6e452431d317d4d22b797507dfc380953a4f4fc01ee8491516b" dependencies = [ "arc-swap", "async-lock", diff --git a/pkgs/development/python-modules/pycrdt/default.nix b/pkgs/development/python-modules/pycrdt/default.nix index f1a12eef0e4e..b7d2659d4b9f 100644 --- a/pkgs/development/python-modules/pycrdt/default.nix +++ b/pkgs/development/python-modules/pycrdt/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "pycrdt"; - version = "0.10.9"; + version = "0.12.8"; pyproject = true; src = fetchFromGitHub { owner = "jupyter-server"; repo = "pycrdt"; tag = version; - hash = "sha256-G0hmjSm1AP7CbnhT56Pxb/vVOQVGxSS4W4/CMGAeP7c="; + hash = "sha256-DQIv1wySGMpVPKnu9dRhaV4tUJ1+E/AgfXV3R2jgU1k="; }; postPatch = '' From 5785989193c8d810cc1758a47e73a24823e021b9 Mon Sep 17 00:00:00 2001 From: Markus Theil Date: Thu, 13 Feb 2025 09:44:24 +0100 Subject: [PATCH 1658/2168] asmjit: unstable-2023-04-28 -> unstable-2025-02-12 Signed-off-by: Markus Theil --- pkgs/by-name/as/asmjit/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/as/asmjit/package.nix b/pkgs/by-name/as/asmjit/package.nix index c8a795e959be..5a53add5099d 100644 --- a/pkgs/by-name/as/asmjit/package.nix +++ b/pkgs/by-name/as/asmjit/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation { pname = "asmjit"; - version = "unstable-2023-04-28"; + version = "unstable-2025-02-12"; src = fetchFromGitHub { owner = "asmjit"; repo = "asmjit"; - rev = "3577608cab0bc509f856ebf6e41b2f9d9f71acc4"; - hash = "sha256-EIfSruaM2Z64XOYAeEaf/wFy6/7UO6Sth487R1Q0yhI="; + rev = "029075b84bf0161a761beb63e6eda519a29020db"; + hash = "sha256-/9F1rFNPwJUrVOVeK9sIA+Q7UrqQpQy8T6g4ywcoJc8="; }; nativeBuildInputs = [ @@ -34,6 +34,6 @@ stdenv.mkDerivation { ''; homepage = "https://asmjit.com/"; license = licenses.zlib; - maintainers = with maintainers; [ nikstur ]; + maintainers = with maintainers; [ thillux ]; }; } From 751529d3b07d1694ff5b61ea6e1cf5008ab09ce1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Jan 2025 14:12:48 +0000 Subject: [PATCH 1659/2168] libyang: 3.4.2 -> 3.7.8 Co-authored-by: Franz Pletz --- pkgs/by-name/li/libyang/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libyang/package.nix b/pkgs/by-name/li/libyang/package.nix index e0523222b28a..ca097a219486 100644 --- a/pkgs/by-name/li/libyang/package.nix +++ b/pkgs/by-name/li/libyang/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "libyang"; - version = "3.4.2"; + version = "3.7.8"; src = fetchFromGitHub { owner = "CESNET"; repo = "libyang"; rev = "v${version}"; - hash = "sha256-pki4T6faY42UcnzOT6697FJWyPRNKNbUFEFZkkeWUx8="; + hash = "sha256-5oJV8gr2rwvSdpX5w3gmIw/LTrWtXVnl6oLr/soNTDk="; }; nativeBuildInputs = [ From 40b9513886b76f1929d197ba9a692bba12a686da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 09:01:06 +0000 Subject: [PATCH 1660/2168] python312Packages.lcgit: 1.0.0 -> 2.0.0 --- pkgs/development/python-modules/lcgit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/lcgit/default.nix b/pkgs/development/python-modules/lcgit/default.nix index c1fe8c82de4f..e7fc4a064d59 100644 --- a/pkgs/development/python-modules/lcgit/default.nix +++ b/pkgs/development/python-modules/lcgit/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "lcgit"; - version = "1.0.0"; + version = "2.0.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "cisagov"; repo = "lcgit"; tag = "v${version}"; - hash = "sha256-aMwjgN9//jAnTYnbJJvQyfE/f+5QosKxF1l4vF+3myc="; + hash = "sha256-unw5xY5iZlVrV01hchHS3Ar+zpF7awTAutcqndKH0Ic="; }; postPatch = '' @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pythonic Linear Congruential Generator iterator"; homepage = "https://github.com/cisagov/lcgit"; - changelog = "https://github.com/cisagov/lcgit/releases/tag/v${version}"; + changelog = "https://github.com/cisagov/lcgit/releases/tag/${src.tag}"; license = licenses.cc0; maintainers = with maintainers; [ fab ]; }; From 8b57c1dcaa370285eb17ece77e60bf054fac0ede Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 2 Jan 2025 21:41:08 +0100 Subject: [PATCH 1661/2168] python312Packages.pycrdt-websocket: 0.15.1 -> 0.15.3 Diff: https://github.com/jupyter-server/pycrdt-websocket/compare/refs/tags/v0.15.1...v0.15.3 Changelog: https://github.com/jupyter-server/pycrdt-websocket/blob/refs/tags/v0.15.3/CHANGELOG.md --- .../python-modules/pycrdt-websocket/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pycrdt-websocket/default.nix b/pkgs/development/python-modules/pycrdt-websocket/default.nix index f9a62593a4db..a5de0310fb25 100644 --- a/pkgs/development/python-modules/pycrdt-websocket/default.nix +++ b/pkgs/development/python-modules/pycrdt-websocket/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "pycrdt-websocket"; - version = "0.15.3"; + version = "0.15.4"; pyproject = true; src = fetchFromGitHub { owner = "jupyter-server"; repo = "pycrdt-websocket"; tag = "v${version}"; - hash = "sha256-VK4nSsxF/FbCnyS1RM/JHCPS0Omj4rvdwjzLNDq2hjk="; + hash = "sha256-yDmi8tb7Tq4ro97mFxbPVLwaHhyYKQbnRLB04u2k5xo="; }; build-system = [ hatchling ]; @@ -60,6 +60,13 @@ buildPythonPackage rec { websockets ]; + disabledTests = [ + # Looking for a certfile + # FileNotFoundError: [Errno 2] No such file or directory + "test_asgi" + "test_yroom_restart" + ]; + disabledTestPaths = [ # requires nodejs and installed js modules "tests/test_pycrdt_yjs.py" @@ -70,7 +77,7 @@ buildPythonPackage rec { meta = { description = "WebSocket Connector for pycrdt"; homepage = "https://github.com/jupyter-server/pycrdt-websocket"; - changelog = "https://github.com/jupyter-server/pycrdt-websocket/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/jupyter-server/pycrdt-websocket/blob/v${version}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = lib.teams.jupyter.members; }; From 51d457d48fba666c6b7836b6bb3f1318cde26fe3 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 13 Feb 2025 10:06:17 +0100 Subject: [PATCH 1662/2168] python312Packages.jupyter-ydoc: 3.0.2 -> 3.0.3 Changelog: https://github.com/jupyter-server/jupyter_ydoc/blob/v3.0.3/CHANGELOG.md --- pkgs/development/python-modules/jupyter-ydoc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-ydoc/default.nix b/pkgs/development/python-modules/jupyter-ydoc/default.nix index ed83dfdea046..765eadaf82eb 100644 --- a/pkgs/development/python-modules/jupyter-ydoc/default.nix +++ b/pkgs/development/python-modules/jupyter-ydoc/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "jupyter-ydoc"; - version = "3.0.2"; + version = "3.0.3"; pyproject = true; src = fetchPypi { pname = "jupyter_ydoc"; inherit version; - hash = "sha256-1fHVvD7JV55YdGlJbNM9bypp4Y50Mp4TDCMUELocMdA="; + hash = "sha256-ZvPTepoCqXEbUIpVdLCsSJqkDyFgMK8p/dgshiouteo="; }; build-system = [ From 2f4ee1e6645e34dfd8e39121255525e673639551 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=B9=82=E0=B8=97=E0=B8=AA=E0=B8=BA=E0=B8=95=E0=B8=B1?= =?UTF-8?q?=E0=B8=A5?= Date: Thu, 13 Feb 2025 15:53:28 +0700 Subject: [PATCH 1663/2168] h2o: add optional mruby support --- pkgs/by-name/h2/h2o/package.nix | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix index 9fbe8b8ca21a..6a6df40b8dd5 100644 --- a/pkgs/by-name/h2/h2o/package.nix +++ b/pkgs/by-name/h2/h2o/package.nix @@ -13,6 +13,9 @@ libuv, wslay, zlib, + withMruby ? false, + bison, + ruby, }: stdenv.mkDerivation (finalAttrs: { @@ -33,12 +36,18 @@ stdenv.mkDerivation (finalAttrs: { "lib" ]; - nativeBuildInputs = [ - pkg-config - cmake - makeWrapper - ninja - ]; + nativeBuildInputs = + [ + pkg-config + cmake + makeWrapper + ninja + ] + ++ lib.optionals withMruby [ + bison + ruby + ]; + buildInputs = [ brotli openssl @@ -49,6 +58,10 @@ stdenv.mkDerivation (finalAttrs: { wslay ]; + cmakeFlags = [ + "-DWITH_MRUBY=${if withMruby then "ON" else "OFF"}" + ]; + postInstall = '' EXES="$(find "$out/share/h2o" -type f -executable)" for exe in $EXES; do From d016fedb1924a0888f1a346a8ee381b7fa5f06bc Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 13 Feb 2025 09:13:04 +0000 Subject: [PATCH 1664/2168] wlr-randr: 0.4.1 -> 0.5.0 Changes: https://gitlab.freedesktop.org/emersion/wlr-randr/-/tags --- pkgs/by-name/wl/wlr-randr/package.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/wl/wlr-randr/package.nix b/pkgs/by-name/wl/wlr-randr/package.nix index 4064d5538bbf..95d57a5e3d83 100644 --- a/pkgs/by-name/wl/wlr-randr/package.nix +++ b/pkgs/by-name/wl/wlr-randr/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromSourcehut, + fetchFromGitLab, meson, ninja, pkg-config, @@ -11,13 +11,14 @@ stdenv.mkDerivation rec { pname = "wlr-randr"; - version = "0.4.1"; + version = "0.5.0"; - src = fetchFromSourcehut { - owner = "~emersion"; - repo = pname; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "emersion"; + repo = "wlr-randr"; rev = "v${version}"; - hash = "sha256-2kWTVAi4hq2d9jQ6yBLVzm3x7n/oSvBdZ45WyjhXhc4="; + hash = "sha256-lHOGpY0IVnR8QdSqJbtIA4FkhmQ/zDiFNqqXyj8iw/s="; }; strictDeps = true; @@ -34,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Xrandr clone for wlroots compositors"; - homepage = "https://git.sr.ht/~emersion/wlr-randr"; + homepage = "https://gitlab.freedesktop.org/emersion/wlr-randr"; license = licenses.mit; maintainers = with maintainers; [ ma27 ]; platforms = platforms.linux; From 8e72024b22cb0accd1de05f4f822d40b99caef14 Mon Sep 17 00:00:00 2001 From: ZHAO Jin-Xiang Date: Thu, 13 Feb 2025 15:20:02 +0800 Subject: [PATCH 1665/2168] windsurf: fix collision with vscode --- pkgs/applications/editors/vscode/generic.nix | 26 +++++++++++--------- pkgs/by-name/wi/windsurf/package.nix | 4 ++- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index c5f0c0b51673..8e2cc8d521ee 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -42,6 +42,8 @@ longName, shortName, pname, + libraryName ? "vscode", + iconName ? "vs${executableName}", updateScript, dontFixup ? false, rev ? null, @@ -154,7 +156,7 @@ stdenv.mkDerivation ( comment = "Code Editing. Redefined."; genericName = "Text Editor"; exec = "${executableName} %F"; - icon = "vs${executableName}"; + icon = iconName; startupNotify = true; startupWMClass = shortName; categories = [ @@ -167,7 +169,7 @@ stdenv.mkDerivation ( actions.new-empty-window = { name = "New Empty Window"; exec = "${executableName} --new-window %F"; - icon = "vs${executableName}"; + icon = iconName; }; }) (makeDesktopItem { @@ -176,7 +178,7 @@ stdenv.mkDerivation ( comment = "Code Editing. Redefined."; genericName = "Text Editor"; exec = executableName + " --open-url %U"; - icon = "vs${executableName}"; + icon = iconName; startupNotify = true; startupWMClass = shortName; categories = [ @@ -185,7 +187,7 @@ stdenv.mkDerivation ( "Development" "IDE" ]; - mimeTypes = [ "x-scheme-handler/vs${executableName}" ]; + mimeTypes = [ "x-scheme-handler/${iconName}" ]; keywords = [ "vscode" ]; noDisplay = true; }) @@ -244,23 +246,23 @@ stdenv.mkDerivation ( '' else '' - mkdir -p "$out/lib/vscode" "$out/bin" - cp -r ./* "$out/lib/vscode" + mkdir -p "$out/lib/${libraryName}" "$out/bin" + cp -r ./* "$out/lib/${libraryName}" - ln -s "$out/lib/vscode/bin/${sourceExecutableName}" "$out/bin/${executableName}" + ln -s "$out/lib/${libraryName}/bin/${sourceExecutableName}" "$out/bin/${executableName}" # These are named vscode.png, vscode-insiders.png, etc to match the name in upstream *.deb packages. mkdir -p "$out/share/pixmaps" - cp "$out/lib/vscode/resources/app/resources/linux/code.png" "$out/share/pixmaps/vs${executableName}.png" + cp "$out/lib/${libraryName}/resources/app/resources/linux/code.png" "$out/share/pixmaps/${iconName}.png" # Override the previously determined VSCODE_PATH with the one we know to be correct - sed -i "/ELECTRON=/iVSCODE_PATH='$out/lib/vscode'" "$out/bin/${executableName}" - grep -q "VSCODE_PATH='$out/lib/vscode'" "$out/bin/${executableName}" # check if sed succeeded + sed -i "/ELECTRON=/iVSCODE_PATH='$out/lib/${libraryName}'" "$out/bin/${executableName}" + grep -q "VSCODE_PATH='$out/lib/${libraryName}'" "$out/bin/${executableName}" # check if sed succeeded # Remove native encryption code, as it derives the key from the executable path which does not work for us. # The credentials should be stored in a secure keychain already, so the benefit of this is questionable # in the first place. - rm -rf $out/lib/vscode/resources/app/node_modules/vscode-encrypt + rm -rf $out/lib/${libraryName}/resources/app/node_modules/vscode-encrypt '' ) + '' @@ -327,7 +329,7 @@ stdenv.mkDerivation ( --add-needed ${libglvnd}/lib/libGLESv2.so.2 \ --add-needed ${libglvnd}/lib/libGL.so.1 \ --add-needed ${libglvnd}/lib/libEGL.so.1 \ - $out/lib/vscode/${executableName} + $out/lib/${libraryName}/${executableName} ''; inherit meta; diff --git a/pkgs/by-name/wi/windsurf/package.nix b/pkgs/by-name/wi/windsurf/package.nix index 92cb26bffc61..3e4d6f4f1dc5 100644 --- a/pkgs/by-name/wi/windsurf/package.nix +++ b/pkgs/by-name/wi/windsurf/package.nix @@ -13,7 +13,7 @@ let (lib.importJSON ./info.json)."${stdenv.hostPlatform.system}" or (throw "windsurf: unsupported system ${stdenv.hostPlatform.system}"); in -callPackage vscode-generic rec { +callPackage vscode-generic { inherit commandLineArgs useVSCodeRipgrep; inherit (info) version vscodeVersion; @@ -22,6 +22,8 @@ callPackage vscode-generic rec { executableName = "windsurf"; longName = "Windsurf"; shortName = "windsurf"; + libraryName = "windsurf"; + iconName = "windsurf"; sourceRoot = if stdenv.hostPlatform.isDarwin then "Windsurf.app" else "Windsurf"; From c97c81390d4ab57eba36829400f32d54440b19ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 09:32:59 +0000 Subject: [PATCH 1666/2168] python312Packages.dsmr-parser: 1.4.2 -> 1.4.3 --- pkgs/development/python-modules/dsmr-parser/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dsmr-parser/default.nix b/pkgs/development/python-modules/dsmr-parser/default.nix index f69ea095a286..1146b8177041 100644 --- a/pkgs/development/python-modules/dsmr-parser/default.nix +++ b/pkgs/development/python-modules/dsmr-parser/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dsmr-parser"; - version = "1.4.2"; + version = "1.4.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "ndokter"; repo = "dsmr_parser"; tag = "v${version}"; - hash = "sha256-NfleByW9MF7FS4n/cMv297382LucP6Z629CuA6chm20="; + hash = "sha256-jBrcliN63isFKMqgaFIAPP/ALDdtL/O9mCN8Va+g+NE="; }; pythonRelaxDeps = [ "dlms_cosem" ]; @@ -48,7 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to parse Dutch Smart Meter Requirements (DSMR)"; homepage = "https://github.com/ndokter/dsmr_parser"; - changelog = "https://github.com/ndokter/dsmr_parser/releases/tag/v${version}"; + changelog = "https://github.com/ndokter/dsmr_parser/releases/tag/${src.tag}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; mainProgram = "dsmr_console"; From e64044fabafe599b8e230c0e6f6b0d376e19300e Mon Sep 17 00:00:00 2001 From: a-kenji Date: Thu, 13 Feb 2025 16:44:17 +0700 Subject: [PATCH 1667/2168] modules/hebbot: make hebbot package configurable Credit: @phaer --- nixos/modules/services/matrix/hebbot.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/matrix/hebbot.nix b/nixos/modules/services/matrix/hebbot.nix index ba676422ca1f..07a473813d76 100644 --- a/nixos/modules/services/matrix/hebbot.nix +++ b/nixos/modules/services/matrix/hebbot.nix @@ -20,6 +20,7 @@ in meta.maintainers = [ lib.maintainers.raitobezarius ]; options.services.hebbot = { enable = mkEnableOption "hebbot"; + package = lib.mkPackageOption pkgs "hebbot" {}; botPasswordFile = mkOption { type = types.path; description = '' @@ -61,7 +62,7 @@ in script = '' export BOT_PASSWORD="$(cat $CREDENTIALS_DIRECTORY/bot-password-file)" - ${lib.getExe pkgs.hebbot} + ${lib.getExe cfg.package} ''; serviceConfig = { From e6c437f1d87baaeb4d313a1d3b03ee8f6f0ae162 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 09:51:36 +0000 Subject: [PATCH 1668/2168] python312Packages.microsoft-kiota-serialization-form: 1.9.1 -> 1.9.2 --- .../microsoft-kiota-serialization-form/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-form/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-form/default.nix index 3a4edc918ae4..132eb2bd6636 100644 --- a/pkgs/development/python-modules/microsoft-kiota-serialization-form/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-serialization-form/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "microsoft-kiota-serialization-form"; - version = "1.9.1"; + version = "1.9.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "microsoft"; repo = "kiota-python"; - tag = "microsoft-kiota-serialization-form-v${version}"; - hash = "sha256-ESRnI8prXG1h5H5RVD4eOQ1sQYSEMMLVHSk8yhzFGVw="; + tag = "microsoft-kiota-serialization-text-v${version}"; + hash = "sha256-ribVfvKmDMxGmeqj30SDcnbNGdRBfs1DmqQGXP3EHCk="; }; sourceRoot = "source/packages/serialization/form/"; @@ -45,7 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Form serialization implementation for Kiota clients in Python"; homepage = "https://github.com/microsoft/kiota-python/tree/main/packages/serialization/form"; - changelog = "https://github.com/microsoft/kiota-python/releases/tag/microsoft-kiota-serialization-form-v${version}"; + changelog = "https://github.com/microsoft/kiota-python/releases/tag/microsoft-kiota-serialization-form-${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From 943e2eebd6515392e421cf798df6310023b6573a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 09:53:07 +0000 Subject: [PATCH 1669/2168] python312Packages.microsoft-kiota-authentication-azure: 1.9.1 -> 1.9.2 --- .../microsoft-kiota-authentication-azure/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix b/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix index def6f45944c3..b27445386bf1 100644 --- a/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "microsoft-kiota-authentication-azure"; - version = "1.9.1"; + version = "1.9.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "microsoft"; repo = "kiota-python"; - tag = "microsoft-kiota-authentication-azure-v${version}"; - hash = "sha256-ESRnI8prXG1h5H5RVD4eOQ1sQYSEMMLVHSk8yhzFGVw="; + tag = "microsoft-kiota-serialization-text-v${version}"; + hash = "sha256-ribVfvKmDMxGmeqj30SDcnbNGdRBfs1DmqQGXP3EHCk="; }; sourceRoot = "source/packages/authentication/azure/"; @@ -51,7 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Kiota Azure authentication provider"; homepage = "https://github.com/microsoft/kiota-python/tree/main/packages/authentication/azure"; - changelog = "https://github.com/microsoft/kiota-python/releases/tag/microsoft-kiota-authentication-azure-v${version}"; + changelog = "https://github.com/microsoft/kiota-python/releases/tag/microsoft-kiota-authentication-azure-${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From e0e7397ff3b99a9775927f62f7accc37b74e9e24 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Feb 2025 11:06:30 +0100 Subject: [PATCH 1670/2168] python313Packages.tesla-fleet-api: 0.9.8 -> 0.9.10 Diff: https://github.com/Teslemetry/python-tesla-fleet-api/compare/refs/tags/v0.9.8...v0.9.10 Changelog: https://github.com/Teslemetry/python-tesla-fleet-api/releases/tag/v0.9.10 --- pkgs/development/python-modules/tesla-fleet-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tesla-fleet-api/default.nix b/pkgs/development/python-modules/tesla-fleet-api/default.nix index 0c41d7a933ce..843b4d73d511 100644 --- a/pkgs/development/python-modules/tesla-fleet-api/default.nix +++ b/pkgs/development/python-modules/tesla-fleet-api/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "tesla-fleet-api"; - version = "0.9.8"; + version = "0.9.10"; pyproject = true; disabled = pythonOlder "3.10"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Teslemetry"; repo = "python-tesla-fleet-api"; tag = "v${version}"; - hash = "sha256-Bm+euNX0n2proyc0DCyYcc7lUlx/YhRWpPInWPr40CY="; + hash = "sha256-JKXGQJwFmcG2+suHpd8LuEgtlpNV6YzxrGBIa8A7InI="; }; build-system = [ setuptools ]; From 9f5dfaabd6ec37a3cb15ffe5be9321963446e714 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 12 Feb 2025 08:34:43 +0100 Subject: [PATCH 1671/2168] python313Packages.cyclopts: 3.6.0 -> 3.7.0 Diff: https://github.com/BrianPugh/cyclopts/compare/refs/tags/v3.6.0...v3.7.0 Changelog: https://github.com/BrianPugh/cyclopts/releases/tag/v3.7.0 --- pkgs/development/python-modules/cyclopts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix index bbe83e8c789f..d510f1fbd13d 100644 --- a/pkgs/development/python-modules/cyclopts/default.nix +++ b/pkgs/development/python-modules/cyclopts/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "cyclopts"; - version = "3.6.0"; + version = "3.7.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "BrianPugh"; repo = "cyclopts"; tag = "v${version}"; - hash = "sha256-ASIPCSGD3YY0XXUISMvEOVWXh3aEoL2mZSDnbYjFMo0="; + hash = "sha256-Zv0q8m7BS9MF2xyRRgVn1Bc8iwycmaXbP9S6yNl0yUk="; }; build-system = [ From 75124f4d3b4421e1910d4c0af541a520a2f9b56d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 10:19:32 +0000 Subject: [PATCH 1672/2168] python312Packages.wikipedia-api: 0.8.0 -> 0.8.1 --- pkgs/development/python-modules/wikipedia-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wikipedia-api/default.nix b/pkgs/development/python-modules/wikipedia-api/default.nix index d31652738025..e169f9864670 100644 --- a/pkgs/development/python-modules/wikipedia-api/default.nix +++ b/pkgs/development/python-modules/wikipedia-api/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "wikipedia-api"; - version = "0.8.0"; + version = "0.8.1"; format = "setuptools"; src = fetchFromGitHub { owner = "martin-majlis"; repo = "Wikipedia-API"; tag = "v${version}"; - hash = "sha256-L/XjFV3jUW4WNV4+5J60oAwtZMFSmM1y1/z4eNsFjIY="; + hash = "sha256-5wi1HVkD36RnmIAKSKRYTc30HtYMiFrRoYzZRWENd/M="; }; propagatedBuildInputs = [ requests ]; From e2ff7c090d4ef448213cd42a0a1408a2797cb2c9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 12 Feb 2025 08:35:07 +0100 Subject: [PATCH 1673/2168] python313Packages.environs: 14.1.0 -> 14.1.1 Diff: https://github.com/sloria/environs/compare/refs/tags/14.1.0...14.1.1 Changelog: https://github.com/sloria/environs/blob/14.1.1/CHANGELOG.md --- pkgs/development/python-modules/environs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/environs/default.nix b/pkgs/development/python-modules/environs/default.nix index c6e377e7be99..c6fb398f69d4 100644 --- a/pkgs/development/python-modules/environs/default.nix +++ b/pkgs/development/python-modules/environs/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "environs"; - version = "14.1.0"; + version = "14.1.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "sloria"; repo = "environs"; tag = version; - hash = "sha256-OmZn6ngujcPuws+idRtzwIt+9XLfRge7IFby+yCiQNM="; + hash = "sha256-yWGLCUMnmk+d6o4OmBxuSTdImse8ikNs0rDXLZgFU6k="; }; nativeBuildInputs = [ flit-core ]; From aff16a27198beb81a962d961857103073560613f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Feb 2025 11:22:03 +0100 Subject: [PATCH 1674/2168] python313Packages.homeassistant-stubs: 2025.2.1 -> 2025.2.3 https://github.com/KapJI/homeassistant-stubs/releases/tag/2025.2.3 --- pkgs/servers/home-assistant/stubs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index ee532d02e048..ab15453ac011 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2025.2.1"; + version = "2025.2.3"; pyproject = true; disabled = python.version != home-assistant.python.version; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-Lw+eItDQX77jKIE9/9S0C9khzR+HMHFPGvPpzRHwrZw="; + hash = "sha256-bb9LAgra8AVqoNsyL95wrOt9JXMPnT7FxwU1+JLKw5c="; }; build-system = [ From aa66876d7ffdae962e247f49d67d1c9e34e65d24 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 12 Feb 2025 08:35:34 +0100 Subject: [PATCH 1675/2168] python313Packages.griffe: 1.5.6 -> 1.5.7 Diff: https://github.com/mkdocstrings/griffe/compare/refs/tags/1.5.6...1.5.7 Changelog: https://github.com/mkdocstrings/griffe/blob/1.5.7/CHANGELOG.md --- pkgs/development/python-modules/griffe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix index 846e9c506755..5e72a718ad2e 100644 --- a/pkgs/development/python-modules/griffe/default.nix +++ b/pkgs/development/python-modules/griffe/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "griffe"; - version = "1.5.6"; + version = "1.5.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "griffe"; tag = version; - hash = "sha256-TQSQ+gW79GV3lkdPAYsJb2stvVY4CktjjS3yO7S8o2E="; + hash = "sha256-4ulyhdPAfN5mjw6rzJsu9Y4+Pz3SfWP46qnbdLbO6Ng="; }; build-system = [ pdm-backend ]; From 42cf296d222c2240fbe159750aaa0f2963218f26 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Feb 2025 11:26:03 +0100 Subject: [PATCH 1676/2168] home-assistant.python.pkgs.pytest-homeassistant-custom-component: 0.13.210 -> 0.13.213 https://github.com/MatthewFlamm/pytest-homeassistant-custom-component/blob/refs/tags/0.13.213/CHANGELOG.md --- .../home-assistant/pytest-homeassistant-custom-component.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix index 1cea64518f09..0d0a52f2d17d 100644 --- a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix +++ b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pytest-homeassistant-custom-component"; - version = "0.13.210"; + version = "0.13.213"; pyproject = true; disabled = pythonOlder "3.12"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "MatthewFlamm"; repo = "pytest-homeassistant-custom-component"; rev = "refs/tags/${version}"; - hash = "sha256-SQCxuMmLYfZ1xzaIko5VJiKtu8LqzJIW4Rk8ze/VSEg="; + hash = "sha256-mYdG3LFjkm7vkQTLW/5kRe/Yrflq1jZGgQRiIuIqJYg="; }; build-system = [ setuptools ]; From 13106496ecb4ca3c2a7866e10bfe14ec9389726c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 12 Feb 2025 08:35:53 +0100 Subject: [PATCH 1677/2168] python313Packages.neo4j: 5.28.0 -> 5.28.1 Diff: https://github.com/neo4j/neo4j-python-driver/compare/refs/tags/5.28.0...5.28.1 Changelog: https://github.com/neo4j/neo4j-python-driver/releases/tag/5.28.1 --- pkgs/development/python-modules/neo4j/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix index 2a63d512164c..7a9110fdd9c5 100644 --- a/pkgs/development/python-modules/neo4j/default.nix +++ b/pkgs/development/python-modules/neo4j/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "neo4j"; - version = "5.28.0"; + version = "5.28.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "neo4j"; repo = "neo4j-python-driver"; tag = version; - hash = "sha256-1hq0XuHb7R/ROkeyEyfGQMH//E632aiNYVSjszM1OEY="; + hash = "sha256-6Qa6llM8ke9dOkZ7q057ruM0h7pByxAQ+I6Mus2ExVA="; }; postPatch = '' From f77b432f878c7327d2b4f402ae58eae5bbefcb9c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 12 Feb 2025 08:36:14 +0100 Subject: [PATCH 1678/2168] python313Packages.pyexploitdb: 0.2.66 -> 0.2.67 Changelog: https://github.com/Hackman238/pyExploitDb/blob/master/ChangeLog.md --- pkgs/development/python-modules/pyexploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix index 4ccd7881a920..417e035062f7 100644 --- a/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/pkgs/development/python-modules/pyexploitdb/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyexploitdb"; - version = "0.2.66"; + version = "0.2.67"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyExploitDb"; inherit version; - hash = "sha256-KZt9lxeUT0d9MLd96c5WYJWfUbo4Q2Gyqjdw1gQJTGQ="; + hash = "sha256-sz6fI1iSa6aRk5QSsKrSncDI2XFTNbpSjMt2ch8+gfA="; }; build-system = [ setuptools ]; From 23d6d290af7480c0ab0829024065fc437d329dd5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 12 Feb 2025 08:36:45 +0100 Subject: [PATCH 1679/2168] python313Packages.twilio: 9.4.4 -> 9.4.5 Diff: https://github.com/twilio/twilio-python/compare/refs/tags/9.4.4...9.4.5 Changelog: https://github.com/twilio/twilio-python/blob/9.4.5/CHANGES.md --- pkgs/development/python-modules/twilio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 0a21259d8e3a..546b135f344c 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "9.4.4"; + version = "9.4.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; tag = version; - hash = "sha256-qkbxu2FembYCdGOEaBmAod6HYGaulhcakTLgCHJoZZY="; + hash = "sha256-+lg+rV3BueELZGk4sOOryZmI560oAVjT+AYdeJpqC1U="; }; build-system = [ setuptools ]; From fbd12fb18b9098e2d29def26fe9e0e36d51abac0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 12 Feb 2025 08:40:02 +0100 Subject: [PATCH 1680/2168] python313Packages.lingva: 5.0.4 -> 5.0.5 Diff: https://github.com/vacanza/lingva/compare/refs/tags/v5.0.4...v5.0.5 Changelog: https://github.com/vacanza/lingva/blob/5.0.5/changes.rst --- pkgs/development/python-modules/lingva/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lingva/default.nix b/pkgs/development/python-modules/lingva/default.nix index 5deff1a94709..8016cbad7f1f 100644 --- a/pkgs/development/python-modules/lingva/default.nix +++ b/pkgs/development/python-modules/lingva/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "lingva"; - version = "5.0.4"; + version = "5.0.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "vacanza"; repo = "lingva"; tag = "v${version}"; - hash = "sha256-2h3J+pvXRmjD7noMA7Cyu5Tf/9R8Akv08A7xJMLVD08="; + hash = "sha256-zKEGRLaqQSqbOP4ZAidIxMgGQbDIC9pAGfjWqoQTouc="; }; build-system = [ setuptools ]; From 2d7681200f9cd1027bf6ddc7b8db351e69319eb1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 12 Feb 2025 08:39:40 +0100 Subject: [PATCH 1681/2168] python313Packages.model-bakery: 1.20.1 -> 1.20.3 Diff: https://github.com/model-bakers/model_bakery/compare/refs/tags/1.20.1...1.20.3 Changelog: https://github.com/model-bakers/model_bakery/blob/1.20.3/CHANGELOG.md --- pkgs/development/python-modules/model-bakery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/model-bakery/default.nix b/pkgs/development/python-modules/model-bakery/default.nix index 91f7cf1e896f..2f52f3a914da 100644 --- a/pkgs/development/python-modules/model-bakery/default.nix +++ b/pkgs/development/python-modules/model-bakery/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "model-bakery"; - version = "1.20.1"; + version = "1.20.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "model-bakers"; repo = "model_bakery"; tag = version; - hash = "sha256-VA3rRzu1FhgCRCSRBQ+cZkwHVZr5/e++twk3hOWuc2c="; + hash = "sha256-0zLlX0AfGDnSrV3gqheYBUwX7+iJQjBER8EEtXwVkbA="; }; build-system = [ hatchling ]; From 3ad31f60e1786075bbd4522370931b8d70f1b7f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 10:39:20 +0000 Subject: [PATCH 1682/2168] python312Packages.mkdocs-autorefs: 1.3.0 -> 1.3.1 --- pkgs/development/python-modules/mkdocs-autorefs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs-autorefs/default.nix b/pkgs/development/python-modules/mkdocs-autorefs/default.nix index 50515bae3118..7d9f410ddae6 100644 --- a/pkgs/development/python-modules/mkdocs-autorefs/default.nix +++ b/pkgs/development/python-modules/mkdocs-autorefs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mkdocs-autorefs"; - version = "1.3.0"; + version = "1.3.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "autorefs"; tag = version; - hash = "sha256-EfZcY5eZtRKjxWC4/sWF3F4N/uK2e3gFK2dBY/kTCM4="; + hash = "sha256-YVkj4D7JK0GOqnGlg5L3uqFsBB5C0OnlXX+wYW4GpkQ="; }; postPatch = '' @@ -48,7 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Automatically link across pages in MkDocs"; homepage = "https://github.com/mkdocstrings/autorefs/"; - changelog = "https://github.com/mkdocstrings/autorefs/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/mkdocstrings/autorefs/blob/${src.tag}/CHANGELOG.md"; license = licenses.isc; maintainers = with maintainers; [ fab ]; }; From 5bb7734809e02205cc70ba7bcaf2771c4882e37e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 12 Feb 2025 08:40:26 +0100 Subject: [PATCH 1683/2168] python313Packages.pylacus: 1.12.0 -> 1.12.1 Diff: https://github.com/ail-project/PyLacus/compare/refs/tags/v1.12.0...v1.12.1 Changelog: https://github.com/ail-project/PyLacus/releases/tag/v1.12.1 --- pkgs/development/python-modules/pylacus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylacus/default.nix b/pkgs/development/python-modules/pylacus/default.nix index 994b77a92266..2ba2c4ead705 100644 --- a/pkgs/development/python-modules/pylacus/default.nix +++ b/pkgs/development/python-modules/pylacus/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pylacus"; - version = "1.12.0"; + version = "1.12.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "ail-project"; repo = "PyLacus"; tag = "v${version}"; - hash = "sha256-M7xPJKM/8fY8RBU2ESzaYOfENICCRNexORJGkerD4FM="; + hash = "sha256-nFVIS7G1EvoiOz0MWuCdNPfEL1Tb6lLD00Cw9427obQ="; }; build-system = [ poetry-core ]; From ad50bcfeaaf87d5a6258f7b6b3e4a2777a502953 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 12 Feb 2025 08:38:58 +0100 Subject: [PATCH 1684/2168] python313Packages.nexia: 2.0.9 -> 2.1.0 Diff: https://github.com/bdraco/nexia/compare/refs/tags/2.0.9...2.1.0 Changelog: https://github.com/bdraco/nexia/releases/tag/2.1.0 --- pkgs/development/python-modules/nexia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nexia/default.nix b/pkgs/development/python-modules/nexia/default.nix index 8d89ee9d54a6..de973027754f 100644 --- a/pkgs/development/python-modules/nexia/default.nix +++ b/pkgs/development/python-modules/nexia/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "nexia"; - version = "2.0.9"; + version = "2.1.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "nexia"; tag = version; - hash = "sha256-HbsjMugPFptRPCwvXszD7Zfyl0P/VfQRbVDSMC+4mcg="; + hash = "sha256-bW3eFPs7sX3Z5ZH87orIg0HICXQiFtLqyLKFgpSCzJ0="; }; postPatch = '' From 00bd86e982f1b9525f1dc5212a5cb5689bb45e8b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Feb 2025 11:45:24 +0100 Subject: [PATCH 1685/2168] python313Packages.publicsuffixlist: 1.0.2.20250211 -> 1.0.2.20250213 Changelog: https://github.com/ko-zu/psl/blob/v1.0.2.20250213-gha/CHANGES.md --- pkgs/development/python-modules/publicsuffixlist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 215eebaf8fe2..e48bb58fe4fb 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "1.0.2.20250211"; + version = "1.0.2.20250213"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ujbidDxlKcthvB90O2WJLLBRtmT69+rgzha4wAGJue8="; + hash = "sha256-gbT6n/jr+GgYDh0046DsTiQesJ6jp7WQS/wvwe/0NCw="; }; build-system = [ setuptools ]; From 36acd90a17fdd1f202c0b8fc47890ed8f471c41e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 12 Feb 2025 09:24:14 +0100 Subject: [PATCH 1686/2168] python312Packages.cramjam: 2.8.3 -> 2.9.1-unstable-2025-01-04 Diff: https://github.com/milesgranger/pyrus-cramjam/compare/refs/tags/v2.8.3...61564e7761e38e5ec55e7939ccd6a276c2c55d11 Changelog: https://github.com/milesgranger/cramjam/releases/tag/v2.9.1 --- .../python-modules/cramjam/default.nix | 43 ++++++++++--------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/cramjam/default.nix b/pkgs/development/python-modules/cramjam/default.nix index dc35cbc2c6ff..750ff3fa7076 100644 --- a/pkgs/development/python-modules/cramjam/default.nix +++ b/pkgs/development/python-modules/cramjam/default.nix @@ -3,8 +3,8 @@ buildPythonPackage, fetchFromGitHub, rustPlatform, - stdenv, - libiconv, + + # tests hypothesis, numpy, pytest-xdist, @@ -13,30 +13,30 @@ buildPythonPackage rec { pname = "cramjam"; - version = "2.8.3"; + # 2.9.1 ships with experimental decoders that were having issues. + # They were removed afterwards but the change has not been released yet: + # https://github.com/milesgranger/cramjam/pull/197 + # TODO: update to the next stable release when available + version = "2.9.1-unstable-2025-01-04"; pyproject = true; src = fetchFromGitHub { owner = "milesgranger"; - repo = "pyrus-cramjam"; - tag = "v${version}"; - hash = "sha256-1KD5/oZjfdXav1ZByQoyyiDSzbmY4VJsSJg/FtUFdDE="; + repo = "cramjam"; + rev = "61564e7761e38e5ec55e7939ccd6a276c2c55d11"; + hash = "sha256-KTYTelQdN5EIJFbyQgrYcayqkAQQSNF+SHqUFFHf1Z8="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - hash = "sha256-Gpj/LUCx/ivYlmxNJnEZr8caEfV4OaQwEPNjz7vobsw="; + inherit pname src version; + hash = "sha256-Jw9zbgcrX3pofW7E8b4xzZYKj3h6ufCVLjv2xD/qONo="; }; - buildAndTestSubdir = "cramjam-python"; - nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; - nativeCheckInputs = [ hypothesis numpy @@ -44,22 +44,23 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "cramjam-python/tests" ]; + env = { + # Makes tests less flaky by relaxing performance constraints + # https://github.com/HypothesisWorks/hypothesis/issues/3713 + CI = true; + }; disabledTestPaths = [ - "cramjam-python/benchmarks/test_bench.py" - # test_variants.py appears to be flaky - # - # https://github.com/NixOS/nixpkgs/pull/311584#issuecomment-2117656380 - "cramjam-python/tests/test_variants.py" + "benchmarks/test_bench.py" ]; pythonImportsCheck = [ "cramjam" ]; - meta = with lib; { + meta = { description = "Thin Python bindings to de/compression algorithms in Rust"; homepage = "https://github.com/milesgranger/pyrus-cramjam"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ veprbl ]; + changelog = "https://github.com/milesgranger/cramjam/releases/tag/v${version}"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ veprbl ]; }; } From d6d21ca240f3218f6fcad295e45f5b1526b388f3 Mon Sep 17 00:00:00 2001 From: BirdeeHub Date: Thu, 13 Feb 2025 00:40:41 -0800 Subject: [PATCH 1687/2168] vimPlugins.lze: 0.7.9 -> 0.7.11 --- pkgs/development/lua-modules/generated-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 9c78f7931a36..7aaa090d8574 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -2565,14 +2565,14 @@ buildLuarocksPackage { lze = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "lze"; - version = "0.7.9-1"; + version = "0.7.11-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lze-0.7.9-1.rockspec"; - sha256 = "010xp1142d7rl29hbbzl8dyf8cy77dzy266kmxa16099zm245kfd"; + url = "mirror://luarocks/lze-0.7.11-1.rockspec"; + sha256 = "1nvnjncs5xz5gv4vsvwnsp6hcyvbzjrxvq0li9nr84hmb5sx7z1r"; }).outPath; src = fetchzip { - url = "https://github.com/BirdeeHub/lze/archive/v0.7.9.zip"; - sha256 = "02klg4hl9q9wx3rdx0d92qiiyjw8agvanbicxdcsdavl9kaci8fl"; + url = "https://github.com/BirdeeHub/lze/archive/v0.7.11.zip"; + sha256 = "0vv333vkymjdsm73ppw8fpn9kxhapbiiikcaxhjswvrxw8ap7dwg"; }; disabled = luaOlder "5.1"; From 531aa24c592a906c939693343a95f1f77cadd82f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Feb 2025 11:46:34 +0100 Subject: [PATCH 1688/2168] python313Packages.tencentcloud-sdk-python: 3.0.1316 -> 3.0.1317 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1316...3.0.1317 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1317/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 a71af11de0f8..82921c10b838 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.1316"; + version = "3.0.1317"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = version; - hash = "sha256-g3a/WQVfYlAgRecvP+s1jvxEDwNvwx4enDhnkW0UrYo="; + hash = "sha256-UIDr9RkApo2vH5TaUwtPLMcqQd89vFMMzEBGk0Zy+Fo="; }; build-system = [ setuptools ]; From 58120e2711713f799257e7e954e11ea05251bf95 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Feb 2025 11:46:54 +0100 Subject: [PATCH 1689/2168] python312Packages.mypy-boto3-acm-pca: 1.36.0 -> 1.36.18 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 3a65414ef8b7..d33675f95436 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -58,8 +58,8 @@ rec { "sha256-YidmZX6XLk9a5oupICy7bzfzhyWWa4JAArDEXiMT3Us="; mypy-boto3-acm-pca = - buildMypyBoto3Package "acm-pca" "1.36.0" - "sha256-2LHrGmkx7GwtcsVNImY9e54f/AewDY0qdcMSd3ktDCE="; + buildMypyBoto3Package "acm-pca" "1.36.18" + "sha256-3kwz/6Gi2HpomS5l9ayUNGG1VIv2sdojkNxnrRcAQG8="; mypy-boto3-amp = buildMypyBoto3Package "amp" "1.36.11" From 4afef42ada6d10e3041ec68feda683f982c75fc1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Feb 2025 11:47:02 +0100 Subject: [PATCH 1690/2168] python312Packages.mypy-boto3-appsync: 1.36.8 -> 1.36.18 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index d33675f95436..204c52e1e547 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -134,8 +134,8 @@ rec { "sha256-nLO7lRp3s0m1s6CMcEhpTAXpqhC+fgdXuus0AZhXTts="; mypy-boto3-appsync = - buildMypyBoto3Package "appsync" "1.36.8" - "sha256-NSE8FKmNW1g3TTddFEJ22R80oEncfEAifk22xnCn2Bw="; + buildMypyBoto3Package "appsync" "1.36.18" + "sha256-HnvpzgTUZJvqpKFB5yhUm2k2Hfwag+tTOljDw2z4PRk="; mypy-boto3-arc-zonal-shift = buildMypyBoto3Package "arc-zonal-shift" "1.36.0" From ed6a3ec0df07a5207665595794e2d8ad25aa7bba Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Feb 2025 11:47:14 +0100 Subject: [PATCH 1691/2168] python312Packages.mypy-boto3-codebuild: 1.36.11 -> 1.36.19 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 204c52e1e547..feebbfdc7c42 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -266,8 +266,8 @@ rec { "sha256-adJN1hy0NsAFWRgBuT7uOqlFWQtHasuHyC6TwQ/oE/8="; mypy-boto3-codebuild = - buildMypyBoto3Package "codebuild" "1.36.11" - "sha256-O+QUYQiFM5ztT9q9FP9pDWYnc0msWIXd11Pi2YvEH7E="; + buildMypyBoto3Package "codebuild" "1.36.19" + "sha256-5jWS6GSWjZPO9+17YCqzdl0C4sHt8HRwTJqjFf7t6tM="; mypy-boto3-codecatalyst = buildMypyBoto3Package "codecatalyst" "1.36.0" From 1216f2d4d46e942e7025740a8917194c10b52f5e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Feb 2025 11:47:32 +0100 Subject: [PATCH 1692/2168] python312Packages.mypy-boto3-ec2: 1.36.8 -> 1.36.18 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index feebbfdc7c42..49e52680359d 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -446,8 +446,8 @@ rec { "sha256-YrzTW5fEsZPDu4p84jhY4avS/wM01XybrvGCOtF48cQ="; mypy-boto3-ec2 = - buildMypyBoto3Package "ec2" "1.36.8" - "sha256-r63ya2QLeI3N0onajpBwq98ikz4pv6VlS5GVYpOoXyA="; + buildMypyBoto3Package "ec2" "1.36.18" + "sha256-9+Qt4q49OI2HaYmwbPGmLdGJb9th192Hy3C6GW0p2+E="; mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.36.0" From 875835a681b50f707ea0899314123ce237e75701 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Feb 2025 11:47:44 +0100 Subject: [PATCH 1693/2168] python312Packages.mypy-boto3-fsx: 1.36.0 -> 1.36.19 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 49e52680359d..77b6edbff39a 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -558,8 +558,8 @@ rec { "sha256-AF/akUwLmAZnHABVlvFS+f3Iqr/Yi0b+3XxGNJRfuug="; mypy-boto3-fsx = - buildMypyBoto3Package "fsx" "1.36.0" - "sha256-bNWYHBISI/jOUu5vA8NBI25JNxM4KdFk3nV0zNLZwaw="; + buildMypyBoto3Package "fsx" "1.36.19" + "sha256-11p4ACLZU/UmhXVk9w9dmRpSUfoF4Sj5aPiJs2nnOyQ="; mypy-boto3-gamelift = buildMypyBoto3Package "gamelift" "1.36.0" From b7f68758d956449ebef8a9c4979336949b00a295 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Feb 2025 11:48:12 +0100 Subject: [PATCH 1694/2168] python312Packages.mypy-boto3-medialive: 1.36.4 -> 1.36.19 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 77b6edbff39a..b4eac2ad1a99 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -866,8 +866,8 @@ rec { "sha256-Zs7r18i4H2k2XnqvRN/d+b5W+0bjfNonNL1EI1rK7aw="; mypy-boto3-medialive = - buildMypyBoto3Package "medialive" "1.36.4" - "sha256-ehAZOo4ekOoPdKXhUOXv7YK67bJhd4haHM3GjuTQiBs="; + buildMypyBoto3Package "medialive" "1.36.19" + "sha256-546c5x+TddUlNzw5Wqruap7O8zvAXlgvszHo/psBRuo="; mypy-boto3-mediapackage = buildMypyBoto3Package "mediapackage" "1.36.0" From 7611c8234e462dd37217d24afeaf528263e7bb35 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Feb 2025 11:48:22 +0100 Subject: [PATCH 1695/2168] python312Packages.mypy-boto3-opensearchserverless: 1.36.0 -> 1.36.19 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index b4eac2ad1a99..4c87c2b0265a 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -974,8 +974,8 @@ rec { "sha256-oz48RBbQGyDikXQJ4sjOYgVjs6oy2tYPsPuHqpupO5w="; mypy-boto3-opensearchserverless = - buildMypyBoto3Package "opensearchserverless" "1.36.0" - "sha256-dllkeUE5qQE61akOhPcJz3iClMj8Z2aplfHNNEIXcF4="; + buildMypyBoto3Package "opensearchserverless" "1.36.19" + "sha256-CjPLD9P2FZpyFpH6S1FbXIxY1UEF7pgrjOIpInCA9Rw="; mypy-boto3-opsworks = buildMypyBoto3Package "opsworks" "1.36.0" From 9f603ccc2c7a69c4650200e94a34826a219b4836 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Feb 2025 11:48:27 +0100 Subject: [PATCH 1696/2168] python312Packages.mypy-boto3-pi: 1.36.16 -> 1.36.18 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 4c87c2b0265a..f156e1daaceb 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1026,8 +1026,8 @@ rec { "sha256-4/9lvIlwuiXlkPXYcjKdC+Ewzhglg+cEgswJaYMDBWU="; mypy-boto3-pi = - buildMypyBoto3Package "pi" "1.36.16" - "sha256-Xx9QinfGubDOAV3qr2jKip3n+1vdpDSboXXJM0XWFnY="; + buildMypyBoto3Package "pi" "1.36.18" + "sha256-DSuDOZ8R3r4rlhnPsoY4qbulr0aThwONLf7/TqNm+5o="; mypy-boto3-pinpoint = buildMypyBoto3Package "pinpoint" "1.36.0" From 1583ef6f492bd6397edf2728ba4dab9ae54b6887 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Feb 2025 11:48:30 +0100 Subject: [PATCH 1697/2168] python312Packages.mypy-boto3-polly: 1.36.0 -> 1.36.19 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index f156e1daaceb..0161eb6adb60 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1050,8 +1050,8 @@ rec { "sha256-CCM2JZp9dcNhbmqU1xwpnN6cahGHy0lo3byX6KhyQ50="; mypy-boto3-polly = - buildMypyBoto3Package "polly" "1.36.0" - "sha256-+HLE7PMRrMooODJxPIiWOvMNJmbpceLYJ2rvYkrP9Jo="; + buildMypyBoto3Package "polly" "1.36.19" + "sha256-lI9liwsOjlcvgiCimRuroWLkTWI/Zy0/VJ6YJNh8tXc="; mypy-boto3-pricing = buildMypyBoto3Package "pricing" "1.36.0" From 0fe38d49a58b5b168d9b464dcc970956897716a4 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 13 Feb 2025 10:33:15 +0100 Subject: [PATCH 1698/2168] python312Packages.uproot: 5.5.1 -> 5.5.2 Diff: https://github.com/scikit-hep/uproot5/compare/refs/tags/v5.5.1...v5.5.2 Changelog: https://github.com/scikit-hep/uproot5/releases/tag/v5.5.2 --- .../python-modules/uproot/default.nix | 81 +++++++++---------- 1 file changed, 36 insertions(+), 45 deletions(-) diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index fb49f9b6e9cc..9c34d6798579 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, @@ -11,30 +10,31 @@ # dependencies awkward, cramjam, - numpy, fsspec, + numpy, packaging, - # checks + # tests awkward-pandas, pandas, - pytestCheckHook, pytest-timeout, + pytestCheckHook, rangehttpserver, scikit-hep-testdata, + writableTmpDirAsHomeHook, xxhash, }: buildPythonPackage rec { pname = "uproot"; - version = "5.5.1"; + version = "5.5.2"; pyproject = true; src = fetchFromGitHub { owner = "scikit-hep"; repo = "uproot5"; tag = "v${version}"; - hash = "sha256-a5gCsv8iBUUASHCJIpxFbgBXTSm/KJOTt6fvSvP/Lio="; + hash = "sha256-vMTZ3ajCEkKKerPXThSxk0vgGxK2Po9hVf8ofaGCO04="; }; build-system = [ @@ -45,8 +45,8 @@ buildPythonPackage rec { dependencies = [ awkward cramjam - numpy fsspec + numpy packaging xxhash ]; @@ -54,50 +54,41 @@ buildPythonPackage rec { nativeCheckInputs = [ awkward-pandas pandas - pytestCheckHook pytest-timeout + pytestCheckHook rangehttpserver scikit-hep-testdata + writableTmpDirAsHomeHook ]; - preCheck = '' - export HOME="$(mktemp -d)" - ''; + disabledTests = [ + # Tests that try to download files + "test_descend_into_path_classname_of" + "test_fallback" + "test_fsspec_cache_http" + "test_fsspec_cache_http_directory" + "test_fsspec_chunks" + "test_fsspec_globbing_http" + "test_http" + "test_http_fallback_workers" + "test_http_multipart" + "test_http_port" + "test_http_size" + "test_http_size_port" + "test_http_workers" + "test_issue176" + "test_issue176_again" + "test_issue_1054_filename_colons" + "test_no_multipart" + "test_open_fsspec_github" + "test_open_fsspec_http" + "test_pickle_roundtrip_http" - disabledTests = - [ - # Tests that try to download files - "test_descend_into_path_classname_of" - "test_fallback" - "test_fsspec_cache_http" - "test_fsspec_cache_http_directory" - "test_fsspec_chunks" - "test_fsspec_globbing_http" - "test_http" - "test_http_fallback_workers" - "test_http_multipart" - "test_http_port" - "test_http_size" - "test_http_size_port" - "test_http_workers" - "test_issue176" - "test_issue176_again" - "test_issue_1054_filename_colons" - "test_no_multipart" - "test_open_fsspec_github" - "test_open_fsspec_http" - "test_pickle_roundtrip_http" - - # Cyclic dependency with dask-awkward - "test_dask_duplicated_keys" - "test_decompression_executor_for_dask" - "test_decompression_threadpool_executor_for_dask" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # Tries to connect to localhost:22 - # PermissionError: [Errno 1] Operation not permitted - "test_open_fsspec_ssh" - ]; + # Cyclic dependency with dask-awkward + "test_dask_duplicated_keys" + "test_decompression_executor_for_dask" + "test_decompression_threadpool_executor_for_dask" + ]; disabledTestPaths = [ # Tests that try to download files From e889770f0081d6969e7e095fa42ec80fc57b3629 Mon Sep 17 00:00:00 2001 From: Brian McGillion Date: Mon, 10 Feb 2025 21:43:23 +0400 Subject: [PATCH 1699/2168] libdaq: init at 3.0.18 used in the snort3+ package. Signed-off-by: Brian McGillion --- pkgs/by-name/li/libdaq/package.nix | 63 ++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 pkgs/by-name/li/libdaq/package.nix diff --git a/pkgs/by-name/li/libdaq/package.nix b/pkgs/by-name/li/libdaq/package.nix new file mode 100644 index 000000000000..c182572de779 --- /dev/null +++ b/pkgs/by-name/li/libdaq/package.nix @@ -0,0 +1,63 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + pkg-config, + libpcap, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libdaq"; + version = "3.0.18"; + + src = fetchFromGitHub { + owner = "snort3"; + repo = "libdaq"; + tag = "v${finalAttrs.version}"; + hash = "sha256-PMb8q8QcfUXxEf0s2UdaZogmxzqUCw0wRdzfT1xio/E="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + libpcap + stdenv.cc.cc # libstdc++ + ]; + + outputs = [ + "lib" + "dev" + "out" + ]; + + autoreconfPhase = '' + ./bootstrap + ''; + + postInstall = '' + # remove build directory (/build/**, or /tmp/nix-build-**) from RPATHs + for f in "$out"/bin/*; do + local nrp="$(patchelf --print-rpath "$f" | sed -E 's@(:|^)'$NIX_BUILD_TOP'[^:]*:@\1@g')" + patchelf --set-rpath "$nrp" "$f" + done + ''; + + meta = { + description = "Data AcQuisition library (libDAQ), for snort packet I/O"; + homepage = "https://www.snort.org"; + maintainers = with lib.maintainers; [ + aycanirican + brianmcgillion + ]; + license = lib.licenses.gpl2; + outputsToInstall = [ + "lib" + "dev" + ]; + platforms = with lib.platforms; linux; + }; +}) From 5d094105cd741e732f635d366c72b7f5253e0fd9 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 13 Feb 2025 10:05:02 +0100 Subject: [PATCH 1700/2168] hawkeye: init at 6.0.0 Signed-off-by: Matthias Beyer --- pkgs/by-name/ha/hawkeye/package.nix | 32 +++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 pkgs/by-name/ha/hawkeye/package.nix diff --git a/pkgs/by-name/ha/hawkeye/package.nix b/pkgs/by-name/ha/hawkeye/package.nix new file mode 100644 index 000000000000..36d883ccdc56 --- /dev/null +++ b/pkgs/by-name/ha/hawkeye/package.nix @@ -0,0 +1,32 @@ +{ + lib, + rustPackages, + fetchFromGitHub, + pkg-config, +}: + +rustPackages.rustPlatform.buildRustPackage rec { + pname = "hawkeye"; + version = "6.0.0"; + + src = fetchFromGitHub { + owner = "korandoru"; + repo = "hawkeye"; + tag = "v${version}"; + hash = "sha256-VfJWj9BwNVR7RVUW+CjFuaniyiEath1U0F/7QJcA3r4="; + }; + + cargoHash = "sha256-tTXoxWjcTtEcRcuSs0ewCN1VJYmTIKRgL3s7QSYt7sk="; + + nativeBuildInputs = [ + pkg-config + ]; + + meta = { + homepage = "https://github.com/korandoro/hawkeye"; + description = "Simple license header checker and formatter, in multiple distribution forms"; + license = lib.licenses.asl20; + mainProgram = "hawkeye"; + maintainers = with lib.maintainers; [ matthiasbeyer ]; + }; +} From 80e7e67c1f0e3f1ae57e2456df86d49a11130a62 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Feb 2025 11:58:00 +0100 Subject: [PATCH 1701/2168] prowler: 5.2.3 -> 5.3.0 Diff: https://github.com/prowler-cloud/prowler/compare/refs/tags/5.2.3...5.3.0 Changelog: https://github.com/prowler-cloud/prowler/releases/tag/5.3.0 --- pkgs/by-name/pr/prowler/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/prowler/package.nix b/pkgs/by-name/pr/prowler/package.nix index cb8eeb120561..c48b674513d2 100644 --- a/pkgs/by-name/pr/prowler/package.nix +++ b/pkgs/by-name/pr/prowler/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "prowler"; - version = "5.2.3"; + version = "5.3.0"; pyproject = true; src = fetchFromGitHub { owner = "prowler-cloud"; repo = "prowler"; tag = version; - hash = "sha256-gEkD3lMOLpi2NeZBN4V2RJ/aqcuSLSQFSFYFSyDgizc="; + hash = "sha256-OLq8lmqoydumUhInvDck2ImD/awDqWBlMcFP4RxMBiI="; }; pythonRelaxDeps = true; From ba3b6a7fe81d4d41bf88228d7fc7dfe80630ae11 Mon Sep 17 00:00:00 2001 From: Brian McGillion Date: Mon, 10 Feb 2025 21:56:18 +0400 Subject: [PATCH 1702/2168] snort: rename to snort2 allow the introduction of the new version of snort (snort3+) which is largely a rewrite of snort. leaving the origional version of snort here as version 2 incase there are non-backward compatible deployments. snort2 is largely unmaintained upstream. Signed-off-by: Brian McGillion --- pkgs/by-name/sn/{snort => snort2}/package.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) rename pkgs/by-name/sn/{snort => snort2}/package.nix (79%) diff --git a/pkgs/by-name/sn/snort/package.nix b/pkgs/by-name/sn/snort2/package.nix similarity index 79% rename from pkgs/by-name/sn/snort/package.nix rename to pkgs/by-name/sn/snort2/package.nix index 5fd3607b5d83..cb1e8185e7e1 100644 --- a/pkgs/by-name/sn/snort/package.nix +++ b/pkgs/by-name/sn/snort2/package.nix @@ -16,13 +16,15 @@ libtirpc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "2.9.20"; - pname = "snort"; + pname = "snort2"; - src = fetchurl { - name = "${pname}-${version}.tar.gz"; - url = "https://snort.org/downloads/archive/snort/${pname}-${version}.tar.gz"; + # TODO: remove this package after 25.05 release + # https://github.com/NixOS/nixpkgs/pull/381363#issuecomment-2653483597 + src = fetchurl rec { + name = "snort-${finalAttrs.version}.tar.gz"; + url = "https://snort.org/downloads/snort/${name}"; sha256 = "sha256-KUAOE/U7GDHguLEOwSJKHLqm3BUzpTIqIN2Au4S0mBw="; }; @@ -65,4 +67,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; platforms = with lib.platforms; linux; }; -} +}) From c1bdbaa9c40b1c90194148ea858e7e1258a95c05 Mon Sep 17 00:00:00 2001 From: Brian McGillion Date: Wed, 12 Feb 2025 09:24:19 +0400 Subject: [PATCH 1703/2168] snort: init at 3.6.3.0 Snort 3 aka snort++ is the next generation Snort IPS (Intrusion Prevention System). snort3 is actively maintained and developed unlike the snort2 baseline so this with replace the old snort2 as the default version. snort2 is not yet removed from the pkgs to allow folks to utilize that if required. In addition to the primary binary `snort` there is `snort2lua` a tool to convert Snort 2.X conf and rules to the new form. Signed-off-by: Brian McGillion --- ...cmake-fix-pkg-config-path-for-libdir.patch | 47 +++++++++++++ pkgs/by-name/sn/snort/package.nix | 66 +++++++++++++++++++ 2 files changed, 113 insertions(+) create mode 100644 pkgs/by-name/sn/snort/0001-cmake-fix-pkg-config-path-for-libdir.patch create mode 100644 pkgs/by-name/sn/snort/package.nix diff --git a/pkgs/by-name/sn/snort/0001-cmake-fix-pkg-config-path-for-libdir.patch b/pkgs/by-name/sn/snort/0001-cmake-fix-pkg-config-path-for-libdir.patch new file mode 100644 index 000000000000..39cd1083239f --- /dev/null +++ b/pkgs/by-name/sn/snort/0001-cmake-fix-pkg-config-path-for-libdir.patch @@ -0,0 +1,47 @@ +From a4dd3bf78fc8d4c22b40ddb4e91f525012703a5a Mon Sep 17 00:00:00 2001 +From: Brian McGillion +Date: Mon, 10 Feb 2025 23:31:47 +0400 +Subject: [PATCH] cmake: fix pkg-config path for libdir + +on systems that prefer absolute paths there is a mixing and matching of +the relative and absolute paths that can result in the below creation of +libdir having the prefix and the full path appended to it. + +** added to highlight + +``prefix=/nix/store/3npvhj5wfwhc0q42qwiinj64bzfb1vvz-snort-3.6.3.0 +exec_prefix=${prefix} +bindir=${exec_prefix}/bin +**libdir=${prefix}//nix/store/3npvhj5wfwhc0q42qwiinj64bzfb1vvz-snort-3.6.3.0/lib** +includedir=${prefix}/include +datarootdir=${prefix}/share +datadir=${datarootdir} +mandir=${datarootdir}/man +infodir=${datarootdir}/info +`` + +In order to preserve backwards compatibility we will use the cmake +fullpath option ${CMAKE_INSTALL_FULL_LIBDIR} in place of +${prefix}/${CMAKE_INSTALL_LIBDIR} which will support both contexts. + +Signed-off-by: Brian McGillion +--- + cmake/create_pkg_config.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/create_pkg_config.cmake b/cmake/create_pkg_config.cmake +index 300350cbd..4ce8b16e6 100644 +--- a/cmake/create_pkg_config.cmake ++++ b/cmake/create_pkg_config.cmake +@@ -5,7 +5,7 @@ + set(prefix "${CMAKE_INSTALL_PREFIX}") + set(exec_prefix "\${prefix}") + set(bindir "\${exec_prefix}/bin") +-set(libdir "\${prefix}/${CMAKE_INSTALL_LIBDIR}") ++set(libdir "\${CMAKE_INSTALL_FULL_LIBDIR}") + set(includedir "\${prefix}/include") + set(datarootdir "\${prefix}/share") + set(datadir "\${datarootdir}") +-- +2.47.2 + diff --git a/pkgs/by-name/sn/snort/package.nix b/pkgs/by-name/sn/snort/package.nix new file mode 100644 index 000000000000..0fd10533ad91 --- /dev/null +++ b/pkgs/by-name/sn/snort/package.nix @@ -0,0 +1,66 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + libdaq, + libdnet, + flex, + hwloc, + luajit, + openssl, + libpcap, + pcre2, + pkg-config, + zlib, + xz, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "snort"; + version = "3.6.3.0"; + + src = fetchFromGitHub { + owner = "snort3"; + repo = "snort3"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-loMmmpoaEncW31FUIE9Zf9w635Prvke6vCY+mIt6oGI="; + }; + + nativeBuildInputs = [ + libdaq + pkg-config + cmake + ]; + + buildInputs = [ + libdaq + libpcap + stdenv.cc.cc # libstdc++ + libdnet + flex + hwloc + luajit + openssl + libpcap + pcre2 + zlib + xz + ]; + + # Patch that is tracking upstream PR https://github.com/snort3/snort3/pull/399 + patches = [ ./0001-cmake-fix-pkg-config-path-for-libdir.patch ]; + + enableParallelBuilding = true; + + meta = { + description = "Network intrusion prevention and detection system (IDS/IPS)"; + homepage = "https://www.snort.org"; + maintainers = with lib.maintainers; [ + aycanirican + brianmcgillion + ]; + license = lib.licenses.gpl2; + platforms = with lib.platforms; linux; + }; +}) From f322b888ccdebc122fbd2dd6d81f04941559e66e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 11:05:04 +0000 Subject: [PATCH 1704/2168] python312Packages.msldap: 0.5.12 -> 0.5.13 --- pkgs/development/python-modules/msldap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msldap/default.nix b/pkgs/development/python-modules/msldap/default.nix index 7bfe74af8ab9..5a4e99891336 100644 --- a/pkgs/development/python-modules/msldap/default.nix +++ b/pkgs/development/python-modules/msldap/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "msldap"; - version = "0.5.12"; + version = "0.5.13"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-RKKj0oUPkl5QtrgtRRXHTO6lSLfB/E09DT9t9loMxUA="; + hash = "sha256-iNWFnq+CSc1mvukFewr3jE0tbqmVTHHuXeVcwbsCkdI="; }; build-system = [ setuptools ]; From af6831814d528fe0d1477eca76006c2183ac8f0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Thu, 13 Feb 2025 12:09:17 +0100 Subject: [PATCH 1705/2168] sympa: Add missing UnicodeUTF8 dependency --- pkgs/by-name/sy/sympa/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/sy/sympa/package.nix b/pkgs/by-name/sy/sympa/package.nix index bae91b64c82b..f7fdfe270c7c 100644 --- a/pkgs/by-name/sy/sympa/package.nix +++ b/pkgs/by-name/sy/sympa/package.nix @@ -47,6 +47,7 @@ let TemplateToolkit URI UnicodeLineBreak + UnicodeUTF8 XMLLibXML ### Features From 92812316ff477d526ceda74ec7748f1673964671 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 11:10:48 +0000 Subject: [PATCH 1706/2168] python312Packages.diff-cover: 9.2.1 -> 9.2.2 --- pkgs/development/python-modules/diff-cover/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/diff-cover/default.nix b/pkgs/development/python-modules/diff-cover/default.nix index c1e0f4f64b85..bc1206611558 100644 --- a/pkgs/development/python-modules/diff-cover/default.nix +++ b/pkgs/development/python-modules/diff-cover/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "diff-cover"; - version = "9.2.1"; + version = "9.2.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "diff_cover"; inherit version; - hash = "sha256-X6Wy1xzPXRbNIipxwsoGnZv1+j1lf2+sm02cIzeTI78="; + hash = "sha256-mhv/2Kn9GJifgXOYeCaBiFTf+2Wexvuv5mnzBNHk/Vc="; }; build-system = [ poetry-core ]; From 02cc8ed1934d5f48c989d59dcaad282e50481662 Mon Sep 17 00:00:00 2001 From: eljamm Date: Thu, 13 Feb 2025 12:27:06 +0100 Subject: [PATCH 1707/2168] linux_xanmod, linux_xanmod_latest: 2025-02-09 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index e017735533bb..ec447e53058d 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -14,12 +14,12 @@ let # kernel config in the xanmod version commit variants = { lts = { - version = "6.12.12"; - hash = "sha256-k+nRkmqZXqHTYVT4r+Lt7SG9uLDsefM3ivV5Ps6VL8c="; + version = "6.12.13"; + hash = "sha256-1AlkY+7lkOnjvA+h3eP3RHPrV1upydDHhZVPY5ty58A="; }; main = { - version = "6.12.12"; - hash = "sha256-k+nRkmqZXqHTYVT4r+Lt7SG9uLDsefM3ivV5Ps6VL8c="; + version = "6.12.13"; + hash = "sha256-1AlkY+7lkOnjvA+h3eP3RHPrV1upydDHhZVPY5ty58A="; }; }; From 2035d8d39cfde044a782c7e2fb3f8da15c9057d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 11:31:14 +0000 Subject: [PATCH 1708/2168] python312Packages.govee-local-api: 2.0.0 -> 2.0.1 --- pkgs/development/python-modules/govee-local-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/govee-local-api/default.nix b/pkgs/development/python-modules/govee-local-api/default.nix index 29b0f9d4e7a6..7f93c111bd60 100644 --- a/pkgs/development/python-modules/govee-local-api/default.nix +++ b/pkgs/development/python-modules/govee-local-api/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "govee-local-api"; - version = "2.0.0"; + version = "2.0.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Galorhallen"; repo = "govee-local-api"; tag = "v${version}"; - hash = "sha256-1n5HPFI/E/I4eepnpQg8hhIksr48igVy56gQ0UiMYHU="; + hash = "sha256-Y5818sePEg6t5EQgmG97MCXXECvJniCpNYHGN8BLXS8="; }; postPatch = '' From 0410a403a7ae0eaa4381f526ed59b1aa03ed3ee6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 11:36:22 +0000 Subject: [PATCH 1709/2168] python312Packages.plantuml-markdown: 3.10.4 -> 3.11.1 --- .../python-modules/plantuml-markdown/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/plantuml-markdown/default.nix b/pkgs/development/python-modules/plantuml-markdown/default.nix index 6bfbdb8665fe..dd51e56c7d0e 100644 --- a/pkgs/development/python-modules/plantuml-markdown/default.nix +++ b/pkgs/development/python-modules/plantuml-markdown/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "plantuml-markdown"; - version = "3.10.4"; + version = "3.11.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "mikitex70"; repo = pname; tag = version; - hash = "sha256-5K8NSxMCdAsOtV0egY8gMbHnHifvYNRHzafR0LAcm+Q="; + hash = "sha256-DgHWqwPsZ5q1XqrfaAiUslKnJdHX4Pzw9lygF3iaxz4="; }; propagatedBuildInputs = [ @@ -59,7 +59,7 @@ buildPythonPackage rec { diagram which will be converted into an image and inserted in the document. ''; homepage = "https://github.com/mikitex70/plantuml-markdown"; - changelog = "https://github.com/mikitex70/plantuml-markdown/releases/tag/${version}"; + changelog = "https://github.com/mikitex70/plantuml-markdown/releases/tag/${src.tag}"; license = licenses.bsd2; maintainers = with maintainers; [ nikstur ]; }; From d1ec5a1c203d64efa42d4448ba193bb8d3a65436 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 12:05:09 +0000 Subject: [PATCH 1710/2168] python312Packages.pywikibot: 9.6.1 -> 9.6.2 --- pkgs/development/python-modules/pywikibot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pywikibot/default.nix b/pkgs/development/python-modules/pywikibot/default.nix index c55ad44ff921..a16fd50f0972 100644 --- a/pkgs/development/python-modules/pywikibot/default.nix +++ b/pkgs/development/python-modules/pywikibot/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pywikibot"; - version = "9.6.1"; + version = "9.6.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-736LEUwW1LofS1105TxVWHMGFaEpQGwa+WGIk2OQxmA="; + hash = "sha256-iPmQxOJmc9Ms8UhK43HrYgyyvu0g4/hO8bmO39AXOTo="; }; propagatedBuildInputs = [ From 8eee05e8e67fd9b7293e546efc91d9d71f5ad29e Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Thu, 13 Feb 2025 07:03:55 -0500 Subject: [PATCH 1711/2168] crystal: remove unused patch from < 1.2.0 --- pkgs/development/compilers/crystal/default.nix | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 52557ca4a64a..2386f0eabe2a 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -2,7 +2,6 @@ , callPackage , fetchFromGitHub , fetchurl -, fetchpatch , lib , substituteAll # Dependencies @@ -99,16 +98,7 @@ let src = ./tzdata.patch; inherit tzdata; }) - ] - ++ lib.optionals (lib.versionOlder version "1.2.0") [ - # add support for DWARF5 debuginfo, fixes builds on recent compilers - # the PR is 8 commits from 2019, so just fetch the whole thing - # and hope it doesn't change - (fetchpatch { - url = "https://github.com/crystal-lang/crystal/pull/11399.patch"; - sha256 = "sha256-CjNpkQQ2UREADmlyLUt7zbhjXf0rTjFhNbFYLwJKkc8="; - }) - ]; + ]; outputs = [ "out" "lib" "bin" ]; From 95aeb07b87d2261ac4d0ebf549adc5ab6b069c04 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 12:06:59 +0000 Subject: [PATCH 1712/2168] python312Packages.blis: 1.2.0 -> 1.2.1 --- pkgs/development/python-modules/blis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix index 076b2a65ab78..91a41aaf54d8 100644 --- a/pkgs/development/python-modules/blis/default.nix +++ b/pkgs/development/python-modules/blis/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "blis"; - version = "1.2.0"; + version = "1.2.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "explosion"; repo = "cython-blis"; tag = "release-v${version}"; - hash = "sha256-TyyB0kPGX517fe0rI4T+VkSnFvTRCFR06BLwo67X9zQ="; + hash = "sha256-krUqAEPxJXdlolSbV5R0ZqrWaFuXh7IxSeFTsCr6iss="; }; preCheck = '' From 893c191973837db2bc02a924c3907eae29fe2e8d Mon Sep 17 00:00:00 2001 From: Pratham Patel Date: Thu, 13 Feb 2025 17:40:54 +0530 Subject: [PATCH 1713/2168] pykickstart: init at 3.62 --- pkgs/by-name/py/pykickstart/package.nix | 46 +++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 pkgs/by-name/py/pykickstart/package.nix diff --git a/pkgs/by-name/py/pykickstart/package.nix b/pkgs/by-name/py/pykickstart/package.nix new file mode 100644 index 000000000000..884cf64ce659 --- /dev/null +++ b/pkgs/by-name/py/pykickstart/package.nix @@ -0,0 +1,46 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + gettext, + gitMinimal, +}: + +python3Packages.buildPythonApplication rec { + pname = "pykickstart"; + version = "3.62"; + + src = fetchFromGitHub { + owner = "pykickstart"; + repo = "pykickstart"; + tag = "r${version}"; + hash = "sha256-QoMIr1nDGOMzAJ7pO2SdsZIcrSPFt/YEXJz201cXZQo="; + }; + + build-system = with python3Packages; [ + setuptools + ]; + + dependencies = with python3Packages; [ + requests + ]; + + nativeBuildInputs = [ + gettext + gitMinimal + ]; + + # All checks are for RedHat's weird translation library. + # Can't package it and not really necessary so disable them. + doCheck = false; + + meta = { + description = "Python package to interact with Kickstart files commonly found in the RPM world"; + homepage = "https://github.com/pykickstart/pykickstart"; + changelog = "https://github.com/pykickstart/pykickstart/releases/tag/r${version}"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ + thefossguy + ]; + }; +} From ebb34d9b893944b08dea6ca52e3c7c904d51cada Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 12:12:58 +0000 Subject: [PATCH 1714/2168] python312Packages.iterative-telemetry: 0.0.9 -> 0.0.10 --- .../python-modules/iterative-telemetry/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/iterative-telemetry/default.nix b/pkgs/development/python-modules/iterative-telemetry/default.nix index 18f1a865dbf3..64ee06e02927 100644 --- a/pkgs/development/python-modules/iterative-telemetry/default.nix +++ b/pkgs/development/python-modules/iterative-telemetry/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "iterative-telemtry"; - version = "0.0.9"; + version = "0.0.10"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "telemetry-python"; tag = version; - hash = "sha256-bcGniytjlN3JFPeMQYjyIP8Ruty9/dnzp9neclbdsfU="; + hash = "sha256-+l9JH9MbN+Pai3MIcKZJObzoPGhQipfMd7T8v4SoSws="; }; build-system = [ setuptools-scm ]; @@ -45,7 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Common library to send usage telemetry"; homepage = "https://github.com/iterative/iterative-telemetry"; - changelog = "https://github.com/iterative/iterative-telemetry/releases/tag/${version}"; + changelog = "https://github.com/iterative/iterative-telemetry/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ melling ]; }; From a9638c1ac8eab5f808fb6726e7450ad13a185372 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 13 Feb 2025 13:28:03 +0100 Subject: [PATCH 1715/2168] python312Packages.vector: skip tests crashing on aarch64-linux --- .../python-modules/vector/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/vector/default.nix b/pkgs/development/python-modules/vector/default.nix index 41b3156e3186..715a13dbdf06 100644 --- a/pkgs/development/python-modules/vector/default.nix +++ b/pkgs/development/python-modules/vector/default.nix @@ -58,10 +58,18 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - disabledTests = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ - # AssertionError: assert 2.1073424255447017e-08 == 0.0 - "test_issue_463" - ]; + disabledTests = + lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ + # Fatal Python error: Segmentation fault + # numba/typed/typeddict.py", line 185 in __setitem__ + "test_method_transform2D" + "test_method_transform3D" + "test_method_transform4D" + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ + # AssertionError: assert 2.1073424255447017e-08 == 0.0 + "test_issue_463" + ]; meta = { description = "Library for 2D, 3D, and Lorentz vectors, especially arrays of vectors, to solve common physics problems in a NumPy-like way"; From 1876a43bbfd58fdcb26e786031fec9b573389095 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 13 Feb 2025 13:35:54 +0100 Subject: [PATCH 1716/2168] python312Packages.fastjet: mark as broken --- pkgs/development/python-modules/fastjet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastjet/default.nix b/pkgs/development/python-modules/fastjet/default.nix index d3e62027ae77..6b57b4a8f031 100644 --- a/pkgs/development/python-modules/fastjet/default.nix +++ b/pkgs/development/python-modules/fastjet/default.nix @@ -1,8 +1,6 @@ { lib, - stdenv, fetchPypi, - fetchurl, buildPythonPackage, pytestCheckHook, pkgs, @@ -88,5 +86,7 @@ buildPythonPackage rec { changelog = "https://github.com/scikit-hep/fastjet/releases/tag/v${version}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ veprbl ]; + # ImportError: fastjetcontribfragile.so.0: cannot open shared object file: No such file or directory + broken = true; }; } From 1e84f83d2eac906b0972556896a81e1e7a52c65b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 12:45:55 +0000 Subject: [PATCH 1717/2168] cdncheck: 1.1.0 -> 1.1.1 --- pkgs/by-name/cd/cdncheck/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cd/cdncheck/package.nix b/pkgs/by-name/cd/cdncheck/package.nix index 146df1742574..54490c56a6ee 100644 --- a/pkgs/by-name/cd/cdncheck/package.nix +++ b/pkgs/by-name/cd/cdncheck/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "cdncheck"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "cdncheck"; tag = "v${version}"; - hash = "sha256-1TYUSWbcWnRsOM8ctY1g9CmFSAXiK9NmN5ZDaKeJIgw="; + hash = "sha256-vz/PAu/YMrlUQ6oXERNm1bl3fZ0YDrvYCv64Qe0+zUo="; }; - vendorHash = "sha256-0fiZJeBvxUib8a9CeTmYottOp+15YEdTVYhdzKSSCrk="; + vendorHash = "sha256-/1REkZ5+sz/H4T4lXhloz7fu5cLv1GoaD3dlttN+Qd4="; subPackages = [ "cmd/cdncheck/" ]; From 70d23021065a53e0a6611e3922522f0e15277b8e Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Thu, 13 Feb 2025 07:46:44 -0500 Subject: [PATCH 1718/2168] crystal: remove unused ffi flag from < 1.6.1 --- pkgs/development/compilers/crystal/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 2386f0eabe2a..812d36a60181 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -178,9 +178,6 @@ let FLAGS = [ "--single-module" # needed for deterministic builds - ] ++ lib.optionals (lib.versionAtLeast version "1.3.0" && lib.versionOlder version "1.6.1") [ - # ffi is only used by the interpreter and its spec are broken on < 1.6.1 - "-Dwithout_ffi" ]; # This makes sure we don't keep depending on the previous version of From 3f804eb5eb234c900d3a5dc8fc455895dc0c3a7e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 13 Feb 2025 13:50:50 +0100 Subject: [PATCH 1719/2168] vcsi: cleanup --- pkgs/by-name/vc/vcsi/package.nix | 46 +++++++++++++++++++------------- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/vc/vcsi/package.nix b/pkgs/by-name/vc/vcsi/package.nix index 823a932f08f7..3d679991385b 100644 --- a/pkgs/by-name/vc/vcsi/package.nix +++ b/pkgs/by-name/vc/vcsi/package.nix @@ -3,33 +3,23 @@ python3Packages, fetchFromGitHub, ffmpeg, + versionCheckHook, }: python3Packages.buildPythonApplication rec { pname = "vcsi"; version = "7.0.16"; - - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "amietn"; - repo = pname; - rev = "v${version}"; + repo = "vcsi"; + tag = "v${version}"; hash = "sha256-I0o6GX/TNMfU+rQtSqReblRplXPynPF6m2zg0YokmtI="; }; - nativeBuildInputs = [ python3Packages.poetry-core ]; - - nativeCheckInputs = [ - python3Packages.pytestCheckHook - ]; - - propagatedBuildInputs = with python3Packages; [ - numpy - pillow - jinja2 - texttable - parsedatetime + build-system = with python3Packages; [ + poetry-core ]; pythonRelaxDeps = [ @@ -37,15 +27,33 @@ python3Packages.buildPythonApplication rec { "pillow" ]; + dependencies = with python3Packages; [ + jinja2 + numpy + parsedatetime + pillow + texttable + ]; + pythonImportsCheck = [ "vcsi" ]; makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}" ]; - meta = with lib; { + nativeCheckInputs = + [ + versionCheckHook + ] + ++ (with python3Packages; [ + pytestCheckHook + ]); + versionCheckProgramArg = [ "--version" ]; + + meta = { description = "Create video contact sheets"; homepage = "https://github.com/amietn/vcsi"; - license = licenses.mit; - maintainers = with maintainers; [ + changelog = "https://github.com/amietn/vcsi/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dandellion zopieux ]; From a5456d1c7f49df69210fc596c6d0a54cf6326547 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Thu, 13 Feb 2025 07:51:59 -0500 Subject: [PATCH 1720/2168] crystal: remove unused binaryUrl conditional from < 1.2.0 --- pkgs/development/compilers/crystal/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 812d36a60181..b00b441b4b70 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -49,8 +49,6 @@ let binaryUrl = version: rel: if arch == archs.aarch64-linux then "https://dev.alpinelinux.org/archive/crystal/crystal-${version}-aarch64-alpine-linux-musl.tar.gz" - else if arch == archs.x86_64-darwin && lib.versionOlder version "1.2.0" then - "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-${toString rel}-darwin-x86_64.tar.gz" else "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-${toString rel}-${arch}.tar.gz"; From be52d291c44c769e613463f60a7b2eed08eec37a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 12:53:41 +0000 Subject: [PATCH 1721/2168] python312Packages.metaflow: 2.13.9 -> 2.14.0 --- pkgs/development/python-modules/metaflow/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/metaflow/default.nix b/pkgs/development/python-modules/metaflow/default.nix index 6e356c81b47d..259c02a36d52 100644 --- a/pkgs/development/python-modules/metaflow/default.nix +++ b/pkgs/development/python-modules/metaflow/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "metaflow"; - version = "2.13.9"; + version = "2.14.0"; pyproject = true; src = fetchFromGitHub { owner = "Netflix"; repo = "metaflow"; tag = version; - hash = "sha256-f/cWZl59i1PRqNqLV5LtcZoDKdovdCKoQJNxzXKczgs="; + hash = "sha256-EyPA8GT1jskCWtsaBvwL8MW5B4mWw2tfXIKgvePeQ+E="; }; build-system = [ @@ -48,7 +48,7 @@ buildPythonPackage rec { meta = { description = "Open Source AI/ML Platform"; homepage = "https://metaflow.org/"; - changelog = "https://github.com/Netflix/metaflow/releases/tag/${version}"; + changelog = "https://github.com/Netflix/metaflow/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ kr7x ]; }; From 14dd0e0e6b0ebb34046f21998a7bbbf29d33198f Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Thu, 13 Feb 2025 07:54:05 -0500 Subject: [PATCH 1722/2168] crystal: remove unused substituteInPlace from < 1.7.0 --- pkgs/development/compilers/crystal/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index b00b441b4b70..a0aa47a88151 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -134,10 +134,6 @@ let substituteInPlace spec/std/socket/udp_socket_spec.cr \ --replace 'it "joins and transmits to multicast groups"' 'pending "joins and transmits to multicast groups"' - '' + lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionAtLeast version "1.3.0" && lib.versionOlder version "1.7.0") '' - # See https://github.com/NixOS/nixpkgs/pull/195606#issuecomment-1356491277 - substituteInPlace spec/compiler/loader/unix_spec.cr \ - --replace 'it "parses file paths"' 'pending "parses file paths"' '' + lib.optionalString (stdenv.cc.isClang && (stdenv.cc.libcxx != null)) '' # Darwin links against libc++ not libstdc++. Newer versions of clang (12+) require # libc++abi to be linked explicitly (see https://github.com/NixOS/nixpkgs/issues/166205). From 4cd21f169a489a514c98ebab7a7d1bdb413cc7ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 12:58:00 +0000 Subject: [PATCH 1723/2168] cglm: 0.9.4 -> 0.9.5 --- pkgs/by-name/cg/cglm/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cg/cglm/package.nix b/pkgs/by-name/cg/cglm/package.nix index 69d05316785a..06b2175ac2ca 100644 --- a/pkgs/by-name/cg/cglm/package.nix +++ b/pkgs/by-name/cg/cglm/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "cglm"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "recp"; repo = "cglm"; rev = "v${version}"; - sha256 = "sha256-VQgnc3DSZoY1ounc9fj3Mju52noI0JZ7ck8FqWpEgY8="; + sha256 = "sha256-yc8UFKl0q+QZ9helTzrxfZdk7yeRSb3bUVyIL+uRWdQ="; }; nativeBuildInputs = [ cmake ]; From 64b711b4a3148eab8c62c7ddb49f58c50e50b4d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 13:07:32 +0000 Subject: [PATCH 1724/2168] ttdl: 4.8.0 -> 4.9.0 --- pkgs/by-name/tt/ttdl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tt/ttdl/package.nix b/pkgs/by-name/tt/ttdl/package.nix index 0ef0dc2920d7..3ee92e70b69b 100644 --- a/pkgs/by-name/tt/ttdl/package.nix +++ b/pkgs/by-name/tt/ttdl/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "ttdl"; - version = "4.8.0"; + version = "4.9.0"; src = fetchFromGitHub { owner = "VladimirMarkelov"; repo = "ttdl"; rev = "v${version}"; - sha256 = "sha256-RHmKCayouxtlbp/dpZlC9d9OuUXHDLVWucnuIP3rEhA="; + sha256 = "sha256-qFOZj214iw/d1wvWz8wwIFB2kaDSPH80blDkohQxSro="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Jrr9/H9c9/u5Vf5Ym/WGIKPH/wXyt25LjK3XWidUyIc="; + cargoHash = "sha256-gdFLT04pNedU30/Qw2OiXpdLL+6cC6ryUoeZLKu/myQ="; meta = with lib; { description = "CLI tool to manage todo lists in todo.txt format"; From 410516938046de0d7b7b4fb7a782ecf70d81c676 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 13:08:00 +0000 Subject: [PATCH 1725/2168] quill-log: 8.1.0 -> 8.1.1 --- pkgs/by-name/qu/quill-log/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qu/quill-log/package.nix b/pkgs/by-name/qu/quill-log/package.nix index 65c7d5fa2c8f..07c62d568a3d 100644 --- a/pkgs/by-name/qu/quill-log/package.nix +++ b/pkgs/by-name/qu/quill-log/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "quill-log"; - version = "8.1.0"; + version = "8.1.1"; src = fetchFromGitHub { owner = "odygrd"; repo = "quill"; rev = "v${version}"; - hash = "sha256-bzu+IKURT/+WPfmsUlzLrXqY2l62CLolqwWg2BwGnO0="; + hash = "sha256-7+yJRhTdYyGiOrsWnzagTPtxH2Gqqd4VNw/2i2C6Mak="; }; nativeBuildInputs = [ cmake ]; From acd9639d88942b0d4b94d73135d5cd2f6ddb6666 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 13 Feb 2025 14:15:38 +0100 Subject: [PATCH 1726/2168] ldid: move to pkgs/by-name --- .../tools/ldid/default.nix => by-name/ld/ldid/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{development/tools/ldid/default.nix => by-name/ld/ldid/package.nix} (100%) diff --git a/pkgs/development/tools/ldid/default.nix b/pkgs/by-name/ld/ldid/package.nix similarity index 100% rename from pkgs/development/tools/ldid/default.nix rename to pkgs/by-name/ld/ldid/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6cdb7c778357..1afbcacb55f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18290,7 +18290,7 @@ with pkgs; wlroots = wlroots_0_17; }; - ldid = callPackage ../development/tools/ldid { + ldid = callPackage ../by-name/ld/ldid/package.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; From d0049daf4b5240c9e232612db4bd2f9d7dcaec5e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 13:17:41 +0000 Subject: [PATCH 1727/2168] gosec: 2.22.0 -> 2.22.1 --- pkgs/by-name/go/gosec/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/gosec/package.nix b/pkgs/by-name/go/gosec/package.nix index 35d505bce1e1..3fb760cbc20a 100644 --- a/pkgs/by-name/go/gosec/package.nix +++ b/pkgs/by-name/go/gosec/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "gosec"; - version = "2.22.0"; + version = "2.22.1"; src = fetchFromGitHub { owner = "securego"; repo = pname; rev = "v${version}"; - hash = "sha256-LI4tb4rMzdEFWr8ZnYB3K9YE5GrvXB9XTkG1ZC/JqZs="; + hash = "sha256-iYva3ri2X6A6CAEpmt8xrqL7L9JAZlGcVPeMkWG47Ss="; }; - vendorHash = "sha256-Hx/9jO40viu9vxXwGC2292C5GRfIyM2ihjrRNVDQLYc="; + vendorHash = "sha256-a9cgl8oOkGZl4fi/uP+yXgoByNm3+wRQ3n5wSAJz0JQ="; subPackages = [ "cmd/gosec" From 75c99c03db5f15676068bf60e7e62835b95b48d7 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 13 Feb 2025 14:19:51 +0100 Subject: [PATCH 1728/2168] ldid: use new apple sdk pattern --- pkgs/by-name/ld/ldid/package.nix | 33 ++++++++++---------------------- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 10 insertions(+), 27 deletions(-) diff --git a/pkgs/by-name/ld/ldid/package.nix b/pkgs/by-name/ld/ldid/package.nix index c0c2645ab094..43b34a567543 100644 --- a/pkgs/by-name/ld/ldid/package.nix +++ b/pkgs/by-name/ld/ldid/package.nix @@ -5,8 +5,6 @@ libplist, libxml2, openssl, - CoreFoundation, - Security, }: stdenv.mkDerivation rec { @@ -21,33 +19,22 @@ stdenv.mkDerivation rec { strictDeps = true; - buildInputs = - [ - libplist - libxml2 - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreFoundation - Security - ]; + buildInputs = [ + libplist + libxml2 + openssl + ]; - NIX_LDFLAGS = - [ - "-lcrypto" - "-lplist-2.0" - "-lxml2" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - "-framework CoreFoundation" - "-framework Security" - ]; + env.NIX_LDFLAGS = toString ([ + "-lcrypto" + "-lplist-2.0" + ]); buildPhase = '' runHook preBuild cc -c -o lookup2.o lookup2.c -I. - c++ -std=c++11 -o ldid lookup2.o ldid.cpp -I. ${toString NIX_LDFLAGS} + c++ -std=c++11 -o ldid lookup2.o ldid.cpp -I. runHook postBuild ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1afbcacb55f0..925c68f77eff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18290,10 +18290,6 @@ with pkgs; wlroots = wlroots_0_17; }; - ldid = callPackage ../by-name/ld/ldid/package.nix { - inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; - }; - zrythm = callPackage ../applications/audio/zrythm { inherit (plasma5Packages) breeze-icons; }; From 5f99f2bdbbf78f8009eed64e551bc9f92a89e32b Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 13 Feb 2025 14:22:39 +0100 Subject: [PATCH 1729/2168] ldid: refactor --- pkgs/by-name/ld/ldid/package.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ld/ldid/package.nix b/pkgs/by-name/ld/ldid/package.nix index 43b34a567543..5dcd0622db0b 100644 --- a/pkgs/by-name/ld/ldid/package.nix +++ b/pkgs/by-name/ld/ldid/package.nix @@ -7,13 +7,13 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ldid"; version = "2.1.5"; src = fetchgit { url = "git://git.saurik.com/ldid.git"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-RM5pU3mrgyvwNfWKNvCT3UYVGKtVhD7ifgp8fq9xXiM="; }; @@ -48,11 +48,12 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Link Identity Editor"; homepage = "https://cydia.saurik.com/info/ldid/"; - maintainers = with maintainers; [ wegank ]; - platforms = platforms.unix; - license = licenses.agpl3Only; + license = lib.licenses.agpl3Only; + mainProgram = "ldid"; + maintainers = with lib.maintainers; [ wegank ]; + platforms = lib.platforms.unix; }; -} +}) From a0a6f30c9765dcb7e7761e13ba4649c2fcafc537 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 13:25:34 +0000 Subject: [PATCH 1730/2168] k6: 0.56.0 -> 0.57.0 --- pkgs/by-name/k6/k6/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/k6/k6/package.nix b/pkgs/by-name/k6/k6/package.nix index edd51aadb23e..14c95944d2c5 100644 --- a/pkgs/by-name/k6/k6/package.nix +++ b/pkgs/by-name/k6/k6/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "k6"; - version = "0.56.0"; + version = "0.57.0"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - hash = "sha256-QU/FJZqyodwUGxb3MjaQXIGWZSlrkxKe4bh6r/p7jrQ="; + hash = "sha256-wU/Kelv/5N86xHJT6E5dfdzBgSYiTYZJ8rkjLyU7RAo="; }; subPackages = [ "./" ]; From 3411a4ae3b2769f41d22ab45e88ff306c72b24a8 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 13 Feb 2025 13:09:31 +0100 Subject: [PATCH 1731/2168] =?UTF-8?q?ocamlPackages.sel:=200.5.0=20?= =?UTF-8?q?=E2=86=92=200.6.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/sel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/sel/default.nix b/pkgs/development/ocaml-modules/sel/default.nix index 89abcc5aef33..3a73375697a7 100644 --- a/pkgs/development/ocaml-modules/sel/default.nix +++ b/pkgs/development/ocaml-modules/sel/default.nix @@ -8,13 +8,13 @@ buildDunePackage rec { pname = "sel"; - version = "0.5.0"; + version = "0.6.0"; minimalOCamlVersion = "4.07"; src = fetchurl { url = "https://github.com/gares/sel/releases/download/v${version}/sel-${version}.tbz"; - hash = "sha256-n4Z+Pe9fkHLnRzwCryxYNe165Q2Vds9+CduRbRJjqI0="; + hash = "sha256-AUnO7PZ7fAuyFQnHzeb7buLbSpfZw1NSywaMurjAqDM="; }; buildInputs = [ From b36dc5bd6e16ba1f7559187f54c5b442c66d5d78 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 13:37:49 +0000 Subject: [PATCH 1732/2168] jay: 1.9.0 -> 1.9.1 --- pkgs/by-name/ja/jay/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ja/jay/package.nix b/pkgs/by-name/ja/jay/package.nix index c787cb9aa8fa..d66d4a0a34f2 100644 --- a/pkgs/by-name/ja/jay/package.nix +++ b/pkgs/by-name/ja/jay/package.nix @@ -15,17 +15,17 @@ rustPlatform.buildRustPackage rec { pname = "jay"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "mahkoh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RGBFIYVeunMhZbpRExKYh7VlhodOsCN7WzN/7UPEJdc="; + sha256 = "sha256-dUp3QYno2rB3wuJmSvBpCqowSpfMQIJqUYc0lDVqVPA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-vW+87tqc9bJ/xDOqcgz3PrqEkf7daZp3nb0hwXDxULI="; + cargoHash = "sha256-ovQxpUrRZAP1lHlsObfbIsgIjgMp+BLf6Ul+mzDVN5o="; SHADERC_LIB_DIR = "${lib.getLib shaderc}/lib"; From 44044c06fe3b6696e37afd13cf23a9e98278d9a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 13:39:50 +0000 Subject: [PATCH 1733/2168] kubernetes: 1.32.1 -> 1.32.2 --- pkgs/applications/networking/cluster/kubernetes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 87abb370d07d..a2fc303698fd 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -21,13 +21,13 @@ buildGoModule rec { pname = "kubernetes"; - version = "1.32.1"; + version = "1.32.2"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - hash = "sha256-6KZlbwSMmFvh6XKJR1W/qa3xU0O3fuQaMW/P5An/AtQ="; + hash = "sha256-pie36Y3zKGKvnCDHtjNHYox1b2xhy6w7MShkAfkDVrs="; }; vendorHash = null; From 15b955f4289065441eddf7e1f70c4f6cab17bf32 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 13:41:55 +0000 Subject: [PATCH 1734/2168] python312Packages.exiv2: 0.17.1 -> 0.17.2 --- pkgs/development/python-modules/exiv2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/exiv2/default.nix b/pkgs/development/python-modules/exiv2/default.nix index 0192bd465f15..0ca80a01bb97 100644 --- a/pkgs/development/python-modules/exiv2/default.nix +++ b/pkgs/development/python-modules/exiv2/default.nix @@ -12,14 +12,14 @@ }: buildPythonPackage rec { pname = "exiv2"; - version = "0.17.1"; + version = "0.17.2"; pyproject = true; src = fetchFromGitHub { owner = "jim-easterbrook"; repo = "python-exiv2"; tag = version; - hash = "sha256-AXBhCe7AvhQkGZaLMTGExwgUYQGdRkk14Rtceugexag="; + hash = "sha256-OWy/LPfeji5/lJ5itLcAUE6Q1hR1EHGwkABvLQk+LYM="; }; # FAIL: test_localisation (test_types.TestTypesModule.test_localisation) From 6c64d6daf932cabf8e63619e7590a4770e3e446a Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Thu, 13 Feb 2025 12:55:41 +0000 Subject: [PATCH 1735/2168] nixos/autobrr: use systemd credentials Make use of systemd's LoadCredentials feature to allow for the secret file to be better managed without having to be world-readable, since due to DynamicUser it was not possible to assign it to one specific user. --- nixos/modules/services/misc/autobrr.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/autobrr.nix b/nixos/modules/services/misc/autobrr.nix index 097bcc10096e..4694b8e80ed3 100644 --- a/nixos/modules/services/misc/autobrr.nix +++ b/nixos/modules/services/misc/autobrr.nix @@ -9,7 +9,7 @@ let cfg = config.services.autobrr; configFormat = pkgs.formats.toml { }; configTemplate = configFormat.generate "autobrr.toml" cfg.settings; - templaterCmd = "${lib.getExe pkgs.dasel} put -f '${configTemplate}' -v $(cat ${cfg.secretFile}) -o %S/autobrr/config.toml 'sessionSecret'"; + templaterCmd = ''${lib.getExe pkgs.dasel} put -f '${configTemplate}' -v "$(${config.systemd.package}/bin/systemd-creds cat sessionSecret)" -o %S/autobrr/config.toml "sessionSecret"''; in { options = { @@ -73,6 +73,7 @@ in serviceConfig = { Type = "simple"; DynamicUser = true; + LoadCredential = "sessionSecret:${cfg.secretFile}"; StateDirectory = "autobrr"; ExecStartPre = "${lib.getExe pkgs.bash} -c '${templaterCmd}'"; ExecStart = "${lib.getExe pkgs.autobrr} --config %S/autobrr"; From ce9137b32dc6bfa747ea78fdb683f0a12571574a Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Thu, 13 Feb 2025 13:31:29 +0000 Subject: [PATCH 1736/2168] nixos/autobrr: make use of package option The package option was defined, but the generated systemd service was hardcoded to use pkgs.autobrr. --- nixos/modules/services/misc/autobrr.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/autobrr.nix b/nixos/modules/services/misc/autobrr.nix index 4694b8e80ed3..c898351c4316 100644 --- a/nixos/modules/services/misc/autobrr.nix +++ b/nixos/modules/services/misc/autobrr.nix @@ -76,7 +76,7 @@ in LoadCredential = "sessionSecret:${cfg.secretFile}"; StateDirectory = "autobrr"; ExecStartPre = "${lib.getExe pkgs.bash} -c '${templaterCmd}'"; - ExecStart = "${lib.getExe pkgs.autobrr} --config %S/autobrr"; + ExecStart = "${lib.getExe cfg.package} --config %S/autobrr"; Restart = "on-failure"; }; }; From 5f411a7f057ef7a12dcf2b54ca57279a5311a2aa Mon Sep 17 00:00:00 2001 From: Pratham Patel Date: Thu, 13 Feb 2025 19:14:53 +0530 Subject: [PATCH 1737/2168] libcosmicAppHook: init --- .../li/libcosmicAppHook/libcosmic-app-hook.sh | 96 +++++++++++++++++++ pkgs/by-name/li/libcosmicAppHook/package.nix | 85 ++++++++++++++++ 2 files changed, 181 insertions(+) create mode 100644 pkgs/by-name/li/libcosmicAppHook/libcosmic-app-hook.sh create mode 100644 pkgs/by-name/li/libcosmicAppHook/package.nix diff --git a/pkgs/by-name/li/libcosmicAppHook/libcosmic-app-hook.sh b/pkgs/by-name/li/libcosmicAppHook/libcosmic-app-hook.sh new file mode 100644 index 000000000000..e6a523191956 --- /dev/null +++ b/pkgs/by-name/li/libcosmicAppHook/libcosmic-app-hook.sh @@ -0,0 +1,96 @@ +# SPDX-License-Identifier: MIT +# SPDX-FileCopyrightText: Lily Foster +# Portions of this code are adapted from nixos-cosmic +# https://github.com/lilyinstarlight/nixos-cosmic + +# shellcheck shell=bash +libcosmicAppWrapperArgs=() + +libcosmicAppVergenHook() { + if [ -z "${VERGEN_GIT_COMMIT_DATE-}" ]; then + # shellcheck disable=SC2155 + export VERGEN_GIT_COMMIT_DATE="$(date --utc --date=@"$SOURCE_DATE_EPOCH" '+%Y-%m-%d')" + fi +} + +libcosmicAppLinkerArgsHook() { + # Force linking to certain libraries like libEGL, which are always dlopen()ed + local flags="CARGO_TARGET_@cargoLinkerVar@_RUSTFLAGS" + + export "$flags"="${!flags-} -C link-arg=-Wl,--push-state,--no-as-needed" + # shellcheck disable=SC2043 + for lib in @cargoLinkLibs@; do + export "$flags"="${!flags} -C link-arg=-l${lib}" + done + export "$flags"="${!flags} -C link-arg=-Wl,--pop-state" +} + +preConfigurePhases+=" libcosmicAppVergenHook libcosmicAppLinkerArgsHook" + +# Add shell hook for use in dev shells +if [ -n "${IN_NIX_SHELL-}" ] && [ -z "${shellHook-}" ]; then + shellHook="libcosmicAppLinkerArgsHook && export RUSTFLAGS=\$CARGO_TARGET_@cargoLinkerVar@_RUSTFLAGS CARGO_TARGET_@cargoLinkerVar@_RUSTFLAGS=" +fi + +libcosmicAppWrapperArgsHook() { + if [ -d "${prefix:?}/share" ]; then + libcosmicAppWrapperArgs+=(--suffix XDG_DATA_DIRS : "$prefix/share") + fi + + # add fallback schemas, icons, and settings paths + libcosmicAppWrapperArgs+=(--suffix XDG_DATA_DIRS : "@fallbackXdgDirs@") +} + +preFixupPhases+=" libcosmicAppWrapperArgsHook" + +wrapLibcosmicApp() { + local program="$1" + shift 1 + wrapProgram "$program" "${libcosmicAppWrapperArgs[@]}" "$@" +} + +# Note: $libcosmicAppWrapperArgs still gets defined even if ${dontWrapLibcosmicApp-} is set +libcosmicAppWrapHook() { + # guard against running multiple times (e.g. due to propagation) + [ -z "$libcosmicAppWrapHookHasRun" ] || return 0 + libcosmicAppWrapHookHasRun=1 + + if [[ -z "${dontWrapLibcosmicApp:-}" ]]; then + targetDirsThatExist=() + targetDirsRealPath=() + + # wrap binaries + targetDirs=("${prefix}/bin" "${prefix}/libexec") + for targetDir in "${targetDirs[@]}"; do + if [[ -d "${targetDir}" ]]; then + targetDirsThatExist+=("${targetDir}") + targetDirsRealPath+=("$(realpath "${targetDir}")/") + find "${targetDir}" -type f -executable -print0 | + while IFS= read -r -d '' file; do + echo "Wrapping program '${file}'" + wrapLibcosmicApp "${file}" + done + fi + done + + # wrap links to binaries that point outside targetDirs + # Note: links to binaries within targetDirs do not need + # to be wrapped as the binaries have already been wrapped + if [[ ${#targetDirsThatExist[@]} -ne 0 ]]; then + find "${targetDirsThatExist[@]}" -type l -xtype f -executable -print0 | + while IFS= read -r -d '' linkPath; do + linkPathReal=$(realpath "${linkPath}") + for targetPath in "${targetDirsRealPath[@]}"; do + if [[ "$linkPathReal" == "$targetPath"* ]]; then + echo "Not wrapping link: '$linkPath' (already wrapped)" + continue 2 + fi + done + echo "Wrapping link: '$linkPath'" + wrapLibcosmicApp "${linkPath}" + done + fi + fi +} + +fixupOutputHooks+=(libcosmicAppWrapHook) diff --git a/pkgs/by-name/li/libcosmicAppHook/package.nix b/pkgs/by-name/li/libcosmicAppHook/package.nix new file mode 100644 index 000000000000..d7e177c42cf3 --- /dev/null +++ b/pkgs/by-name/li/libcosmicAppHook/package.nix @@ -0,0 +1,85 @@ +# SPDX-License-Identifier: MIT +# SPDX-FileCopyrightText: Lily Foster +# Portions of this code are adapted from nixos-cosmic +# https://github.com/lilyinstarlight/nixos-cosmic + +{ + lib, + stdenv, + makeSetupHook, + makeBinaryWrapper, + pkg-config, + targetPackages, + libGL, + libxkbcommon, + xorg, + wayland, + vulkan-loader, + + includeSettings ? true, +}: + +makeSetupHook { + name = "libcosmic-app-hook"; + + propagatedBuildInputs = [ + makeBinaryWrapper + pkg-config + ]; + + # ensure deps for linking below are available + depsTargetTargetPropagated = + assert (lib.assertMsg (!targetPackages ? raw) "libcosmicAppHook must be in nativeBuildInputs"); + [ + libGL + libxkbcommon + xorg.libX11 + xorg.libXcursor + xorg.libXi + xorg.libxcb + ] + ++ lib.optionals (!stdenv.isDarwin) [ + wayland + vulkan-loader + ]; + + substitutions = { + fallbackXdgDirs = "${lib.optionalString includeSettings "${targetPackages.cosmic-settings}/share:"}${targetPackages.cosmic-icons}/share"; + + cargoLinkerVar = stdenv.hostPlatform.rust.cargoEnvVarTarget; + # force linking for all libraries that may be dlopen'd by libcosmic/iced apps + cargoLinkLibs = lib.escapeShellArgs ( + [ + # for wgpu-hal + "EGL" + # for xkbcommon-dl + "xkbcommon" + # for x11-dl, tiny-xlib, wgpu-hal + "X11" + # for x11-dl, tiny-xlib + "X11-xcb" + # for x11-dl + "Xcursor" + "Xi" + # for x11rb + "xcb" + ] + ++ lib.optionals (!stdenv.isDarwin) [ + # for wgpu-hal, wayland-sys + "wayland-client" + # for wgpu-hal + "wayland-egl" + "vulkan" + ] + ); + }; + + meta = { + description = "Setup hook for configuring and wrapping applications based on libcosmic"; + maintainers = with lib.maintainers; [ + HeitorAugustoLN + nyabinary + thefossguy + ]; + }; +} ./libcosmic-app-hook.sh From c8d935e107fea993d27cd6cf7615016f6c5065bb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 13:55:58 +0000 Subject: [PATCH 1738/2168] python312Packages.beanhub-import: 1.0.6 -> 1.0.7 --- pkgs/development/python-modules/beanhub-import/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/beanhub-import/default.nix b/pkgs/development/python-modules/beanhub-import/default.nix index c79aa99ec891..f1be289c5995 100644 --- a/pkgs/development/python-modules/beanhub-import/default.nix +++ b/pkgs/development/python-modules/beanhub-import/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "beanhub-import"; - version = "1.0.6"; + version = "1.0.7"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "LaunchPlatform"; repo = "beanhub-import"; tag = version; - hash = "sha256-cDvYebzR9OmBYC+sjwNNf2nm4lxWGZVKuW4BusecDCk="; + hash = "sha256-lafSOk+MS9MqB9KSxVR7S1HJJ6R6RZeCrFK8JGCZAIg="; }; build-system = [ poetry-core ]; @@ -47,7 +47,7 @@ buildPythonPackage rec { meta = { description = "Declarative idempotent rule-based Beancount transaction import engine in Python"; homepage = "https://github.com/LaunchPlatform/beanhub-import/"; - changelog = "https://github.com/LaunchPlatform/beanhub-import/releases/tag/${version}"; + changelog = "https://github.com/LaunchPlatform/beanhub-import/releases/tag/${src.tag}"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ fangpen ]; }; From 4fdf1fb8e6d11072f4825e03014cfb08f4856ee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Thu, 13 Feb 2025 14:42:01 +0100 Subject: [PATCH 1739/2168] dbeaver-bin: remove files for unsupported architectures --- pkgs/by-name/db/dbeaver-bin/package.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix index 64866f90bf5b..88eafe1938d8 100644 --- a/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/pkgs/by-name/db/dbeaver-bin/package.nix @@ -107,9 +107,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; - autoPatchelfIgnoreMissingDeps = [ - "libc.so.8" - ]; + preFixup = '' + # most directories are for different architectures, only keep what we need + shopt -s extglob + pushd $out/opt/dbeaver/plugins/com.sun.jna_5.15.0.v20240915-2000/com/sun/jna/ + rm -r !(ptr|internal|linux-x86-64|linux-aarch64|darwin-x86-64|darwin-aarch64)/ + popd + ''; passthru.updateScript = ./update.sh; From 41242015108d5c7704970f1d5ce3af48d3e88866 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christina=20S=C3=B8rensen?= Date: Thu, 13 Feb 2025 15:03:33 +0100 Subject: [PATCH 1740/2168] eza: 0.20.20 -> 0.20.21 changelog: https://github.com/eza-community/eza/releases/tag/v0.20.21 --- pkgs/by-name/ez/eza/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix index 3c81fa198d91..133df14e2abd 100644 --- a/pkgs/by-name/ez/eza/package.nix +++ b/pkgs/by-name/ez/eza/package.nix @@ -15,17 +15,17 @@ rustPlatform.buildRustPackage rec { pname = "eza"; - version = "0.20.20"; + version = "0.20.21"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-+duTIPM1SJoCijqKDWN3H5tO8rAaqMWzMMQbJvvurcE="; + hash = "sha256-qMzBSGV33rQwR6snEqEXsa7cw05B3SszZH0/Fb9Yxjw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-9mHS74PgQWSwipRpazb9fmAHFXRCp35juVMcjwuD4bY="; + cargoHash = "sha256-+LaDGq/blYoTYIWmKtlvJe6SC8RG7PrIiYugrjchgw0="; nativeBuildInputs = [ cmake From 8e0c372d12e7978bb2890289d6369145c73eb44b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 14:07:03 +0000 Subject: [PATCH 1741/2168] python312Packages.myst-nb: 1.1.2 -> 1.2.0 --- pkgs/development/python-modules/myst-nb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/myst-nb/default.nix b/pkgs/development/python-modules/myst-nb/default.nix index 520919e7fa46..f12ee7e8c1b7 100644 --- a/pkgs/development/python-modules/myst-nb/default.nix +++ b/pkgs/development/python-modules/myst-nb/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "myst-nb"; - version = "1.1.2"; + version = "1.2.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "myst_nb"; - hash = "sha256-lhtABWVwKcqJiSpMde2/CFbFTOr2FyNotGv3Z2wfdwA="; + hash = "sha256-r0Wex1OzQZUhgrRbCoC0d2zr+Aye5qrKKj9AJ7RAyd4="; }; nativeBuildInputs = [ flit-core ]; From 1b9a4fe5d830a720a8b3f956e455a961196f50c4 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 13 Feb 2025 22:07:35 +0800 Subject: [PATCH 1742/2168] pantheon.elementary-greeter: 8.0.0 -> 8.0.1 https://github.com/elementary/greeter/compare/8.0.0...8.0.1 --- pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index 55fe603c7b48..f27eaf74cbb1 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation rec { pname = "elementary-greeter"; - version = "8.0.0"; + version = "8.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = "greeter"; rev = version; - sha256 = "sha256-fx3KHMF6UhIFXyJHQ4dKJnVidsNMBk7AvHzaF3ELH1k="; + sha256 = "sha256-T/tI8WRVbTLdolDYa98M2Vm26p0xhGiai74lXAlpQ8k="; }; patches = [ From 90537073b5ba8470b41b65def59afb37d081f2e9 Mon Sep 17 00:00:00 2001 From: Brian McGillion Date: Thu, 13 Feb 2025 07:53:55 +0400 Subject: [PATCH 1743/2168] optinix: 0.1.3 -> 0.1.4 Update to version 0.1.4. included changelog https://gitlab.com/hmajid2301/optinix/-/releases/v0.1.4 Signed-off-by: Brian McGillion --- pkgs/by-name/op/optinix/package.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/optinix/package.nix b/pkgs/by-name/op/optinix/package.nix index d45a5ef7790e..1f0e0466b5f9 100644 --- a/pkgs/by-name/op/optinix/package.nix +++ b/pkgs/by-name/op/optinix/package.nix @@ -6,19 +6,24 @@ }: buildGoModule rec { pname = "optinix"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitLab { owner = "hmajid2301"; repo = "optinix"; rev = "v${version}"; - hash = "sha256-Y+TCMKLLBcpGgbQbwt/F9PhcDoG9B156hHM9teD+vFA="; + hash = "sha256-OuzLTygfJj1ILT0lAcBC28vU5YLuq0ErZHsLHoQNWBA="; }; - vendorHash = "sha256-kwAmp3pP2oEETztJ28fW1H6cMp0mCBiunVy41I8aeEk="; + vendorHash = "sha256-gnxG4VqdZbGQyXc1dl3pU7yr3BbZPH17OLAB3dffcrk="; nativeBuildInputs = [ installShellFiles ]; + preBuild = '' + substituteInPlace vendor/modernc.org/libc/honnef.co/go/netdb/netdb.go \ + --replace-fail '!os.IsNotExist(err)' '!os.IsNotExist(err) && !os.IsPermission(err)' + ''; + postInstall = '' installShellCompletion --cmd optinix \ --bash <($out/bin/optinix completion bash) \ @@ -31,6 +36,7 @@ buildGoModule rec { homepage = "https://gitlab.com/hmajid2301/optinix"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ hmajid2301 ]; + changelog = "https://gitlab.com/hmajid2301/optinix/-/releases/v${version}"; mainProgram = "optinix"; }; } From f850d7a1408433fb9fa9aa7d468cdc8e27492c10 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 13 Feb 2025 22:09:28 +0800 Subject: [PATCH 1744/2168] pantheon.wingpanel-indicator-power: 8.0.1 -> 8.0.2 https://github.com/elementary/wingpanel-indicator-power/compare/8.0.1...8.0.2 --- .../pantheon/desktop/wingpanel-indicators/power/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix index 41d8e5f88275..28b0333882b9 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-power"; - version = "8.0.1"; + version = "8.0.2"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-zMvw96uRr9hrgXck+OhMiPku9qu8/zUtusiaJLUcuys="; + sha256 = "sha256-AeeL/OcQ7V3HT3IWhTQHx/dcCSqL/0s/fShPq96V3xE="; }; patches = [ From 599b04d78c1d645d470998fcb8955239885de6e0 Mon Sep 17 00:00:00 2001 From: Yechiel Worenklein <41305372+yechielw@users.noreply.github.com> Date: Thu, 13 Feb 2025 16:09:10 +0200 Subject: [PATCH 1745/2168] burpsuite: 2024.11.2 2025.1.1 --- pkgs/by-name/bu/burpsuite/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bu/burpsuite/package.nix b/pkgs/by-name/bu/burpsuite/package.nix index 5e8ce706803a..209819f0381a 100644 --- a/pkgs/by-name/bu/burpsuite/package.nix +++ b/pkgs/by-name/bu/burpsuite/package.nix @@ -9,20 +9,20 @@ }: let - version = "2024.11.2"; + version = "2025.1.1"; product = if proEdition then { productName = "pro"; productDesktop = "Burp Suite Professional Edition"; - hash = "sha256-VoihG+JjA39wQ1Z7rRwenggwQCNTgg9wgi3vF1tAi6A="; + hash = "sha256-17COQ9deYkzmaXBbg1arD3BQY7l3WZ9FakLXzTxgmr8="; } else { productName = "community"; productDesktop = "Burp Suite Community Edition"; - hash = "sha256-KSpZ+QO+R1c5wc/I07TQIhfEoh8lrHQR8H+2C1Al+wk="; + hash = "sha256-VnDVv492suHIjDqermH79Rcz4hb3bmgazIiBvbwV3Zc="; }; src = fetchurl { From e961af0d12930feb8d529059d10965a8e39bd822 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 13 Feb 2025 14:42:37 +0100 Subject: [PATCH 1746/2168] opentofu-ls: init at 0-unstable-2025-01-01 --- pkgs/by-name/op/opentofu-ls/package.nix | 55 +++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 pkgs/by-name/op/opentofu-ls/package.nix diff --git a/pkgs/by-name/op/opentofu-ls/package.nix b/pkgs/by-name/op/opentofu-ls/package.nix new file mode 100644 index 000000000000..37d5e220f2a6 --- /dev/null +++ b/pkgs/by-name/op/opentofu-ls/package.nix @@ -0,0 +1,55 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + versionCheckHook, + unstableGitUpdater, +}: + +buildGoModule { + pname = "opentofu-ls"; + version = "0-unstable-2025-01-01"; + + src = fetchFromGitHub { + owner = "opentofu"; + repo = "opentofu-ls"; + rev = "e6fe83c83107728dd39bb9324b8e1ecc31ad44d3"; + hash = "sha256-3d/vlW+U1YrGR34edyaMZmV6HaMra0yDCgnQwkQGzuY="; + }; + + vendorHash = "sha256-CrbLqcwPXHB80m4VhqrC8j5VhU2BUeuNy87+bc+Bq6I="; + + ldflags = [ + "-s" + "-w" + ]; + + checkFlags = + let + skippedTests = [ + # Require network access + "TestCompletion_moduleWithValidData" + "TestCompletion_multipleModulesWithValidData" + "TestCompletion_multipleModulesWithValidData" + "TestExec_cancel" + "TestLangServer_DidChangeWatchedFiles_moduleInstalled" + "TestLangServer_workspace_symbol_basic" + "TestLangServer_workspace_symbol_missing" + ]; + in + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; + + __darwinAllowLocalNetworking = true; + + passthru = { + updateScript = unstableGitUpdater { }; + }; + + meta = { + description = "OpenTofu Language Server"; + homepage = "https://github.com/opentofu/opentofu-ls"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + mainProgram = "opentofu-ls"; + }; +} From fee2c2d067a9046e2d816f6d7136298f87408ac3 Mon Sep 17 00:00:00 2001 From: Qiming Chu Date: Thu, 13 Feb 2025 22:22:45 +0800 Subject: [PATCH 1747/2168] add-determinism: 0.5.0 -> 0.6.0 Signed-off-by: Qiming Chu --- pkgs/by-name/ad/add-determinism/Cargo.lock | 311 ++++++++++++-------- pkgs/by-name/ad/add-determinism/package.nix | 4 +- 2 files changed, 184 insertions(+), 131 deletions(-) mode change 100755 => 100644 pkgs/by-name/ad/add-determinism/Cargo.lock diff --git a/pkgs/by-name/ad/add-determinism/Cargo.lock b/pkgs/by-name/ad/add-determinism/Cargo.lock old mode 100755 new mode 100644 index 887a7e469ba6..a23863544736 --- a/pkgs/by-name/ad/add-determinism/Cargo.lock +++ b/pkgs/by-name/ad/add-determinism/Cargo.lock @@ -4,7 +4,7 @@ version = 4 [[package]] name = "add-determinism" -version = "0.5.0" +version = "0.6.0" dependencies = [ "anyhow", "chrono", @@ -28,10 +28,10 @@ dependencies = [ ] [[package]] -name = "adler" -version = "1.0.2" +name = "adler2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" [[package]] name = "aho-corasick" @@ -59,9 +59,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.14" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" +checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" dependencies = [ "anstyle", "anstyle-parse", @@ -74,61 +74,62 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.7" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" +checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" [[package]] name = "anstyle-parse" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" +checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" +checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" dependencies = [ "windows-sys", ] [[package]] name = "anstyle-wincon" -version = "3.0.3" +version = "3.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" +checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e" dependencies = [ "anstyle", + "once_cell", "windows-sys", ] [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36" [[package]] name = "bumpalo" -version = "3.16.0" +version = "3.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" +checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" [[package]] name = "byteorder" @@ -138,9 +139,12 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "cc" -version = "1.0.98" +version = "1.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" +checksum = "c7777341816418c02e033934a09f20dc0ccaf65a5201ef8a450ae0105a573fda" +dependencies = [ + "shlex", +] [[package]] name = "cfg-if" @@ -156,9 +160,9 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] name = "chrono" -version = "0.4.38" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825" dependencies = [ "android-tzdata", "iana-time-zone", @@ -170,9 +174,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.4" +version = "4.5.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" +checksum = "8acebd8ad879283633b343856142139f2da2317c96b05b4dd6181c61e2480184" dependencies = [ "clap_builder", "clap_derive", @@ -180,9 +184,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.2" +version = "4.5.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +checksum = "f6ba32cbda51c7e1dfd49acc1457ba1a7dec5b64fe360e828acb13ca8dc9c2f9" dependencies = [ "anstream", "anstyle", @@ -192,9 +196,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.4" +version = "4.5.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" +checksum = "bf4ced95c6f4a675af3da73304b9ac4ed991640c36374e4b46795c49e17cf1ed" dependencies = [ "heck", "proc-macro2", @@ -204,21 +208,21 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.0" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" +checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" [[package]] name = "colorchoice" -version = "1.0.1" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" +checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "crc32fast" @@ -231,9 +235,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.20" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "deranged" @@ -252,9 +256,9 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "errno" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", "windows-sys", @@ -262,15 +266,15 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" dependencies = [ "crc32fast", "libz-sys", @@ -285,7 +289,19 @@ checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.13.3+wasi-0.2.2", + "windows-targets", ] [[package]] @@ -308,9 +324,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -337,9 +353,9 @@ checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" [[package]] name = "is_terminal_polyfill" -version = "1.70.0" +version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "itertools" @@ -352,10 +368,11 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" dependencies = [ + "once_cell", "wasm-bindgen", ] @@ -370,9 +387,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.155" +version = "0.2.169" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" [[package]] name = "libm" @@ -382,9 +399,9 @@ checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" [[package]] name = "libz-sys" -version = "1.1.18" +version = "1.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e" +checksum = "df9b68e50e6e0b26f672573834882eb57759f6db9b3be2ea3c35c91188bb4eaa" dependencies = [ "cc", "pkg-config", @@ -393,21 +410,21 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" [[package]] name = "log" -version = "0.4.21" +version = "0.4.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f" [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memoffset" @@ -420,11 +437,11 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.7.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" +checksum = "b3b1c9bd4fe1f0f8b387f6eb9eb3b4a1aa26185e5750efb9140301703f62cd1b" dependencies = [ - "adler", + "adler2", ] [[package]] @@ -494,15 +511,15 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e" [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "powerfmt" @@ -530,9 +547,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.36" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] @@ -564,14 +581,14 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom", + "getrandom 0.2.15", ] [[package]] name = "regex" -version = "1.10.4" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", @@ -581,9 +598,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", @@ -592,15 +609,15 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" dependencies = [ "bitflags", "errno", @@ -609,6 +626,12 @@ dependencies = [ "windows-sys", ] +[[package]] +name = "rustversion" +version = "1.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4" + [[package]] name = "same-file" version = "1.0.6" @@ -620,9 +643,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.203" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" dependencies = [ "serde_derive", ] @@ -639,15 +662,21 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ "proc-macro2", "quote", "syn", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "smallvec" version = "1.13.2" @@ -668,9 +697,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "syn" -version = "2.0.96" +version = "2.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80" +checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1" dependencies = [ "proc-macro2", "quote", @@ -679,12 +708,14 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.10.1" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "38c246215d7d24f48ae091a2902398798e05d978b24315d6efbc00ede9a8bb91" dependencies = [ "cfg-if", "fastrand", + "getrandom 0.3.1", + "once_cell", "rustix", "windows-sys", ] @@ -711,9 +742,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.36" +version = "0.3.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" dependencies = [ "deranged", "num-conv", @@ -730,15 +761,15 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034" [[package]] name = "utf8parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "vcpkg" @@ -763,24 +794,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] -name = "wasm-bindgen" -version = "0.2.92" +name = "wasi" +version = "0.13.3+wasi-0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2" +dependencies = [ + "wit-bindgen-rt", +] + +[[package]] +name = "wasm-bindgen" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" dependencies = [ "cfg-if", + "once_cell", + "rustversion", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" dependencies = [ "bumpalo", "log", - "once_cell", "proc-macro2", "quote", "syn", @@ -789,9 +830,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -799,9 +840,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", @@ -812,15 +853,18 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ "windows-sys", ] @@ -836,18 +880,18 @@ dependencies = [ [[package]] name = "windows-sys" -version = "0.52.0" +version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" dependencies = [ "windows-targets", ] [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -861,51 +905,60 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "wit-bindgen-rt" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c" +dependencies = [ + "bitflags", +] [[package]] name = "zerocopy" diff --git a/pkgs/by-name/ad/add-determinism/package.nix b/pkgs/by-name/ad/add-determinism/package.nix index dfc8b3f18c24..da19cebb445c 100644 --- a/pkgs/by-name/ad/add-determinism/package.nix +++ b/pkgs/by-name/ad/add-determinism/package.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "add-determinism"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "keszybz"; repo = pname; tag = "v${version}"; - hash = "sha256-YfY0l57SjBfO5nLlCfEBzwyVPdzZKK5YKVvVATsObi0="; + hash = "sha256-QFhed8YTgvfm6bB/cRsrnN0foplJhK1b9IYD9HGdJUc="; }; # this project has no Cargo.lock now From 0070971e998e167e40c7148f66177ccdff4c3797 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Feb 2025 15:29:44 +0100 Subject: [PATCH 1748/2168] python312Packages.pyipma: fix typo --- pkgs/development/python-modules/pyipma/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyipma/default.nix b/pkgs/development/python-modules/pyipma/default.nix index c8c1611fe3b9..61d777e99be2 100644 --- a/pkgs/development/python-modules/pyipma/default.nix +++ b/pkgs/development/python-modules/pyipma/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dgomes"; - repo = "pyipma"; + repo = "pyipma"; tag = version; hash = "sha256-1EUOkNwNoZQEetJ5v6httas0S0a3bHLv/lDRXQsT/Ds="; }; From 97209dbaf504c0c89f5d84a210d52dbe1497ff85 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 14:30:43 +0000 Subject: [PATCH 1749/2168] ogen: 1.9.0 -> 1.10.0 --- pkgs/by-name/og/ogen/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/og/ogen/package.nix b/pkgs/by-name/og/ogen/package.nix index 1e1f549cf6c0..8f95e9172ddb 100644 --- a/pkgs/by-name/og/ogen/package.nix +++ b/pkgs/by-name/og/ogen/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "ogen"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "ogen-go"; repo = "ogen"; tag = "v${version}"; - hash = "sha256-clskb5DA1dNVKjKgtYakvshRrkeoqiwYX4QKAqSdKnE="; + hash = "sha256-I+SCgOVH0Fo0f5lbv610PPB7dduE2MHixlKoN+v/m7c="; }; - vendorHash = "sha256-Ud1fg2wv+EM6h8dRO4R5SABOhPldF7uc9VwEw2/B6No="; + vendorHash = "sha256-OEESbftF9pF5e2GT31Jo0vugS4WOCBX5I04my/PG99M="; patches = [ ./modify-version-handling.patch ]; From 48947b5d96c9f440bd0ea95baa7fd48bfa55ff16 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 21 Dec 2024 01:02:10 +0000 Subject: [PATCH 1750/2168] obs-studio: port to new build system They would like builders to use CMake presets now; we inherit from their Ubuntu and macOS presets respectively. --- .../video/obs-studio/CMakeUserPresets.json | 17 +++++++++++++ .../applications/video/obs-studio/default.nix | 25 ++++++++++++++++--- 2 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 pkgs/applications/video/obs-studio/CMakeUserPresets.json diff --git a/pkgs/applications/video/obs-studio/CMakeUserPresets.json b/pkgs/applications/video/obs-studio/CMakeUserPresets.json new file mode 100644 index 000000000000..932ca674c09e --- /dev/null +++ b/pkgs/applications/video/obs-studio/CMakeUserPresets.json @@ -0,0 +1,17 @@ +{ + "version": 3, + "configurePresets": [ + { + "name": "nixpkgs-linux", + "displayName": "Nixpkgs (Linux)", + "inherits": ["ubuntu"], + "binaryDir": "${sourceDir}/build" + }, + { + "name": "nixpkgs-darwin", + "displayName": "Nixpkgs (Darwin)", + "inherits": ["macos"], + "binaryDir": "${sourceDir}/build" + } + ] +} diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 5dff164084de..447af0b9b803 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -2,6 +2,7 @@ , uthash , lib , stdenv +, ninja , nv-codec-headers-12 , fetchFromGitHub , fetchpatch @@ -42,6 +43,7 @@ , pipewire , libdrm , librist +, cjson , libva , srt , qtwayland @@ -107,6 +109,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ addDriverRunpath cmake + ninja pkg-config wrapGAppsHook3 wrapQtAppsHook @@ -132,6 +135,7 @@ stdenv.mkDerivation (finalAttrs: { mbedtls pciutils librist + cjson libva srt qtwayland @@ -157,18 +161,25 @@ stdenv.mkDerivation (finalAttrs: { ln -s $i cef/Release/ ln -s $i cef/Resources/ done - ln -s ${libcef}/lib/libcef.so cef/Release/ + ln -s ${libcef}/lib/*.so* cef/Release/ + ln -s ${libcef}/libexec/cef/chrome-sandbox cef/Release/ ln -s ${libcef}/lib/libcef_dll_wrapper.a cef/libcef_dll_wrapper/ ln -s ${libcef}/include cef/ ''; + postPatch = '' + cp ${./CMakeUserPresets.json} ./CMakeUserPresets.json + ''; + cmakeFlags = [ + "--preset" "nixpkgs-${if stdenv.hostPlatform.isDarwin then "darwin" else "linux"}" "-DOBS_VERSION_OVERRIDE=${finalAttrs.version}" "-Wno-dev" # kill dev warnings that are useless for packaging # Add support for browser source - "-DBUILD_BROWSER=ON" + "-DENABLE_BROWSER=ON" "-DCEF_ROOT_DIR=../../cef" "-DENABLE_JACK=ON" + "-DENABLE_WEBRTC=ON" (lib.cmakeBool "ENABLE_QSV11" stdenv.hostPlatform.isx86_64) (lib.cmakeBool "ENABLE_LIBFDK" withFdk) (lib.cmakeBool "ENABLE_ALSA" alsaSupport) @@ -193,8 +204,13 @@ stdenv.mkDerivation (finalAttrs: { blackmagic-desktop-video ]; in '' - # Remove libcef before patchelf, otherwise it will fail + # Remove cef components before patchelf, otherwise it will fail rm $out/lib/obs-plugins/libcef.so + rm $out/lib/obs-plugins/libEGL.so + rm $out/lib/obs-plugins/libGLESv2.so + rm $out/lib/obs-plugins/libvk_swiftshader.so + rm $out/lib/obs-plugins/libvulkan.so.1 + rm $out/lib/obs-plugins/chrome-sandbox qtWrapperArgs+=( --prefix LD_LIBRARY_PATH : "$out/lib:${lib.makeLibraryPath wrapperLibraries}" @@ -206,8 +222,9 @@ stdenv.mkDerivation (finalAttrs: { addDriverRunpath $out/lib/lib*.so addDriverRunpath $out/lib/obs-plugins/*.so - # Link libcef again after patchelfing other libs + # Link cef components again after patchelfing other libs ln -s ${libcef}/lib/* $out/lib/obs-plugins/ + ln -s ${libcef}/libexec/cef/* $out/lib/obs-plugins/ ''; passthru.updateScript = nix-update-script { }; From 1000f3ce633a5f5ce49b9d33baa2e00d4816195e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Feb 2025 15:35:29 +0100 Subject: [PATCH 1751/2168] python313Packages.opower: 0.8.9 -> 0.9.0 Diff: https://github.com/tronikos/opower/compare/refs/tags/v0.8.9...v0.9.0 Changelog: https://github.com/tronikos/opower/releases/tag/v0.9.0 --- pkgs/development/python-modules/opower/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix index 1d52e82799d8..7ff79cd4a8cc 100644 --- a/pkgs/development/python-modules/opower/default.nix +++ b/pkgs/development/python-modules/opower/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "opower"; - version = "0.8.9"; + version = "0.9.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "tronikos"; repo = "opower"; tag = "v${version}"; - hash = "sha256-Djega2v8ybzTBfczPz/5INjGZpiWjunInLa0ywKuXL4="; + hash = "sha256-1g7B4r1CDapi4yfnOLTHNE2Y1TYYqtkdfHwcptxXL9E="; }; build-system = [ setuptools ]; From 085f3251f8f05a06409067d1010fbbe8175e9cc7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Feb 2025 15:37:36 +0100 Subject: [PATCH 1752/2168] python313Packages.stookwijzer: 1.5.1 -> 1.5.2 Diff: https://github.com/fwestenberg/stookwijzer/compare/refs/tags/v1.5.1...v1.5.2 Changelog: https://github.com/fwestenberg/stookwijzer/releases/tag/v1.5.2 --- pkgs/development/python-modules/stookwijzer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stookwijzer/default.nix b/pkgs/development/python-modules/stookwijzer/default.nix index 9d4be55a2875..fd1bd32df1ed 100644 --- a/pkgs/development/python-modules/stookwijzer/default.nix +++ b/pkgs/development/python-modules/stookwijzer/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "stookwijzer"; - version = "1.5.1"; + version = "1.5.2"; pyproject = true; src = fetchFromGitHub { owner = "fwestenberg"; repo = "stookwijzer"; tag = "v${version}"; - hash = "sha256-zAlHB4ZAgbUBDBQbnoSXwB+iOKeWKtkwBbA4AAyNv00="; + hash = "sha256-ES9atB0KricNI5KWQC5Eoftwd/Le7Id3855977KuEy4="; }; build-system = [ setuptools ]; From a09044eb2cc7bb829a799e627f9285d2fd968c91 Mon Sep 17 00:00:00 2001 From: joachimschmidt557 Date: Thu, 13 Feb 2025 15:39:11 +0100 Subject: [PATCH 1753/2168] timew-sync-client: 1.0.1-unstable-2024-08-05 -> 1.1 --- pkgs/by-name/ti/timew-sync-client/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ti/timew-sync-client/package.nix b/pkgs/by-name/ti/timew-sync-client/package.nix index 1635865e33f0..7ad8a4c9c418 100644 --- a/pkgs/by-name/ti/timew-sync-client/package.nix +++ b/pkgs/by-name/ti/timew-sync-client/package.nix @@ -4,15 +4,15 @@ python3Packages, }: -python3Packages.buildPythonApplication { +python3Packages.buildPythonApplication rec { pname = "timew-sync-client"; - version = "1.0.1-unstable-2024-08-05"; + version = "1.1"; src = fetchFromGitHub { owner = "timewarrior-synchronize"; repo = "timew-sync-client"; - rev = "de3442bd29b071f54cd1e10af99f3378a83b4794"; - hash = "sha256-AKRAMEUTIPvR+kaEZZYjd4II2KzYZTwRgGzFMGD5aio="; + rev = "v${version}"; + hash = "sha256-8Bw+BI7EiW9UcHo6gaDthX4VH4kAlycm4EvAJEEAOWc="; }; pyproject = true; From b348bca03af025a5ed1bf6dd4c0d7573ab6523fd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Feb 2025 15:39:20 +0100 Subject: [PATCH 1754/2168] python313Packages.python-kasa: 0.10.1 -> 0.10.2 Diff: https://github.com/python-kasa/python-kasa/compare/refs/tags/0.10.1...0.10.2 Changelog: https://github.com/python-kasa/python-kasa/blob/0.10.2/CHANGELOG.md --- pkgs/development/python-modules/python-kasa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-kasa/default.nix b/pkgs/development/python-modules/python-kasa/default.nix index 55c8b0faa57c..8ce0a76f0709 100644 --- a/pkgs/development/python-modules/python-kasa/default.nix +++ b/pkgs/development/python-modules/python-kasa/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "python-kasa"; - version = "0.10.1"; + version = "0.10.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "python-kasa"; repo = "python-kasa"; tag = version; - hash = "sha256-GqFWQRORU1CBtw+xasvGl0NZlVgD+mV37uWkwhOphF0="; + hash = "sha256-OIkqNGTnIPoHYrE5NhAxSsRCTyMGvNADvIg28EuKsEw="; }; build-system = [ hatchling ]; From 2a578fd78d5efd3c4be46fe2a5d6d305281bb830 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 13 Feb 2025 15:10:52 +0100 Subject: [PATCH 1755/2168] python312Packages.coffea: skip tests crashing on aarch64-linux --- .../python-modules/coffea/default.nix | 51 ++++++++++++------- 1 file changed, 34 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/coffea/default.nix b/pkgs/development/python-modules/coffea/default.nix index 0710ca0f5dba..85c37de53b18 100644 --- a/pkgs/development/python-modules/coffea/default.nix +++ b/pkgs/development/python-modules/coffea/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, @@ -36,8 +37,8 @@ # checks distributed, pyinstrument, - pytestCheckHook, pytest-xdist, + pytestCheckHook, }: buildPythonPackage rec { @@ -91,30 +92,46 @@ buildPythonPackage rec { nativeCheckInputs = [ distributed pyinstrument - pytestCheckHook pytest-xdist + pytestCheckHook ]; pythonImportsCheck = [ "coffea" ]; - disabledTests = [ - # Requires internet access - # https://github.com/CoffeaTeam/coffea/issues/1094 - "test_lumimask" + disabledTests = + [ + # Requires internet access + # https://github.com/CoffeaTeam/coffea/issues/1094 + "test_lumimask" - # Flaky: FileNotFoundError: [Errno 2] No such file or directory - # https://github.com/scikit-hep/coffea/issues/1246 - "test_packed_selection_cutflow_dak" # cutflow.npz - "test_packed_selection_nminusone_dak" # nminusone.npz + # Flaky: FileNotFoundError: [Errno 2] No such file or directory + # https://github.com/scikit-hep/coffea/issues/1246 + "test_packed_selection_cutflow_dak" # cutflow.npz + "test_packed_selection_nminusone_dak" # nminusone.npz - # AssertionError: bug in Awkward Array: attempt to convert TypeTracerArray into a concrete array - "test_apply_to_fileset" - "test_lorentz_behavior" + # AssertionError: bug in Awkward Array: attempt to convert TypeTracerArray into a concrete array + "test_apply_to_fileset" + "test_lorentz_behavior" - # ValueError: The array to mask was deleted before it could be masked. - # If you want to construct this mask, you must either keep the array alive or use 'ak.mask' explicitly. - "test_read_nanomc" - ]; + # ValueError: The array to mask was deleted before it could be masked. + # If you want to construct this mask, you must either keep the array alive or use 'ak.mask' explicitly. + "test_read_nanomc" + ] + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ + # Fatal Python error: Segmentation fault + # coffea/nanoevents/transforms.py", line 287 in index_range + "test_KaonParent_to_PionDaughters_Loop" + "test_MCRecoAssociations" + "test_MC_daughters" + "test_MC_parents" + "test_field_is_present" + + # Fatal Python error: Segmentation fault + # File "/build/source/tests/test_lumi_tools.py", line 37 in test_lumidata + "test_lumidata" + # coffea/lumi_tools/lumi_tools.py", line 113 in get_lumi + "test_lumilist" + ]; __darwinAllowLocalNetworking = true; From e56d6a7d1a307d021132cb696d7d0778f7575870 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Feb 2025 15:50:06 +0100 Subject: [PATCH 1756/2168] python313Packages.arcam-fmj: 1.7.0 -> 1.8.0 Diff: https://github.com/elupus/arcam_fmj/compare/refs/tags/1.7.0...1.8.0 Changelog: https://github.com/elupus/arcam_fmj/releases/tag/1.8.0 --- pkgs/development/python-modules/arcam-fmj/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/arcam-fmj/default.nix b/pkgs/development/python-modules/arcam-fmj/default.nix index 76b558bd32d1..e7d6d11e9708 100644 --- a/pkgs/development/python-modules/arcam-fmj/default.nix +++ b/pkgs/development/python-modules/arcam-fmj/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "arcam-fmj"; - version = "1.7.0"; + version = "1.8.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "elupus"; repo = "arcam_fmj"; tag = version; - hash = "sha256-dyIKKkJkeZn4ciZ97Xd4Wttr0r3AVwYGk+du4lEvW14="; + hash = "sha256-G+TbZ95KiAunvzhpY6IRZy6xrBn4ceZwixZw37KB298="; }; build-system = [ setuptools ]; From 911eaaa675e49846a6865c89ccc90e255bbcd215 Mon Sep 17 00:00:00 2001 From: Philipp Arras Date: Thu, 13 Feb 2025 15:54:36 +0100 Subject: [PATCH 1757/2168] python3Packages.nanobind: 2.4.0 -> 2.5.0 --- pkgs/development/python-modules/nanobind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nanobind/default.nix b/pkgs/development/python-modules/nanobind/default.nix index 8255cd578439..992ff08227a7 100644 --- a/pkgs/development/python-modules/nanobind/default.nix +++ b/pkgs/development/python-modules/nanobind/default.nix @@ -25,14 +25,14 @@ }: buildPythonPackage rec { pname = "nanobind"; - version = "2.4.0"; + version = "2.5.0"; pyproject = true; src = fetchFromGitHub { owner = "wjakob"; repo = "nanobind"; tag = "v${version}"; - hash = "sha256-9OpDsjFEeJGtbti4Q9HHl78XaGf8M3lG4ukvHCMzyMU="; + hash = "sha256-sH+qZHd9OKDxl2yTAeDh4xLwW64k6nIToyLfd3cR6kE="; fetchSubmodules = true; }; From 485f47ce6489e2ef8c67ecaf2827212915ab9b6f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 14:54:55 +0000 Subject: [PATCH 1758/2168] muffet: 2.10.7 -> 2.10.8 --- pkgs/by-name/mu/muffet/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mu/muffet/package.nix b/pkgs/by-name/mu/muffet/package.nix index 0987a312b2a6..ad69ddb22310 100644 --- a/pkgs/by-name/mu/muffet/package.nix +++ b/pkgs/by-name/mu/muffet/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "muffet"; - version = "2.10.7"; + version = "2.10.8"; src = fetchFromGitHub { owner = "raviqqe"; repo = "muffet"; rev = "v${version}"; - hash = "sha256-txIH3FqKQ6IWN19aABmLAJicmXi6NK7VpH6NDMtAGUE="; + hash = "sha256-vpckg0zx8RNR7dAKjdlSHyevn7kDslrysah8jCLSaBw="; }; vendorHash = "sha256-IbpTQdJ6OssyzwS2H4iNgJybC9rvvlW6UYkihNkBYOE="; From 372fa7fc987a438e65675c03f51f5b365389a214 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 14:57:23 +0000 Subject: [PATCH 1759/2168] lzbench: 1.8.1 -> 2.0.1 --- pkgs/by-name/lz/lzbench/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lz/lzbench/package.nix b/pkgs/by-name/lz/lzbench/package.nix index a024d4eae070..2af7bd2a3cbb 100644 --- a/pkgs/by-name/lz/lzbench/package.nix +++ b/pkgs/by-name/lz/lzbench/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "lzbench"; - version = "1.8.1"; + version = "2.0.1"; src = fetchFromGitHub { owner = "inikep"; repo = pname; rev = "v${version}"; - sha256 = "19zlvcjb1qg4fx30rrp6m650660y35736j8szvdxmqh9ipkisyia"; + sha256 = "sha256-946AcnD9z60Oihm2pseS8D5j6pGdYeCxmhTLNcW9Mmc="; }; enableParallelBuilding = true; From 44eb247b1715b51d19484009675ffe28a4f27c22 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 14:58:14 +0000 Subject: [PATCH 1760/2168] c2fmzq: 0.4.27 -> 0.4.28 --- pkgs/by-name/c2/c2fmzq/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/c2/c2fmzq/package.nix b/pkgs/by-name/c2/c2fmzq/package.nix index 3e16d5c4f60a..83c6820f75b1 100644 --- a/pkgs/by-name/c2/c2fmzq/package.nix +++ b/pkgs/by-name/c2/c2fmzq/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "c2FmZQ"; - version = "0.4.27"; + version = "0.4.28"; src = fetchFromGitHub { owner = "c2FmZQ"; repo = "c2FmZQ"; rev = "v${version}"; - hash = "sha256-PGZN6+DJWMoBREqvqub9t1XxvtuhgFTFwerOu/v8xTI="; + hash = "sha256-R9CYgP444S9LinGT2fUnmOvaBHHv2thy1I2TQSPbnOs="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { sourceRoot = "${src.name}/c2FmZQ"; - vendorHash = "sha256-zKELnKHwNlXnKsIPr51Ec0bBEOYVMWs/8oQU5zJ+z/s="; + vendorHash = "sha256-yv/PNzWvEAiKyXw9XVAty67vRgXJmi4eq+i352yKKck="; subPackages = [ "c2FmZQ-client" From 1f6fe98d1e545861c178475b7ad91d69757c49a1 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 29 Dec 2024 17:37:25 +0000 Subject: [PATCH 1761/2168] obs-studio: 30.2.3 -> 31.0.1 --- .../applications/video/obs-studio/default.nix | 27 ++----------------- .../obs-studio/fix-nix-plugin-path.patch | 13 --------- 2 files changed, 2 insertions(+), 38 deletions(-) diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 447af0b9b803..02ebf38f611f 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -65,13 +65,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "obs-studio"; - version = "30.2.3"; + version = "31.0.1"; src = fetchFromGitHub { owner = "obsproject"; repo = "obs-studio"; rev = finalAttrs.version; - hash = "sha256-4bAzW62xX9apKOAJyn3iys1bFdHj4re2reMZtlGsn5s="; + hash = "sha256-dwS/90j4WfcneAsGFwuABM7xqvq1+VSD2uDVdU/GgQo="; fetchSubmodules = true; }; @@ -81,29 +81,6 @@ stdenv.mkDerivation (finalAttrs: { # Lets obs-browser build against CEF 90.1.0+ ./Enable-file-access-and-universal-access-for-file-URL.patch ./fix-nix-plugin-path.patch - - # Fix libobs.pc for plugins on non-x86 systems - (fetchpatch { - name = "fix-arm64-cmake.patch"; - url = "https://git.alpinelinux.org/aports/plain/community/obs-studio/broken-config.patch?id=a92887564dcc65e07b6be8a6224fda730259ae2b"; - hash = "sha256-yRSw4VWDwMwysDB3Hw/tsmTjEQUhipvrVRQcZkbtuoI="; - includes = [ "*/CompilerConfig.cmake" ]; - }) - - (fetchpatch { - name = "qt-6.8.patch"; - url = "https://github.com/obsproject/obs-websocket/commit/d9befb9e0a4898695eef5ccbc91a4fac02027854.patch"; - extraPrefix = "plugins/obs-websocket/"; - stripLen = 1; - hash = "sha256-7SDBRr9G40b9DfbgdaYJxTeiDSLUfVixtMtM3cLTVZs="; - }) - - # Fix lossless audio, ffmpeg 7,1 compatibility issue - (fetchpatch { - name = "fix-lossless-audio.patch"; - url = "https://github.com/obsproject/obs-studio/commit/dfc3a69c5276edf84c933035ff2a7e278fa13c9a.patch"; - hash = "sha256-wiF3nolBpZKp7LR7NloNfJ+v4Uq/nBgwCVoKZX+VEMA="; - }) ]; nativeBuildInputs = [ diff --git a/pkgs/applications/video/obs-studio/fix-nix-plugin-path.patch b/pkgs/applications/video/obs-studio/fix-nix-plugin-path.patch index 13569e8499b5..68d030fe5108 100644 --- a/pkgs/applications/video/obs-studio/fix-nix-plugin-path.patch +++ b/pkgs/applications/video/obs-studio/fix-nix-plugin-path.patch @@ -1,16 +1,3 @@ -diff --git a/cmake/Modules/ObsDefaults_Linux.cmake b/cmake/Modules/ObsDefaults_Linux.cmake -index fe8d72364..1c590fcdb 100644 ---- a/cmake/Modules/ObsDefaults_Linux.cmake -+++ b/cmake/Modules/ObsDefaults_Linux.cmake -@@ -76,7 +76,7 @@ macro(setup_obs_project) - set(OBS_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") - set(OBS_DATA_PATH "${OBS_DATA_DESTINATION}") - -- set(OBS_SCRIPT_PLUGIN_PATH "${CMAKE_INSTALL_PREFIX}/${OBS_SCRIPT_PLUGIN_DESTINATION}") -+ set(OBS_SCRIPT_PLUGIN_PATH "${OBS_SCRIPT_PLUGIN_DESTINATION}") - set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${OBS_LIBRARY_DESTINATION}") - else() - set(OBS_EXECUTABLE_DESTINATION "bin/${_ARCH_SUFFIX}bit") diff --git a/libobs/obs-nix.c b/libobs/obs-nix.c index 77c36be5e..fe8a04813 100644 --- a/libobs/obs-nix.c From a99cff7ebab55d7ea2547e59350c0c6312d4c6fa Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 30 Dec 2024 02:59:17 +0100 Subject: [PATCH 1762/2168] obs-studio-plugins.wlrobs: 2023-08-23 -> 2024-12-24 --- pkgs/applications/video/obs-studio/plugins/wlrobs.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/obs-studio/plugins/wlrobs.nix b/pkgs/applications/video/obs-studio/plugins/wlrobs.nix index 37950307d9e8..48c6f588308b 100644 --- a/pkgs/applications/video/obs-studio/plugins/wlrobs.nix +++ b/pkgs/applications/video/obs-studio/plugins/wlrobs.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation { pname = "wlrobs"; - version = "unstable-2023-08-23"; + version = "unstable-2024-12-24"; src = fetchFromSourcehut { vc = "hg"; owner = "~scoopta"; repo = "wlrobs"; - rev = "f72d5cb3cbbd3983ae6cfd86cb1940be7372681c"; - hash = "sha256-hiM0d38SSUqbyisP3fAtKRLBDjVKZdU2U1xyXci7yNk="; + rev = "b8668b4d6d6d33e3de86ce3fa4331249bc0abc8b"; + hash = "sha256-gqGnDrfID5hTcpX3EkSGg4yDwa/ZKCQCqJ3feq44I1I="; }; nativeBuildInputs = [ From 5592fc0a126887f258a45aa70774866587aec1c0 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 13 Feb 2025 15:55:17 +0100 Subject: [PATCH 1763/2168] obs-studio: reformat --- .../applications/video/obs-studio/default.nix | 263 ++++++++++-------- 1 file changed, 141 insertions(+), 122 deletions(-) diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 02ebf38f611f..99cb6da36458 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -1,62 +1,62 @@ -{ config -, uthash -, lib -, stdenv -, ninja -, nv-codec-headers-12 -, fetchFromGitHub -, fetchpatch -, addDriverRunpath -, cmake -, fdk_aac -, ffmpeg -, jansson -, libjack2 -, libxkbcommon -, libpthreadstubs -, libXdmcp -, qtbase -, qtsvg -, speex -, libv4l -, x264 -, curl -, wayland -, xorg -, pkg-config -, libvlc -, libGL -, mbedtls -, wrapGAppsHook3 -, scriptingSupport ? true -, luajit -, swig -, python3 -, alsaSupport ? stdenv.hostPlatform.isLinux -, alsa-lib -, pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux -, libpulseaudio -, libcef -, pciutils -, pipewireSupport ? stdenv.hostPlatform.isLinux -, withFdk ? true -, pipewire -, libdrm -, librist -, cjson -, libva -, srt -, qtwayland -, wrapQtAppsHook -, nlohmann_json -, websocketpp -, asio -, decklinkSupport ? false -, blackmagic-desktop-video -, libdatachannel -, libvpl -, qrcodegencpp -, nix-update-script +{ + config, + uthash, + lib, + stdenv, + ninja, + nv-codec-headers-12, + fetchFromGitHub, + addDriverRunpath, + cmake, + fdk_aac, + ffmpeg, + jansson, + libjack2, + libxkbcommon, + libpthreadstubs, + libXdmcp, + qtbase, + qtsvg, + speex, + libv4l, + x264, + curl, + wayland, + xorg, + pkg-config, + libvlc, + libGL, + mbedtls, + wrapGAppsHook3, + scriptingSupport ? true, + luajit, + swig, + python3, + alsaSupport ? stdenv.hostPlatform.isLinux, + alsa-lib, + pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux, + libpulseaudio, + libcef, + pciutils, + pipewireSupport ? stdenv.hostPlatform.isLinux, + withFdk ? true, + pipewire, + libdrm, + librist, + cjson, + libva, + srt, + qtwayland, + wrapQtAppsHook, + nlohmann_json, + websocketpp, + asio, + decklinkSupport ? false, + blackmagic-desktop-video, + libdatachannel, + libvpl, + qrcodegencpp, + nix-update-script, }: let @@ -90,46 +90,52 @@ stdenv.mkDerivation (finalAttrs: { pkg-config wrapGAppsHook3 wrapQtAppsHook - ] - ++ optional scriptingSupport swig; + ] ++ optional scriptingSupport swig; - buildInputs = [ - curl - ffmpeg - jansson - libcef - libjack2 - libv4l - libxkbcommon - libpthreadstubs - libXdmcp - qtbase - qtsvg - speex - wayland - x264 - libvlc - mbedtls - pciutils - librist - cjson - libva - srt - qtwayland - nlohmann_json - websocketpp - asio - libdatachannel - libvpl - qrcodegencpp - uthash - nv-codec-headers-12 - ] - ++ optionals scriptingSupport [ luajit python3 ] - ++ optional alsaSupport alsa-lib - ++ optional pulseaudioSupport libpulseaudio - ++ optionals pipewireSupport [ pipewire libdrm ] - ++ optional withFdk fdk_aac; + buildInputs = + [ + curl + ffmpeg + jansson + libcef + libjack2 + libv4l + libxkbcommon + libpthreadstubs + libXdmcp + qtbase + qtsvg + speex + wayland + x264 + libvlc + mbedtls + pciutils + librist + cjson + libva + srt + qtwayland + nlohmann_json + websocketpp + asio + libdatachannel + libvpl + qrcodegencpp + uthash + nv-codec-headers-12 + ] + ++ optionals scriptingSupport [ + luajit + python3 + ] + ++ optional alsaSupport alsa-lib + ++ optional pulseaudioSupport libpulseaudio + ++ optionals pipewireSupport [ + pipewire + libdrm + ] + ++ optional withFdk fdk_aac; # Copied from the obs-linuxbrowser postUnpack = '' @@ -149,7 +155,8 @@ stdenv.mkDerivation (finalAttrs: { ''; cmakeFlags = [ - "--preset" "nixpkgs-${if stdenv.hostPlatform.isDarwin then "darwin" else "linux"}" + "--preset" + "nixpkgs-${if stdenv.hostPlatform.isDarwin then "darwin" else "linux"}" "-DOBS_VERSION_OVERRIDE=${finalAttrs.version}" "-Wno-dev" # kill dev warnings that are useless for packaging # Add support for browser source @@ -172,28 +179,32 @@ stdenv.mkDerivation (finalAttrs: { ]; dontWrapGApps = true; - preFixup = let - wrapperLibraries = [ - xorg.libX11 - libvlc - libGL - ] ++ optionals decklinkSupport [ - blackmagic-desktop-video - ]; - in '' - # Remove cef components before patchelf, otherwise it will fail - rm $out/lib/obs-plugins/libcef.so - rm $out/lib/obs-plugins/libEGL.so - rm $out/lib/obs-plugins/libGLESv2.so - rm $out/lib/obs-plugins/libvk_swiftshader.so - rm $out/lib/obs-plugins/libvulkan.so.1 - rm $out/lib/obs-plugins/chrome-sandbox + preFixup = + let + wrapperLibraries = + [ + xorg.libX11 + libvlc + libGL + ] + ++ optionals decklinkSupport [ + blackmagic-desktop-video + ]; + in + '' + # Remove cef components before patchelf, otherwise it will fail + rm $out/lib/obs-plugins/libcef.so + rm $out/lib/obs-plugins/libEGL.so + rm $out/lib/obs-plugins/libGLESv2.so + rm $out/lib/obs-plugins/libvk_swiftshader.so + rm $out/lib/obs-plugins/libvulkan.so.1 + rm $out/lib/obs-plugins/chrome-sandbox - qtWrapperArgs+=( - --prefix LD_LIBRARY_PATH : "$out/lib:${lib.makeLibraryPath wrapperLibraries}" - ''${gappsWrapperArgs[@]} - ) - ''; + qtWrapperArgs+=( + --prefix LD_LIBRARY_PATH : "$out/lib:${lib.makeLibraryPath wrapperLibraries}" + ''${gappsWrapperArgs[@]} + ) + ''; postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' addDriverRunpath $out/lib/lib*.so @@ -214,9 +225,17 @@ stdenv.mkDerivation (finalAttrs: { video content, efficiently ''; homepage = "https://obsproject.com"; - maintainers = with maintainers; [ jb55 materus fpletz ]; + maintainers = with maintainers; [ + jb55 + materus + fpletz + ]; license = with licenses; [ gpl2Plus ] ++ optional withFdk fraunhofer-fdk; - platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; + platforms = [ + "x86_64-linux" + "i686-linux" + "aarch64-linux" + ]; mainProgram = "obs"; }; }) From 74b7941a4645cab57deb70fee3e5c31e7d7a7c22 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 13 Feb 2025 16:00:25 +0100 Subject: [PATCH 1764/2168] obs-studio: make browser support optional --- .../applications/video/obs-studio/default.nix | 40 ++++++++++--------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 99cb6da36458..f4e19bd370ff 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -36,6 +36,7 @@ alsa-lib, pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux, libpulseaudio, + browserSupport ? false, # FIXME: broken libcef, pciutils, pipewireSupport ? stdenv.hostPlatform.isLinux, @@ -97,7 +98,6 @@ stdenv.mkDerivation (finalAttrs: { curl ffmpeg jansson - libcef libjack2 libv4l libxkbcommon @@ -135,10 +135,11 @@ stdenv.mkDerivation (finalAttrs: { pipewire libdrm ] + ++ optional browserSupport libcef ++ optional withFdk fdk_aac; # Copied from the obs-linuxbrowser - postUnpack = '' + postUnpack = lib.optionalString browserSupport '' mkdir -p cef/Release cef/Resources cef/libcef_dll_wrapper/ for i in ${libcef}/share/cef/*; do ln -s $i cef/Release/ @@ -159,9 +160,6 @@ stdenv.mkDerivation (finalAttrs: { "nixpkgs-${if stdenv.hostPlatform.isDarwin then "darwin" else "linux"}" "-DOBS_VERSION_OVERRIDE=${finalAttrs.version}" "-Wno-dev" # kill dev warnings that are useless for packaging - # Add support for browser source - "-DENABLE_BROWSER=ON" - "-DCEF_ROOT_DIR=../../cef" "-DENABLE_JACK=ON" "-DENABLE_WEBRTC=ON" (lib.cmakeBool "ENABLE_QSV11" stdenv.hostPlatform.isx86_64) @@ -170,7 +168,8 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "ENABLE_PULSEAUDIO" pulseaudioSupport) (lib.cmakeBool "ENABLE_PIPEWIRE" pipewireSupport) (lib.cmakeBool "ENABLE_AJA" false) # TODO: fix linking against libajantv2 - ]; + (lib.cmakeBool "ENABLE_BROWSER" browserSupport) + ] ++ lib.optional browserSupport "-DCEF_ROOT_DIR=../../cef"; env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=deprecated-declarations" @@ -192,6 +191,12 @@ stdenv.mkDerivation (finalAttrs: { ]; in '' + qtWrapperArgs+=( + --prefix LD_LIBRARY_PATH : "$out/lib:${lib.makeLibraryPath wrapperLibraries}" + ''${gappsWrapperArgs[@]} + ) + '' + + lib.optionalString browserSupport '' # Remove cef components before patchelf, otherwise it will fail rm $out/lib/obs-plugins/libcef.so rm $out/lib/obs-plugins/libEGL.so @@ -199,21 +204,20 @@ stdenv.mkDerivation (finalAttrs: { rm $out/lib/obs-plugins/libvk_swiftshader.so rm $out/lib/obs-plugins/libvulkan.so.1 rm $out/lib/obs-plugins/chrome-sandbox - - qtWrapperArgs+=( - --prefix LD_LIBRARY_PATH : "$out/lib:${lib.makeLibraryPath wrapperLibraries}" - ''${gappsWrapperArgs[@]} - ) ''; - postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' - addDriverRunpath $out/lib/lib*.so - addDriverRunpath $out/lib/obs-plugins/*.so + postFixup = lib.concatStrings [ + (lib.optionalString stdenv.hostPlatform.isLinux '' + addDriverRunpath $out/lib/lib*.so + addDriverRunpath $out/lib/obs-plugins/*.so + '') - # Link cef components again after patchelfing other libs - ln -s ${libcef}/lib/* $out/lib/obs-plugins/ - ln -s ${libcef}/libexec/cef/* $out/lib/obs-plugins/ - ''; + (lib.optionalString browserSupport '' + # Link cef components again after patchelfing other libs + ln -s ${libcef}/lib/* $out/lib/obs-plugins/ + ln -s ${libcef}/libexec/cef/* $out/lib/obs-plugins/ + '') + ]; passthru.updateScript = nix-update-script { }; From f92816786a1280fc8420417ed3b58dcb0a4271b2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 15:19:33 +0000 Subject: [PATCH 1765/2168] hyprland-protocols: 0.6.1 -> 0.6.2 --- pkgs/by-name/hy/hyprland-protocols/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hy/hyprland-protocols/package.nix b/pkgs/by-name/hy/hyprland-protocols/package.nix index 68377ce31e3f..4a1a09df0c47 100644 --- a/pkgs/by-name/hy/hyprland-protocols/package.nix +++ b/pkgs/by-name/hy/hyprland-protocols/package.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "hyprland-protocols"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprland-protocols"; rev = "v${finalAttrs.version}"; - hash = "sha256-laKgI3mr2qz6tas/q3tuGPxMdsGhBi/w+HO+hO2f1AY="; + hash = "sha256-5v+bv75wJWvahyM2xcMTSNNxmV8a7hb01Eey5zYnBJw="; }; nativeBuildInputs = [ From 4247ec2c9b9088020cd99fd2689fa693c72f52cd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 15:20:37 +0000 Subject: [PATCH 1766/2168] snazy: 0.54.0 -> 0.55.0 --- pkgs/by-name/sn/snazy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sn/snazy/package.nix b/pkgs/by-name/sn/snazy/package.nix index cb367b1e7c5b..38efbbf4ec75 100644 --- a/pkgs/by-name/sn/snazy/package.nix +++ b/pkgs/by-name/sn/snazy/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "snazy"; - version = "0.54.0"; + version = "0.55.0"; src = fetchFromGitHub { owner = "chmouel"; repo = pname; rev = version; - hash = "sha256-1+UbUwvv5HWiQ+u9gPtJ3JwP6cMi4IZOCSMedXzWEoQ="; + hash = "sha256-Vc3L93S7WQAcqsLIhiCrTGmmc+1q26zRpOWXyUNFNVc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Y2GUE9S0bZFVvu9bvs8WptrdO1V27z+Vu/eQDNvq7pE="; + cargoHash = "sha256-ZieQfjRSxO5LEpQaXFIPcdejoG+6Mw4FCM/7LcbwRro="; nativeBuildInputs = [ installShellFiles ]; From 9080f707f604f688595af86e61e9c485d7fecde8 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Thu, 13 Feb 2025 16:24:39 +0100 Subject: [PATCH 1767/2168] python3Packages.pylsqpack: Update build-system MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Robert Schütz --- pkgs/development/python-modules/pylsqpack/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pylsqpack/default.nix b/pkgs/development/python-modules/pylsqpack/default.nix index 0febb5ed8065..ec9aa62cd5eb 100644 --- a/pkgs/development/python-modules/pylsqpack/default.nix +++ b/pkgs/development/python-modules/pylsqpack/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { hash = "sha256-Up+j49bxsO7JK0NFA8DsVRy3FAI8wXEJEfZl+raobr0="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; From 8e3d4b3e7a2538b6d3d9a777b2182167461737b2 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 13 Feb 2025 16:29:22 +0100 Subject: [PATCH 1768/2168] nextcloud29: 29.0.11 -> 29.0.12 https://github.com/nextcloud/server/releases/tag/v29.0.12 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index a06f49658769..6815dc591274 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -59,8 +59,8 @@ let in { nextcloud29 = generic { - version = "29.0.11"; - hash = "sha256-UGf8F91zICzC39m5ccp7uUy5UEghRgJ9rGILEjweztE="; + version = "29.0.12"; + hash = "sha256-wCA1T/Ph0ghzcPcOBY/hcXE2NroPBzpRlK29/zwcr8Y="; packages = nextcloud29Packages; }; From d37ed07048e65b5e9b46ed9ec6b1c68f2d104870 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 15:29:31 +0000 Subject: [PATCH 1769/2168] python312Packages.succulent: 0.4.0 -> 0.4.1 --- pkgs/development/python-modules/succulent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/succulent/default.nix b/pkgs/development/python-modules/succulent/default.nix index 176d16318531..15648e91f617 100644 --- a/pkgs/development/python-modules/succulent/default.nix +++ b/pkgs/development/python-modules/succulent/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "succulent"; - version = "0.4.0"; + version = "0.4.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "firefly-cpp"; repo = "succulent"; tag = version; - hash = "sha256-rD0qKYmWTu0LMRdWgul8OGp1FcczSY2/OxT8+oXO78E="; + hash = "sha256-lmN31Xdp1PCLhgInGxvTKTLBXFpz3NnHYSFjKQfRfec="; }; pythonRelaxDeps = [ @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Collect POST requests"; homepage = "https://github.com/firefly-cpp/succulent"; - changelog = "https://github.com/firefly-cpp/succulent/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/firefly-cpp/succulent/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ firefly-cpp ]; }; From 183e6a6dfc863b3fb275b8308b357d596ea84c6b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 13 Feb 2025 16:30:32 +0100 Subject: [PATCH 1770/2168] nextcloud30: 30.0.5 -> 30.0.6 https://github.com/nextcloud/server/releases/tag/v30.0.6 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 6815dc591274..038b07fb4ae6 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -65,8 +65,8 @@ in }; nextcloud30 = generic { - version = "30.0.5"; - hash = "sha256-JIxubmEs7usXDE0luFebCvDmYTq9+gfy/mmTQmt4G+o="; + version = "30.0.6"; + hash = "sha256-rA4JG+aSCWXcDILxSbYy1rWt563uhKezyM/YR0UKjdw="; packages = nextcloud30Packages; }; From 2d522ae1414fd3c1a5ade474aea1e57b4cf8cfc0 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 13 Feb 2025 16:31:03 +0100 Subject: [PATCH 1771/2168] nextcloud29Packages.apps: update --- pkgs/servers/nextcloud/packages/29.json | 52 ++++++++++++------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/pkgs/servers/nextcloud/packages/29.json b/pkgs/servers/nextcloud/packages/29.json index 3897465a9e3e..5ebdc3dbcf15 100644 --- a/pkgs/servers/nextcloud/packages/29.json +++ b/pkgs/servers/nextcloud/packages/29.json @@ -30,9 +30,9 @@ ] }, "collectives": { - "hash": "sha256-IAnJZuaj6KW6kF4daIKxvCEDCViWu30gogm8q2/ooQs=", - "url": "https://github.com/nextcloud/collectives/releases/download/v2.16.0/collectives-2.16.0.tar.gz", - "version": "2.16.0", + "hash": "sha256-1BEK5T+6w8yLSXyj/Me8QMls/LSWaor5TpvC2HK3/4U=", + "url": "https://github.com/nextcloud/collectives/releases/download/v2.16.1/collectives-2.16.1.tar.gz", + "version": "2.16.1", "description": "Collectives is a Nextcloud App for activist and community projects to organize together.\nCome and gather in collectives to build shared knowledge.\n\n* 👥 **Collective and non-hierarchical workflow by heart**: Collectives are\n tied to a [Nextcloud Team](https://github.com/nextcloud/circles) and\n owned by the collective.\n* 📝 **Collaborative page editing** like known from Etherpad thanks to the\n [Text app](https://github.com/nextcloud/text).\n* 🔤 **Well-known [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax**\n for page formatting.\n\n## Installation\n\nIn your Nextcloud instance, simply navigate to **»Apps«**, find the\n**»Teams«** and **»Collectives«** apps and enable them.", "homepage": "https://github.com/nextcloud/collectives", "licenses": [ @@ -40,9 +40,9 @@ ] }, "contacts": { - "hash": "sha256-hqCDr7qEqsi8tZ9Woz9hsUm1HENK16FNz4pcQCto8S4=", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v6.0.2/contacts-v6.0.2.tar.gz", - "version": "6.0.2", + "hash": "sha256-o7RoBhg0UFzZoxXj1Qovbheq1i7wBHnn4hSnEbc/D/c=", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v6.0.3/contacts-v6.0.3.tar.gz", + "version": "6.0.3", "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.", "homepage": "https://github.com/nextcloud/contacts#readme", "licenses": [ @@ -140,10 +140,10 @@ ] }, "groupfolders": { - "hash": "sha256-7g18TdAQKLNKrKPZO+TNiUoHtncy6aLBy4KHq7j7VHo=", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v17.0.9/groupfolders-v17.0.9.tar.gz", - "version": "17.0.9", - "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.", + "hash": "sha256-yfTZjAsmv2wdMNNP1Tm0fmzSIlUwRfMraNPgFEHW238=", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v17.0.10/groupfolders-v17.0.10.tar.gz", + "version": "17.0.10", + "description": "Admin configured folders shared with everyone in a team.\n\nFolders can be configured from *Team folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more teams, control their write/sharing permissions and assign a quota for the folder.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ "agpl" @@ -190,9 +190,9 @@ ] }, "mail": { - "hash": "sha256-i2gBkqRPvHyZL8raWTIordGVhY1NWi4KN1JLbsQd/8k=", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.19/mail-v3.7.19.tar.gz", - "version": "3.7.19", + "hash": "sha256-YGgJgWZYnJuhhHxabx/tUmcnmfDgjWiZUBnhGThihrU=", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.20/mail-v3.7.20.tar.gz", + "version": "3.7.20", "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -250,10 +250,10 @@ ] }, "onlyoffice": { - "hash": "sha256-YXj0tHU++S7YDMYj/Eg5KsSX3qBSYtyuPZfiOBQ8cjk=", - "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.5.0/onlyoffice.tar.gz", - "version": "9.5.0", - "description": "ONLYOFFICE connector allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.", + "hash": "sha256-zAhrnZ/rzzo6+ycozd8ihxIHVRHmQ+haudts2PcxnoM=", + "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.6.0/onlyoffice.tar.gz", + "version": "9.6.0", + "description": "ONLYOFFICE app allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.", "homepage": "https://www.onlyoffice.com", "licenses": [ "agpl" @@ -280,9 +280,9 @@ ] }, "previewgenerator": { - "hash": "sha256-kTYmN/tAJwjj2KwnrKVIZa5DhyXHjuNWNskqJZxs4sY=", - "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.7.0/previewgenerator-v5.7.0.tar.gz", - "version": "5.7.0", + "hash": "sha256-dPUvtVFtSqlG9M1RXZ8u7nL3wgK5yFU2/pL9pFLjisc=", + "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.8.0/previewgenerator-v5.8.0.tar.gz", + "version": "5.8.0", "description": "The Preview Generator app allows admins to pre-generate previews. The app listens to edit events and stores this information. Once a cron job is triggered it will generate start preview generation. This means that you can better utilize your system by pre-generating previews when your system is normally idle and thus putting less load on your machine when the requests are actually served.\n\nThe app does not replace on demand preview generation so if a preview is requested before it is pre-generated it will still be shown.\nThe first time you install this app, before using a cron job, you properly want to generate all previews via:\n**./occ preview:generate-all -vvv**\n\n**Important**: To enable pre-generation of previews you must add **php /var/www/nextcloud/occ preview:pre-generate** to a system cron job that runs at times of your choosing.", "homepage": "https://github.com/nextcloud/previewgenerator", "licenses": [ @@ -330,9 +330,9 @@ ] }, "sociallogin": { - "hash": "sha256-P9OBXDW3+iOtC9/dQ/M89YxY3OQ0u5I8Z1XQLvYznEo=", - "url": "https://github.com/zorn-v/nextcloud-social-login/releases/download/v5.8.4/release.tar.gz", - "version": "5.8.4", + "hash": "sha256-XJbeVUYr3NZvynZyRlRtc0NNEJxcIHjwNst/J2+IBUM=", + "url": "https://github.com/zorn-v/nextcloud-social-login/releases/download/v5.9.1/release.tar.gz", + "version": "5.9.1", "description": "# Social login\n\nMake possible create users and login via Telegram, OAuth or OpenID\n\nFor OAuth you must create app for certain providers. Login button appear at login page if app id specified. Settings are in \"Social login\" section of settings page.\n\n## Installation\n\nLogin to your NextCloud installation as an administrator and under \"Apps\" click \"Download and enable\" next to the \"Social Login\" app.\n\nSee below for setup and configuration instructions.\n\n\n\n## Custom OAuth2/OIDC groups\n\nYou can use groups from your custom provider. For that you should specify \"Groups claim\" in custom OAuth2/OIDC provider settings. That claim should be returned from provider in `id_token` or at user info endpoint. Format should be `array` or comma separated string. Eg (with claim named `roles`)\n\n```json\n{\"roles\": [\"admin\", \"user\"]}\n```\nor\n```json\n{\"roles\": \"admin,user\"}\n```\n\nAlso nested claims is supported. For example `resource_access.client-id.roles` for\n\n```json\n\"resource_access\": {\n \"client-id\": {\n \"roles\": [\n \"client-role-1\",\n \"client-role-2\"\n ]\n }\n}\n```\n\nThere is also support for setting the displayName:\n```\n{\"roles\": [{gid: 1, displayName: \"admin\"}, {gid: 2, displayName: \"user\"}]}\n```\n\n\nYou can use provider groups in two ways:\n\n1. Map provider groups to existing nextcloud groups\n2. Create provider groups in nextcloud and associate it to user (if appropriate option specified)\n\nIf you want sync groups on every login do not forget to check \"Update user profile every login\" setting\n\n## Examples for groups\n\n* You can find example how to configure WSO2IS for return roles claim with OIDC [here](https://medium.com/@dewni.matheesha/claim-mapping-and-retrieving-end-user-information-in-wso2is-cffd5f3937ff)\n* [GitLab OIDC allowing specific GitLab groups](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/gitlab.md)\n\n## Built-in OAuth providers\n\nYou can copy link of certain login button to get proper \"redirect url\" for OAuth app setting.\n\n* [Google](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/google.md)\n* [Amazon](https://developer.amazon.com/loginwithamazon/console/site/lwa/overview.html)\n* [Facebook](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/facebook.md)\n* [Twitter](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/twitter.md)\n* [GitHub](https://github.com/settings/developers)\n* [Discord](#configure-discord)\n* [Telegram](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/telegram.md)\n* PlexTv - you can use any title as app id\n* [Codeberg](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/codeberg.md)\n\nDetails about \"Allow login only from specified domain\" google setting you can find here [#44](https://github.com/zorn-v/nextcloud-social-login/issues/44)\nYou can use comma separated list for multiple domains\n\n## Config\n\nYou can use `'social_login_auto_redirect' => true` setting in `config.php` for auto redirect unauthorized users to social login if only one provider is configured.\nIf you want to temporary disable this function (e.g. for login as local admin), you can add `noredir=1` query parameter in url for login page. Something like `https://cloud.domain.com/login?noredir=1`\n\nTo set options for http client, you can use\n```php\n 'social_login_http_client' => [\n 'timeout' => 45,\n 'proxy' => 'socks4://127.0.0.1:9050', // Check https://curl.se/libcurl/c/CURLOPT_PROXY.html for allowed variants\n ],\n```\nin `config.php`\n\n### Configurate a provider via CLI\n\nYou can configure everything from commandline by using the occ utility. To setup a oidc-provider replace the variables and URLs with values that match your deployment.\n```bash\nphp occ config:app:set sociallogin custom_providers --value='{\"custom_oidc\": [{\"name\": \"gitlab_oidc\", \"title\": \"Gitlab\", \"authorizeUrl\": \"https://gitlab.my-domain.org/oauth/authorize\", \"tokenUrl\": \"https://gitlab.my-domain.org/oauth/token\", \"userInfoUrl\": \"https://gitlab.my-domain.org/oauth/userinfo\", \"logoutUrl\": \"\", \"clientId\": \"$my_application_id\", \"clientSecret\": \"$my_super_secret_secret\", \"scope\": \"openid\", \"groupsClaim\": \"groups\", \"style\": \"gitlab\", \"defaultGroup\": \"\"}]}'\n```\nto do this with docker you just need to add `docker exec -t -uwww-data CONTAINER_NAME` in front of the command, or run it interactively from `docker exec -it -uwww-data CONTAINER_NAME sh`\n\nTo find out how to configure other providers, just configure them in the GUI and take a look at the database afterwards:\n```\nmysql -u nextcloud -p nextcloud\nPassword: \n\n> SELECT * FROM oc_appconfig WHERE appid='sociallogin';\n```\n\nOr just run\n\n`docker exec -t -uwww-data CONTAINER_NAME php occ config:app:get sociallogin custom_providers`\n\n### Configure Discord\n\nTo properly configure discord you have to:\n\n1. Create new discord application on [DiscordApp developers](https://discordapp.com/developers/applications/me#top)\n2. Open tab `Settings -> OAuth2 -> General`. In `Redirects` add new redirection link looking like this: `https://nextcloud.mydomain.com/apps/sociallogin/oauth/discord`.\n3. Copy `CLIENT ID` and generate and copy `CLIENT SECRET`\n4. Open in Nextcloud `Settings -> Social Login` and paste `CLIENT ID` into field `App id` and `CLIENT SECRET` into `Secret`.\n5. Select default group for users created this way.\n6. For group mapping check [#395](https://github.com/zorn-v/nextcloud-social-login/pull/395)\n\n## Hint\n\n### About Callback(Reply) Url\nYou can copy link from specific login button on login page and paste it on provider's website as callback url. To make proper button visible, just fill certain provider settings with random data and change it later.\n\nSome users may get strange reply(Callback) url error from provider even if you pasted the right url, that's because your nextcloud server may generate http urls when you are actually using https.\nPlease set 'overwriteprotocol' => 'https', in your config.php file.", "homepage": "https://github.com/zorn-v/nextcloud-social-login", "licenses": [ @@ -340,9 +340,9 @@ ] }, "spreed": { - "hash": "sha256-8C2TopybeFczpaNQF3IWeVh3uPXmNjQ1mdcWTyYOsZw=", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v19.0.12/spreed-v19.0.12.tar.gz", - "version": "19.0.12", + "hash": "sha256-JJp0dzFKJttDBuPOavraF7odo/0tVoDAeMPHVkmB78s=", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v19.0.13/spreed-v19.0.13.tar.gz", + "version": "19.0.13", "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* 👥 **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* 💻 **Screen sharing!** Share your screen with the participants of your call.\n* 🚀 **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* 🌉 **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ From fa16f61c2aabb9304c8d73fc38a25e20368457a3 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 13 Feb 2025 16:31:25 +0100 Subject: [PATCH 1772/2168] nextcloud30Packages.apps: update --- pkgs/servers/nextcloud/packages/30.json | 46 ++++++++++++------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/pkgs/servers/nextcloud/packages/30.json b/pkgs/servers/nextcloud/packages/30.json index 43b275a222f5..c8b141c9b863 100644 --- a/pkgs/servers/nextcloud/packages/30.json +++ b/pkgs/servers/nextcloud/packages/30.json @@ -20,9 +20,9 @@ ] }, "calendar": { - "hash": "sha256-nroc7URZtN5LhGg4wYgr3wD0k8k3vYj9k/V4H0JF2C0=", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.0.9/calendar-v5.0.9.tar.gz", - "version": "5.0.9", + "hash": "sha256-QWJJOj4Iy/BLXWzHihoQaAhFkU05plZ/AV55QrW0Pag=", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.0.10/calendar-v5.0.10.tar.gz", + "version": "5.0.10", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -30,9 +30,9 @@ ] }, "collectives": { - "hash": "sha256-IAnJZuaj6KW6kF4daIKxvCEDCViWu30gogm8q2/ooQs=", - "url": "https://github.com/nextcloud/collectives/releases/download/v2.16.0/collectives-2.16.0.tar.gz", - "version": "2.16.0", + "hash": "sha256-1BEK5T+6w8yLSXyj/Me8QMls/LSWaor5TpvC2HK3/4U=", + "url": "https://github.com/nextcloud/collectives/releases/download/v2.16.1/collectives-2.16.1.tar.gz", + "version": "2.16.1", "description": "Collectives is a Nextcloud App for activist and community projects to organize together.\nCome and gather in collectives to build shared knowledge.\n\n* 👥 **Collective and non-hierarchical workflow by heart**: Collectives are\n tied to a [Nextcloud Team](https://github.com/nextcloud/circles) and\n owned by the collective.\n* 📝 **Collaborative page editing** like known from Etherpad thanks to the\n [Text app](https://github.com/nextcloud/text).\n* 🔤 **Well-known [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax**\n for page formatting.\n\n## Installation\n\nIn your Nextcloud instance, simply navigate to **»Apps«**, find the\n**»Teams«** and **»Collectives«** apps and enable them.", "homepage": "https://github.com/nextcloud/collectives", "licenses": [ @@ -140,10 +140,10 @@ ] }, "groupfolders": { - "hash": "sha256-MPNSmqVzYSwEXM9ZyV7xEvUrmH8WYdpKHPcVWWQpt8M=", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v18.0.9/groupfolders-v18.0.9.tar.gz", - "version": "18.0.9", - "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.", + "hash": "sha256-LR+b5weiFGsk/uozT39rwCeo98PjLcJOMyn5B/OgkvU=", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v18.0.10/groupfolders-v18.0.10.tar.gz", + "version": "18.0.10", + "description": "Admin configured folders shared with everyone in a team.\n\nFolders can be configured from *Team folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more teams, control their write/sharing permissions and assign a quota for the folder.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ "agpl" @@ -250,10 +250,10 @@ ] }, "onlyoffice": { - "hash": "sha256-YXj0tHU++S7YDMYj/Eg5KsSX3qBSYtyuPZfiOBQ8cjk=", - "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.5.0/onlyoffice.tar.gz", - "version": "9.5.0", - "description": "ONLYOFFICE connector allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.", + "hash": "sha256-zAhrnZ/rzzo6+ycozd8ihxIHVRHmQ+haudts2PcxnoM=", + "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.6.0/onlyoffice.tar.gz", + "version": "9.6.0", + "description": "ONLYOFFICE app allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.", "homepage": "https://www.onlyoffice.com", "licenses": [ "agpl" @@ -280,9 +280,9 @@ ] }, "previewgenerator": { - "hash": "sha256-kTYmN/tAJwjj2KwnrKVIZa5DhyXHjuNWNskqJZxs4sY=", - "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.7.0/previewgenerator-v5.7.0.tar.gz", - "version": "5.7.0", + "hash": "sha256-dPUvtVFtSqlG9M1RXZ8u7nL3wgK5yFU2/pL9pFLjisc=", + "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.8.0/previewgenerator-v5.8.0.tar.gz", + "version": "5.8.0", "description": "The Preview Generator app allows admins to pre-generate previews. The app listens to edit events and stores this information. Once a cron job is triggered it will generate start preview generation. This means that you can better utilize your system by pre-generating previews when your system is normally idle and thus putting less load on your machine when the requests are actually served.\n\nThe app does not replace on demand preview generation so if a preview is requested before it is pre-generated it will still be shown.\nThe first time you install this app, before using a cron job, you properly want to generate all previews via:\n**./occ preview:generate-all -vvv**\n\n**Important**: To enable pre-generation of previews you must add **php /var/www/nextcloud/occ preview:pre-generate** to a system cron job that runs at times of your choosing.", "homepage": "https://github.com/nextcloud/previewgenerator", "licenses": [ @@ -330,9 +330,9 @@ ] }, "sociallogin": { - "hash": "sha256-P9OBXDW3+iOtC9/dQ/M89YxY3OQ0u5I8Z1XQLvYznEo=", - "url": "https://github.com/zorn-v/nextcloud-social-login/releases/download/v5.8.4/release.tar.gz", - "version": "5.8.4", + "hash": "sha256-XJbeVUYr3NZvynZyRlRtc0NNEJxcIHjwNst/J2+IBUM=", + "url": "https://github.com/zorn-v/nextcloud-social-login/releases/download/v5.9.1/release.tar.gz", + "version": "5.9.1", "description": "# Social login\n\nMake possible create users and login via Telegram, OAuth or OpenID\n\nFor OAuth you must create app for certain providers. Login button appear at login page if app id specified. Settings are in \"Social login\" section of settings page.\n\n## Installation\n\nLogin to your NextCloud installation as an administrator and under \"Apps\" click \"Download and enable\" next to the \"Social Login\" app.\n\nSee below for setup and configuration instructions.\n\n\n\n## Custom OAuth2/OIDC groups\n\nYou can use groups from your custom provider. For that you should specify \"Groups claim\" in custom OAuth2/OIDC provider settings. That claim should be returned from provider in `id_token` or at user info endpoint. Format should be `array` or comma separated string. Eg (with claim named `roles`)\n\n```json\n{\"roles\": [\"admin\", \"user\"]}\n```\nor\n```json\n{\"roles\": \"admin,user\"}\n```\n\nAlso nested claims is supported. For example `resource_access.client-id.roles` for\n\n```json\n\"resource_access\": {\n \"client-id\": {\n \"roles\": [\n \"client-role-1\",\n \"client-role-2\"\n ]\n }\n}\n```\n\nThere is also support for setting the displayName:\n```\n{\"roles\": [{gid: 1, displayName: \"admin\"}, {gid: 2, displayName: \"user\"}]}\n```\n\n\nYou can use provider groups in two ways:\n\n1. Map provider groups to existing nextcloud groups\n2. Create provider groups in nextcloud and associate it to user (if appropriate option specified)\n\nIf you want sync groups on every login do not forget to check \"Update user profile every login\" setting\n\n## Examples for groups\n\n* You can find example how to configure WSO2IS for return roles claim with OIDC [here](https://medium.com/@dewni.matheesha/claim-mapping-and-retrieving-end-user-information-in-wso2is-cffd5f3937ff)\n* [GitLab OIDC allowing specific GitLab groups](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/gitlab.md)\n\n## Built-in OAuth providers\n\nYou can copy link of certain login button to get proper \"redirect url\" for OAuth app setting.\n\n* [Google](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/google.md)\n* [Amazon](https://developer.amazon.com/loginwithamazon/console/site/lwa/overview.html)\n* [Facebook](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/facebook.md)\n* [Twitter](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/twitter.md)\n* [GitHub](https://github.com/settings/developers)\n* [Discord](#configure-discord)\n* [Telegram](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/telegram.md)\n* PlexTv - you can use any title as app id\n* [Codeberg](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/codeberg.md)\n\nDetails about \"Allow login only from specified domain\" google setting you can find here [#44](https://github.com/zorn-v/nextcloud-social-login/issues/44)\nYou can use comma separated list for multiple domains\n\n## Config\n\nYou can use `'social_login_auto_redirect' => true` setting in `config.php` for auto redirect unauthorized users to social login if only one provider is configured.\nIf you want to temporary disable this function (e.g. for login as local admin), you can add `noredir=1` query parameter in url for login page. Something like `https://cloud.domain.com/login?noredir=1`\n\nTo set options for http client, you can use\n```php\n 'social_login_http_client' => [\n 'timeout' => 45,\n 'proxy' => 'socks4://127.0.0.1:9050', // Check https://curl.se/libcurl/c/CURLOPT_PROXY.html for allowed variants\n ],\n```\nin `config.php`\n\n### Configurate a provider via CLI\n\nYou can configure everything from commandline by using the occ utility. To setup a oidc-provider replace the variables and URLs with values that match your deployment.\n```bash\nphp occ config:app:set sociallogin custom_providers --value='{\"custom_oidc\": [{\"name\": \"gitlab_oidc\", \"title\": \"Gitlab\", \"authorizeUrl\": \"https://gitlab.my-domain.org/oauth/authorize\", \"tokenUrl\": \"https://gitlab.my-domain.org/oauth/token\", \"userInfoUrl\": \"https://gitlab.my-domain.org/oauth/userinfo\", \"logoutUrl\": \"\", \"clientId\": \"$my_application_id\", \"clientSecret\": \"$my_super_secret_secret\", \"scope\": \"openid\", \"groupsClaim\": \"groups\", \"style\": \"gitlab\", \"defaultGroup\": \"\"}]}'\n```\nto do this with docker you just need to add `docker exec -t -uwww-data CONTAINER_NAME` in front of the command, or run it interactively from `docker exec -it -uwww-data CONTAINER_NAME sh`\n\nTo find out how to configure other providers, just configure them in the GUI and take a look at the database afterwards:\n```\nmysql -u nextcloud -p nextcloud\nPassword: \n\n> SELECT * FROM oc_appconfig WHERE appid='sociallogin';\n```\n\nOr just run\n\n`docker exec -t -uwww-data CONTAINER_NAME php occ config:app:get sociallogin custom_providers`\n\n### Configure Discord\n\nTo properly configure discord you have to:\n\n1. Create new discord application on [DiscordApp developers](https://discordapp.com/developers/applications/me#top)\n2. Open tab `Settings -> OAuth2 -> General`. In `Redirects` add new redirection link looking like this: `https://nextcloud.mydomain.com/apps/sociallogin/oauth/discord`.\n3. Copy `CLIENT ID` and generate and copy `CLIENT SECRET`\n4. Open in Nextcloud `Settings -> Social Login` and paste `CLIENT ID` into field `App id` and `CLIENT SECRET` into `Secret`.\n5. Select default group for users created this way.\n6. For group mapping check [#395](https://github.com/zorn-v/nextcloud-social-login/pull/395)\n\n## Hint\n\n### About Callback(Reply) Url\nYou can copy link from specific login button on login page and paste it on provider's website as callback url. To make proper button visible, just fill certain provider settings with random data and change it later.\n\nSome users may get strange reply(Callback) url error from provider even if you pasted the right url, that's because your nextcloud server may generate http urls when you are actually using https.\nPlease set 'overwriteprotocol' => 'https', in your config.php file.", "homepage": "https://github.com/zorn-v/nextcloud-social-login", "licenses": [ @@ -340,9 +340,9 @@ ] }, "spreed": { - "hash": "sha256-j2r0dJ5QYrGHFbCfuuyOmXR7oEN78Nagn5Qb8kzmknA=", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v20.1.3/spreed-v20.1.3.tar.gz", - "version": "20.1.3", + "hash": "sha256-+MYplCq6Kx1UiEz+Isbit7kQNhe4dncy6W+y7eMzuiA=", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v20.1.4/spreed-v20.1.4.tar.gz", + "version": "20.1.4", "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* 👥 **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* 💻 **Screen sharing!** Share your screen with the participants of your call.\n* 🚀 **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* 🌉 **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ From e2883d94b38b2a9538978590e0d032ce8067c411 Mon Sep 17 00:00:00 2001 From: emilylange Date: Thu, 13 Feb 2025 16:36:50 +0100 Subject: [PATCH 1773/2168] chromium,chromedriver: 133.0.6943.53 -> 133.0.6943.98 https://chromereleases.googleblog.com/2025/02/stable-channel-update-for-desktop_12.html This update includes 4 security fixes. CVEs: CVE-2025-0995 CVE-2025-0996 CVE-2025-0997 CVE-2025-0998 --- .../networking/browsers/chromium/info.json | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index ec6ffb4603a7..543b0b439df0 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -1,9 +1,9 @@ { "chromium": { - "version": "133.0.6943.53", + "version": "133.0.6943.98", "chromedriver": { - "hash_darwin": "sha256-aMpn8kj3Guj8HxNMEwujZbE2R4jNTRDVO+cg8JgOvkA=", - "hash_darwin_aarch64": "sha256-SWLTeD4aJVHKl2BXGUJRNL0eslMNhm+9zWrWh5EMQiY=" + "hash_darwin": "sha256-OD/E+h4APHs8qBXdDyhBtZ42D3PvbBJHhbRXMxWY/34=", + "hash_darwin_aarch64": "sha256-H3JEby9RZPT2cCmuzOvc7n6+SOy1EMcH0v71g7Z1yio=" }, "deps": { "depot_tools": { @@ -19,8 +19,8 @@ "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "9a80935019b0925b01cc21d254da203bc3986f04", - "hash": "sha256-doJ/HygMtLxr04S73lhs5kTt8qC7SHrCxHbjAoFPv2M=", + "rev": "da53563ceb66412e2637507c8724bd0cab05e453", + "hash": "sha256-yltjJNXU+YQD/sFEa8+ZKqUJpVZ2Yi0YDx27bnekcng=", "recompress": true }, "src/third_party/clang-format/script": { @@ -575,8 +575,8 @@ }, "src/third_party/pdfium": { "url": "https://pdfium.googlesource.com/pdfium.git", - "rev": "c674dba647e81805158339785c0c7e3b57643f8c", - "hash": "sha256-2Z7Dg3IuxMB+xKFURo0Z7NztPQht7Fd+A1dX99gQ+A4=" + "rev": "b57762c6c6ad261024f11fc724687593c03cce67", + "hash": "sha256-ksN/7volHAeQLJSFQMV/YOfkXyZ97GSawXp31uca4oc=" }, "src/third_party/perfetto": { "url": "https://android.googlesource.com/platform/external/perfetto.git", @@ -755,8 +755,8 @@ }, "src/third_party/webrtc": { "url": "https://webrtc.googlesource.com/src.git", - "rev": "283b6ef9d3eabe5bb3ed7c9d6b6d211a92f9b6d0", - "hash": "sha256-KMyO88KoYiTHq+stdbc8vRYqeQbrqexDIiOeWbqytrU=" + "rev": "cd3e2951ff0f36fa12bea747862c52533a2b39f3", + "hash": "sha256-5tdES3wILTC25Lvos5mWYlfT4ZnM2pBFy5LVACVMXEY=" }, "src/third_party/wuffs/src": { "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git", @@ -785,8 +785,8 @@ }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "fe051262efbbd92479a08436f733eba9f756e008", - "hash": "sha256-l3hMgnhy2Ml6kExwGFWi+M6Oq4YFsOSIkRDCmji+syY=" + "rev": "79c3c1ab7faee8247b740b4ec660a998f2881633", + "hash": "sha256-fmd2mIjJs6l9zRTJ2bFIMQNnApFN3epeS+57TBlF/Uk=" } } }, From 054a8e73de970eac9a140d11bf64cc82e5423394 Mon Sep 17 00:00:00 2001 From: Lorenzo Manacorda Date: Thu, 13 Feb 2025 16:39:29 +0100 Subject: [PATCH 1774/2168] go-ethereum 1.14.13 -> 1.15.0 The bootnode sub-package has been removed in https://github.com/ethereum/go-ethereum/pull/30813. --- pkgs/by-name/go/go-ethereum/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/go/go-ethereum/package.nix b/pkgs/by-name/go/go-ethereum/package.nix index abff2184e684..679de8f72c76 100644 --- a/pkgs/by-name/go/go-ethereum/package.nix +++ b/pkgs/by-name/go/go-ethereum/package.nix @@ -18,17 +18,17 @@ let in buildGoModule rec { pname = "go-ethereum"; - version = "1.14.13"; + version = "1.15.0"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - hash = "sha256-oJe+V11WArXVmoIC7nYN6oKc0VoHtRtelidyb3v6skI="; + hash = "sha256-qfk9G3/wzeh8Nf7BG4Qv6It/bY1ZYoYyHsgoqgCyd6E="; }; proxyVendor = true; - vendorHash = "sha256-IEwy3XRyj+5GjAWRjPsd5qzwEMpI/pZIwPjKdeATgkE="; + vendorHash = "sha256-gTwmtrdj3+Pa4UxaUuhwk2Dtgur82Tbd0ict1cgVinw="; doCheck = false; @@ -46,7 +46,6 @@ buildGoModule rec { "cmd/abidump" "cmd/abigen" "cmd/blsync" - "cmd/bootnode" "cmd/clef" "cmd/devp2p" "cmd/era" From 9569ee01c536b37b813da042a5e7d2296dfa0425 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 15:43:04 +0000 Subject: [PATCH 1775/2168] python312Packages.wagtail-localize: 1.11.1 -> 1.11.3 --- .../development/python-modules/wagtail-localize/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/wagtail-localize/default.nix b/pkgs/development/python-modules/wagtail-localize/default.nix index bd492a5171b8..d1c9a6614d0e 100644 --- a/pkgs/development/python-modules/wagtail-localize/default.nix +++ b/pkgs/development/python-modules/wagtail-localize/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "wagtail-localize"; - version = "1.11.1"; + version = "1.11.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { repo = "wagtail-localize"; owner = "wagtail"; tag = "v${version}"; - hash = "sha256-HBc5t74zA7kUE8pvaYRZtslVInWrTw0UkmrGd+xaW0Q="; + hash = "sha256-uTZqpitexB5e2/W9HtNo0j4gOW9vDS2BsaVq16BUFM4="; }; build-system = [ flit-core ]; @@ -60,7 +60,7 @@ buildPythonPackage rec { meta = with lib; { description = "Translation plugin for Wagtail CMS"; homepage = "https://github.com/wagtail/wagtail-localize"; - changelog = "https://github.com/wagtail/wagtail-localize/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/wagtail/wagtail-localize/blob/${src.tag}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ sephi ]; }; From 8562dce80e7082b95758556b203ddf883e912dc1 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 13 Feb 2025 16:44:30 +0100 Subject: [PATCH 1776/2168] akkuPackages.akku: fix aarch64 build --- pkgs/tools/package-management/akku/overrides.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/akku/overrides.nix b/pkgs/tools/package-management/akku/overrides.nix index 1de84dcae643..d885e686c9db 100644 --- a/pkgs/tools/package-management/akku/overrides.nix +++ b/pkgs/tools/package-management/akku/overrides.nix @@ -25,6 +25,7 @@ in tables-test.ikarus.sps lazy.sps pipeline-operators.sps + os-environment-variables.sps ' ''; }) @@ -45,7 +46,9 @@ in src = akku.src; }) # not a tar archive - (pkg: old: removeAttrs old [ "unpackPhase" ]) + (pkg: old: { + unpackPhase = null; + }) ]; machine-code = pkg: old: { From ca39ecc1a5eb7dd5fbffbe6828c29a7a77d1c10f Mon Sep 17 00:00:00 2001 From: Lorenzo Manacorda Date: Thu, 13 Feb 2025 16:46:11 +0100 Subject: [PATCH 1777/2168] go-ethereum: add asymmetric as maintainer --- pkgs/by-name/go/go-ethereum/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/go/go-ethereum/package.nix b/pkgs/by-name/go/go-ethereum/package.nix index 679de8f72c76..df1dc289bd45 100644 --- a/pkgs/by-name/go/go-ethereum/package.nix +++ b/pkgs/by-name/go/go-ethereum/package.nix @@ -74,7 +74,10 @@ buildGoModule rec { lgpl3Only gpl3Only ]; - maintainers = with maintainers; [ RaghavSood ]; + maintainers = with maintainers; [ + asymmetric + RaghavSood + ]; mainProgram = "geth"; }; } From 97804c7e62ea070d9138f38f2f93e428388c013f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Feb 2025 16:54:20 +0100 Subject: [PATCH 1778/2168] python313Packages.archinfo: 9.2.140 -> 9.2.141 Diff: https://github.com/angr/archinfo/compare/refs/tags/v9.2.140...v9.2.141 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 6a44d191d51e..fd16daacfbb8 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.140"; + version = "9.2.141"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "angr"; repo = "archinfo"; tag = "v${version}"; - hash = "sha256-7yBjLamoxFs+9XJNb/BcHiTgzRuEnszaahMm1HBmlfo="; + hash = "sha256-DRkviSduWDxps5XPdoTRL+Sy/fXrjsZjO4aeBVFjT9E="; }; build-system = [ setuptools ]; From 508c8ff7e3854221bec45db01d4485449cca1a77 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Feb 2025 16:54:36 +0100 Subject: [PATCH 1779/2168] python313Packages.ailment: 9.2.140 -> 9.2.141 Diff: https://github.com/angr/ailment/compare/refs/tags/v9.2.140...v9.2.141 --- pkgs/development/python-modules/ailment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 3b72a533f979..855cd8902a6d 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.140"; + version = "9.2.141"; pyproject = true; disabled = pythonOlder "3.11"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "angr"; repo = "ailment"; tag = "v${version}"; - hash = "sha256-J4Wu2EbDnwj63kDQSIPWZmTB61nAATZHeawCxLC5lbY="; + hash = "sha256-TNwqf5MMqIaugOEiB0CQKAPI7AvjKTp9zJocc4GUvpg="; }; build-system = [ setuptools ]; From 1bdf86d94d958b90fb822c1706e0579b6e7078f1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Feb 2025 16:56:00 +0100 Subject: [PATCH 1780/2168] python313Packages.pyvex: 9.2.140 -> 9.2.141 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index ce5ca8b9ee53..44fc8b4b3bf0 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.140"; + version = "9.2.141"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-UdUODBxVoCwJw8eNHNix6oimHz2oa6oWnIPEfmCJ50w="; + hash = "sha256-8Z2Xy6N/P2THbi/wRoM/59XzRrwDgiOxALn7OvHY4GY="; }; build-system = [ setuptools ]; From 612f328087580d534ce0012a366f59919776213e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Feb 2025 16:56:18 +0100 Subject: [PATCH 1781/2168] python313Packages.claripy: 9.2.140 -> 9.2.141 Diff: https://github.com/angr/claripy/compare/refs/tags/v9.2.140...v9.2.141 --- pkgs/development/python-modules/claripy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index a5ad48ef74d9..4ab30cc416f9 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.140"; + version = "9.2.141"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "angr"; repo = "claripy"; tag = "v${version}"; - hash = "sha256-VnvAIQm4TiNUGmpg1agOj/qEQZiR011M1BQdSyrCY5Y="; + hash = "sha256-CP7U8S9JDeElR39XvcSKt3l7Um5qDJ19aJ2x9nj2+2Q="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail From 352da57d86d555425f97211e745d6b54acb01778 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Feb 2025 16:57:55 +0100 Subject: [PATCH 1782/2168] python313Packages.cle: 9.2.140 -> 9.2.141 Diff: https://github.com/angr/cle/compare/refs/tags/v9.2.140...v9.2.141 --- pkgs/development/python-modules/cle/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 15156a0c5186..b9f3a48bdf30 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -16,14 +16,14 @@ let # The binaries are following the argr projects release cycle - version = "9.2.140"; + version = "9.2.141"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { owner = "angr"; repo = "binaries"; rev = "refs/tags/v${version}"; - hash = "sha256-H+2ZfSqbu4dsioQdIZxSQZW2Q6liqL114GgZgflSqqE="; + hash = "sha256-QrelXkl+hpiz+7Uwobx+ZY9I9lhCuhevpXq2JqJNj5c="; }; in buildPythonPackage rec { @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "angr"; repo = "cle"; rev = "refs/tags/v${version}"; - hash = "sha256-3z1cOaSO2XMA4h1U6N+PS+YnrS/ujGDDsZqTks1hu5w="; + hash = "sha256-1l3wiyRhUuaw2eO+34lBcS2POlJoBVBuiOY6VoglD+A="; }; build-system = [ setuptools ]; From 3d9bfbf8dfe0be1f3887915385883040deab6ab6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Feb 2025 17:00:17 +0100 Subject: [PATCH 1783/2168] python312Packages.angr: 9.2.140 -> 9.2.141 Diff: https://github.com/angr/angr/compare/refs/tags/v9.2.140...v9.2.141 --- pkgs/development/python-modules/angr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 2c4ebdd856aa..78827310fb12 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.140"; + version = "9.2.141"; pyproject = true; disabled = pythonOlder "3.11"; @@ -45,7 +45,7 @@ buildPythonPackage rec { owner = "angr"; repo = "angr"; tag = "v${version}"; - hash = "sha256-wo+4DgZlcUvuz8DJR7upsKeWlTh1CYAaxpNlfCnbYN0="; + hash = "sha256-rrJTYe3o/Ra8+EKAA7t0M02tWVN4Ul5ueUar7lpUvMg="; }; postPatch = '' From 5d6301ccb103082ff3967e3a7a1aae4ab6c0373a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 13 Feb 2025 17:03:07 +0100 Subject: [PATCH 1784/2168] golangci-lint: 1.64.2 -> 1.64.4 Diff: https://github.com/golangci/golangci-lint/compare/v1.64.2...v1.64.4 Changelog: https://github.com/golangci/golangci-lint/blob/v1.64.4/CHANGELOG.md --- pkgs/by-name/go/golangci-lint/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/golangci-lint/package.nix b/pkgs/by-name/go/golangci-lint/package.nix index 1bdc8b7d2d8d..ce403419611e 100644 --- a/pkgs/by-name/go/golangci-lint/package.nix +++ b/pkgs/by-name/go/golangci-lint/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.64.2"; + version = "1.64.4"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - hash = "sha256-ODnNBwtfILD0Uy2AKDR/e76ZrdyaOGlCktVUcf9ujy8="; + hash = "sha256-BrkBIf4WP3COAac/5vre8fHLgDneg5Gm31nNq8sXzEE="; }; - vendorHash = "sha256-/iq7Ju7c2gS7gZn3n+y0kLtPn2Nn8HY/YdqSDYjtEkI="; + vendorHash = "sha256-xUKse9yTAVuysmPwmX4EXdlpg6NYKfT5QB1RgmBQvhk="; subPackages = [ "cmd/golangci-lint" ]; From 4bca511d16ee1182227baca1e60ec83dc6a44a9d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 16:07:47 +0000 Subject: [PATCH 1785/2168] python312Packages.microsoft-kiota-serialization-json: 1.9.1 -> 1.9.2 --- .../microsoft-kiota-serialization-json/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix index 270ea442ab89..544620ed15ed 100644 --- a/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "microsoft-kiota-serialization-json"; - version = "1.9.1"; + version = "1.9.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "microsoft"; repo = "kiota-python"; - tag = "microsoft-kiota-serialization-json-v${version}"; - hash = "sha256-ESRnI8prXG1h5H5RVD4eOQ1sQYSEMMLVHSk8yhzFGVw="; + tag = "microsoft-kiota-serialization-text-v${version}"; + hash = "sha256-ribVfvKmDMxGmeqj30SDcnbNGdRBfs1DmqQGXP3EHCk="; }; sourceRoot = "source/packages/serialization/json/"; @@ -45,7 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "JSON serialization implementation for Kiota clients in Python"; homepage = "https://github.com/microsoft/kiota-python/tree/main/packages/serialization/json"; - changelog = "https://github.com/microsoft/kiota-python/releases/tag/microsoft-kiota-serialization-json-v${version}"; + changelog = "https://github.com/microsoft/kiota-python/releases/tag/microsoft-kiota-serialization-json-${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From 44c96ea66f60f8cff053b6b4fabebae48c18d0fc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 16:09:58 +0000 Subject: [PATCH 1786/2168] python312Packages.sshfs: 2024.9.0 -> 2025.2.0 --- pkgs/development/python-modules/sshfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sshfs/default.nix b/pkgs/development/python-modules/sshfs/default.nix index 6e056ad9b569..c9724a63a82f 100644 --- a/pkgs/development/python-modules/sshfs/default.nix +++ b/pkgs/development/python-modules/sshfs/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "sshfs"; - version = "2024.9.0"; + version = "2025.2.0"; pyproject = true; src = fetchFromGitHub { owner = "fsspec"; repo = "sshfs"; tag = version; - hash = "sha256-rRcXimthyFLBqt0nMEv7bisL+JNLLZuRH7BopSLM7QQ="; + hash = "sha256-O9Va3dLfTko9AfyK4iJa8U6xrtJsNNEeBn9UeRAgmVc="; }; build-system = [ @@ -69,7 +69,7 @@ buildPythonPackage rec { meta = with lib; { description = "SSH/SFTP implementation for fsspec"; homepage = "https://github.com/fsspec/sshfs/"; - changelog = "https://github.com/fsspec/sshfs/releases/tag/${version}"; + changelog = "https://github.com/fsspec/sshfs/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ melling ]; }; From befafa5657f72c064cfb835461e4cc9f35b7670d Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Thu, 13 Feb 2025 17:23:55 +0100 Subject: [PATCH 1787/2168] python3Packages.pydevd: 3.2.3 -> 3.3.0 --- pkgs/development/python-modules/pydevd/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pydevd/default.nix b/pkgs/development/python-modules/pydevd/default.nix index 2de0d42c6755..e138896db2d4 100644 --- a/pkgs/development/python-modules/pydevd/default.nix +++ b/pkgs/development/python-modules/pydevd/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pydevd"; - version = "3.2.3"; + version = "3.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "fabioz"; repo = "PyDev.Debugger"; rev = "pydev_debugger_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-IJSy6BoQCHNo2YsnrHGXsEaWsLy5dq3jG6Jn4MgpgCg="; + hash = "sha256-V5pM0xnMFnpR1oK0purHFCV3wu+4fOmd72kmy7pVeyk="; }; postPatch = '' @@ -79,11 +79,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "pydevd" ]; - meta = with lib; { + meta = { description = "PyDev.Debugger (used in PyDev, PyCharm and VSCode Python)"; homepage = "https://github.com/fabioz/PyDev.Debugger"; - license = licenses.epl10; - maintainers = with maintainers; [ onny ]; + license = lib.licenses.epl10; + maintainers = with lib.maintainers; [ onny ]; mainProgram = "pydevd"; }; } From 00c37e6f36e08d3874cd69de513131b9744f0297 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 13 Feb 2025 11:06:13 +0100 Subject: [PATCH 1788/2168] python312Packages.pyheos: update tag --- pkgs/development/python-modules/pyheos/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyheos/default.nix b/pkgs/development/python-modules/pyheos/default.nix index 33f4de33833a..ac4c6a91232f 100644 --- a/pkgs/development/python-modules/pyheos/default.nix +++ b/pkgs/development/python-modules/pyheos/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "andrewsayre"; repo = "pyheos"; - tag = "1.02"; # TODO: https://github.com/andrewsayre/pyheos/issues/104 + tag = version; hash = "sha256-1JybtE5wweuIgZ8eFUX9XYPji7FzxbRFPKy75Fp1nw0="; }; @@ -35,11 +35,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "pyheos" ]; - meta = with lib; { + meta = { changelog = "https://github.com/andrewsayre/pyheos/releases/tag/${src.tag}"; description = "Async python library for controlling HEOS devices through the HEOS CLI Protocol"; homepage = "https://github.com/andrewsayre/pyheos"; - license = licenses.asl20; - maintainers = with maintainers; [ dotlambda ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; }; } From da2bf4271c431bb24926d219a04417212585a605 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Feb 2025 17:45:45 +0100 Subject: [PATCH 1789/2168] python313Packages.tencentcloud-sdk-python: 3.0.1317 -> 3.0.1318 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1317...3.0.1318 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1318/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 82921c10b838..e8f812e21de9 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.1317"; + version = "3.0.1318"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = version; - hash = "sha256-UIDr9RkApo2vH5TaUwtPLMcqQd89vFMMzEBGk0Zy+Fo="; + hash = "sha256-pH0gm+/bZqMKWt3800rfMdKba0ZxuPNmkXDR2lPc3fs="; }; build-system = [ setuptools ]; From 1f01c75782d0c13b63289af994ac77efd0e4bee2 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Sat, 8 Feb 2025 11:59:58 -0300 Subject: [PATCH 1790/2168] cosmic-idle: init at 1.0.0-alpha.5.1 --- pkgs/by-name/co/cosmic-idle/package.nix | 68 +++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 pkgs/by-name/co/cosmic-idle/package.nix diff --git a/pkgs/by-name/co/cosmic-idle/package.nix b/pkgs/by-name/co/cosmic-idle/package.nix new file mode 100644 index 000000000000..ffbab9fb9921 --- /dev/null +++ b/pkgs/by-name/co/cosmic-idle/package.nix @@ -0,0 +1,68 @@ +# SPDX-License-Identifier: MIT +# SPDX-FileCopyrightText: Lily Foster +# Portions of this code are adapted from nixos-cosmic +# https://github.com/lilyinstarlight/nixos-cosmic +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + libcosmicAppHook, + just, + bash, + nix-update-script, +}: +rustPlatform.buildRustPackage rec { + pname = "cosmic-idle"; + version = "1.0.0-alpha.5.1"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = "cosmic-idle"; + tag = "epoch-${version}"; + hash = "sha256-hORU+iMvWA4XMSWmzir9EwjpLK5vOLR8BgMZz+aIZ4U="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-iFR0kFyzawlXrWItzFQbG/tKGd3Snwk/0LYkPzCkJUQ="; + + nativeBuildInputs = [ + just + libcosmicAppHook + ]; + + dontUseJustBuild = true; + dontUseJustCheck = true; + + justFlags = [ + "--set" + "prefix" + (placeholder "out") + "--set" + "bin-src" + "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-idle" + ]; + + postPatch = '' + substituteInPlace src/main.rs --replace-fail '"/bin/sh"' '"${lib.getExe' bash "sh"}"' + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; + + meta = { + description = "Idle daemon for the COSMIC Desktop Environment"; + homepage = "https://github.com/pop-os/cosmic-idle"; + license = lib.licenses.gpl3Only; + mainProgram = "cosmic-idle"; + maintainers = with lib.maintainers; [ HeitorAugustoLN ]; + platforms = lib.platforms.linux; + sourceProvenance = [ lib.sourceTypes.fromSource ]; + }; +} From d06a4635031614d5a799c5a3e58bdb77ed366a9f Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 13 Feb 2025 09:49:54 +0200 Subject: [PATCH 1791/2168] bubblemail: 1.4 -> 1.9 Diff: https://framagit.org/razer/bubblemail/-/compare/v1.4...1.9 Fixes #381562 . --- pkgs/by-name/bu/bubblemail/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bu/bubblemail/package.nix b/pkgs/by-name/bu/bubblemail/package.nix index f1d3150034f6..c33013ba7b8e 100644 --- a/pkgs/by-name/bu/bubblemail/package.nix +++ b/pkgs/by-name/bu/bubblemail/package.nix @@ -19,14 +19,14 @@ python3Packages.buildPythonApplication rec { pname = "bubblemail"; - version = "1.4"; + version = "1.9"; src = fetchFromGitLab { domain = "framagit.org"; owner = "razer"; repo = "bubblemail"; rev = "v${version}"; - sha256 = "sha256-MPl4pXvdhwCFWTepn/Mxp8ZMs+HCzXC59qdKZp3mHdw="; + sha256 = "sha256-eXEFBLo7CbLRlnI2nr7qWAdLUKe6PLQJ78Ho8MP9ShY="; }; buildInputs = [ From e1858153fc7417bc8045921cdce68761b62167c0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 17:12:58 +0000 Subject: [PATCH 1792/2168] python312Packages.presenterm-export: 0.2.6 -> 0.2.7 --- pkgs/development/python-modules/presenterm-export/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/presenterm-export/default.nix b/pkgs/development/python-modules/presenterm-export/default.nix index 0e789e3c738d..b508f284d982 100644 --- a/pkgs/development/python-modules/presenterm-export/default.nix +++ b/pkgs/development/python-modules/presenterm-export/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "presenterm-export"; - version = "0.2.6"; + version = "0.2.7"; pyproject = true; src = fetchPypi { pname = "presenterm_export"; inherit version; - hash = "sha256-ZC/U0G3DEMoqzl/5mcKShOyOm1Zw6VQhP1txA7tlMR8="; + hash = "sha256-9TkZ52lA1l3PYs2DTgji0LDrG5kixnFffuMIfhILY1E="; }; pythonRelaxDeps = true; From 1aca3c42132e5231776c7199a78d6aec184be729 Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Thu, 13 Feb 2025 18:15:21 +0100 Subject: [PATCH 1793/2168] devenv: disable telemetry by default --- pkgs/by-name/de/devenv/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/de/devenv/package.nix b/pkgs/by-name/de/devenv/package.nix index 6e64ccf592e2..0153deb0433c 100644 --- a/pkgs/by-name/de/devenv/package.nix +++ b/pkgs/by-name/de/devenv/package.nix @@ -74,6 +74,7 @@ rustPlatform.buildRustPackage { wrapProgram $out/bin/devenv \ --prefix PATH ":" "$out/bin:${cachix}/bin" \ --set DEVENV_NIX ${devenv_nix} \ + --set-default DO_NOT_TRACK 1 \ ${setDefaultLocaleArchive} # Generate manpages From e86d97f2be50ee6cdeff0d1ffccae6cb7ac8d17f Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Tue, 4 Feb 2025 18:14:22 -0300 Subject: [PATCH 1794/2168] cosmic-ext-tweaks: init at 0.1.3 --- pkgs/by-name/co/cosmic-ext-tweaks/package.nix | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 pkgs/by-name/co/cosmic-ext-tweaks/package.nix diff --git a/pkgs/by-name/co/cosmic-ext-tweaks/package.nix b/pkgs/by-name/co/cosmic-ext-tweaks/package.nix new file mode 100644 index 000000000000..f3ece6db260b --- /dev/null +++ b/pkgs/by-name/co/cosmic-ext-tweaks/package.nix @@ -0,0 +1,60 @@ +# SPDX-License-Identifier: MIT +# SPDX-FileCopyrightText: Lily Foster +# Portions of this code are adapted from nixos-cosmic +# https://github.com/lilyinstarlight/nixos-cosmic +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + libcosmicAppHook, + just, + openssl, + nix-update-script, +}: +rustPlatform.buildRustPackage rec { + pname = "cosmic-ext-tweaks"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "cosmic-utils"; + repo = "tweaks"; + tag = version; + hash = "sha256-SzD2TnPrCKsG3d+t1695GSC+HCqK88wlO42saGAZLS8="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-LgrjrGusQ5HZJcAPsgV0hUgvcAZr8rlPyE3+z910+pI="; + + nativeBuildInputs = [ + libcosmicAppHook + just + ]; + + buildInputs = [ openssl ]; + + dontUseJustBuild = true; + dontUseJustCheck = true; + + justFlags = [ + "--set" + "prefix" + (placeholder "out") + "--set" + "bin-src" + "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-ext-tweaks" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/cosmic-utils/tweaks/releases/tag/${version}"; + description = "Tweaking tool for the COSMIC Desktop Environment"; + homepage = "https://github.com/cosmic-utils/tweaks"; + license = lib.licenses.gpl3Only; + mainProgram = "cosmic-ext-tweaks"; + maintainers = with lib.maintainers; [ HeitorAugustoLN ]; + platforms = lib.platforms.linux; + sourceProvenance = [ lib.sourceTypes.fromSource ]; + }; +} From 3451497d0e56cce3dc104e7f55bc83d111bd95a6 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Tue, 4 Feb 2025 17:32:09 -0300 Subject: [PATCH 1795/2168] cosmic-ext-calculator: init at 0.1.1 --- .../co/cosmic-ext-calculator/package.nix | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 pkgs/by-name/co/cosmic-ext-calculator/package.nix diff --git a/pkgs/by-name/co/cosmic-ext-calculator/package.nix b/pkgs/by-name/co/cosmic-ext-calculator/package.nix new file mode 100644 index 000000000000..e70dc26ff5d5 --- /dev/null +++ b/pkgs/by-name/co/cosmic-ext-calculator/package.nix @@ -0,0 +1,57 @@ +# SPDX-License-Identifier: MIT +# SPDX-FileCopyrightText: Lily Foster +# Portions of this code are adapted from nixos-cosmic +# https://github.com/lilyinstarlight/nixos-cosmic +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + libcosmicAppHook, + just, + nix-update-script, +}: +rustPlatform.buildRustPackage rec { + pname = "cosmic-ext-calculator"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "cosmic-utils"; + repo = "calculator"; + tag = version; + hash = "sha256-UO3JKPsztptNEFAxolRui9FxtCsTRgpXhHH242i9b6E="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-a4IOmCWKX8RR8xeKS6wdsTlNyTr91B93bYMDx/+/+04="; + + nativeBuildInputs = [ + libcosmicAppHook + just + ]; + + dontUseJustBuild = true; + dontUseJustCheck = true; + + justFlags = [ + "--set" + "prefix" + (placeholder "out") + "--set" + "bin-src" + "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-ext-calculator" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/cosmic-utils/calculator/releases/tag/${version}"; + description = "Calculator for the COSMIC Desktop Environment"; + homepage = "https://github.com/cosmic-utils/calculator"; + license = lib.licenses.gpl3Only; + mainProgram = "cosmic-ext-calculator"; + maintainers = with lib.maintainers; [ HeitorAugustoLN ]; + platforms = lib.platforms.linux; + sourceProvenance = [ lib.sourceTypes.fromSource ]; + }; +} From 19f32b1d85f921be9b273ba9848e7f4a01ab322e Mon Sep 17 00:00:00 2001 From: Petr Portnov Date: Thu, 13 Feb 2025 20:23:20 +0300 Subject: [PATCH 1796/2168] mount-zip: add progrm_jarvis as maintainer --- pkgs/by-name/mo/mount-zip/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/mo/mount-zip/package.nix b/pkgs/by-name/mo/mount-zip/package.nix index 76e7c9ae7041..734f02bf410f 100644 --- a/pkgs/by-name/mo/mount-zip/package.nix +++ b/pkgs/by-name/mo/mount-zip/package.nix @@ -46,7 +46,10 @@ stdenv.mkDerivation (finalAttrs: { This project is a fork of fuse-zip. ''; license = licenses.gpl3; - maintainers = with maintainers; [ arti5an ]; + maintainers = with maintainers; [ + arti5an + progrm_jarvis + ]; platforms = platforms.linux; mainProgram = "mount-zip"; }; From b04fc7b0ea06a6173cb922e8836cf18d27f56b88 Mon Sep 17 00:00:00 2001 From: codgician <15964984+codgician@users.noreply.github.com> Date: Thu, 13 Feb 2025 17:23:22 +0000 Subject: [PATCH 1797/2168] linuxPackages_latest.prl-tools: 20.2.0-55872 -> 20.2.1-55876 --- pkgs/os-specific/linux/prl-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index b5ac3562128a..935fcb4001fc 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -41,13 +41,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "prl-tools"; - version = "20.2.0-55872"; + version = "20.2.1-55876"; # We download the full distribution to extract prl-tools-lin.iso from # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso src = fetchurl { url = "https://download.parallels.com/desktop/v${lib.versions.major finalAttrs.version}/${finalAttrs.version}/ParallelsDesktop-${finalAttrs.version}.dmg"; - hash = "sha256-oOilbF5MzZxZXNVQYAp/JxyMVdM0oltG8pGfzzsQ1kY="; + hash = "sha256-MZuvEjSjRqtdr22bl4NhcKZBNDmdM/axI/8wOP/SvPU="; }; hardeningDisable = [ From 9339f7a20fa3cd97b3a40c65e4e825e47cd6f188 Mon Sep 17 00:00:00 2001 From: Petr Portnov Date: Mon, 13 Jan 2025 05:12:33 +0300 Subject: [PATCH 1798/2168] mount-zip: 1.0.15 -> 1.6 --- pkgs/by-name/mo/mount-zip/package.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/mo/mount-zip/package.nix b/pkgs/by-name/mo/mount-zip/package.nix index 734f02bf410f..b40691e82e3e 100644 --- a/pkgs/by-name/mo/mount-zip/package.nix +++ b/pkgs/by-name/mo/mount-zip/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mount-zip"; - version = "1.0.15"; + version = "1.6"; src = fetchFromGitHub { owner = "google"; repo = "mount-zip"; rev = "v${finalAttrs.version}"; - hash = "sha256-7S+mZ6jejD9wCqFYfJ0mE2jCKt77S64LEAgAIV2DPqA="; + hash = "sha256-akiZwuwrsj+62TmZEJamlvQ1rSyFA4hrH0TcZ8T97z4="; }; strictDeps = true; @@ -35,22 +35,23 @@ stdenv.mkDerivation (finalAttrs: { libzip ]; - makeFlags = [ "prefix=$(out)" ]; + makeFlags = [ "PREFIX=$(out)" ]; - meta = with lib; { + meta = { description = "FUSE file system for ZIP archives"; homepage = "https://github.com/google/mount-zip"; + changelog = "https://github.com/google/mount-zip/releases/tag/v${finalAttrs.version}"; longDescription = '' mount-zip is a tool allowing to open, explore and extract ZIP archives. This project is a fork of fuse-zip. ''; - license = licenses.gpl3; - maintainers = with maintainers; [ + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ arti5an progrm_jarvis ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; mainProgram = "mount-zip"; }; }) From ee34bf3dffe08eca9a75141a3b350ed401ebb43b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 17:25:47 +0000 Subject: [PATCH 1799/2168] komga: 1.19.0 -> 1.19.1 --- pkgs/by-name/ko/komga/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ko/komga/package.nix b/pkgs/by-name/ko/komga/package.nix index 05076e2bc745..4623c2f203d1 100644 --- a/pkgs/by-name/ko/komga/package.nix +++ b/pkgs/by-name/ko/komga/package.nix @@ -9,11 +9,11 @@ stdenvNoCC.mkDerivation rec { pname = "komga"; - version = "1.19.0"; + version = "1.19.1"; src = fetchurl { url = "https://github.com/gotson/${pname}/releases/download/${version}/${pname}-${version}.jar"; - sha256 = "sha256-9klOS9VFKMiOWihJkXdk5/GTW6oRVrmSAKwK7es6IhM="; + sha256 = "sha256-yFdcYDqatKMFkoBuPNtC/4qWeF+y6kRwhOLS0zGM9pg="; }; nativeBuildInputs = [ From d444960d1a98ea85bddeec6b21e241bdc2d43860 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Thu, 13 Feb 2025 14:42:52 -0300 Subject: [PATCH 1800/2168] forecast: use libcosmicAppHook --- pkgs/by-name/fo/forecast/package.nix | 39 ++++------------------------ 1 file changed, 5 insertions(+), 34 deletions(-) diff --git a/pkgs/by-name/fo/forecast/package.nix b/pkgs/by-name/fo/forecast/package.nix index 9caca19cafdb..87ced2b58bba 100644 --- a/pkgs/by-name/fo/forecast/package.nix +++ b/pkgs/by-name/fo/forecast/package.nix @@ -5,22 +5,16 @@ fetchFromGitHub, # nativeBuildInputs - autoPatchelfHook, + libcosmicAppHook, just, - pkg-config, - wrapGAppsHook3, # buildInputs - libxkbcommon, openssl, - vulkan-loader, - wayland, - nix-update-script, - cosmic-icons, + nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "forecast"; version = "0-unstable-2024-09-23"; @@ -49,37 +43,14 @@ rustPlatform.buildRustPackage rec { }; nativeBuildInputs = [ - autoPatchelfHook + libcosmicAppHook just - pkg-config - wrapGAppsHook3 ]; dontUseJustBuild = true; dontUseJustCheck = true; - buildInputs = [ - libxkbcommon - openssl - vulkan-loader - wayland - ]; - - env = { - # COSMIC applications now uses vergen for the About page - VERGEN_GIT_COMMIT_DATE = "1970-01-01"; - VERGEN_GIT_SHA = src.rev; - }; - - runtimeDependencies = [ - libxkbcommon - wayland - ]; - - postFixup = '' - wrapProgram $out/bin/cosmic-ext-forecast \ - --suffix XDG_DATA_DIRS : "${cosmic-icons}/share" - ''; + buildInputs = [ openssl ]; justFlags = [ "--set" From 3aafac930376152c00c7d813290b809e06d0748b Mon Sep 17 00:00:00 2001 From: Petr Portnov Date: Thu, 13 Feb 2025 20:28:24 +0300 Subject: [PATCH 1801/2168] mount-zip: add passthru.updateScript and versionCheckHook --- pkgs/by-name/mo/mount-zip/package.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/by-name/mo/mount-zip/package.nix b/pkgs/by-name/mo/mount-zip/package.nix index b40691e82e3e..1940e8a8f268 100644 --- a/pkgs/by-name/mo/mount-zip/package.nix +++ b/pkgs/by-name/mo/mount-zip/package.nix @@ -8,6 +8,8 @@ libzip, pandoc, pkg-config, + versionCheckHook, + gitUpdater, }: stdenv.mkDerivation (finalAttrs: { @@ -37,6 +39,16 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "PREFIX=$(out)" ]; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + }; + meta = { description = "FUSE file system for ZIP archives"; homepage = "https://github.com/google/mount-zip"; From 8fa08cdc675e731dc5ccffeb96004501fcfc6412 Mon Sep 17 00:00:00 2001 From: Jorik Date: Sat, 2 Nov 2024 15:19:53 +0100 Subject: [PATCH 1802/2168] posting: init at 2.3.0 --- pkgs/by-name/po/posting/package.nix | 56 +++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 pkgs/by-name/po/posting/package.nix diff --git a/pkgs/by-name/po/posting/package.nix b/pkgs/by-name/po/posting/package.nix new file mode 100644 index 000000000000..4550df713fd3 --- /dev/null +++ b/pkgs/by-name/po/posting/package.nix @@ -0,0 +1,56 @@ +{ + lib, + fetchFromGitHub, + python3Packages, + xorg, +}: +python3Packages.buildPythonApplication rec { + pname = "posting"; + version = "2.3.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "darrenburns"; + repo = "posting"; + tag = version; + hash = "sha256-lL85gJxFw8/e8Js+UCE9VxBMcmWRUkHh8Cq5wTC93KA="; + }; + + pythonRelaxDeps = true; + + build-system = with python3Packages; [ + hatchling + ]; + + # Required for x resources themes + buildInputs = [ xorg.xrdb ]; + + dependencies = + with python3Packages; + [ + click + xdg-base-dirs + click-default-group + pyperclip + pyyaml + python-dotenv + watchfiles + pydantic + pydantic-settings + httpx + textual-autocomplete + textual + ] + ++ httpx.optional-dependencies.brotli + ++ textual.optional-dependencies.syntax; + + meta = { + description = "Modern API client that lives in your terminal"; + mainProgram = "posting"; + homepage = "https://posting.sh/"; + changelog = "https://github.com/darrenburns/posting/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ jorikvanveen ]; + platforms = lib.platforms.unix; + }; +} From 318e57b3867136741e4325b374ad5de54f68e1cd Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Thu, 13 Feb 2025 14:45:27 -0300 Subject: [PATCH 1803/2168] forecast: fix updateScript --- pkgs/by-name/fo/forecast/package.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/fo/forecast/package.nix b/pkgs/by-name/fo/forecast/package.nix index 87ced2b58bba..893b0150ae57 100644 --- a/pkgs/by-name/fo/forecast/package.nix +++ b/pkgs/by-name/fo/forecast/package.nix @@ -62,7 +62,12 @@ rustPlatform.buildRustPackage { ]; passthru = { - updateScript = nix-update-script { }; + updateScript = nix-update-script { + extraArgs = [ + "--version" + "branch=HEAD" + ]; + }; }; meta = { From 007d4fc4a1a649678b85ed96350331252609efed Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Thu, 13 Feb 2025 14:52:26 -0300 Subject: [PATCH 1804/2168] forecast: 0-unstable-2024-09-23 -> 0-unstable-2025-02-12 --- pkgs/by-name/fo/forecast/Cargo.lock | 1728 +++++++++++++------------- pkgs/by-name/fo/forecast/package.nix | 21 +- 2 files changed, 884 insertions(+), 865 deletions(-) diff --git a/pkgs/by-name/fo/forecast/Cargo.lock b/pkgs/by-name/fo/forecast/Cargo.lock index 49a40caae702..1830507aa82e 100644 --- a/pkgs/by-name/fo/forecast/Cargo.lock +++ b/pkgs/by-name/fo/forecast/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "ab_glyph" @@ -20,43 +20,53 @@ checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" [[package]] name = "accesskit" -version = "0.12.2" -source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +version = "0.16.0" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" + +[[package]] +name = "accesskit_atspi_common" +version = "0.9.0" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" +dependencies = [ + "accesskit", + "accesskit_consumer", + "atspi-common", + "serde", + "thiserror", + "zvariant 3.15.2", +] [[package]] name = "accesskit_consumer" -version = "0.17.0" -source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +version = "0.24.0" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" dependencies = [ "accesskit", + "immutable-chunkmap", ] [[package]] name = "accesskit_macos" -version = "0.11.0" -source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +version = "0.17.0" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" dependencies = [ "accesskit", "accesskit_consumer", - "icrate 0.1.2", - "objc2 0.5.0", + "objc2", + "objc2-app-kit", + "objc2-foundation", "once_cell", ] [[package]] name = "accesskit_unix" -version = "0.7.1" -source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +version = "0.12.0" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" dependencies = [ "accesskit", - "accesskit_consumer", - "async-channel", - "async-executor", - "async-task", + "accesskit_atspi_common", "atspi", "futures-lite 1.13.0", - "futures-util", - "once_cell", "serde", "tokio", "tokio-stream", @@ -65,21 +75,20 @@ dependencies = [ [[package]] name = "accesskit_windows" -version = "0.16.0" -source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +version = "0.22.0" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" dependencies = [ "accesskit", "accesskit_consumer", - "once_cell", "paste", "static_assertions", - "windows 0.48.0", + "windows 0.54.0", ] [[package]] name = "accesskit_winit" -version = "0.18.1" -source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +version = "0.22.0" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" dependencies = [ "accesskit", "accesskit_macos", @@ -152,12 +161,12 @@ checksum = "3aa2999eb46af81abb65c2d30d446778d7e613b60bbf4e174a027e80f90a3c14" [[package]] name = "android-activity" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" +checksum = "ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046" dependencies = [ "android-properties", - "bitflags 2.5.0", + "bitflags 2.6.0", "cc", "cesu8", "jni", @@ -166,7 +175,7 @@ dependencies = [ "log", "ndk", "ndk-context", - "ndk-sys", + "ndk-sys 0.6.0+11769913", "num_enum", "thiserror", ] @@ -233,7 +242,7 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -244,9 +253,9 @@ checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "as-raw-xcb-connection" @@ -256,11 +265,11 @@ checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" [[package]] name = "ash" -version = "0.37.3+1.3.251" +version = "0.38.0+1.3.281" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f" dependencies = [ - "libloading 0.7.4", + "libloading", ] [[package]] @@ -269,7 +278,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093" dependencies = [ - "async-fs 2.1.2", + "async-fs", "async-net", "enumflags2", "futures-channel", @@ -360,18 +369,6 @@ dependencies = [ "slab", ] -[[package]] -name = "async-fs" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" -dependencies = [ - "async-lock 2.8.0", - "autocfg", - "blocking", - "futures-lite 1.13.0", -] - [[package]] name = "async-fs" version = "2.1.2" @@ -416,7 +413,7 @@ dependencies = [ "futures-lite 2.3.0", "parking", "polling 3.6.0", - "rustix 0.38.32", + "rustix 0.38.39", "slab", "tracing", "windows-sys 0.52.0", @@ -466,7 +463,7 @@ dependencies = [ "cfg-if", "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.32", + "rustix 0.38.39", "windows-sys 0.48.0", ] @@ -485,7 +482,7 @@ dependencies = [ "cfg-if", "event-listener 5.3.0", "futures-lite 2.3.0", - "rustix 0.38.32", + "rustix 0.38.39", "tracing", "windows-sys 0.52.0", ] @@ -498,7 +495,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -513,7 +510,7 @@ dependencies = [ "cfg-if", "futures-core", "futures-io", - "rustix 0.38.32", + "rustix 0.38.39", "signal-hook-registry", "slab", "windows-sys 0.48.0", @@ -533,7 +530,7 @@ checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -547,7 +544,7 @@ name = "atomicwrites" version = "0.4.2" source = "git+https://github.com/jackpot51/rust-atomicwrites#043ab4859d53ffd3d55334685303d8df39c9f768" dependencies = [ - "rustix 0.38.32", + "rustix 0.38.39", "tempfile", "windows-sys 0.48.0", ] @@ -667,18 +664,18 @@ dependencies = [ [[package]] name = "bit-set" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +checksum = "f0481a0e032742109b1133a095184ee93d88f3dc9e0d28a5d033dc77a073f44f" dependencies = [ "bit-vec", ] [[package]] name = "bit-vec" -version = "0.6.3" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" +checksum = "d2c54ff287cfc0a34f38a6b832ea1bd8e448a330b3e40a50859e6488bee07f22" [[package]] name = "bit_field" @@ -694,9 +691,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" dependencies = [ "serde", ] @@ -722,33 +719,13 @@ dependencies = [ "generic-array", ] -[[package]] -name = "block-sys" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7" -dependencies = [ - "objc-sys", -] - [[package]] name = "block2" -version = "0.3.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68" +checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" dependencies = [ - "block-sys", - "objc2 0.4.1", -] - -[[package]] -name = "block2" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e58aa60e59d8dbfcc36138f5f18be5f24394d33b38b24f7fd0b1caa33095f22f" -dependencies = [ - "block-sys", - "objc2 0.5.0", + "objc2", ] [[package]] @@ -793,7 +770,7 @@ checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -814,54 +791,28 @@ version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" -[[package]] -name = "calloop" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" -dependencies = [ - "bitflags 2.5.0", - "log", - "polling 3.6.0", - "rustix 0.38.32", - "slab", - "thiserror", -] - [[package]] name = "calloop" version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "log", "polling 3.6.0", - "rustix 0.38.32", + "rustix 0.38.39", "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 0.12.4", - "rustix 0.38.32", - "wayland-backend", - "wayland-client", -] - [[package]] name = "calloop-wayland-source" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" dependencies = [ - "calloop 0.13.0", - "rustix 0.38.32", + "calloop", + "rustix 0.38.39", "wayland-backend", "wayland-client", ] @@ -907,9 +858,9 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] name = "cfg_aliases" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77e53693616d3075149f4ead59bdeecd204ac6b8192d8969757601b74bddf00f" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "chrono" @@ -923,7 +874,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.4", + "windows-targets 0.52.6", ] [[package]] @@ -938,7 +889,7 @@ dependencies = [ [[package]] name = "clipboard_macos" version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" dependencies = [ "objc", "objc-foundation", @@ -948,7 +899,7 @@ dependencies = [ [[package]] name = "clipboard_wayland" version = "0.2.2" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" dependencies = [ "dnd", "mime 0.1.0", @@ -958,7 +909,7 @@ dependencies = [ [[package]] name = "clipboard_x11" version = "0.4.2" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" dependencies = [ "thiserror", "x11rb", @@ -1120,14 +1071,26 @@ dependencies = [ "libc", ] +[[package]] +name = "cosmic-client-toolkit" +version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-protocols?rev=d218c76#d218c76b58c7a3b20dd5e7943f93fc306a1b81b8" +dependencies = [ + "cosmic-protocols", + "libc", + "smithay-client-toolkit", + "wayland-client", + "wayland-protocols", +] + [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" dependencies = [ "atomicwrites", "cosmic-config-derive", - "dirs", + "dirs 5.0.1", "iced_futures", "known-folders", "notify", @@ -1142,7 +1105,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" dependencies = [ "quote", "syn 1.0.109", @@ -1150,7 +1113,7 @@ dependencies = [ [[package]] name = "cosmic-ext-forecast" -version = "0.1.0" +version = "1.1.0" dependencies = [ "bytes", "chrono", @@ -1164,21 +1127,46 @@ dependencies = [ "rust-embed", "serde", "tokio", - "vergen", +] + +[[package]] +name = "cosmic-freedesktop-icons" +version = "0.2.6" +source = "git+https://github.com/pop-os/freedesktop-icons#5a3b4163148a9600a54cc846aa863f4e6389635d" +dependencies = [ + "dirs 5.0.1", + "once_cell", + "rust-ini", + "thiserror", + "tracing", + "xdg", +] + +[[package]] +name = "cosmic-protocols" +version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-protocols?rev=d218c76#d218c76b58c7a3b20dd5e7943f93fc306a1b81b8" +dependencies = [ + "bitflags 2.6.0", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-protocols-wlr", + "wayland-scanner", + "wayland-server", ] [[package]] name = "cosmic-text" version = "0.12.1" -source = "git+https://github.com/pop-os/cosmic-text.git#c7512170201910cfb8a021f8d749c4125dfed18d" +source = "git+https://github.com/pop-os/cosmic-text.git#166b59f560c551dab391a864f7c1f503c1e18446" dependencies = [ - "bitflags 2.5.0", - "fontdb", + "bitflags 2.6.0", + "fontdb 0.16.2", "log", "rangemap", - "rayon", - "rustc-hash", - "rustybuzz 0.14.1", + "rustc-hash 1.1.0", + "rustybuzz", "self_cell 1.0.3", "smol_str", "swash", @@ -1193,12 +1181,12 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" dependencies = [ "almost", "cosmic-config", "csscolorparser", - "dirs", + "dirs 5.0.1", "lazy_static", "palette", "ron", @@ -1305,11 +1293,12 @@ checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" [[package]] name = "d3d12" -version = "0.19.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdbd1f579714e3c809ebd822c81ef148b1ceaeb3d535352afc73fd0c4c6a0017" dependencies = [ - "bitflags 2.5.0", - "libloading 0.8.3", + "bitflags 2.6.0", + "libloading", "winapi", ] @@ -1334,7 +1323,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -1345,7 +1334,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core", "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -1368,15 +1357,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" -[[package]] -name = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", -] - [[package]] name = "derivative" version = "2.2.0" @@ -1397,7 +1377,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -1410,13 +1390,33 @@ dependencies = [ "crypto-common", ] +[[package]] +name = "dirs" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" +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", + "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]] @@ -1445,7 +1445,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -1454,7 +1454,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.8.3", + "libloading", ] [[package]] @@ -1469,32 +1469,46 @@ dependencies = [ [[package]] name = "dnd" version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "mime 0.1.0", "raw-window-handle", - "smithay-client-toolkit 0.19.2", + "smithay-client-toolkit", "smithay-clipboard", ] +[[package]] +name = "document-features" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0" +dependencies = [ + "litrs", +] + [[package]] name = "downcast-rs" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" +[[package]] +name = "dpi" +version = "0.1.1" +source = "git+https://github.com/pop-os/winit.git?tag=iced-xdg-surface-0.13#1cc02bdab141072eaabad639d74b032fd0fcc62e" + [[package]] name = "drm" version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0f8a69e60d75ae7dab4ef26a59ca99f2a89d4c142089b537775ae0c198bdcde" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "bytemuck", "drm-ffi", "drm-fourcc", - "rustix 0.38.32", + "rustix 0.38.39", ] [[package]] @@ -1504,7 +1518,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6" dependencies = [ "drm-sys", - "rustix 0.38.32", + "rustix 0.38.39", ] [[package]] @@ -1544,17 +1558,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" -[[package]] -name = "enum-repr" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bad30c9c0fa1aaf1ae5010dab11f1117b15d35faf62cda4bbbc53b9987950f18" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "enumflags2" version = "0.7.9" @@ -1573,7 +1576,7 @@ checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -1758,9 +1761,6 @@ name = "float-cmp" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" -dependencies = [ - "num-traits", -] [[package]] name = "float_next_after" @@ -1788,7 +1788,7 @@ dependencies = [ "fluent-syntax", "intl-memoizer", "intl_pluralrules", - "rustc-hash", + "rustc-hash 1.1.0", "self_cell 0.10.3", "smallvec", "unic-langid", @@ -1829,9 +1829,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "font-types" -version = "0.5.5" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34fd7136aca682873d859ef34494ab1a7d3f57ecd485ed40eb6437ee8c85aa29" +checksum = "11c3a23a5a151afb1f74ea797f8c300dee41eff9ee3cb1bf94ed316d860c46b3" dependencies = [ "bytemuck", ] @@ -1842,7 +1842,7 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d" dependencies = [ - "roxmltree", + "roxmltree 0.19.0", ] [[package]] @@ -1859,6 +1859,20 @@ dependencies = [ "ttf-parser 0.20.0", ] +[[package]] +name = "fontdb" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e32eac81c1135c1df01d4e6d4233c47ba11f6a6d07f33e0bba09d18797077770" +dependencies = [ + "fontconfig-parser", + "log", + "memmap2 0.9.4", + "slotmap", + "tinyvec", + "ttf-parser 0.21.1", +] + [[package]] name = "foreign-types" version = "0.3.2" @@ -1886,7 +1900,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -1911,24 +1925,14 @@ dependencies = [ ] [[package]] -name = "fraction" -version = "0.15.3" +name = "freedesktop-desktop-entry" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f158e3ff0a1b334408dc9fb811cd99b446986f4d8b741bb08f9df1604085ae7" +checksum = "c201444ddafb5506fe85265b48421664ff4617e3b7090ef99e42a0070c1aead0" dependencies = [ - "lazy_static", - "num", -] - -[[package]] -name = "freedesktop-icons" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8ef34245e0540c9a3ce7a28340b98d2c12b75da0d446da4e8224923fcaa0c16" -dependencies = [ - "dirs", - "once_cell", - "rust-ini", + "dirs 3.0.2", + "gettext-rs", + "memchr", "thiserror", "xdg", ] @@ -2027,7 +2031,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -2092,13 +2096,23 @@ dependencies = [ ] [[package]] -name = "gif" -version = "0.12.0" +name = "gettext-rs" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +checksum = "a44e92f7dc08430aca7ed55de161253a22276dfd69c5526e5c5e95d1f7cf338a" dependencies = [ - "color_quant", - "weezl", + "gettext-sys", + "locale_config", +] + +[[package]] +name = "gettext-sys" +version = "0.22.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb45773f5b8945f12aecd04558f545964f943dacda1b1155b3d738f5469ef661" +dependencies = [ + "cc", + "temp-dir", ] [[package]] @@ -2130,9 +2144,9 @@ dependencies = [ [[package]] name = "glam" -version = "0.24.2" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945" +checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3" [[package]] name = "glow" @@ -2148,31 +2162,20 @@ dependencies = [ [[package]] name = "glutin_wgl_sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead" +checksum = "0a4e1951bbd9434a81aa496fe59ccc2235af3820d27b85f9314e279609211e2c" dependencies = [ "gl_generator", ] -[[package]] -name = "glyphon" -version = "0.5.0" -source = "git+https://github.com/pop-os/glyphon.git?tag=v0.5.0#1b0646ff8f74da92d3be704dfc2257d7f4d7eed8" -dependencies = [ - "cosmic-text", - "etagere", - "lru", - "wgpu", -] - [[package]] name = "gpu-alloc" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "gpu-alloc-types", ] @@ -2182,14 +2185,14 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] name = "gpu-allocator" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f56f6318968d03c18e1bcf4857ff88c61157e9da8e47c5f29055d60e1228884" +checksum = "fdd4240fc91d3433d5e5b0fc5b67672d771850dc19bbee03c1381e19322803d7" dependencies = [ "log", "presser", @@ -2200,22 +2203,22 @@ dependencies = [ [[package]] name = "gpu-descriptor" -version = "0.2.4" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" +checksum = "9c08c1f623a8d0b722b8b99f821eb0ba672a1618f0d3b16ddbee1cedd2dd8557" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "gpu-descriptor-types", "hashbrown", ] [[package]] name = "gpu-descriptor-types" -version = "0.1.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" +checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -2279,10 +2282,10 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "com", "libc", - "libloading 0.8.3", + "libloading", "thiserror", "widestring", "winapi", @@ -2467,7 +2470,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.71", + "syn 2.0.87", "unic-langid", ] @@ -2481,7 +2484,7 @@ dependencies = [ "i18n-config", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -2495,7 +2498,7 @@ dependencies = [ "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core", + "windows-core 0.52.0", ] [[package]] @@ -2509,15 +2512,14 @@ dependencies = [ [[package]] name = "iced" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" dependencies = [ "dnd", "iced_accessibility", "iced_core", "iced_futures", "iced_renderer", - "iced_sctk", "iced_widget", "iced_winit", "image 0.24.9", @@ -2529,57 +2531,69 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" dependencies = [ "accesskit", - "accesskit_unix", "accesskit_winit", ] [[package]] name = "iced_core" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", + "bytes", "dnd", - "iced_accessibility", + "glam", "log", "mime 0.1.0", "num-traits", + "once_cell", "palette", "raw-window-handle", + "rustc-hash 2.0.0", "serde", - "smithay-client-toolkit 0.19.2", "smol_str", "thiserror", "web-time", "window_clipboard", - "xxhash-rust", ] [[package]] name = "iced_futures" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" dependencies = [ "futures", "iced_core", "log", + "rustc-hash 2.0.0", "tokio", "wasm-bindgen-futures", "wasm-timer", ] [[package]] -name = "iced_graphics" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +name = "iced_glyphon" +version = "0.6.0" +source = "git+https://github.com/pop-os/glyphon.git?tag=iced-0.14-dev#6ef9d12a20cfd0f7bdf38136a26ded9f7459ec8b" dependencies = [ - "bitflags 2.5.0", + "cosmic-text", + "etagere", + "lru", + "rustc-hash 2.0.0", + "wgpu", +] + +[[package]] +name = "iced_graphics" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" +dependencies = [ + "bitflags 2.6.0", "bytemuck", "cosmic-text", - "glam", "half", "iced_core", "iced_futures", @@ -2589,16 +2603,15 @@ dependencies = [ "lyon_path", "once_cell", "raw-window-handle", - "rustc-hash", + "rustc-hash 2.0.0", "thiserror", "unicode-segmentation", - "xxhash-rust", ] [[package]] name = "iced_renderer" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2609,95 +2622,60 @@ dependencies = [ [[package]] name = "iced_runtime" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" dependencies = [ + "bytes", "dnd", - "iced_accessibility", "iced_core", "iced_futures", - "smithay-client-toolkit 0.19.2", - "thiserror", - "window_clipboard", -] - -[[package]] -name = "iced_sctk" -version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" -dependencies = [ - "enum-repr", - "float-cmp", - "futures", - "iced_futures", - "iced_graphics", - "iced_runtime", - "iced_style", - "itertools", - "lazy_static", "raw-window-handle", - "smithay-client-toolkit 0.19.2", "thiserror", - "tracing", - "wayland-backend", - "wayland-protocols 0.32.3", "window_clipboard", - "xkbcommon", - "xkbcommon-dl", - "xkeysym", -] - -[[package]] -name = "iced_style" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" -dependencies = [ - "iced_core", - "once_cell", - "palette", ] [[package]] name = "iced_tiny_skia" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" dependencies = [ "bytemuck", "cosmic-text", "iced_graphics", - "kurbo", + "kurbo 0.10.4", "log", "resvg", - "rustc-hash", + "rustc-hash 2.0.0", "softbuffer", "tiny-skia", - "xxhash-rust", ] [[package]] name = "iced_wgpu" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" dependencies = [ "as-raw-xcb-connection", - "bitflags 2.5.0", + "bitflags 2.6.0", "bytemuck", + "cosmic-client-toolkit", "futures", "glam", - "glyphon", "guillotiere", + "iced_glyphon", "iced_graphics", "log", "lyon", "once_cell", "raw-window-handle", "resvg", - "rustix 0.38.32", - "smithay-client-toolkit 0.19.2", + "rustc-hash 2.0.0", + "rustix 0.38.39", + "thiserror", "tiny-xlib", "wayland-backend", "wayland-client", - "wayland-protocols 0.32.3", + "wayland-protocols", "wayland-sys", "wgpu", "x11rb", @@ -2705,15 +2683,16 @@ dependencies = [ [[package]] name = "iced_widget" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" dependencies = [ "dnd", "iced_renderer", "iced_runtime", - "iced_style", "num-traits", + "once_cell", "ouroboros", + "rustc-hash 2.0.0", "thiserror", "unicode-segmentation", "window_clipboard", @@ -2721,43 +2700,24 @@ dependencies = [ [[package]] name = "iced_winit" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" dependencies = [ "dnd", + "iced_futures", "iced_graphics", "iced_runtime", - "iced_style", "log", + "rustc-hash 2.0.0", "thiserror", "tracing", + "wasm-bindgen-futures", "web-sys", "winapi", "window_clipboard", "winit", ] -[[package]] -name = "icrate" -version = "0.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" -dependencies = [ - "block2 0.3.0", - "dispatch", - "objc2 0.4.1", -] - -[[package]] -name = "icrate" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb69199826926eb864697bddd27f73d9fddcffc004f5733131e15b465e30642" -dependencies = [ - "block2 0.4.0", - "objc2 0.5.0", -] - [[package]] name = "ident_case" version = "1.0.1" @@ -2784,7 +2744,7 @@ dependencies = [ "byteorder", "color_quant", "exr", - "gif 0.13.1", + "gif", "jpeg-decoder", "num-traits", "png", @@ -2802,7 +2762,7 @@ dependencies = [ "byteorder-lite", "color_quant", "exr", - "gif 0.13.1", + "gif", "image-webp", "num-traits", "png", @@ -2837,6 +2797,15 @@ version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126" +[[package]] +name = "immutable-chunkmap" +version = "2.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12f97096f508d54f8f8ab8957862eee2ccd628847b6217af1a335e1c44dee578" +dependencies = [ + "arrayvec", +] + [[package]] name = "include_dir" version = "0.7.4" @@ -2903,7 +2872,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -2936,6 +2905,12 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "io-lifetimes" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06432fb54d3be7964ecd3649233cddf80db2832f47fec34c01f65b3d9d774983" + [[package]] name = "ipnet" version = "2.9.0" @@ -3018,9 +2993,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" dependencies = [ "wasm-bindgen", ] @@ -3041,7 +3016,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" dependencies = [ "libc", - "libloading 0.8.3", + "libloading", "pkg-config", ] @@ -3082,11 +3057,22 @@ dependencies = [ [[package]] name = "kurbo" -version = "0.9.5" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" +checksum = "1618d4ebd923e97d67e7cd363d80aef35fe961005cbbbb3d2dad8bdd1bc63440" dependencies = [ "arrayvec", + "smallvec", +] + +[[package]] +name = "kurbo" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89234b2cc610a7dd927ebde6b41dd1a5d4214cffaef4cf1fb2195d592f92518f" +dependencies = [ + "arrayvec", + "smallvec", ] [[package]] @@ -3103,39 +3089,43 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.162" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" dependencies = [ "apply", "ashpd 0.9.1", "chrono", "cosmic-config", + "cosmic-freedesktop-icons", "cosmic-theme", "css-color", "derive_setters", - "fraction", - "freedesktop-icons", + "freedesktop-desktop-entry", "iced", "iced_core", "iced_futures", "iced_renderer", "iced_runtime", - "iced_style", "iced_tiny_skia", "iced_wgpu", "iced_widget", "iced_winit", "image 0.25.2", "lazy_static", + "libc", + "license", + "mime 0.3.17", "palette", "rfd", + "rustix 0.38.39", "serde", + "shlex", "slotmap", "taffy", "thiserror", @@ -3157,16 +3147,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] - [[package]] name = "libloading" version = "0.8.3" @@ -3174,7 +3154,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "windows-targets 0.52.4", + "windows-targets 0.52.6", ] [[package]] @@ -3189,7 +3169,7 @@ version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", "redox_syscall 0.4.1", ] @@ -3200,10 +3180,21 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", ] +[[package]] +name = "license" +version = "3.6.0+3.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b517725daf998729e5ef4c4881cdde19cd5bbdde09741ba1b0f1ba0ce018961" +dependencies = [ + "reword", + "serde", + "serde_json", +] + [[package]] name = "linux-raw-sys" version = "0.3.8" @@ -3212,9 +3203,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "linux-raw-sys" @@ -3222,6 +3213,12 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0b5399f6804fbab912acbd8878ed3532d506b7c951b8f9f164ef90fef39e3f4" +[[package]] +name = "litrs" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" + [[package]] name = "locale_config" version = "0.3.0" @@ -3265,9 +3262,6 @@ name = "lru" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" -dependencies = [ - "hashbrown", -] [[package]] name = "lyon" @@ -3384,11 +3378,11 @@ dependencies = [ [[package]] name = "metal" -version = "0.27.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" +checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "block", "core-graphics-types", "foreign-types 0.5.0", @@ -3400,7 +3394,7 @@ dependencies = [ [[package]] name = "mime" version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" dependencies = [ "smithay-clipboard", ] @@ -3447,18 +3441,19 @@ checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" [[package]] name = "naga" -version = "0.19.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +version = "22.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bd5a652b6faf21496f2cfd88fc49989c8db0825d1f6746b1a71a6ede24a63ad" dependencies = [ "arrayvec", "bit-set", - "bitflags 2.5.0", + "bitflags 2.6.0", + "cfg_aliases 0.1.1", "codespan-reporting", "hexf-parse", "indexmap", "log", - "num-traits", - "rustc-hash", + "rustc-hash 1.1.0", "spirv", "termcolor", "thiserror", @@ -3485,14 +3480,14 @@ dependencies = [ [[package]] name = "ndk" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" +checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "jni-sys", "log", - "ndk-sys", + "ndk-sys 0.6.0+11769913", "num_enum", "raw-window-handle", "thiserror", @@ -3513,6 +3508,15 @@ dependencies = [ "jni-sys", ] +[[package]] +name = "ndk-sys" +version = "0.6.0+11769913" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873" +dependencies = [ + "jni-sys", +] + [[package]] name = "new_debug_unreachable" version = "1.0.6" @@ -3537,7 +3541,7 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "cfg_aliases 0.1.1", "libc", @@ -3566,7 +3570,7 @@ version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "crossbeam-channel", "filetime", "fsevent-sys", @@ -3579,20 +3583,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "num" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" -dependencies = [ - "num-bigint", - "num-complex", - "num-integer", - "num-iter", - "num-rational", - "num-traits", -] - [[package]] name = "num-bigint" version = "0.4.6" @@ -3603,21 +3593,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-complex" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" -dependencies = [ - "num-traits", -] - -[[package]] -name = "num-conv" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" - [[package]] name = "num-derive" version = "0.4.2" @@ -3626,7 +3601,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -3638,17 +3613,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-iter" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - [[package]] name = "num-rational" version = "0.4.2" @@ -3698,16 +3662,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.71", -] - -[[package]] -name = "num_threads" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" -dependencies = [ - "libc", + "syn 2.0.87", ] [[package]] @@ -3717,7 +3672,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" dependencies = [ "malloc_buf", - "objc_exception", ] [[package]] @@ -3733,35 +3687,95 @@ dependencies = [ [[package]] name = "objc-sys" -version = "0.3.2" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7c71324e4180d0899963fc83d9d241ac39e699609fc1025a850aadac8257459" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" [[package]] name = "objc2" -version = "0.4.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" +checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" dependencies = [ "objc-sys", - "objc2-encode 3.0.0", + "objc2-encode", ] [[package]] -name = "objc2" -version = "0.5.0" +name = "objc2-app-kit" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a9c7f0d511a4ce26b078183179dca908171cfc69f88986fe36c5138e1834476" +checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" dependencies = [ - "objc-sys", - "objc2-encode 4.0.3", + "bitflags 2.6.0", + "block2", + "libc", + "objc2", + "objc2-core-data", + "objc2-core-image", + "objc2-foundation", + "objc2-quartz-core", ] [[package]] -name = "objc2-encode" -version = "3.0.0" +name = "objc2-cloud-kit" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" +checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-core-location", + "objc2-foundation", +] + +[[package]] +name = "objc2-contacts" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-data" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-image" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc2-core-location" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781" +dependencies = [ + "block2", + "objc2", + "objc2-contacts", + "objc2-foundation", +] [[package]] name = "objc2-encode" @@ -3770,12 +3784,108 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" [[package]] -name = "objc_exception" -version = "0.1.2" +name = "objc2-foundation" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" dependencies = [ - "cc", + "bitflags 2.6.0", + "block2", + "dispatch", + "libc", + "objc2", +] + +[[package]] +name = "objc2-link-presentation" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398" +dependencies = [ + "block2", + "objc2", + "objc2-app-kit", + "objc2-foundation", +] + +[[package]] +name = "objc2-metal" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-quartz-core" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc2-symbols" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc" +dependencies = [ + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-ui-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-cloud-kit", + "objc2-core-data", + "objc2-core-image", + "objc2-core-location", + "objc2-foundation", + "objc2-link-presentation", + "objc2-quartz-core", + "objc2-symbols", + "objc2-uniform-type-identifiers", + "objc2-user-notifications", +] + +[[package]] +name = "objc2-uniform-type-identifiers" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-user-notifications" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-core-location", + "objc2-foundation", ] [[package]] @@ -3819,7 +3929,7 @@ version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "foreign-types 0.3.2", "libc", @@ -3836,7 +3946,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -3894,9 +4004,9 @@ dependencies = [ [[package]] name = "ouroboros" -version = "0.17.2" +version = "0.18.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2ba07320d39dfea882faa70554b4bd342a5f273ed59ba7c1c6b4c840492c954" +checksum = "944fa20996a25aded6b4795c6d63f10014a7a83f8be9828a11860b08c5fc4a67" dependencies = [ "aliasable", "ouroboros_macro", @@ -3905,15 +4015,16 @@ dependencies = [ [[package]] name = "ouroboros_macro" -version = "0.17.2" +version = "0.18.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec4c6225c69b4ca778c0aea097321a64c421cf4577b331c61b229267edabb6f8" +checksum = "39b0deead1528fd0e5947a8546a9642a9777c25f6e1e26f34c97b204bbb465bd" dependencies = [ "heck 0.4.1", - "proc-macro-error", + "itertools", "proc-macro2", + "proc-macro2-diagnostics", "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -3946,7 +4057,7 @@ checksum = "e8890702dbec0bad9116041ae586f84805b13eecd1d8b1df27c29998a9969d6d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -4051,7 +4162,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -4060,7 +4171,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ - "siphasher", + "siphasher 0.3.11", ] [[package]] @@ -4086,7 +4197,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -4157,7 +4268,7 @@ dependencies = [ "concurrent-queue", "hermit-abi", "pin-project-lite", - "rustix 0.38.32", + "rustix 0.38.39", "tracing", "windows-sys 0.52.0", ] @@ -4168,12 +4279,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2" -[[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" @@ -4238,6 +4343,19 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "proc-macro2-diagnostics" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", + "version_check", + "yansi", +] + [[package]] name = "profiling" version = "1.0.15" @@ -4254,7 +4372,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" dependencies = [ "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -4274,9 +4392,9 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" [[package]] name = "quick-xml" -version = "0.34.0" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f24d770aeca0eacb81ac29dfbc55ebcc09312fdd1f8bbecdc7e4a84e000e3b4" +checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe" dependencies = [ "memchr", ] @@ -4408,17 +4526,11 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "rctree" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" - [[package]] name = "read-fonts" -version = "0.19.3" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8b8af39d1f23869711ad4cea5e7835a20daa987f80232f7f2a2374d648ca64d" +checksum = "f6f9e8a4f503e5c8750e4cd3b32a4e090035c46374b305a15c70bad833dca05f" dependencies = [ "bytemuck", "font-types", @@ -4433,15 +4545,6 @@ dependencies = [ "bitflags 1.3.2", ] -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.4.1" @@ -4543,21 +4646,29 @@ dependencies = [ [[package]] name = "resvg" -version = "0.37.0" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cadccb3d99a9efb8e5e00c16fbb732cbe400db2ec7fc004697ee7d97d86cf1f4" +checksum = "944d052815156ac8fa77eaac055220e95ba0b01fa8887108ca710c03805d9051" dependencies = [ - "gif 0.12.0", + "gif", "jpeg-decoder", "log", "pico-args", - "png", "rgb", "svgtypes", "tiny-skia", "usvg", ] +[[package]] +name = "reword" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe272098dce9ed76b479995953f748d1851261390b08f8a0ff619c885a1f0765" +dependencies = [ + "unicode-segmentation", +] + [[package]] name = "rfd" version = "0.14.1" @@ -4597,7 +4708,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ "base64 0.21.7", - "bitflags 2.5.0", + "bitflags 2.6.0", "serde", "serde_derive", ] @@ -4608,6 +4719,12 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" +[[package]] +name = "roxmltree" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" + [[package]] name = "rust-embed" version = "8.3.0" @@ -4628,7 +4745,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.71", + "syn 2.0.87", "walkdir", ] @@ -4664,6 +4781,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc-hash" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" + [[package]] name = "rustix" version = "0.37.27" @@ -4672,7 +4795,7 @@ checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" dependencies = [ "bitflags 1.3.2", "errno", - "io-lifetimes", + "io-lifetimes 1.0.11", "libc", "linux-raw-sys 0.3.8", "windows-sys 0.48.0", @@ -4680,14 +4803,14 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.32" +version = "0.38.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +checksum = "375116bee2be9ed569afe2154ea6a99dfdffd257f533f187498c2a8f5feaf4ee" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", - "linux-raw-sys 0.4.13", + "linux-raw-sys 0.4.14", "windows-sys 0.52.0", ] @@ -4707,41 +4830,19 @@ version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247" -[[package]] -name = "rustversion" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" - -[[package]] -name = "rustybuzz" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c" -dependencies = [ - "bitflags 2.5.0", - "bytemuck", - "smallvec", - "ttf-parser 0.20.0", - "unicode-bidi-mirroring 0.1.0", - "unicode-ccc 0.1.2", - "unicode-properties", - "unicode-script", -] - [[package]] name = "rustybuzz" version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfb9cf8877777222e4a3bc7eb247e398b56baba500c38c1c46842431adc8b55c" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "bytemuck", "libm", "smallvec", "ttf-parser 0.21.1", - "unicode-bidi-mirroring 0.2.0", - "unicode-ccc 0.2.0", + "unicode-bidi-mirroring", + "unicode-ccc", "unicode-properties", "unicode-script", ] @@ -4784,14 +4885,14 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sctk-adwaita" -version = "0.8.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b2eaf3a5b264a521b988b2e73042e742df700c4f962cde845d1541adb46550" +checksum = "b6277f0217056f77f1d8f49f2950ac6c278c0d607c45f5ee99328d792ede24ec" dependencies = [ "ab_glyph", "log", "memmap2 0.9.4", - "smithay-client-toolkit 0.18.1", + "smithay-client-toolkit", "tiny-skia", ] @@ -4850,7 +4951,7 @@ checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -4873,7 +4974,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -4965,10 +5066,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] -name = "skrifa" -version = "0.19.3" +name = "siphasher" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab45fb68b53576a43d4fc0e9ec8ea64e29a4d2cc7f44506964cb75f288222e9" +checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" + +[[package]] +name = "skrifa" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6667e349abb2e6e850b31bc638a11f7fadd7e4cf113b71947c46bf6d5fe0dbc9" dependencies = [ "bytemuck", "read-fonts", @@ -4998,54 +5105,29 @@ version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" -[[package]] -name = "smithay-client-toolkit" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" -dependencies = [ - "bitflags 2.5.0", - "calloop 0.12.4", - "calloop-wayland-source 0.2.0", - "cursor-icon", - "libc", - "log", - "memmap2 0.9.4", - "rustix 0.38.32", - "thiserror", - "wayland-backend", - "wayland-client", - "wayland-csd-frame", - "wayland-cursor", - "wayland-protocols 0.31.2", - "wayland-protocols-wlr 0.2.0", - "wayland-scanner", - "xkeysym", -] - [[package]] name = "smithay-client-toolkit" version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "bytemuck", - "calloop 0.13.0", - "calloop-wayland-source 0.3.0", + "calloop", + "calloop-wayland-source", "cursor-icon", "libc", "log", "memmap2 0.9.4", "pkg-config", - "rustix 0.38.32", + "rustix 0.38.39", "thiserror", "wayland-backend", "wayland-client", "wayland-csd-frame", "wayland-cursor", - "wayland-protocols 0.32.3", - "wayland-protocols-wlr 0.3.3", + "wayland-protocols", + "wayland-protocols-wlr", "wayland-scanner", "xkbcommon", "xkeysym", @@ -5058,7 +5140,7 @@ source = "git+https://github.com/pop-os/smithay-clipboard?tag=pop-dnd-5#5a3007de dependencies = [ "libc", "raw-window-handle", - "smithay-client-toolkit 0.19.2", + "smithay-client-toolkit", "wayland-backend", ] @@ -5098,7 +5180,7 @@ source = "git+https://github.com/pop-os/softbuffer?tag=cosmic-4.0#6e75b1ad7e9839 dependencies = [ "as-raw-xcb-connection", "bytemuck", - "cfg_aliases 0.2.0", + "cfg_aliases 0.2.1", "cocoa", "core-graphics", "drm", @@ -5110,7 +5192,7 @@ dependencies = [ "objc", "raw-window-handle", "redox_syscall 0.4.1", - "rustix 0.38.32", + "rustix 0.38.39", "tiny-xlib", "wasm-bindgen", "wayland-backend", @@ -5136,7 +5218,7 @@ version = "0.3.0+sdk-1.3.268.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -5174,19 +5256,19 @@ checksum = "f83ba502a3265efb76efb89b0a2f7782ad6f2675015d4ce37e4b547dda42b499" [[package]] name = "svgtypes" -version = "0.13.0" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e44e288cd960318917cbd540340968b90becc8bc81f171345d706e7a89d9d70" +checksum = "794de53cc48eaabeed0ab6a3404a65f40b3e38c067e4435883a65d2aa4ca000e" dependencies = [ - "kurbo", - "siphasher", + "kurbo 0.11.1", + "siphasher 1.0.1", ] [[package]] name = "swash" -version = "0.1.17" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d7773d67fe3373048cf840bfcc54ec3207cfc1e95c526b287ef2eb5eff9faf6" +checksum = "f0e25b48fd1c222c9fdb61148e2203b750f9840c07922fd61b87c6015560b8f6" dependencies = [ "skrifa", "yazi", @@ -5206,9 +5288,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.71" +version = "2.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462" +checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" dependencies = [ "proc-macro2", "quote", @@ -5281,6 +5363,12 @@ version = "0.12.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" +[[package]] +name = "temp-dir" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc1ee6eef34f12f765cb94725905c6312b6610ab2b0940889cfe58dae7bc3c72" + [[package]] name = "tempfile" version = "3.10.1" @@ -5289,7 +5377,7 @@ checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand 2.0.2", - "rustix 0.38.32", + "rustix 0.38.39", "windows-sys 0.52.0", ] @@ -5304,22 +5392,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -5333,39 +5421,6 @@ dependencies = [ "weezl", ] -[[package]] -name = "time" -version = "0.3.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" -dependencies = [ - "deranged", - "itoa", - "libc", - "num-conv", - "num_threads", - "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.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" -dependencies = [ - "num-conv", - "time-core", -] - [[package]] name = "tiny-keccak" version = "2.0.2" @@ -5409,7 +5464,7 @@ checksum = "1d52f22673960ad13af14ff4025997312def1223bfa7c8e4949d099e6b3d5d1c" dependencies = [ "as-raw-xcb-connection", "ctor-lite", - "libloading 0.8.3", + "libloading", "pkg-config", "tracing", ] @@ -5465,7 +5520,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -5598,9 +5653,9 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.40" +version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ "log", "pin-project-lite", @@ -5610,20 +5665,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] name = "tracing-core" -version = "0.1.32" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" dependencies = [ "once_cell", ] @@ -5652,7 +5707,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6d3364c5e96cb2ad1603037ab253ddd34d7fb72a58bdddf4b7350760fc69a46" dependencies = [ - "rustc-hash", + "rustc-hash 1.1.0", ] [[package]] @@ -5697,24 +5752,12 @@ version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" -[[package]] -name = "unicode-bidi-mirroring" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694" - [[package]] name = "unicode-bidi-mirroring" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23cb788ffebc92c5948d0e997106233eeb1d8b9512f93f41651f52b6c5f5af86" -[[package]] -name = "unicode-ccc" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" - [[package]] name = "unicode-ccc" version = "0.2.0" @@ -5798,63 +5841,29 @@ checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[package]] name = "usvg" -version = "0.37.0" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b0a51b72ab80ca511d126b77feeeb4fb1e972764653e61feac30adc161a756" -dependencies = [ - "base64 0.21.7", - "log", - "pico-args", - "usvg-parser", - "usvg-text-layout", - "usvg-tree", - "xmlwriter", -] - -[[package]] -name = "usvg-parser" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bd4e3c291f45d152929a31f0f6c819245e2921bfd01e7bd91201a9af39a2bdc" +checksum = "b84ea542ae85c715f07b082438a4231c3760539d902e11d093847a0b22963032" dependencies = [ + "base64 0.22.0", "data-url", "flate2", + "fontdb 0.18.0", "imagesize", - "kurbo", + "kurbo 0.11.1", "log", - "roxmltree", + "pico-args", + "roxmltree 0.20.0", + "rustybuzz", "simplecss", - "siphasher", - "svgtypes", - "usvg-tree", -] - -[[package]] -name = "usvg-text-layout" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d383a3965de199d7f96d4e11a44dd859f46e86de7f3dca9a39bf82605da0a37c" -dependencies = [ - "fontdb", - "kurbo", - "log", - "rustybuzz 0.12.1", - "unicode-bidi", - "unicode-script", - "unicode-vo", - "usvg-tree", -] - -[[package]] -name = "usvg-tree" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ee3d202ebdb97a6215604b8f5b4d6ef9024efd623cf2e373a6416ba976ec7d3" -dependencies = [ - "rctree", + "siphasher 1.0.1", "strict-num", "svgtypes", "tiny-skia-path", + "unicode-bidi", + "unicode-script", + "unicode-vo", + "xmlwriter", ] [[package]] @@ -5874,18 +5883,6 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" -[[package]] -name = "vergen" -version = "8.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2990d9ea5967266ea0ccf413a4aa5c42a93dbcfda9cb49a97de6931726b12566" -dependencies = [ - "anyhow", - "cfg-if", - "rustversion", - "time", -] - [[package]] name = "version-compare" version = "0.2.0" @@ -5931,34 +5928,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" dependencies = [ "cfg-if", "js-sys", @@ -5968,9 +5966,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5978,22 +5976,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" [[package]] name = "wasm-timer" @@ -6012,13 +6010,13 @@ dependencies = [ [[package]] name = "wayland-backend" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f90e11ce2ca99c97b940ee83edbae9da2d56a08f9ea8158550fd77fa31722993" +checksum = "056535ced7a150d45159d3a8dc30f91a2e2d588ca0b23f70e56033622b8016f6" dependencies = [ "cc", "downcast-rs", - "rustix 0.38.32", + "rustix 0.38.39", "scoped-tls", "smallvec", "wayland-sys", @@ -6026,12 +6024,12 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.31.5" +version = "0.31.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e321577a0a165911bdcfb39cf029302479d7527b517ee58ab0f6ad09edf0943" +checksum = "b66249d3fc69f76fd74c82cc319300faa554e9d865dab1f7cd66cc20db10b280" dependencies = [ - "bitflags 2.5.0", - "rustix 0.38.32", + "bitflags 2.6.0", + "rustix 0.38.39", "wayland-backend", "wayland-scanner", ] @@ -6042,7 +6040,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cursor-icon", "wayland-backend", ] @@ -6053,58 +6051,34 @@ version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71ce5fa868dd13d11a0d04c5e2e65726d0897be8de247c0c5a65886e283231ba" dependencies = [ - "rustix 0.38.32", + "rustix 0.38.39", "wayland-client", "xcursor", ] [[package]] name = "wayland-protocols" -version = "0.31.2" +version = "0.32.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" +checksum = "7cd0ade57c4e6e9a8952741325c30bf82f4246885dca8bf561898b86d0c1f58e" dependencies = [ - "bitflags 2.5.0", - "wayland-backend", - "wayland-client", - "wayland-scanner", -] - -[[package]] -name = "wayland-protocols" -version = "0.32.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62989625a776e827cc0f15d41444a3cea5205b963c3a25be48ae1b52d6b4daaa" -dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "wayland-backend", "wayland-client", "wayland-scanner", + "wayland-server", ] [[package]] name = "wayland-protocols-plasma" -version = "0.2.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" +checksum = "f79f2d57c7fcc6ab4d602adba364bf59a5c24de57bd194486bf9b8360e06bfc4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "wayland-backend", "wayland-client", - "wayland-protocols 0.31.2", - "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.5.0", - "wayland-backend", - "wayland-client", - "wayland-protocols 0.31.2", + "wayland-protocols", "wayland-scanner", ] @@ -6114,18 +6088,19 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd993de54a40a40fbe5601d9f1fbcaef0aebcc5fda447d7dc8f6dcbaae4f8953" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "wayland-backend", "wayland-client", - "wayland-protocols 0.32.3", + "wayland-protocols", "wayland-scanner", + "wayland-server", ] [[package]] name = "wayland-scanner" -version = "0.31.4" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7b56f89937f1cf2ee1f1259cf2936a17a1f45d8f0aa1019fae6d470d304cfa6" +checksum = "597f2001b2e5fc1121e3d5b9791d3e78f05ba6bfa4641053846248e3a13661c3" dependencies = [ "proc-macro2", "quick-xml", @@ -6133,10 +6108,24 @@ dependencies = [ ] [[package]] -name = "wayland-sys" -version = "0.31.4" +name = "wayland-server" +version = "0.31.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43676fe2daf68754ecf1d72026e4e6c15483198b5d24e888b74d3f22f887a148" +checksum = "c89532cc712a2adb119eb4d09694b402576052254d0bb284f82ac1c47fb786ad" +dependencies = [ + "bitflags 2.6.0", + "downcast-rs", + "io-lifetimes 2.0.4", + "rustix 0.38.39", + "wayland-backend", + "wayland-scanner", +] + +[[package]] +name = "wayland-sys" +version = "0.31.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efa8ac0d8e8ed3e3b5c9fc92c7881406a268e11555abe36493efabe649a29e09" dependencies = [ "dlib", "log", @@ -6146,9 +6135,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" dependencies = [ "js-sys", "wasm-bindgen", @@ -6156,9 +6145,9 @@ dependencies = [ [[package]] name = "web-time" -version = "0.2.4" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" dependencies = [ "js-sys", "wasm-bindgen", @@ -6172,12 +6161,13 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "wgpu" -version = "0.19.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +version = "22.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d1c4ba43f80542cf63a0a6ed3134629ae73e8ab51e4b765a67f3aa062eb433" dependencies = [ "arrayvec", - "cfg-if", "cfg_aliases 0.1.1", + "document-features", "js-sys", "log", "naga", @@ -6196,14 +6186,15 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "0.19.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +version = "22.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0348c840d1051b8e86c3bcd31206080c5e71e5933dabd79be1ce732b0b2f089a" dependencies = [ "arrayvec", "bit-vec", - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg_aliases 0.1.1", - "codespan-reporting", + "document-features", "indexmap", "log", "naga", @@ -6211,24 +6202,24 @@ dependencies = [ "parking_lot 0.12.1", "profiling", "raw-window-handle", - "rustc-hash", + "rustc-hash 1.1.0", "smallvec", "thiserror", - "web-sys", "wgpu-hal", "wgpu-types", ] [[package]] name = "wgpu-hal" -version = "0.19.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6bbf4b4de8b2a83c0401d9e5ae0080a2792055f25859a02bf9be97952bbed4f" dependencies = [ "android_system_properties", "arrayvec", "ash", "bit-set", - "bitflags 2.5.0", + "bitflags 2.6.0", "block", "cfg_aliases 0.1.1", "core-graphics-types", @@ -6242,10 +6233,11 @@ dependencies = [ "js-sys", "khronos-egl", "libc", - "libloading 0.8.3", + "libloading", "log", "metal", "naga", + "ndk-sys 0.5.0+25.2.9519653", "objc", "once_cell", "parking_lot 0.12.1", @@ -6253,7 +6245,7 @@ dependencies = [ "range-alloc", "raw-window-handle", "renderdoc-sys", - "rustc-hash", + "rustc-hash 1.1.0", "smallvec", "thiserror", "wasm-bindgen", @@ -6264,10 +6256,11 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "0.19.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc9d91f0e2c4b51434dfa6db77846f2793149d8e73f800fa2e41f52b8eac3c5d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "js-sys", "web-sys", ] @@ -6312,7 +6305,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "window_clipboard" version = "0.4.1" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" dependencies = [ "clipboard-win", "clipboard_macos", @@ -6324,25 +6317,26 @@ dependencies = [ "thiserror", ] -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-implement", - "windows-interface", - "windows-targets 0.48.5", -] - [[package]] name = "windows" version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ - "windows-core", - "windows-targets 0.52.4", + "windows-core 0.52.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" +dependencies = [ + "windows-core 0.54.0", + "windows-implement", + "windows-interface", + "windows-targets 0.52.6", ] [[package]] @@ -6351,29 +6345,48 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", ] [[package]] name = "windows-implement" -version = "0.48.0" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e2ee588991b9e7e6c8338edf3333fbe4da35dc72092643958ebb43f0ab2c49c" +checksum = "942ac266be9249c84ca862f0a164a39533dc2f6f33dc98ec89c8da99b82ea0bd" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.87", ] [[package]] name = "windows-interface" -version = "0.48.0" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6fb8df20c9bcaa8ad6ab513f7b40104840c8867d5751126e4df3b08388d0cc7" +checksum = "da33557140a288fae4e1d5f8873aaf9eb6613a9cf82c3e070223ff177f598b60" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.87", +] + +[[package]] +name = "windows-result" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -6400,7 +6413,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.6", ] [[package]] @@ -6435,17 +6448,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "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", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -6462,9 +6476,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -6480,9 +6494,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -6498,9 +6512,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -6516,9 +6536,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -6534,9 +6554,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -6552,9 +6572,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -6570,52 +6590,56 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winit" -version = "0.29.10" -source = "git+https://github.com/pop-os/winit.git?branch=winit-0.29#bdc66109acc85c912264c9e4b864520345bdb45f" +version = "0.30.5" +source = "git+https://github.com/pop-os/winit.git?tag=iced-xdg-surface-0.13#1cc02bdab141072eaabad639d74b032fd0fcc62e" dependencies = [ "ahash", "android-activity", "atomic-waker", - "bitflags 2.5.0", + "bitflags 2.6.0", + "block2", "bytemuck", - "calloop 0.12.4", - "cfg_aliases 0.1.1", + "calloop", + "cfg_aliases 0.2.1", + "concurrent-queue", "core-foundation", "core-graphics", "cursor-icon", - "icrate 0.0.4", + "dpi", "js-sys", "libc", - "log", "memmap2 0.9.4", "ndk", - "ndk-sys", - "objc2 0.4.1", - "once_cell", + "objc2", + "objc2-app-kit", + "objc2-foundation", + "objc2-ui-kit", "orbclient", "percent-encoding", + "pin-project", "raw-window-handle", - "redox_syscall 0.3.5", - "rustix 0.38.32", + "redox_syscall 0.4.1", + "rustix 0.38.39", "sctk-adwaita", - "smithay-client-toolkit 0.18.1", + "smithay-client-toolkit", "smol_str", + "tracing", "unicode-segmentation", "wasm-bindgen", "wasm-bindgen-futures", "wayland-backend", "wayland-client", - "wayland-protocols 0.31.2", + "wayland-protocols", "wayland-protocols-plasma", "web-sys", "web-time", - "windows-sys 0.48.0", + "windows-sys 0.52.0", "x11-dl", "x11rb", "xkbcommon-dl", @@ -6669,9 +6693,9 @@ dependencies = [ "as-raw-xcb-connection", "gethostname", "libc", - "libloading 0.8.3", + "libloading", "once_cell", - "rustix 0.38.32", + "rustix 0.38.39", "x11rb-protocol", ] @@ -6720,7 +6744,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "dlib", "log", "once_cell", @@ -6749,16 +6773,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" [[package]] -name = "xxhash-rust" -version = "0.8.10" +name = "yansi" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927da81e25be1e1a2901d59b81b37dd2efd1fc9c9345a55007f09bf5a2d3ee03" +checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" [[package]] name = "yazi" -version = "0.1.6" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1" +checksum = "e01738255b5a16e78bbb83e7fbba0a1e7dd506905cfc53f4622d89015a03fbb5" [[package]] name = "zbus" @@ -6767,15 +6791,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" dependencies = [ "async-broadcast 0.5.1", - "async-executor", - "async-fs 1.6.0", - "async-io 1.13.0", - "async-lock 2.8.0", "async-process 1.8.1", "async-recursion", - "async-task", "async-trait", - "blocking", "byteorder", "derivative", "enumflags2", @@ -6810,7 +6828,7 @@ checksum = "23915fcb26e7a9a9dc05fd93a9870d336d6d032cd7e8cebf1c5c37666489fdd5" dependencies = [ "async-broadcast 0.7.1", "async-executor", - "async-fs 2.1.2", + "async-fs", "async-io 2.3.2", "async-lock 3.3.0", "async-process 2.2.3", @@ -6864,7 +6882,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", "zvariant_utils 2.0.0", ] @@ -6892,9 +6910,9 @@ dependencies = [ [[package]] name = "zeno" -version = "0.2.3" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd15f8e0dbb966fd9245e7498c7e9e5055d9e5c8b676b95bd67091cd11a1e697" +checksum = "cc0de2315dc13d00e5df3cd6b8d2124a6eaec6a2d4b6a1c5f37b7efad17fcc17" [[package]] name = "zerocopy" @@ -6913,7 +6931,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -6990,7 +7008,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", "zvariant_utils 2.0.0", ] @@ -7013,5 +7031,5 @@ checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", ] diff --git a/pkgs/by-name/fo/forecast/package.nix b/pkgs/by-name/fo/forecast/package.nix index 893b0150ae57..43da5ff5aadb 100644 --- a/pkgs/by-name/fo/forecast/package.nix +++ b/pkgs/by-name/fo/forecast/package.nix @@ -16,29 +16,30 @@ rustPlatform.buildRustPackage { pname = "forecast"; - version = "0-unstable-2024-09-23"; + version = "0-unstable-2025-02-12"; src = fetchFromGitHub { owner = "cosmic-utils"; repo = "forecast"; - rev = "d3c274932847aa101fb7aacf1d01ded265b6fad4"; - hash = "sha256-6hlh9T0h1Yi8io2sMU/r8uMtP6isH6JJxE5LvZrj9Cs="; + rev = "08030d27dc7751122a3d5d228ef25eb0a6725c8f"; + hash = "sha256-06HZ38yW1xnRhXQZ6tHg2Yr0LmfJVRu7Cpp245B7tBg="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "accesskit-0.12.2" = "sha256-1UwgRyUe0PQrZrpS7574oNLi13fg5HpgILtZGW6JNtQ="; + "accesskit-0.16.0" = "sha256-yeBzocXxuvHmuPGMRebbsYSKSvN+8sUsmaSKlQDpW4w="; "atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA="; - "clipboard_macos-0.1.0" = "sha256-cG5vnkiyDlQnbEfV2sPbmBYKv1hd3pjJrymfZb8ziKk="; - "cosmic-config-0.1.0" = "sha256-zamYPvxmIqh4IT4G+aqceP1mXNNBA1TAcJwAtjlbYAU="; - "cosmic-text-0.12.1" = "sha256-5Gk220HTiHuxDvyqwz1Dwr+BaLvH/6X7M14IirQzcsE="; - "d3d12-0.19.0" = "sha256-usrxQXWLGJDjmIdw1LBXtBvX+CchZDvE8fHC0LjvhD4="; - "glyphon-0.5.0" = "sha256-j1HrbEpUBqazWqNfJhpyjWuxYAxkvbXzRKeSouUoPWg="; + "clipboard_macos-0.1.0" = "sha256-tovB4fjPVVRY8LKn5albMzskFQ+1W5ul4jT5RXx9gKE="; + "cosmic-client-toolkit-0.1.0" = "sha256-/DJ/PfqnZHB6VeRi7HXWp0Vruk+jWBe+VCLPpiJeEv4="; + "cosmic-config-0.1.0" = "sha256-7CKtRpQKYyUwANz5OMkfqDkfbGP4y0pSjvWBngby+yI="; + "cosmic-freedesktop-icons-0.2.6" = "sha256-+WmCBP9BQx7AeGdFW2KM029vuweYKM/OzuCap5aTImw="; + "cosmic-text-0.12.1" = "sha256-+litEIoCWfwt/+wqRCtWuGr5DHAuDFV/naHnADNLbQI="; + "dpi-0.1.1" = "sha256-whi05/2vc3s5eAJTZ9TzVfGQ/EnfPr0S4PZZmbiYio0="; + "iced_glyphon-0.6.0" = "sha256-u1vnsOjP8npQ57NNSikotuHxpi4Mp/rV9038vAgCsfQ="; "smithay-clipboard-0.8.0" = "sha256-4InFXm0ahrqFrtNLeqIuE3yeOpxKZJZx+Bc0yQDtv34="; "softbuffer-0.4.1" = "sha256-a0bUFz6O8CWRweNt/OxTvflnPYwO5nm6vsyc/WcXyNg="; "taffy-0.3.11" = "sha256-SCx9GEIJjWdoNVyq+RZAGn0N71qraKZxf9ZWhvyzLaI="; - "winit-0.29.10" = "sha256-ScTII2AzK3SC8MVeASZ9jhVWsEaGrSQ2BnApTxgfxK4="; }; }; From 9f2205b4ef5de22a0c2fed71307204de4a8aeb0d Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Thu, 13 Feb 2025 14:57:09 -0300 Subject: [PATCH 1805/2168] forecast: migrate to useFetchCargoVendor --- pkgs/by-name/fo/forecast/Cargo.lock | 7035 -------------------------- pkgs/by-name/fo/forecast/package.nix | 19 +- 2 files changed, 2 insertions(+), 7052 deletions(-) delete mode 100644 pkgs/by-name/fo/forecast/Cargo.lock diff --git a/pkgs/by-name/fo/forecast/Cargo.lock b/pkgs/by-name/fo/forecast/Cargo.lock deleted file mode 100644 index 1830507aa82e..000000000000 --- a/pkgs/by-name/fo/forecast/Cargo.lock +++ /dev/null @@ -1,7035 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 4 - -[[package]] -name = "ab_glyph" -version = "0.2.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e08104bebc65a46f8bc7aa733d39ea6874bfa7156f41a46b805785e3af1587d" -dependencies = [ - "ab_glyph_rasterizer", - "owned_ttf_parser", -] - -[[package]] -name = "ab_glyph_rasterizer" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" - -[[package]] -name = "accesskit" -version = "0.16.0" -source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" - -[[package]] -name = "accesskit_atspi_common" -version = "0.9.0" -source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" -dependencies = [ - "accesskit", - "accesskit_consumer", - "atspi-common", - "serde", - "thiserror", - "zvariant 3.15.2", -] - -[[package]] -name = "accesskit_consumer" -version = "0.24.0" -source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" -dependencies = [ - "accesskit", - "immutable-chunkmap", -] - -[[package]] -name = "accesskit_macos" -version = "0.17.0" -source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" -dependencies = [ - "accesskit", - "accesskit_consumer", - "objc2", - "objc2-app-kit", - "objc2-foundation", - "once_cell", -] - -[[package]] -name = "accesskit_unix" -version = "0.12.0" -source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" -dependencies = [ - "accesskit", - "accesskit_atspi_common", - "atspi", - "futures-lite 1.13.0", - "serde", - "tokio", - "tokio-stream", - "zbus 3.15.2", -] - -[[package]] -name = "accesskit_windows" -version = "0.22.0" -source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" -dependencies = [ - "accesskit", - "accesskit_consumer", - "paste", - "static_assertions", - "windows 0.54.0", -] - -[[package]] -name = "accesskit_winit" -version = "0.22.0" -source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" -dependencies = [ - "accesskit", - "accesskit_macos", - "accesskit_unix", - "accesskit_windows", - "raw-window-handle", - "winit", -] - -[[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 = "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 = "aliasable" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" - -[[package]] -name = "aligned-vec" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1" - -[[package]] -name = "allocator-api2" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" - -[[package]] -name = "almost" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3aa2999eb46af81abb65c2d30d446778d7e613b60bbf4e174a027e80f90a3c14" - -[[package]] -name = "android-activity" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046" -dependencies = [ - "android-properties", - "bitflags 2.6.0", - "cc", - "cesu8", - "jni", - "jni-sys", - "libc", - "log", - "ndk", - "ndk-context", - "ndk-sys 0.6.0+11769913", - "num_enum", - "thiserror", -] - -[[package]] -name = "android-properties" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" - -[[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 = "anyhow" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" - -[[package]] -name = "apply" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f47b57fc4521e3cae26a4d45b5227f8fadee4c345be0fefd8d5d1711afb8aeb9" - -[[package]] -name = "approx" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" -dependencies = [ - "num-traits", -] - -[[package]] -name = "arbitrary" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" - -[[package]] -name = "arc-swap" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" - -[[package]] -name = "arg_enum_proc_macro" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "arrayref" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" - -[[package]] -name = "arrayvec" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" - -[[package]] -name = "as-raw-xcb-connection" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" - -[[package]] -name = "ash" -version = "0.38.0+1.3.281" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f" -dependencies = [ - "libloading", -] - -[[package]] -name = "ashpd" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093" -dependencies = [ - "async-fs", - "async-net", - "enumflags2", - "futures-channel", - "futures-util", - "rand", - "serde", - "serde_repr", - "tokio", - "url", - "zbus 4.3.0", -] - -[[package]] -name = "ashpd" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfe7e0dd0ac5a401dc116ed9f9119cf9decc625600474cb41f0fc0a0050abc9a" -dependencies = [ - "enumflags2", - "futures-channel", - "futures-util", - "rand", - "serde", - "serde_repr", - "tokio", - "url", - "zbus 4.3.0", -] - -[[package]] -name = "async-broadcast" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" -dependencies = [ - "event-listener 2.5.3", - "futures-core", -] - -[[package]] -name = "async-broadcast" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" -dependencies = [ - "event-listener 5.3.0", - "event-listener-strategy 0.5.1", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-channel" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" -dependencies = [ - "concurrent-queue", - "event-listener 5.3.0", - "event-listener-strategy 0.5.1", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-compression" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a116f46a969224200a0a97f29cfd4c50e7534e4b4826bd23ea2c3c533039c82c" -dependencies = [ - "flate2", - "futures-core", - "memchr", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "async-executor" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a" -dependencies = [ - "async-task", - "concurrent-queue", - "fastrand 2.0.2", - "futures-lite 2.3.0", - "slab", -] - -[[package]] -name = "async-fs" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" -dependencies = [ - "async-lock 3.3.0", - "blocking", - "futures-lite 2.3.0", -] - -[[package]] -name = "async-io" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" -dependencies = [ - "async-lock 2.8.0", - "autocfg", - "cfg-if", - "concurrent-queue", - "futures-lite 1.13.0", - "log", - "parking", - "polling 2.8.0", - "rustix 0.37.27", - "slab", - "socket2 0.4.10", - "waker-fn", -] - -[[package]] -name = "async-io" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" -dependencies = [ - "async-lock 3.3.0", - "cfg-if", - "concurrent-queue", - "futures-io", - "futures-lite 2.3.0", - "parking", - "polling 3.6.0", - "rustix 0.38.39", - "slab", - "tracing", - "windows-sys 0.52.0", -] - -[[package]] -name = "async-lock" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" -dependencies = [ - "event-listener 2.5.3", -] - -[[package]] -name = "async-lock" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" -dependencies = [ - "event-listener 4.0.3", - "event-listener-strategy 0.4.0", - "pin-project-lite", -] - -[[package]] -name = "async-net" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7" -dependencies = [ - "async-io 2.3.2", - "blocking", - "futures-lite 2.3.0", -] - -[[package]] -name = "async-process" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" -dependencies = [ - "async-io 1.13.0", - "async-lock 2.8.0", - "async-signal", - "blocking", - "cfg-if", - "event-listener 3.1.0", - "futures-lite 1.13.0", - "rustix 0.38.39", - "windows-sys 0.48.0", -] - -[[package]] -name = "async-process" -version = "2.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a" -dependencies = [ - "async-channel", - "async-io 2.3.2", - "async-lock 3.3.0", - "async-signal", - "async-task", - "blocking", - "cfg-if", - "event-listener 5.3.0", - "futures-lite 2.3.0", - "rustix 0.38.39", - "tracing", - "windows-sys 0.52.0", -] - -[[package]] -name = "async-recursion" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "async-signal" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" -dependencies = [ - "async-io 2.3.2", - "async-lock 2.8.0", - "atomic-waker", - "cfg-if", - "futures-core", - "futures-io", - "rustix 0.38.39", - "signal-hook-registry", - "slab", - "windows-sys 0.48.0", -] - -[[package]] -name = "async-task" -version = "4.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" - -[[package]] -name = "async-trait" -version = "0.1.81" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "atomic-waker" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" - -[[package]] -name = "atomicwrites" -version = "0.4.2" -source = "git+https://github.com/jackpot51/rust-atomicwrites#043ab4859d53ffd3d55334685303d8df39c9f768" -dependencies = [ - "rustix 0.38.39", - "tempfile", - "windows-sys 0.48.0", -] - -[[package]] -name = "atspi" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6059f350ab6f593ea00727b334265c4dfc7fd442ee32d264794bd9bdc68e87ca" -dependencies = [ - "atspi-common", - "atspi-connection", - "atspi-proxies", -] - -[[package]] -name = "atspi-common" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92af95f966d2431f962bc632c2e68eda7777330158bf640c4af4249349b2cdf5" -dependencies = [ - "enumflags2", - "serde", - "static_assertions", - "zbus 3.15.2", - "zbus_names 2.6.1", - "zvariant 3.15.2", -] - -[[package]] -name = "atspi-connection" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c65e7d70f86d4c0e3b2d585d9bf3f979f0b19d635a336725a88d279f76b939" -dependencies = [ - "atspi-common", - "atspi-proxies", - "futures-lite 1.13.0", - "zbus 3.15.2", -] - -[[package]] -name = "atspi-proxies" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6495661273703e7a229356dcbe8c8f38223d697aacfaf0e13590a9ac9977bb52" -dependencies = [ - "atspi-common", - "serde", - "zbus 3.15.2", -] - -[[package]] -name = "autocfg" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" - -[[package]] -name = "av1-grain" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6678909d8c5d46a42abcf571271e15fdbc0a225e3646cf23762cd415046c78bf" -dependencies = [ - "anyhow", - "arrayvec", - "log", - "nom", - "num-rational", - "v_frame", -] - -[[package]] -name = "avif-serialize" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876c75a42f6364451a033496a14c44bffe41f5f4a8236f697391f11024e596d2" -dependencies = [ - "arrayvec", -] - -[[package]] -name = "backtrace" -version = "0.3.71" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - -[[package]] -name = "base64" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" - -[[package]] -name = "basic-toml" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "823388e228f614e9558c6804262db37960ec8821856535f5c3f59913140558f8" -dependencies = [ - "serde", -] - -[[package]] -name = "bit-set" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0481a0e032742109b1133a095184ee93d88f3dc9e0d28a5d033dc77a073f44f" -dependencies = [ - "bit-vec", -] - -[[package]] -name = "bit-vec" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2c54ff287cfc0a34f38a6b832ea1bd8e448a330b3e40a50859e6488bee07f22" - -[[package]] -name = "bit_field" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" -dependencies = [ - "serde", -] - -[[package]] -name = "bitstream-io" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b81e1519b0d82120d2fd469d5bfb2919a9361c48b02d82d04befc1cdd2002452" - -[[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 = "block2" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" -dependencies = [ - "objc2", -] - -[[package]] -name = "blocking" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" -dependencies = [ - "async-channel", - "async-task", - "futures-io", - "futures-lite 2.3.0", - "piper", -] - -[[package]] -name = "built" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "236e6289eda5a812bc6b53c3b024039382a2895fbbeef2d748b2931546d392c4" - -[[package]] -name = "bumpalo" -version = "3.15.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" - -[[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", - "syn 2.0.87", -] - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "byteorder-lite" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" - -[[package]] -name = "bytes" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" - -[[package]] -name = "calloop" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" -dependencies = [ - "bitflags 2.6.0", - "log", - "polling 3.6.0", - "rustix 0.38.39", - "slab", - "thiserror", -] - -[[package]] -name = "calloop-wayland-source" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" -dependencies = [ - "calloop", - "rustix 0.38.39", - "wayland-backend", - "wayland-client", -] - -[[package]] -name = "cc" -version = "1.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9d013ecb737093c0e86b151a7b837993cf9ec6c502946cfb44bedc392421e0b" -dependencies = [ - "jobserver", - "libc", - "shlex", -] - -[[package]] -name = "cesu8" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" - -[[package]] -name = "cfg-expr" -version = "0.15.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" -dependencies = [ - "smallvec", - "target-lexicon", -] - -[[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 = "cfg_aliases" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" - -[[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", - "js-sys", - "num-traits", - "serde", - "wasm-bindgen", - "windows-targets 0.52.6", -] - -[[package]] -name = "clipboard-win" -version = "5.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d517d4b86184dbb111d3556a10f1c8a04da7428d2987bf1081602bf11c3aa9ee" -dependencies = [ - "error-code", -] - -[[package]] -name = "clipboard_macos" -version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" -dependencies = [ - "objc", - "objc-foundation", - "objc_id", -] - -[[package]] -name = "clipboard_wayland" -version = "0.2.2" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" -dependencies = [ - "dnd", - "mime 0.1.0", - "smithay-clipboard", -] - -[[package]] -name = "clipboard_x11" -version = "0.4.2" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" -dependencies = [ - "thiserror", - "x11rb", -] - -[[package]] -name = "cocoa" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" -dependencies = [ - "bitflags 1.3.2", - "block", - "cocoa-foundation", - "core-foundation", - "core-graphics", - "foreign-types 0.5.0", - "libc", - "objc", -] - -[[package]] -name = "cocoa-foundation" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" -dependencies = [ - "bitflags 1.3.2", - "block", - "core-foundation", - "core-graphics-types", - "libc", - "objc", -] - -[[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 = "com" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e17887fd17353b65b1b2ef1c526c83e26cd72e74f598a8dc1bee13a48f3d9f6" -dependencies = [ - "com_macros", -] - -[[package]] -name = "com_macros" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d375883580a668c7481ea6631fc1a8863e33cc335bf56bfad8d7e6d4b04b13a5" -dependencies = [ - "com_macros_support", - "proc-macro2", - "syn 1.0.109", -] - -[[package]] -name = "com_macros_support" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad899a1087a9296d5644792d7cb72b8e34c1bec8e7d4fbc002230169a6e8710c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "combine" -version = "4.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" -dependencies = [ - "bytes", - "memchr", -] - -[[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 = "const-random" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" -dependencies = [ - "const-random-macro", -] - -[[package]] -name = "const-random-macro" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" -dependencies = [ - "getrandom", - "once_cell", - "tiny-keccak", -] - -[[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" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-graphics-types", - "foreign-types 0.5.0", - "libc", -] - -[[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 = "cosmic-client-toolkit" -version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-protocols?rev=d218c76#d218c76b58c7a3b20dd5e7943f93fc306a1b81b8" -dependencies = [ - "cosmic-protocols", - "libc", - "smithay-client-toolkit", - "wayland-client", - "wayland-protocols", -] - -[[package]] -name = "cosmic-config" -version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" -dependencies = [ - "atomicwrites", - "cosmic-config-derive", - "dirs 5.0.1", - "iced_futures", - "known-folders", - "notify", - "once_cell", - "ron", - "serde", - "tokio", - "tracing", - "xdg", -] - -[[package]] -name = "cosmic-config-derive" -version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] -name = "cosmic-ext-forecast" -version = "1.1.0" -dependencies = [ - "bytes", - "chrono", - "i18n-embed", - "i18n-embed-fl", - "include_dir", - "libcosmic", - "log", - "open", - "reqwest", - "rust-embed", - "serde", - "tokio", -] - -[[package]] -name = "cosmic-freedesktop-icons" -version = "0.2.6" -source = "git+https://github.com/pop-os/freedesktop-icons#5a3b4163148a9600a54cc846aa863f4e6389635d" -dependencies = [ - "dirs 5.0.1", - "once_cell", - "rust-ini", - "thiserror", - "tracing", - "xdg", -] - -[[package]] -name = "cosmic-protocols" -version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-protocols?rev=d218c76#d218c76b58c7a3b20dd5e7943f93fc306a1b81b8" -dependencies = [ - "bitflags 2.6.0", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-protocols-wlr", - "wayland-scanner", - "wayland-server", -] - -[[package]] -name = "cosmic-text" -version = "0.12.1" -source = "git+https://github.com/pop-os/cosmic-text.git#166b59f560c551dab391a864f7c1f503c1e18446" -dependencies = [ - "bitflags 2.6.0", - "fontdb 0.16.2", - "log", - "rangemap", - "rustc-hash 1.1.0", - "rustybuzz", - "self_cell 1.0.3", - "smol_str", - "swash", - "sys-locale", - "ttf-parser 0.21.1", - "unicode-bidi", - "unicode-linebreak", - "unicode-script", - "unicode-segmentation", -] - -[[package]] -name = "cosmic-theme" -version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" -dependencies = [ - "almost", - "cosmic-config", - "csscolorparser", - "dirs 5.0.1", - "lazy_static", - "palette", - "ron", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "cpufeatures" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" -dependencies = [ - "libc", -] - -[[package]] -name = "crc32fast" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" -dependencies = [ - "cfg-if", -] - -[[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-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-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "css-color" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42aaeae719fd78ce501d77c6cdf01f7e96f26bcd5617a4903a1c2b97e388543a" - -[[package]] -name = "csscolorparser" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf" -dependencies = [ - "phf", - "serde", -] - -[[package]] -name = "ctor-lite" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f791803201ab277ace03903de1594460708d2d54df6053f2d9e82f592b19e3b" - -[[package]] -name = "cursor-icon" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" - -[[package]] -name = "d3d12" -version = "22.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdbd1f579714e3c809ebd822c81ef148b1ceaeb3d535352afc73fd0c4c6a0017" -dependencies = [ - "bitflags 2.6.0", - "libloading", - "winapi", -] - -[[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 2.0.87", -] - -[[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 2.0.87", -] - -[[package]] -name = "dashmap" -version = "6.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" -dependencies = [ - "cfg-if", - "crossbeam-utils", - "hashbrown", - "lock_api", - "once_cell", - "parking_lot_core 0.9.9", -] - -[[package]] -name = "data-url" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" - -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "derive_setters" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e8ef033054e131169b8f0f9a7af8f5533a9436fadf3c500ed547f730f07090d" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "crypto-common", -] - -[[package]] -name = "dirs" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" -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 = "dispatch" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" - -[[package]] -name = "displaydoc" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "dlib" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" -dependencies = [ - "libloading", -] - -[[package]] -name = "dlv-list" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f" -dependencies = [ - "const-random", -] - -[[package]] -name = "dnd" -version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" -dependencies = [ - "bitflags 2.6.0", - "mime 0.1.0", - "raw-window-handle", - "smithay-client-toolkit", - "smithay-clipboard", -] - -[[package]] -name = "document-features" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0" -dependencies = [ - "litrs", -] - -[[package]] -name = "downcast-rs" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" - -[[package]] -name = "dpi" -version = "0.1.1" -source = "git+https://github.com/pop-os/winit.git?tag=iced-xdg-surface-0.13#1cc02bdab141072eaabad639d74b032fd0fcc62e" - -[[package]] -name = "drm" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0f8a69e60d75ae7dab4ef26a59ca99f2a89d4c142089b537775ae0c198bdcde" -dependencies = [ - "bitflags 2.6.0", - "bytemuck", - "drm-ffi", - "drm-fourcc", - "rustix 0.38.39", -] - -[[package]] -name = "drm-ffi" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6" -dependencies = [ - "drm-sys", - "rustix 0.38.39", -] - -[[package]] -name = "drm-fourcc" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4" - -[[package]] -name = "drm-sys" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d09ff881f92f118b11105ba5e34ff8f4adf27b30dae8f12e28c193af1c83176" -dependencies = [ - "libc", - "linux-raw-sys 0.6.4", -] - -[[package]] -name = "either" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" - -[[package]] -name = "encoding_rs" -version = "0.8.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "endi" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" - -[[package]] -name = "enumflags2" -version = "0.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" -dependencies = [ - "enumflags2_derive", - "serde", -] - -[[package]] -name = "enumflags2_derive" -version = "0.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[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 = "error-code" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" - -[[package]] -name = "etagere" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "306960881d6c46bd0dd6b7f07442a441418c08d0d3e63d8d080b0f64c6343e4e" -dependencies = [ - "euclid", - "svg_fmt", -] - -[[package]] -name = "euclid" -version = "0.22.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787" -dependencies = [ - "num-traits", -] - -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[package]] -name = "event-listener" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener" -version = "4.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener" -version = "5.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener-strategy" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" -dependencies = [ - "event-listener 4.0.3", - "pin-project-lite", -] - -[[package]] -name = "event-listener-strategy" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3" -dependencies = [ - "event-listener 5.3.0", - "pin-project-lite", -] - -[[package]] -name = "exr" -version = "1.72.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4" -dependencies = [ - "bit_field", - "flume", - "half", - "lebe", - "miniz_oxide", - "rayon-core", - "smallvec", - "zune-inflate", -] - -[[package]] -name = "fast-srgb8" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" - -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "fastrand" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" - -[[package]] -name = "fdeflate" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" -dependencies = [ - "simd-adler32", -] - -[[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 0.4.1", - "windows-sys 0.52.0", -] - -[[package]] -name = "find-crate" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59a98bbaacea1c0eb6a0876280051b892eb73594fd90cf3b20e9c817029c57d2" -dependencies = [ - "toml 0.5.11", -] - -[[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 = "float-cmp" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" - -[[package]] -name = "float_next_after" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8" - -[[package]] -name = "fluent" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61f69378194459db76abd2ce3952b790db103ceb003008d3d50d97c41ff847a7" -dependencies = [ - "fluent-bundle", - "unic-langid", -] - -[[package]] -name = "fluent-bundle" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e242c601dec9711505f6d5bbff5bedd4b61b2469f2e8bb8e57ee7c9747a87ffd" -dependencies = [ - "fluent-langneg", - "fluent-syntax", - "intl-memoizer", - "intl_pluralrules", - "rustc-hash 1.1.0", - "self_cell 0.10.3", - "smallvec", - "unic-langid", -] - -[[package]] -name = "fluent-langneg" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c4ad0989667548f06ccd0e306ed56b61bd4d35458d54df5ec7587c0e8ed5e94" -dependencies = [ - "unic-langid", -] - -[[package]] -name = "fluent-syntax" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0abed97648395c902868fee9026de96483933faa54ea3b40d652f7dfe61ca78" -dependencies = [ - "thiserror", -] - -[[package]] -name = "flume" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" -dependencies = [ - "spin", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "font-types" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11c3a23a5a151afb1f74ea797f8c300dee41eff9ee3cb1bf94ed316d860c46b3" -dependencies = [ - "bytemuck", -] - -[[package]] -name = "fontconfig-parser" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d" -dependencies = [ - "roxmltree 0.19.0", -] - -[[package]] -name = "fontdb" -version = "0.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3" -dependencies = [ - "fontconfig-parser", - "log", - "memmap2 0.9.4", - "slotmap", - "tinyvec", - "ttf-parser 0.20.0", -] - -[[package]] -name = "fontdb" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e32eac81c1135c1df01d4e6d4233c47ba11f6a6d07f33e0bba09d18797077770" -dependencies = [ - "fontconfig-parser", - "log", - "memmap2 0.9.4", - "slotmap", - "tinyvec", - "ttf-parser 0.21.1", -] - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared 0.1.1", -] - -[[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 0.3.1", -] - -[[package]] -name = "foreign-types-macros" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[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 = "freedesktop-desktop-entry" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c201444ddafb5506fe85265b48421664ff4617e3b7090ef99e42a0070c1aead0" -dependencies = [ - "dirs 3.0.2", - "gettext-rs", - "memchr", - "thiserror", - "xdg", -] - -[[package]] -name = "fsevent-sys" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" -dependencies = [ - "libc", -] - -[[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", - "num_cpus", -] - -[[package]] -name = "futures-io" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" - -[[package]] -name = "futures-lite" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" -dependencies = [ - "fastrand 1.9.0", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] - -[[package]] -name = "futures-lite" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" -dependencies = [ - "fastrand 2.0.2", - "futures-core", - "futures-io", - "parking", - "pin-project-lite", -] - -[[package]] -name = "futures-macro" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[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 = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "gethostname" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" -dependencies = [ - "libc", - "windows-targets 0.48.5", -] - -[[package]] -name = "getrandom" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06fddc2749e0528d2813f95e050e87e52c8cbbae56223b9babf73b3e53b0cc6" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "gettext-rs" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44e92f7dc08430aca7ed55de161253a22276dfd69c5526e5c5e95d1f7cf338a" -dependencies = [ - "gettext-sys", - "locale_config", -] - -[[package]] -name = "gettext-sys" -version = "0.22.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb45773f5b8945f12aecd04558f545964f943dacda1b1155b3d738f5469ef661" -dependencies = [ - "cc", - "temp-dir", -] - -[[package]] -name = "gif" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" -dependencies = [ - "color_quant", - "weezl", -] - -[[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 = "glam" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3" - -[[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.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a4e1951bbd9434a81aa496fe59ccc2235af3820d27b85f9314e279609211e2c" -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.6.0", - "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.6.0", -] - -[[package]] -name = "gpu-allocator" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdd4240fc91d3433d5e5b0fc5b67672d771850dc19bbee03c1381e19322803d7" -dependencies = [ - "log", - "presser", - "thiserror", - "winapi", - "windows 0.52.0", -] - -[[package]] -name = "gpu-descriptor" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c08c1f623a8d0b722b8b99f821eb0ba672a1618f0d3b16ddbee1cedd2dd8557" -dependencies = [ - "bitflags 2.6.0", - "gpu-descriptor-types", - "hashbrown", -] - -[[package]] -name = "gpu-descriptor-types" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91" -dependencies = [ - "bitflags 2.6.0", -] - -[[package]] -name = "grid" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df00eed8d1f0db937f6be10e46e8072b0671accb504cf0f959c5c52c679f5b9" - -[[package]] -name = "guillotiere" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62d5865c036cb1393e23c50693df631d3f5d7bcca4c04fe4cc0fd592e74a782" -dependencies = [ - "euclid", - "svg_fmt", -] - -[[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", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[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.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" -dependencies = [ - "ahash", - "allocator-api2", -] - -[[package]] -name = "hassle-rs" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890" -dependencies = [ - "bitflags 2.6.0", - "com", - "libc", - "libloading", - "thiserror", - "widestring", - "winapi", -] - -[[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 = "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 = "http" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" -dependencies = [ - "bytes", - "http", -] - -[[package]] -name = "http-body-util" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" -dependencies = [ - "bytes", - "futures-core", - "http", - "http-body", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "hyper" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "itoa", - "pin-project-lite", - "smallvec", - "tokio", - "want", -] - -[[package]] -name = "hyper-tls" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" -dependencies = [ - "bytes", - "http-body-util", - "hyper", - "hyper-util", - "native-tls", - "tokio", - "tokio-native-tls", - "tower-service", -] - -[[package]] -name = "hyper-util" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "http", - "http-body", - "hyper", - "pin-project-lite", - "socket2 0.5.6", - "tokio", - "tower", - "tower-service", - "tracing", -] - -[[package]] -name = "i18n-config" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e88074831c0be5b89181b05e6748c4915f77769ecc9a4c372f88b169a8509c9" -dependencies = [ - "basic-toml", - "log", - "serde", - "serde_derive", - "thiserror", - "unic-langid", -] - -[[package]] -name = "i18n-embed" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e901c87176ac0b615033c81dbe927c230f74700abfd60ed953a6f547c87bbe6d" -dependencies = [ - "arc-swap", - "fluent", - "fluent-langneg", - "fluent-syntax", - "i18n-embed-impl", - "intl-memoizer", - "lazy_static", - "locale_config", - "log", - "parking_lot 0.12.1", - "rust-embed", - "thiserror", - "unic-langid", - "walkdir", -] - -[[package]] -name = "i18n-embed-fl" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d73fe51b9655599147183495551696628b335f75b2dbfa225196b16d69d7288e" -dependencies = [ - "dashmap", - "find-crate", - "fluent", - "fluent-syntax", - "i18n-config", - "i18n-embed", - "lazy_static", - "proc-macro-error", - "proc-macro2", - "quote", - "strsim 0.11.1", - "syn 2.0.87", - "unic-langid", -] - -[[package]] -name = "i18n-embed-impl" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81093c4701672f59416582fe3145676126fd23ba5db910acad0793c1108aaa58" -dependencies = [ - "find-crate", - "i18n-config", - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[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 = "iced" -version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" -dependencies = [ - "dnd", - "iced_accessibility", - "iced_core", - "iced_futures", - "iced_renderer", - "iced_widget", - "iced_winit", - "image 0.24.9", - "mime 0.1.0", - "thiserror", - "window_clipboard", -] - -[[package]] -name = "iced_accessibility" -version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" -dependencies = [ - "accesskit", - "accesskit_winit", -] - -[[package]] -name = "iced_core" -version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" -dependencies = [ - "bitflags 2.6.0", - "bytes", - "dnd", - "glam", - "log", - "mime 0.1.0", - "num-traits", - "once_cell", - "palette", - "raw-window-handle", - "rustc-hash 2.0.0", - "serde", - "smol_str", - "thiserror", - "web-time", - "window_clipboard", -] - -[[package]] -name = "iced_futures" -version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" -dependencies = [ - "futures", - "iced_core", - "log", - "rustc-hash 2.0.0", - "tokio", - "wasm-bindgen-futures", - "wasm-timer", -] - -[[package]] -name = "iced_glyphon" -version = "0.6.0" -source = "git+https://github.com/pop-os/glyphon.git?tag=iced-0.14-dev#6ef9d12a20cfd0f7bdf38136a26ded9f7459ec8b" -dependencies = [ - "cosmic-text", - "etagere", - "lru", - "rustc-hash 2.0.0", - "wgpu", -] - -[[package]] -name = "iced_graphics" -version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" -dependencies = [ - "bitflags 2.6.0", - "bytemuck", - "cosmic-text", - "half", - "iced_core", - "iced_futures", - "image 0.24.9", - "kamadak-exif", - "log", - "lyon_path", - "once_cell", - "raw-window-handle", - "rustc-hash 2.0.0", - "thiserror", - "unicode-segmentation", -] - -[[package]] -name = "iced_renderer" -version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" -dependencies = [ - "iced_graphics", - "iced_tiny_skia", - "iced_wgpu", - "log", - "thiserror", -] - -[[package]] -name = "iced_runtime" -version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" -dependencies = [ - "bytes", - "dnd", - "iced_core", - "iced_futures", - "raw-window-handle", - "thiserror", - "window_clipboard", -] - -[[package]] -name = "iced_tiny_skia" -version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" -dependencies = [ - "bytemuck", - "cosmic-text", - "iced_graphics", - "kurbo 0.10.4", - "log", - "resvg", - "rustc-hash 2.0.0", - "softbuffer", - "tiny-skia", -] - -[[package]] -name = "iced_wgpu" -version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" -dependencies = [ - "as-raw-xcb-connection", - "bitflags 2.6.0", - "bytemuck", - "cosmic-client-toolkit", - "futures", - "glam", - "guillotiere", - "iced_glyphon", - "iced_graphics", - "log", - "lyon", - "once_cell", - "raw-window-handle", - "resvg", - "rustc-hash 2.0.0", - "rustix 0.38.39", - "thiserror", - "tiny-xlib", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-sys", - "wgpu", - "x11rb", -] - -[[package]] -name = "iced_widget" -version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" -dependencies = [ - "dnd", - "iced_renderer", - "iced_runtime", - "num-traits", - "once_cell", - "ouroboros", - "rustc-hash 2.0.0", - "thiserror", - "unicode-segmentation", - "window_clipboard", -] - -[[package]] -name = "iced_winit" -version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" -dependencies = [ - "dnd", - "iced_futures", - "iced_graphics", - "iced_runtime", - "log", - "rustc-hash 2.0.0", - "thiserror", - "tracing", - "wasm-bindgen-futures", - "web-sys", - "winapi", - "window_clipboard", - "winit", -] - -[[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 = "image" -version = "0.24.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "exr", - "gif", - "jpeg-decoder", - "num-traits", - "png", - "qoi", - "tiff", -] - -[[package]] -name = "image" -version = "0.25.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" -dependencies = [ - "bytemuck", - "byteorder-lite", - "color_quant", - "exr", - "gif", - "image-webp", - "num-traits", - "png", - "qoi", - "ravif", - "rayon", - "rgb", - "tiff", - "zune-core", - "zune-jpeg", -] - -[[package]] -name = "image-webp" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f79afb8cbee2ef20f59ccd477a218c12a93943d075b492015ecb1bb81f8ee904" -dependencies = [ - "byteorder-lite", - "quick-error", -] - -[[package]] -name = "imagesize" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" - -[[package]] -name = "imgref" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126" - -[[package]] -name = "immutable-chunkmap" -version = "2.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f97096f508d54f8f8ab8957862eee2ccd628847b6217af1a335e1c44dee578" -dependencies = [ - "arrayvec", -] - -[[package]] -name = "include_dir" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "923d117408f1e49d914f1a379a309cffe4f18c05cf4e3d12e613a15fc81bd0dd" -dependencies = [ - "include_dir_macros", -] - -[[package]] -name = "include_dir_macros" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cab85a7ed0bd5f0e76d93846e0147172bed2e2d3f859bcc33a8d9699cad1a75" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "indexmap" -version = "2.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" -dependencies = [ - "equivalent", - "hashbrown", -] - -[[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 = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "interpolate_name" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "intl-memoizer" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c310433e4a310918d6ed9243542a6b83ec1183df95dff8f23f87bb88a264a66f" -dependencies = [ - "type-map", - "unic-langid", -] - -[[package]] -name = "intl_pluralrules" -version = "7.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "078ea7b7c29a2b4df841a7f6ac8775ff6074020c6776d48491ce2268e068f972" -dependencies = [ - "unic-langid", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "io-lifetimes" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06432fb54d3be7964ecd3649233cddf80db2832f47fec34c01f65b3d9d774983" - -[[package]] -name = "ipnet" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" - -[[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-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.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 = "jni" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" -dependencies = [ - "cesu8", - "cfg-if", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", - "windows-sys 0.45.0", -] - -[[package]] -name = "jni-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" - -[[package]] -name = "jobserver" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" -dependencies = [ - "libc", -] - -[[package]] -name = "jpeg-decoder" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" -dependencies = [ - "rayon", -] - -[[package]] -name = "js-sys" -version = "0.3.72" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "kamadak-exif" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef4fc70d0ab7e5b6bafa30216a6b48705ea964cdfc29c050f2412295eba58077" -dependencies = [ - "mutate_once", -] - -[[package]] -name = "khronos-egl" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" -dependencies = [ - "libc", - "libloading", - "pkg-config", -] - -[[package]] -name = "khronos_api" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" - -[[package]] -name = "known-folders" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4397c789f2709d23cfcb703b316e0766a8d4b17db2d47b0ab096ef6047cae1d8" -dependencies = [ - "windows-sys 0.52.0", -] - -[[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 = "kurbo" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1618d4ebd923e97d67e7cd363d80aef35fe961005cbbbb3d2dad8bdd1bc63440" -dependencies = [ - "arrayvec", - "smallvec", -] - -[[package]] -name = "kurbo" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89234b2cc610a7dd927ebde6b41dd1a5d4214cffaef4cf1fb2195d592f92518f" -dependencies = [ - "arrayvec", - "smallvec", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "lebe" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" - -[[package]] -name = "libc" -version = "0.2.162" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398" - -[[package]] -name = "libcosmic" -version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" -dependencies = [ - "apply", - "ashpd 0.9.1", - "chrono", - "cosmic-config", - "cosmic-freedesktop-icons", - "cosmic-theme", - "css-color", - "derive_setters", - "freedesktop-desktop-entry", - "iced", - "iced_core", - "iced_futures", - "iced_renderer", - "iced_runtime", - "iced_tiny_skia", - "iced_wgpu", - "iced_widget", - "iced_winit", - "image 0.25.2", - "lazy_static", - "libc", - "license", - "mime 0.3.17", - "palette", - "rfd", - "rustix 0.38.39", - "serde", - "shlex", - "slotmap", - "taffy", - "thiserror", - "tokio", - "tracing", - "unicode-segmentation", - "url", - "zbus 4.3.0", -] - -[[package]] -name = "libfuzzer-sys" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7" -dependencies = [ - "arbitrary", - "cc", - "once_cell", -] - -[[package]] -name = "libloading" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" -dependencies = [ - "cfg-if", - "windows-targets 0.52.6", -] - -[[package]] -name = "libm" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" - -[[package]] -name = "libredox" -version = "0.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" -dependencies = [ - "bitflags 2.6.0", - "libc", - "redox_syscall 0.4.1", -] - -[[package]] -name = "libredox" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" -dependencies = [ - "bitflags 2.6.0", - "libc", -] - -[[package]] -name = "license" -version = "3.6.0+3.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b517725daf998729e5ef4c4881cdde19cd5bbdde09741ba1b0f1ba0ce018961" -dependencies = [ - "reword", - "serde", - "serde_json", -] - -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "linux-raw-sys" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" - -[[package]] -name = "linux-raw-sys" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0b5399f6804fbab912acbd8878ed3532d506b7c951b8f9f164ef90fef39e3f4" - -[[package]] -name = "litrs" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" - -[[package]] -name = "locale_config" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" -dependencies = [ - "lazy_static", - "objc", - "objc-foundation", - "regex", - "winapi", -] - -[[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 = "loop9" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062" -dependencies = [ - "imgref", -] - -[[package]] -name = "lru" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" - -[[package]] -name = "lyon" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e7f9cda98b5430809e63ca5197b06c7d191bf7e26dfc467d5a3f0290e2a74f" -dependencies = [ - "lyon_algorithms", - "lyon_tessellation", -] - -[[package]] -name = "lyon_algorithms" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3bca95f9a4955b3e4a821fbbcd5edfbd9be2a9a50bb5758173e5358bfb4c623" -dependencies = [ - "lyon_path", - "num-traits", -] - -[[package]] -name = "lyon_geom" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edecfb8d234a2b0be031ab02ebcdd9f3b9ee418fb35e265f7a540a48d197bff9" -dependencies = [ - "arrayvec", - "euclid", - "num-traits", -] - -[[package]] -name = "lyon_path" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca507745ba7ccbc76e5c44e7b63b1a29d2b0d6126f375806a5bbaf657c7d6c45" -dependencies = [ - "lyon_geom", - "num-traits", -] - -[[package]] -name = "lyon_tessellation" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c7c67b5bc8123b352b2e7e742b47d1f236a13fe77619433be9568fbd888e9c0" -dependencies = [ - "float_next_after", - "lyon_path", - "num-traits", -] - -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - -[[package]] -name = "maybe-rayon" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519" -dependencies = [ - "cfg-if", - "rayon", -] - -[[package]] -name = "memchr" -version = "2.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" - -[[package]] -name = "memmap2" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -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", -] - -[[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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" -dependencies = [ - "autocfg", -] - -[[package]] -name = "metal" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21" -dependencies = [ - "bitflags 2.6.0", - "block", - "core-graphics-types", - "foreign-types 0.5.0", - "log", - "objc", - "paste", -] - -[[package]] -name = "mime" -version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" -dependencies = [ - "smithay-clipboard", -] - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.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 = "mutate_once" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" - -[[package]] -name = "naga" -version = "22.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bd5a652b6faf21496f2cfd88fc49989c8db0825d1f6746b1a71a6ede24a63ad" -dependencies = [ - "arrayvec", - "bit-set", - "bitflags 2.6.0", - "cfg_aliases 0.1.1", - "codespan-reporting", - "hexf-parse", - "indexmap", - "log", - "rustc-hash 1.1.0", - "spirv", - "termcolor", - "thiserror", - "unicode-xid", -] - -[[package]] -name = "native-tls" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" -dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "ndk" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" -dependencies = [ - "bitflags 2.6.0", - "jni-sys", - "log", - "ndk-sys 0.6.0+11769913", - "num_enum", - "raw-window-handle", - "thiserror", -] - -[[package]] -name = "ndk-context" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" - -[[package]] -name = "ndk-sys" -version = "0.5.0+25.2.9519653" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" -dependencies = [ - "jni-sys", -] - -[[package]] -name = "ndk-sys" -version = "0.6.0+11769913" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873" -dependencies = [ - "jni-sys", -] - -[[package]] -name = "new_debug_unreachable" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" - -[[package]] -name = "nix" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset 0.7.1", -] - -[[package]] -name = "nix" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" -dependencies = [ - "bitflags 2.6.0", - "cfg-if", - "cfg_aliases 0.1.1", - "libc", - "memoffset 0.9.1", -] - -[[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 = "noop_proc_macro" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" - -[[package]] -name = "notify" -version = "6.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" -dependencies = [ - "bitflags 2.6.0", - "crossbeam-channel", - "filetime", - "fsevent-sys", - "inotify", - "kqueue", - "libc", - "log", - "mio", - "walkdir", - "windows-sys 0.48.0", -] - -[[package]] -name = "num-bigint" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" -dependencies = [ - "num-integer", - "num-traits", -] - -[[package]] -name = "num-derive" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[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-rational" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" -dependencies = [ - "num-bigint", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -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", - "libc", -] - -[[package]] -name = "num_enum" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" -dependencies = [ - "num_enum_derive", -] - -[[package]] -name = "num_enum_derive" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" -dependencies = [ - "proc-macro-crate 3.1.0", - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "objc" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" -dependencies = [ - "malloc_buf", -] - -[[package]] -name = "objc-foundation" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" -dependencies = [ - "block", - "objc", - "objc_id", -] - -[[package]] -name = "objc-sys" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" - -[[package]] -name = "objc2" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" -dependencies = [ - "objc-sys", - "objc2-encode", -] - -[[package]] -name = "objc2-app-kit" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" -dependencies = [ - "bitflags 2.6.0", - "block2", - "libc", - "objc2", - "objc2-core-data", - "objc2-core-image", - "objc2-foundation", - "objc2-quartz-core", -] - -[[package]] -name = "objc2-cloud-kit" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009" -dependencies = [ - "bitflags 2.6.0", - "block2", - "objc2", - "objc2-core-location", - "objc2-foundation", -] - -[[package]] -name = "objc2-contacts" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889" -dependencies = [ - "block2", - "objc2", - "objc2-foundation", -] - -[[package]] -name = "objc2-core-data" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" -dependencies = [ - "bitflags 2.6.0", - "block2", - "objc2", - "objc2-foundation", -] - -[[package]] -name = "objc2-core-image" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" -dependencies = [ - "block2", - "objc2", - "objc2-foundation", - "objc2-metal", -] - -[[package]] -name = "objc2-core-location" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781" -dependencies = [ - "block2", - "objc2", - "objc2-contacts", - "objc2-foundation", -] - -[[package]] -name = "objc2-encode" -version = "4.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" - -[[package]] -name = "objc2-foundation" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" -dependencies = [ - "bitflags 2.6.0", - "block2", - "dispatch", - "libc", - "objc2", -] - -[[package]] -name = "objc2-link-presentation" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398" -dependencies = [ - "block2", - "objc2", - "objc2-app-kit", - "objc2-foundation", -] - -[[package]] -name = "objc2-metal" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" -dependencies = [ - "bitflags 2.6.0", - "block2", - "objc2", - "objc2-foundation", -] - -[[package]] -name = "objc2-quartz-core" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" -dependencies = [ - "bitflags 2.6.0", - "block2", - "objc2", - "objc2-foundation", - "objc2-metal", -] - -[[package]] -name = "objc2-symbols" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc" -dependencies = [ - "objc2", - "objc2-foundation", -] - -[[package]] -name = "objc2-ui-kit" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f" -dependencies = [ - "bitflags 2.6.0", - "block2", - "objc2", - "objc2-cloud-kit", - "objc2-core-data", - "objc2-core-image", - "objc2-core-location", - "objc2-foundation", - "objc2-link-presentation", - "objc2-quartz-core", - "objc2-symbols", - "objc2-uniform-type-identifiers", - "objc2-user-notifications", -] - -[[package]] -name = "objc2-uniform-type-identifiers" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe" -dependencies = [ - "block2", - "objc2", - "objc2-foundation", -] - -[[package]] -name = "objc2-user-notifications" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3" -dependencies = [ - "bitflags 2.6.0", - "block2", - "objc2", - "objc2-core-location", - "objc2-foundation", -] - -[[package]] -name = "objc_id" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" -dependencies = [ - "objc", -] - -[[package]] -name = "object" -version = "0.32.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "open" -version = "5.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "449f0ff855d85ddbf1edd5b646d65249ead3f5e422aaa86b7d2d0b049b103e32" -dependencies = [ - "is-wsl", - "libc", - "pathdiff", -] - -[[package]] -name = "openssl" -version = "0.10.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" -dependencies = [ - "bitflags 2.6.0", - "cfg-if", - "foreign-types 0.3.2", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-sys" -version = "0.9.102" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - -[[package]] -name = "orbclient" -version = "0.3.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52f0d54bde9774d3a51dcf281a5def240c71996bc6ca05d2c847ec8b2b216166" -dependencies = [ - "libredox 0.0.2", -] - -[[package]] -name = "ordered-multimap" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79" -dependencies = [ - "dlv-list", - "hashbrown", -] - -[[package]] -name = "ordered-stream" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" -dependencies = [ - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "ouroboros" -version = "0.18.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "944fa20996a25aded6b4795c6d63f10014a7a83f8be9828a11860b08c5fc4a67" -dependencies = [ - "aliasable", - "ouroboros_macro", - "static_assertions", -] - -[[package]] -name = "ouroboros_macro" -version = "0.18.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39b0deead1528fd0e5947a8546a9642a9777c25f6e1e26f34c97b204bbb465bd" -dependencies = [ - "heck 0.4.1", - "itertools", - "proc-macro2", - "proc-macro2-diagnostics", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "owned_ttf_parser" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4586edfe4c648c71797a74c84bacb32b52b212eff5dfe2bb9f2c599844023e7" -dependencies = [ - "ttf-parser 0.20.0", -] - -[[package]] -name = "palette" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebfc23a4b76642983d57e4ad00bb4504eb30a8ce3c70f4aee1f725610e36d97a" -dependencies = [ - "approx", - "fast-srgb8", - "palette_derive", - "phf", - "serde", -] - -[[package]] -name = "palette_derive" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8890702dbec0bad9116041ae586f84805b13eecd1d8b1df27c29998a9969d6d" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "parking" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" - -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - -[[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 0.9.9", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi", -] - -[[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 0.4.1", - "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 = "pathdiff" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" - -[[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_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", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "phf_shared" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" -dependencies = [ - "siphasher 0.3.11", -] - -[[package]] -name = "pico-args" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" - -[[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.87", -] - -[[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" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "piper" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" -dependencies = [ - "atomic-waker", - "fastrand 2.0.2", - "futures-io", -] - -[[package]] -name = "pkg-config" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" - -[[package]] -name = "png" -version = "0.17.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" -dependencies = [ - "bitflags 1.3.2", - "crc32fast", - "fdeflate", - "flate2", - "miniz_oxide", -] - -[[package]] -name = "polling" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" -dependencies = [ - "autocfg", - "bitflags 1.3.2", - "cfg-if", - "concurrent-queue", - "libc", - "log", - "pin-project-lite", - "windows-sys 0.48.0", -] - -[[package]] -name = "polling" -version = "3.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0c976a60b2d7e99d6f229e414670a9b85d13ac305cc6d1e9c134de58c5aaaf6" -dependencies = [ - "cfg-if", - "concurrent-queue", - "hermit-abi", - "pin-project-lite", - "rustix 0.38.39", - "tracing", - "windows-sys 0.52.0", -] - -[[package]] -name = "pollster" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2" - -[[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 = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit 0.19.15", -] - -[[package]] -name = "proc-macro-crate" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" -dependencies = [ - "toml_edit 0.21.1", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro2" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "proc-macro2-diagnostics" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", - "version_check", - "yansi", -] - -[[package]] -name = "profiling" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" -dependencies = [ - "profiling-procmacros", -] - -[[package]] -name = "profiling-procmacros" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" -dependencies = [ - "quote", - "syn 2.0.87", -] - -[[package]] -name = "qoi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" -dependencies = [ - "bytemuck", -] - -[[package]] -name = "quick-error" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" - -[[package]] -name = "quick-xml" -version = "0.36.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe" -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 = "range-alloc" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" - -[[package]] -name = "rangemap" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684" - -[[package]] -name = "rav1e" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd87ce80a7665b1cce111f8a16c1f3929f6547ce91ade6addf4ec86a8dda5ce9" -dependencies = [ - "arbitrary", - "arg_enum_proc_macro", - "arrayvec", - "av1-grain", - "bitstream-io", - "built", - "cfg-if", - "interpolate_name", - "itertools", - "libc", - "libfuzzer-sys", - "log", - "maybe-rayon", - "new_debug_unreachable", - "noop_proc_macro", - "num-derive", - "num-traits", - "once_cell", - "paste", - "profiling", - "rand", - "rand_chacha", - "simd_helpers", - "system-deps", - "thiserror", - "v_frame", - "wasm-bindgen", -] - -[[package]] -name = "ravif" -version = "0.11.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67376f469e7e7840d0040bbf4b9b3334005bb167f814621326e4c7ab8cd6e944" -dependencies = [ - "avif-serialize", - "imgref", - "loop9", - "quick-error", - "rav1e", - "rayon", - "rgb", -] - -[[package]] -name = "raw-window-handle" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42a9830a0e1b9fb145ebb365b8bc4ccd75f290f98c0247deafbbe2c75cefb544" - -[[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 = "read-fonts" -version = "0.25.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f9e8a4f503e5c8750e4cd3b32a4e090035c46374b305a15c70bad833dca05f" -dependencies = [ - "bytemuck", - "font-types", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - -[[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 0.1.3", - "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", - "regex-syntax", -] - -[[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", -] - -[[package]] -name = "regex-syntax" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" - -[[package]] -name = "renderdoc-sys" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" - -[[package]] -name = "reqwest" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e6cc1e89e689536eb5aeede61520e874df5a4707df811cd5da4aa5fbb2aae19" -dependencies = [ - "async-compression", - "base64 0.22.0", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "http-body-util", - "hyper", - "hyper-tls", - "hyper-util", - "ipnet", - "js-sys", - "log", - "mime 0.3.17", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls-pemfile", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "system-configuration", - "tokio", - "tokio-native-tls", - "tokio-util", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "winreg", -] - -[[package]] -name = "resvg" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "944d052815156ac8fa77eaac055220e95ba0b01fa8887108ca710c03805d9051" -dependencies = [ - "gif", - "jpeg-decoder", - "log", - "pico-args", - "rgb", - "svgtypes", - "tiny-skia", - "usvg", -] - -[[package]] -name = "reword" -version = "7.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe272098dce9ed76b479995953f748d1851261390b08f8a0ff619c885a1f0765" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "rfd" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25a73a7337fc24366edfca76ec521f51877b114e42dab584008209cca6719251" -dependencies = [ - "ashpd 0.8.1", - "block", - "dispatch", - "js-sys", - "log", - "objc", - "objc-foundation", - "objc_id", - "pollster", - "raw-window-handle", - "urlencoding", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "windows-sys 0.48.0", -] - -[[package]] -name = "rgb" -version = "0.8.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" -dependencies = [ - "bytemuck", -] - -[[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.6.0", - "serde", - "serde_derive", -] - -[[package]] -name = "roxmltree" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" - -[[package]] -name = "roxmltree" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" - -[[package]] -name = "rust-embed" -version = "8.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb78f46d0066053d16d4ca7b898e9343bc3530f71c61d5ad84cd404ada068745" -dependencies = [ - "rust-embed-impl", - "rust-embed-utils", - "walkdir", -] - -[[package]] -name = "rust-embed-impl" -version = "8.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91ac2a3c6c0520a3fb3dd89321177c3c692937c4eb21893378219da10c44fc8" -dependencies = [ - "proc-macro2", - "quote", - "rust-embed-utils", - "syn 2.0.87", - "walkdir", -] - -[[package]] -name = "rust-embed-utils" -version = "8.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f69089032567ffff4eada41c573fc43ff466c7db7c5688b2e7969584345581" -dependencies = [ - "sha2", - "walkdir", -] - -[[package]] -name = "rust-ini" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e0698206bcb8882bf2a9ecb4c1e7785db57ff052297085a6efd4fe42302068a" -dependencies = [ - "cfg-if", - "ordered-multimap", -] - -[[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-hash" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" - -[[package]] -name = "rustix" -version = "0.37.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes 1.0.11", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustix" -version = "0.38.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "375116bee2be9ed569afe2154ea6a99dfdffd257f533f187498c2a8f5feaf4ee" -dependencies = [ - "bitflags 2.6.0", - "errno", - "libc", - "linux-raw-sys 0.4.14", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustls-pemfile" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" -dependencies = [ - "base64 0.22.0", - "rustls-pki-types", -] - -[[package]] -name = "rustls-pki-types" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247" - -[[package]] -name = "rustybuzz" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfb9cf8877777222e4a3bc7eb247e398b56baba500c38c1c46842431adc8b55c" -dependencies = [ - "bitflags 2.6.0", - "bytemuck", - "libm", - "smallvec", - "ttf-parser 0.21.1", - "unicode-bidi-mirroring", - "unicode-ccc", - "unicode-properties", - "unicode-script", -] - -[[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 = "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 = "sctk-adwaita" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6277f0217056f77f1d8f49f2950ac6c278c0d607c45f5ee99328d792ede24ec" -dependencies = [ - "ab_glyph", - "log", - "memmap2 0.9.4", - "smithay-client-toolkit", - "tiny-skia", -] - -[[package]] -name = "security-framework" -version = "2.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "self_cell" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14e4d63b804dc0c7ec4a1e52bcb63f02c7ac94476755aa579edac21e01f915d" -dependencies = [ - "self_cell 1.0.3", -] - -[[package]] -name = "self_cell" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba" - -[[package]] -name = "serde" -version = "1.0.204" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.204" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "serde_json" -version = "1.0.115" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" -dependencies = [ - "indexmap", - "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 2.0.87", -] - -[[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_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 = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[package]] -name = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[package]] -name = "simd-adler32" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" - -[[package]] -name = "simd_helpers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95890f873bec569a0362c235787f3aca6e1e887302ba4840839bcc6459c42da6" -dependencies = [ - "quote", -] - -[[package]] -name = "simplecss" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a11be7c62927d9427e9f40f3444d5499d868648e2edbc4e2116de69e7ec0e89d" -dependencies = [ - "log", -] - -[[package]] -name = "siphasher" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" - -[[package]] -name = "siphasher" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" - -[[package]] -name = "skrifa" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6667e349abb2e6e850b31bc638a11f7fadd7e4cf113b71947c46bf6d5fe0dbc9" -dependencies = [ - "bytemuck", - "read-fonts", -] - -[[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", -] - -[[package]] -name = "smallvec" -version = "1.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - -[[package]] -name = "smithay-client-toolkit" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016" -dependencies = [ - "bitflags 2.6.0", - "bytemuck", - "calloop", - "calloop-wayland-source", - "cursor-icon", - "libc", - "log", - "memmap2 0.9.4", - "pkg-config", - "rustix 0.38.39", - "thiserror", - "wayland-backend", - "wayland-client", - "wayland-csd-frame", - "wayland-cursor", - "wayland-protocols", - "wayland-protocols-wlr", - "wayland-scanner", - "xkbcommon", - "xkeysym", -] - -[[package]] -name = "smithay-clipboard" -version = "0.8.0" -source = "git+https://github.com/pop-os/smithay-clipboard?tag=pop-dnd-5#5a3007def49eb678d1144850c9ee04b80707c56a" -dependencies = [ - "libc", - "raw-window-handle", - "smithay-client-toolkit", - "wayland-backend", -] - -[[package]] -name = "smol_str" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead" -dependencies = [ - "serde", -] - -[[package]] -name = "socket2" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "socket2" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "softbuffer" -version = "0.4.1" -source = "git+https://github.com/pop-os/softbuffer?tag=cosmic-4.0#6e75b1ad7e98397d37cb187886d05969bc480995" -dependencies = [ - "as-raw-xcb-connection", - "bytemuck", - "cfg_aliases 0.2.1", - "cocoa", - "core-graphics", - "drm", - "fastrand 2.0.2", - "foreign-types 0.5.0", - "js-sys", - "log", - "memmap2 0.9.4", - "objc", - "raw-window-handle", - "redox_syscall 0.4.1", - "rustix 0.38.39", - "tiny-xlib", - "wasm-bindgen", - "wayland-backend", - "wayland-client", - "wayland-sys", - "web-sys", - "windows-sys 0.52.0", - "x11rb", -] - -[[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.3.0+sdk-1.3.268.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" -dependencies = [ - "bitflags 2.6.0", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "strict-num" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" -dependencies = [ - "float-cmp", -] - -[[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 = "svg_fmt" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f83ba502a3265efb76efb89b0a2f7782ad6f2675015d4ce37e4b547dda42b499" - -[[package]] -name = "svgtypes" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "794de53cc48eaabeed0ab6a3404a65f40b3e38c067e4435883a65d2aa4ca000e" -dependencies = [ - "kurbo 0.11.1", - "siphasher 1.0.1", -] - -[[package]] -name = "swash" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0e25b48fd1c222c9fdb61148e2203b750f9840c07922fd61b87c6015560b8f6" -dependencies = [ - "skrifa", - "yazi", - "zeno", -] - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - -[[package]] -name = "sys-locale" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0" -dependencies = [ - "libc", -] - -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "system-deps" -version = "6.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" -dependencies = [ - "cfg-expr", - "heck 0.5.0", - "pkg-config", - "toml 0.8.12", - "version-compare", -] - -[[package]] -name = "taffy" -version = "0.3.11" -source = "git+https://github.com/DioxusLabs/taffy?rev=7781c70#7781c70241f7f572130c13106f2a869a9cf80885" -dependencies = [ - "arrayvec", - "grid", - "num-traits", - "slotmap", -] - -[[package]] -name = "target-lexicon" -version = "0.12.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" - -[[package]] -name = "temp-dir" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc1ee6eef34f12f765cb94725905c6312b6610ab2b0940889cfe58dae7bc3c72" - -[[package]] -name = "tempfile" -version = "3.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" -dependencies = [ - "cfg-if", - "fastrand 2.0.2", - "rustix 0.38.39", - "windows-sys 0.52.0", -] - -[[package]] -name = "termcolor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "thiserror" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "tiff" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" -dependencies = [ - "flate2", - "jpeg-decoder", - "weezl", -] - -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - -[[package]] -name = "tiny-skia" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab" -dependencies = [ - "arrayref", - "arrayvec", - "bytemuck", - "cfg-if", - "log", - "png", - "tiny-skia-path", -] - -[[package]] -name = "tiny-skia-path" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93" -dependencies = [ - "arrayref", - "bytemuck", - "strict-num", -] - -[[package]] -name = "tiny-xlib" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d52f22673960ad13af14ff4025997312def1223bfa7c8e4949d099e6b3d5d1c" -dependencies = [ - "as-raw-xcb-connection", - "ctor-lite", - "libloading", - "pkg-config", - "tracing", -] - -[[package]] -name = "tinystr" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c02bf3c538ab32ba913408224323915f4ef9a6d61c0e85d493f355921c0ece" -dependencies = [ - "displaydoc", -] - -[[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 = "tokio" -version = "1.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "num_cpus", - "pin-project-lite", - "signal-hook-registry", - "socket2 0.5.6", - "tokio-macros", - "tracing", - "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", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-stream" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" -dependencies = [ - "futures-core", - "pin-project-lite", - "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-sink", - "pin-project-lite", - "tokio", - "tracing", -] - -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - -[[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 0.22.9", -] - -[[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.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.22.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow 0.6.5", -] - -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "pin-project", - "pin-project-lite", - "tokio", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-layer" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" - -[[package]] -name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[package]] -name = "tracing" -version = "0.1.41" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" -dependencies = [ - "log", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "tracing-core" -version = "0.1.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" -dependencies = [ - "once_cell", -] - -[[package]] -name = "try-lock" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" - -[[package]] -name = "ttf-parser" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" - -[[package]] -name = "ttf-parser" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8" - -[[package]] -name = "type-map" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6d3364c5e96cb2ad1603037ab253ddd34d7fb72a58bdddf4b7350760fc69a46" -dependencies = [ - "rustc-hash 1.1.0", -] - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "uds_windows" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" -dependencies = [ - "memoffset 0.9.1", - "tempfile", - "winapi", -] - -[[package]] -name = "unic-langid" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238722e6d794ed130f91f4ea33e01fcff4f188d92337a21297892521c72df516" -dependencies = [ - "unic-langid-impl", -] - -[[package]] -name = "unic-langid-impl" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bd55a2063fdea4ef1f8633243a7b0524cbeef1905ae04c31a1c9b9775c55bc6" -dependencies = [ - "serde", - "tinystr", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - -[[package]] -name = "unicode-bidi-mirroring" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23cb788ffebc92c5948d0e997106233eeb1d8b9512f93f41651f52b6c5f5af86" - -[[package]] -name = "unicode-ccc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df77b101bcc4ea3d78dafc5ad7e4f58ceffe0b2b16bf446aeb50b6cb4157656" - -[[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-properties" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" - -[[package]] -name = "unicode-script" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd" - -[[package]] -name = "unicode-segmentation" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" - -[[package]] -name = "unicode-vo" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" - -[[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.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[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 = "urlencoding" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" - -[[package]] -name = "usvg" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84ea542ae85c715f07b082438a4231c3760539d902e11d093847a0b22963032" -dependencies = [ - "base64 0.22.0", - "data-url", - "flate2", - "fontdb 0.18.0", - "imagesize", - "kurbo 0.11.1", - "log", - "pico-args", - "roxmltree 0.20.0", - "rustybuzz", - "simplecss", - "siphasher 1.0.1", - "strict-num", - "svgtypes", - "tiny-skia-path", - "unicode-bidi", - "unicode-script", - "unicode-vo", - "xmlwriter", -] - -[[package]] -name = "v_frame" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6f32aaa24bacd11e488aa9ba66369c7cd514885742c9fe08cfe85884db3e92b" -dependencies = [ - "aligned-vec", - "num-traits", - "wasm-bindgen", -] - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "version-compare" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "waker-fn" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" - -[[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 = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" -dependencies = [ - "cfg-if", - "once_cell", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.87", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" - -[[package]] -name = "wasm-timer" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" -dependencies = [ - "futures", - "js-sys", - "parking_lot 0.11.2", - "pin-utils", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "wayland-backend" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "056535ced7a150d45159d3a8dc30f91a2e2d588ca0b23f70e56033622b8016f6" -dependencies = [ - "cc", - "downcast-rs", - "rustix 0.38.39", - "scoped-tls", - "smallvec", - "wayland-sys", -] - -[[package]] -name = "wayland-client" -version = "0.31.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b66249d3fc69f76fd74c82cc319300faa554e9d865dab1f7cd66cc20db10b280" -dependencies = [ - "bitflags 2.6.0", - "rustix 0.38.39", - "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.6.0", - "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 0.38.39", - "wayland-client", - "xcursor", -] - -[[package]] -name = "wayland-protocols" -version = "0.32.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cd0ade57c4e6e9a8952741325c30bf82f4246885dca8bf561898b86d0c1f58e" -dependencies = [ - "bitflags 2.6.0", - "wayland-backend", - "wayland-client", - "wayland-scanner", - "wayland-server", -] - -[[package]] -name = "wayland-protocols-plasma" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f79f2d57c7fcc6ab4d602adba364bf59a5c24de57bd194486bf9b8360e06bfc4" -dependencies = [ - "bitflags 2.6.0", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-scanner", -] - -[[package]] -name = "wayland-protocols-wlr" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd993de54a40a40fbe5601d9f1fbcaef0aebcc5fda447d7dc8f6dcbaae4f8953" -dependencies = [ - "bitflags 2.6.0", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-scanner", - "wayland-server", -] - -[[package]] -name = "wayland-scanner" -version = "0.31.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597f2001b2e5fc1121e3d5b9791d3e78f05ba6bfa4641053846248e3a13661c3" -dependencies = [ - "proc-macro2", - "quick-xml", - "quote", -] - -[[package]] -name = "wayland-server" -version = "0.31.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89532cc712a2adb119eb4d09694b402576052254d0bb284f82ac1c47fb786ad" -dependencies = [ - "bitflags 2.6.0", - "downcast-rs", - "io-lifetimes 2.0.4", - "rustix 0.38.39", - "wayland-backend", - "wayland-scanner", -] - -[[package]] -name = "wayland-sys" -version = "0.31.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efa8ac0d8e8ed3e3b5c9fc92c7881406a268e11555abe36493efabe649a29e09" -dependencies = [ - "dlib", - "log", - "once_cell", - "pkg-config", -] - -[[package]] -name = "web-sys" -version = "0.3.72" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "web-time" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "weezl" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" - -[[package]] -name = "wgpu" -version = "22.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d1c4ba43f80542cf63a0a6ed3134629ae73e8ab51e4b765a67f3aa062eb433" -dependencies = [ - "arrayvec", - "cfg_aliases 0.1.1", - "document-features", - "js-sys", - "log", - "naga", - "parking_lot 0.12.1", - "profiling", - "raw-window-handle", - "smallvec", - "static_assertions", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "wgpu-core", - "wgpu-hal", - "wgpu-types", -] - -[[package]] -name = "wgpu-core" -version = "22.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0348c840d1051b8e86c3bcd31206080c5e71e5933dabd79be1ce732b0b2f089a" -dependencies = [ - "arrayvec", - "bit-vec", - "bitflags 2.6.0", - "cfg_aliases 0.1.1", - "document-features", - "indexmap", - "log", - "naga", - "once_cell", - "parking_lot 0.12.1", - "profiling", - "raw-window-handle", - "rustc-hash 1.1.0", - "smallvec", - "thiserror", - "wgpu-hal", - "wgpu-types", -] - -[[package]] -name = "wgpu-hal" -version = "22.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6bbf4b4de8b2a83c0401d9e5ae0080a2792055f25859a02bf9be97952bbed4f" -dependencies = [ - "android_system_properties", - "arrayvec", - "ash", - "bit-set", - "bitflags 2.6.0", - "block", - "cfg_aliases 0.1.1", - "core-graphics-types", - "d3d12", - "glow", - "glutin_wgl_sys", - "gpu-alloc", - "gpu-allocator", - "gpu-descriptor", - "hassle-rs", - "js-sys", - "khronos-egl", - "libc", - "libloading", - "log", - "metal", - "naga", - "ndk-sys 0.5.0+25.2.9519653", - "objc", - "once_cell", - "parking_lot 0.12.1", - "profiling", - "range-alloc", - "raw-window-handle", - "renderdoc-sys", - "rustc-hash 1.1.0", - "smallvec", - "thiserror", - "wasm-bindgen", - "web-sys", - "wgpu-types", - "winapi", -] - -[[package]] -name = "wgpu-types" -version = "22.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc9d91f0e2c4b51434dfa6db77846f2793149d8e73f800fa2e41f52b8eac3c5d" -dependencies = [ - "bitflags 2.6.0", - "js-sys", - "web-sys", -] - -[[package]] -name = "widestring" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" - -[[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 = "window_clipboard" -version = "0.4.1" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" -dependencies = [ - "clipboard-win", - "clipboard_macos", - "clipboard_wayland", - "clipboard_x11", - "dnd", - "mime 0.1.0", - "raw-window-handle", - "thiserror", -] - -[[package]] -name = "windows" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" -dependencies = [ - "windows-core 0.52.0", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows" -version = "0.54.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" -dependencies = [ - "windows-core 0.54.0", - "windows-implement", - "windows-interface", - "windows-targets 0.52.6", -] - -[[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.6", -] - -[[package]] -name = "windows-core" -version = "0.54.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" -dependencies = [ - "windows-result", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-implement" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942ac266be9249c84ca862f0a164a39533dc2f6f33dc98ec89c8da99b82ea0bd" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "windows-interface" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da33557140a288fae4e1d5f8873aaf9eb6613a9cf82c3e070223ff177f598b60" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "windows-result" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "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-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.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.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[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.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[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.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_msvc" -version = "0.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.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[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.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[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.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[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.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" - -[[package]] -name = "winit" -version = "0.30.5" -source = "git+https://github.com/pop-os/winit.git?tag=iced-xdg-surface-0.13#1cc02bdab141072eaabad639d74b032fd0fcc62e" -dependencies = [ - "ahash", - "android-activity", - "atomic-waker", - "bitflags 2.6.0", - "block2", - "bytemuck", - "calloop", - "cfg_aliases 0.2.1", - "concurrent-queue", - "core-foundation", - "core-graphics", - "cursor-icon", - "dpi", - "js-sys", - "libc", - "memmap2 0.9.4", - "ndk", - "objc2", - "objc2-app-kit", - "objc2-foundation", - "objc2-ui-kit", - "orbclient", - "percent-encoding", - "pin-project", - "raw-window-handle", - "redox_syscall 0.4.1", - "rustix 0.38.39", - "sctk-adwaita", - "smithay-client-toolkit", - "smol_str", - "tracing", - "unicode-segmentation", - "wasm-bindgen", - "wasm-bindgen-futures", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-protocols-plasma", - "web-sys", - "web-time", - "windows-sys 0.52.0", - "x11-dl", - "x11rb", - "xkbcommon-dl", -] - -[[package]] -name = "winnow" -version = "0.5.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] - -[[package]] -name = "winnow" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" -dependencies = [ - "memchr", -] - -[[package]] -name = "winreg" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "x11-dl" -version = "2.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" -dependencies = [ - "libc", - "once_cell", - "pkg-config", -] - -[[package]] -name = "x11rb" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" -dependencies = [ - "as-raw-xcb-connection", - "gethostname", - "libc", - "libloading", - "once_cell", - "rustix 0.38.39", - "x11rb-protocol", -] - -[[package]] -name = "x11rb-protocol" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" - -[[package]] -name = "xcursor" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" - -[[package]] -name = "xdg" -version = "2.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" - -[[package]] -name = "xdg-home" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" -dependencies = [ - "libc", - "winapi", -] - -[[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 = "xkbcommon-dl" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" -dependencies = [ - "bitflags 2.6.0", - "dlib", - "log", - "once_cell", - "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.8.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" - -[[package]] -name = "xmlwriter" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" - -[[package]] -name = "yansi" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" - -[[package]] -name = "yazi" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e01738255b5a16e78bbb83e7fbba0a1e7dd506905cfc53f4622d89015a03fbb5" - -[[package]] -name = "zbus" -version = "3.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" -dependencies = [ - "async-broadcast 0.5.1", - "async-process 1.8.1", - "async-recursion", - "async-trait", - "byteorder", - "derivative", - "enumflags2", - "event-listener 2.5.3", - "futures-core", - "futures-sink", - "futures-util", - "hex", - "nix 0.26.4", - "once_cell", - "ordered-stream", - "rand", - "serde", - "serde_repr", - "sha1", - "static_assertions", - "tokio", - "tracing", - "uds_windows", - "winapi", - "xdg-home", - "zbus_macros 3.15.2", - "zbus_names 2.6.1", - "zvariant 3.15.2", -] - -[[package]] -name = "zbus" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23915fcb26e7a9a9dc05fd93a9870d336d6d032cd7e8cebf1c5c37666489fdd5" -dependencies = [ - "async-broadcast 0.7.1", - "async-executor", - "async-fs", - "async-io 2.3.2", - "async-lock 3.3.0", - "async-process 2.2.3", - "async-recursion", - "async-task", - "async-trait", - "blocking", - "enumflags2", - "event-listener 5.3.0", - "futures-core", - "futures-sink", - "futures-util", - "hex", - "nix 0.28.0", - "ordered-stream", - "rand", - "serde", - "serde_repr", - "sha1", - "static_assertions", - "tokio", - "tracing", - "uds_windows", - "windows-sys 0.52.0", - "xdg-home", - "zbus_macros 4.3.0", - "zbus_names 3.0.0", - "zvariant 4.1.2", -] - -[[package]] -name = "zbus_macros" -version = "3.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "regex", - "syn 1.0.109", - "zvariant_utils 1.0.1", -] - -[[package]] -name = "zbus_macros" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02bcca0b586d2f8589da32347b4784ba424c4891ed86aa5b50d5e88f6b2c4f5d" -dependencies = [ - "proc-macro-crate 3.1.0", - "proc-macro2", - "quote", - "syn 2.0.87", - "zvariant_utils 2.0.0", -] - -[[package]] -name = "zbus_names" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" -dependencies = [ - "serde", - "static_assertions", - "zvariant 3.15.2", -] - -[[package]] -name = "zbus_names" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" -dependencies = [ - "serde", - "static_assertions", - "zvariant 4.1.2", -] - -[[package]] -name = "zeno" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc0de2315dc13d00e5df3cd6b8d2124a6eaec6a2d4b6a1c5f37b7efad17fcc17" - -[[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 2.0.87", -] - -[[package]] -name = "zune-core" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" - -[[package]] -name = "zune-inflate" -version = "0.2.54" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" -dependencies = [ - "simd-adler32", -] - -[[package]] -name = "zune-jpeg" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16099418600b4d8f028622f73ff6e3deaabdff330fb9a2a131dea781ee8b0768" -dependencies = [ - "zune-core", -] - -[[package]] -name = "zvariant" -version = "3.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db" -dependencies = [ - "byteorder", - "enumflags2", - "libc", - "serde", - "static_assertions", - "zvariant_derive 3.15.2", -] - -[[package]] -name = "zvariant" -version = "4.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1724a2b330760dc7d2a8402d841119dc869ef120b139d29862d6980e9c75bfc9" -dependencies = [ - "endi", - "enumflags2", - "serde", - "static_assertions", - "url", - "zvariant_derive 4.1.2", -] - -[[package]] -name = "zvariant_derive" -version = "3.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "syn 1.0.109", - "zvariant_utils 1.0.1", -] - -[[package]] -name = "zvariant_derive" -version = "4.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55025a7a518ad14518fb243559c058a2e5b848b015e31f1d90414f36e3317859" -dependencies = [ - "proc-macro-crate 3.1.0", - "proc-macro2", - "quote", - "syn 2.0.87", - "zvariant_utils 2.0.0", -] - -[[package]] -name = "zvariant_utils" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "zvariant_utils" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] diff --git a/pkgs/by-name/fo/forecast/package.nix b/pkgs/by-name/fo/forecast/package.nix index 43da5ff5aadb..e97bf249026b 100644 --- a/pkgs/by-name/fo/forecast/package.nix +++ b/pkgs/by-name/fo/forecast/package.nix @@ -25,23 +25,8 @@ rustPlatform.buildRustPackage { hash = "sha256-06HZ38yW1xnRhXQZ6tHg2Yr0LmfJVRu7Cpp245B7tBg="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "accesskit-0.16.0" = "sha256-yeBzocXxuvHmuPGMRebbsYSKSvN+8sUsmaSKlQDpW4w="; - "atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA="; - "clipboard_macos-0.1.0" = "sha256-tovB4fjPVVRY8LKn5albMzskFQ+1W5ul4jT5RXx9gKE="; - "cosmic-client-toolkit-0.1.0" = "sha256-/DJ/PfqnZHB6VeRi7HXWp0Vruk+jWBe+VCLPpiJeEv4="; - "cosmic-config-0.1.0" = "sha256-7CKtRpQKYyUwANz5OMkfqDkfbGP4y0pSjvWBngby+yI="; - "cosmic-freedesktop-icons-0.2.6" = "sha256-+WmCBP9BQx7AeGdFW2KM029vuweYKM/OzuCap5aTImw="; - "cosmic-text-0.12.1" = "sha256-+litEIoCWfwt/+wqRCtWuGr5DHAuDFV/naHnADNLbQI="; - "dpi-0.1.1" = "sha256-whi05/2vc3s5eAJTZ9TzVfGQ/EnfPr0S4PZZmbiYio0="; - "iced_glyphon-0.6.0" = "sha256-u1vnsOjP8npQ57NNSikotuHxpi4Mp/rV9038vAgCsfQ="; - "smithay-clipboard-0.8.0" = "sha256-4InFXm0ahrqFrtNLeqIuE3yeOpxKZJZx+Bc0yQDtv34="; - "softbuffer-0.4.1" = "sha256-a0bUFz6O8CWRweNt/OxTvflnPYwO5nm6vsyc/WcXyNg="; - "taffy-0.3.11" = "sha256-SCx9GEIJjWdoNVyq+RZAGn0N71qraKZxf9ZWhvyzLaI="; - }; - }; + useFetchCargoVendor = true; + cargoHash = "sha256-mqZ2tIZzQWU39SMj8UBnScsGAg4xGhkcm51aXx3UBSk="; nativeBuildInputs = [ libcosmicAppHook From fc6336715d4995e2c2d6244b7fd8c92cbb3d4904 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Thu, 13 Feb 2025 14:58:34 -0300 Subject: [PATCH 1806/2168] forecast: add HeitorAugustoLN as a maintainer --- pkgs/by-name/fo/forecast/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/fo/forecast/package.nix b/pkgs/by-name/fo/forecast/package.nix index e97bf249026b..f17051154863 100644 --- a/pkgs/by-name/fo/forecast/package.nix +++ b/pkgs/by-name/fo/forecast/package.nix @@ -60,7 +60,10 @@ rustPlatform.buildRustPackage { description = "Weather app written in rust and libcosmic"; homepage = "https://github.com/cosmic-utils/forecast"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ GaetanLepage ]; + maintainers = with lib.maintainers; [ + GaetanLepage + HeitorAugustoLN + ]; platforms = lib.platforms.linux; mainProgram = "cosmic-ext-forecast"; }; From 6fd701cc309defbb987b874df282dd714f2cec6b Mon Sep 17 00:00:00 2001 From: Jack Wilsdon Date: Thu, 13 Feb 2025 18:05:39 +0000 Subject: [PATCH 1807/2168] python3Packages.datauri: add missing dependency --- pkgs/development/python-modules/datauri/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/datauri/default.nix b/pkgs/development/python-modules/datauri/default.nix index fd83056f3250..87da3ec656d3 100644 --- a/pkgs/development/python-modules/datauri/default.nix +++ b/pkgs/development/python-modules/datauri/default.nix @@ -7,6 +7,7 @@ pythonOlder, setuptools, typing-extensions, + cached-property, }: buildPythonPackage rec { @@ -25,7 +26,10 @@ buildPythonPackage rec { build-system = [ setuptools ]; - dependencies = [ typing-extensions ]; + dependencies = [ + typing-extensions + cached-property + ]; nativeCheckInputs = [ pydantic From 675abe72b865af269f6549dec7c7638af48cb8c3 Mon Sep 17 00:00:00 2001 From: cy Date: Thu, 13 Feb 2025 13:14:41 -0500 Subject: [PATCH 1808/2168] anki-bin: 24.11 -> 25.02 Changelog: https://github.com/ankitects/anki/releases/tag/25.02 --- pkgs/games/anki/bin.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/anki/bin.nix b/pkgs/games/anki/bin.nix index 11c03ec3bebe..ecc8b0833d1c 100644 --- a/pkgs/games/anki/bin.nix +++ b/pkgs/games/anki/bin.nix @@ -15,22 +15,22 @@ let pname = "anki-bin"; # Update hashes for both Linux and Darwin! - version = "24.11"; + version = "25.02"; sources = { linux = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux-qt6.tar.zst"; - hash = "sha256-JXn4oxhRODHh6b5hFFj393xMRlaJRVcbMJ5AyXr+jq8="; + hash = "sha256-9g9ktEME4P8wQYv8i8TzIXThpsTi4QuJNTdGdA+YqNA="; }; # For some reason anki distributes completely separate dmg-files for the aarch64 version and the x86_64 version darwin-x86_64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-intel-qt6.dmg"; - hash = "sha256-d94lfk1pUJgxk4Dylw+fC2qt8wfRJ7tJQYm+Chp1J5k="; + hash = "sha256-5soE9JZugwuEIUdzU+ki7PoXluvmG9bnlaV5EAmlIOs="; }; darwin-aarch64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-apple-qt6.dmg"; - hash = "sha256-AEpyrZBQ+0FI9CxwCacGlbMDMZ7eebBRPkQ0Nstubnk="; + hash = "sha256-4N6ukTOxJ2FprmtSxUCxmathKf5J6oXNCJyqLZ39ysk="; }; }; From 459aa8f67e6fc19d16c8799a39bc1af6affaa8bf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 18:23:27 +0000 Subject: [PATCH 1809/2168] python312Packages.pyeconet: 0.1.26 -> 0.1.27 --- pkgs/development/python-modules/pyeconet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyeconet/default.nix b/pkgs/development/python-modules/pyeconet/default.nix index f26cd0f67f64..aef69fa52484 100644 --- a/pkgs/development/python-modules/pyeconet/default.nix +++ b/pkgs/development/python-modules/pyeconet/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyeconet"; - version = "0.1.26"; + version = "0.1.27"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "w1ll1am23"; repo = "pyeconet"; tag = "v${version}"; - hash = "sha256-3A37/LHCYkqFjbjP3mtO4kRnWZ8NQiFAS67mT2igvqM="; + hash = "sha256-oGQwwzNOPMdlpdSZld4vA9bDMOzTH247LTNN5ywOBX8="; }; build-system = [ setuptools ]; From e1430b00098d8f83c3f560ebec309595f2f5651c Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 13 Feb 2025 17:18:58 +0700 Subject: [PATCH 1810/2168] python312Packages.ipylab: init at 1.0.0 --- .../python-modules/ipylab/default.nix | 50 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/development/python-modules/ipylab/default.nix diff --git a/pkgs/development/python-modules/ipylab/default.nix b/pkgs/development/python-modules/ipylab/default.nix new file mode 100644 index 000000000000..90c9b8a0ae1f --- /dev/null +++ b/pkgs/development/python-modules/ipylab/default.nix @@ -0,0 +1,50 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + hatchling, + hatch-nodejs-version, + ipywidgets, + jupyterlab, +}: + +buildPythonPackage rec { + pname = "ipylab"; + version = "1.0.0"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-xPB0Sx+W1sRgW5hqpZ68zWRFG/cclIOgGat6UsVlYXA="; + }; + + build-system = [ + hatchling + hatch-nodejs-version + jupyterlab + ]; + + env.HATCH_BUILD_NO_HOOKS = true; + + dependencies = [ + ipywidgets + ]; + + pythonImportsCheck = [ "ipylab" ]; + + # There are no tests + doCheck = false; + + meta = { + description = "Control JupyterLab from Python notebooks."; + homepage = "https://github.com/jtpio/ipylab"; + changelog = "https://github.com/jtpio/ipylab/releases/tag/v${version}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ flokli ]; + badPlatforms = [ + # Unclear why it breaks on darwin only + # ModuleNotFoundError: No module named 'ipylab._version' + lib.systems.inspect.patterns.isDarwin + ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ac494ea9806f..fb7a6da9d98e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6492,6 +6492,8 @@ self: super: with self; { ipydatawidgets = callPackage ../development/python-modules/ipydatawidgets { }; + ipylab = callPackage ../development/python-modules/ipylab { }; + ipynbname = callPackage ../development/python-modules/ipynbname { }; ipyniivue = callPackage ../development/python-modules/ipyniivue { }; From 1562f5286858b3c1e5ea7e60f4bf6b3578519248 Mon Sep 17 00:00:00 2001 From: cy Date: Thu, 13 Feb 2025 13:15:30 -0500 Subject: [PATCH 1811/2168] anki-bin: add cything as maintainer --- pkgs/games/anki/bin.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/games/anki/bin.nix b/pkgs/games/anki/bin.nix index ecc8b0833d1c..7ccafd81b6f9 100644 --- a/pkgs/games/anki/bin.nix +++ b/pkgs/games/anki/bin.nix @@ -67,7 +67,10 @@ let "x86_64-darwin" "aarch64-darwin" ]; - maintainers = with maintainers; [ mahmoudk1000 ]; + maintainers = with maintainers; [ + mahmoudk1000 + cything + ]; }; passthru = { From c081e2b8941ed58fe8b8c70b32a9a1ca9ac5a276 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Thu, 13 Feb 2025 15:32:21 -0300 Subject: [PATCH 1812/2168] oboete: use `libcosmicAppHook` --- pkgs/by-name/ob/oboete/package.nix | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) diff --git a/pkgs/by-name/ob/oboete/package.nix b/pkgs/by-name/ob/oboete/package.nix index 037d72024ce5..779ff37241e1 100644 --- a/pkgs/by-name/ob/oboete/package.nix +++ b/pkgs/by-name/ob/oboete/package.nix @@ -2,12 +2,8 @@ lib, rustPlatform, fetchFromGitHub, - pkg-config, - wrapGAppsHook3, - libxkbcommon, + libcosmicAppHook, sqlite, - vulkan-loader, - wayland, nix-update-script, }: @@ -25,27 +21,9 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-91JMgdpMXL0a7oZXAG5xgiulOIyVXQ5x09wN3XDeSy0="; - nativeBuildInputs = [ - pkg-config - wrapGAppsHook3 - ]; + nativeBuildInputs = [ libcosmicAppHook ]; - buildInputs = [ - libxkbcommon - sqlite - vulkan-loader - wayland - ]; - - postFixup = '' - wrapProgram $out/bin/oboete \ - --prefix LD_LIBRARY_PATH : "${ - lib.makeLibraryPath [ - libxkbcommon - wayland - ] - }" - ''; + buildInputs = [ sqlite ]; passthru = { updateScript = nix-update-script { }; From 50e7d579aa6caffeca66b86e57ef368a710e5090 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Thu, 13 Feb 2025 15:34:19 -0300 Subject: [PATCH 1813/2168] oboete: add HeitorAugustoLN as a maintainer --- pkgs/by-name/ob/oboete/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ob/oboete/package.nix b/pkgs/by-name/ob/oboete/package.nix index 779ff37241e1..5c8f86b09648 100644 --- a/pkgs/by-name/ob/oboete/package.nix +++ b/pkgs/by-name/ob/oboete/package.nix @@ -34,7 +34,10 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/mariinkys/oboete"; changelog = "https://github.com/mariinkys/oboete/releases/tag/${version}"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ GaetanLepage ]; + maintainers = with lib.maintainers; [ + GaetanLepage + HeitorAugustoLN + ]; platforms = lib.platforms.linux; mainProgram = "oboete"; }; From ff375cefb9aa52a7c0830b51e3c743234731414a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 18:42:02 +0000 Subject: [PATCH 1814/2168] python312Packages.pysqueezebox: 0.11.1 -> 0.12.0 --- pkgs/development/python-modules/pysqueezebox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pysqueezebox/default.nix b/pkgs/development/python-modules/pysqueezebox/default.nix index c61e5aa324f9..3c141bfc2fa1 100644 --- a/pkgs/development/python-modules/pysqueezebox/default.nix +++ b/pkgs/development/python-modules/pysqueezebox/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pysqueezebox"; - version = "0.11.1"; + version = "0.12.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "rajlaud"; repo = "pysqueezebox"; tag = "v${version}"; - hash = "sha256-8eCf0y8xbnSP+c+QP8fRkamUj5kN4EUQVZpotdo7hbs="; + hash = "sha256-WZrj9YNVQSS1M+PKLkX1zyERVmcvJGnHal6JKgl/fC0="; }; build-system = [ setuptools ]; @@ -52,7 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Asynchronous library to control Logitech Media Server"; homepage = "https://github.com/rajlaud/pysqueezebox"; - changelog = "https://github.com/rajlaud/pysqueezebox/releases/tag/v${version}"; + changelog = "https://github.com/rajlaud/pysqueezebox/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ nyanloutre ]; }; From c9e4b908b5ca8321e89c62998b983c3d724a17f3 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 13 Feb 2025 19:44:07 +0100 Subject: [PATCH 1815/2168] open-webui: 0.5.10 -> 0.5.11 changelog: https://github.com/open-webui/open-webui/releases/tag/v0.5.11 diff: https://github.com/open-webui/open-webui/compare/v0.5.10..v0.5.11 --- pkgs/by-name/op/open-webui/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix index 80a000b83b11..a67b263f07fc 100644 --- a/pkgs/by-name/op/open-webui/package.nix +++ b/pkgs/by-name/op/open-webui/package.nix @@ -7,19 +7,19 @@ }: let pname = "open-webui"; - version = "0.5.10"; + version = "0.5.11"; src = fetchFromGitHub { owner = "open-webui"; repo = "open-webui"; tag = "v${version}"; - hash = "sha256-zwVrDdCMapuHKmtlEUnCwxXCBU93C5uT9eqDk5Of2BE="; + hash = "sha256-U+zY/Jgzo52x/H4xcW2/LjM52r+hdJvZ/xsIeAeJniE="; }; frontend = buildNpmPackage { inherit pname version src; - npmDepsHash = "sha256-G08r+2eelxV3ottsNEZ6xysu13AbzPNTwkwZdY1qadg="; + npmDepsHash = "sha256-bAzcNLMB8OqzYRfw9Cr0xuFFl4FIKvBQT/4M2nZP0C8="; # Disabling `pyodide:fetch` as it downloads packages during `buildPhase` # Until this is solved, running python packages from the browser will not work. @@ -140,6 +140,7 @@ python312.pkgs.buildPythonApplication rec { rapidocr-onnxruntime redis requests + restrictedpython sentence-transformers soundfile tiktoken From dc27af6815504e7b3264e437413939f8720cfe1b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 19:13:50 +0000 Subject: [PATCH 1816/2168] ada: 3.0.0 -> 3.1.0 --- pkgs/by-name/ad/ada/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ad/ada/package.nix b/pkgs/by-name/ad/ada/package.nix index 55264bc6b50d..8548477c5432 100644 --- a/pkgs/by-name/ad/ada/package.nix +++ b/pkgs/by-name/ad/ada/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "ada"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "ada-url"; repo = "ada"; rev = "v${version}"; - hash = "sha256-6heohik9MlIvDTSWe8U6/mdHuSHaEv4rkGwaz0LH8NU="; + hash = "sha256-BVVYK4JyLyjIjkTCohiA20qwftFdyCo84fWMVVgia0Q="; }; nativeBuildInputs = [ cmake ]; From 4910bf15877f16aa3db7140c748920ee63aa3ad6 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Wed, 13 Nov 2024 19:49:14 -0800 Subject: [PATCH 1817/2168] widevine-cdm: add aarch64-linux --- .../by-name/wi/widevine-cdm/aarch64-linux.nix | 49 +++++++++++++++++++ pkgs/by-name/wi/widevine-cdm/meta.nix | 12 +++++ pkgs/by-name/wi/widevine-cdm/package.nix | 36 +------------- pkgs/by-name/wi/widevine-cdm/x86_64-linux.nix | 28 +++++++++++ 4 files changed, 91 insertions(+), 34 deletions(-) create mode 100644 pkgs/by-name/wi/widevine-cdm/aarch64-linux.nix create mode 100644 pkgs/by-name/wi/widevine-cdm/meta.nix create mode 100644 pkgs/by-name/wi/widevine-cdm/x86_64-linux.nix diff --git a/pkgs/by-name/wi/widevine-cdm/aarch64-linux.nix b/pkgs/by-name/wi/widevine-cdm/aarch64-linux.nix new file mode 100644 index 000000000000..f8ce102acdda --- /dev/null +++ b/pkgs/by-name/wi/widevine-cdm/aarch64-linux.nix @@ -0,0 +1,49 @@ +{ + lib, + stdenv, + fetchurl, + fetchFromGitHub, + squashfsTools, + python3, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "widevine-cdm"; + version = "${finalAttrs.lacrosVersion}-${builtins.substring 0 7 finalAttrs.widevineInstaller.rev}"; + lacrosVersion = "120.0.6098.0"; + + widevineInstaller = fetchFromGitHub { + owner = "AsahiLinux"; + repo = "widevine-installer"; + rev = "7a3928fe1342fb07d96f61c2b094e3287588958b"; + sha256 = "sha256-XI1y4pVNpXS+jqFs0KyVMrxcULOJ5rADsgvwfLF6e0Y="; + }; + + src = fetchurl { + url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/chromeos-lacros-arm64-squash-zstd-${finalAttrs.lacrosVersion}"; + hash = "sha256-OKV8w5da9oZ1oSGbADVPCIkP9Y0MVLaQ3PXS3ZBLFXY="; + }; + + nativeBuildInputs = [ + squashfsTools + python3 + ]; + + unpackPhase = '' + unsquashfs -q $src 'WidevineCdm/*' + python3 $widevineInstaller/widevine_fixup.py squashfs-root/WidevineCdm/_platform_specific/cros_arm64/libwidevinecdm.so libwidevinecdm.so + cp squashfs-root/WidevineCdm/manifest.json . + cp squashfs-root/WidevineCdm/LICENSE LICENSE.txt + ''; + + # Accoring to widevine-installer: "Hack because Chromium hardcodes a check for this right now..." + postInstall = '' + install -vD manifest.json "$out/share/google/chrome/WidevineCdm/manifest.json" + install -vD LICENSE.txt "$out/share/google/chrome/WidevineCdm/License.txt" + install -vD libwidevinecdm.so "$out/share/google/chrome/WidevineCdm/_platform_specific/linux_arm64/libwidevinecdm.so" + mkdir -p "$out/share/google/chrome/WidevineCdm/_platform_specific/linux_x64" + touch "$out/share/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so" + ''; + + meta = import ./meta.nix lib; +}) diff --git a/pkgs/by-name/wi/widevine-cdm/meta.nix b/pkgs/by-name/wi/widevine-cdm/meta.nix new file mode 100644 index 000000000000..0361d3ee1da5 --- /dev/null +++ b/pkgs/by-name/wi/widevine-cdm/meta.nix @@ -0,0 +1,12 @@ +lib: { + description = "Widevine CDM"; + homepage = "https://www.widevine.com"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ jlamur ]; + platforms = lib.map (lib.removeSuffix ".nix") ( + lib.filter (name: name != "meta.nix" && name != "package.nix") ( + builtins.attrNames (builtins.readDir ./.) + ) + ); +} diff --git a/pkgs/by-name/wi/widevine-cdm/package.nix b/pkgs/by-name/wi/widevine-cdm/package.nix index a5e7bc2f1b40..f4e0d12fbe49 100644 --- a/pkgs/by-name/wi/widevine-cdm/package.nix +++ b/pkgs/by-name/wi/widevine-cdm/package.nix @@ -1,35 +1,3 @@ -{ - lib, - stdenv, - fetchzip, -}: +{ stdenv, callPackage }: -stdenv.mkDerivation rec { - pname = "widevine-cdm"; - version = "4.10.2830.0"; - - src = fetchzip { - url = "https://dl.google.com/widevine-cdm/${version}-linux-x64.zip"; - hash = "sha256-XDnsan1ulnIK87Owedb2s9XWLzk1K2viGGQe9LN/kcE="; - stripRoot = false; - }; - - installPhase = '' - runHook preInstall - - install -vD manifest.json $out/share/google/chrome/WidevineCdm/manifest.json - install -vD LICENSE.txt $out/share/google/chrome/WidevineCdm/LICENSE.txt - install -vD libwidevinecdm.so $out/share/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so - - runHook postInstall - ''; - - meta = with lib; { - description = "Widevine CDM"; - homepage = "https://www.widevine.com"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = with maintainers; [ jlamur ]; - platforms = [ "x86_64-linux" ]; - }; -} +callPackage (./. + "/${stdenv.hostPlatform.system}.nix") { inherit stdenv; } diff --git a/pkgs/by-name/wi/widevine-cdm/x86_64-linux.nix b/pkgs/by-name/wi/widevine-cdm/x86_64-linux.nix new file mode 100644 index 000000000000..07432c73527f --- /dev/null +++ b/pkgs/by-name/wi/widevine-cdm/x86_64-linux.nix @@ -0,0 +1,28 @@ +{ + lib, + stdenv, + fetchzip, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "widevine-cdm"; + version = "4.10.2830.0"; + + src = fetchzip { + url = "https://dl.google.com/widevine-cdm/${finalAttrs.version}-linux-x64.zip"; + hash = "sha256-XDnsan1ulnIK87Owedb2s9XWLzk1K2viGGQe9LN/kcE="; + stripRoot = false; + }; + + installPhase = '' + runHook preInstall + + install -vD manifest.json $out/share/google/chrome/WidevineCdm/manifest.json + install -vD LICENSE.txt $out/share/google/chrome/WidevineCdm/LICENSE.txt + install -vD libwidevinecdm.so $out/share/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so + + runHook postInstall + ''; + + meta = import ./meta.nix lib; +}) From cd26a4eaf05a9993525fee805d92774e93e6278a Mon Sep 17 00:00:00 2001 From: Marcel Date: Thu, 13 Feb 2025 20:30:10 +0100 Subject: [PATCH 1818/2168] angular-language-server: 19.0.4 -> 19.1.0 --- pkgs/by-name/an/angular-language-server/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/an/angular-language-server/package.nix b/pkgs/by-name/an/angular-language-server/package.nix index 7f0fd663652e..5434f506d01d 100644 --- a/pkgs/by-name/an/angular-language-server/package.nix +++ b/pkgs/by-name/an/angular-language-server/package.nix @@ -15,11 +15,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "angular-language-server"; - version = "19.0.4"; + version = "19.1.0"; src = fetchurl { name = "angular-language-server-${finalAttrs.version}.zip"; url = "https://github.com/angular/vscode-ng-language-service/releases/download/v${finalAttrs.version}/ng-template.vsix"; - hash = "sha256-0vED1AcNIbZ7SmXn4KaBBajxfAptQg+XKL3NtJfnvG8="; + hash = "sha256-ipF8UOUUuUr6LWetJ9V7Mm1EcxL4fQCZvl1ti5VBo5U="; }; nativeBuildInputs = [ From 19a013742d52f1976bca0ad116fb5747980a4821 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Thu, 13 Feb 2025 14:33:05 -0500 Subject: [PATCH 1819/2168] consul: 1.20.2 -> 1.20.3 Diff: https://github.com/hashicorp/consul/compare/refs/tags/v1.20.2...v1.20.3 Changelog: https://github.com/hashicorp/consul/releases/tag/v1.20.3 --- pkgs/by-name/co/consul/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/consul/package.nix b/pkgs/by-name/co/consul/package.nix index ad6fbcadeabe..37661766483c 100644 --- a/pkgs/by-name/co/consul/package.nix +++ b/pkgs/by-name/co/consul/package.nix @@ -8,7 +8,7 @@ buildGoModule rec { pname = "consul"; - version = "1.20.2"; + version = "1.20.3"; # Note: Currently only release tags are supported, because they have the Consul UI # vendored. See @@ -22,7 +22,7 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; tag = "v${version}"; - hash = "sha256-pUKX94OgJ2PTchBokAI5QzLxvdzQjcePrKHEiB782hc="; + hash = "sha256-Bgzanv7z2mVtzp6UC5mxzkYaE82ULioVmaXN2DqJ4LI="; }; # This corresponds to paths with package main - normally unneeded but consul @@ -32,7 +32,7 @@ buildGoModule rec { "connect/certgen" ]; - vendorHash = "sha256-pH9KVyHgSULZ+fuUSDIXOzLhrdhsbJEom67k6jaW31E="; + vendorHash = "sha256-Sa6OcRMgx1WUXVNbgSAR+2KWYlc6b/50ZqPS8/ycBkI="; doCheck = false; From 761e1f5aa13201e5677e115ecd2c1f4aef31a3b6 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 13 Feb 2025 19:28:53 +0000 Subject: [PATCH 1820/2168] nixos-rebuild-ng: add test_reexec and test_reexec_flake --- .../nixos-rebuild-ng/src/tests/test_main.py | 91 +++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py index 823bc9bff536..347dbc228650 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py @@ -7,6 +7,7 @@ from typing import Any from unittest.mock import ANY, Mock, call, patch import pytest +from pytest import MonkeyPatch import nixos_rebuild as nr @@ -125,6 +126,96 @@ def test_parse_args() -> None: ] +@patch.dict(nr.os.environ, {}, clear=True) +@patch(get_qualified_name(nr.os.execve, nr.os), autospec=True) +@patch(get_qualified_name(nr.nix.build), autospec=True) +def test_reexec(mock_build: Mock, mock_execve: Mock, monkeypatch: MonkeyPatch) -> None: + monkeypatch.setattr(nr, "EXECUTABLE", "nixos-rebuild-ng") + argv = ["/path/bin/nixos-rebuild-ng", "switch", "--no-flake"] + args, _ = nr.parse_args(argv) + mock_build.return_value = Path("/path") + + nr.reexec(argv, args, {"build": True}, {"flake": True}) + assert mock_build.call_args_list == [ + call( + "config.system.build.nixos-rebuild", + nr.models.BuildAttr(ANY, ANY), + {"build": True, "no_out_link": True}, + ) + ] + # do not exec if there is no new version + assert mock_execve.call_args_list == [] + + mock_build.return_value = Path("/path/new") + + nr.reexec(argv, args, {}, {}) + # exec in the new version successfully + assert mock_execve.call_args_list == [ + call( + Path("/path/new/bin/nixos-rebuild-ng"), + ["/path/bin/nixos-rebuild-ng", "switch", "--no-flake"], + {"_NIXOS_REBUILD_REEXEC": "1"}, + ) + ] + + mock_execve.reset_mock() + mock_execve.side_effect = [OSError("BOOM"), None] + + nr.reexec(argv, args, {}, {}) + # exec in the previous version if the new version fails + assert mock_execve.call_args == call( + Path("/path/bin/nixos-rebuild-ng"), + ["/path/bin/nixos-rebuild-ng", "switch", "--no-flake"], + {"_NIXOS_REBUILD_REEXEC": "1"}, + ) + + +@patch.dict(nr.os.environ, {}, clear=True) +@patch(get_qualified_name(nr.os.execve, nr.os), autospec=True) +@patch(get_qualified_name(nr.nix.build_flake), autospec=True) +def test_reexec_flake( + mock_build: Mock, mock_execve: Mock, monkeypatch: MonkeyPatch +) -> None: + monkeypatch.setattr(nr, "EXECUTABLE", "nixos-rebuild-ng") + argv = ["/path/bin/nixos-rebuild-ng", "switch", "--flake"] + args, _ = nr.parse_args(argv) + mock_build.return_value = Path("/path") + + nr.reexec(argv, args, {"build": True}, {"flake": True}) + assert mock_build.call_args_list == [ + call( + "config.system.build.nixos-rebuild", + nr.models.Flake(ANY, ANY), + {"flake": True, "no_link": True}, + ) + ] + # do not exec if there is no new version + assert mock_execve.call_args_list == [] + + mock_build.return_value = Path("/path/new") + + nr.reexec(argv, args, {}, {}) + # exec in the new version successfully + assert mock_execve.call_args_list == [ + call( + Path("/path/new/bin/nixos-rebuild-ng"), + ["/path/bin/nixos-rebuild-ng", "switch", "--flake"], + {"_NIXOS_REBUILD_REEXEC": "1"}, + ) + ] + + mock_execve.reset_mock() + mock_execve.side_effect = [OSError("BOOM"), None] + + nr.reexec(argv, args, {}, {}) + # exec in the previous version if the new version fails + assert mock_execve.call_args == call( + Path("/path/bin/nixos-rebuild-ng"), + ["/path/bin/nixos-rebuild-ng", "switch", "--flake"], + {"_NIXOS_REBUILD_REEXEC": "1"}, + ) + + @patch.dict(nr.process.os.environ, {}, clear=True) @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) def test_execute_nix_boot(mock_run: Mock, tmp_path: Path) -> None: From 76bec1b1a88dd36a09fa23dc9a792d783def7b63 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 13 Feb 2025 20:08:18 +0000 Subject: [PATCH 1821/2168] python3Packages.craft-providers: 2.1.1 -> 2.2.0 --- pkgs/development/python-modules/craft-providers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/craft-providers/default.nix b/pkgs/development/python-modules/craft-providers/default.nix index bcdbcf148b43..e2392e0b3531 100644 --- a/pkgs/development/python-modules/craft-providers/default.nix +++ b/pkgs/development/python-modules/craft-providers/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "craft-providers"; - version = "2.1.1"; + version = "2.2.0"; pyproject = true; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-providers"; tag = version; - hash = "sha256-aW3efKy3c7ZGXS4wsvby0ww3Gwjt+1tMKsJCGprkcZo="; + hash = "sha256-HCt6xdUu8+6CtkLeUrY2KYnULLwLLobDDm4O1DAiZrc="; }; patches = [ From b72bbe662b0a552d7cf948cc2b7972f0676cc338 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 13 Feb 2025 21:14:28 +0100 Subject: [PATCH 1822/2168] docs: Fix some links Discovered with xrefcheck --- pkgs/README.md | 6 +++--- pkgs/by-name/README.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/README.md b/pkgs/README.md index 842565fc3923..5771f7e1adbd 100644 --- a/pkgs/README.md +++ b/pkgs/README.md @@ -87,7 +87,7 @@ Now that this is out of the way. To add a package to Nixpkgs: - XML::Simple, a Perl module: [`pkgs/top-level/perl-packages.nix`](top-level/perl-packages.nix) (search for the `XMLSimple` attribute). Most Perl modules are so simple to build that they are defined directly in `perl-packages.nix`; no need to make a separate file for them. - - Adobe Reader: [`pkgs/applications/misc/adobe-reader/default.nix`](applications/misc/adobe-reader/default.nix). Shows how binary-only packages can be supported. In particular the [builder](applications/misc/adobe-reader/builder.sh) uses `patchelf` to set the RUNPATH and ELF interpreter of the executables so that the right libraries are found at runtime. + - Adobe Reader: [`pkgs/applications/misc/adobe-reader/default.nix`](applications/misc/adobe-reader/default.nix). Shows how binary-only packages can be supported. In particular the `postFixup` phase uses `patchelf` to set the RUNPATH and ELF interpreter of the executables so that the right libraries are found at runtime. Some notes: @@ -337,7 +337,7 @@ In Nixpkgs, there are generally three different names associated with a package: - The `pname` attribute of the derivation. This is what most users see, in particular when using `nix-env`. -- The attribute name used for the package in the [`pkgs/by-name` structure](./pkgs/by-name/README.md) or in [`all-packages.nix`](./pkgs/top-level/all-packages.nix), and when passing it as a dependency in recipes. +- The attribute name used for the package in the [`pkgs/by-name` structure](./by-name/README.md) or in [`all-packages.nix`](./top-level/all-packages.nix), and when passing it as a dependency in recipes. - The filename for (the directory containing) the Nix expression. @@ -729,7 +729,7 @@ $ nix-build -A phoronix-test-suite.tests Here are examples of package tests: -- [Jasmin compile test](development/compilers/jasmin/test-assemble-hello-world/default.nix) +- [Jasmin compile test](by-name/ja/jasmin/test-assemble-hello-world/default.nix) - [Lobster compile test](development/compilers/lobster/test-can-run-hello-world.nix) - [Spacy annotation test](development/python-modules/spacy/annotation-test/default.nix) - [Libtorch test](development/libraries/science/math/libtorch/test/default.nix) diff --git a/pkgs/by-name/README.md b/pkgs/by-name/README.md index 5eb121b4f3f0..d19495730995 100644 --- a/pkgs/by-name/README.md +++ b/pkgs/by-name/README.md @@ -85,7 +85,7 @@ though it is expected to still take some time to get done. If you're interested in helping out with this effort, please see [this ticket](https://github.com/NixOS/nixpkgs-vet/issues/56). -Since [only PRs to packages in `pkgs/by-name` can be automatically merged](../../CONTRIBUTING.md#how-to-merge-pull-requests), +Since [only PRs to packages in `pkgs/by-name` can be automatically merged](../../CONTRIBUTING.md#how-to-merge-pull-requests-yourself), if package maintainers would like to use this feature, they are welcome to migrate their packages to `pkgs/by-name`. To lessen PR traffic, they're encouraged to also perform some more general maintenance on the package in the same PR, though this is not required and must not be expected. From fca650ed14e874f557247a4b97c460089fc35b0c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 13:30:47 +0000 Subject: [PATCH 1823/2168] dayon: 15.0.2 -> 16.0.0 --- pkgs/by-name/da/dayon/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/da/dayon/package.nix b/pkgs/by-name/da/dayon/package.nix index e53120b7d160..86731d7e43b4 100644 --- a/pkgs/by-name/da/dayon/package.nix +++ b/pkgs/by-name/da/dayon/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dayon"; - version = "15.0.2"; + version = "16.0.0"; src = fetchFromGitHub { owner = "RetGal"; repo = "dayon"; rev = "v${finalAttrs.version}"; - hash = "sha256-5gpST5c3UGutrGuysBEHWqbj9O5+XagA6fTZ7D/R7Oo="; + hash = "sha256-glE8Y8w70nIoOhGqYb90+HuiFeKkORjGLyixsPvjmOI="; }; nativeBuildInputs = [ From 614bcf1728292b9e495c493869516d9c12d6fdaf Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 13 Feb 2025 20:24:44 +0000 Subject: [PATCH 1824/2168] google-chrome: 133.0.6943.53 -> 133.0.6943.98 --- pkgs/by-name/go/google-chrome/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index f35d832b9c30..1cf2479d86f3 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -171,11 +171,11 @@ let linux = stdenv.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "133.0.6943.53"; + version = "133.0.6943.98"; 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-73X2cohboI+GbFDk5ikjxnT1PKjG4UoyzhA9T9Qe9Vk="; + hash = "sha256-UHpt9ToxrE2VA3c5+zOpMYpKWPRWIIeCErIZwEWkfqg="; }; # With strictDeps on, some shebangs were not being patched correctly @@ -274,11 +274,11 @@ let darwin = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "133.0.6943.54"; + version = "133.0.6943.99"; src = fetchurl { - url = "http://dl.google.com/release2/chrome/acyg7rfg57oedifn3wrcxvaq5duq_133.0.6943.54/GoogleChrome-133.0.6943.54.dmg"; - hash = "sha256-VkLjnKjAgj9Fg21jh9Xl56XDBmG0OUuDsnj93rQvJ40="; + url = "http://dl.google.com/release2/chrome/adux5id3nnmm6yel34xr47dlcova_133.0.6943.99/GoogleChrome-133.0.6943.99.dmg"; + hash = "sha256-fcwFpGgbojvB1269/aWLNcj9JnzB0WlNimpYNETIyE8="; }; dontPatch = true; From 656ab3bba6af0087b822fe62f61b586224c71070 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 13 Feb 2025 20:26:31 +0000 Subject: [PATCH 1825/2168] charmcraft: 3.4.2 -> 3.4.3 --- pkgs/by-name/ch/charmcraft/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ch/charmcraft/package.nix b/pkgs/by-name/ch/charmcraft/package.nix index 8ffad09d7a11..99d094dd7f50 100644 --- a/pkgs/by-name/ch/charmcraft/package.nix +++ b/pkgs/by-name/ch/charmcraft/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { pname = "charmcraft"; - version = "3.4.2"; + version = "3.4.3"; pyproject = true; @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { owner = "canonical"; repo = "charmcraft"; tag = version; - hash = "sha256-6ucF0iQxQrFFz7jlaktYsB538W8jbX+Sw5hP0/VoYsk="; + hash = "sha256-TCr6iZHUIJ/dZhj8pWsCYKAfqv9LXD3fGP432UQh/Lo="; }; postPatch = '' From 95da217b9a21d0d9d1585e2088ee8cde4cb33745 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 13 Feb 2025 20:28:02 +0000 Subject: [PATCH 1826/2168] python3Packages.craft-application: 4.9.0 -> 4.9.1 --- pkgs/development/python-modules/craft-application/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/craft-application/default.nix b/pkgs/development/python-modules/craft-application/default.nix index 2501fe7738fd..f2a4a3d6bc8b 100644 --- a/pkgs/development/python-modules/craft-application/default.nix +++ b/pkgs/development/python-modules/craft-application/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "craft-application"; - version = "4.9.0"; + version = "4.9.1"; pyproject = true; src = fetchFromGitHub { owner = "canonical"; repo = "craft-application"; tag = version; - hash = "sha256-DprItAuGjw8AACeJDrIa6KIWLSyImuWI0qeROpPohtM="; + hash = "sha256-Jg+8C16qCr8HGUGtTi3eDhEFhoiR+0EFjLaUtPvXCW8="; }; postPatch = '' From 71661452441182b4713aa0113f2e72b4d8bbb4e3 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 13 Feb 2025 20:28:32 +0000 Subject: [PATCH 1827/2168] python3Packages.craft-parts: 2.6.0 -> 2.6.1 --- pkgs/development/python-modules/craft-parts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/craft-parts/default.nix b/pkgs/development/python-modules/craft-parts/default.nix index e7bbf01087cb..ac6dcf7cdfde 100644 --- a/pkgs/development/python-modules/craft-parts/default.nix +++ b/pkgs/development/python-modules/craft-parts/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "craft-parts"; - version = "2.6.0"; + version = "2.6.1"; pyproject = true; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-parts"; tag = version; - hash = "sha256-SybDzprUrKeL+Jl7Gm4XYLlvmy056D1OtJB7v/W2flY="; + hash = "sha256-KQS4jjA66rROglOrGR7UofJL+oYEEC2X+o6pROrR5r4="; }; patches = [ ./bash-path.patch ]; From 6a3317579da615bc7bbd8b33ce6db3fd1197499e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 13 Feb 2025 01:19:24 +0100 Subject: [PATCH 1828/2168] python312Packages.kserve: fix on darwin and linux --- .../python-modules/kserve/default.nix | 40 +++++++++++++++---- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/kserve/default.nix b/pkgs/development/python-modules/kserve/default.nix index 2fc4813f1a7a..20ed84acdf57 100644 --- a/pkgs/development/python-modules/kserve/default.nix +++ b/pkgs/development/python-modules/kserve/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, @@ -121,19 +122,44 @@ buildPythonPackage rec { pythonImportsCheck = [ "kserve" ]; + pytestFlagsArray = + [ + # AssertionError + "--deselect=test/test_server.py::TestTFHttpServerLoadAndUnLoad::test_unload" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # RuntimeError: Failed to start GCS + "--deselect=test/test_dataplane.py::TestDataPlane::test_explain" + "--deselect=test/test_dataplane.py::TestDataPlane::test_infer" + "--deselect=test/test_dataplane.py::TestDataPlane::test_model_metadata" + "--deselect=test/test_dataplane.py::TestDataPlane::test_server_readiness" + "--deselect=test/test_server.py::TestRayServer::test_explain" + "--deselect=test/test_server.py::TestRayServer::test_health_handler" + "--deselect=test/test_server.py::TestRayServer::test_infer" + "--deselect=test/test_server.py::TestRayServer::test_list_handler" + "--deselect=test/test_server.py::TestRayServer::test_liveness_handler" + "--deselect=test/test_server.py::TestRayServer::test_predict" + ]; + disabledTestPaths = [ # Looks for a config file at the root of the repository "test/test_inference_service_client.py" ]; - disabledTests = [ - # Require network access - "test_infer_graph_endpoint" - "test_infer_path_based_routing" + disabledTests = + [ + # Require network access + "test_infer_graph_endpoint" + "test_infer_path_based_routing" - # Tries to access `/tmp` (hardcoded) - "test_local_path_with_out_dir_exist" - ]; + # Tries to access `/tmp` (hardcoded) + "test_local_path_with_out_dir_exist" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "test_local_path_with_out_dir_not_exist" + ]; + + __darwinAllowLocalNetworking = true; meta = { description = "Standardized Serverless ML Inference Platform on Kubernetes"; From ae077d04777ff7c781023ec027d279a2a11edc81 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 13 Feb 2025 01:45:21 +0100 Subject: [PATCH 1829/2168] python312Packages.kserve: use pytest-xdist to speedup testing --- pkgs/development/python-modules/kserve/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/kserve/default.nix b/pkgs/development/python-modules/kserve/default.nix index 20ed84acdf57..8ba8618faa8e 100644 --- a/pkgs/development/python-modules/kserve/default.nix +++ b/pkgs/development/python-modules/kserve/default.nix @@ -44,6 +44,7 @@ avro, grpcio-testing, pytest-asyncio, + pytest-xdist, pytestCheckHook, tomlkit, }: @@ -116,6 +117,7 @@ buildPythonPackage rec { avro grpcio-testing pytest-asyncio + pytest-xdist pytestCheckHook tomlkit ] ++ lib.flatten (builtins.attrValues optional-dependencies); From acf8b759cdfdd71fc29239ec8a410eba96bab1b1 Mon Sep 17 00:00:00 2001 From: June Stepp Date: Thu, 13 Feb 2025 14:44:41 -0600 Subject: [PATCH 1830/2168] audacity: use xwayland on wayland by default Audacity doesn't support Wayland due to a memory leak. --- pkgs/by-name/au/audacity/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/au/audacity/package.nix b/pkgs/by-name/au/audacity/package.nix index 061aea770cda..8c99fb7705bf 100644 --- a/pkgs/by-name/au/audacity/package.nix +++ b/pkgs/by-name/au/audacity/package.nix @@ -176,15 +176,17 @@ stdenv.mkDerivation (finalAttrs: { dontWrapGApps = true; # Replace audacity's wrapper, to: - # - put it in the right place, it shouldn't be in "$out/audacity" + # - Put it in the right place; it shouldn't be in "$out/audacity" # - Add the ffmpeg dynamic dependency + # - Use Xwayland by default on Wayland. See https://github.com/audacity/audacity/pull/5977 postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram "$out/bin/audacity" \ "''${gappsWrapperArgs[@]}" \ --prefix LD_LIBRARY_PATH : "$out/lib/audacity":${lib.makeLibraryPath [ ffmpeg ]} \ --suffix AUDACITY_MODULES_PATH : "$out/lib/audacity/modules" \ - --suffix AUDACITY_PATH : "$out/share/audacity" + --suffix AUDACITY_PATH : "$out/share/audacity" \ + --set-default GDK_BACKEND x11 '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications,bin} From f6a5e3bab976b0ab0ff3b80637f2a6ea20429def Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Thu, 13 Feb 2025 12:47:24 -0800 Subject: [PATCH 1831/2168] code-cursor: 0.45.8 -> 0.45.11 --- pkgs/by-name/co/code-cursor/package.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/co/code-cursor/package.nix b/pkgs/by-name/co/code-cursor/package.nix index 690f3b019ba8..32bb7de83470 100644 --- a/pkgs/by-name/co/code-cursor/package.nix +++ b/pkgs/by-name/co/code-cursor/package.nix @@ -9,26 +9,26 @@ }: let pname = "cursor"; - version = "0.45.8"; + version = "0.45.11"; inherit (stdenvNoCC) hostPlatform; sources = { x86_64-linux = fetchurl { - url = "https://download.todesktop.com/230313mzl4w4u92/cursor-0.45.8-build-250201b44xw1x2k-x86_64.AppImage"; - hash = "sha256-H+9cisa1LWJleqzwaB0WIzJpioYZyfLghelcZthCOvg="; + url = "https://download.todesktop.com/230313mzl4w4u92/cursor-0.45.11-build-250207y6nbaw5qc-x86_64.AppImage"; + hash = "sha256-kpS4YHlv9C3e7Em4yCl4YS9nNgNNpMsSyXmMlT29hCI="; }; aarch64-linux = fetchurl { - url = "https://download.todesktop.com/230313mzl4w4u92/cursor-0.45.8-build-250201b44xw1x2k-arm64.AppImage"; - hash = "sha256-GgPt9SvuCA9Hxm7nxm7mz0AvPKaLWCkYXO225taXnLA="; + url = "https://download.todesktop.com/230313mzl4w4u92/cursor-0.45.11-build-250207y6nbaw5qc-arm64.AppImage"; + hash = "sha256-XyxyXRzqZnb3XQ07XP+U3hVGm2Rq+kjcPMaeoqyqwys="; }; x86_64-darwin = fetchurl { - url = "https://download.todesktop.com/230313mzl4w4u92/Cursor%200.45.8%20-%20Build%20250201b44xw1x2k-x64.dmg"; - hash = "sha256-UqwzgxBSZR0itCknKzBClEX3w9aFKFhGIiVUQNYDVEM="; + url = "https://download.todesktop.com/230313mzl4w4u92/Cursor%200.45.11%20-%20Build%20250207y6nbaw5qc-x64.dmg"; + hash = "sha256-VehjX0mcngBeUdEbkB6Vpu+mcTXy9YAh7BLAM1K9K+Y="; }; aarch64-darwin = fetchurl { - url = "https://download.todesktop.com/230313mzl4w4u92/Cursor%200.45.8%20-%20Build%20250201b44xw1x2k-arm64.dmg"; - hash = "sha256-AUW19xJFsrDGSUNE/bwkC2aN2QyaS+JKCjuxx//kbiI="; + url = "https://download.todesktop.com/230313mzl4w4u92/Cursor%200.45.11%20-%20Build%20250207y6nbaw5qc-arm64.dmg"; + hash = "sha256-VeRroXuhJsSnlF8Ys8CjsNRE0LAUgOHPMddVFn8cItI="; }; }; From 8b23d3eb84490ad838181a16bda20484880ee2c8 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 13 Feb 2025 19:14:43 +0100 Subject: [PATCH 1832/2168] python312Packages.textual: skip failing tests on darwin --- .../python-modules/textual/default.nix | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix index 0bcc0d1f5a08..ec4513f5e7d2 100644 --- a/pkgs/development/python-modules/textual/default.nix +++ b/pkgs/development/python-modules/textual/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, jinja2, @@ -10,7 +11,6 @@ pytest-xdist, pytestCheckHook, pythonAtLeast, - pythonOlder, rich, syrupy, time-machine, @@ -24,8 +24,6 @@ buildPythonPackage rec { version = "1.0.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "Textualize"; repo = "textual"; @@ -61,10 +59,15 @@ buildPythonPackage rec { tree-sitter ]; - disabledTestPaths = [ - # Snapshot tests require syrupy<4 - "tests/snapshot_tests/test_snapshots.py" - ]; + disabledTestPaths = + [ + # Snapshot tests require syrupy<4 + "tests/snapshot_tests/test_snapshots.py" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # RuntimeError: There is no current event loop in thread 'MainThread'. + "tests/test_focus.py" + ]; disabledTests = [ @@ -93,11 +96,11 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - meta = with lib; { + meta = { description = "TUI framework for Python inspired by modern web development"; homepage = "https://github.com/Textualize/textual"; changelog = "https://github.com/Textualize/textual/releases/tag/v${version}"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = [ ]; }; } From 81024f9037e0c74aa3fa0953fcfe7796a0b7969e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 13 Feb 2025 21:43:56 +0100 Subject: [PATCH 1833/2168] python312Packages.textual-serve: init at 1.1.1 --- .../python-modules/textual-serve/default.nix | 54 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/development/python-modules/textual-serve/default.nix diff --git a/pkgs/development/python-modules/textual-serve/default.nix b/pkgs/development/python-modules/textual-serve/default.nix new file mode 100644 index 000000000000..8a50b830ed0b --- /dev/null +++ b/pkgs/development/python-modules/textual-serve/default.nix @@ -0,0 +1,54 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + + # build-system + hatchling, + + # dependencies + aiohttp, + aiohttp-jinja2, + jinja2, + rich, + textual, +}: + +buildPythonPackage rec { + pname = "textual-serve"; + version = "1.1.1"; + pyproject = true; + + # No tags on GitHub + src = fetchPypi { + pname = "textual_serve"; + inherit version; + hash = "sha256-ccZiRyxGLl42je/GYO5ujq47/aiMpAwFDFVHRobrDFQ="; + }; + + build-system = [ + hatchling + ]; + + dependencies = [ + aiohttp + aiohttp-jinja2 + jinja2 + rich + textual + ]; + + pythonImportsCheck = [ + "textual_serve" + ]; + + # No tests in the pypi archive + doCheck = false; + + meta = { + description = "Turn your Textual TUIs in to web applications"; + homepage = "https://pypi.org/project/textual-serve/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f3e04032c2d9..86b1f557c827 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16247,6 +16247,8 @@ self: super: with self; { textual-fastdatatable = callPackage ../development/python-modules/textual-fastdatatable { }; + textual-serve = callPackage ../development/python-modules/textual-serve { }; + textual-slider = callPackage ../development/python-modules/textual-slider { }; textual-universal-directorytree = callPackage ../development/python-modules/textual-universal-directorytree { }; From b78c758a4176ca5cb434662d5a0c4d56c2b7c230 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 13 Feb 2025 20:23:16 +0000 Subject: [PATCH 1834/2168] python3Packages.craft-platforms: 0.5.0 -> 0.6.0 --- pkgs/development/python-modules/craft-platforms/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/craft-platforms/default.nix b/pkgs/development/python-modules/craft-platforms/default.nix index 3219ba12b9b1..07482338e95c 100644 --- a/pkgs/development/python-modules/craft-platforms/default.nix +++ b/pkgs/development/python-modules/craft-platforms/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "craft-platforms"; - version = "0.5.0"; + version = "0.6.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-platforms"; tag = version; - hash = "sha256-P7GC+t/rs49/a85Bxy6x4cRyCEaHG4b7SIb85sMj7Yk="; + hash = "sha256-/mnRFw79YMG34/0aQMi237KMNxWanyJixkEKq+zaSuE="; }; postPatch = '' From 7dce0bdb437f99a2da7aa25f239886d8ade91d06 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 13 Feb 2025 20:50:05 +0000 Subject: [PATCH 1835/2168] python3Packages.craft-application: ignore broken tests with later craft-platforms A later version of craft-platforms slightly changes the wording of some error messages, which breaks a few assertions. This is a temporary fix until craft-application ships supporting craft-platforms 0.6.0 No functional issues appear to be present. --- pkgs/development/python-modules/craft-application/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/craft-application/default.nix b/pkgs/development/python-modules/craft-application/default.nix index f2a4a3d6bc8b..6e1456aad508 100644 --- a/pkgs/development/python-modules/craft-application/default.nix +++ b/pkgs/development/python-modules/craft-application/default.nix @@ -105,6 +105,10 @@ buildPythonPackage rec { "test_grammar_aware_part_error" "test_grammar_aware_part_error[part2]" "test_grammar_aware_project_error[project0]" + # Temp fix - asserts fail against error messages which have changed + # slightly in a later revision of craft-platforms. No functional error. + "test_platform_invalid_arch" + "test_platform_invalid_build_arch" ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ # These tests have hardcoded "amd64" strings which fail on aarch64 From 4ae617874da5970db15ddd8c1932e6bb5b42cdc6 Mon Sep 17 00:00:00 2001 From: networkException Date: Thu, 13 Feb 2025 21:58:04 +0100 Subject: [PATCH 1836/2168] ungoogled-chromium: 133.0.6943.53-1 -> 133.0.6943.98-1 https://chromereleases.googleblog.com/2025/02/stable-channel-update-for-desktop_12.html This update includes 4 security fixes. CVEs: CVE-2025-0995 CVE-2025-0996 CVE-2025-0997 CVE-2025-0998 --- .../networking/browsers/chromium/info.json | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index 543b0b439df0..93f5f1d7dd83 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -791,7 +791,7 @@ } }, "ungoogled-chromium": { - "version": "133.0.6943.53", + "version": "133.0.6943.98", "deps": { "depot_tools": { "rev": "423f1e1914ab4aa7b2bdf804e216d4c097853ba2", @@ -802,16 +802,16 @@ "hash": "sha256-T2dcISln9WCODoI/LsE2ldkRfFdMwVOmqqjQinAmZss=" }, "ungoogled-patches": { - "rev": "133.0.6943.53-1", - "hash": "sha256-8n0BST0sqQRcfv0lCiEflrvyxt8Agj/kK0O2fVzWqCY=" + "rev": "133.0.6943.98-1", + "hash": "sha256-lSRJD8tKmZ89MJr6MkldV8/50iB/l8FEwl6ZM/KtZHA=" }, "npmHash": "sha256-oVoTruhxTymYiGkELd2Oa1wOfjGLtChQZozP4GzOO1A=" }, "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "9a80935019b0925b01cc21d254da203bc3986f04", - "hash": "sha256-doJ/HygMtLxr04S73lhs5kTt8qC7SHrCxHbjAoFPv2M=", + "rev": "da53563ceb66412e2637507c8724bd0cab05e453", + "hash": "sha256-yltjJNXU+YQD/sFEa8+ZKqUJpVZ2Yi0YDx27bnekcng=", "recompress": true }, "src/third_party/clang-format/script": { @@ -1366,8 +1366,8 @@ }, "src/third_party/pdfium": { "url": "https://pdfium.googlesource.com/pdfium.git", - "rev": "c674dba647e81805158339785c0c7e3b57643f8c", - "hash": "sha256-2Z7Dg3IuxMB+xKFURo0Z7NztPQht7Fd+A1dX99gQ+A4=" + "rev": "b57762c6c6ad261024f11fc724687593c03cce67", + "hash": "sha256-ksN/7volHAeQLJSFQMV/YOfkXyZ97GSawXp31uca4oc=" }, "src/third_party/perfetto": { "url": "https://android.googlesource.com/platform/external/perfetto.git", @@ -1546,8 +1546,8 @@ }, "src/third_party/webrtc": { "url": "https://webrtc.googlesource.com/src.git", - "rev": "283b6ef9d3eabe5bb3ed7c9d6b6d211a92f9b6d0", - "hash": "sha256-KMyO88KoYiTHq+stdbc8vRYqeQbrqexDIiOeWbqytrU=" + "rev": "cd3e2951ff0f36fa12bea747862c52533a2b39f3", + "hash": "sha256-5tdES3wILTC25Lvos5mWYlfT4ZnM2pBFy5LVACVMXEY=" }, "src/third_party/wuffs/src": { "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git", @@ -1576,8 +1576,8 @@ }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "fe051262efbbd92479a08436f733eba9f756e008", - "hash": "sha256-l3hMgnhy2Ml6kExwGFWi+M6Oq4YFsOSIkRDCmji+syY=" + "rev": "79c3c1ab7faee8247b740b4ec660a998f2881633", + "hash": "sha256-fmd2mIjJs6l9zRTJ2bFIMQNnApFN3epeS+57TBlF/Uk=" } } } From 2f323d5a906086f3b5dd263685bbecbdeda59c44 Mon Sep 17 00:00:00 2001 From: Christoph Honal Date: Fri, 7 Feb 2025 13:05:44 +0100 Subject: [PATCH 1837/2168] nrfconnect: 4.4.1 -> 5.1.0 --- pkgs/by-name/nr/nrfconnect/package.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/nr/nrfconnect/package.nix b/pkgs/by-name/nr/nrfconnect/package.nix index c7f7c529f74d..8130d4f2a90a 100644 --- a/pkgs/by-name/nr/nrfconnect/package.nix +++ b/pkgs/by-name/nr/nrfconnect/package.nix @@ -6,11 +6,11 @@ let pname = "nrfconnect"; - version = "4.4.1"; + version = "5.1.0"; src = fetchurl { url = "https://nsscprodmedia.blob.core.windows.net/prod/software-and-other-downloads/desktop-software/nrf-connect-for-desktop/${lib.versions.major version}-${lib.versions.minor version}-${lib.versions.patch version}/nrfconnect-${version}-x86_64.appimage"; - hash = "sha256-x/vVSOEajuQtLATRXk8DVLlXHegCqP+acecaOFNeBb8="; + hash = "sha256-QEoKIdi8tlZ86langbCYJXSO+dGONBEQPdwmREIhZBA="; name = "${pname}-${version}.AppImage"; }; @@ -22,7 +22,9 @@ in appimageTools.wrapType2 { inherit pname version src; - extraPkgs = pkgs: [ pkgs.segger-jlink ]; + extraPkgs = pkgs: [ + pkgs.segger-jlink-headless + ]; extraInstallCommands = '' install -Dm444 ${appimageContents}/nrfconnect.desktop -t $out/share/applications @@ -32,12 +34,12 @@ appimageTools.wrapType2 { --replace 'Exec=AppRun' 'Exec=nrfconnect' ''; - meta = with lib; { + meta = { description = "Nordic Semiconductor nRF Connect for Desktop"; homepage = "https://www.nordicsemi.com/Products/Development-tools/nRF-Connect-for-desktop"; - license = licenses.unfree; - platforms = platforms.linux; - maintainers = with maintainers; [ stargate01 ]; + license = lib.licenses.unfree; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ stargate01 ]; mainProgram = "nrfconnect"; }; } From 10952c87e367d3af7b877f79c41905429a4000b1 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Thu, 13 Feb 2025 14:26:57 -0500 Subject: [PATCH 1838/2168] zed-editor: 0.172.11 -> 0.173.8 --- pkgs/by-name/ze/zed-editor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index b735dd0146ee..8f91dab205a0 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -96,7 +96,7 @@ let in rustPlatform.buildRustPackage rec { pname = "zed-editor"; - version = "0.172.11"; + version = "0.173.8"; outputs = [ "out" ] ++ lib.optional buildRemoteServer "remote_server"; @@ -104,7 +104,7 @@ rustPlatform.buildRustPackage rec { owner = "zed-industries"; repo = "zed"; tag = "v${version}"; - hash = "sha256-ozPARaFIPJZHsxB9e9c12nVuV/jGBRBXQJ1M+/luExY="; + hash = "sha256-xAmPfCRzgsH5305GTJj9000Jd8AQVyFzI3jVAcTGfYo="; }; patches = [ @@ -124,7 +124,7 @@ rustPlatform.buildRustPackage rec { ''; useFetchCargoVendor = true; - cargoHash = "sha256-3xpsTAj4jrttMZIbZCZc2Qf7g3Q4B6FBSUYEHf0u2+w="; + cargoHash = "sha256-4MIfIU4z/Ot6XczmnCXKhE+DiR4vSguStgZLImXQ6Cg="; nativeBuildInputs = [ From 9144c79cddf8604ab1af2a9fa639f8a01c22d421 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 20:13:51 +0000 Subject: [PATCH 1839/2168] tig: 2.5.11 -> 2.5.12 --- pkgs/by-name/ti/tig/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ti/tig/package.nix b/pkgs/by-name/ti/tig/package.nix index b1de77ff208d..ac1f711e17ed 100644 --- a/pkgs/by-name/ti/tig/package.nix +++ b/pkgs/by-name/ti/tig/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "tig"; - version = "2.5.11"; + version = "2.5.12"; src = fetchFromGitHub { owner = "jonas"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-LFuuhivEg5J7TmrAv/WsKWMsbip0PszuKLPgLLeRzkA="; + sha256 = "sha256-2kNogpzu8e/abjwo18s1G5ZcSZdG5c/Ydp6tfezumdk="; }; nativeBuildInputs = [ From 76347d3a45c73f02730e26eaa2cab56bc48e00c7 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Thu, 13 Feb 2025 13:09:46 -0800 Subject: [PATCH 1840/2168] signalbackup-tools: 20250207 -> 20250213-1 Diff: https://github.com/bepaald/signalbackup-tools/compare/20250207...20250213-1 --- pkgs/by-name/si/signalbackup-tools/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix index 4c86cc146f16..40f52e701c42 100644 --- a/pkgs/by-name/si/signalbackup-tools/package.nix +++ b/pkgs/by-name/si/signalbackup-tools/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20250207"; + version = "20250213-1"; src = fetchFromGitHub { owner = "bepaald"; repo = "signalbackup-tools"; rev = version; - hash = "sha256-pFaL6BWD6Kaw8fJhrPL7b2iDKjHr99gkytP5Kosf7Gw="; + hash = "sha256-616NpIZ2TWyZEoYWZx6XDDxmZbsnrpxcWmTc7QgiT70="; }; nativeBuildInputs = [ From 84f2c0747bef537de021afb044d9f884e8bd2f78 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 13 Feb 2025 12:32:02 -0600 Subject: [PATCH 1841/2168] luaPackages.lush-nvim: fix package --- pkgs/development/lua-modules/overrides.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 0f581254e7b2..76e459e66922 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -517,9 +517,13 @@ in meta.broken = stdenv.hostPlatform.isDarwin; }); - lush-nvim = prev.lush-nvim.overrideAttrs (drv: { - doCheck = false; - }); + lush-nvim = prev.lush-nvim.overrideAttrs { + # Remove dangling symlink created during installation because we don't copy the source CREATE.md it links to + # Using a generic method because path changes depending on if building luaPackage or vimPlugin + postInstall = '' + find -L $out -type l -name "README.md" -print -delete + ''; + }; luuid = prev.luuid.overrideAttrs (oa: { externalDeps = [ From 3b6d27f540ab93375dffb15a66b6823fe9c5f365 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Thu, 13 Feb 2025 13:17:53 -0800 Subject: [PATCH 1842/2168] python312Packages.openai: 1.61.1 -> 1.63.0 Diff: https://github.com/openai/openai-python/compare/refs/tags/v1.61.1...v1.63.0 Changelog: https://github.com/openai/openai-python/blob/v1.63.0/CHANGELOG.md --- pkgs/development/python-modules/openai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index 5b4e5410604c..290a408429a7 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pname = "openai"; - version = "1.61.1"; + version = "1.63.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -45,7 +45,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; tag = "v${version}"; - hash = "sha256-7dDsfEHHYJv6hbDPryhzZwCtdIzYUOABLOSXXQ1vau8="; + hash = "sha256-QR9zFBOIWQCzutOUPzAdm3xhu0aIt5XoyQc5cTciYXw="; }; build-system = [ From 383adab9e0e6c4563e8585b65271abcfa4cd2cb2 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Fri, 17 May 2024 15:31:15 +0200 Subject: [PATCH 1843/2168] domino-chain: init at 1.1 --- .../do/domino-chain/algorithm-header.patch | 13 +++ pkgs/by-name/do/domino-chain/package.nix | 84 +++++++++++++++++++ 2 files changed, 97 insertions(+) create mode 100644 pkgs/by-name/do/domino-chain/algorithm-header.patch create mode 100644 pkgs/by-name/do/domino-chain/package.nix diff --git a/pkgs/by-name/do/domino-chain/algorithm-header.patch b/pkgs/by-name/do/domino-chain/algorithm-header.patch new file mode 100644 index 000000000000..f356554cf8b1 --- /dev/null +++ b/pkgs/by-name/do/domino-chain/algorithm-header.patch @@ -0,0 +1,13 @@ +diff --git a/src/domino-chain/tools.cpp b/src/domino-chain/tools.cpp +index 0eaa592..e91c760 100644 +--- a/src/domino-chain/tools.cpp ++++ b/src/domino-chain/tools.cpp +@@ -48,6 +48,8 @@ + + #include + ++#include ++ + uint64_t getTime(void) + { + #if defined(WIN32) || defined(_WIN32) diff --git a/pkgs/by-name/do/domino-chain/package.nix b/pkgs/by-name/do/domino-chain/package.nix new file mode 100644 index 000000000000..4d0ced53f0f1 --- /dev/null +++ b/pkgs/by-name/do/domino-chain/package.nix @@ -0,0 +1,84 @@ +{ + lib, + stdenv, + fetchFromGitLab, + boost, + freefont_ttf, + fribidi, + gettext, + imagemagick, + libpng, + lua, + pkg-config, + povray, + SDL2, + SDL2_image, + SDL2_mixer, + SDL2_ttf, + zlib, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "domino-chain"; + version = "1.1"; + + src = fetchFromGitLab { + owner = "domino-chain"; + repo = "domino-chain.gitlab.io"; + tag = finalAttrs.version; + hash = "sha256-ERR5QwQpTFLeAijlGtGU0Lpd40II/L5i3muYDN2EfX4="; + }; + + patches = [ + ./algorithm-header.patch + ]; + + postPatch = '' + substituteInPlace Makefile \ + --replace-warn /usr/share/fonts/truetype/freefont/ ${freefont_ttf}/share/fonts/truetype/ + substituteInPlace src/domino-chain/screen.cpp \ + --replace-fail /usr/share/fonts/truetype/freefont/ ${freefont_ttf}/share/fonts/truetype/ + ''; + + nativeBuildInputs = [ + gettext + imagemagick + pkg-config + povray + ]; + + buildInputs = [ + boost + freefont_ttf + fribidi + libpng + lua + SDL2 + SDL2_image + SDL2_mixer + SDL2_ttf + zlib + ]; + + enableParallelBuilding = true; + + __structuredAttrs = true; + makeFlags = [ + "PREFIX=$(out)" + "POVRAY=povray Work_Threads=$(NIX_BUILD_CORES)" + ]; + + env.NIX_CFLAGS_COMPILE = toString [ + "-I${lib.getDev SDL2}/include/SDL2" + "-I${lib.getDev SDL2_mixer}/include/SDL2" + ]; + + meta = { + description = "Rearrange dominoes on different platforms to start a chain reaction"; + homepage = "https://domino-chain.gitlab.io/"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ fgaz ]; + mainProgram = "domino-chain"; + platforms = lib.platforms.all; + }; +}) From 52c671bafbc176f4583c5474b7f10e63b6980900 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 13 Feb 2025 21:23:37 +0000 Subject: [PATCH 1844/2168] Revert "nixos-rebuild-ng: {assert_called_with,assert_has_calls} -> {call_args,call_args_list}" This reverts commit d6e849ee03d1849bd5151c651e66a8731a0c4891. It was a bad idea, the diffs are even worse than before for anything that has more 2 calls. --- .../nixos-rebuild-ng/src/tests/test_main.py | 1031 +++++++++-------- .../nixos-rebuild-ng/src/tests/test_models.py | 10 +- .../ni/nixos-rebuild-ng/src/tests/test_nix.py | 327 +++--- .../src/tests/test_process.py | 13 +- 4 files changed, 704 insertions(+), 677 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py index 347dbc228650..e6d40bc8bd19 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py @@ -4,7 +4,7 @@ import uuid from pathlib import Path from subprocess import PIPE, CompletedProcess from typing import Any -from unittest.mock import ANY, Mock, call, patch +from unittest.mock import ANY, call, patch import pytest from pytest import MonkeyPatch @@ -218,7 +218,7 @@ def test_reexec_flake( @patch.dict(nr.process.os.environ, {}, clear=True) @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) -def test_execute_nix_boot(mock_run: Mock, tmp_path: Path) -> None: +def test_execute_nix_boot(mock_run: Any, tmp_path: Path) -> None: nixpkgs_path = tmp_path / "nixpkgs" nixpkgs_path.mkdir() config_path = tmp_path / "test" @@ -238,59 +238,62 @@ def test_execute_nix_boot(mock_run: Mock, tmp_path: Path) -> None: nr.execute(["nixos-rebuild", "boot", "--no-flake", "-vvv", "--no-reexec"]) - assert mock_run.call_args_list == [ - call( - ["nix-instantiate", "--find-file", "nixpkgs", "-vvv"], - stdout=PIPE, - check=False, - **DEFAULT_RUN_KWARGS, - ), - call( - ["git", "-C", nixpkgs_path, "rev-parse", "--short", "HEAD"], - check=False, - capture_output=True, - **DEFAULT_RUN_KWARGS, - ), - call( - ["git", "-C", nixpkgs_path, "diff", "--quiet"], - check=False, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "nix-build", - "", - "--attr", - "config.system.build.toplevel", - "-vvv", - "--no-out-link", - ], - check=True, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "nix-env", - "-p", - Path("/nix/var/nix/profiles/system"), - "--set", - config_path, - ], - check=True, - **DEFAULT_RUN_KWARGS, - ), - call( - [config_path / "bin/switch-to-configuration", "boot"], - check=True, - **(DEFAULT_RUN_KWARGS | {"env": {"NIXOS_INSTALL_BOOTLOADER": "0"}}), - ), - ] + assert mock_run.call_count == 6 + mock_run.assert_has_calls( + [ + call( + ["nix-instantiate", "--find-file", "nixpkgs", "-vvv"], + stdout=PIPE, + check=False, + **DEFAULT_RUN_KWARGS, + ), + call( + ["git", "-C", nixpkgs_path, "rev-parse", "--short", "HEAD"], + check=False, + capture_output=True, + **DEFAULT_RUN_KWARGS, + ), + call( + ["git", "-C", nixpkgs_path, "diff", "--quiet"], + check=False, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "nix-build", + "", + "--attr", + "config.system.build.toplevel", + "-vvv", + "--no-out-link", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "nix-env", + "-p", + Path("/nix/var/nix/profiles/system"), + "--set", + config_path, + ], + check=True, + **DEFAULT_RUN_KWARGS, + ), + call( + [config_path / "bin/switch-to-configuration", "boot"], + check=True, + **(DEFAULT_RUN_KWARGS | {"env": {"NIXOS_INSTALL_BOOTLOADER": "0"}}), + ), + ] + ) @patch.dict(nr.process.os.environ, {}, clear=True) @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) -def test_execute_nix_build_vm(mock_run: Mock, tmp_path: Path) -> None: +def test_execute_nix_build_vm(mock_run: Any, tmp_path: Path) -> None: config_path = tmp_path / "test" config_path.touch() @@ -315,28 +318,31 @@ def test_execute_nix_build_vm(mock_run: Mock, tmp_path: Path) -> None: ] ) - assert mock_run.call_args_list == [ - call( - [ - "nix-build", - "", - "--attr", - "config.system.build.vm", - "--include", - "nixos-config=./configuration.nix", - "--include", - "nixpkgs=$HOME/.nix-defexpr/channels/pinned_nixpkgs", - ], - check=True, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ) - ] + assert mock_run.call_count == 1 + mock_run.assert_has_calls( + [ + call( + [ + "nix-build", + "", + "--attr", + "config.system.build.vm", + "--include", + "nixos-config=./configuration.nix", + "--include", + "nixpkgs=$HOME/.nix-defexpr/channels/pinned_nixpkgs", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ) + ] + ) @patch.dict(nr.process.os.environ, {}, clear=True) @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) -def test_execute_nix_build_image_flake(mock_run: Mock, tmp_path: Path) -> None: +def test_execute_nix_build_image_flake(mock_run: Any, tmp_path: Path) -> None: config_path = tmp_path / "test" config_path.touch() @@ -370,39 +376,42 @@ def test_execute_nix_build_image_flake(mock_run: Mock, tmp_path: Path) -> None: ] ) - assert mock_run.call_args_list == [ - call( - [ - "nix", - "eval", - "--json", - "/path/to/config#nixosConfigurations.hostname.config.system.build.images", - "--apply", - "builtins.mapAttrs (n: v: v.passthru.filePath)", - ], - check=True, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "nix", - "--extra-experimental-features", - "nix-command flakes", - "build", - "--print-out-paths", - "/path/to/config#nixosConfigurations.hostname.config.system.build.images.azure", - ], - check=True, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ), - ] + assert mock_run.call_count == 2 + mock_run.assert_has_calls( + [ + call( + [ + "nix", + "eval", + "--json", + "/path/to/config#nixosConfigurations.hostname.config.system.build.images", + "--apply", + "builtins.mapAttrs (n: v: v.passthru.filePath)", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "nix", + "--extra-experimental-features", + "nix-command flakes", + "build", + "--print-out-paths", + "/path/to/config#nixosConfigurations.hostname.config.system.build.images.azure", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + ] + ) @patch.dict(nr.process.os.environ, {}, clear=True) @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) -def test_execute_nix_switch_flake(mock_run: Mock, tmp_path: Path) -> None: +def test_execute_nix_switch_flake(mock_run: Any, tmp_path: Path) -> None: config_path = tmp_path / "test" config_path.touch() @@ -431,43 +440,46 @@ def test_execute_nix_switch_flake(mock_run: Mock, tmp_path: Path) -> None: ] ) - assert mock_run.call_args_list == [ - call( - [ - "nix", - "--extra-experimental-features", - "nix-command flakes", - "build", - "--print-out-paths", - "/path/to/config#nixosConfigurations.hostname.config.system.build.toplevel", - "-v", - "--option", - "narinfo-cache-negative-ttl", - "1200", - "--no-link", - ], - check=True, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "sudo", - "nix-env", - "-p", - Path("/nix/var/nix/profiles/system"), - "--set", - config_path, - ], - check=True, - **DEFAULT_RUN_KWARGS, - ), - call( - ["sudo", config_path / "bin/switch-to-configuration", "switch"], - check=True, - **(DEFAULT_RUN_KWARGS | {"env": {"NIXOS_INSTALL_BOOTLOADER": "1"}}), - ), - ] + assert mock_run.call_count == 3 + mock_run.assert_has_calls( + [ + call( + [ + "nix", + "--extra-experimental-features", + "nix-command flakes", + "build", + "--print-out-paths", + "/path/to/config#nixosConfigurations.hostname.config.system.build.toplevel", + "-v", + "--option", + "narinfo-cache-negative-ttl", + "1200", + "--no-link", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "sudo", + "nix-env", + "-p", + Path("/nix/var/nix/profiles/system"), + "--set", + config_path, + ], + check=True, + **DEFAULT_RUN_KWARGS, + ), + call( + ["sudo", config_path / "bin/switch-to-configuration", "switch"], + check=True, + **(DEFAULT_RUN_KWARGS | {"env": {"NIXOS_INSTALL_BOOTLOADER": "1"}}), + ), + ] + ) @patch.dict(nr.process.os.environ, {}, clear=True) @@ -475,9 +487,9 @@ def test_execute_nix_switch_flake(mock_run: Mock, tmp_path: Path) -> None: @patch(get_qualified_name(nr.cleanup_ssh, nr), autospec=True) @patch(get_qualified_name(nr.nix.uuid4, nr.nix), autospec=True) def test_execute_nix_switch_build_target_host( - mock_uuid4: Mock, - mock_cleanup_ssh: Mock, - mock_run: Mock, + mock_uuid4: Any, + mock_cleanup_ssh: Any, + mock_run: Any, tmp_path: Path, ) -> None: config_path = tmp_path / "test" @@ -521,154 +533,157 @@ def test_execute_nix_switch_build_target_host( ] ) - assert mock_run.call_args_list == [ - call( - [ - "nix-instantiate", - "--find-file", - "nixpkgs", - "--include", - "nixos-config=./configuration.nix", - "--include", - "nixpkgs=$HOME/.nix-defexpr/channels/pinned_nixpkgs", - ], - check=False, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "nix-instantiate", - "", - "--attr", - "config.system.build.toplevel", - "--add-root", - nr.tmpdir.TMPDIR_PATH / "00000000000000000000000000000000", - "--include", - "nixos-config=./configuration.nix", - "--include", - "nixpkgs=$HOME/.nix-defexpr/channels/pinned_nixpkgs", - ], - check=True, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ), - call( - ["nix-copy-closure", "--to", "user@build-host", config_path], - check=True, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "ssh", - *nr.process.SSH_DEFAULT_OPTS, - "user@build-host", - "--", - "mktemp", - "-d", - "-t", - "nixos-rebuild.XXXXX", - ], - check=True, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "ssh", - *nr.process.SSH_DEFAULT_OPTS, - "user@build-host", - "--", - "nix-store", - "--realise", - str(config_path), - "--add-root", - "/tmp/tmpdir/00000000000000000000000000000000", - ], - check=True, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "ssh", - *nr.process.SSH_DEFAULT_OPTS, - "user@build-host", - "--", - "readlink", - "-f", - "/tmp/tmpdir/config", - ], - check=True, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "ssh", - *nr.process.SSH_DEFAULT_OPTS, - "user@build-host", - "--", - "rm", - "-rf", - "/tmp/tmpdir", - ], - check=False, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "nix", - "copy", - "--from", - "ssh://user@build-host", - "--to", - "ssh://user@target-host", - config_path, - ], - check=True, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "ssh", - *nr.process.SSH_DEFAULT_OPTS, - "user@target-host", - "--", - "sudo", - "nix-env", - "-p", - "/nix/var/nix/profiles/system", - "--set", - str(config_path), - ], - check=True, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "ssh", - *nr.process.SSH_DEFAULT_OPTS, - "user@target-host", - "--", - "sudo", - "env", - "NIXOS_INSTALL_BOOTLOADER=0", - str(config_path / "bin/switch-to-configuration"), - "switch", - ], - check=True, - **DEFAULT_RUN_KWARGS, - ), - ] + assert mock_run.call_count == 10 + mock_run.assert_has_calls( + [ + call( + [ + "nix-instantiate", + "--find-file", + "nixpkgs", + "--include", + "nixos-config=./configuration.nix", + "--include", + "nixpkgs=$HOME/.nix-defexpr/channels/pinned_nixpkgs", + ], + check=False, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "nix-instantiate", + "", + "--attr", + "config.system.build.toplevel", + "--add-root", + nr.tmpdir.TMPDIR_PATH / "00000000000000000000000000000000", + "--include", + "nixos-config=./configuration.nix", + "--include", + "nixpkgs=$HOME/.nix-defexpr/channels/pinned_nixpkgs", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + ["nix-copy-closure", "--to", "user@build-host", config_path], + check=True, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "ssh", + *nr.process.SSH_DEFAULT_OPTS, + "user@build-host", + "--", + "mktemp", + "-d", + "-t", + "nixos-rebuild.XXXXX", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "ssh", + *nr.process.SSH_DEFAULT_OPTS, + "user@build-host", + "--", + "nix-store", + "--realise", + str(config_path), + "--add-root", + "/tmp/tmpdir/00000000000000000000000000000000", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "ssh", + *nr.process.SSH_DEFAULT_OPTS, + "user@build-host", + "--", + "readlink", + "-f", + "/tmp/tmpdir/config", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "ssh", + *nr.process.SSH_DEFAULT_OPTS, + "user@build-host", + "--", + "rm", + "-rf", + "/tmp/tmpdir", + ], + check=False, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "nix", + "copy", + "--from", + "ssh://user@build-host", + "--to", + "ssh://user@target-host", + config_path, + ], + check=True, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "ssh", + *nr.process.SSH_DEFAULT_OPTS, + "user@target-host", + "--", + "sudo", + "nix-env", + "-p", + "/nix/var/nix/profiles/system", + "--set", + str(config_path), + ], + check=True, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "ssh", + *nr.process.SSH_DEFAULT_OPTS, + "user@target-host", + "--", + "sudo", + "env", + "NIXOS_INSTALL_BOOTLOADER=0", + str(config_path / "bin/switch-to-configuration"), + "switch", + ], + check=True, + **DEFAULT_RUN_KWARGS, + ), + ] + ) @patch.dict(nr.process.os.environ, {}, clear=True) @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) @patch(get_qualified_name(nr.cleanup_ssh, nr), autospec=True) def test_execute_nix_switch_flake_target_host( - mock_cleanup_ssh: Mock, - mock_run: Mock, + mock_cleanup_ssh: Any, + mock_run: Any, tmp_path: Path, ) -> None: config_path = tmp_path / "test" @@ -695,66 +710,69 @@ def test_execute_nix_switch_flake_target_host( ] ) - assert mock_run.call_args_list == [ - call( - [ - "nix", - "--extra-experimental-features", - "nix-command flakes", - "build", - "--print-out-paths", - "/path/to/config#nixosConfigurations.hostname.config.system.build.toplevel", - "--no-link", - ], - check=True, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ), - call( - ["nix-copy-closure", "--to", "user@localhost", config_path], - check=True, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "ssh", - *nr.process.SSH_DEFAULT_OPTS, - "user@localhost", - "--", - "sudo", - "nix-env", - "-p", - "/nix/var/nix/profiles/system", - "--set", - str(config_path), - ], - check=True, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "ssh", - *nr.process.SSH_DEFAULT_OPTS, - "user@localhost", - "--", - "sudo", - "env", - "NIXOS_INSTALL_BOOTLOADER=0", - str(config_path / "bin/switch-to-configuration"), - "switch", - ], - check=True, - **DEFAULT_RUN_KWARGS, - ), - ] + assert mock_run.call_count == 4 + mock_run.assert_has_calls( + [ + call( + [ + "nix", + "--extra-experimental-features", + "nix-command flakes", + "build", + "--print-out-paths", + "/path/to/config#nixosConfigurations.hostname.config.system.build.toplevel", + "--no-link", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + ["nix-copy-closure", "--to", "user@localhost", config_path], + check=True, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "ssh", + *nr.process.SSH_DEFAULT_OPTS, + "user@localhost", + "--", + "sudo", + "nix-env", + "-p", + "/nix/var/nix/profiles/system", + "--set", + str(config_path), + ], + check=True, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "ssh", + *nr.process.SSH_DEFAULT_OPTS, + "user@localhost", + "--", + "sudo", + "env", + "NIXOS_INSTALL_BOOTLOADER=0", + str(config_path / "bin/switch-to-configuration"), + "switch", + ], + check=True, + **DEFAULT_RUN_KWARGS, + ), + ] + ) @patch.dict(nr.process.os.environ, {}, clear=True) @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) @patch(get_qualified_name(nr.cleanup_ssh, nr), autospec=True) def test_execute_nix_switch_flake_build_host( - mock_cleanup_ssh: Mock, - mock_run: Mock, + mock_cleanup_ssh: Any, + mock_run: Any, tmp_path: Path, ) -> None: config_path = tmp_path / "test" @@ -782,74 +800,77 @@ def test_execute_nix_switch_flake_build_host( ] ) - assert mock_run.call_args_list == [ - call( - [ - "nix", - "--extra-experimental-features", - "nix-command flakes", - "eval", - "--raw", - "/path/to/config#nixosConfigurations.hostname.config.system.build.toplevel.drvPath", - ], - check=True, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ), - call( - ["nix-copy-closure", "--to", "user@localhost", config_path], - check=True, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "ssh", - *nr.process.SSH_DEFAULT_OPTS, - "user@localhost", - "--", - "nix", - "--extra-experimental-features", - "'nix-command flakes'", - "build", - f"'{config_path}^*'", - "--print-out-paths", - "--no-link", - ], - check=True, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "nix-copy-closure", - "--from", - "user@localhost", - config_path, - ], - check=True, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "nix-env", - "-p", - Path("/nix/var/nix/profiles/system"), - "--set", - config_path, - ], - check=True, - **DEFAULT_RUN_KWARGS, - ), - call( - [config_path / "bin/switch-to-configuration", "switch"], - check=True, - **DEFAULT_RUN_KWARGS, - ), - ] + assert mock_run.call_count == 6 + mock_run.assert_has_calls( + [ + call( + [ + "nix", + "--extra-experimental-features", + "nix-command flakes", + "eval", + "--raw", + "/path/to/config#nixosConfigurations.hostname.config.system.build.toplevel.drvPath", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + ["nix-copy-closure", "--to", "user@localhost", config_path], + check=True, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "ssh", + *nr.process.SSH_DEFAULT_OPTS, + "user@localhost", + "--", + "nix", + "--extra-experimental-features", + "'nix-command flakes'", + "build", + f"'{config_path}^*'", + "--print-out-paths", + "--no-link", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "nix-copy-closure", + "--from", + "user@localhost", + config_path, + ], + check=True, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "nix-env", + "-p", + Path("/nix/var/nix/profiles/system"), + "--set", + config_path, + ], + check=True, + **DEFAULT_RUN_KWARGS, + ), + call( + [config_path / "bin/switch-to-configuration", "switch"], + check=True, + **DEFAULT_RUN_KWARGS, + ), + ] + ) @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) -def test_execute_switch_rollback(mock_run: Mock, tmp_path: Path) -> None: +def test_execute_switch_rollback(mock_run: Any, tmp_path: Path) -> None: nixpkgs_path = tmp_path / "nixpkgs" nixpkgs_path.touch() @@ -874,49 +895,52 @@ def test_execute_switch_rollback(mock_run: Mock, tmp_path: Path) -> None: ] ) - assert mock_run.call_args_list == [ - call( - ["nix-instantiate", "--find-file", "nixpkgs"], - check=False, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "git", - "-C", - nixpkgs_path, - "rev-parse", - "--short", - "HEAD", - ], - check=False, - capture_output=True, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "nix-env", - "--rollback", - "-p", - Path("/nix/var/nix/profiles/system"), - ], - check=True, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - Path("/nix/var/nix/profiles/system/bin/switch-to-configuration"), - "switch", - ], - check=True, - **DEFAULT_RUN_KWARGS, - ), - ] + assert mock_run.call_count == 4 + mock_run.assert_has_calls( + [ + call( + ["nix-instantiate", "--find-file", "nixpkgs"], + check=False, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "git", + "-C", + nixpkgs_path, + "rev-parse", + "--short", + "HEAD", + ], + check=False, + capture_output=True, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "nix-env", + "--rollback", + "-p", + Path("/nix/var/nix/profiles/system"), + ], + check=True, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + Path("/nix/var/nix/profiles/system/bin/switch-to-configuration"), + "switch", + ], + check=True, + **DEFAULT_RUN_KWARGS, + ), + ] + ) @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) -def test_execute_build(mock_run: Mock, tmp_path: Path) -> None: +def test_execute_build(mock_run: Any, tmp_path: Path) -> None: config_path = tmp_path / "test" config_path.touch() mock_run.side_effect = [ @@ -926,23 +950,26 @@ def test_execute_build(mock_run: Mock, tmp_path: Path) -> None: nr.execute(["nixos-rebuild", "build", "--no-flake", "--no-reexec"]) - assert mock_run.call_args_list == [ - call( - [ - "nix-build", - "", - "--attr", - "config.system.build.toplevel", - ], - check=True, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ) - ] + assert mock_run.call_count == 1 + mock_run.assert_has_calls( + [ + call( + [ + "nix-build", + "", + "--attr", + "config.system.build.toplevel", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ) + ] + ) @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) -def test_execute_test_flake(mock_run: Mock, tmp_path: Path) -> None: +def test_execute_test_flake(mock_run: Any, tmp_path: Path) -> None: config_path = tmp_path / "test" config_path.touch() @@ -958,35 +985,38 @@ def test_execute_test_flake(mock_run: Mock, tmp_path: Path) -> None: ["nixos-rebuild", "test", "--flake", "github:user/repo#hostname", "--no-reexec"] ) - assert mock_run.call_args_list == [ - call( - [ - "nix", - "--extra-experimental-features", - "nix-command flakes", - "build", - "--print-out-paths", - "github:user/repo#nixosConfigurations.hostname.config.system.build.toplevel", - ], - check=True, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ), - call( - [config_path / "bin/switch-to-configuration", "test"], - check=True, - **DEFAULT_RUN_KWARGS, - ), - ] + assert mock_run.call_count == 2 + mock_run.assert_has_calls( + [ + call( + [ + "nix", + "--extra-experimental-features", + "nix-command flakes", + "build", + "--print-out-paths", + "github:user/repo#nixosConfigurations.hostname.config.system.build.toplevel", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + [config_path / "bin/switch-to-configuration", "test"], + check=True, + **DEFAULT_RUN_KWARGS, + ), + ] + ) @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) @patch(get_qualified_name(nr.nix.Path.exists, nr.nix), autospec=True, return_value=True) @patch(get_qualified_name(nr.nix.Path.mkdir, nr.nix), autospec=True) def test_execute_test_rollback( - mock_path_mkdir: Mock, - mock_path_exists: Mock, - mock_run: Mock, + mock_path_mkdir: Any, + mock_path_exists: Any, + mock_run: Any, ) -> None: def run_side_effect(args: list[str], **kwargs: Any) -> CompletedProcess[str]: if args[0] == "nix-env": @@ -1008,26 +1038,29 @@ def test_execute_test_rollback( ["nixos-rebuild", "test", "--rollback", "--profile-name", "foo", "--no-reexec"] ) - assert mock_run.call_args_list == [ - call( - [ - "nix-env", - "-p", - Path("/nix/var/nix/profiles/system-profiles/foo"), - "--list-generations", - ], - check=True, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - Path( - "/nix/var/nix/profiles/system-profiles/foo-2083-link/bin/switch-to-configuration" - ), - "test", - ], - check=True, - **DEFAULT_RUN_KWARGS, - ), - ] + assert mock_run.call_count == 2 + mock_run.assert_has_calls( + [ + call( + [ + "nix-env", + "-p", + Path("/nix/var/nix/profiles/system-profiles/foo"), + "--list-generations", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + Path( + "/nix/var/nix/profiles/system-profiles/foo-2083-link/bin/switch-to-configuration" + ), + "test", + ], + check=True, + **DEFAULT_RUN_KWARGS, + ), + ] + ) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py index cb318192fc2e..e02fc69848fb 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py @@ -1,7 +1,8 @@ import platform import subprocess from pathlib import Path -from unittest.mock import Mock, patch +from typing import Any +from unittest.mock import patch from pytest import MonkeyPatch @@ -78,9 +79,7 @@ def test_flake_to_attr() -> None: @patch(get_qualified_name(platform.node), autospec=True) -def test_flake_from_arg( - mock_node: Mock, monkeypatch: MonkeyPatch, tmpdir: Path -) -> None: +def test_flake_from_arg(mock_node: Any, monkeypatch: MonkeyPatch, tmpdir: Path) -> None: mock_node.return_value = "hostname" # Flake string @@ -162,12 +161,11 @@ def test_flake_from_arg( @patch(get_qualified_name(m.Path.mkdir, m), autospec=True) -def test_profile_from_arg(mock_mkdir: Mock) -> None: +def test_profile_from_arg(mock_mkdir: Any) -> None: assert m.Profile.from_arg("system") == m.Profile( "system", Path("/nix/var/nix/profiles/system"), ) - mock_mkdir.assert_not_called() assert m.Profile.from_arg("something") == m.Profile( "something", diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py index 861ba7ae0617..35fea00cbeef 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py @@ -3,7 +3,7 @@ import uuid from pathlib import Path from subprocess import PIPE, CompletedProcess from typing import Any -from unittest.mock import ANY, Mock, call, patch +from unittest.mock import ANY, call, patch import pytest from pytest import MonkeyPatch @@ -20,13 +20,13 @@ from .helpers import get_qualified_name autospec=True, return_value=CompletedProcess([], 0, stdout=" \n/path/to/file\n "), ) -def test_build(mock_run: Mock) -> None: +def test_build(mock_run: Any) -> None: assert n.build( "config.system.build.attr", m.BuildAttr("", None), {"nix_flag": "foo"}, ) == Path("/path/to/file") - assert mock_run.call_args == call( + mock_run.assert_called_with( [ "nix-build", "", @@ -38,17 +38,13 @@ def test_build(mock_run: Mock) -> None: stdout=PIPE, ) - mock_run.reset_mock() - assert n.build( "config.system.build.attr", m.BuildAttr(Path("file"), "preAttr") ) == Path("/path/to/file") - assert mock_run.call_args_list == [ - call( - ["nix-build", Path("file"), "--attr", "preAttr.config.system.build.attr"], - stdout=PIPE, - ) - ] + mock_run.assert_called_with( + ["nix-build", Path("file"), "--attr", "preAttr.config.system.build.attr"], + stdout=PIPE, + ) @patch( @@ -56,7 +52,7 @@ def test_build(mock_run: Mock) -> None: autospec=True, return_value=CompletedProcess([], 0, stdout=" \n/path/to/file\n "), ) -def test_build_flake(mock_run: Mock, monkeypatch: MonkeyPatch, tmpdir: Path) -> None: +def test_build_flake(mock_run: Any, monkeypatch: MonkeyPatch, tmpdir: Path) -> None: monkeypatch.chdir(tmpdir) flake = m.Flake.parse(".#hostname") @@ -65,7 +61,7 @@ def test_build_flake(mock_run: Mock, monkeypatch: MonkeyPatch, tmpdir: Path) -> flake, {"no_link": True, "nix_flag": "foo"}, ) == Path("/path/to/file") - assert mock_run.call_args == call( + mock_run.assert_called_with( [ "nix", "--extra-experimental-features", @@ -83,9 +79,7 @@ def test_build_flake(mock_run: Mock, monkeypatch: MonkeyPatch, tmpdir: Path) -> @patch(get_qualified_name(n.run_wrapper, n), autospec=True) @patch(get_qualified_name(n.uuid4, n), autospec=True) -def test_build_remote( - mock_uuid4: Mock, mock_run: Mock, monkeypatch: MonkeyPatch -) -> None: +def test_build_remote(mock_uuid4: Any, mock_run: Any, monkeypatch: MonkeyPatch) -> None: build_host = m.Remote("user@host", [], None) monkeypatch.setenv("NIX_SSHOPTS", "--ssh opts") @@ -114,53 +108,58 @@ def test_build_remote( instantiate_flags={"inst": True}, copy_flags={"copy": True}, ) == Path("/path/to/config") - assert mock_run.call_args_list == [ - call( - [ - "nix-instantiate", - "", - "--attr", - "preAttr.config.system.build.toplevel", - "--add-root", - n.tmpdir.TMPDIR_PATH / "00000000000000000000000000000001", - "--inst", - ], - stdout=PIPE, - ), - call( - [ - "nix-copy-closure", - "--copy", - "--to", - "user@host", - Path("/path/to/file"), - ], - extra_env={"NIX_SSHOPTS": " ".join([*p.SSH_DEFAULT_OPTS, "--ssh opts"])}, - ), - call( - ["mktemp", "-d", "-t", "nixos-rebuild.XXXXX"], - remote=build_host, - stdout=PIPE, - ), - call( - [ - "nix-store", - "--realise", - Path("/path/to/file"), - "--add-root", - Path("/tmp/tmpdir/00000000000000000000000000000002"), - "--realise", - ], - remote=build_host, - stdout=PIPE, - ), - call( - ["readlink", "-f", "/tmp/tmpdir/config"], - remote=build_host, - stdout=PIPE, - ), - call(["rm", "-rf", Path("/tmp/tmpdir")], remote=build_host, check=False), - ] + + mock_run.assert_has_calls( + [ + call( + [ + "nix-instantiate", + "", + "--attr", + "preAttr.config.system.build.toplevel", + "--add-root", + n.tmpdir.TMPDIR_PATH / "00000000000000000000000000000001", + "--inst", + ], + stdout=PIPE, + ), + call( + [ + "nix-copy-closure", + "--copy", + "--to", + "user@host", + Path("/path/to/file"), + ], + extra_env={ + "NIX_SSHOPTS": " ".join([*p.SSH_DEFAULT_OPTS, "--ssh opts"]) + }, + ), + call( + ["mktemp", "-d", "-t", "nixos-rebuild.XXXXX"], + remote=build_host, + stdout=PIPE, + ), + call( + [ + "nix-store", + "--realise", + Path("/path/to/file"), + "--add-root", + Path("/tmp/tmpdir/00000000000000000000000000000002"), + "--realise", + ], + remote=build_host, + stdout=PIPE, + ), + call( + ["readlink", "-f", "/tmp/tmpdir/config"], + remote=build_host, + stdout=PIPE, + ), + call(["rm", "-rf", Path("/tmp/tmpdir")], remote=build_host, check=False), + ] + ) @patch( @@ -169,7 +168,7 @@ def test_build_remote( return_value=CompletedProcess([], 0, stdout=" \n/path/to/file\n "), ) def test_build_remote_flake( - mock_run: Mock, monkeypatch: MonkeyPatch, tmpdir: Path + mock_run: Any, monkeypatch: MonkeyPatch, tmpdir: Path ) -> None: monkeypatch.chdir(tmpdir) flake = m.Flake.parse(".#hostname") @@ -184,43 +183,47 @@ def test_build_remote_flake( copy_flags={"copy": True}, flake_build_flags={"build": True}, ) == Path("/path/to/file") - assert mock_run.call_args_list == [ - call( - [ - "nix", - "--extra-experimental-features", - "nix-command flakes", - "eval", - "--raw", - ".#nixosConfigurations.hostname.config.system.build.toplevel.drvPath", - "--flake", - ], - stdout=PIPE, - ), - call( - [ - "nix-copy-closure", - "--copy", - "--to", - "user@host", - Path("/path/to/file"), - ], - extra_env={"NIX_SSHOPTS": " ".join([*p.SSH_DEFAULT_OPTS, "--ssh opts"])}, - ), - call( - [ - "nix", - "--extra-experimental-features", - "nix-command flakes", - "build", - "/path/to/file^*", - "--print-out-paths", - "--build", - ], - remote=build_host, - stdout=PIPE, - ), - ] + mock_run.assert_has_calls( + [ + call( + [ + "nix", + "--extra-experimental-features", + "nix-command flakes", + "eval", + "--raw", + ".#nixosConfigurations.hostname.config.system.build.toplevel.drvPath", + "--flake", + ], + stdout=PIPE, + ), + call( + [ + "nix-copy-closure", + "--copy", + "--to", + "user@host", + Path("/path/to/file"), + ], + extra_env={ + "NIX_SSHOPTS": " ".join([*p.SSH_DEFAULT_OPTS, "--ssh opts"]) + }, + ), + call( + [ + "nix", + "--extra-experimental-features", + "nix-command flakes", + "build", + "/path/to/file^*", + "--print-out-paths", + "--build", + ], + remote=build_host, + stdout=PIPE, + ), + ] + ) def test_copy_closure(monkeypatch: MonkeyPatch) -> None: @@ -233,7 +236,7 @@ def test_copy_closure(monkeypatch: MonkeyPatch) -> None: build_host = m.Remote("user@build.host", [], None) with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run: n.copy_closure(closure, target_host) - assert mock_run.call_args == call( + mock_run.assert_called_with( ["nix-copy-closure", "--to", "user@target.host", closure], extra_env={"NIX_SSHOPTS": " ".join(p.SSH_DEFAULT_OPTS)}, ) @@ -241,7 +244,7 @@ def test_copy_closure(monkeypatch: MonkeyPatch) -> None: monkeypatch.setenv("NIX_SSHOPTS", "--ssh build-opt") with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run: n.copy_closure(closure, None, build_host, {"copy_flag": True}) - assert mock_run.call_args == call( + mock_run.assert_called_with( ["nix-copy-closure", "--copy-flag", "--from", "user@build.host", closure], extra_env={ "NIX_SSHOPTS": " ".join([*p.SSH_DEFAULT_OPTS, "--ssh build-opt"]) @@ -255,7 +258,7 @@ def test_copy_closure(monkeypatch: MonkeyPatch) -> None: } with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run: n.copy_closure(closure, target_host, build_host, {"copy_flag": True}) - assert mock_run.call_args == call( + mock_run.assert_called_with( [ "nix", "copy", @@ -272,24 +275,26 @@ def test_copy_closure(monkeypatch: MonkeyPatch) -> None: monkeypatch.setattr(n, "WITH_NIX_2_18", False) with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run: n.copy_closure(closure, target_host, build_host) - assert mock_run.call_args_list == [ - call( - ["nix-copy-closure", "--from", "user@build.host", closure], - extra_env=extra_env, - ), - call( - ["nix-copy-closure", "--to", "user@target.host", closure], - extra_env=extra_env, - ), - ] + mock_run.assert_has_calls( + [ + call( + ["nix-copy-closure", "--from", "user@build.host", closure], + extra_env=extra_env, + ), + call( + ["nix-copy-closure", "--to", "user@target.host", closure], + extra_env=extra_env, + ), + ] + ) @patch(get_qualified_name(n.run_wrapper, n), autospec=True) -def test_edit(mock_run: Mock, monkeypatch: MonkeyPatch, tmpdir: Path) -> None: +def test_edit(mock_run: Any, monkeypatch: MonkeyPatch, tmpdir: Path) -> None: # Flake flake = m.Flake.parse(f"{tmpdir}#attr") n.edit(flake, {"commit_lock_file": True}) - assert mock_run.call_args == call( + mock_run.assert_called_with( [ "nix", "--extra-experimental-features", @@ -311,7 +316,7 @@ def test_edit(mock_run: Mock, monkeypatch: MonkeyPatch, tmpdir: Path) -> None: mp.setenv("EDITOR", "editor") n.edit(None) - assert mock_run.call_args == call(["editor", default_nix], check=False) + mock_run.assert_called_with(["editor", default_nix], check=False) @patch( @@ -328,13 +333,13 @@ def test_edit(mock_run: Mock, monkeypatch: MonkeyPatch, tmpdir: Path) -> None: """, ), ) -def test_get_build_image_variants(mock_run: Mock, tmp_path: Path) -> None: +def test_get_build_image_variants(mock_run: Any, tmp_path: Path) -> None: build_attr = m.BuildAttr("", None) assert n.get_build_image_variants(build_attr) == { "azure": "nixos-image-azure-25.05.20250102.6df2492-x86_64-linux.vhd", "vmware": "nixos-image-vmware-25.05.20250102.6df2492-x86_64-linux.vmdk", } - assert mock_run.call_args == call( + mock_run.assert_called_with( [ "nix-instantiate", "--eval", @@ -352,14 +357,12 @@ def test_get_build_image_variants(mock_run: Mock, tmp_path: Path) -> None: stdout=PIPE, ) - mock_run.reset_mock() - build_attr = m.BuildAttr(Path(tmp_path), "preAttr") assert n.get_build_image_variants(build_attr, {"inst_flag": True}) == { "azure": "nixos-image-azure-25.05.20250102.6df2492-x86_64-linux.vhd", "vmware": "nixos-image-vmware-25.05.20250102.6df2492-x86_64-linux.vmdk", } - assert mock_run.call_args == call( + mock_run.assert_called_with( [ "nix-instantiate", "--eval", @@ -393,13 +396,13 @@ def test_get_build_image_variants(mock_run: Mock, tmp_path: Path) -> None: """, ), ) -def test_get_build_image_variants_flake(mock_run: Mock) -> None: +def test_get_build_image_variants_flake(mock_run: Any) -> None: flake = m.Flake(Path("flake.nix"), "myAttr") assert n.get_build_image_variants_flake(flake, {"eval_flag": True}) == { "azure": "nixos-image-azure-25.05.20250102.6df2492-x86_64-linux.vhd", "vmware": "nixos-image-vmware-25.05.20250102.6df2492-x86_64-linux.vmdk", } - assert mock_run.call_args == call( + mock_run.assert_called_with( [ "nix", "eval", @@ -424,7 +427,7 @@ def test_get_nixpkgs_rev() -> None: side_effect=[CompletedProcess([], 0, "")], ) as mock_run: assert n.get_nixpkgs_rev(path) is None - assert mock_run.call_args == call( + mock_run.assert_called_with( ["git", "-C", path, "rev-parse", "--short", "HEAD"], check=False, capture_output=True, @@ -451,7 +454,7 @@ def test_get_nixpkgs_rev() -> None: ], ) as mock_run: assert n.get_nixpkgs_rev(path) == ".git.0f7c82403fd6" - assert mock_run.call_args_list == expected_calls + mock_run.assert_has_calls(expected_calls) with patch( get_qualified_name(n.run_wrapper, n), @@ -462,7 +465,7 @@ def test_get_nixpkgs_rev() -> None: ], ) as mock_run: assert n.get_nixpkgs_rev(path) == ".git.0f7c82403fd6M" - assert mock_run.call_args_list == expected_calls + mock_run.assert_has_calls(expected_calls) def test_get_generations(tmp_path: Path) -> None: @@ -503,7 +506,7 @@ def test_get_generations_from_nix_env(tmp_path: Path) -> None: m.Generation(id=2083, current=False, timestamp="2024-11-07 22:59:41"), m.Generation(id=2084, current=True, timestamp="2024-11-07 23:54:17"), ] - assert mock_run.call_args == call( + mock_run.assert_called_with( ["nix-env", "-p", path, "--list-generations"], stdout=PIPE, remote=None, @@ -521,7 +524,7 @@ def test_get_generations_from_nix_env(tmp_path: Path) -> None: m.Generation(id=2083, current=False, timestamp="2024-11-07 22:59:41"), m.Generation(id=2084, current=True, timestamp="2024-11-07 23:54:17"), ] - assert mock_run.call_args == call( + mock_run.assert_called_with( ["nix-env", "-p", path, "--list-generations"], stdout=PIPE, remote=remote, @@ -545,7 +548,7 @@ def test_get_generations_from_nix_env(tmp_path: Path) -> None: ), ], ) -def test_list_generations(mock_get_generations: Mock, tmp_path: Path) -> None: +def test_list_generations(mock_get_generations: Any, tmp_path: Path) -> None: # Probably better to test this function in a real system, this test is # mostly to make sure it doesn't break horribly assert n.list_generations(m.Profile("system", tmp_path)) == [ @@ -571,20 +574,18 @@ def test_list_generations(mock_get_generations: Mock, tmp_path: Path) -> None: @patch(get_qualified_name(n.run_wrapper, n), autospec=True) -def test_repl(mock_run: Mock) -> None: +def test_repl(mock_run: Any) -> None: n.repl("attr", m.BuildAttr("", None), {"nix_flag": True}) - assert mock_run.call_args == call( + mock_run.assert_called_with( ["nix", "repl", "--file", "", "--nix-flag"] ) n.repl("attr", m.BuildAttr(Path("file.nix"), "myAttr")) - assert mock_run.call_args == call( - ["nix", "repl", "--file", Path("file.nix"), "myAttr"] - ) + mock_run.assert_called_with(["nix", "repl", "--file", Path("file.nix"), "myAttr"]) @patch(get_qualified_name(n.run_wrapper, n), autospec=True) -def test_repl_flake(mock_run: Mock) -> None: +def test_repl_flake(mock_run: Any) -> None: n.repl_flake("attr", m.Flake(Path("flake.nix"), "myAttr"), {"nix_flag": True}) # See nixos-rebuild-ng.tests.repl for a better test, # this is mostly for sanity check @@ -592,14 +593,14 @@ def test_repl_flake(mock_run: Mock) -> None: @patch(get_qualified_name(n.run_wrapper, n), autospec=True) -def test_rollback(mock_run: Mock, tmp_path: Path) -> None: +def test_rollback(mock_run: Any, tmp_path: Path) -> None: path = tmp_path / "test" path.touch() profile = m.Profile("system", path) assert n.rollback(profile, None, False) == profile.path - assert mock_run.call_args == call( + mock_run.assert_called_with( ["nix-env", "--rollback", "-p", path], remote=None, sudo=False, @@ -607,7 +608,7 @@ def test_rollback(mock_run: Mock, tmp_path: Path) -> None: target_host = m.Remote("user@localhost", [], None) assert n.rollback(profile, target_host, True) == profile.path - assert mock_run.call_args == call( + mock_run.assert_called_with( ["nix-env", "--rollback", "-p", path], remote=target_host, sudo=True, @@ -619,10 +620,8 @@ def test_rollback_temporary_profile(tmp_path: Path) -> None: path.touch() profile = m.Profile("system", path) - with patch( - get_qualified_name(n.run_wrapper, n), - autospec=True, - return_value=CompletedProcess( + with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run: + mock_run.return_value = CompletedProcess( [], 0, stdout=textwrap.dedent("""\ @@ -630,13 +629,12 @@ def test_rollback_temporary_profile(tmp_path: Path) -> None: 2083 2024-11-07 22:59:41 2084 2024-11-07 23:54:17 (current) """), - ), - ) as mock_run: + ) assert ( n.rollback_temporary_profile(m.Profile("system", path), None, False) == path.parent / "system-2083-link" ) - assert mock_run.call_args == call( + mock_run.assert_called_with( [ "nix-env", "-p", @@ -653,7 +651,7 @@ def test_rollback_temporary_profile(tmp_path: Path) -> None: n.rollback_temporary_profile(m.Profile("foo", path), target_host, True) == path.parent / "foo-2083-link" ) - assert mock_run.call_args == call( + mock_run.assert_called_with( [ "nix-env", "-p", @@ -665,16 +663,13 @@ def test_rollback_temporary_profile(tmp_path: Path) -> None: sudo=True, ) - with patch( - get_qualified_name(n.run_wrapper, n), - autospec=True, - return_value=CompletedProcess([], 0, stdout=""), - ) as mock_run: + with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run: + mock_run.return_value = CompletedProcess([], 0, stdout="") assert n.rollback_temporary_profile(profile, None, False) is None @patch(get_qualified_name(n.run_wrapper, n), autospec=True) -def test_set_profile(mock_run: Mock) -> None: +def test_set_profile(mock_run: Any) -> None: profile_path = Path("/path/to/profile") config_path = Path("/path/to/config") n.set_profile( @@ -684,7 +679,7 @@ def test_set_profile(mock_run: Mock) -> None: sudo=False, ) - assert mock_run.call_args == call( + mock_run.assert_called_with( ["nix-env", "-p", profile_path, "--set", config_path], remote=None, sudo=False, @@ -692,7 +687,7 @@ def test_set_profile(mock_run: Mock) -> None: @patch(get_qualified_name(n.run_wrapper, n), autospec=True) -def test_switch_to_configuration(mock_run: Mock, monkeypatch: MonkeyPatch) -> None: +def test_switch_to_configuration(mock_run: Any, monkeypatch: MonkeyPatch) -> None: profile_path = Path("/path/to/profile") config_path = Path("/path/to/config") @@ -707,7 +702,7 @@ def test_switch_to_configuration(mock_run: Mock, monkeypatch: MonkeyPatch) -> No specialisation=None, install_bootloader=False, ) - assert mock_run.call_args == call( + mock_run.assert_called_with( [profile_path / "bin/switch-to-configuration", "switch"], extra_env={"NIXOS_INSTALL_BOOTLOADER": "0"}, sudo=False, @@ -741,7 +736,7 @@ def test_switch_to_configuration(mock_run: Mock, monkeypatch: MonkeyPatch) -> No install_bootloader=True, specialisation="special", ) - assert mock_run.call_args == call( + mock_run.assert_called_with( [ config_path / "specialisation/special/bin/switch-to-configuration", "test", @@ -762,17 +757,17 @@ def test_switch_to_configuration(mock_run: Mock, monkeypatch: MonkeyPatch) -> No ], ) @patch(get_qualified_name(n.Path.is_dir, n), autospec=True, return_value=True) -def test_upgrade_channels(mock_is_dir: Mock, mock_glob: Mock) -> None: +def test_upgrade_channels(mock_is_dir: Any, mock_glob: Any) -> None: with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run: n.upgrade_channels(False) - assert mock_run.call_args == call(["nix-channel", "--update", "nixos"], check=False) - - mock_run.reset_mock() + mock_run.assert_called_with(["nix-channel", "--update", "nixos"], check=False) with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run: n.upgrade_channels(True) - assert mock_run.call_args_list == [ - call(["nix-channel", "--update", "nixos"], check=False), - call(["nix-channel", "--update", "nixos-hardware"], check=False), - call(["nix-channel", "--update", "home-manager"], check=False), - ] + mock_run.assert_has_calls( + [ + call(["nix-channel", "--update", "nixos"], check=False), + call(["nix-channel", "--update", "nixos-hardware"], check=False), + call(["nix-channel", "--update", "home-manager"], check=False), + ] + ) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py index a62ee2355153..6458f54c06ef 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py @@ -1,4 +1,5 @@ -from unittest.mock import Mock, call, patch +from typing import Any +from unittest.mock import patch from pytest import MonkeyPatch @@ -9,9 +10,9 @@ from .helpers import get_qualified_name @patch(get_qualified_name(p.subprocess.run), autospec=True) -def test_run(mock_run: Mock) -> None: +def test_run(mock_run: Any) -> None: p.run_wrapper(["test", "--with", "flags"], check=True) - assert mock_run.call_args == call( + mock_run.assert_called_with( ["test", "--with", "flags"], check=True, text=True, @@ -27,7 +28,7 @@ def test_run(mock_run: Mock) -> None: sudo=True, extra_env={"FOO": "bar"}, ) - assert mock_run.call_args == call( + mock_run.assert_called_with( ["sudo", "test", "--with", "flags"], check=False, text=True, @@ -44,7 +45,7 @@ def test_run(mock_run: Mock) -> None: check=True, remote=m.Remote("user@localhost", ["--ssh", "opt"], "password"), ) - assert mock_run.call_args == call( + mock_run.assert_called_with( [ "ssh", "--ssh", @@ -70,7 +71,7 @@ def test_run(mock_run: Mock) -> None: extra_env={"FOO": "bar"}, remote=m.Remote("user@localhost", ["--ssh", "opt"], "password"), ) - assert mock_run.call_args == call( + mock_run.assert_called_with( [ "ssh", "--ssh", From 8efe14c0245a86777a48bf64d27dba3606015237 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 13 Feb 2025 21:27:19 +0000 Subject: [PATCH 1845/2168] nixos-rebuild-ng: add pytest-mock --- pkgs/by-name/ni/nixos-rebuild-ng/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/package.nix b/pkgs/by-name/ni/nixos-rebuild-ng/package.nix index df33313193fe..02e140fcc0a6 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/package.nix +++ b/pkgs/by-name/ni/nixos-rebuild-ng/package.nix @@ -89,6 +89,7 @@ python3Packages.buildPythonApplication rec { ps: with ps; [ mypy pytest + pytest-mock ruff ] ); From b0ba32b3e73fec51f00d4bb17fe690d235e8e36b Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 13 Feb 2025 21:30:17 +0000 Subject: [PATCH 1846/2168] nixos-rebuild-ng: add pytest-mock in devShell It is included to help debugging only, so its helpers shouldn't be used in tests. --- pkgs/by-name/ni/nixos-rebuild-ng/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/package.nix b/pkgs/by-name/ni/nixos-rebuild-ng/package.nix index 02e140fcc0a6..5f75a21e2402 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/package.nix +++ b/pkgs/by-name/ni/nixos-rebuild-ng/package.nix @@ -89,6 +89,8 @@ python3Packages.buildPythonApplication rec { ps: with ps; [ mypy pytest + # this is to help development (e.g.: better diffs) inside devShell + # only, do not use its helpers like `mocker` pytest-mock ruff ] From 83fc1380c37474fe987aadce26dd998bf71347a1 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 13 Feb 2025 21:30:52 +0000 Subject: [PATCH 1847/2168] nixos-rebuild-ng: use Mock as type in test mocks --- .../nixos-rebuild-ng/src/tests/test_main.py | 36 +++++++++---------- .../nixos-rebuild-ng/src/tests/test_models.py | 9 ++--- .../ni/nixos-rebuild-ng/src/tests/test_nix.py | 32 +++++++++-------- 3 files changed, 40 insertions(+), 37 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py index e6d40bc8bd19..249d7b059774 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py @@ -4,7 +4,7 @@ import uuid from pathlib import Path from subprocess import PIPE, CompletedProcess from typing import Any -from unittest.mock import ANY, call, patch +from unittest.mock import ANY, Mock, call, patch import pytest from pytest import MonkeyPatch @@ -218,7 +218,7 @@ def test_reexec_flake( @patch.dict(nr.process.os.environ, {}, clear=True) @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) -def test_execute_nix_boot(mock_run: Any, tmp_path: Path) -> None: +def test_execute_nix_boot(mock_run: Mock, tmp_path: Path) -> None: nixpkgs_path = tmp_path / "nixpkgs" nixpkgs_path.mkdir() config_path = tmp_path / "test" @@ -293,7 +293,7 @@ def test_execute_nix_boot(mock_run: Any, tmp_path: Path) -> None: @patch.dict(nr.process.os.environ, {}, clear=True) @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) -def test_execute_nix_build_vm(mock_run: Any, tmp_path: Path) -> None: +def test_execute_nix_build_vm(mock_run: Mock, tmp_path: Path) -> None: config_path = tmp_path / "test" config_path.touch() @@ -342,7 +342,7 @@ def test_execute_nix_build_vm(mock_run: Any, tmp_path: Path) -> None: @patch.dict(nr.process.os.environ, {}, clear=True) @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) -def test_execute_nix_build_image_flake(mock_run: Any, tmp_path: Path) -> None: +def test_execute_nix_build_image_flake(mock_run: Mock, tmp_path: Path) -> None: config_path = tmp_path / "test" config_path.touch() @@ -411,7 +411,7 @@ def test_execute_nix_build_image_flake(mock_run: Any, tmp_path: Path) -> None: @patch.dict(nr.process.os.environ, {}, clear=True) @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) -def test_execute_nix_switch_flake(mock_run: Any, tmp_path: Path) -> None: +def test_execute_nix_switch_flake(mock_run: Mock, tmp_path: Path) -> None: config_path = tmp_path / "test" config_path.touch() @@ -487,9 +487,9 @@ def test_execute_nix_switch_flake(mock_run: Any, tmp_path: Path) -> None: @patch(get_qualified_name(nr.cleanup_ssh, nr), autospec=True) @patch(get_qualified_name(nr.nix.uuid4, nr.nix), autospec=True) def test_execute_nix_switch_build_target_host( - mock_uuid4: Any, - mock_cleanup_ssh: Any, - mock_run: Any, + mock_uuid4: Mock, + mock_cleanup_ssh: Mock, + mock_run: Mock, tmp_path: Path, ) -> None: config_path = tmp_path / "test" @@ -682,8 +682,8 @@ def test_execute_nix_switch_build_target_host( @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) @patch(get_qualified_name(nr.cleanup_ssh, nr), autospec=True) def test_execute_nix_switch_flake_target_host( - mock_cleanup_ssh: Any, - mock_run: Any, + mock_cleanup_ssh: Mock, + mock_run: Mock, tmp_path: Path, ) -> None: config_path = tmp_path / "test" @@ -771,8 +771,8 @@ def test_execute_nix_switch_flake_target_host( @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) @patch(get_qualified_name(nr.cleanup_ssh, nr), autospec=True) def test_execute_nix_switch_flake_build_host( - mock_cleanup_ssh: Any, - mock_run: Any, + mock_cleanup_ssh: Mock, + mock_run: Mock, tmp_path: Path, ) -> None: config_path = tmp_path / "test" @@ -870,7 +870,7 @@ def test_execute_nix_switch_flake_build_host( @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) -def test_execute_switch_rollback(mock_run: Any, tmp_path: Path) -> None: +def test_execute_switch_rollback(mock_run: Mock, tmp_path: Path) -> None: nixpkgs_path = tmp_path / "nixpkgs" nixpkgs_path.touch() @@ -940,7 +940,7 @@ def test_execute_switch_rollback(mock_run: Any, tmp_path: Path) -> None: @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) -def test_execute_build(mock_run: Any, tmp_path: Path) -> None: +def test_execute_build(mock_run: Mock, tmp_path: Path) -> None: config_path = tmp_path / "test" config_path.touch() mock_run.side_effect = [ @@ -969,7 +969,7 @@ def test_execute_build(mock_run: Any, tmp_path: Path) -> None: @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) -def test_execute_test_flake(mock_run: Any, tmp_path: Path) -> None: +def test_execute_test_flake(mock_run: Mock, tmp_path: Path) -> None: config_path = tmp_path / "test" config_path.touch() @@ -1014,9 +1014,9 @@ def test_execute_test_flake(mock_run: Any, tmp_path: Path) -> None: @patch(get_qualified_name(nr.nix.Path.exists, nr.nix), autospec=True, return_value=True) @patch(get_qualified_name(nr.nix.Path.mkdir, nr.nix), autospec=True) def test_execute_test_rollback( - mock_path_mkdir: Any, - mock_path_exists: Any, - mock_run: Any, + mock_path_mkdir: Mock, + mock_path_exists: Mock, + mock_run: Mock, ) -> None: def run_side_effect(args: list[str], **kwargs: Any) -> CompletedProcess[str]: if args[0] == "nix-env": diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py index e02fc69848fb..3c6859015489 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py @@ -1,8 +1,7 @@ import platform import subprocess from pathlib import Path -from typing import Any -from unittest.mock import patch +from unittest.mock import Mock, patch from pytest import MonkeyPatch @@ -79,7 +78,9 @@ def test_flake_to_attr() -> None: @patch(get_qualified_name(platform.node), autospec=True) -def test_flake_from_arg(mock_node: Any, monkeypatch: MonkeyPatch, tmpdir: Path) -> None: +def test_flake_from_arg( + mock_node: Mock, monkeypatch: MonkeyPatch, tmpdir: Path +) -> None: mock_node.return_value = "hostname" # Flake string @@ -161,7 +162,7 @@ def test_flake_from_arg(mock_node: Any, monkeypatch: MonkeyPatch, tmpdir: Path) @patch(get_qualified_name(m.Path.mkdir, m), autospec=True) -def test_profile_from_arg(mock_mkdir: Any) -> None: +def test_profile_from_arg(mock_mkdir: Mock) -> None: assert m.Profile.from_arg("system") == m.Profile( "system", Path("/nix/var/nix/profiles/system"), diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py index 35fea00cbeef..ea937c06fcd3 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py @@ -3,7 +3,7 @@ import uuid from pathlib import Path from subprocess import PIPE, CompletedProcess from typing import Any -from unittest.mock import ANY, call, patch +from unittest.mock import ANY, Mock, call, patch import pytest from pytest import MonkeyPatch @@ -20,7 +20,7 @@ from .helpers import get_qualified_name autospec=True, return_value=CompletedProcess([], 0, stdout=" \n/path/to/file\n "), ) -def test_build(mock_run: Any) -> None: +def test_build(mock_run: Mock) -> None: assert n.build( "config.system.build.attr", m.BuildAttr("", None), @@ -52,7 +52,7 @@ def test_build(mock_run: Any) -> None: autospec=True, return_value=CompletedProcess([], 0, stdout=" \n/path/to/file\n "), ) -def test_build_flake(mock_run: Any, monkeypatch: MonkeyPatch, tmpdir: Path) -> None: +def test_build_flake(mock_run: Mock, monkeypatch: MonkeyPatch, tmpdir: Path) -> None: monkeypatch.chdir(tmpdir) flake = m.Flake.parse(".#hostname") @@ -79,7 +79,9 @@ def test_build_flake(mock_run: Any, monkeypatch: MonkeyPatch, tmpdir: Path) -> N @patch(get_qualified_name(n.run_wrapper, n), autospec=True) @patch(get_qualified_name(n.uuid4, n), autospec=True) -def test_build_remote(mock_uuid4: Any, mock_run: Any, monkeypatch: MonkeyPatch) -> None: +def test_build_remote( + mock_uuid4: Mock, mock_run: Mock, monkeypatch: MonkeyPatch +) -> None: build_host = m.Remote("user@host", [], None) monkeypatch.setenv("NIX_SSHOPTS", "--ssh opts") @@ -168,7 +170,7 @@ def test_build_remote(mock_uuid4: Any, mock_run: Any, monkeypatch: MonkeyPatch) return_value=CompletedProcess([], 0, stdout=" \n/path/to/file\n "), ) def test_build_remote_flake( - mock_run: Any, monkeypatch: MonkeyPatch, tmpdir: Path + mock_run: Mock, monkeypatch: MonkeyPatch, tmpdir: Path ) -> None: monkeypatch.chdir(tmpdir) flake = m.Flake.parse(".#hostname") @@ -290,7 +292,7 @@ def test_copy_closure(monkeypatch: MonkeyPatch) -> None: @patch(get_qualified_name(n.run_wrapper, n), autospec=True) -def test_edit(mock_run: Any, monkeypatch: MonkeyPatch, tmpdir: Path) -> None: +def test_edit(mock_run: Mock, monkeypatch: MonkeyPatch, tmpdir: Path) -> None: # Flake flake = m.Flake.parse(f"{tmpdir}#attr") n.edit(flake, {"commit_lock_file": True}) @@ -333,7 +335,7 @@ def test_edit(mock_run: Any, monkeypatch: MonkeyPatch, tmpdir: Path) -> None: """, ), ) -def test_get_build_image_variants(mock_run: Any, tmp_path: Path) -> None: +def test_get_build_image_variants(mock_run: Mock, tmp_path: Path) -> None: build_attr = m.BuildAttr("", None) assert n.get_build_image_variants(build_attr) == { "azure": "nixos-image-azure-25.05.20250102.6df2492-x86_64-linux.vhd", @@ -396,7 +398,7 @@ def test_get_build_image_variants(mock_run: Any, tmp_path: Path) -> None: """, ), ) -def test_get_build_image_variants_flake(mock_run: Any) -> None: +def test_get_build_image_variants_flake(mock_run: Mock) -> None: flake = m.Flake(Path("flake.nix"), "myAttr") assert n.get_build_image_variants_flake(flake, {"eval_flag": True}) == { "azure": "nixos-image-azure-25.05.20250102.6df2492-x86_64-linux.vhd", @@ -548,7 +550,7 @@ def test_get_generations_from_nix_env(tmp_path: Path) -> None: ), ], ) -def test_list_generations(mock_get_generations: Any, tmp_path: Path) -> None: +def test_list_generations(mock_get_generations: Mock, tmp_path: Path) -> None: # Probably better to test this function in a real system, this test is # mostly to make sure it doesn't break horribly assert n.list_generations(m.Profile("system", tmp_path)) == [ @@ -574,7 +576,7 @@ def test_list_generations(mock_get_generations: Any, tmp_path: Path) -> None: @patch(get_qualified_name(n.run_wrapper, n), autospec=True) -def test_repl(mock_run: Any) -> None: +def test_repl(mock_run: Mock) -> None: n.repl("attr", m.BuildAttr("", None), {"nix_flag": True}) mock_run.assert_called_with( ["nix", "repl", "--file", "", "--nix-flag"] @@ -585,7 +587,7 @@ def test_repl(mock_run: Any) -> None: @patch(get_qualified_name(n.run_wrapper, n), autospec=True) -def test_repl_flake(mock_run: Any) -> None: +def test_repl_flake(mock_run: Mock) -> None: n.repl_flake("attr", m.Flake(Path("flake.nix"), "myAttr"), {"nix_flag": True}) # See nixos-rebuild-ng.tests.repl for a better test, # this is mostly for sanity check @@ -593,7 +595,7 @@ def test_repl_flake(mock_run: Any) -> None: @patch(get_qualified_name(n.run_wrapper, n), autospec=True) -def test_rollback(mock_run: Any, tmp_path: Path) -> None: +def test_rollback(mock_run: Mock, tmp_path: Path) -> None: path = tmp_path / "test" path.touch() @@ -669,7 +671,7 @@ def test_rollback_temporary_profile(tmp_path: Path) -> None: @patch(get_qualified_name(n.run_wrapper, n), autospec=True) -def test_set_profile(mock_run: Any) -> None: +def test_set_profile(mock_run: Mock) -> None: profile_path = Path("/path/to/profile") config_path = Path("/path/to/config") n.set_profile( @@ -687,7 +689,7 @@ def test_set_profile(mock_run: Any) -> None: @patch(get_qualified_name(n.run_wrapper, n), autospec=True) -def test_switch_to_configuration(mock_run: Any, monkeypatch: MonkeyPatch) -> None: +def test_switch_to_configuration(mock_run: Mock, monkeypatch: MonkeyPatch) -> None: profile_path = Path("/path/to/profile") config_path = Path("/path/to/config") @@ -757,7 +759,7 @@ def test_switch_to_configuration(mock_run: Any, monkeypatch: MonkeyPatch) -> Non ], ) @patch(get_qualified_name(n.Path.is_dir, n), autospec=True, return_value=True) -def test_upgrade_channels(mock_is_dir: Any, mock_glob: Any) -> None: +def test_upgrade_channels(mock_is_dir: Mock, mock_glob: Mock) -> None: with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run: n.upgrade_channels(False) mock_run.assert_called_with(["nix-channel", "--update", "nixos"], check=False) From f2df828138846ba168ce0ba2e7eecc9fcc0d6cba Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 13 Feb 2025 21:39:04 +0000 Subject: [PATCH 1848/2168] nixos-rebuild-ng: improve some tests --- .../nixos-rebuild-ng/src/tests/test_main.py | 60 +++++++++---------- .../nixos-rebuild-ng/src/tests/test_models.py | 1 + .../ni/nixos-rebuild-ng/src/tests/test_nix.py | 2 +- 3 files changed, 30 insertions(+), 33 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py index 249d7b059774..2e9363e2869a 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py @@ -136,34 +136,34 @@ def test_reexec(mock_build: Mock, mock_execve: Mock, monkeypatch: MonkeyPatch) - mock_build.return_value = Path("/path") nr.reexec(argv, args, {"build": True}, {"flake": True}) - assert mock_build.call_args_list == [ - call( - "config.system.build.nixos-rebuild", - nr.models.BuildAttr(ANY, ANY), - {"build": True, "no_out_link": True}, - ) - ] + mock_build.assert_has_calls( + [ + call( + "config.system.build.nixos-rebuild", + nr.models.BuildAttr(ANY, ANY), + {"build": True, "no_out_link": True}, + ) + ] + ) # do not exec if there is no new version - assert mock_execve.call_args_list == [] + mock_execve.assert_not_called() mock_build.return_value = Path("/path/new") nr.reexec(argv, args, {}, {}) # exec in the new version successfully - assert mock_execve.call_args_list == [ - call( - Path("/path/new/bin/nixos-rebuild-ng"), - ["/path/bin/nixos-rebuild-ng", "switch", "--no-flake"], - {"_NIXOS_REBUILD_REEXEC": "1"}, - ) - ] + mock_execve.assert_called_once_with( + Path("/path/new/bin/nixos-rebuild-ng"), + ["/path/bin/nixos-rebuild-ng", "switch", "--no-flake"], + {"_NIXOS_REBUILD_REEXEC": "1"}, + ) mock_execve.reset_mock() mock_execve.side_effect = [OSError("BOOM"), None] nr.reexec(argv, args, {}, {}) # exec in the previous version if the new version fails - assert mock_execve.call_args == call( + mock_execve.assert_any_call( Path("/path/bin/nixos-rebuild-ng"), ["/path/bin/nixos-rebuild-ng", "switch", "--no-flake"], {"_NIXOS_REBUILD_REEXEC": "1"}, @@ -182,34 +182,30 @@ def test_reexec_flake( mock_build.return_value = Path("/path") nr.reexec(argv, args, {"build": True}, {"flake": True}) - assert mock_build.call_args_list == [ - call( - "config.system.build.nixos-rebuild", - nr.models.Flake(ANY, ANY), - {"flake": True, "no_link": True}, - ) - ] + mock_build.assert_called_once_with( + "config.system.build.nixos-rebuild", + nr.models.Flake(ANY, ANY), + {"flake": True, "no_link": True}, + ) # do not exec if there is no new version - assert mock_execve.call_args_list == [] + mock_execve.assert_not_called() mock_build.return_value = Path("/path/new") nr.reexec(argv, args, {}, {}) # exec in the new version successfully - assert mock_execve.call_args_list == [ - call( - Path("/path/new/bin/nixos-rebuild-ng"), - ["/path/bin/nixos-rebuild-ng", "switch", "--flake"], - {"_NIXOS_REBUILD_REEXEC": "1"}, - ) - ] + mock_execve.assert_called_once_with( + Path("/path/new/bin/nixos-rebuild-ng"), + ["/path/bin/nixos-rebuild-ng", "switch", "--flake"], + {"_NIXOS_REBUILD_REEXEC": "1"}, + ) mock_execve.reset_mock() mock_execve.side_effect = [OSError("BOOM"), None] nr.reexec(argv, args, {}, {}) # exec in the previous version if the new version fails - assert mock_execve.call_args == call( + mock_execve.assert_any_call( Path("/path/bin/nixos-rebuild-ng"), ["/path/bin/nixos-rebuild-ng", "switch", "--flake"], {"_NIXOS_REBUILD_REEXEC": "1"}, diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py index 3c6859015489..cb318192fc2e 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py @@ -167,6 +167,7 @@ def test_profile_from_arg(mock_mkdir: Mock) -> None: "system", Path("/nix/var/nix/profiles/system"), ) + mock_mkdir.assert_not_called() assert m.Profile.from_arg("something") == m.Profile( "something", diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py index ea937c06fcd3..af8c0bdfd6a7 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py @@ -762,7 +762,7 @@ def test_switch_to_configuration(mock_run: Mock, monkeypatch: MonkeyPatch) -> No def test_upgrade_channels(mock_is_dir: Mock, mock_glob: Mock) -> None: with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run: n.upgrade_channels(False) - mock_run.assert_called_with(["nix-channel", "--update", "nixos"], check=False) + mock_run.assert_called_once_with(["nix-channel", "--update", "nixos"], check=False) with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run: n.upgrade_channels(True) From 61fd9955a814bc78b147eeafcd8c2940a2e34caa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 21:51:52 +0000 Subject: [PATCH 1849/2168] python312Packages.pglast: 7.2 -> 7.3 --- pkgs/development/python-modules/pglast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix index ad8c7f1b2628..d5c2893652d4 100644 --- a/pkgs/development/python-modules/pglast/default.nix +++ b/pkgs/development/python-modules/pglast/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pglast"; - version = "7.2"; + version = "7.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wOlhmlivkyO79Rr4tUcmOPGro5FmZfC2VA5GOHgxcr4="; + hash = "sha256-jl0LSJGJlKYU1eX7y1ElDNbtkORo7grR3Bz5Ot5pabA="; }; build-system = [ setuptools ]; From 73bd2d7f2f99693308cdb8c59b8bdca2976fd109 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 13 Feb 2025 23:03:04 +0100 Subject: [PATCH 1850/2168] python312Packages.jaxtyping: 0.2.37 -> 0.2.38 Diff: https://github.com/google/jaxtyping/compare/refs/tags/v0.2.37...v0.2.38 Changelog: https://github.com/patrick-kidger/jaxtyping/releases/tag/v0.2.38 --- pkgs/development/python-modules/jaxtyping/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaxtyping/default.nix b/pkgs/development/python-modules/jaxtyping/default.nix index f29fa882b578..35e9c56adc2d 100644 --- a/pkgs/development/python-modules/jaxtyping/default.nix +++ b/pkgs/development/python-modules/jaxtyping/default.nix @@ -23,14 +23,14 @@ let self = buildPythonPackage rec { pname = "jaxtyping"; - version = "0.2.37"; + version = "0.2.38"; pyproject = true; src = fetchFromGitHub { owner = "google"; repo = "jaxtyping"; tag = "v${version}"; - hash = "sha256-0a/9TSQW/k5kuucHoSUhLtRk9k+5ycbI/g6V1id3v28="; + hash = "sha256-AK0c4HCM8ExDBdnQ0y6qSNTHTF5rD6kC+OjiJtW5Mkg="; }; build-system = [ hatchling ]; From 04b5324d00217f80fe4fc558f8360e4cb271f13a Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 13 Feb 2025 17:02:15 -0500 Subject: [PATCH 1851/2168] telegram-desktop: 5.10.7 -> 5.11.1 Diff: https://github.com/telegramdesktop/tdesktop/compare/v5.10.7...v5.11.1 Changelog: https://github.com/telegramdesktop/tdesktop/releases/tag/v5.11.1 --- .../telegram/telegram-desktop/unwrapped.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix index 310280934c59..d7458082b70f 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix @@ -46,14 +46,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "telegram-desktop-unwrapped"; - version = "5.10.7"; + version = "5.11.1"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-lcU2EJQgT7vQa2z0SB8LKhWjhn22Wc+eHi92junY2PY="; + hash = "sha256-lhZ/RSHRr+yaOAec5GOM2mrU0dNQbUxd4g7w+oAF+ZY="; }; postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' From 8053a7f3c9ee8b0259bd0e35c1a86f3983a9173d Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Thu, 13 Feb 2025 15:05:34 -0700 Subject: [PATCH 1852/2168] harper: 0.20.0 -> 0.21.1 https://github.com/Automattic/harper/releases/tag/v0.21.1 Signed-off-by: Sumner Evans --- pkgs/by-name/ha/harper/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix index ba03ff532ae3..4671e4a0d58a 100644 --- a/pkgs/by-name/ha/harper/package.nix +++ b/pkgs/by-name/ha/harper/package.nix @@ -2,22 +2,25 @@ lib, rustPlatform, fetchFromGitHub, + nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "harper"; - version = "0.20.0"; + version = "0.21.1"; src = fetchFromGitHub { owner = "Automattic"; repo = "harper"; rev = "v${version}"; - hash = "sha256-8JeF1HxsP+Y+C1g3YJ0B0+JHoRFkBjz4/T8rVr2KgGw="; + hash = "sha256-UTohTnIUMpyQGvkuOD2L7bViF3b5QnbDjRD4VSmf4lE="; }; buildAndTestSubdir = "harper-ls"; useFetchCargoVendor = true; - cargoHash = "sha256-uVjDFo5mJi4Xbq0Z+XOjy5VqXqkm0a+4xu+dVnjWXCU="; + cargoHash = "sha256-wHXo4yfFc77osCamK0NidbrIYyIFMEpfBr0B6aniBmQ="; + + passthru.updateScript = nix-update-script { }; meta = { description = "Grammar Checker for Developers"; From ee351cf30a297649b5ed8d15f9b78b730d23d874 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 22:06:02 +0000 Subject: [PATCH 1853/2168] python312Packages.marshmallow-sqlalchemy: 1.3.0 -> 1.4.1 --- .../python-modules/marshmallow-sqlalchemy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix index c91d0dcc95e0..80afef53575d 100644 --- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "marshmallow-sqlalchemy"; - version = "1.3.0"; + version = "1.4.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "marshmallow_sqlalchemy"; inherit version; - hash = "sha256-Xd9YPddf31qzHfdph82iupGUKZa6XVd+ktZ0j6k6X1I="; + hash = "sha256-tKqWQ1bQDheL24Rpoo2qkCKzdf9PXAT44rmq/h5lxSk="; }; build-system = [ flit-core ]; From d6f2566ca9670f67419f6bfaa8dc078073be32d0 Mon Sep 17 00:00:00 2001 From: Alexis Praga Date: Sun, 9 Feb 2025 19:10:07 +0100 Subject: [PATCH 1854/2168] safestringlib: init at 1.2.0-unstable-2024-10-21 To fix compilation issues in bwa-mem2, an update of this library is required. Latest, unstable version compiles more easily than the last stable release. --- pkgs/by-name/sa/safestringlib/package.nix | 78 +++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 pkgs/by-name/sa/safestringlib/package.nix diff --git a/pkgs/by-name/sa/safestringlib/package.nix b/pkgs/by-name/sa/safestringlib/package.nix new file mode 100644 index 000000000000..ac049eb4a97c --- /dev/null +++ b/pkgs/by-name/sa/safestringlib/package.nix @@ -0,0 +1,78 @@ +{ + lib, + stdenv, + cmake, + fetchFromGitHub, + fetchpatch, +}: + +stdenv.mkDerivation { + pname = "safestringlib"; + # Latest release is 1.2.0 and has compilation issues + version = "1.2.0-unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "intel"; + repo = "safestringlib"; + rev = "e99c03cfafdce5311c4dbf1fd3f916ccc6e300be"; + hash = "sha256-d+6YDtMtdaS2eW0eIfuwzdQRiExsoexL3fKj7C2zENM="; + }; + + outputs = [ + "out" + ]; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + (lib.cmakeBool "BUILD_UNITTESTS" true) + ]; + + patches = [ + # https://github.com/intel/safestringlib/issues/74 + (fetchpatch { + name = "darwin-fix"; + url = "https://github.com/intel/safestringlib/pull/75/commits/3ff9c6234be7dd4ee1dd5cdc2ccbb2c7541adfec.patch"; + hash = "sha256-4HS7XyKPQSmKczaMCi1s6NxgTNzRZXTds2CXBTbpuAM="; + }) + ]; + + # see https://github.com/bwa-mem2/bwa-mem2/issues/93 + # Skip wmemset too + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + sed -i 's/memset_s/memset8_s/g' include/safe_mem_lib.h + sed -i 's/memset_s/memset8_s/g' safeclib/memset16_s.c + sed -i 's/memset_s/memset8_s/g' safeclib/memset32_s.c + sed -i 's/memset_s/memset8_s/g' safeclib/memset_s.c + sed -i 's/memset_s/memset8_s/g' safeclib/wmemset_s.c + sed -i 's/ memset_s/ memset8_s/g' unittests/*.c + sed -i 's/ wmemset_s/ wmemset8_s/g' unittests/*.c + ''; + + checkPhase = '' + runHook preCheck + cd unittests + ./safestring_test + runHook postCheck + ''; + doCheck = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib + cp ../libsafestring_static.a $out/lib/libsafestring.a + mkdir -p $out/ + cp -r ../../include $out/ + + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/intel/safestringlib"; + description = "Safer replacements for C library functions that prevent serious security vulnerabilities"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ apraga ]; + }; +} From 5bfb437d33886bc82f74a6af40c83e1b65da3bdb Mon Sep 17 00:00:00 2001 From: Alexis Praga Date: Sun, 9 Feb 2025 19:43:31 +0100 Subject: [PATCH 1855/2168] bwa-mem2: add apraga as maintainer --- pkgs/by-name/bw/bwa-mem2/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/bw/bwa-mem2/package.nix b/pkgs/by-name/bw/bwa-mem2/package.nix index ad1bc23399cd..f0f6cb7c0b8f 100644 --- a/pkgs/by-name/bw/bwa-mem2/package.nix +++ b/pkgs/by-name/bw/bwa-mem2/package.nix @@ -67,6 +67,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/bwa-mem2/bwa-mem2/"; changelog = "https://github.com/bwa-mem2/bwa-mem2/blob/${finalAttrs.src.rev}/NEWS.md"; platforms = platforms.x86_64; - maintainers = with maintainers; [ alxsimon ]; + maintainers = with maintainers; [ apraga ]; }; }) From 58be5fb6310c6637b19a28479e9c49b6be7f20b2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 22:33:21 +0000 Subject: [PATCH 1856/2168] python312Packages.microsoft-kiota-abstractions: 1.9.1 -> 1.9.2 --- .../microsoft-kiota-abstractions/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix b/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix index 6e1f963599c4..1f1427974895 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.9.1"; + version = "1.9.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,8 +22,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "microsoft"; repo = "kiota-python"; - tag = "microsoft-kiota-abstractions-v${version}"; - hash = "sha256-ESRnI8prXG1h5H5RVD4eOQ1sQYSEMMLVHSk8yhzFGVw="; + tag = "microsoft-kiota-serialization-text-v${version}"; + hash = "sha256-ribVfvKmDMxGmeqj30SDcnbNGdRBfs1DmqQGXP3EHCk="; }; sourceRoot = "source/packages/abstractions/"; @@ -55,7 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Abstractions library for Kiota generated Python clients"; homepage = "https://github.com/microsoft/kiota-python/tree/main/packages/abstractions/"; - changelog = "https://github.com/microsoft/kiota-python/releases/tag/microsoft-kiota-abstractions-v${version}"; + changelog = "https://github.com/microsoft/kiota-python/releases/tag/microsoft-kiota-abstractions-${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From a2b9e98fabd861cc7dff797827824b4f804cb666 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 22:35:04 +0000 Subject: [PATCH 1857/2168] python312Packages.azure-eventhub: 5.13.0 -> 5.14.0 --- pkgs/development/python-modules/azure-eventhub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-eventhub/default.nix b/pkgs/development/python-modules/azure-eventhub/default.nix index 08e8f2ae7cc8..42c588a78a81 100644 --- a/pkgs/development/python-modules/azure-eventhub/default.nix +++ b/pkgs/development/python-modules/azure-eventhub/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "azure-eventhub"; - version = "5.13.0"; + version = "5.14.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "azure_eventhub"; inherit version; - hash = "sha256-rqM6CrT4ycIhLkVcRRi+mobAAVymMBms/Fd4qxkHjPA="; + hash = "sha256-UTCICIQQGpalfLfFs3xksECYd0KdVMDVcDeLTwt7bTU="; }; nativeBuildInputs = [ setuptools ]; From 386d93d06d1789d1bdfbd944afbe285213cb4ce8 Mon Sep 17 00:00:00 2001 From: Alexis Praga Date: Sat, 8 Feb 2025 11:35:15 +0100 Subject: [PATCH 1858/2168] perlPackages.BioExtAlign: bug fix and add test Bug: with perl > 5.36, the compiler is more restrictive with errors. This package has implicit function definitions. The fix is to ignore the errors as vep, the main package for that, runs without issue. Also this package is no longer maintained We also add test that were missing from the package. Not all test can be run as they depends on other Perl modules in Bioper. --- .../perl-modules/Bio-Ext-Align/default.nix | 25 ++++-- .../Bio-Ext-Align/disable-other-tests.patch | 84 +++++++++++++++++++ .../perl-modules/Bio-Ext-Align/fprintf.patch | 2 +- .../Bio-Ext-Align/no-implicit-function.patch | 13 +++ 4 files changed, 118 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/perl-modules/Bio-Ext-Align/disable-other-tests.patch create mode 100644 pkgs/development/perl-modules/Bio-Ext-Align/no-implicit-function.patch diff --git a/pkgs/development/perl-modules/Bio-Ext-Align/default.nix b/pkgs/development/perl-modules/Bio-Ext-Align/default.nix index dde83f2b0f23..2bbb36e2ad25 100644 --- a/pkgs/development/perl-modules/Bio-Ext-Align/default.nix +++ b/pkgs/development/perl-modules/Bio-Ext-Align/default.nix @@ -8,10 +8,7 @@ buildPerlPackage rec { pname = "BioExtAlign"; version = "1.5.1"; - outputs = [ - "out" - "dev" - ]; + outputs = [ "out" ]; src = fetchFromGitHub { owner = "bioperl"; @@ -20,7 +17,15 @@ buildPerlPackage rec { sha256 = "sha256-+0tZ6q3PFem8DWa2vq+njOLmjDvMB0JhD0FGk00lVMA="; }; - patches = [ ./fprintf.patch ]; + patches = [ + # Starting for Perl 5.6, implicit function declaration are treated as errors + # There may be an error but ensembl-vep (the main package for this dependency) + # runs + ./no-implicit-function.patch + # Tests need other parts of BioExt, disabling them + ./disable-other-tests.patch + ./fprintf.patch + ]; # Do not install other Bio-ext packages preConfigure = '' @@ -30,6 +35,15 @@ buildPerlPackage rec { # Disable tests as it requires Bio::Tools::Align which is in a different directory buildPhase = '' make + + ''; + + checkPhase = '' + runHook preCheck + + make test + + runHook postCheck ''; meta = { @@ -39,5 +53,6 @@ buildPerlPackage rec { Part of BioPerl Extensions (BioPerl-Ext) distribution, a collection of Bioperl C-compiled extensions. ''; license = with lib.licenses; [ artistic1 ]; + maintainers = with lib.maintainers; [ apraga ]; }; } diff --git a/pkgs/development/perl-modules/Bio-Ext-Align/disable-other-tests.patch b/pkgs/development/perl-modules/Bio-Ext-Align/disable-other-tests.patch new file mode 100644 index 000000000000..37a7d99ba45c --- /dev/null +++ b/pkgs/development/perl-modules/Bio-Ext-Align/disable-other-tests.patch @@ -0,0 +1,84 @@ +diff --git a/Bio/Ext/Align/test.pl b/Bio/Ext/Align/test.pl +index 72411f3..1deb77b 100755 +--- a/Bio/Ext/Align/test.pl ++++ b/Bio/Ext/Align/test.pl +@@ -8,13 +8,10 @@ my $DEBUG = $ENV{'BIOPERLDEBUG'} || 0; + BEGIN { + eval { require Test; }; + use Test; +- plan tests => 9; ++ plan tests => 4; + } + + use Bio::Ext::Align; +-use Bio::Tools::dpAlign; +-use Bio::Seq; +-use Bio::AlignIO; + + $loaded = 1; + ok(1); # modules loaded +@@ -34,64 +31,3 @@ $alb = &Bio::Ext::Align::Align_Sequences_ProteinSmithWaterman($seq1,$seq2, + $seq2->seq,15,50,STDERR) if $DEBUG; + + +-warn( "Testing Local Alignment case...\n") if $DEBUg; +- +-$alnout = new Bio::AlignIO(-format => 'pfam', -fh => \*STDERR); +-$aln = &Bio::Ext::Align::Align_DNA_Sequences("AATGCCATTGACGG", +- "CAGCCTCGCTTAG",3,-1,3,1, +- Bio::Tools::dpAlign::DPALIGN_LOCAL_MILLER_MYERS); +- +-$out = Bio::SimpleAlign->new(); +- +-$out->add_seq(Bio::LocatableSeq->new(-seq => $aln->aln1, +- -start => $aln->start1, +- -end => $aln->end1, +- -id => "one")); +- +-$out->add_seq(Bio::LocatableSeq->new(-seq => $aln->aln2, +- -start => $aln->start2, +- -end => $aln->end2, +- -id => "two")); +-$alnout->write_aln($out) if $DEBUG; +- +-$aln = &Bio::Ext::Align::Align_Protein_Sequences("WLGQRNLVSSTGGNLLNVWLKDW","WMGNRNVVNLLNVWFRDW",0, +- Bio::Tools::dpAlign::DPALIGN_LOCAL_MILLER_MYERS); +-$out = Bio::SimpleAlign->new(); +-ok($aln); +- +-$out->add_seq(Bio::LocatableSeq->new(-seq => $aln->aln1, +- -start => $aln->start1, +- -end => $aln->end1, +- -id => "one")); +- +-$out->add_seq(Bio::LocatableSeq->new(-seq => $aln->aln2, +- -start => $aln->start2, +- -end => $aln->end2, +- -id => "two")); +-$alnout->write_aln($out) if $DEBUG; +-ok(1); +- +-warn( "Testing Global Alignment case...\n") if $DEBUG; +- +-$factory = new Bio::Tools::dpAlign('-alg' => Bio::Tools::dpAlign::DPALIGN_GLOBAL_MILLER_MYERS); +-$s1 = new Bio::Seq(-id => "one", -seq => "AATGCCATTGACGG", -alphabet => 'dna'); +-$s2 = new Bio::Seq(-id => "two", -seq => "CAGCCTCGCTTAG", -alphabet => 'dna'); +-$aln = $factory->pairwise_alignment($s1, $s2); +-$alnout->write_aln($aln) if $DEBUG; +-$factory->align_and_show($s1, $s2) if $DEBUG; +- +-ok(1); +- +-$s1 = new Bio::Seq(-id => "one", -seq => "WLGQRNLVSSTGGNLLNVWLKDW", +- -alphabet => 'protein'); +-$s2 = new Bio::Seq(-id => "two", -seq => "WMGNRNVVNLLNVWFRDW", +- -alphabet => 'protein'); +-$aln = $factory->pairwise_alignment($s1, $s2); +-$alnout->write_aln($aln) if $DEBUG; +-$factory->align_and_show($s1, $s2) if $DEBUG; +-ok(1); +- +-$prof = $factory->sequence_profile($s1); +-warn( "Optimal Alignment Score = %d\n", $factory->pairwise_alignment_score($prof, $s2)) if $DEBUG; +- +-ok($factory->pairwise_alignment_score($prof,$s2),77); diff --git a/pkgs/development/perl-modules/Bio-Ext-Align/fprintf.patch b/pkgs/development/perl-modules/Bio-Ext-Align/fprintf.patch index f62004a9a338..fd4d01df6df6 100644 --- a/pkgs/development/perl-modules/Bio-Ext-Align/fprintf.patch +++ b/pkgs/development/perl-modules/Bio-Ext-Align/fprintf.patch @@ -7,7 +7,7 @@ index 0e07b67..0eab932 100644 dpAlign_fatal(char * s) { - fprintf(stderr, s); -+ fputs(stderr, s); ++ fputs(s, stderr); exit(-1); } diff --git a/pkgs/development/perl-modules/Bio-Ext-Align/no-implicit-function.patch b/pkgs/development/perl-modules/Bio-Ext-Align/no-implicit-function.patch new file mode 100644 index 000000000000..02a6baeb1316 --- /dev/null +++ b/pkgs/development/perl-modules/Bio-Ext-Align/no-implicit-function.patch @@ -0,0 +1,13 @@ +diff --git a/Bio/Ext/Align/Makefile.PL b/Bio/Ext/Align/Makefile.PL +index cc6c343..ea5cffa 100755 +--- a/Bio/Ext/Align/Makefile.PL ++++ b/Bio/Ext/Align/Makefile.PL +@@ -5,7 +5,7 @@ WriteMakefile( + 'NAME' => 'Bio::Ext::Align', + 'VERSION' => '1.5.1', + 'LIBS' => ['-lm'], # e.g., '-lm' +- 'DEFINE' => '-DPOSIX -DNOERROR', # e.g., '-DHAVE_SOMETHING' ++ 'DEFINE' => '-DPOSIX -DNOERROR -Wno-implicit-function-declaration', # e.g., '-DHAVE_SOMETHING' + 'INC' => '-I./libs', # e.g., '-I/usr/include/other' + 'MYEXTLIB' => 'libs/libsw$(LIB_EXT)', + 'clean' => { 'FILES' => 'libs/*.o libs/*.a' } From 234ad6c854005f1d86c87dec087723daab2c375e Mon Sep 17 00:00:00 2001 From: Daniel Coonce <1077480+coonce@users.noreply.github.com> Date: Sat, 8 Feb 2025 21:16:08 -0600 Subject: [PATCH 1859/2168] jellyseerr: fix noBrokenSymlinks --- pkgs/by-name/je/jellyseerr/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/je/jellyseerr/package.nix b/pkgs/by-name/je/jellyseerr/package.nix index 1783f4f7aa5c..ec60dee5694d 100644 --- a/pkgs/by-name/je/jellyseerr/package.nix +++ b/pkgs/by-name/je/jellyseerr/package.nix @@ -48,9 +48,15 @@ stdenv.mkDerivation (finalAttrs: { buildPhase = '' runHook preBuild + pnpm build pnpm prune --prod --ignore-scripts rm -rf .next/cache + + # Clean up broken symlinks left behind by `pnpm prune` + # https://github.com/pnpm/pnpm/issues/3645 + find node_modules -xtype l -delete + runHook postBuild ''; From ebe61cdf1f3be12630b2b6af4c84bc1943fcb7ec Mon Sep 17 00:00:00 2001 From: Alexis Praga Date: Mon, 10 Feb 2025 23:56:52 +0100 Subject: [PATCH 1860/2168] kent: fix for non-x86_64 cpus. --- pkgs/by-name/ke/kent/package.nix | 8 ++++---- pkgs/development/perl-modules/Bio-Ext-Align/default.nix | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ke/kent/package.nix b/pkgs/by-name/ke/kent/package.nix index d7e8abd22b84..2c9d41ff6d27 100644 --- a/pkgs/by-name/ke/kent/package.nix +++ b/pkgs/by-name/ke/kent/package.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { export HOME=$TMPDIR export DESTBINDIR=$HOME/bin - mkdir -p $HOME/lib $HOME/bin/x86_64 + mkdir -p $HOME/lib $HOME/bin/${stdenv.hostPlatform.parsed.cpu.name} cd ./src chmod +x ./checkUmask.sh @@ -63,8 +63,8 @@ stdenv.mkDerivation rec { cd jkOwnLib make - cp ../lib/x86_64/jkOwnLib.a $HOME/lib - cp ../lib/x86_64/jkweb.a $HOME/lib + cp ../lib/${stdenv.hostPlatform.parsed.cpu.name}/jkOwnLib.a $HOME/lib + cp ../lib/${stdenv.hostPlatform.parsed.cpu.name}/jkweb.a $HOME/lib cp -r ../inc $HOME/ cd ../utils @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin $out/lib $out/inc cp $HOME/lib/jkOwnLib.a $out/lib cp $HOME/lib/jkweb.a $out/lib - cp $HOME/bin/x86_64/* $out/bin + cp $HOME/bin/${stdenv.hostPlatform.parsed.cpu.name}/* $out/bin cp -r $HOME/inc/* $out/inc/ runHook postInstall diff --git a/pkgs/development/perl-modules/Bio-Ext-Align/default.nix b/pkgs/development/perl-modules/Bio-Ext-Align/default.nix index 2bbb36e2ad25..936148bc1ce8 100644 --- a/pkgs/development/perl-modules/Bio-Ext-Align/default.nix +++ b/pkgs/development/perl-modules/Bio-Ext-Align/default.nix @@ -35,7 +35,6 @@ buildPerlPackage rec { # Disable tests as it requires Bio::Tools::Align which is in a different directory buildPhase = '' make - ''; checkPhase = '' From c9b94e90efd85b96771eaacffba37b49d874ef87 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Feb 2025 23:42:04 +0100 Subject: [PATCH 1861/2168] python313Packages.python-roborock: 2.11.1 -> 2.11.2 Diff: https://github.com/humbertogontijo/python-roborock/compare/refs/tags/v2.11.1...v2.11.2 Changelog: https://github.com/humbertogontijo/python-roborock/blob/v2.11.2/CHANGELOG.md --- pkgs/development/python-modules/python-roborock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index 58645e42760b..02862735359d 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "2.11.1"; + version = "2.11.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; tag = "v${version}"; - hash = "sha256-uFZ+d4MehZbK7xZdmWnZrsbK2f5UsA4J/vVRLZXyI8E="; + hash = "sha256-lSVq2x4SG4MnXaJHU+6RxVnqH2H6XKcEZRNGRfsmglY="; }; postPatch = '' From 903c29e2a6abd6e3aab802012e1162a49e5aeb6d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Feb 2025 23:39:54 +0100 Subject: [PATCH 1862/2168] python313Packages.pytenable: 1.7.1 -> 1.7.3 Diff: https://github.com/tenable/pyTenable/compare/refs/tags/1.7.1...1.7.3 Changelog: https://github.com/tenable/pyTenable/releases/tag/1.7.3 --- pkgs/development/python-modules/pytenable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytenable/default.nix b/pkgs/development/python-modules/pytenable/default.nix index 8cc45c14286d..312783923cc6 100644 --- a/pkgs/development/python-modules/pytenable/default.nix +++ b/pkgs/development/python-modules/pytenable/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "pytenable"; - version = "1.7.1"; + version = "1.7.3"; pyproject = true; disabled = pythonOlder "3.10"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "tenable"; repo = "pyTenable"; tag = version; - hash = "sha256-IPhuxjUmj4g5UxuCZsthZytgDsFiplPt+dIsCHgfMdg="; + hash = "sha256-yOc5SUNXchmUPedudkD75XvSZNfDiXPRzLuMbseaQz8="; }; pythonRelaxDeps = [ From ca827ed60af88293382bd09bbc0e13f994311fe7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Feb 2025 23:58:11 +0100 Subject: [PATCH 1863/2168] checkov: migrate to pkgs/by-name --- .../analysis => by-name/ch}/checkov/flake8-compat-5.x.patch | 0 .../checkov/default.nix => by-name/ch/checkov/package.nix} | 6 ++---- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) rename pkgs/{development/tools/analysis => by-name/ch}/checkov/flake8-compat-5.x.patch (100%) rename pkgs/{development/tools/analysis/checkov/default.nix => by-name/ch/checkov/package.nix} (96%) diff --git a/pkgs/development/tools/analysis/checkov/flake8-compat-5.x.patch b/pkgs/by-name/ch/checkov/flake8-compat-5.x.patch similarity index 100% rename from pkgs/development/tools/analysis/checkov/flake8-compat-5.x.patch rename to pkgs/by-name/ch/checkov/flake8-compat-5.x.patch diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/by-name/ch/checkov/package.nix similarity index 96% rename from pkgs/development/tools/analysis/checkov/default.nix rename to pkgs/by-name/ch/checkov/package.nix index f25ce7248c60..07da280fe860 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/by-name/ch/checkov/package.nix @@ -6,18 +6,16 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.364"; + version = "3.2.370"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; tag = version; - hash = "sha256-ZmvIICAnC9RDizKl06aOD1LNEAo8WG7E1ZZB3Rero+c="; + hash = "sha256-IaE2Mg8Fk1Xb3ujPRHTY1N4ev75qM8Kj5o7IPtKuNsk="; }; - patches = [ ./flake8-compat-5.x.patch ]; - pythonRelaxDeps = [ "bc-detect-secrets" "bc-python-hcl2" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1fad5c7dcd1..fb3618d837a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -287,8 +287,6 @@ with pkgs; chef-cli = callPackage ../tools/misc/chef-cli { }; - checkov = callPackage ../development/tools/analysis/checkov { }; - clang-uml = callPackage ../by-name/cl/clang-uml/package.nix { stdenv = clangStdenv; }; From f891153cf966f661ee97eac66083a58a0efa9a58 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 13 Feb 2025 22:50:43 +0000 Subject: [PATCH 1864/2168] fzf: 0.59.0 -> 0.60.0 Changes: https://github.com/junegunn/fzf/releases/tag/v0.60.0 --- pkgs/by-name/fz/fzf/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fz/fzf/package.nix b/pkgs/by-name/fz/fzf/package.nix index 8e55d4a4866c..4f5e50af85c2 100644 --- a/pkgs/by-name/fz/fzf/package.nix +++ b/pkgs/by-name/fz/fzf/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "fzf"; - version = "0.59.0"; + version = "0.60.0"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf"; rev = "v${version}"; - hash = "sha256-2W4JZy7oZWLbbL9B4OheFXM7FvlWoSx7Mlnth/cOWeg="; + hash = "sha256-4SnM1i0d+MPfQNkuqvq9acOKLGX6O5/VAYpgkeMcaEY="; }; - vendorHash = "sha256-kPgfDV3HUe2j8bvsnL4cCl8Abuk+wvDmKbJ33XDQPOE="; + vendorHash = "sha256-i4ofEI4K6Pypf5KJi/OW6e/vhnCHUArMHnZKrvQ8eww="; env.CGO_ENABLED = 0; From a72a726ee18d6267c2be47bfdd56b490583172f5 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 13 Feb 2025 17:15:35 -0600 Subject: [PATCH 1865/2168] yabai: 7.1.8 -> 7.1.9 --- pkgs/by-name/ya/yabai/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ya/yabai/package.nix b/pkgs/by-name/ya/yabai/package.nix index 9fa0a5e86093..e842f1d0bc27 100644 --- a/pkgs/by-name/ya/yabai/package.nix +++ b/pkgs/by-name/ya/yabai/package.nix @@ -14,7 +14,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "yabai"; - version = "7.1.8"; + version = "7.1.9"; src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system} @@ -66,13 +66,13 @@ stdenv.mkDerivation (finalAttrs: { # See the comments on https://github.com/NixOS/nixpkgs/pull/188322 for more information. "aarch64-darwin" = fetchzip { url = "https://github.com/koekeishiya/yabai/releases/download/v${finalAttrs.version}/yabai-v${finalAttrs.version}.tar.gz"; - hash = "sha256-lD+n3QYI53AiCi32Ci06bNulwdyhRG7xQDVqJqlHOcs="; + hash = "sha256-x5V269Jilpv9XdSw5AtLpOBc4io8i1+duj62S4h9eXM="; }; "x86_64-darwin" = fetchFromGitHub { owner = "koekeishiya"; repo = "yabai"; rev = "v${finalAttrs.version}"; - hash = "sha256-nbPs8xPh1TW6HU1yl0gStSzsj6yxsBhHUI63y1GGGW0="; + hash = "sha256-STgd51fatxGahhYyCDo35mZbhYwX5n76cdu2NnzjdDM="; }; }; From 3834b653fe0301c39147a577f0f44574891e267c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 14 Feb 2025 00:22:06 +0100 Subject: [PATCH 1866/2168] checkov: 3.2.364 -> 3.2.370 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/3.2.364...3.2.370 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.370 --- pkgs/by-name/ch/checkov/package.nix | 25 ++++++++++++++++++++++--- pkgs/by-name/pi/pip-audit/package.nix | 2 +- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ch/checkov/package.nix b/pkgs/by-name/ch/checkov/package.nix index 07da280fe860..905fd2bfa585 100644 --- a/pkgs/by-name/ch/checkov/package.nix +++ b/pkgs/by-name/ch/checkov/package.nix @@ -4,6 +4,25 @@ python3, }: +let + py = python3.override { + packageOverrides = self: super: { + + # Requires 'cyclonedx-python-lib = ">=6.0.0,<8.0.0"' + cyclonedx-python-lib = super.cyclonedx-python-lib.overridePythonAttrs (oldAttrs: rec { + version = "7.6.2"; + src = fetchFromGitHub { + owner = "CycloneDX"; + repo = "cyclonedx-python-lib"; + tag = "v${version}"; + hash = "sha256-nklizCiu7Nmynjd5WU5oX/v2TWy9xFVF4GkmCwFKZLI="; + }; + }); + }; + }; +in +with py.pkgs; + python3.pkgs.buildPythonApplication rec { pname = "checkov"; version = "3.2.370"; @@ -43,9 +62,9 @@ python3.pkgs.buildPythonApplication rec { "pycep-parser" ]; - build-system = with python3.pkgs; [ setuptools-scm ]; + build-system = with py.pkgs; [ setuptools-scm ]; - dependencies = with python3.pkgs; [ + dependencies = with py.pkgs; [ aiodns aiohttp aiomultiprocess @@ -88,7 +107,7 @@ python3.pkgs.buildPythonApplication rec { update-checker ]; - nativeCheckInputs = with python3.pkgs; [ + nativeCheckInputs = with py.pkgs; [ aioresponses distutils mock diff --git a/pkgs/by-name/pi/pip-audit/package.nix b/pkgs/by-name/pi/pip-audit/package.nix index 0e55d55e9142..6522775d1e4e 100644 --- a/pkgs/by-name/pi/pip-audit/package.nix +++ b/pkgs/by-name/pi/pip-audit/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "pip-audit"; version = "2.7.3"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "trailofbits"; From 2038975272efcd2a505bddc4afedf895c7b9f6aa Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 13 Feb 2025 17:29:51 -0600 Subject: [PATCH 1867/2168] tabby-agent: 0.23.1 -> 0.24.0 --- pkgs/by-name/ta/tabby-agent/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ta/tabby-agent/package.nix b/pkgs/by-name/ta/tabby-agent/package.nix index 63d0eaec4660..bf546bfb7ff9 100644 --- a/pkgs/by-name/ta/tabby-agent/package.nix +++ b/pkgs/by-name/ta/tabby-agent/package.nix @@ -9,13 +9,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "tabby-agent"; - version = "0.23.1"; + version = "0.24.0"; src = fetchFromGitHub { owner = "TabbyML"; repo = "tabby"; tag = "v${finalAttrs.version}"; - hash = "sha256-KiADf4vjdMMbD5edSEE4LPphaDP64E0nqLLJ0lVnLDE="; + hash = "sha256-8SUeqIta1CFLVtX7GxOeczSDyi50TTGgyZK2kZJsA+0="; }; nativeBuildInputs = [ @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-RMa4fuR6L1BM+QmLsZ7i42jtGAQXkVQvv1hh0lr+Ky8="; + hash = "sha256-fQnMLjVhscLN0HFyP7ArjytTryZtr1D+gxrvMT0c40k="; }; passthru.updateScript = nix-update-script { From 87eeb667b55d2aa433ee612707b273f60d8e560f Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 13 Feb 2025 21:46:47 +0100 Subject: [PATCH 1868/2168] python312Packages.textual-dev: add missing dependency --- .../python-modules/textual-dev/default.nix | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/textual-dev/default.nix b/pkgs/development/python-modules/textual-dev/default.nix index d1a78f756c99..45952a87842c 100644 --- a/pkgs/development/python-modules/textual-dev/default.nix +++ b/pkgs/development/python-modules/textual-dev/default.nix @@ -1,14 +1,19 @@ { lib, - aiohttp, buildPythonPackage, - click, fetchFromGitHub, - msgpack, + + # build-system poetry-core, - pythonOlder, + + # dependencies + aiohttp, + click, + msgpack, textual, + textual-serve, typing-extensions, + versionCheckHook, }: buildPythonPackage rec { @@ -16,8 +21,6 @@ buildPythonPackage rec { version = "1.7.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "Textualize"; repo = "textual-dev"; @@ -32,6 +35,7 @@ buildPythonPackage rec { click msgpack textual + textual-serve typing-extensions ]; @@ -40,12 +44,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "textual_dev" ]; - meta = with lib; { + meta = { description = "Development tools for Textual"; homepage = "https://github.com/Textualize/textual-dev"; - changelog = "https://github.com/Textualize/textual-dev/releases/tag/${src.tag}"; - license = licenses.mit; - maintainers = with maintainers; [ yannip ]; + changelog = "https://github.com/Textualize/textual-dev/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ yannip ]; mainProgram = "textual"; }; } From 16a84fa3298ad380ac9ecaf19c75a93a635f68be Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Feb 2025 23:13:14 +0100 Subject: [PATCH 1869/2168] pip-audit: 2.7.3 -> 2.8.0 Diff: https://github.com/trailofbits/pip-audit/compare/refs/tags/v2.7.3...v2.8.0 Changelog: https://github.com/pypa/pip-audit/releases/tag/v2.8.0 --- pkgs/by-name/pi/pip-audit/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pi/pip-audit/package.nix b/pkgs/by-name/pi/pip-audit/package.nix index 6522775d1e4e..10a402a621a9 100644 --- a/pkgs/by-name/pi/pip-audit/package.nix +++ b/pkgs/by-name/pi/pip-audit/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "pip-audit"; - version = "2.7.3"; - pyproject = true; + version = "2.8.0"; + format = "pyproject"; src = fetchFromGitHub { owner = "trailofbits"; repo = "pip-audit"; tag = "v${version}"; - hash = "sha256-MRFfF5OygUCIdUnPvxhYk4IcLSWGgmlw2qgzPoZDniw="; + hash = "sha256-UW7pJYMcc8Myc4DmrZqAPUhAVs9J6o8/6QQb5vxskcg="; }; build-system = with python3.pkgs; [ flit-core ]; @@ -27,6 +27,7 @@ python3.pkgs.buildPythonApplication rec { packaging pip-api pip-requirements-parser + platformdirs rich toml ] @@ -62,7 +63,7 @@ python3.pkgs.buildPythonApplication rec { description = "Tool for scanning Python environments for known vulnerabilities"; homepage = "https://github.com/trailofbits/pip-audit"; changelog = "https://github.com/pypa/pip-audit/releases/tag/v${version}"; - license = with licenses; [ asl20 ]; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; mainProgram = "pip-audit"; }; From 7d6b6003a7aa3f4576963cd5189f14d0c6960390 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Feb 2025 23:23:38 +0100 Subject: [PATCH 1870/2168] python313Packages.cyclonedx-python-lib: 8.7.0 -> 8.8.0 Diff: https://github.com/CycloneDX/cyclonedx-python-lib/compare/refs/tags/v8.7.0...v8.8.0 Changelog: https://github.com/CycloneDX/cyclonedx-python-lib/releases/tag/v8.8.0 --- .../python-modules/cyclonedx-python-lib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index 858d21bada1a..a4664cb718aa 100644 --- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "cyclonedx-python-lib"; - version = "8.7.0"; + version = "8.8.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "CycloneDX"; repo = "cyclonedx-python-lib"; tag = "v${version}"; - hash = "sha256-gnY8JgdxdjXzO9PE9mt57+DQCmxR00pHEL/q9sHN3+Q="; + hash = "sha256-igT1QroP260cqSAiaJv4Zrji691WIjyDLZ1p5dtPF5Y="; }; pythonRelaxDeps = [ "py-serializable" ]; From ed5b492c7e1b0ee2a7ee1c83be6a4349936022e8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Feb 2025 23:35:31 +0100 Subject: [PATCH 1871/2168] cyclonedx-python: 4.6.0 -> 5.1.2 Diff: https://github.com/CycloneDX/cyclonedx-python/compare/refs/tags/v4.6.0...v5.1.2 Changelog: https://github.com/CycloneDX/cyclonedx-python/releases/tag/v5.1.2 --- pkgs/by-name/cy/cyclonedx-python/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cy/cyclonedx-python/package.nix b/pkgs/by-name/cy/cyclonedx-python/package.nix index a6bbf4778cd7..96798e7eaddb 100644 --- a/pkgs/by-name/cy/cyclonedx-python/package.nix +++ b/pkgs/by-name/cy/cyclonedx-python/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "cyclonedx-python"; - version = "4.6.0"; + version = "5.1.2"; pyproject = true; src = fetchFromGitHub { owner = "CycloneDX"; repo = "cyclonedx-python"; tag = "v${version}"; - hash = "sha256-EcCxw3SppuGUgN7AIU9NhpRw7dLDhTHHT5emGOgkDFU="; + hash = "sha256-jh/7sMVBQWptC6Zi+yEwraR7leoyqYg4is83qao7gaY="; }; build-system = with python3Packages; [ poetry-core ]; From 87ef4318cd40588226dadbb0dbac3c9bc08342e6 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 00:46:02 +0100 Subject: [PATCH 1872/2168] python312Packages.islpy: 2024.2 -> 2025.1 Diff: https://github.com/inducer/islpy/compare/refs/tags/v2024.2...v2025.1 --- pkgs/development/python-modules/islpy/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/islpy/default.nix b/pkgs/development/python-modules/islpy/default.nix index 08554808eb75..f69c15e52a2b 100644 --- a/pkgs/development/python-modules/islpy/default.nix +++ b/pkgs/development/python-modules/islpy/default.nix @@ -20,21 +20,16 @@ buildPythonPackage rec { pname = "islpy"; - version = "2024.2"; + version = "2025.1"; pyproject = true; src = fetchFromGitHub { owner = "inducer"; repo = "islpy"; tag = "v${version}"; - hash = "sha256-ixw9U4WqcXBW6KGBOsUImjsxmvG5XKCv4jCbTjJ4pjg="; + hash = "sha256-njwNijl7kAbU7v6Bd6p0J9KnYzXZi9gVdqSf8qD0FXE="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "setuptools>=42,<64;python_version<'3.12'" "setuptools>=42" - ''; - build-system = [ cmake nanobind @@ -56,7 +51,7 @@ buildPythonPackage rec { # Force resolving the package from $out to make generated ext files usable by tests preCheck = '' - mv islpy islpy.hidden + rm -rf islpy ''; nativeCheckInputs = [ pytestCheckHook ]; @@ -66,6 +61,7 @@ buildPythonPackage rec { meta = { description = "Python wrapper around isl, an integer set library"; homepage = "https://github.com/inducer/islpy"; + changelog = "https://github.com/inducer/islpy/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ tomasajt ]; }; From 0256f1180cc4100c2cdbb85456f80d4080004436 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Fri, 14 Feb 2025 01:06:22 +0100 Subject: [PATCH 1873/2168] nixos/services.mysql: format with nixfmt-rfc-style --- nixos/modules/services/databases/mysql.nix | 323 ++++++++++++--------- 1 file changed, 185 insertions(+), 138 deletions(-) diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index 412fe4836cd3..efca1e933329 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let cfg = config.services.mysql; @@ -8,8 +13,7 @@ let # Oracle MySQL has supported "notify" service type since 8.0 hasNotify = isMariaDB || (isOracle && lib.versionAtLeast cfg.package.version "8.0"); - mysqldOptions = - "--user=${cfg.user} --datadir=${cfg.dataDir} --basedir=${cfg.package}"; + mysqldOptions = "--user=${cfg.user} --datadir=${cfg.dataDir} --basedir=${cfg.package}"; format = pkgs.formats.ini { listsAsDuplicateKeys = true; }; configFile = format.generate "my.cnf" cfg.settings; @@ -18,11 +22,31 @@ in { imports = [ - (lib.mkRemovedOptionModule [ "services" "mysql" "pidDir" ] "Don't wait for pidfiles, describe dependencies through systemd.") - (lib.mkRemovedOptionModule [ "services" "mysql" "rootPassword" ] "Use socket authentication or set the password outside of the nix store.") - (lib.mkRemovedOptionModule [ "services" "mysql" "extraOptions" ] "Use services.mysql.settings.mysqld instead.") - (lib.mkRemovedOptionModule [ "services" "mysql" "bind" ] "Use services.mysql.settings.mysqld.bind-address instead.") - (lib.mkRemovedOptionModule [ "services" "mysql" "port" ] "Use services.mysql.settings.mysqld.port instead.") + (lib.mkRemovedOptionModule [ + "services" + "mysql" + "pidDir" + ] "Don't wait for pidfiles, describe dependencies through systemd.") + (lib.mkRemovedOptionModule [ + "services" + "mysql" + "rootPassword" + ] "Use socket authentication or set the password outside of the nix store.") + (lib.mkRemovedOptionModule [ + "services" + "mysql" + "extraOptions" + ] "Use services.mysql.settings.mysqld instead.") + (lib.mkRemovedOptionModule [ + "services" + "mysql" + "bind" + ] "Use services.mysql.settings.mysqld.bind-address instead.") + (lib.mkRemovedOptionModule [ + "services" + "mysql" + "port" + ] "Use services.mysql.settings.mysqld.port instead.") ]; ###### interface @@ -106,7 +130,7 @@ in settings = lib.mkOption { type = format.type; - default = {}; + default = { }; description = '' MySQL configuration. Refer to , @@ -137,25 +161,27 @@ in }; initialDatabases = lib.mkOption { - type = lib.types.listOf (lib.types.submodule { - options = { - name = lib.mkOption { - type = lib.types.str; - description = '' - The name of the database to create. - ''; + type = lib.types.listOf ( + lib.types.submodule { + options = { + name = lib.mkOption { + type = lib.types.str; + description = '' + The name of the database to create. + ''; + }; + schema = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + description = '' + The initial schema of the database; if null (the default), + an empty database is created. + ''; + }; }; - schema = lib.mkOption { - type = lib.types.nullOr lib.types.path; - default = null; - description = '' - The initial schema of the database; if null (the default), - an empty database is created. - ''; - }; - }; - }); - default = []; + } + ); + default = [ ]; description = '' List of database names and their initial schemas that should be used to create databases on the first startup of MySQL. The schema attribute is optional: If not specified, an empty database is created. @@ -176,7 +202,7 @@ in ensureDatabases = lib.mkOption { type = lib.types.listOf lib.types.str; - default = []; + default = [ ]; description = '' Ensures that the specified databases exist. This option will never delete existing databases, especially not when the value of this @@ -190,39 +216,41 @@ in }; ensureUsers = lib.mkOption { - type = lib.types.listOf (lib.types.submodule { - options = { - name = lib.mkOption { - type = lib.types.str; - description = '' - Name of the user to ensure. - ''; - }; - ensurePermissions = lib.mkOption { - type = lib.types.attrsOf lib.types.str; - default = {}; - description = '' - Permissions to ensure for the user, specified as attribute set. - The attribute names specify the database and tables to grant the permissions for, - separated by a dot. You may use wildcards here. - The attribute values specfiy the permissions to grant. - You may specify one or multiple comma-separated SQL privileges here. + type = lib.types.listOf ( + lib.types.submodule { + options = { + name = lib.mkOption { + type = lib.types.str; + description = '' + Name of the user to ensure. + ''; + }; + ensurePermissions = lib.mkOption { + type = lib.types.attrsOf lib.types.str; + default = { }; + description = '' + Permissions to ensure for the user, specified as attribute set. + The attribute names specify the database and tables to grant the permissions for, + separated by a dot. You may use wildcards here. + The attribute values specfiy the permissions to grant. + You may specify one or multiple comma-separated SQL privileges here. - For more information on how to specify the target - and on which privileges exist, see the - [GRANT syntax](https://mariadb.com/kb/en/library/grant/). - The attributes are used as `GRANT ''${attrName} ON ''${attrValue}`. - ''; - example = lib.literalExpression '' - { - "database.*" = "ALL PRIVILEGES"; - "*.*" = "SELECT, LOCK TABLES"; - } - ''; + For more information on how to specify the target + and on which privileges exist, see the + [GRANT syntax](https://mariadb.com/kb/en/library/grant/). + The attributes are used as `GRANT ''${attrName} ON ''${attrValue}`. + ''; + example = lib.literalExpression '' + { + "database.*" = "ALL PRIVILEGES"; + "*.*" = "SELECT, LOCK TABLES"; + } + ''; + }; }; - }; - }); - default = []; + } + ); + default = [ ]; description = '' Ensures that the specified users exist and have at least the ensured permissions. The MySQL users will be identified using Unix socket authentication. This authenticates the Unix user with the @@ -251,7 +279,11 @@ in replication = { role = lib.mkOption { - type = lib.types.enum [ "master" "slave" "none" ]; + type = lib.types.enum [ + "master" + "slave" + "none" + ]; default = "none"; description = "Role of the MySQL server instance."; }; @@ -292,14 +324,13 @@ in }; - ###### implementation config = lib.mkIf cfg.enable { - services.mysql.dataDir = - lib.mkDefault (if lib.versionAtLeast config.system.stateVersion "17.09" then "/var/lib/mysql" - else "/var/mysql"); + services.mysql.dataDir = lib.mkDefault ( + if lib.versionAtLeast config.system.stateVersion "17.09" then "/var/lib/mysql" else "/var/mysql" + ); services.mysql.settings.mysqld = lib.mkMerge [ { @@ -311,7 +342,11 @@ in log-bin-index = "mysql-bin-${toString cfg.replication.serverId}.index"; relay-log = "mysql-relay-bin"; server-id = cfg.replication.serverId; - binlog-ignore-db = [ "information_schema" "performance_schema" "mysql" ]; + binlog-ignore-db = [ + "information_schema" + "performance_schema" + "mysql" + ]; }) (lib.mkIf (!isMariaDB) { plugin-load-add = [ "auth_socket.so" ]; @@ -355,17 +390,21 @@ in pkgs.nettools ]; - preStart = if isMariaDB then '' - if ! test -e ${cfg.dataDir}/mysql; then - ${cfg.package}/bin/mysql_install_db --defaults-file=/etc/my.cnf ${mysqldOptions} - touch ${cfg.dataDir}/mysql_init - fi - '' else '' - if ! test -e ${cfg.dataDir}/mysql; then - ${cfg.package}/bin/mysqld --defaults-file=/etc/my.cnf ${mysqldOptions} --initialize-insecure - touch ${cfg.dataDir}/mysql_init - fi - ''; + preStart = + if isMariaDB then + '' + if ! test -e ${cfg.dataDir}/mysql; then + ${cfg.package}/bin/mysql_install_db --defaults-file=/etc/my.cnf ${mysqldOptions} + touch ${cfg.dataDir}/mysql_init + fi + '' + else + '' + if ! test -e ${cfg.dataDir}/mysql; then + ${cfg.package}/bin/mysqld --defaults-file=/etc/my.cnf ${mysqldOptions} --initialize-insecure + touch ${cfg.dataDir}/mysql_init + fi + ''; script = '' # https://mariadb.com/kb/en/getting-started-with-mariadb-galera-cluster/#systemd-and-galera-recovery @@ -379,52 +418,55 @@ in exec ${cfg.package}/bin/mysqld --defaults-file=/etc/my.cnf ${mysqldOptions} $_WSREP_NEW_CLUSTER $_WSREP_START_POSITION ''; - postStart = let - # The super user account to use on *first* run of MySQL server - superUser = if isMariaDB then cfg.user else "root"; - in '' - ${lib.optionalString (!hasNotify) '' - # Wait until the MySQL server is available for use - while [ ! -e /run/mysqld/mysqld.sock ] - do - echo "MySQL daemon not yet started. Waiting for 1 second..." - sleep 1 - done - ''} + postStart = + let + # The super user account to use on *first* run of MySQL server + superUser = if isMariaDB then cfg.user else "root"; + in + '' + ${lib.optionalString (!hasNotify) '' + # Wait until the MySQL server is available for use + while [ ! -e /run/mysqld/mysqld.sock ] + do + echo "MySQL daemon not yet started. Waiting for 1 second..." + sleep 1 + done + ''} - if [ -f ${cfg.dataDir}/mysql_init ] - then - # While MariaDB comes with a 'mysql' super user account since 10.4.x, MySQL does not - # Since we don't want to run this service as 'root' we need to ensure the account exists on first run - ( echo "CREATE USER IF NOT EXISTS '${cfg.user}'@'localhost' IDENTIFIED WITH ${if isMariaDB then "unix_socket" else "auth_socket"};" - echo "GRANT ALL PRIVILEGES ON *.* TO '${cfg.user}'@'localhost' WITH GRANT OPTION;" - ) | ${cfg.package}/bin/mysql -u ${superUser} -N + if [ -f ${cfg.dataDir}/mysql_init ] + then + # While MariaDB comes with a 'mysql' super user account since 10.4.x, MySQL does not + # Since we don't want to run this service as 'root' we need to ensure the account exists on first run + ( echo "CREATE USER IF NOT EXISTS '${cfg.user}'@'localhost' IDENTIFIED WITH ${ + if isMariaDB then "unix_socket" else "auth_socket" + };" + echo "GRANT ALL PRIVILEGES ON *.* TO '${cfg.user}'@'localhost' WITH GRANT OPTION;" + ) | ${cfg.package}/bin/mysql -u ${superUser} -N - ${lib.concatMapStrings (database: '' - # Create initial databases - if ! test -e "${cfg.dataDir}/${database.name}"; then - echo "Creating initial database: ${database.name}" - ( echo 'create database `${database.name}`;' + ${lib.concatMapStrings (database: '' + # Create initial databases + if ! test -e "${cfg.dataDir}/${database.name}"; then + echo "Creating initial database: ${database.name}" + ( echo 'create database `${database.name}`;' - ${lib.optionalString (database.schema != null) '' - echo 'use `${database.name}`;' + ${lib.optionalString (database.schema != null) '' + echo 'use `${database.name}`;' - # TODO: this silently falls through if database.schema does not exist, - # we should catch this somehow and exit, but can't do it here because we're in a subshell. - if [ -f "${database.schema}" ] - then - cat ${database.schema} - elif [ -d "${database.schema}" ] - then - cat ${database.schema}/mysql-databases/*.sql - fi - ''} - ) | ${cfg.package}/bin/mysql -u ${superUser} -N - fi - '') cfg.initialDatabases} + # TODO: this silently falls through if database.schema does not exist, + # we should catch this somehow and exit, but can't do it here because we're in a subshell. + if [ -f "${database.schema}" ] + then + cat ${database.schema} + elif [ -d "${database.schema}" ] + then + cat ${database.schema}/mysql-databases/*.sql + fi + ''} + ) | ${cfg.package}/bin/mysql -u ${superUser} -N + fi + '') cfg.initialDatabases} - ${lib.optionalString (cfg.replication.role == "master") - '' + ${lib.optionalString (cfg.replication.role == "master") '' # Set up the replication master ( echo "use mysql;" @@ -434,8 +476,7 @@ in ) | ${cfg.package}/bin/mysql -u ${superUser} -N ''} - ${lib.optionalString (cfg.replication.role == "slave") - '' + ${lib.optionalString (cfg.replication.role == "slave") '' # Set up the replication slave ( echo "stop slave;" @@ -444,34 +485,36 @@ in ) | ${cfg.package}/bin/mysql -u ${superUser} -N ''} - ${lib.optionalString (cfg.initialScript != null) - '' + ${lib.optionalString (cfg.initialScript != null) '' # Execute initial script # using toString to avoid copying the file to nix store if given as path instead of string, # as it might contain credentials cat ${toString cfg.initialScript} | ${cfg.package}/bin/mysql -u ${superUser} -N ''} - rm ${cfg.dataDir}/mysql_init - fi + rm ${cfg.dataDir}/mysql_init + fi - ${lib.optionalString (cfg.ensureDatabases != []) '' - ( - ${lib.concatMapStrings (database: '' - echo "CREATE DATABASE IF NOT EXISTS \`${database}\`;" - '') cfg.ensureDatabases} - ) | ${cfg.package}/bin/mysql -N - ''} + ${lib.optionalString (cfg.ensureDatabases != [ ]) '' + ( + ${lib.concatMapStrings (database: '' + echo "CREATE DATABASE IF NOT EXISTS \`${database}\`;" + '') cfg.ensureDatabases} + ) | ${cfg.package}/bin/mysql -N + ''} - ${lib.concatMapStrings (user: - '' - ( echo "CREATE USER IF NOT EXISTS '${user.name}'@'localhost' IDENTIFIED WITH ${if isMariaDB then "unix_socket" else "auth_socket"};" - ${lib.concatStringsSep "\n" (lib.mapAttrsToList (database: permission: '' - echo "GRANT ${permission} ON ${database} TO '${user.name}'@'localhost';" - '') user.ensurePermissions)} + ${lib.concatMapStrings (user: '' + ( echo "CREATE USER IF NOT EXISTS '${user.name}'@'localhost' IDENTIFIED WITH ${ + if isMariaDB then "unix_socket" else "auth_socket" + };" + ${lib.concatStringsSep "\n" ( + lib.mapAttrsToList (database: permission: '' + echo "GRANT ${permission} ON ${database} TO '${user.name}'@'localhost';" + '') user.ensurePermissions + )} ) | ${cfg.package}/bin/mysql -N '') cfg.ensureUsers} - ''; + ''; serviceConfig = lib.mkMerge [ { @@ -500,7 +543,11 @@ in ProtectKernelTunables = true; ProtectKernelModules = true; ProtectControlGroups = true; - RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ]; + RestrictAddressFamilies = [ + "AF_UNIX" + "AF_INET" + "AF_INET6" + ]; LockPersonality = true; MemoryDenyWriteExecute = true; RestrictRealtime = true; From 6449da32b224cad459b15e4c0850bd2aea1155e8 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Fri, 14 Feb 2025 01:06:52 +0100 Subject: [PATCH 1874/2168] nixos/services.mysql: add myselfe as maintainer --- ci/OWNERS | 1 + nixos/modules/services/databases/mysql.nix | 2 ++ 2 files changed, 3 insertions(+) diff --git a/ci/OWNERS b/ci/OWNERS index 8b58e7e812ce..c64ef4208e30 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -253,6 +253,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /nixos/tests/postgresql @NixOS/postgres # MySQL/MariaDB and related stuff +/nixos/modules/services/databases/mysql.nix @6543 /nixos/modules/services/backup/mysql-backup.nix @6543 # Hardened profile & related modules diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index efca1e933329..68ef50651f43 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -563,4 +563,6 @@ in ]; }; }; + + meta.maintainers = [ lib.maintainers._6543 ]; } From 1f2fbf2d3c68e5c48eb4bb3c7a8b6c4f06c9281f Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 01:16:14 +0100 Subject: [PATCH 1875/2168] python312Packages.pymbolic: fix build --- .../python-modules/pymbolic/default.nix | 50 +++++++------------ 1 file changed, 19 insertions(+), 31 deletions(-) diff --git a/pkgs/development/python-modules/pymbolic/default.nix b/pkgs/development/python-modules/pymbolic/default.nix index 3f0e0bfcd54c..a74f61195b14 100644 --- a/pkgs/development/python-modules/pymbolic/default.nix +++ b/pkgs/development/python-modules/pymbolic/default.nix @@ -1,17 +1,21 @@ { lib, - astunparse, buildPythonPackage, - fetchpatch, - fetchPypi, + fetchFromGitHub, + + # build-system + hatchling, + + # dependencies immutabledict, + pytools, + + # optional-dependencies matchpy, numpy, + + # tests pytestCheckHook, - pythonOlder, - pytools, - setuptools, - typing-extensions, }: buildPythonPackage rec { @@ -19,34 +23,18 @@ buildPythonPackage rec { version = "2024.2.2"; pyproject = true; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-l2zP8O0bnVrTRxzyuqDQLiMBwevtXld7LgX2M8L1P+w="; + src = fetchFromGitHub { + owner = "inducer"; + repo = "pymbolic"; + tag = "v${version}"; + hash = "sha256-07RWdEPhO+n9/FOvIWe4nm9fGekut9X6Tz4HlIkBSpo="; }; - patches = [ - (fetchpatch { - url = "https://github.com/inducer/pymbolic/commit/cb3d999e4788dad3edf053387b6064adf8b08e19.patch"; - excludes = [ ".github/workflows/ci.yml" ]; - hash = "sha256-P0YjqAo0z0LZMIUTeokwMkfP8vxBXi3TcV4BSFaO1lU="; - }) - ]; - - postPatch = '' - # pytest is a test requirement not a run-time one - substituteInPlace setup.py \ - --replace '"pytest>=2.3",' "" - ''; - - build-system = [ setuptools ]; + build-system = [ hatchling ]; dependencies = [ - astunparse immutabledict pytools - typing-extensions ]; optional-dependencies = { @@ -58,11 +46,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "pymbolic" ]; - meta = with lib; { + meta = { description = "Package for symbolic computation"; homepage = "https://documen.tician.de/pymbolic/"; changelog = "https://github.com/inducer/pymbolic/releases/tag/v${version}"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = [ ]; }; } From 7a2f89ea262c37bfc998bb9cddd7370002d488a5 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 16 Nov 2024 17:37:48 +1000 Subject: [PATCH 1876/2168] hydra: 0-unstable-2024-12-05 -> 0-unstable-2025-02-12 Diff: https://github.com/NixOS/hydra/compare/250668a19fa4d8ff9a6176ee6c44ca3003adedf1...c6f98202cd1b091475ae51b6a093d00b4c8060d4 --- pkgs/by-name/hy/hydra/package.nix | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/hy/hydra/package.nix b/pkgs/by-name/hy/hydra/package.nix index e6b509b67636..d77fcd597f30 100644 --- a/pkgs/by-name/hy/hydra/package.nix +++ b/pkgs/by-name/hy/hydra/package.nix @@ -42,6 +42,7 @@ , glibcLocales , meson , ninja +, nix-eval-jobs , fetchFromGitHub , nixosTests , unstableGitUpdater @@ -122,16 +123,26 @@ let git ]; }; + + nix-eval-jobs' = nix-eval-jobs.overrideAttrs (_: { + version = "2.25.0-unstable-2025-02-13"; + src = fetchFromGitHub { + owner = "nix-community"; + repo = "nix-eval-jobs"; + rev = "6d4fd5a93d7bc953ffa4dcd6d53ad7056a71eff7"; + hash = "sha256-1dZLPw+nlFQzzswfyTxW+8VF1AJ4ZvoYvLTjlHiz1SA="; + }; + }); in stdenv.mkDerivation (finalAttrs: { pname = "hydra"; - version = "0-unstable-2024-12-05"; + version = "0-unstable-2025-02-12"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "250668a19fa4d8ff9a6176ee6c44ca3003adedf1"; - hash = "sha256-r+t/0U8Pp6/Lvi3s3v8nDB9xCggvxFsnCEJ9TuZvVJc="; + rev = "c6f98202cd1b091475ae51b6a093d00b4c8060d4"; + hash = "sha256-CEDUtkA005PiLt1wSo3sgmxfxUBikQSE74ZudyWNxfE="; }; outputs = [ "out" "doc" ]; @@ -161,6 +172,7 @@ stdenv.mkDerivation (finalAttrs: { subversion openssh nix + nix-eval-jobs' coreutils findutils pixz @@ -193,6 +205,7 @@ stdenv.mkDerivation (finalAttrs: { glibcLocales python3 libressl.nc + nix-eval-jobs' openldap postgresql ]; @@ -202,7 +215,7 @@ stdenv.mkDerivation (finalAttrs: { }; shellHook = '' - PATH=$(pwd)/src/script:$(pwd)/src/hydra-eval-jobs:$(pwd)/src/hydra-queue-runner:$(pwd)/src/hydra-evaluator:$PATH + PATH=$(pwd)/src/script:$(pwd)/src/hydra-queue-runner:$(pwd)/src/hydra-evaluator:$PATH PERL5LIB=$(pwd)/src/lib:$PERL5LIB; ''; @@ -228,7 +241,8 @@ stdenv.mkDerivation (finalAttrs: { --prefix PATH ':' $out/bin:$hydraPath \ --set-default HYDRA_RELEASE ${finalAttrs.version} \ --set HYDRA_HOME $out/libexec/hydra \ - --set NIX_RELEASE ${nix.name or "unknown"} + --set NIX_RELEASE ${nix.name or "unknown"} \ + --set NIX_EVAL_JOBS_RELEASE ${nix-eval-jobs'.name or "unknown"} done ''; From c85cb3976ccb8cb4ffd2a375db0f701b6db04091 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Thu, 13 Feb 2025 18:28:52 -0600 Subject: [PATCH 1877/2168] ghostty: 1.1.0 -> 1.1.2 --- pkgs/by-name/gh/ghostty/deps.nix | 19 ++++++++++++------- pkgs/by-name/gh/ghostty/package.nix | 6 ++---- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/gh/ghostty/deps.nix b/pkgs/by-name/gh/ghostty/deps.nix index fe2a11f4eef6..3c1ca62e28a5 100644 --- a/pkgs/by-name/gh/ghostty/deps.nix +++ b/pkgs/by-name/gh/ghostty/deps.nix @@ -1,5 +1,4 @@ # generated by zon2nix (https://github.com/Cloudef/zig2nix) - { lib, linkFarm, @@ -9,10 +8,8 @@ zig, name ? "zig-packages", }: - with builtins; with lib; - let unpackZigArtifact = { @@ -207,7 +204,7 @@ linkFarm name [ name = "12209ca054cb1919fa276e328967f10b253f7537c4136eb48f3332b0f7cf661cad38"; path = fetchZigArtifact { name = "zig_wayland"; - url = "https://codeberg.org/ifreund/zig-wayland/archive/fbfe3b4ac0b472a27b1f1a67405436c58cbee12d.tar.gz"; + url = "https://deps.files.ghostty.org/zig-wayland-fbfe3b4ac0b472a27b1f1a67405436c58cbee12d.tar.gz"; hash = "sha256-RtAystqK/GRYIquTK1KfD7rRSCrfuzAvCD1Z9DE1ldc="; }; } @@ -227,6 +224,14 @@ linkFarm name [ hash = "sha256-QWN4jOrA91KlbqmeEHHJ4HTnCC9nmfxt8DHUXJpAzLI="; }; } + { + name = "12208d70ee791d7ef7e16e1c3c9c1127b57f1ed066a24f87d57fc9f730c5dc394b9d"; + path = fetchZigArtifact { + name = "gobject"; + url = "https://github.com/ianprime0509/zig-gobject/releases/download/v0.2.2/bindings-gnome47.tar.zst"; + hash = "sha256-UU97kNv/bZzQPKz1djhEDLapLguvfBpFfWVb6FthtcI="; + }; + } { name = "12202cdac858abc52413a6c6711d5026d2d3c8e13f95ca2c327eade0736298bb021f"; path = fetchZigArtifact { @@ -252,11 +257,11 @@ linkFarm name [ }; } { - name = "12204fc99743d8232e691ac22e058519bfc6ea92de4a11c6dba59b117531c847cd6a"; + name = "12203d2647e5daf36a9c85b969e03f422540786ce9ea624eb4c26d204fe1f46218f3"; path = fetchZigArtifact { name = "iterm2_themes"; - url = "https://github.com/mbadolato/iTerm2-Color-Schemes/archive/0e23daf59234fc892cba949562d7bf69204594bb.tar.gz"; - hash = "sha256-KswGCFqD1TOBkvaqtRcFOm96TbIqhqUEOg1u1ye/f0s="; + url = "https://github.com/mbadolato/iTerm2-Color-Schemes/archive/db227d159adc265818f2e898da0f70ef8d7b580e.tar.gz"; + hash = "sha256-Iyf7U4rpvNkPX4AOEbYSYGte5+SjRwsWD2luOn1Hz8U="; }; } { diff --git a/pkgs/by-name/gh/ghostty/package.nix b/pkgs/by-name/gh/ghostty/package.nix index d8462622da46..bf8359959186 100644 --- a/pkgs/by-name/gh/ghostty/package.nix +++ b/pkgs/by-name/gh/ghostty/package.nix @@ -28,7 +28,6 @@ # https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/build.zig#L106 withAdwaita ? true, }: - let zig_hook = zig_0_13.hook.overrideAttrs { zig_default_flags = "-Dcpu=baseline -Doptimize=${optimizeLevel} --color off"; @@ -41,10 +40,9 @@ let # https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/src/renderer.zig#L51-L52 renderer = if stdenv.hostPlatform.isDarwin then "metal" else "opengl"; in - stdenv.mkDerivation (finalAttrs: { pname = "ghostty"; - version = "1.1.0"; + version = "1.1.2"; outputs = [ "out" "man" @@ -57,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ghostty-org"; repo = "ghostty"; tag = "v${finalAttrs.version}"; - hash = "sha256-a2A/mt2xS19YEQB+cTPdew/a7xCnGWNvIOdO9QNqxm0="; + hash = "sha256-HZiuxnflLT9HXU7bc0xrk5kJJHQGNTQ2QXMZS7bE2u8="; }; deps = callPackage ./deps.nix { From 91fd664d85d47c66821798f6ed2f01150a0fcf3c Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 14 Feb 2025 00:48:48 +0000 Subject: [PATCH 1878/2168] nixos-rebuild-ng: increase timeout for REPL tests --- pkgs/by-name/ni/nixos-rebuild-ng/tests/repl.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/tests/repl.nix b/pkgs/by-name/ni/nixos-rebuild-ng/tests/repl.nix index 1853a65bab86..1a614e8d8655 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/tests/repl.nix +++ b/pkgs/by-name/ni/nixos-rebuild-ng/tests/repl.nix @@ -13,7 +13,7 @@ let escapeExpect = lib.strings.escapeNixString; expectSetup = '' - set timeout 180 + set timeout 300 proc expect_simple { pattern } { puts "Expecting: $pattern" expect { @@ -76,7 +76,7 @@ runCommand "test-nixos-rebuild-repl" expect ${writeText "test-nixos-rebuild-repl-expect" '' ${expectSetup} - spawn nixos-rebuild repl --fast + spawn nixos-rebuild repl --no-reexec expect "nix-repl> " @@ -116,7 +116,7 @@ runCommand "test-nixos-rebuild-repl" expect ${writeText "test-nixos-rebuild-repl-absolute-path-expect" '' ${expectSetup} - spawn sh -c "nixos-rebuild repl --fast --flake path:\$HOME#testconf" + spawn sh -c "nixos-rebuild repl --no-reexec --flake path:\$HOME#testconf" expect_simple "nix-repl>" @@ -146,7 +146,7 @@ runCommand "test-nixos-rebuild-repl" pushd "$HOME" expect ${writeText "test-nixos-rebuild-repl-relative-path-expect" '' ${expectSetup} - spawn sh -c "nixos-rebuild repl --fast --flake .#testconf" + spawn sh -c "nixos-rebuild repl --no-reexec --flake .#testconf" expect_simple "nix-repl>" From 58b0a792df715f67f743b647d691061e1f242eb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Tue, 11 Feb 2025 01:27:48 +0100 Subject: [PATCH 1879/2168] pnpm_10: 10.2.1 -> 10.4.0 --- pkgs/development/tools/pnpm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix index 86d73f8db0b4..390d71445af4 100644 --- a/pkgs/development/tools/pnpm/default.nix +++ b/pkgs/development/tools/pnpm/default.nix @@ -16,8 +16,8 @@ let hash = "sha256-hHIWjD4f0L/yh+aUsFP8y78gV5o/+VJrYzO+q432Wo0="; }; "10" = { - version = "10.2.1"; - hash = "sha256-+Yjw2TuH4dotjN9qx/RaAcb4Q642BrTKDy/9cTuF+XU="; + version = "10.4.0"; + hash = "sha256-5X6KVE96hCR8+nfdbZI+rlGZo3NHTlPqsfVAx5Yok4Y="; }; }; From 942907da9f4396a14a56884752f3441f896a575a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 01:11:37 +0000 Subject: [PATCH 1880/2168] ocamlPackages.visitors: 20210608 -> 20250212 --- pkgs/development/ocaml-modules/visitors/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/visitors/default.nix b/pkgs/development/ocaml-modules/visitors/default.nix index f2115d16ee4b..b4459cfaae65 100644 --- a/pkgs/development/ocaml-modules/visitors/default.nix +++ b/pkgs/development/ocaml-modules/visitors/default.nix @@ -9,7 +9,7 @@ buildDunePackage rec { pname = "visitors"; - version = "20210608"; + version = "20250212"; duneVersion = "3"; @@ -20,7 +20,7 @@ buildDunePackage rec { repo = pname; rev = version; domain = "gitlab.inria.fr"; - sha256 = "1p75x5yqwbwv8yb2gz15rfl3znipy59r45d1f4vcjdghhjws6q2a"; + sha256 = "sha256-AFD4+vriwVGt6lzDyIDuIMadakcgB4j235yty5qqFgQ="; }; propagatedBuildInputs = [ From d86d3abce39dd0954895ed216a7c871bb0053b65 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 01:23:29 +0000 Subject: [PATCH 1881/2168] qcad: 3.31.2.7 -> 3.32.1.0 --- pkgs/applications/misc/qcad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index 9134a9e5d00c..f06bd8fe72ab 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -18,14 +18,14 @@ stdenv.mkDerivation rec { pname = "qcad"; - version = "3.31.2.7"; + version = "3.32.1.0"; src = fetchFromGitHub { name = "qcad-${version}-src"; owner = "qcad"; repo = "qcad"; rev = "v${version}"; - hash = "sha256-gNUmcpyDctmsqavOOaPzyghmfMp6QnZcToUtFoVgoxI="; + hash = "sha256-3P6iudD/swpNDPL4G8isJI6zxqc6/rmHAMpPnEwnuiM="; }; patches = [ From d5ed0c352a447ec58cababe15e037fd743cceec7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 01:32:33 +0000 Subject: [PATCH 1882/2168] google-authenticator: 1.10 -> 1.11 --- pkgs/by-name/go/google-authenticator/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/google-authenticator/package.nix b/pkgs/by-name/go/google-authenticator/package.nix index 0334a252510f..3eacb27aabee 100644 --- a/pkgs/by-name/go/google-authenticator/package.nix +++ b/pkgs/by-name/go/google-authenticator/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "google-authenticator-libpam"; - version = "1.10"; + version = "1.11"; src = fetchFromGitHub { owner = "google"; repo = "google-authenticator-libpam"; rev = version; - hash = "sha256-KEfwQeJIuRF+S3gPn+maDb8Fu0FRXLs2/Nlbjj2d3AE="; + hash = "sha256-cLMX5SdKvyQr3annc/Hhhz6XgY+BypRHASKRh6xTdmo="; }; nativeBuildInputs = [ autoreconfHook ]; From d4884e2527600429aa275a7bdd2dcc0e1fdeac6b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 01:39:42 +0000 Subject: [PATCH 1883/2168] leetcode-cli: 0.4.5 -> 0.4.6 --- pkgs/by-name/le/leetcode-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/le/leetcode-cli/package.nix b/pkgs/by-name/le/leetcode-cli/package.nix index 71c66932a942..25f05d80fb52 100644 --- a/pkgs/by-name/le/leetcode-cli/package.nix +++ b/pkgs/by-name/le/leetcode-cli/package.nix @@ -15,15 +15,15 @@ rustPlatform.buildRustPackage rec { pname = "leetcode-cli"; - version = "0.4.5"; + version = "0.4.6"; src = fetchCrate { inherit pname version; - hash = "sha256-Jc0akHj2DHbkF7sjslOwdeI1piW2gnhoalBz18lpQdQ="; + hash = "sha256-AYBBW9VtdvqqqiouhkS3diPcOdaQOs8Htkw9DTRX2t4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-rr/8rbgjGr1npkimJK8rpZcsRFP0ACx+a1x0ITI71G0="; + cargoHash = "sha256-o2RkhYsSQKwU+dsHQvlcxAVKUjOTqg424dqrM7JRoN8="; nativeBuildInputs = [ pkg-config From a791a7ba5637fd9cc551e427669914a984ee233c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 01:46:44 +0000 Subject: [PATCH 1884/2168] mpd-discord-rpc: 1.7.3 -> 1.8.0 --- pkgs/by-name/mp/mpd-discord-rpc/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mp/mpd-discord-rpc/package.nix b/pkgs/by-name/mp/mpd-discord-rpc/package.nix index 83890dd7458b..589e27d4f32b 100644 --- a/pkgs/by-name/mp/mpd-discord-rpc/package.nix +++ b/pkgs/by-name/mp/mpd-discord-rpc/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "mpd-discord-rpc"; - version = "1.7.3"; + version = "1.8.0"; src = fetchFromGitHub { owner = "JakeStanger"; repo = "mpd-discord-rpc"; rev = "v${version}"; - hash = "sha256-WiHMXazNKyt5N7WmkftZYEHeQi+l9qoU2yr6jRHfjdE="; + hash = "sha256-RuXH0RaR0VVN7tja0pcc8QH826/JzH4tyVVCbrK7ldI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-v6YQS+Te0bIzSr3q4QaEcXbUjiTCKELxCdqBlbjLI3E="; + cargoHash = "sha256-ewmg5t0JljnvxjrGDJzokRwndv7UNw9NMQ7Cx6oDWjg="; nativeBuildInputs = [ pkg-config From c4f89c65368e8fe943754762c1d10f7823e1a000 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 01:48:21 +0000 Subject: [PATCH 1885/2168] cntb: 1.4.12 -> 1.5.2 --- pkgs/by-name/cn/cntb/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cn/cntb/package.nix b/pkgs/by-name/cn/cntb/package.nix index 69622e914a10..7ae21fb9b98d 100644 --- a/pkgs/by-name/cn/cntb/package.nix +++ b/pkgs/by-name/cn/cntb/package.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "cntb"; - version = "1.4.12"; + version = "1.5.2"; src = fetchFromGitHub { owner = "contabo"; repo = "cntb"; rev = "v${version}"; - hash = "sha256-5JOO9tWMjy81wSB9Vq/gBYZ0xfrhES0dm/cTqXP8HiI"; + hash = "sha256-ym4SYeAkxKBq/0VgyXx1uoHiM29LEXMqHl3XICdM30Y="; # docs contains two files with the same name but different cases, # this leads to a different hash on case insensitive filesystems (e.g. darwin) # https://github.com/contabo/cntb/issues/34 @@ -22,7 +22,7 @@ buildGoModule rec { subPackages = [ "." ]; - vendorHash = "sha256-IBDVHQe6OOGQ27G7uXKRtavy4tnCvIbL07j969/E9Vg="; + vendorHash = "sha256-6J93Nt9MhnTjsah8sDff0SvImzOEsSdnDHBhUADmO1k="; ldflags = [ "-X contabo.com/cli/cntb/cmd.version=${src.rev}" From 00b57c528c4e8e17cd06c2e4270c84811ea118d5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 01:56:32 +0000 Subject: [PATCH 1886/2168] amazon-ecr-credential-helper: 0.9.0 -> 0.9.1 --- pkgs/by-name/am/amazon-ecr-credential-helper/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/am/amazon-ecr-credential-helper/package.nix b/pkgs/by-name/am/amazon-ecr-credential-helper/package.nix index bc6be8d706eb..978b8cbb1c69 100644 --- a/pkgs/by-name/am/amazon-ecr-credential-helper/package.nix +++ b/pkgs/by-name/am/amazon-ecr-credential-helper/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "amazon-ecr-credential-helper"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "awslabs"; repo = "amazon-ecr-credential-helper"; rev = "v${version}"; - sha256 = "sha256-TRYBZiddnN6wCErSLKCr9JEH/Ldxg+Oh2hA63+EwRjo="; + sha256 = "sha256-kX1I8HsOJKFogqpfTgFBedM6BObdkpYfYwx3tS2IdMo="; }; vendorHash = null; From 46e5ba73588e8bb7e2b440db3e29b06b5856a145 Mon Sep 17 00:00:00 2001 From: Jean-Francois Labonte Date: Thu, 13 Feb 2025 21:20:25 -0500 Subject: [PATCH 1887/2168] vscode: 1.97.1 -> 1.97.2 --- pkgs/applications/editors/vscode/vscode.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index d002b3a0c34d..20608414517b 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -36,22 +36,22 @@ let sha256 = { - x86_64-linux = "0gr2z4vzms6fv4kcc8dzc7l3inpb5hasnzdfr1zc2n4i3nl8z8vw"; - x86_64-darwin = "1qplpjazjds5kns0kmp5qa6zfix30cqa93bl4bcpvblb2x9fh1v8"; - aarch64-linux = "1jhrmwrnxzwvhqgfrs35kyd5hhg2b7dyq3p5k88jhm8607nkds79"; - aarch64-darwin = "072lg4nvq3cdjzrwngaxnz9p952zkxsknsb39zjh55vzrij55g9x"; - armv7l-linux = "06bvh72bq4ippr2k8ifcfqhkhhh6na4vxsz1k50swr1k2kzwwr5d"; + x86_64-linux = "11a0y0zdz3mmc2xvpnlq06a7q06y6529xpp4hlhpjylj0bk06xn1"; + x86_64-darwin = "12fxhwqcz36f5pv4kvs7bblmymxyixg7pvi0gb5k0j73pkvqrr6g"; + aarch64-linux = "0g5qz7gq7k65p2f8iwz1jiy03nwsmy3v3gb18qwg9mbhm0dk59la"; + aarch64-darwin = "1g4fz8nw5m7krjlsjs43937kz1sr7lkflbphpyh8cmalwpxa8ysn"; + armv7l-linux = "09r12y9xbpqnnw9mab3k4kx0ngpfng1l6rk09n9l2q36ji20ijmy"; } .${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.97.1"; + version = "1.97.2"; pname = "vscode" + lib.optionalString isInsiders "-insiders"; # This is used for VS Code - Remote SSH test - rev = "e249dada235c2083c83813bd65b7f4707fb97b76"; + rev = "e54c774e0add60467559eb0d1e229c6452cf8447"; executableName = "code" + lib.optionalString isInsiders "-insiders"; longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; @@ -75,7 +75,7 @@ callPackage ./generic.nix rec { src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - sha256 = "01snzahh794ygpgwh4r57c8mnisp6a4fc3v5x76cdhxw2hd9s26n"; + sha256 = "15fd401sqmlkpw48pysqpyi5rlsqx4cm55bbwakhkal4qa1qnq4m"; }; stdenv = stdenvNoCC; }; From c5d64694288f1625e50d2bad504d00b9125ca5ad Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 13 Feb 2025 20:34:18 -0600 Subject: [PATCH 1888/2168] postman: 11.1.0 -> 11.31.0 --- pkgs/by-name/po/postman/darwin.nix | 4 ++-- pkgs/by-name/po/postman/linux.nix | 4 ++-- pkgs/by-name/po/postman/package.nix | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/po/postman/darwin.nix b/pkgs/by-name/po/postman/darwin.nix index 1e648396eba1..082c8d2ae46a 100644 --- a/pkgs/by-name/po/postman/darwin.nix +++ b/pkgs/by-name/po/postman/darwin.nix @@ -13,12 +13,12 @@ let { aarch64-darwin = { arch = "arm64"; - sha256 = "sha256-V+JLXl12DnwZlPF0qNs2lQqRpWbSDiPXDTtl4FGcZcM="; + sha256 = "sha256-BwHGR9xyOwOEV11KT4OGUG2khRbbyUg6qJPR8yA3gQI="; }; x86_64-darwin = { arch = "64"; - sha256 = "sha256-l7J4Rrq+kUyk+0Chq5qo50K1VXC/7E3FC/hQ1DQ0PGA="; + sha256 = "sha256-ZVSIiSkPZ3W6PCV36mTMkE47IPQCJ6z+gdLgx0+HeAs="; }; } .${stdenvNoCC.hostPlatform.system} diff --git a/pkgs/by-name/po/postman/linux.nix b/pkgs/by-name/po/postman/linux.nix index 591794c90ccf..cd7b563cb007 100644 --- a/pkgs/by-name/po/postman/linux.nix +++ b/pkgs/by-name/po/postman/linux.nix @@ -56,12 +56,12 @@ let { aarch64-linux = { arch = "arm64"; - sha256 = "sha256-yq2J5KRv/NJDaQG7e7RKyzbJqKWRolSU9X6khHxlrNo="; + sha256 = "sha256-c4JPemJjKM0N6XajNG4lK2zL3i5sBtsVlC9KNv4zM74="; }; x86_64-linux = { arch = "64"; - sha256 = "sha256-fAaxrLZSXGBYr4Vu0Cz2pZwXivSTkaIF5wL217cB9qM="; + sha256 = "sha256-y260wmU+C0Y6wpeHuHe0mXuAZZgZ38qr2pGprhZJ7sE="; }; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/by-name/po/postman/package.nix b/pkgs/by-name/po/postman/package.nix index ae8c27f750b1..57f10fa0d827 100644 --- a/pkgs/by-name/po/postman/package.nix +++ b/pkgs/by-name/po/postman/package.nix @@ -6,7 +6,7 @@ let pname = "postman"; - version = "11.1.0"; + version = "11.31.0"; meta = with lib; { homepage = "https://www.getpostman.com"; description = "API Development Environment"; From adddd36466b315a9aa6760209528e9f67a5b7dda Mon Sep 17 00:00:00 2001 From: useranon350 Date: Thu, 13 Feb 2025 21:36:51 -0500 Subject: [PATCH 1889/2168] cemu: 2.4 -> 2.5 --- pkgs/by-name/ce/cemu/0002-cemu-imgui.patch | 13 +++++++++++++ pkgs/by-name/ce/cemu/package.nix | 13 ++++++++----- 2 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 pkgs/by-name/ce/cemu/0002-cemu-imgui.patch diff --git a/pkgs/by-name/ce/cemu/0002-cemu-imgui.patch b/pkgs/by-name/ce/cemu/0002-cemu-imgui.patch new file mode 100644 index 000000000000..96f95b9687cc --- /dev/null +++ b/pkgs/by-name/ce/cemu/0002-cemu-imgui.patch @@ -0,0 +1,13 @@ +diff --git a/src/imgui/imgui_extension.cpp b/src/imgui/imgui_extension.cpp +index f1c072f..e3e901d 100644 +--- a/src/imgui/imgui_extension.cpp ++++ b/src/imgui/imgui_extension.cpp +@@ -129,8 +129,6 @@ void ImGui_UpdateWindowInformation(bool mainWindow) + io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad; + #if BOOST_OS_WINDOWS + io.ImeWindowHandle = mainWindow ? g_window_info.window_main.hwnd : g_window_info.window_pad.hwnd; +-#else +- io.ImeWindowHandle = nullptr; + #endif + + io.MousePos = ImVec2(-FLT_MAX, -FLT_MAX); diff --git a/pkgs/by-name/ce/cemu/package.nix b/pkgs/by-name/ce/cemu/package.nix index 191ece85ab31..28c90ea1d828 100644 --- a/pkgs/by-name/ce/cemu/package.nix +++ b/pkgs/by-name/ce/cemu/package.nix @@ -34,24 +34,25 @@ wrapGAppsHook3, wxGTK32, zarchive, + bluez, }: let - # cemu doesn't build with imgui 1.90.2 or newer: - # error: 'struct ImGuiIO' has no member named 'ImeWindowHandle' + # cemu doesn't build with imgui 1.91.4 or newer: + # before v1.91.4 (2024/10/08) the default type for ImTextureID was void*. imgui' = imgui.overrideAttrs rec { - version = "1.90.1"; + version = "1.91.3"; src = fetchFromGitHub { owner = "ocornut"; repo = "imgui"; rev = "v${version}"; - hash = "sha256-gf47uLeNiXQic43buB5ZnMqiotlUfIyAsP+3H7yJuFg="; + hash = "sha256-J4gz4rnydu8JlzqNC/OIoVoRcgeFd6B1Qboxu5drOKY="; }; }; in stdenv.mkDerivation (finalAttrs: { pname = "cemu"; - version = "2.4"; + version = "2.5"; src = fetchFromGitHub { owner = "cemu-project"; @@ -71,6 +72,7 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/cemu-project/Cemu/commit/2b0cbf7f6b6c34c748585d255ee7756ff592a502.patch"; hash = "sha256-jHB/9MWZ/oNfUgZtxtgkSN/OnRARSuGVfXFFB9ldDpI="; }) + ./0002-cemu-imgui.patch ]; nativeBuildInputs = [ @@ -106,6 +108,7 @@ stdenv.mkDerivation (finalAttrs: { wayland wxGTK32 zarchive + bluez ]; cmakeFlags = [ From 7fd769bbe905e9b27c8e95520cb655ba1e73476a Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 13 Feb 2025 20:38:22 -0600 Subject: [PATCH 1890/2168] postman: 11.31.0 -> 11.32.2 --- pkgs/by-name/po/postman/darwin.nix | 4 ++-- pkgs/by-name/po/postman/linux.nix | 4 ++-- pkgs/by-name/po/postman/package.nix | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/po/postman/darwin.nix b/pkgs/by-name/po/postman/darwin.nix index 082c8d2ae46a..e14ad072e574 100644 --- a/pkgs/by-name/po/postman/darwin.nix +++ b/pkgs/by-name/po/postman/darwin.nix @@ -13,12 +13,12 @@ let { aarch64-darwin = { arch = "arm64"; - sha256 = "sha256-BwHGR9xyOwOEV11KT4OGUG2khRbbyUg6qJPR8yA3gQI="; + sha256 = "sha256-tp8qKk06HvSVY1GggOv9VYH+1Ntlirf8Pf2FY0Qhksk="; }; x86_64-darwin = { arch = "64"; - sha256 = "sha256-ZVSIiSkPZ3W6PCV36mTMkE47IPQCJ6z+gdLgx0+HeAs="; + sha256 = "sha256-8hSxtLGoAcTLmUpr3Il/1wii2MgLqOJ3oAYSSPq7a1o="; }; } .${stdenvNoCC.hostPlatform.system} diff --git a/pkgs/by-name/po/postman/linux.nix b/pkgs/by-name/po/postman/linux.nix index cd7b563cb007..4549c027948a 100644 --- a/pkgs/by-name/po/postman/linux.nix +++ b/pkgs/by-name/po/postman/linux.nix @@ -56,12 +56,12 @@ let { aarch64-linux = { arch = "arm64"; - sha256 = "sha256-c4JPemJjKM0N6XajNG4lK2zL3i5sBtsVlC9KNv4zM74="; + sha256 = "sha256-JKE6riUJXAiCwT0yp5ncoExiRAnFmuefmPkwWmvRjV4="; }; x86_64-linux = { arch = "64"; - sha256 = "sha256-y260wmU+C0Y6wpeHuHe0mXuAZZgZ38qr2pGprhZJ7sE="; + sha256 = "sha256-w7R4IsWMtW37BwGHBY9UweMR6PaZpkya401ARGeR1wY="; }; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/by-name/po/postman/package.nix b/pkgs/by-name/po/postman/package.nix index 57f10fa0d827..d883696aa9da 100644 --- a/pkgs/by-name/po/postman/package.nix +++ b/pkgs/by-name/po/postman/package.nix @@ -6,7 +6,7 @@ let pname = "postman"; - version = "11.31.0"; + version = "11.32.2"; meta = with lib; { homepage = "https://www.getpostman.com"; description = "API Development Environment"; From 0270af5e2e2d587871a84a9c0137840ed2e83377 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 02:46:38 +0000 Subject: [PATCH 1891/2168] mtr-exporter: 0.4.0 -> 0.5.0 --- pkgs/by-name/mt/mtr-exporter/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mt/mtr-exporter/package.nix b/pkgs/by-name/mt/mtr-exporter/package.nix index 2425226d513a..808666c58851 100644 --- a/pkgs/by-name/mt/mtr-exporter/package.nix +++ b/pkgs/by-name/mt/mtr-exporter/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "mtr-exporter"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "mgumz"; repo = "mtr-exporter"; rev = version; - hash = "sha256-dMlMUjbUg05Z8FFEPwMOiHzLiHSSjV1CzKqrt/qJ6Js="; + hash = "sha256-+MomCtDMhnN9HsWguvzCKKaBl5CO0vL27OBjQfuajLI="; }; vendorHash = null; From 766c0cd16b4f9dd008b8f7f63d797455fe62b7e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 02:51:17 +0000 Subject: [PATCH 1892/2168] astc-encoder: 5.1.0 -> 5.2.0 --- pkgs/by-name/as/astc-encoder/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/as/astc-encoder/package.nix b/pkgs/by-name/as/astc-encoder/package.nix index 4ece84c89c5e..5ea47e927550 100644 --- a/pkgs/by-name/as/astc-encoder/package.nix +++ b/pkgs/by-name/as/astc-encoder/package.nix @@ -47,13 +47,13 @@ in stdenv.mkDerivation rec { pname = "astc-encoder"; - version = "5.1.0"; + version = "5.2.0"; src = fetchFromGitHub { owner = "ARM-software"; repo = "astc-encoder"; rev = version; - sha256 = "sha256-IGzH/0JLDUkwABCFRVVEJevWwcT5El3HweU6nsVQCJw="; + sha256 = "sha256-rCyi5Nla2IXsLD+rLMTN1h3B9umlNN0epZmPi/IFHPQ="; }; nativeBuildInputs = [ cmake ]; From 51792bbb1995e0ed3dfc05412245569946e2c22d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 03:17:16 +0000 Subject: [PATCH 1893/2168] nuclei: 3.3.8 -> 3.3.9 --- pkgs/by-name/nu/nuclei/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/nu/nuclei/package.nix b/pkgs/by-name/nu/nuclei/package.nix index d85ed923a2c7..788dc8ade7f7 100644 --- a/pkgs/by-name/nu/nuclei/package.nix +++ b/pkgs/by-name/nu/nuclei/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "nuclei"; - version = "3.3.8"; + version = "3.3.9"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei"; tag = "v${version}"; - hash = "sha256-RL6/H1X6+rt9n1rpeRpKv+u3SloOnRX6YzMKDDQw+78="; + hash = "sha256-9P8KSuhTI/m0m51PUTZGU+qRbnT3izPbHTzsqZNbMJE="; }; - vendorHash = "sha256-k4seYTUO7BmU2HhTWweDRfNnXp+HshWM1riSc9BbYYg="; + vendorHash = "sha256-CTdB/+aVaXKqtiwHn8pgmhXjZ0mIDrmLvnKmisExi74="; proxyVendor = true; # hash mismatch between Linux and Darwin From 1af7f05b19df4b5a78b84a4e4e9c313d68a4bcd1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 03:17:25 +0000 Subject: [PATCH 1894/2168] cairo-lang: 2.9.2 -> 2.9.3 --- pkgs/by-name/ca/cairo-lang/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cairo-lang/package.nix b/pkgs/by-name/ca/cairo-lang/package.nix index 7bc31286d0e3..8c0276d89b6a 100644 --- a/pkgs/by-name/ca/cairo-lang/package.nix +++ b/pkgs/by-name/ca/cairo-lang/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "cairo"; - version = "2.9.2"; + version = "2.9.3"; src = fetchFromGitHub { owner = "starkware-libs"; repo = "cairo"; rev = "v${version}"; - hash = "sha256-zjgCOrTlIPN4aU0+FCohJmISPiwpppj3zO/7unVi/iU="; + hash = "sha256-X6aEyo3VY0C+1w1S7ZuxVKACKDHWaxPMR98ICq6/icg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-d9S8d0KLxoipH5nE0jyUaFAl/V8eSOvOwf2skrW5K5g="; + cargoHash = "sha256-yjo7nxt/oAqPRI6I3WlnFC+lfT5HiQJnsjTuijx4ekk="; # openssl crate requires perl during build process nativeBuildInputs = [ From 88b52c533c8ca3ce87f7e5dc36b1b92e354c6395 Mon Sep 17 00:00:00 2001 From: Jean-Luc Jox Date: Fri, 14 Feb 2025 13:20:06 +1000 Subject: [PATCH 1895/2168] upbound: 0.37.0 -> 0.37.1 --- pkgs/by-name/up/upbound/sources-stable.json | 34 ++++++++++----------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/up/upbound/sources-stable.json b/pkgs/by-name/up/upbound/sources-stable.json index cbf434da428d..f7fa7ac80671 100644 --- a/pkgs/by-name/up/upbound/sources-stable.json +++ b/pkgs/by-name/up/upbound/sources-stable.json @@ -8,38 +8,38 @@ "fetchurlAttrSet": { "docker-credential-up": { "aarch64-darwin": { - "hash": "sha256-WuNC7E1i/Yikwe3uq1Hxf4mpAzgqe9T6tI2DFqJFYq8=", - "url": "https://cli.upbound.io/stable/v0.37.0/bundle/docker-credential-up/darwin_arm64.tar.gz" + "hash": "sha256-I4pzsc8lR7w7RFuPig7nUAoLhOridrobglnGNAK//Ek=", + "url": "https://cli.upbound.io/stable/v0.37.1/bundle/docker-credential-up/darwin_arm64.tar.gz" }, "aarch64-linux": { - "hash": "sha256-b5ylPJxIVkI3EDY5IFTHll/4F6KDtQLm7eq8J7eGmtA=", - "url": "https://cli.upbound.io/stable/v0.37.0/bundle/docker-credential-up/linux_arm64.tar.gz" + "hash": "sha256-PVJON0BzYMN3vBlHIAIBycfO9jvy1KRnelSnPTsJ6pg=", + "url": "https://cli.upbound.io/stable/v0.37.1/bundle/docker-credential-up/linux_arm64.tar.gz" }, "x86_64-darwin": { - "hash": "sha256-jJV0SX96Isz7+E0MOQ6aq3KDwFZt4knTVuDU3iSIC+4=", - "url": "https://cli.upbound.io/stable/v0.37.0/bundle/docker-credential-up/darwin_amd64.tar.gz" + "hash": "sha256-VNJ4zII+RK82ulN0TRwrl4tpbnQKICKhcKm1re4bJJY=", + "url": "https://cli.upbound.io/stable/v0.37.1/bundle/docker-credential-up/darwin_amd64.tar.gz" }, "x86_64-linux": { - "hash": "sha256-Ek8xTUKFjYekaee+8rjjOKSQQ1jX3asyvVa/jATWR5c=", - "url": "https://cli.upbound.io/stable/v0.37.0/bundle/docker-credential-up/linux_amd64.tar.gz" + "hash": "sha256-L7Ar3NhsMGne3AOCJ8IWrKBlSleYqKU5Fm9DRN8DZPU=", + "url": "https://cli.upbound.io/stable/v0.37.1/bundle/docker-credential-up/linux_amd64.tar.gz" } }, "up": { "aarch64-darwin": { - "hash": "sha256-jDhAB0b1XMAwGgTeL1uXIIg4YoBgpgI9KBdsbyBXjF4=", - "url": "https://cli.upbound.io/stable/v0.37.0/bundle/up/darwin_arm64.tar.gz" + "hash": "sha256-c4wqYH7AG//7uI5sHbDOwZ0LxYIgP3tXDOut9kMlR6o=", + "url": "https://cli.upbound.io/stable/v0.37.1/bundle/up/darwin_arm64.tar.gz" }, "aarch64-linux": { - "hash": "sha256-mVS1knNDtQjbxj2FXIyx/m/HVUhUSuN2E7HNmdxgtd4=", - "url": "https://cli.upbound.io/stable/v0.37.0/bundle/up/linux_arm64.tar.gz" + "hash": "sha256-70ib5DXhpVBPB8FVaS1qzEtWA1M20B3soKltT4cwyZE=", + "url": "https://cli.upbound.io/stable/v0.37.1/bundle/up/linux_arm64.tar.gz" }, "x86_64-darwin": { - "hash": "sha256-5nr+5tCbqoVel97ROn2OamV0s90O6QS9vrbSXIjhJoo=", - "url": "https://cli.upbound.io/stable/v0.37.0/bundle/up/darwin_amd64.tar.gz" + "hash": "sha256-CRtxAO7FFPHjLTaF+MGbAoRLcTCG8GYStFuq+t8t9hM=", + "url": "https://cli.upbound.io/stable/v0.37.1/bundle/up/darwin_amd64.tar.gz" }, "x86_64-linux": { - "hash": "sha256-MZgQlxi4MrzXG59Q4g5Bjb240E5pf5l1bHGASqSc+OU=", - "url": "https://cli.upbound.io/stable/v0.37.0/bundle/up/linux_amd64.tar.gz" + "hash": "sha256-tA0k7DBh8cqYcqC/+8E1QeMNzRLDbE9X4sjlLnYyS08=", + "url": "https://cli.upbound.io/stable/v0.37.1/bundle/up/linux_amd64.tar.gz" } } }, @@ -49,5 +49,5 @@ "x86_64-darwin", "x86_64-linux" ], - "version": "0.37.0" + "version": "0.37.1" } From c631924271809f4df9e1fb7115c820b3b6052f26 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 03:23:37 +0000 Subject: [PATCH 1896/2168] tz: 0.7.0 -> 0.8.0 --- pkgs/by-name/tz/tz/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tz/tz/package.nix b/pkgs/by-name/tz/tz/package.nix index 7ddeb2d399e1..7c8caa485dd0 100644 --- a/pkgs/by-name/tz/tz/package.nix +++ b/pkgs/by-name/tz/tz/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "tz"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "oz"; repo = "tz"; rev = "v${version}"; - sha256 = "sha256-Mnb0GdJ9dgaUanWBP5JOo6++6MfrUgncBRp4NIbhxf0="; + sha256 = "sha256-OpftKCEoAltvQw0bB3SyFeXUDiGjVHNDrrKsdRH6zl4="; }; - vendorHash = "sha256-lcCra4LyebkmelvBs0Dd2mn6R64Q5MaUWc5AP8V9pec="; + vendorHash = "sha256-Mdp2bcqTawbeqdu06QfB4atLaPpPDoE/eisTytxCnj4="; meta = with lib; { description = "Time zone helper"; From 350a9e2d46d45b71cc6194716cfcc0a321251caa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 03:44:02 +0000 Subject: [PATCH 1897/2168] photoqt: 4.8 -> 4.8.1 --- pkgs/by-name/ph/photoqt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ph/photoqt/package.nix b/pkgs/by-name/ph/photoqt/package.nix index 6c335cf07344..776914930af4 100644 --- a/pkgs/by-name/ph/photoqt/package.nix +++ b/pkgs/by-name/ph/photoqt/package.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "photoqt"; - version = "4.8"; + version = "4.8.1"; src = fetchurl { url = "https://photoqt.org/pkgs/photoqt-${version}.tar.gz"; - hash = "sha256-ccSbG5MTIyVJFqNHstaW53BfsGmN/I4ObCZfY0h22QE="; + hash = "sha256-Iq5Fc0v+EYFe1YG3ZhZKl8leXD+TpGGhaQjr800vz7Y="; }; nativeBuildInputs = [ From 37c2c17cc6e4b9719e03a924f1aa674834e814ff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 03:45:08 +0000 Subject: [PATCH 1898/2168] polypane: 23.0.1 -> 23.1.0 --- pkgs/by-name/po/polypane/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/po/polypane/package.nix b/pkgs/by-name/po/polypane/package.nix index 386afbeb5747..100b2ad52073 100644 --- a/pkgs/by-name/po/polypane/package.nix +++ b/pkgs/by-name/po/polypane/package.nix @@ -6,12 +6,12 @@ let pname = "polypane"; - version = "23.0.1"; + version = "23.1.0"; src = fetchurl { url = "https://github.com/firstversionist/${pname}/releases/download/v${version}/${pname}-${version}.AppImage"; name = "${pname}-${version}.AppImage"; - sha256 = "sha256-phOuTka8S/aUOem6+rKx18yhRoArWLQYwxqqFF269XA="; + sha256 = "sha256-6XKosi5ukkrVtG5K6tUDgvqbOQ0RdrDHuYHhIS+Idyg="; }; appimageContents = appimageTools.extractType2 { From e82c85c3c826a6105e14aa14bb0679c9fc87f8e4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 03:47:53 +0000 Subject: [PATCH 1899/2168] reader: 0.4.6 -> 0.4.7 --- pkgs/by-name/re/reader/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/reader/package.nix b/pkgs/by-name/re/reader/package.nix index 522b0b07d2f5..30a4c7e0b1f3 100644 --- a/pkgs/by-name/re/reader/package.nix +++ b/pkgs/by-name/re/reader/package.nix @@ -6,16 +6,16 @@ let self = buildGoModule { pname = "reader"; - version = "0.4.6"; + version = "0.4.7"; src = fetchFromGitHub { owner = "mrusme"; repo = "reader"; tag = "v${self.version}"; - hash = "sha256-Z0mDRL02wZfmPRVDTDV85MqI5Ztctqen7PmOSW5Ee48="; + hash = "sha256-Xg6ndfxKOfiIz654HcnhdvBGydOSSODBp8LnYxmqb4o="; }; - vendorHash = "sha256-6k6Zmwdpc4rBsahtU9nJmTUqfDZi6EeaJGVeLFzbY34="; + vendorHash = "sha256-dr/y4BBBe5K9U24ikLzYA+B2mzTGpFuFqoj5OLXtUG4="; meta = { description = "Lightweight tool offering better readability of web pages on the CLI"; From 6173ea8e0774671f8e378dca324b1147fd1b3621 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 03:48:24 +0000 Subject: [PATCH 1900/2168] talosctl: 1.9.3 -> 1.9.4 --- pkgs/by-name/ta/talosctl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ta/talosctl/package.nix b/pkgs/by-name/ta/talosctl/package.nix index 3ece33feeb91..041faa531b8c 100644 --- a/pkgs/by-name/ta/talosctl/package.nix +++ b/pkgs/by-name/ta/talosctl/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "talosctl"; - version = "1.9.3"; + version = "1.9.4"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; tag = "v${version}"; - hash = "sha256-nI+6EzbGQzfM/pG4d5O4I5BEJ2aNaZ/sE28/EcgQmCs="; + hash = "sha256-gD9fIBILqSFExTIziNx6Hy6TpsBC90yHSfSDB9fhKwA="; }; - vendorHash = "sha256-o/PYWR7KOWCVXUhzdPY0bxRhCROXzp/UAXgFkWpggC8="; + vendorHash = "sha256-ECTR1U2RlatLK3c3UP/aHzYMkN6WxPsHuwoXUzIYsAA="; ldflags = [ "-s" From 34fa41cdef1672bda83724ae81751136af6a8512 Mon Sep 17 00:00:00 2001 From: Ethan Carter Edwards Date: Thu, 13 Feb 2025 23:01:33 -0500 Subject: [PATCH 1901/2168] mailmap: add Ethan Carter Edwards Signed-off-by: Ethan Carter Edwards --- .mailmap | 1 + 1 file changed, 1 insertion(+) diff --git a/.mailmap b/.mailmap index 9004483d7055..49df384b5a67 100644 --- a/.mailmap +++ b/.mailmap @@ -5,6 +5,7 @@ Christina Sørensen Christina Sørensen Christina Sørensen <89321978+cafkafk@users.noreply.github.com> Daniel Løvbrøtte Olsen +Ethan Carter Edwards Ethan Edwards Fabian Affolter Fiona Behrens Fiona Behrens From 0ef972cbd3c4dc6e59d87a65d04ba6bb59a50a8c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 04:17:31 +0000 Subject: [PATCH 1902/2168] helmfile: 0.170.1 -> 0.171.0 --- pkgs/applications/networking/cluster/helmfile/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index ab8de1ab715f..e7e7bdc155a2 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "helmfile"; - version = "0.170.1"; + version = "0.171.0"; src = fetchFromGitHub { owner = "helmfile"; repo = "helmfile"; rev = "v${version}"; - hash = "sha256-qu/0l+4fZUk7H5sCZopmCNxja5hI5WwfXga90Yeuy7o="; + hash = "sha256-zZt0YxGbDqIhg2tXjQo5QnD09ASOUgFyQ1uWbGcujkc="; }; - vendorHash = "sha256-vAv/VlAvkPRWrOHDNkt4VdXXjqi65RVjYtvqSJjb8ds="; + vendorHash = "sha256-sGqnM40Y1nr9dXcSSC1lkwh1ToRLpCMiWJhyMcxxH9U="; proxyVendor = true; # darwin/linux hash mismatch From 1de88d0796202a27005c5a74474fd3cfb3069b82 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 14 Feb 2025 05:48:42 +0100 Subject: [PATCH 1903/2168] =?UTF-8?q?ocamlPackages.seqes:=200.2=20?= =?UTF-8?q?=E2=86=92=200.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/seqes/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/seqes/default.nix b/pkgs/development/ocaml-modules/seqes/default.nix index 00d68ffdbb16..77779c127e14 100644 --- a/pkgs/development/ocaml-modules/seqes/default.nix +++ b/pkgs/development/ocaml-modules/seqes/default.nix @@ -9,10 +9,10 @@ buildDunePackage rec { pname = "seqes"; - version = "0.2"; + version = "0.4"; src = fetchurl { - url = "https://gitlab.com/nomadic-labs/seqes/-/archive/${version}/seqes-${version}.tar.gz"; - sha256 = "sha256-IxLA0jaIPdX9Zn/GL8UHDJYjA1UBW6leGbZmp64YMjI="; + url = "https://gitlab.com/raphael-proust/seqes/-/archive/${version}/seqes-${version}.tar.gz"; + hash = "sha256-E4BalN68CJP7u6NSC0XBooWvUeSNqV+3KEOtoJ4g/dM="; }; minimalOCamlVersion = "4.14"; From 6d159b621e9de8871b11f16789baced48a64a3bf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 04:51:34 +0000 Subject: [PATCH 1904/2168] python312Packages.plaid-python: 28.1.0 -> 29.0.0 --- pkgs/development/python-modules/plaid-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index 694bca9edb1a..ef8da460c2c2 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "plaid-python"; - version = "28.1.0"; + version = "29.0.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "plaid_python"; inherit version; - hash = "sha256-FEw9cuCjQCU4vsZFg8/pn8i1g2XMVXno2PDZl8+iZoc="; + hash = "sha256-/HznxgYQvNxyAbYrvDK1yq8crZcd3fH5j9n2XmfGWTY="; }; build-system = [ setuptools ]; From 1f90bf052fa7be38b94f4cf09eb02f5dae478347 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 04:56:24 +0000 Subject: [PATCH 1905/2168] python312Packages.pyinstaller: 6.11.1 -> 6.12.0 --- pkgs/development/python-modules/pyinstaller/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyinstaller/default.nix b/pkgs/development/python-modules/pyinstaller/default.nix index 6bafe0a9b46e..878387fadeae 100644 --- a/pkgs/development/python-modules/pyinstaller/default.nix +++ b/pkgs/development/python-modules/pyinstaller/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "pyinstaller"; - version = "6.11.1"; + version = "6.12.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-SR37TZ1dHZZQ2VB9rsH/aClSeiVNjjlrrdYKCv/Lcu8="; + hash = "sha256-GDR5e+SM4bJgFa9oves8YabHUAE28E4Pxl5GgRXex3c="; }; build-system = [ setuptools ]; From 0001c6f4c5e10b8e198b341038e4fd6e6b9410bc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 05:07:03 +0000 Subject: [PATCH 1906/2168] mirrord: 3.131.2 -> 3.132.1 --- pkgs/by-name/mi/mirrord/manifest.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json index ae7afac8f32b..91c0a4f9a1be 100644 --- a/pkgs/by-name/mi/mirrord/manifest.json +++ b/pkgs/by-name/mi/mirrord/manifest.json @@ -1,21 +1,21 @@ { - "version": "3.131.2", + "version": "3.132.1", "assets": { "x86_64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.131.2/mirrord_linux_x86_64", - "hash": "sha256-S5esVEqssMZJdxlR8MMVgMbsZkgewD69cNT/lI1LerE=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.132.1/mirrord_linux_x86_64", + "hash": "sha256-O3AoKIK1DZ4We0Bqs60Jzyr/qVhC0SglMfErtkvNvtA=" }, "aarch64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.131.2/mirrord_linux_aarch64", - "hash": "sha256-2SC/6Q43AhUjx2i3kwCLHIMEnxp23qbUuFXYKZBLin8=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.132.1/mirrord_linux_aarch64", + "hash": "sha256-e+5Bd5PgAxqG5bOImA6f7L6mn42nb8AenV0MBI9HPLA=" }, "aarch64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.131.2/mirrord_mac_universal", - "hash": "sha256-uR7k9bE0J6Ald2joM+d51IbEIKBsigD+D5hAUeR17hk=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.132.1/mirrord_mac_universal", + "hash": "sha256-4R44hKYcJc7/Q6TJRrYtwBKtrda/ykID7mbVV1FCv/k=" }, "x86_64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.131.2/mirrord_mac_universal", - "hash": "sha256-uR7k9bE0J6Ald2joM+d51IbEIKBsigD+D5hAUeR17hk=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.132.1/mirrord_mac_universal", + "hash": "sha256-4R44hKYcJc7/Q6TJRrYtwBKtrda/ykID7mbVV1FCv/k=" } } } From 846779bc8ede0f0f21cac1b4be0b064876bc4c99 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Sun, 26 Jan 2025 11:15:23 -0800 Subject: [PATCH 1907/2168] nixos/yggdrasil: use exec to replace bash instance --- nixos/modules/services/networking/yggdrasil.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/yggdrasil.nix b/nixos/modules/services/networking/yggdrasil.nix index 0fb51400d666..ba77eb4d6d37 100644 --- a/nixos/modules/services/networking/yggdrasil.nix +++ b/nixos/modules/services/networking/yggdrasil.nix @@ -193,7 +193,7 @@ in "${binYggdrasil} -genconf") + " > /run/yggdrasil/yggdrasil.conf"} # start yggdrasil - ${binYggdrasil} -useconffile /run/yggdrasil/yggdrasil.conf ${lib.strings.escapeShellArgs cfg.extraArgs} + exec ${binYggdrasil} -useconffile /run/yggdrasil/yggdrasil.conf ${lib.strings.escapeShellArgs cfg.extraArgs} ''; serviceConfig = { From abd2bd2b7b014626e6013f9e889fb9248b8ae6ca Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 14 Feb 2025 09:29:32 +0300 Subject: [PATCH 1908/2168] path-of-building.data: 2.50.0 -> 2.51.0 Diff: https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.50.0...v2.51.0 --- pkgs/games/path-of-building/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/path-of-building/default.nix b/pkgs/games/path-of-building/default.nix index 1e30bcc831fe..7030784312d6 100644 --- a/pkgs/games/path-of-building/default.nix +++ b/pkgs/games/path-of-building/default.nix @@ -17,13 +17,13 @@ let data = stdenv.mkDerivation (finalAttrs: { pname = "path-of-building-data"; - version = "2.50.0"; + version = "2.51.0"; src = fetchFromGitHub { owner = "PathOfBuildingCommunity"; repo = "PathOfBuilding"; rev = "v${finalAttrs.version}"; - hash = "sha256-mclbLRYFNWgn/f4CyaINJlLq06uWh0+ks82Lger4w9w="; + hash = "sha256-Rau3UaWPyaI7QBXCNVtIQSenyNsx5hh2dsd3q8jFjc4="; }; nativeBuildInputs = [ unzip ]; From dd94d40531b4687b9d152cbd51ebb3d1ea7564c3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 14 Feb 2025 08:09:36 +0100 Subject: [PATCH 1909/2168] python313Packages.aiowebostv: 0.6.1 -> 0.6.2 Diff: https://github.com/home-assistant-libs/aiowebostv/compare/refs/tags/v0.6.1...v0.6.2 Changelog: https://github.com/home-assistant-libs/aiowebostv/releases/tag/v0.6.2 --- pkgs/development/python-modules/aiowebostv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiowebostv/default.nix b/pkgs/development/python-modules/aiowebostv/default.nix index 25961f216096..5720666d7865 100644 --- a/pkgs/development/python-modules/aiowebostv/default.nix +++ b/pkgs/development/python-modules/aiowebostv/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aiowebostv"; - version = "0.6.1"; + version = "0.6.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "aiowebostv"; tag = "v${version}"; - hash = "sha256-x1lpqR/e3itkRc/Cs3opXF4NzOZ17g/IcHZeGo234aM="; + hash = "sha256-H5ZhG69F5w1fZBepxqWGo29XnK3Tn6dgota64k2GJbw="; }; build-system = [ setuptools ]; From 737050544f65c02fd6c8f019492b00d222969d4e Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Fri, 14 Feb 2025 08:12:01 +0100 Subject: [PATCH 1910/2168] android-studio: use binary to launch IDE --- pkgs/applications/editors/android-studio/common.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 768e572b11c9..5ac252ff941b 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -100,7 +100,7 @@ let installPhase = '' cp -r . $out - wrapProgram $out/bin/studio.sh \ + wrapProgram $out/bin/studio \ --set-default JAVA_HOME "$out/jbr" \ --set ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \ --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \ @@ -204,6 +204,7 @@ let ] }" ''; + meta.mainProgram = "studio"; }; desktopItem = makeDesktopItem { @@ -279,7 +280,7 @@ let unset ANDROID_HOME fi ''} - exec ${fhsEnv}/bin/${drvName}-fhs-env ${androidStudio}/bin/studio.sh "$@" + exec ${fhsEnv}/bin/${drvName}-fhs-env ${lib.getExe androidStudio} "$@" ''; preferLocalBuild = true; allowSubstitutes = false; From 750686e53ce362561584a3bbfdaf4fd91e672c29 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 07:18:37 +0000 Subject: [PATCH 1911/2168] python312Packages.boto3-stubs: 1.36.18 -> 1.36.19 --- 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 66f5c4820e3f..d65ca334a831 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -359,7 +359,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.36.18"; + version = "1.36.19"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-DCTudrNZZbROqp6lsfGrpykwmKcknwKegsFcphoiF7w="; + hash = "sha256-ZE5mHF2tiCsxoGkdjVJ0yZ2415Ih0y6dfI0Hen+jiDQ="; }; build-system = [ setuptools ]; From 0d9c72fd95990d51c9e63a2a6ac0c44381447444 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 14 Feb 2025 08:36:31 +0100 Subject: [PATCH 1912/2168] open-webui: 0.5.11 -> 0.5.12 Diff: https://github.com/open-webui/open-webui/compare/refs/tags/v0.5.11...0.5.12 Changelog: https://github.com/open-webui/open-webui/blob/v0.5.12/CHANGELOG.md --- pkgs/by-name/op/open-webui/package.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix index a67b263f07fc..adcb569d4f04 100644 --- a/pkgs/by-name/op/open-webui/package.nix +++ b/pkgs/by-name/op/open-webui/package.nix @@ -7,19 +7,19 @@ }: let pname = "open-webui"; - version = "0.5.11"; + version = "0.5.12"; src = fetchFromGitHub { owner = "open-webui"; repo = "open-webui"; tag = "v${version}"; - hash = "sha256-U+zY/Jgzo52x/H4xcW2/LjM52r+hdJvZ/xsIeAeJniE="; + hash = "sha256-+Hg4tyfmgfh3k/pUKMjs7IRahPV2/LRUDj1kt2g45Dw="; }; frontend = buildNpmPackage { inherit pname version src; - npmDepsHash = "sha256-bAzcNLMB8OqzYRfw9Cr0xuFFl4FIKvBQT/4M2nZP0C8="; + npmDepsHash = "sha256-pM8Ie3kkjVq9OJHKpGLQ1E/omd84B0N8lXAHKxUa8/4="; # Disabling `pyodide:fetch` as it downloads packages during `buildPhase` # Until this is solved, running python packages from the browser will not work. @@ -89,8 +89,6 @@ python312.pkgs.buildPythonApplication rec { fake-useragent fastapi faster-whisper - flask - flask-cors fpdf2 ftfy gcp-storage-emulator From e0a1e676b5c82dc4356e9017ec93e9eee78b3825 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Fri, 14 Feb 2025 02:48:52 -0500 Subject: [PATCH 1913/2168] tailscale: 1.80.0 -> 1.80.2 Diff: https://github.com/tailscale/tailscale/compare/v1.80.0...v1.80.2 Changelog: https://github.com/tailscale/tailscale/releases/tag/v1.80.2 --- pkgs/by-name/ta/tailscale/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix index 0379e494f924..25358df2daad 100644 --- a/pkgs/by-name/ta/tailscale/package.nix +++ b/pkgs/by-name/ta/tailscale/package.nix @@ -16,7 +16,7 @@ }: let - version = "1.80.0"; + version = "1.80.2"; in buildGo123Module { pname = "tailscale"; @@ -31,7 +31,7 @@ buildGo123Module { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-wb52Ffoh56EEVToGGK1Rzfb5DHiR2dLxDJRLcUgYhFg="; + hash = "sha256-5HGY9hVSnzqmAdXNJdQ+ZvsK/PmyZ94201UHlHclQE8="; }; patches = [ @@ -43,7 +43,7 @@ buildGo123Module { }) ]; - vendorHash = "sha256-a+d02h0AXqr2FuWRAOUACiYVSpm276onkwKxGSJTL5s="; + vendorHash = "sha256-81UOjoC5GJqhNs4vWcQ2/B9FMaDWtl0rbuFXmxbu5dI="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ makeWrapper ] ++ [ installShellFiles From 95f49597d76febdae4c77280565616cc4e38b23c Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 14 Feb 2025 11:04:50 +0300 Subject: [PATCH 1914/2168] Revert "playwright-test: Add PLAYWRIGHT_BROWSERS_PATH to build environment" --- .../python-modules/playwright/default.nix | 16 ---------------- .../python-modules/playwright/test.py | 10 ---------- pkgs/development/web/playwright/driver.nix | 19 ------------------- pkgs/development/web/playwright/test.js | 8 -------- 4 files changed, 53 deletions(-) delete mode 100644 pkgs/development/python-modules/playwright/test.py delete mode 100644 pkgs/development/web/playwright/test.js diff --git a/pkgs/development/python-modules/playwright/default.nix b/pkgs/development/python-modules/playwright/default.nix index aea64bd48a2e..610e9c58b5ce 100644 --- a/pkgs/development/python-modules/playwright/default.nix +++ b/pkgs/development/python-modules/playwright/default.nix @@ -13,9 +13,6 @@ setuptools-scm, playwright-driver, nixosTests, - writeText, - runCommand, - pythonPackages, nodejs, }: @@ -84,16 +81,6 @@ buildPythonPackage rec { pyee ]; - setupHook = writeText "setupHook.sh" '' - addBrowsersPath () { - if [[ ! -v PLAYWRIGHT_BROWSERS_PATH ]] ; then - export PLAYWRIGHT_BROWSERS_PATH="${playwright-driver.browsers}" - fi - } - - addEnvHooks "$targetOffset" addBrowsersPath - ''; - postInstall = '' ln -s ${driver} $out/${python.sitePackages}/playwright/driver ''; @@ -109,9 +96,6 @@ buildPythonPackage rec { { driver = playwright-driver; browsers = playwright-driver.browsers; - env = runCommand "playwright-env-test" { - buildInputs = [ pythonPackages.playwright ]; - } "python ${./test.py}"; } // lib.optionalAttrs stdenv.hostPlatform.isLinux { inherit (nixosTests) playwright-python; diff --git a/pkgs/development/python-modules/playwright/test.py b/pkgs/development/python-modules/playwright/test.py deleted file mode 100644 index 3ef73acfdd41..000000000000 --- a/pkgs/development/python-modules/playwright/test.py +++ /dev/null @@ -1,10 +0,0 @@ -import os -import sys - -from playwright.sync_api import sync_playwright - -with sync_playwright() as p: - browser = p.chromium.launch() - context = browser.new_context() -with open(os.environ["out"], "w") as f: - f.write("OK") diff --git a/pkgs/development/web/playwright/driver.nix b/pkgs/development/web/playwright/driver.nix index 3cbb71599b01..ab0638768a08 100644 --- a/pkgs/development/web/playwright/driver.nix +++ b/pkgs/development/web/playwright/driver.nix @@ -12,7 +12,6 @@ makeFontsConf, makeWrapper, runCommand, - writeText, cacert, }: let @@ -189,27 +188,9 @@ let runHook postInstall ''; - setupHook = writeText "setupHook.sh" '' - addBrowsersPath () { - if [[ ! -v PLAYWRIGHT_BROWSERS_PATH ]] ; then - export PLAYWRIGHT_BROWSERS_PATH="${playwright-core.passthru.browsers}" - fi - } - - addEnvHooks "$targetOffset" addBrowsersPath - ''; - meta = playwright.meta // { mainProgram = "playwright"; }; - - passthru.tests.env = runCommand "playwright-core-env-test" { - buildInputs = [ - nodejs - playwright-core - playwright-test - ]; - } "node ${./test.js}"; }); browsers = lib.makeOverridable ( diff --git a/pkgs/development/web/playwright/test.js b/pkgs/development/web/playwright/test.js deleted file mode 100644 index 2390bfe513b1..000000000000 --- a/pkgs/development/web/playwright/test.js +++ /dev/null @@ -1,8 +0,0 @@ -const playwright = require('playwright'); -const fs = require('fs'); -playwright.chromium.launch() - .then((browser) => { - console.log('OK'); - fs.writeFileSync(process.env.out, ''); - process.exit(0); - }); From 94307683c174357137ec99c2ea82b6ebe02c29a3 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 14 Feb 2025 09:28:39 +0100 Subject: [PATCH 1915/2168] nixos/nextcloud: reword docs about logs a bit Originally, I only wanted to remove "The logreader application doesn't work, as it was the case before.". But then, the rest sounded a little weird, so I reworded the paragraph a bit more ;-) --- nixos/modules/services/web-apps/nextcloud.md | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/web-apps/nextcloud.md b/nixos/modules/services/web-apps/nextcloud.md index 9d49af27f55c..c9773f779ce7 100644 --- a/nixos/modules/services/web-apps/nextcloud.md +++ b/nixos/modules/services/web-apps/nextcloud.md @@ -253,16 +253,12 @@ This is because * the Logreader application that allows reading logs in the admin panel is enabled by default and requires logs written to a file. -The logreader application doesn't work, as it was the case before. -So nothing actionable here by default. Alternatively you can +If you want to view logs in the admin panel, +set [](#opt-services.nextcloud.settings.log_type) to "file". -* disable the logreader application to shut up the "info". - - We can't really do that by default since whether apps are enabled/disabled is part - of the application's state and tracked inside the database. - -* set [](#opt-services.nextcloud.settings.log_type) to "file" to be able to view logs - from the admin panel. +If you prefer logs in the journal, disable the logreader application to shut up the +"info". We can't really do that by default since whether apps are enabled/disabled +is part of the application's state and tracked inside the database. ## Maintainer information {#module-services-nextcloud-maintainer-info} From caade90015f0b8ddabe2eb9cfcd75077875c5074 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 14 Feb 2025 08:35:14 +0000 Subject: [PATCH 1916/2168] Revert "devenv: disable telemetry by default" This reverts commit 1aca3c42132e5231776c7199a78d6aec184be729. Since I'm the maintainer and author of this package, I was never asked if I agree with this change and I don't. It's going to make it really hard to improve the generation without telemetry, otherwise we wouldn't have done it. --- pkgs/by-name/de/devenv/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/de/devenv/package.nix b/pkgs/by-name/de/devenv/package.nix index 0153deb0433c..6e64ccf592e2 100644 --- a/pkgs/by-name/de/devenv/package.nix +++ b/pkgs/by-name/de/devenv/package.nix @@ -74,7 +74,6 @@ rustPlatform.buildRustPackage { wrapProgram $out/bin/devenv \ --prefix PATH ":" "$out/bin:${cachix}/bin" \ --set DEVENV_NIX ${devenv_nix} \ - --set-default DO_NOT_TRACK 1 \ ${setDefaultLocaleArchive} # Generate manpages From 51c0eeb414a49bf5ad5c70afb22b29787ee7994d Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Wed, 12 Feb 2025 22:42:30 -0800 Subject: [PATCH 1917/2168] llvmPackages_20: 20.1.0-rc1 -> 20.1.0-rc2 --- .../compilers/llvm/20/llvm/orcjit.patch | 53 ------------------- .../compilers/llvm/common/default.nix | 14 +++-- .../compilers/llvm/common/libc/default.nix | 17 +----- pkgs/development/compilers/llvm/default.nix | 2 +- 4 files changed, 12 insertions(+), 74 deletions(-) delete mode 100644 pkgs/development/compilers/llvm/20/llvm/orcjit.patch diff --git a/pkgs/development/compilers/llvm/20/llvm/orcjit.patch b/pkgs/development/compilers/llvm/20/llvm/orcjit.patch deleted file mode 100644 index c08e3f80d73b..000000000000 --- a/pkgs/development/compilers/llvm/20/llvm/orcjit.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 03d6f704d07aa3650a2f59be6f7802a8735460c3 Mon Sep 17 00:00:00 2001 -From: Lang Hames -Date: Wed, 29 Jan 2025 03:58:29 +0000 -Subject: [PATCH] [ORC][LLI] Remove redundant eh-frame registration plugin - construction from lli. - -As of d0052ebbe2e the setUpGenericLLVMIRPlatform function will automatically -add an instance of the EHFrameRegistrationPlugin (for LLJIT instances whose -object linking layers are ObjectLinkingLayers, not RTDyldObjectLinkingLayers). - -This commit removes the redundant plugin creation in the object linking -layer constructor function in lli.cpp to prevent duplicate registration of -eh-frames, which is likely the cause of recent bot failures, e.g. -https://lab.llvm.org/buildbot/#/builders/108/builds/8685. - -(cherry picked from commit 9052b37ab1aa67a039b34356f37236fecc42bac2) ---- - llvm/tools/lli/lli.cpp | 14 ++++---------- - 1 file changed, 4 insertions(+), 10 deletions(-) - -diff --git a/llvm/tools/lli/lli.cpp b/tools/lli/lli.cpp -index 448660a539a0b0..19246f03941673 100644 ---- a/llvm/tools/lli/lli.cpp -+++ b/tools/lli/lli.cpp -@@ -27,9 +27,7 @@ - #include "llvm/ExecutionEngine/Orc/AbsoluteSymbols.h" - #include "llvm/ExecutionEngine/Orc/DebugUtils.h" - #include "llvm/ExecutionEngine/Orc/Debugging/DebuggerSupport.h" --#include "llvm/ExecutionEngine/Orc/EHFrameRegistrationPlugin.h" - #include "llvm/ExecutionEngine/Orc/EPCDynamicLibrarySearchGenerator.h" --#include "llvm/ExecutionEngine/Orc/EPCEHFrameRegistrar.h" - #include "llvm/ExecutionEngine/Orc/EPCGenericRTDyldMemoryManager.h" - #include "llvm/ExecutionEngine/Orc/ExecutionUtils.h" - #include "llvm/ExecutionEngine/Orc/IRPartitionLayer.h" -@@ -1033,14 +1031,10 @@ int runOrcJIT(const char *ProgName) { - Builder.getJITTargetMachineBuilder() - ->setRelocationModel(Reloc::PIC_) - .setCodeModel(CodeModel::Small); -- Builder.setObjectLinkingLayerCreator([&P](orc::ExecutionSession &ES, -- const Triple &TT) { -- auto L = std::make_unique(ES); -- if (P != LLJITPlatform::ExecutorNative) -- L->addPlugin(std::make_unique( -- ES, ExitOnErr(orc::EPCEHFrameRegistrar::Create(ES)))); -- return L; -- }); -+ Builder.setObjectLinkingLayerCreator( -+ [&](orc::ExecutionSession &ES, const Triple &TT) { -+ return std::make_unique(ES); -+ }); - } - - auto J = ExitOnErr(Builder.create()); diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index 3b657ce5bb3f..116d7c6406e4 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -501,10 +501,16 @@ let }) ] ++ - lib.optional (lib.versions.major metadata.release_version == "20") - # Fix OrcJIT - # PR: https://github.com/llvm/llvm-project/pull/125431 - (metadata.getVersionFile "llvm/orcjit.patch"); + lib.optional (lib.versionAtLeast metadata.release_version "20") + # Fix OrcJIT tests with page sizes > 16k + # PR: https://github.com/llvm/llvm-project/pull/127115 + ( + fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/415607e10b56d0e6c4661ff1ec5b9b46bf433cba.patch"; + stripLen = 1; + hash = "sha256-vBbuduJB+NnNE9qtR93k64XKrwvc7w3vowjL/aT+iEA="; + } + ); pollyPatches = [ (metadata.getVersionFile "llvm/gnu-install-dirs-polly.patch") ] ++ lib.optional (lib.versionAtLeast metadata.release_version "15") diff --git a/pkgs/development/compilers/llvm/common/libc/default.nix b/pkgs/development/compilers/llvm/common/libc/default.nix index 900c884c72b4..f57239b7a978 100644 --- a/pkgs/development/compilers/llvm/common/libc/default.nix +++ b/pkgs/development/compilers/llvm/common/libc/default.nix @@ -14,7 +14,6 @@ ninja, isFullBuild ? true, linuxHeaders, - fetchpatch, }: let pname = "libc"; @@ -28,26 +27,12 @@ let ''); in stdenv.mkDerivation (finalAttrs: { - inherit pname version; + inherit pname version patches; src = src'; sourceRoot = "${finalAttrs.src.name}/runtimes"; - patches = - lib.optional (lib.versions.major version == "20") - # Removes invalid token from the LLVM version being placed in the namespace. - # Can be removed when LLVM 20 bumps to rc2. - # PR: https://github.com/llvm/llvm-project/pull/126284 - ( - fetchpatch { - url = "https://github.com/llvm/llvm-project/commit/3a3a3230d171e11842a9940b6da0f72022b1c5b3.patch"; - stripLen = 1; - hash = "sha256-QiU1cWp+027ZZNVdvfGVwbIoRd9jqtSbftGsmaW1gig="; - } - ) - ++ patches; - nativeBuildInputs = [ cmake diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index f2ac815b4b2c..68730c5c96d9 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -30,7 +30,7 @@ let "17.0.6".officialRelease.sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag="; "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE="; "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I="; - "20.1.0-rc1".officialRelease.sha256 = "sha256-yOczbperlR20+iLoao9g0CR+Ml2mjTCx1cqP/9WOhME="; + "20.1.0-rc2".officialRelease.sha256 = "sha256-lBx+MWfYBM6XSJozacALMGlo0DUUWqnsBQyO8lDljSo="; "21.0.0-git".gitRelease = { rev = "c9f1d2cbf18990311ea1287cc154e3784a10a3b0"; rev-version = "21.0.0-unstable-2025-02-10"; From 4eccb53550e827dbfabcaf48ee3c1d215105189b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 14 Feb 2025 09:42:43 +0100 Subject: [PATCH 1918/2168] nixos/tmpfiles: fix docs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes #381822 Apparently, I swapped `path` and `tmpfiles-type` in 2be50b1efee6a94bbc7397f1818468fd29f72ced. Sorry about that 🫠 Also giving `systemd.tmpfiles.settings....type` a better default in the manual than `‹name›`, i.e. `‹tmpfiles-type›` so that it corresponds to the placeholders in the attribute path. --- nixos/modules/system/boot/systemd/tmpfiles.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/systemd/tmpfiles.nix b/nixos/modules/system/boot/systemd/tmpfiles.nix index 5e35e63e96c1..8e2166785e9f 100644 --- a/nixos/modules/system/boot/systemd/tmpfiles.nix +++ b/nixos/modules/system/boot/systemd/tmpfiles.nix @@ -29,10 +29,11 @@ let }; }; default = {}; - type = attrsWith' "config-name" (attrsWith' "tmpfiles-type" (attrsWith' "path" (types.submodule ({ name, config, ... }: { + type = attrsWith' "config-name" (attrsWith' "path" (attrsWith' "tmpfiles-type" (types.submodule ({ name, config, ... }: { options.type = mkOption { type = types.str; default = name; + defaultText = "‹tmpfiles-type›"; example = "d"; description = '' The type of operation to perform on the file. From 47b0fc2bbe4f551bcf588f232736a93c337a8b12 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 14 Feb 2025 11:45:50 +0300 Subject: [PATCH 1919/2168] mangohud: fix crash --- pkgs/tools/graphics/mangohud/default.nix | 5 +++ pkgs/tools/graphics/mangohud/fix-crash.patch | 40 ++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 pkgs/tools/graphics/mangohud/fix-crash.patch diff --git a/pkgs/tools/graphics/mangohud/default.nix b/pkgs/tools/graphics/mangohud/default.nix index 15ebc4ea4fe6..8844acdb11c9 100644 --- a/pkgs/tools/graphics/mangohud/default.nix +++ b/pkgs/tools/graphics/mangohud/default.nix @@ -128,6 +128,11 @@ stdenv.mkDerivation (finalAttrs: { libdbus = dbus.lib; inherit hwdata; }) + + # Fix crash when starting hidden + # Upstream PR: https://github.com/flightlessmango/MangoHud/pull/1570 + # FIXME: remove when merged + ./fix-crash.patch ]; postPatch = '' diff --git a/pkgs/tools/graphics/mangohud/fix-crash.patch b/pkgs/tools/graphics/mangohud/fix-crash.patch new file mode 100644 index 000000000000..e25d953f300d --- /dev/null +++ b/pkgs/tools/graphics/mangohud/fix-crash.patch @@ -0,0 +1,40 @@ +From f0d7e4f4b2d362d90bb81d0b10ef5c505b9661ea Mon Sep 17 00:00:00 2001 +From: K900 +Date: Fri, 14 Feb 2025 11:41:09 +0300 +Subject: [PATCH] mangoapp: don't crash if gpus is not initialized yet + +This seems to happen on startup on Steam Deck style gamescope-session setups. +Just check for gpus = null before trying to access it. +--- + src/app/main.cpp | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/src/app/main.cpp b/src/app/main.cpp +index 0c7c13e07e..4d1d3b1277 100644 +--- a/src/app/main.cpp ++++ b/src/app/main.cpp +@@ -369,8 +369,9 @@ int main(int, char**) + XSync(x11_display, 0); + mangoapp_paused = false; + // resume all GPU threads +- for (auto gpu : gpus->available_gpus) +- gpu->resume(); ++ if (gpus) ++ for (auto gpu : gpus->available_gpus) ++ gpu->resume(); + } + { + std::unique_lock lk(mangoapp_m); +@@ -409,8 +410,9 @@ int main(int, char**) + XSync(x11_display, 0); + mangoapp_paused = true; + // pause all GPUs threads +- for (auto gpu : gpus->available_gpus) +- gpu->pause(); ++ if (gpus) ++ for (auto gpu : gpus->available_gpus) ++ gpu->pause(); + + // If mangoapp is hidden, using mangoapp_cv.wait() causes a hang. + // Because of this hang, we can't detect if the user presses R_SHIFT + F12, + From 2a46ccca6815efc9b7c87bc3918a18a89af557ba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 08:47:12 +0000 Subject: [PATCH 1920/2168] hyprprop: 0.1-unstable-2025-01-29 -> 0.1-unstable-2025-02-13 --- pkgs/by-name/hy/hyprprop/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/hy/hyprprop/package.nix b/pkgs/by-name/hy/hyprprop/package.nix index a4f2c5dc0ede..8c9bee6d7e72 100644 --- a/pkgs/by-name/hy/hyprprop/package.nix +++ b/pkgs/by-name/hy/hyprprop/package.nix @@ -14,13 +14,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "hyprprop"; - version = "0.1-unstable-2025-01-29"; + version = "0.1-unstable-2025-02-13"; src = fetchFromGitHub { owner = "hyprwm"; repo = "contrib"; - rev = "d449f6e1fc31084437ebc0c45057ee656f593efd"; - hash = "sha256-8ytokHHcKusbspRaiGP38s7fHU105JRvO9GRTzcRklg="; + rev = "59178a657b7e09ddf82b9e79681f482b6c2f378b"; + hash = "sha256-kXdVW89VJoG+W6N1u0m8hgK2VIWUAweQVzehRZwdNSo="; }; sourceRoot = "${finalAttrs.src.name}/hyprprop"; From 651d386da86edb5caf96cd67ac015331771f90a8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 08:49:38 +0000 Subject: [PATCH 1921/2168] descent3-unwrapped: 1.5.0-beta-unstable-2025-01-01 -> 1.5.0-beta-unstable-2025-02-13 --- pkgs/by-name/de/descent3-unwrapped/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/de/descent3-unwrapped/package.nix b/pkgs/by-name/de/descent3-unwrapped/package.nix index a8a994e29d68..766f28fe4bae 100644 --- a/pkgs/by-name/de/descent3-unwrapped/package.nix +++ b/pkgs/by-name/de/descent3-unwrapped/package.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { # the wrapped version of Descent 3. Once there’s a stable version of Descent # 3 that supports the -additionaldir command-line option, we can stop using # an unstable version of Descent 3. - version = "1.5.0-beta-unstable-2025-01-01"; + version = "1.5.0-beta-unstable-2025-02-13"; src = fetchFromGitHub { owner = "DescentDevelopers"; repo = "Descent3"; - rev = "11f93221e71201d51a71650a3b190017328cd721"; + rev = "10a20d7cb769a08010e7887b4701a0ecfb142492"; fetchSubmodules = true; leaveDotGit = true; # Descent 3 is supposed to display its Git commit hash in the bottom right @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { git rev-parse --verify HEAD | tr --delete '\n' > git-hash.txt rm -r .git ''; - hash = "sha256-L+Y8Eum9SjGpbbLnBH25uUI4UgCGDwrgE5op19GOAtQ="; + hash = "sha256-Ufu6oHLUn0eI6OTp8cfHRLYpx+tZ3QwX4qz3KpTbQ68="; }; hardeningDisable = [ "format" ]; From 7ae79977623904fe16fb6643a534fdae0cff456d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 09:02:17 +0000 Subject: [PATCH 1922/2168] protoc-gen-go: 1.36.4 -> 1.36.5 --- pkgs/by-name/pr/protoc-gen-go/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/protoc-gen-go/package.nix b/pkgs/by-name/pr/protoc-gen-go/package.nix index 90e748ccf96c..97b8995aa8dd 100644 --- a/pkgs/by-name/pr/protoc-gen-go/package.nix +++ b/pkgs/by-name/pr/protoc-gen-go/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "protoc-gen-go"; - version = "1.36.4"; + version = "1.36.5"; src = fetchFromGitHub { owner = "protocolbuffers"; repo = "protobuf-go"; rev = "v${version}"; - hash = "sha256-lDhg72i/5J4PMsdMPBthEpV3gFqr+ds3O4+rj6AZoMs="; + hash = "sha256-fotgvzHRRCDWRyGM9nP+BFhE0vN5/0jQlb5moOhDAWc="; }; vendorHash = "sha256-nGI/Bd6eMEoY0sBwWEtyhFowHVvwLKjbT4yfzFz6Z3E="; From 4012dc66c0812a87d53aa2c4962c16977fd15f9c Mon Sep 17 00:00:00 2001 From: Brian McGillion Date: Fri, 14 Feb 2025 07:06:08 +0400 Subject: [PATCH 1923/2168] volta: 1.0.1 -> 2.0.2 Fixes: #381910 Signed-off-by: Brian McGillion --- pkgs/by-name/vo/volta/Cargo.lock | 1918 ----------------------------- pkgs/by-name/vo/volta/package.nix | 16 +- 2 files changed, 5 insertions(+), 1929 deletions(-) delete mode 100644 pkgs/by-name/vo/volta/Cargo.lock diff --git a/pkgs/by-name/vo/volta/Cargo.lock b/pkgs/by-name/vo/volta/Cargo.lock deleted file mode 100644 index 0925a8cc91fd..000000000000 --- a/pkgs/by-name/vo/volta/Cargo.lock +++ /dev/null @@ -1,1918 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "ahash" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - -[[package]] -name = "aho-corasick" -version = "0.7.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" -dependencies = [ - "memchr", -] - -[[package]] -name = "android_system_properties" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7ed72e1635e121ca3e79420540282af22da58be50de153d36f81ddc6b83aa9e" -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 = "archive" -version = "0.1.0" -dependencies = [ - "attohttpc", - "cfg-if 1.0.0", - "flate2", - "fs-utils", - "hyperx", - "progress-read", - "tar", - "tee", - "thiserror", - "verbatim", - "zip", -] - -[[package]] -name = "assert-json-diff" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f1c3703dd33532d7f0ca049168930e9099ecac238e23cf932f3a69c42f06da" -dependencies = [ - "serde", - "serde_json", -] - -[[package]] -name = "attohttpc" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b85f766c20e6ae766956f7a2fcc4e0931e79a7e1f48b29132b5d647021114914" -dependencies = [ - "flate2", - "http", - "log", - "rustls", - "rustls-native-certs", - "serde", - "serde_json", - "url", - "webpki", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e49efa51329a5fd37e7c79db4621af617cd4e3e5bc224939808d076077077bf" - -[[package]] -name = "autocfg" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "block-buffer" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" -dependencies = [ - "block-padding", - "byte-tools", - "byteorder", - "generic-array", -] - -[[package]] -name = "block-padding" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d4dc3af3ee2e12f3e5d224e5e1e3d73668abbeb69e566d361f7d5563a4fdf09" -dependencies = [ - "byte-tools", -] - -[[package]] -name = "bumpalo" -version = "3.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" - -[[package]] -name = "byte-tools" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" - -[[package]] -name = "byteorder" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" - -[[package]] -name = "bytes" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" - -[[package]] -name = "bzip2" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42b7c3cbf0fa9c1b82308d57191728ca0256cb821220f4e2fd410a72ade26e3b" -dependencies = [ - "bzip2-sys", - "libc", -] - -[[package]] -name = "bzip2-sys" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6584aa36f5ad4c9247f5323b0a42f37802b37a836f0ad87084d7a33961abe25f" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "cc" -version = "1.0.73" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" - -[[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 = "chain-map" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc076b92c3d763b90697600bf9833c204b517ff911f64dcfb58221b0663d3ee9" - -[[package]] -name = "chrono" -version = "0.4.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" -dependencies = [ - "iana-time-zone", - "js-sys", - "num-integer", - "num-traits", - "time", - "wasm-bindgen", - "winapi", -] - -[[package]] -name = "ci_info" -version = "0.14.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62a62f39080c8c83e899dff6abd46c4fac05c1cf8dafece96ad8238e79addbf8" -dependencies = [ - "envmnt", -] - -[[package]] -name = "clap" -version = "2.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "ansi_term", - "atty", - "bitflags", - "strsim", - "textwrap 0.11.0", - "unicode-width", - "vec_map", -] - -[[package]] -name = "cmdline_words_parser" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75d8078f03daf673d8bd34a1ef48c680ea4a895204882ce5f0ccfb2487b2bd29" - -[[package]] -name = "colored" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" -dependencies = [ - "atty", - "lazy_static", - "winapi", -] - -[[package]] -name = "console" -version = "0.15.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" -dependencies = [ - "encode_unicode", - "lazy_static", - "libc", - "unicode-width", - "windows-sys 0.42.0", -] - -[[package]] -name = "core-foundation" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" - -[[package]] -name = "crc32fast" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" -dependencies = [ - "cfg-if 0.1.10", -] - -[[package]] -name = "ctrlc" -version = "3.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1631ca6e3c59112501a9d87fd86f21591ff77acd31331e8a73f8d80a65bbdd71" -dependencies = [ - "nix", - "windows-sys 0.42.0", -] - -[[package]] -name = "detect-indent" -version = "0.1.0" -source = "git+https://github.com/stefanpenner/detect-indent-rs?branch=master#f645bcc81bfb1f9745c4a4dec7c7f6faf3f84ec5" -dependencies = [ - "lazy_static", - "regex", -] - -[[package]] -name = "digest" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f47366984d3ad862010e22c7ce81a7dbcaebbdfb37241a620f8b6596ee135c" -dependencies = [ - "generic-array", -] - -[[package]] -name = "dirs" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "dunce" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bd4b30a6560bbd9b4620f4de34c3f14f60848e58a9b7216801afcb4c7b31c3c" - -[[package]] -name = "either" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" - -[[package]] -name = "encode_unicode" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90b2c9496c001e8cb61827acdefad780795c42264c137744cae6f7d9e3450abd" - -[[package]] -name = "envmnt" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fbb2fcaad9e6c9e3388dfcc1b44ae5508ae864b7af36f163a8a7c1a48796eee" -dependencies = [ - "fsio", - "indexmap", -] - -[[package]] -name = "envoy" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb34b6240ca977e7ab7dff6f060f9cb9a8f92c7745fe9e292b9443944d1aa768" - -[[package]] -name = "fake-simd" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" - -[[package]] -name = "fastrand" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "779d043b6a0b90cc4c0ed7ee380a6504394cee7efd7db050e3774eee387324b2" -dependencies = [ - "instant", -] - -[[package]] -name = "filetime" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0408e2626025178a6a7f7ffc05a25bc47103229f19c113755de7bf63816290c" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "redox_syscall", - "winapi", -] - -[[package]] -name = "flate2" -version = "1.0.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "fnv" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" - -[[package]] -name = "form_urlencoded" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" -dependencies = [ - "matches", - "percent-encoding", -] - -[[package]] -name = "fs-utils" -version = "0.1.0" - -[[package]] -name = "fs2" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "fsio" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09e87827efaf94c7a44b562ff57de06930712fe21b530c3797cdede26e6377eb" -dependencies = [ - "dunce", -] - -[[package]] -name = "generic-array" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" -dependencies = [ - "typenum", -] - -[[package]] -name = "getrandom" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi", -] - -[[package]] -name = "hamcrest2" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f837c62de05dc9cc71ff6486cd85de8856a330395ae338a04bfcefe5e91075" -dependencies = [ - "num", - "regex", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash", -] - -[[package]] -name = "heck" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "http" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" -dependencies = [ - "bytes", - "fnv", - "itoa 1.0.1", -] - -[[package]] -name = "httparse" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8734b0cfd3bc3e101ec59100e101c2eecd19282202e87808b3037b442777a83" - -[[package]] -name = "httpdate" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" - -[[package]] -name = "hyperx" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5617e92fc2f2501c3e2bc6ce547cad841adba2bae5b921c7e52510beca6d084c" -dependencies = [ - "base64", - "bytes", - "http", - "httpdate", - "language-tags", - "mime", - "percent-encoding", - "unicase", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef5528d9c2817db4e10cc78f8d4c8228906e5854f389ff6b076cee3572a09d35" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "js-sys", - "wasm-bindgen", - "winapi", -] - -[[package]] -name = "idna" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "indexmap" -version = "1.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" -dependencies = [ - "autocfg 1.0.0", - "hashbrown", -] - -[[package]] -name = "indicatif" -version = "0.17.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cef509aa9bc73864d6756f0d34d35504af3cf0844373afe9b8669a5b8005a729" -dependencies = [ - "console", - "number_prefix", - "portable-atomic", - "unicode-width", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "itoa" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f" - -[[package]] -name = "itoa" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" - -[[package]] -name = "js-sys" -version = "0.3.59" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "language-tags" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] -name = "libc" -version = "0.2.138" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8" - -[[package]] -name = "log" -version = "0.4.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "maplit" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08cbb6b4fef96b6d77bfc40ec491b1690c779e77b05cd9f07f787ed376fd4c43" - -[[package]] -name = "matches" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" - -[[package]] -name = "maybe-uninit" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - -[[package]] -name = "memchr" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" - -[[package]] -name = "mime" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e27ca21f40a310bd06d9031785f4801710d566c184a6e15bad4f1d9b65f9425" -dependencies = [ - "unicase", -] - -[[package]] -name = "miniz_oxide" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" -dependencies = [ - "adler", -] - -[[package]] -name = "mockito" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80f9fece9bd97ab74339fe19f4bcaf52b76dcc18e5364c7977c1838f76b38de9" -dependencies = [ - "assert-json-diff", - "colored", - "httparse", - "lazy_static", - "log", - "rand", - "regex", - "serde_json", - "serde_urlencoded", - "similar", -] - -[[package]] -name = "msdos_time" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aad9dfe950c057b1bfe9c1f2aa51583a8468ef2a5baba2ebbe06d775efeb7729" -dependencies = [ - "time", - "winapi", -] - -[[package]] -name = "nix" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46a58d1d356c6597d08cde02c2f09d785b09e28711837b1ed667dc652c08a694" -dependencies = [ - "bitflags", - "cfg-if 1.0.0", - "libc", - "static_assertions", -] - -[[package]] -name = "num" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4825417e1e1406b3782a8ce92f4d53f26ec055e3622e1881ca8e9f5f9e08db" -dependencies = [ - "num-bigint", - "num-complex", - "num-integer", - "num-iter", - "num-rational", - "num-traits", -] - -[[package]] -name = "num-bigint" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9c3f34cdd24f334cb265d9bf8bfa8a241920d026916785747a92f0e55541a1a" -dependencies = [ - "autocfg 0.1.4", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-complex" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb0cf31fb3ff77e6d2a6ebd6800df7fdcd106f2ad89113c9130bcd07f93dffc" -dependencies = [ - "autocfg 0.1.4", - "num-traits", -] - -[[package]] -name = "num-integer" -version = "0.1.41" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09" -dependencies = [ - "autocfg 0.1.4", - "num-traits", -] - -[[package]] -name = "num-iter" -version = "0.1.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bd5272412d173d6bf9afdf98db8612bbabc9a7a830b7bfc9c188911716132e" -dependencies = [ - "autocfg 0.1.4", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2885278d5fe2adc2f75ced642d52d879bffaceb5a2e0b1d4309ffdfb239b454" -dependencies = [ - "autocfg 0.1.4", - "num-bigint", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32" -dependencies = [ - "autocfg 0.1.4", -] - -[[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.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" - -[[package]] -name = "opaque-debug" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f5bb2e8e8dec81642920ccff6b61f1eb94fa3020c5a325c9851ff604152409" - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "os_info" -version = "3.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4750134fb6a5d49afc80777394ad5d95b04bc12068c6abb92fae8f43817270f" -dependencies = [ - "log", - "serde", - "winapi", -] - -[[package]] -name = "percent-encoding" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" - -[[package]] -name = "pest" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "933085deae3f32071f135d799d75667b63c8dc1f4537159756e3d4ceab41868c" -dependencies = [ - "ucd-trie", -] - -[[package]] -name = "pest_derive" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0" -dependencies = [ - "pest", - "pest_generator", -] - -[[package]] -name = "pest_generator" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63120576c4efd69615b5537d3d052257328a4ca82876771d6944424ccfd9f646" -dependencies = [ - "pest", - "pest_meta", - "proc-macro2 0.4.30", - "quote 0.6.12", - "syn 0.15.36", -] - -[[package]] -name = "pest_meta" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f249ea6de7c7b7aba92b4ff4376a994c6dbd98fd2166c89d5c4947397ecb574d" -dependencies = [ - "maplit", - "pest", - "sha-1", -] - -[[package]] -name = "podio" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "780fb4b6698bbf9cf2444ea5d22411cef2953f0824b98f33cf454ec5615645bd" - -[[package]] -name = "portable-atomic" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15eb2c6e362923af47e13c23ca5afb859e83d54452c55b0b9ac763b8f7c1ac16" - -[[package]] -name = "ppv-lite86" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea" - -[[package]] -name = "proc-macro2" -version = "0.4.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" -dependencies = [ - "unicode-xid", -] - -[[package]] -name = "proc-macro2" -version = "1.0.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "progress-read" -version = "0.1.0" - -[[package]] -name = "quote" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faf4799c5d274f3868a4aae320a0a182cbd2baee377b378f080e16a23e9d80db" -dependencies = [ - "proc-macro2 0.4.30", -] - -[[package]] -name = "quote" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" -dependencies = [ - "proc-macro2 1.0.47", -] - -[[package]] -name = "rand" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", - "rand_hc", -] - -[[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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rand_hc" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" -dependencies = [ - "rand_core", -] - -[[package]] -name = "readext" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abdc58f5f18bcf347b55cebb34ed4618b0feff9a9223160f5902adbc1f6a72a6" - -[[package]] -name = "redox_syscall" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" -dependencies = [ - "bitflags", -] - -[[package]] -name = "redox_users" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" -dependencies = [ - "getrandom", - "redox_syscall", -] - -[[package]] -name = "regex" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.6.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" - -[[package]] -name = "remove_dir_all" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" -dependencies = [ - "winapi", -] - -[[package]] -name = "retry" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9166d72162de3575f950507683fac47e30f6f2c3836b71b7fbc61aa517c9c5f4" -dependencies = [ - "rand", -] - -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin", - "untrusted", - "web-sys", - "winapi", -] - -[[package]] -name = "rustls" -version = "0.20.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aab8ee6c7097ed6057f43c187a62418d0c05a4bd5f18b3571db50ee0f9ce033" -dependencies = [ - "log", - "ring", - "sct", - "webpki", -] - -[[package]] -name = "rustls-native-certs" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" -dependencies = [ - "openssl-probe", - "rustls-pemfile", - "schannel", - "security-framework", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55" -dependencies = [ - "base64", -] - -[[package]] -name = "ryu" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c9613b5a66ab9ba26415184cfc41156594925a9cf3a2057e57f31ff145f6568" - -[[package]] -name = "same-file" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "schannel" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" -dependencies = [ - "lazy_static", - "windows-sys 0.36.1", -] - -[[package]] -name = "sct" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "security-framework" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" -dependencies = [ - "bitflags", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "semver" -version = "0.9.0" -source = "git+https://github.com/mikrostew/semver?branch=new-parser#7583eb352dc181ccd09978fd2b16461c1b1669c1" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver-parser" -version = "0.10.0" -source = "git+https://github.com/mikrostew/semver-parser?branch=rewrite#f5c74268a09eef16a289a667ca7b4925e690fe13" -dependencies = [ - "pest", - "pest_derive", -] - -[[package]] -name = "serde" -version = "1.0.152" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.152" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" -dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.2", - "syn 1.0.105", -] - -[[package]] -name = "serde_json" -version = "1.0.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" -dependencies = [ - "indexmap", - "itoa 1.0.1", - "ryu", - "serde", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9" -dependencies = [ - "form_urlencoded", - "itoa 0.4.4", - "ryu", - "serde", -] - -[[package]] -name = "sha-1" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23962131a91661d643c98940b20fcaffe62d776a823247be80a48fcb8b6fce68" -dependencies = [ - "block-buffer", - "digest", - "fake-simd", - "opaque-debug", -] - -[[package]] -name = "similar" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e24979f63a11545f5f2c60141afe249d4f19f84581ea2138065e400941d83d3" - -[[package]] -name = "smallvec" -version = "0.6.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97fcaeba89edba30f044a10c6a3cc39df9c3f17d7cd829dd1446cab35f890e0" -dependencies = [ - "maybe-uninit", -] - -[[package]] -name = "smawk" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043" - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "structopt" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16c2cdbf9cc375f15d1b4141bc48aeef444806655cd0e904207edc8d68d86ed7" -dependencies = [ - "clap", - "structopt-derive", -] - -[[package]] -name = "structopt-derive" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53010261a84b37689f9ed7d395165029f9cc7abb9f56bbfe86bee2597ed25107" -dependencies = [ - "heck", - "proc-macro2 0.4.30", - "quote 0.6.12", - "syn 0.15.36", -] - -[[package]] -name = "syn" -version = "0.15.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b4f551a91e2e3848aeef8751d0d4eec9489b6474c720fd4c55958d8d31a430c" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.12", - "unicode-xid", -] - -[[package]] -name = "syn" -version = "1.0.105" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908" -dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.2", - "unicode-ident", -] - -[[package]] -name = "tar" -version = "0.4.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" -dependencies = [ - "filetime", - "libc", - "xattr", -] - -[[package]] -name = "tee" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37c12559dba7383625faaff75be24becf35bfc885044375bcab931111799a3da" - -[[package]] -name = "tempfile" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" -dependencies = [ - "cfg-if 1.0.0", - "fastrand", - "libc", - "redox_syscall", - "remove_dir_all", - "winapi", -] - -[[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 = "test-support" -version = "0.1.0" -dependencies = [ - "archive", - "hamcrest2", - "serde_json", - "thiserror", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" -dependencies = [ - "smawk", - "unicode-linebreak", - "unicode-width", -] - -[[package]] -name = "thiserror" -version = "1.0.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" -dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.2", - "syn 1.0.105", -] - -[[package]] -name = "time" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" -dependencies = [ - "libc", - "wasi", - "winapi", -] - -[[package]] -name = "typenum" -version = "1.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec" - -[[package]] -name = "ucd-trie" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71a9c5b1fe77426cf144cc30e49e955270f5086e31a6441dfa8b32efc09b9d77" - -[[package]] -name = "unicase" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" -dependencies = [ - "version_check", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" -dependencies = [ - "matches", -] - -[[package]] -name = "unicode-ident" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" - -[[package]] -name = "unicode-linebreak" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5faade31a542b8b35855fff6e8def199853b2da8da256da52f52f1316ee3137" -dependencies = [ - "hashbrown", - "regex", -] - -[[package]] -name = "unicode-normalization" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426" -dependencies = [ - "smallvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1967f4cdfc355b37fd76d2a954fb2ed3871034eb4f26d60537d88795cfc332a9" - -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] -name = "unicode-xid" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" - -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "url" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22fe195a4f217c25b25cb5058ced57059824a678474874038dc88d211bf508d3" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "validate-npm-package-name" -version = "0.1.0" -dependencies = [ - "lazy_static", - "percent-encoding", - "regex", -] - -[[package]] -name = "vec_map" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" - -[[package]] -name = "verbatim" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbad0679079b451226e954019b2efac46bafa8f7b1418b953861e864072a97c6" - -[[package]] -name = "version_check" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce" - -[[package]] -name = "volta" -version = "1.1.1" -dependencies = [ - "atty", - "cfg-if 1.0.0", - "ci_info", - "dirs", - "envoy", - "hamcrest2", - "hyperx", - "lazy_static", - "log", - "mockito", - "semver", - "serde", - "serde_json", - "structopt", - "test-support", - "textwrap 0.16.0", - "volta-core", - "volta-migrate", - "which", - "winreg", -] - -[[package]] -name = "volta-core" -version = "0.1.0" -dependencies = [ - "archive", - "attohttpc", - "atty", - "cfg-if 1.0.0", - "chain-map", - "chrono", - "ci_info", - "cmdline_words_parser", - "console", - "ctrlc", - "detect-indent", - "dirs", - "dunce", - "envoy", - "fs-utils", - "fs2", - "hyperx", - "indexmap", - "indicatif", - "lazy_static", - "lazycell", - "log", - "mockito", - "once_cell", - "os_info", - "readext", - "regex", - "retry", - "semver", - "serde", - "serde_json", - "tempfile", - "term_size", - "textwrap 0.16.0", - "validate-npm-package-name", - "volta-layout", - "walkdir", - "winreg", -] - -[[package]] -name = "volta-layout" -version = "0.1.1" -dependencies = [ - "volta-layout-macro", -] - -[[package]] -name = "volta-layout-macro" -version = "0.1.0" -dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.2", - "syn 1.0.105", -] - -[[package]] -name = "volta-migrate" -version = "0.1.0" -dependencies = [ - "log", - "semver", - "serde", - "serde_json", - "tempfile", - "volta-core", - "volta-layout", - "walkdir", -] - -[[package]] -name = "walkdir" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" -dependencies = [ - "same-file", - "winapi", - "winapi-util", -] - -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - -[[package]] -name = "wasm-bindgen" -version = "0.2.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d" -dependencies = [ - "cfg-if 1.0.0", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2 1.0.47", - "quote 1.0.2", - "syn 1.0.105", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602" -dependencies = [ - "quote 1.0.2", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da" -dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.2", - "syn 1.0.105", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a" - -[[package]] -name = "web-sys" -version = "0.3.59" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed055ab27f941423197eb86b2035720b1a3ce40504df082cac2ecc6ed73335a1" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "which" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" -dependencies = [ - "either", - "libc", - "once_cell", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" -dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", -] - -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.0", - "windows_i686_gnu 0.42.0", - "windows_i686_msvc 0.42.0", - "windows_x86_64_gnu 0.42.0", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.0", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" - -[[package]] -name = "windows_i686_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" - -[[package]] -name = "windows_i686_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" - -[[package]] -name = "winreg" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" -dependencies = [ - "winapi", -] - -[[package]] -name = "xattr" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "244c3741f4240ef46274860397c7c74e50eb23624996930e484c16679633a54c" -dependencies = [ - "libc", -] - -[[package]] -name = "zip" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7341988e4535c60882d5e5f0b7ad0a9a56b080ade8bdb5527cb512f7b2180e0" -dependencies = [ - "bzip2", - "flate2", - "msdos_time", - "podio", - "time", -] diff --git a/pkgs/by-name/vo/volta/package.nix b/pkgs/by-name/vo/volta/package.nix index fd9b22836f55..84ca9c358e21 100644 --- a/pkgs/by-name/vo/volta/package.nix +++ b/pkgs/by-name/vo/volta/package.nix @@ -9,23 +9,17 @@ }: rustPlatform.buildRustPackage rec { pname = "volta"; - version = "1.1.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "volta-cli"; repo = "volta"; - rev = "v${version}"; - hash = "sha256-+j3WRpunV+3YfZnyuKA/CsiKr+gOaP2NbmnyoGMN+Mg="; + tag = "v${version}"; + hash = "sha256-ZI+3/Xbkg/JaZMLhrJEjaSwjs44fOaiRReM2DUTnkkc="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "detect-indent-0.1.0" = "sha256-qtPkPaBiyuT8GhpEFdU7IkAgKnCbTES0FB2CvNKWqic="; - "semver-0.9.0" = "sha256-nw1somkZe9Qi36vjfWlTcDqHAIbaJj72KBTfmucVxXs="; - "semver-parser-0.10.0" = "sha256-iTGnKSddsriF6JS6lvJNjp9aDzGtfjrHEiCijeie3uE="; - }; - }; + useFetchCargoVendor = true; + cargoHash = "sha256-xlqsubkaX2A6d5MIcGf9E0b11Gzneksgku0jvW+UdbE="; buildInputs = [ installShellFiles ] From de1b2782c95760818dcefc461f73264eb98300c7 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 14 Feb 2025 08:48:06 +0100 Subject: [PATCH 1924/2168] ocamlPackages.arg-complete: init at 0.2.1 --- .../ocaml-modules/arg-complete/default.nix | 31 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/ocaml-modules/arg-complete/default.nix diff --git a/pkgs/development/ocaml-modules/arg-complete/default.nix b/pkgs/development/ocaml-modules/arg-complete/default.nix new file mode 100644 index 000000000000..341971b35e88 --- /dev/null +++ b/pkgs/development/ocaml-modules/arg-complete/default.nix @@ -0,0 +1,31 @@ +{ + lib, + fetchurl, + ocaml, + buildDunePackage, + cppo, + ounit2, +}: + +buildDunePackage rec { + pname = "arg-complete"; + version = "0.2.1"; + + src = fetchurl { + url = "https://github.com/sim642/ocaml-arg-complete/releases/download/${version}/arg-complete-${version}.tbz"; + hash = "sha256-SZvLaeeqY3j2LUvqxGs0Vw57JnnpdvAk1jnE3pk27QU="; + }; + + nativeBuildInputs = [ cppo ]; + + doCheck = lib.versionAtLeast ocaml.version "4.08"; + checkInputs = [ ounit2 ]; + + meta = { + description = "Bash completion support for OCaml Stdlib.Arg"; + homepage = "https://sim642.github.io/ocaml-arg-complete/"; + changelog = "https://raw.githubusercontent.com/sim642/ocaml-arg-complete/refs/tags/${version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 09bda1d9cebe..10651337cb3e 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -38,6 +38,8 @@ let apron = callPackage ../development/ocaml-modules/apron { }; + arg-complete = callPackage ../development/ocaml-modules/arg-complete { }; + arp = callPackage ../development/ocaml-modules/arp { }; asai = callPackage ../development/ocaml-modules/asai { }; From 9c1f15d84574fbf20cfc4e766523c5a2a9a060a2 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 14 Feb 2025 08:48:26 +0100 Subject: [PATCH 1925/2168] =?UTF-8?q?ocamlPackages.mopsa:=201.0=20?= =?UTF-8?q?=E2=86=92=201.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/mopsa/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/mopsa/default.nix b/pkgs/development/ocaml-modules/mopsa/default.nix index 8f084ef9618d..456a7e85a663 100644 --- a/pkgs/development/ocaml-modules/mopsa/default.nix +++ b/pkgs/development/ocaml-modules/mopsa/default.nix @@ -11,6 +11,7 @@ ocaml, menhir, apron, + arg-complete, camlidl, yojson, zarith, @@ -18,15 +19,15 @@ buildDunePackage rec { pname = "mopsa"; - version = "1.0"; + version = "1.1"; - minimalOCamlVersion = "4.12"; + minimalOCamlVersion = "4.13"; src = fetchFromGitLab { owner = "mopsa"; repo = "mopsa-analyzer"; - rev = "v${version}"; - hash = "sha256-nGnWwV7g3SYgShbXGUMooyOdFwXFrQHnQvlc8x9TAS4="; + tag = "v${version}"; + hash = "sha256-lO5dtGAl1dq8oJco/hPXrAbN05rKc62Zrci/8CLrQ0c="; }; nativeBuildInputs = [ @@ -36,6 +37,7 @@ buildDunePackage rec { ]; buildInputs = [ + arg-complete camlidl flint libclang From 6d15f89453891d4b8d02cce521b35a8b09c834b5 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 14 Feb 2025 12:00:53 +0300 Subject: [PATCH 1926/2168] hawkeye: switch to fetchCargoVendor --- pkgs/by-name/ha/hawkeye/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ha/hawkeye/package.nix b/pkgs/by-name/ha/hawkeye/package.nix index 36d883ccdc56..6ffc0cc3f428 100644 --- a/pkgs/by-name/ha/hawkeye/package.nix +++ b/pkgs/by-name/ha/hawkeye/package.nix @@ -16,7 +16,8 @@ rustPackages.rustPlatform.buildRustPackage rec { hash = "sha256-VfJWj9BwNVR7RVUW+CjFuaniyiEath1U0F/7QJcA3r4="; }; - cargoHash = "sha256-tTXoxWjcTtEcRcuSs0ewCN1VJYmTIKRgL3s7QSYt7sk="; + useFetchCargoVendor = true; + cargoHash = "sha256-SJEl5QsO4KYRv+5xDPHy1Q53qcL89IJ9JTXtzubO5fk="; nativeBuildInputs = [ pkg-config From 8c76cbea6a534bae8a5c9ebfa830c714ef319725 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 14 Feb 2025 12:01:41 +0300 Subject: [PATCH 1927/2168] llvmPackages.libc: rename shim .so to .tpl This makes it not get deleted with cleanSource. --- pkgs/development/compilers/llvm/common/libc/default.nix | 2 +- .../compilers/llvm/common/libc/{libc-shim.so => libc-shim.tpl} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/compilers/llvm/common/libc/{libc-shim.so => libc-shim.tpl} (100%) diff --git a/pkgs/development/compilers/llvm/common/libc/default.nix b/pkgs/development/compilers/llvm/common/libc/default.nix index f57239b7a978..2ba098da2814 100644 --- a/pkgs/development/compilers/llvm/common/libc/default.nix +++ b/pkgs/development/compilers/llvm/common/libc/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { ''; postInstall = lib.optionalString (!isFullBuild) '' - substituteAll ${./libc-shim.so} $out/lib/libc.so + substituteAll ${./libc-shim.tpl} $out/lib/libc.so ''; libc = if (!isFullBuild) then stdenv.cc.libc else null; diff --git a/pkgs/development/compilers/llvm/common/libc/libc-shim.so b/pkgs/development/compilers/llvm/common/libc/libc-shim.tpl similarity index 100% rename from pkgs/development/compilers/llvm/common/libc/libc-shim.so rename to pkgs/development/compilers/llvm/common/libc/libc-shim.tpl From 0141b8e1af43116e0a9d7cfbd0419a31aa62b4f2 Mon Sep 17 00:00:00 2001 From: misilelab Date: Fri, 14 Feb 2025 18:38:36 +0900 Subject: [PATCH 1928/2168] deno: 2.1.9 -> 2.1.10 --- pkgs/by-name/de/deno/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix index 85eb410a4404..103b7f928761 100644 --- a/pkgs/by-name/de/deno/package.nix +++ b/pkgs/by-name/de/deno/package.nix @@ -18,17 +18,17 @@ let in rustPlatform.buildRustPackage rec { pname = "deno"; - version = "2.1.9"; + version = "2.1.10"; src = fetchFromGitHub { owner = "denoland"; repo = "deno"; tag = "v${version}"; - hash = "sha256-a3oMEZIs9RkD0T4saeaCuQh0VrdNXciKwPJaHO7/Y3I="; + hash = "sha256-1NqBNrTYHhsG6O2qsgANM15FOxx3xheE9T3nYDDH1D0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-UqjkO3k77nUGnV8V4TDC3BbA+jR6/h2wGkgSLus0yVA="; + cargoHash = "sha256-D7dt9RdlTmR2C1dwOl5vZKUlLUnTkdudtZ4FQpr9ddU="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds From a98bc598fbd9accdad41aff1d7a2adf716014452 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 14 Feb 2025 10:43:59 +0100 Subject: [PATCH 1929/2168] npth.meta.mainProgram: remove non-existent npth hasn't come with any executables since 1.7. Fixes: f44a9f89a9eb ("npth: 1.6 -> 1.7") --- pkgs/by-name/np/npth/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/np/npth/package.nix b/pkgs/by-name/np/npth/package.nix index 16e386e72143..646102b031a0 100644 --- a/pkgs/by-name/np/npth/package.nix +++ b/pkgs/by-name/np/npth/package.nix @@ -34,7 +34,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "New GNU Portable Threads Library"; - mainProgram = "npth-config"; longDescription = '' This is a library to provide the GNU Pth API and thus a non-preemptive threads implementation. From 30d2e2d796847a98ad0cf638bcf9a5695abad1e8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 09:49:15 +0000 Subject: [PATCH 1930/2168] minio-warp: 1.0.8 -> 1.1.0 --- pkgs/by-name/mi/minio-warp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/minio-warp/package.nix b/pkgs/by-name/mi/minio-warp/package.nix index 6b5ad34ee504..123bc96b7e3e 100644 --- a/pkgs/by-name/mi/minio-warp/package.nix +++ b/pkgs/by-name/mi/minio-warp/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "minio-warp"; - version = "1.0.8"; + version = "1.1.0"; src = fetchFromGitHub { owner = "minio"; repo = "warp"; rev = "v${version}"; - hash = "sha256-kME4yafNZtHDF/EAIG8qR4PH6HlokIfdBAJH+ibl5ro="; + hash = "sha256-8GQ0rSy+bzji1IZu6vHEXjYVVuQSLlSCwWmzjLE9a+A="; }; - vendorHash = "sha256-073ssCOh0CiiJaatwzhNrwpe2QO21iC6GSkwVtsmYjs="; + vendorHash = "sha256-Qyb8ivuZplbOIxoS2cC+2FSZbW7CnChv1jaIKkCzgN4="; # See .goreleaser.yml ldflags = [ From 6a8151a2aa578595f1ffd6969e7b3b9af6beef53 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 11:02:58 +0100 Subject: [PATCH 1931/2168] volta: cleanup --- pkgs/by-name/vo/volta/package.nix | 56 ++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/vo/volta/package.nix b/pkgs/by-name/vo/volta/package.nix index 84ca9c358e21..baf2030aa164 100644 --- a/pkgs/by-name/vo/volta/package.nix +++ b/pkgs/by-name/vo/volta/package.nix @@ -1,11 +1,13 @@ { lib, - rustPlatform, - libiconv, stdenv, - installShellFiles, - darwin, + rustPlatform, fetchFromGitHub, + installShellFiles, + buildPackages, + writableTmpDirAsHomeHook, + versionCheckHook, + nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "volta"; @@ -21,22 +23,35 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-xlqsubkaX2A6d5MIcGf9E0b11Gzneksgku0jvW+UdbE="; - buildInputs = - [ installShellFiles ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - libiconv - ]; + buildInputs = [ installShellFiles ]; - HOME = "$TMPDIR"; + postInstall = + let + emulator = stdenv.hostPlatform.emulator buildPackages; + in + '' + installShellCompletion --cmd volta \ + --bash <(${emulator} $out/bin/volta completions bash) \ + --fish <(${emulator} $out/bin/volta completions fish) \ + --zsh <(${emulator} $out/bin/volta completions zsh) + ''; - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - installShellCompletion --cmd volta \ - --bash <($out/bin/volta completions bash) \ - --fish <($out/bin/volta completions fish) \ - --zsh <($out/bin/volta completions zsh) - ''; - meta = with lib; { + nativeCheckInputs = [ + writableTmpDirAsHomeHook + ]; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + # Tries to create /var/empty/.volta as $HOME is not writable + doInstallCheck = !stdenv.hostPlatform.isDarwin; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { description = "Hassle-Free JavaScript Tool Manager"; longDescription = '' With Volta, you can select a Node engine once and then stop worrying @@ -50,7 +65,8 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://volta.sh/"; changelog = "https://github.com/volta-cli/volta/blob/main/RELEASES.md"; - license = with licenses; [ bsd2 ]; - maintainers = with maintainers; [ fbrs ]; + license = with lib.licenses; [ bsd2 ]; + maintainers = with lib.maintainers; [ fbrs ]; + mainProgram = "volta"; }; } From e1584ee86752a5dd3f673c83715698be1187d70d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Thu, 13 Feb 2025 15:29:20 +0100 Subject: [PATCH 1932/2168] dbeaver-bin: fix with noBrokenSymlinks --- pkgs/by-name/db/dbeaver-bin/package.nix | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix index 88eafe1938d8..e543b159ad78 100644 --- a/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/pkgs/by-name/db/dbeaver-bin/package.nix @@ -60,6 +60,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { --replace-fail '-Xmx1024m' '-Xmx${override_xmx}' ''; + preInstall = '' + # most directories are for different architectures, only keep what we need + shopt -s extglob + pushd ${lib.optionalString stdenvNoCC.hostPlatform.isDarwin "Contents/Eclipse/"}plugins/com.sun.jna_5.15.0.v20240915-2000/com/sun/jna/ + rm -r !(ptr|internal|linux-x86-64|linux-aarch64|darwin-x86-64|darwin-aarch64)/ + popd + ''; + installPhase = if !stdenvNoCC.hostPlatform.isDarwin then '' @@ -81,7 +89,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { }" mkdir -p $out/share/icons/hicolor/256x256/apps - ln -s $out/opt/dbeaver/dbeaver.png $out/share/icons/hicolor/256x256/apps/dbeaver.png + # for some reason it's missing from the aarch64 build + if [ -e $out/opt/dbeaver/dbeaver.png ]; then + ln -s $out/opt/dbeaver/dbeaver.png $out/share/icons/hicolor/256x256/apps/dbeaver.png + fi mkdir -p $out/share/applications ln -s $out/opt/dbeaver/dbeaver-ce.desktop $out/share/applications/dbeaver.desktop @@ -107,14 +118,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; - preFixup = '' - # most directories are for different architectures, only keep what we need - shopt -s extglob - pushd $out/opt/dbeaver/plugins/com.sun.jna_5.15.0.v20240915-2000/com/sun/jna/ - rm -r !(ptr|internal|linux-x86-64|linux-aarch64|darwin-x86-64|darwin-aarch64)/ - popd - ''; - passthru.updateScript = ./update.sh; meta = { From 705197828d78a5973940cb6d30d0ea27ad893068 Mon Sep 17 00:00:00 2001 From: ZHAO Jin-Xiang Date: Fri, 14 Feb 2025 18:23:27 +0800 Subject: [PATCH 1933/2168] affine: cleaning --- pkgs/by-name/af/affine/package.nix | 390 ++++++++++++++--------------- 1 file changed, 194 insertions(+), 196 deletions(-) diff --git a/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine/package.nix index 5b6e9caa9e79..0c8211f10b52 100644 --- a/pkgs/by-name/af/affine/package.nix +++ b/pkgs/by-name/af/affine/package.nix @@ -1,23 +1,24 @@ { - cacert, - cargo, - copyDesktopItems, - fetchFromGitHub, - fetchurl, - findutils, - jq, lib, - makeDesktopItem, - makeWrapper, - rsync, - rustPlatform, - rustc, stdenv, stdenvNoCC, - yarn-berry, - zip, + fetchFromGitHub, + rustPlatform, electron_33, nodejs_20, + yarn-berry, + cacert, + writableTmpDirAsHomeHook, + cargo, + rustc, + findutils, + zip, + rsync, + jq, + copyDesktopItems, + makeWrapper, + makeDesktopItem, + nix-update-script, buildType ? "stable", commandLineArgs ? "", }: @@ -34,213 +35,210 @@ let electron = electron_33; nodejs = nodejs_20; yarn = yarn-berry.override { inherit nodejs; }; + productName = if buildType != "stable" then "AFFiNE-${buildType}" else "AFFiNE"; + binName = lib.toLower productName; in -stdenv.mkDerivation ( - finalAttrs: - ( - { - productName = if buildType == "stable" then "AFFiNE" else "AFFiNE-" + buildType; - binName = lib.toLower finalAttrs.productName; - pname = finalAttrs.binName; +stdenv.mkDerivation (finalAttrs: { + pname = binName; - # https://github.com/toeverything/AFFiNE/releases/tag/v0.18.1 - version = "0.18.1"; - GITHUB_SHA = "8b066a4b398aace25a20508a8e3c1a381721971f"; - src = fetchFromGitHub { - owner = "toeverything"; - repo = "AFFiNE"; - rev = finalAttrs.GITHUB_SHA; - hash = "sha256-TWwojG3lqQlQFX3BKoFjJ27a3T/SawXgNDO6fP6gW4k="; - }; + version = "0.18.1"; + src = fetchFromGitHub { + owner = "toeverything"; + repo = "AFFiNE"; + tag = "v${finalAttrs.version}"; + hash = "sha256-TWwojG3lqQlQFX3BKoFjJ27a3T/SawXgNDO6fP6gW4k="; + }; - meta = - { - description = "Workspace with fully merged docs, whiteboards and databases"; - longDescription = '' - AFFiNE is an open-source, all-in-one workspace and an operating - system for all the building blocks that assemble your knowledge - base and much more -- wiki, knowledge management, presentation - and digital assets - ''; - homepage = "https://affine.pro/"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ xiaoxiangmoe ]; - platforms = [ - "aarch64-darwin" - "aarch64-linux" - "x86_64-darwin" - "x86_64-linux" - ]; - sourceProvenance = [ lib.sourceTypes.fromSource ]; - } - // lib.optionalAttrs hostPlatform.isLinux { - mainProgram = finalAttrs.binName; - }; - - env = { - BUILD_TYPE = buildType; - }; - cargoDeps = rustPlatform.fetchCargoVendor { - src = finalAttrs.src; - hash = "sha256-5s/X9CD/H9rSn7SqMHioLg1KRP7y9fsozdFRY3hNiP8="; - }; - yarnOfflineCache = stdenvNoCC.mkDerivation { - name = "yarn-offline-cache"; - src = finalAttrs.src; - nativeBuildInputs = [ - yarn - cacert - ]; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) pname version src; + hash = "sha256-5s/X9CD/H9rSn7SqMHioLg1KRP7y9fsozdFRY3hNiP8="; + }; + yarnOfflineCache = stdenvNoCC.mkDerivation { + name = "yarn-offline-cache"; + inherit (finalAttrs) src; + nativeBuildInputs = [ + yarn + cacert + writableTmpDirAsHomeHook + ]; + # force yarn install run in CI mode + env.CI = "1"; + buildPhase = + let supportedArchitectures = builtins.toJSON { os = [ "darwin" "linux" ]; cpu = [ - "arm64" "x64" + "ia32" + "arm64" ]; libc = [ "glibc" "musl" ]; }; - buildPhase = '' - export HOME="$NIX_BUILD_TOP" - export CI=1 - - mkdir -p $out - yarn config set enableTelemetry false - yarn config set cacheFolder $out - yarn config set enableGlobalCache false - yarn config set supportedArchitectures --json "$supportedArchitectures" - - yarn install --immutable --mode=skip-build - ''; - dontInstall = true; - outputHashMode = "recursive"; - outputHash = "sha256-HueTia+1ApfvbBK/b+iE84TB1DCWIDLoQ9XhjYlGCUs="; - }; - nativeBuildInputs = - [ - nodejs - yarn - cargo - rustc - findutils - zip - jq - rsync - ] - ++ lib.optionals hostPlatform.isLinux [ - copyDesktopItems - makeWrapper - ]; - - patchPhase = '' - runHook prePatchPhase - - sed -i '/packagerConfig/a \ electronZipDir: process.env.ELECTRON_FORGE_ELECTRON_ZIP_DIR,' packages/frontend/apps/electron/forge.config.mjs - - runHook postPatchPhase - ''; - - configurePhase = - let - electronContentPath = - electron + (if hostPlatform.isLinux then "/libexec/electron/" else "/Applications/"); - in - '' - runHook preConfigurePhase - - export HOME="$NIX_BUILD_TOP" - export CI=1 - - # cargo config - mkdir -p .cargo - cat $cargoDeps/.cargo/config.toml >> .cargo/config.toml - ln -s $cargoDeps @vendor@ - - # yarn config - yarn config set enableTelemetry false - yarn config set enableGlobalCache false - yarn config set cacheFolder $yarnOfflineCache - - # electron config - ELECTRON_VERSION_IN_LOCKFILE=$(yarn why electron --json | tail --lines 1 | jq --raw-output '.children | to_entries | first | .key ' | cut -d : -f 2) - rsync --archive --chmod=u+w ${electronContentPath} $HOME/.electron-prebuilt-zip-tmp - export ELECTRON_FORGE_ELECTRON_ZIP_DIR=$PWD/.electron_zip_dir - mkdir -p $ELECTRON_FORGE_ELECTRON_ZIP_DIR - (cd $HOME/.electron-prebuilt-zip-tmp && zip --recurse-paths - .) > $ELECTRON_FORGE_ELECTRON_ZIP_DIR/electron-v$ELECTRON_VERSION_IN_LOCKFILE-${nodePlatform}-${nodeArch}.zip - export ELECTRON_SKIP_BINARY_DOWNLOAD=1 - - runHook postConfigurePhase - ''; - buildPhase = '' + in + '' runHook preBuild - # first build - yarn workspaces focus @affine/electron @affine/monorepo - CARGO_NET_OFFLINE=true yarn workspace @affine/native build - BUILD_TYPE=${buildType} SKIP_NX_CACHE=1 yarn workspace @affine/electron generate-assets + mkdir -p $out + yarn config set enableTelemetry false + yarn config set cacheFolder $out + yarn config set enableGlobalCache false + yarn config set supportedArchitectures --json '${supportedArchitectures}' - # second build - yarn config set nmMode classic - yarn config set nmHoistingLimits workspaces - find . -name 'node_modules' -type d -prune -exec rm -rf '{}' + - yarn workspaces focus @affine/electron @affine/monorepo - BUILD_TYPE=${buildType} SKIP_WEB_BUILD=1 SKIP_BUNDLE=1 HOIST_NODE_MODULES=1 yarn workspace @affine/electron make + yarn install --immutable --mode=skip-build runHook postBuild ''; - installPhase = - let - inherit (finalAttrs) binName productName; - in - if hostPlatform.isDarwin then - '' - runHook preInstall + dontInstall = true; + outputHashMode = "recursive"; + outputHash = "sha256-HueTia+1ApfvbBK/b+iE84TB1DCWIDLoQ9XhjYlGCUs="; + }; + nativeBuildInputs = + [ + nodejs + yarn + cargo + rustc + findutils + zip + jq + rsync + writableTmpDirAsHomeHook + ] + ++ lib.optionals hostPlatform.isLinux [ + copyDesktopItems + makeWrapper + ]; - mkdir -p $out/Applications - mv packages/frontend/apps/electron/out/${buildType}/${productName}-darwin-${nodeArch}/${productName}.app $out/Applications + # force yarn install run in CI mode + env.CI = "1"; - runHook postInstall - '' - else - '' - runHook preInstall + # Remove code under The AFFiNE Enterprise Edition (EE) license. + # Keep file package.json for `yarn install --immutable` lockfile check. + postPatch = '' + BACKEND_SERVER_PACKAGE_JSON="$(jq 'del(.scripts.postinstall)' packages/backend/server/package.json)" + rm -rf packages/backend/server/{.*,*} + echo "$BACKEND_SERVER_PACKAGE_JSON" > packages/backend/server/package.json + ''; + patchPhase = '' + runHook prePatchPhase - mkdir --parents $out/lib/${binName}/ - mv packages/frontend/apps/electron/out/${buildType}/${productName}-linux-${nodeArch}/{resources,LICENSE*} $out/lib/${binName}/ - install -Dm644 packages/frontend/apps/electron/resources/icons/icon_${buildType}_64x64.png $out/share/icons/hicolor/64x64/apps/${binName}.png + sed -i '/packagerConfig/a \ electronZipDir: process.env.ELECTRON_FORGE_ELECTRON_ZIP_DIR,' packages/frontend/apps/electron/forge.config.mjs - makeWrapper "${electron}/bin/electron" $out/bin/${binName} \ - --inherit-argv0 \ - --add-flags $out/lib/${binName}/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ - --add-flags ${lib.escapeShellArg commandLineArgs} + runHook postPatchPhase + ''; - runHook postInstall - ''; - } - // (lib.optionalAttrs hostPlatform.isLinux { - desktopItems = - let - inherit (finalAttrs) binName productName; - in - [ - (makeDesktopItem { - name = binName; - desktopName = productName; - comment = "AFFiNE Desktop App"; - exec = "${binName} %U"; - terminal = false; - icon = binName; - startupWMClass = binName; - categories = [ "Utility" ]; - mimeTypes = [ "x-scheme-handler/${binName}" ]; - }) - ]; + configurePhase = '' + runHook preConfigurePhase + + # cargo config + mkdir -p .cargo + cat $cargoDeps/.cargo/config.toml >> .cargo/config.toml + ln -s $cargoDeps @vendor@ + + # yarn config + yarn config set enableTelemetry false + yarn config set enableGlobalCache false + yarn config set cacheFolder $yarnOfflineCache + + # electron config + ELECTRON_VERSION_IN_LOCKFILE=$(yarn why electron --json | tail --lines 1 | jq --raw-output '.children | to_entries | first | .key ' | cut -d : -f 2) + rsync --archive --chmod=u+w "${electron.dist}/" $HOME/.electron-prebuilt-zip-tmp + export ELECTRON_FORGE_ELECTRON_ZIP_DIR=$PWD/.electron_zip_dir + mkdir -p $ELECTRON_FORGE_ELECTRON_ZIP_DIR + (cd $HOME/.electron-prebuilt-zip-tmp && zip --recurse-paths - .) > $ELECTRON_FORGE_ELECTRON_ZIP_DIR/electron-v$ELECTRON_VERSION_IN_LOCKFILE-${nodePlatform}-${nodeArch}.zip + export ELECTRON_SKIP_BINARY_DOWNLOAD=1 + + runHook postConfigurePhase + ''; + + buildPhase = '' + runHook preBuild + + # first build + yarn workspaces focus @affine/electron @affine/monorepo + CARGO_NET_OFFLINE=true yarn workspace @affine/native build + GITHUB_SHA=ffffffffffffffffffffffffffffffffffffffff BUILD_TYPE=${buildType} SKIP_NX_CACHE=1 yarn workspace @affine/electron generate-assets + + # second build + yarn config set nmMode classic + yarn config set nmHoistingLimits workspaces + find . -name 'node_modules' -type d -prune -exec rm -rf '{}' + + yarn workspaces focus @affine/electron @affine/monorepo + BUILD_TYPE=${buildType} SKIP_WEB_BUILD=1 SKIP_BUNDLE=1 HOIST_NODE_MODULES=1 yarn workspace @affine/electron make + + runHook postBuild + ''; + + installPhase = + if hostPlatform.isDarwin then + '' + runHook preInstall + + mkdir -p $out/Applications + mv packages/frontend/apps/electron/out/${buildType}/${productName}-darwin-${nodeArch}/${productName}.app $out/Applications + + runHook postInstall + '' + else + '' + runHook preInstall + + mkdir --parents $out/lib/${binName}/ + mv packages/frontend/apps/electron/out/${buildType}/${productName}-linux-${nodeArch}/{resources,LICENSE*} $out/lib/${binName}/ + install -Dm644 packages/frontend/apps/electron/resources/icons/icon_${buildType}_64x64.png $out/share/icons/hicolor/64x64/apps/${binName}.png + + makeWrapper "${lib.getExe electron}" $out/bin/${binName} \ + --inherit-argv0 \ + --add-flags $out/lib/${binName}/resources/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ + --add-flags ${lib.escapeShellArg commandLineArgs} + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = binName; + desktopName = productName; + comment = "AFFiNE Desktop App"; + exec = "${binName} %U"; + terminal = false; + icon = binName; + startupWMClass = binName; + categories = [ "Utility" ]; + mimeTypes = [ "x-scheme-handler/${binName}" ]; }) - ) -) + ]; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex=^v(\\d+\\.\\d+\\.\\d+)$" + ]; + }; + + meta = { + description = "Workspace with fully merged docs, whiteboards and databases"; + longDescription = '' + AFFiNE is an open-source, all-in-one workspace and an operating + system for all the building blocks that assemble your knowledge + base and much more -- wiki, knowledge management, presentation + and digital assets + ''; + homepage = "https://affine.pro/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ xiaoxiangmoe ]; + platforms = [ + "aarch64-darwin" + "aarch64-linux" + "x86_64-darwin" + "x86_64-linux" + ]; + sourceProvenance = [ lib.sourceTypes.fromSource ]; + }; +}) From a40c55f88f8ec53b308e5e84a297ce185e4468fd Mon Sep 17 00:00:00 2001 From: ZHAO Jin-Xiang Date: Tue, 4 Feb 2025 01:44:23 +0800 Subject: [PATCH 1934/2168] affine: 0.18.1 -> 0.19.6 --- pkgs/by-name/af/affine/package.nix | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine/package.nix index 0c8211f10b52..2d4b018bc060 100644 --- a/pkgs/by-name/af/affine/package.nix +++ b/pkgs/by-name/af/affine/package.nix @@ -41,17 +41,17 @@ in stdenv.mkDerivation (finalAttrs: { pname = binName; - version = "0.18.1"; + version = "0.19.6"; src = fetchFromGitHub { owner = "toeverything"; repo = "AFFiNE"; tag = "v${finalAttrs.version}"; - hash = "sha256-TWwojG3lqQlQFX3BKoFjJ27a3T/SawXgNDO6fP6gW4k="; + hash = "sha256-BydTNE36oRIxr2lTnc2+EY0lvMXn4NTLB4EjqzhdjGk="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-5s/X9CD/H9rSn7SqMHioLg1KRP7y9fsozdFRY3hNiP8="; + hash = "sha256-racjpf0VgNod6OxWKSaCbKS9fEkInpDyhVbAHfYWIDo="; }; yarnOfflineCache = stdenvNoCC.mkDerivation { name = "yarn-offline-cache"; @@ -96,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: { ''; dontInstall = true; outputHashMode = "recursive"; - outputHash = "sha256-HueTia+1ApfvbBK/b+iE84TB1DCWIDLoQ9XhjYlGCUs="; + outputHash = "sha256-E9l5zjOOfyDBzYJOU94VrRvt7Hi4XkRTDav9bVlXvlQ="; }; nativeBuildInputs = [ @@ -125,13 +125,6 @@ stdenv.mkDerivation (finalAttrs: { rm -rf packages/backend/server/{.*,*} echo "$BACKEND_SERVER_PACKAGE_JSON" > packages/backend/server/package.json ''; - patchPhase = '' - runHook prePatchPhase - - sed -i '/packagerConfig/a \ electronZipDir: process.env.ELECTRON_FORGE_ELECTRON_ZIP_DIR,' packages/frontend/apps/electron/forge.config.mjs - - runHook postPatchPhase - ''; configurePhase = '' runHook preConfigurePhase @@ -161,16 +154,16 @@ stdenv.mkDerivation (finalAttrs: { runHook preBuild # first build - yarn workspaces focus @affine/electron @affine/monorepo - CARGO_NET_OFFLINE=true yarn workspace @affine/native build - GITHUB_SHA=ffffffffffffffffffffffffffffffffffffffff BUILD_TYPE=${buildType} SKIP_NX_CACHE=1 yarn workspace @affine/electron generate-assets + yarn install + CARGO_NET_OFFLINE=true yarn affine @affine/native build + GITHUB_SHA=ffffffffffffffffffffffffffffffffffffffff BUILD_TYPE=${buildType} SKIP_NX_CACHE=1 yarn affine @affine/electron generate-assets # second build yarn config set nmMode classic yarn config set nmHoistingLimits workspaces find . -name 'node_modules' -type d -prune -exec rm -rf '{}' + - yarn workspaces focus @affine/electron @affine/monorepo - BUILD_TYPE=${buildType} SKIP_WEB_BUILD=1 SKIP_BUNDLE=1 HOIST_NODE_MODULES=1 yarn workspace @affine/electron make + yarn install + BUILD_TYPE=${buildType} SKIP_WEB_BUILD=1 SKIP_BUNDLE=1 HOIST_NODE_MODULES=1 yarn affine @affine/electron make runHook postBuild ''; From b18c864cf75a7f2a207923e071cd9bc9975051ca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 10:43:47 +0000 Subject: [PATCH 1935/2168] putty: 0.82 -> 0.83 --- pkgs/applications/networking/remote/putty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index 4402e6835e27..6985b640e430 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - version = "0.82"; + version = "0.83"; pname = "putty"; src = fetchurl { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { "https://the.earth.li/~sgtatham/putty/${version}/${pname}-${version}.tar.gz" "ftp://ftp.wayne.edu/putty/putty-website-mirror/${version}/${pname}-${version}.tar.gz" ]; - hash = "sha256-GVYhY4u2szeEtOls3ClvMymRtSRJaNxiNSHDcDCXtdk="; + hash = "sha256-cYd3wT1j0N/5H+AxYrwqBbTfyLCCdjTNYLUc79/2McY="; }; nativeBuildInputs = [ cmake perl pkg-config copyDesktopItems ]; From c66126fd7b62903abaac5a9d7bff4da84cf40da5 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 11:25:44 +0100 Subject: [PATCH 1936/2168] python312Packages.pandera: skip failing tests --- .../python-modules/pandera/default.nix | 46 +++++++++++++------ 1 file changed, 32 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/pandera/default.nix b/pkgs/development/python-modules/pandera/default.nix index a3d1995717df..3ec853572a6c 100644 --- a/pkgs/development/python-modules/pandera/default.nix +++ b/pkgs/development/python-modules/pandera/default.nix @@ -1,9 +1,13 @@ { - stdenv, lib, + stdenv, buildPythonPackage, fetchFromGitHub, + + # build-system setuptools, + + # dependencies multimethod, numpy, packaging, @@ -12,12 +16,8 @@ typeguard, typing-inspect, wrapt, - # test - joblib, - pyarrow, - pytestCheckHook, - pytest-asyncio, - # optional dependencies + + # optional-dependencies black, dask, fastapi, @@ -28,6 +28,13 @@ pyyaml, scipy, shapely, + + # tests + joblib, + pyarrow, + pytestCheckHook, + pytest-asyncio, + pythonAtLeast, }: buildPythonPackage rec { @@ -99,6 +106,12 @@ buildPythonPackage rec { pyarrow ] ++ optional-dependencies.all; + pytestFlagsArray = [ + # KeyError: 'dask' + "--deselect=tests/dask/test_dask.py::test_series_schema" + "--deselect=tests/dask/test_dask_accessor.py::test_dataframe_series_add_schema" + ]; + disabledTestPaths = [ "tests/fastapi/test_app.py" # tries to access network "tests/core/test_docs_setting_column_widths.py" # tests doc generation, requires sphinx @@ -107,12 +120,17 @@ buildPythonPackage rec { "tests/pyspark" # requires spark ]; - disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ - # OOM error on ofborg: - "test_engine_geometry_coerce_crs" - # pandera.errors.SchemaError: Error while coercing 'geometry' to type geometry - "test_schema_dtype_crs_with_coerce" - ]; + disabledTests = + lib.optionals stdenv.hostPlatform.isDarwin [ + # OOM error on ofborg: + "test_engine_geometry_coerce_crs" + # pandera.errors.SchemaError: Error while coercing 'geometry' to type geometry + "test_schema_dtype_crs_with_coerce" + ] + ++ lib.optionals (pythonAtLeast "3.13") [ + # AssertionError: assert DataType(Sparse[float64, nan]) == DataType(Sparse[float64, nan]) + "test_legacy_default_pandas_extension_dtype" + ]; pythonImportsCheck = [ "pandera" @@ -125,7 +143,7 @@ buildPythonPackage rec { meta = { description = "Light-weight, flexible, and expressive statistical data testing library"; homepage = "https://pandera.readthedocs.io"; - changelog = "https://github.com/unionai-oss/pandera/releases/tag/${src.tag}"; + changelog = "https://github.com/unionai-oss/pandera/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ bcdarwin ]; }; From 9dc66d61ba7f464d20948ba6751c58a98a34a6e8 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 14 Oct 2024 13:49:13 +0200 Subject: [PATCH 1937/2168] qt6Packages.libqglviewer: init at 2.9.1 --- pkgs/top-level/qt6-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index 237a4757afb3..bacde47aff79 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -56,6 +56,8 @@ makeScopeWithSplicing' { kquickimageedit = callPackage ../development/libraries/kquickimageedit { }; libqaccessibilityclient = callPackage ../development/libraries/libqaccessibilityclient { }; + libqglviewer = callPackage ../development/libraries/libqglviewer { }; + libqtpas = callPackage ../development/compilers/fpc/libqtpas.nix { }; libquotient = callPackage ../development/libraries/libquotient { }; From 7cb04b0d9b34d0ef3d16c2369ce332b6e3c32c1d Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 12:02:52 +0100 Subject: [PATCH 1938/2168] python312Packages.textual: skip flaky tests also on linux --- .../python-modules/textual/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix index ec4513f5e7d2..d730ddc3f23c 100644 --- a/pkgs/development/python-modules/textual/default.nix +++ b/pkgs/development/python-modules/textual/default.nix @@ -59,15 +59,14 @@ buildPythonPackage rec { tree-sitter ]; - disabledTestPaths = - [ - # Snapshot tests require syrupy<4 - "tests/snapshot_tests/test_snapshots.py" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # RuntimeError: There is no current event loop in thread 'MainThread'. - "tests/test_focus.py" - ]; + disabledTestPaths = [ + # Snapshot tests require syrupy<4 + "tests/snapshot_tests/test_snapshots.py" + + # Flaky + # RuntimeError: There is no current event loop in thread 'MainThread'. + "tests/test_focus.py" + ]; disabledTests = [ From 4dcb3055bc93fa73d94c055a6ef1a8497ac1ed10 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 14 Oct 2024 13:54:43 +0200 Subject: [PATCH 1939/2168] libqglviewer: clean Co-authored-by: Niklas Korz <590517+niklaskorz@users.noreply.github.com> --- .../libraries/libqglviewer/default.nix | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/libqglviewer/default.nix b/pkgs/development/libraries/libqglviewer/default.nix index ec2234bb9a28..6b8457f2a60c 100644 --- a/pkgs/development/libraries/libqglviewer/default.nix +++ b/pkgs/development/libraries/libqglviewer/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, qmake, qtbase, libGLU, AGL }: +{ lib, stdenv, fetchFromGitHub, qmake, qtbase, libGLU, AGL }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libqglviewer"; version = "2.9.1"; - src = fetchurl { - url = "http://www.libqglviewer.com/src/libQGLViewer-${version}.tar.gz"; - sha256 = "sha256-J4+DKgstPvvg1pUhGd+8YFh5C3oPGHaQmDfLZzzkP/M="; + src = fetchFromGitHub { + owner = "GillesDebunne"; + repo = "libQGLViewer"; + tag = "v${finalAttrs.version}"; + hash = "sha256-T8KAcw3cXbp0FZm53OjlQBnUvLRFdoj80dIQzQY0/yw="; }; nativeBuildInputs = [ qmake ]; @@ -19,10 +21,10 @@ stdenv.mkDerivation rec { cd QGLViewer ''; - meta = with lib; { + meta = { description = "C++ library based on Qt that eases the creation of OpenGL 3D viewers"; - homepage = "http://libqglviewer.com"; - license = licenses.gpl2; - platforms = platforms.all; + homepage = "https://github.com/GillesDebunne/libQGLViewer"; + license = lib.licenses.gpl2; + platforms = lib.platforms.all; }; -} +}) From 280c2bf8b6236d0790ec24c2394d643aab5b09ae Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 14 Oct 2024 14:40:17 +0200 Subject: [PATCH 1940/2168] libqglviewer: fix #348484 remove use of absolute path on darwin --- .../libraries/libqglviewer/default.nix | 18 ++++++++++++++---- pkgs/top-level/qt5-packages.nix | 4 +--- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libqglviewer/default.nix b/pkgs/development/libraries/libqglviewer/default.nix index 6b8457f2a60c..92446cf8a138 100644 --- a/pkgs/development/libraries/libqglviewer/default.nix +++ b/pkgs/development/libraries/libqglviewer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, qmake, qtbase, libGLU, AGL }: +{ lib, stdenv, fetchFromGitHub, qmake, qtbase, libGLU }: stdenv.mkDerivation (finalAttrs: { pname = "libqglviewer"; @@ -12,12 +12,22 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ qmake ]; - buildInputs = [ qtbase libGLU ] - ++ lib.optional stdenv.hostPlatform.isDarwin AGL; + buildInputs = [ qtbase libGLU ]; dontWrapQtApps = true; - postPatch = '' + # Fix build on darwin, and install dylib instead of framework + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace QGLViewer/QGLViewer.pro \ + --replace-fail \ + "LIB_DIR_ = /Library/Frameworks" \ + "LIB_DIR_ = \$\$""{PREFIX_}/lib" \ + --replace-fail \ + "!staticlib: CONFIG *= lib_bundle" \ + "" + ''; + + preConfigure = '' cd QGLViewer ''; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 0c80734993fb..38b63a2a9683 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -164,9 +164,7 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate AGL Cocoa Foundation; }; - libqglviewer = callPackage ../development/libraries/libqglviewer { - inherit (pkgs.darwin.apple_sdk.frameworks) AGL; - }; + libqglviewer = callPackage ../development/libraries/libqglviewer { }; libqofono = callPackage ../development/libraries/libqofono { }; From 09c67a9eb2ebc6568fbaec3975f6fb0fb69184fe Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 12:03:00 +0100 Subject: [PATCH 1941/2168] python312Packages.textual: cleanup --- .../python-modules/textual/default.nix | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix index d730ddc3f23c..7f70b2b6b5bd 100644 --- a/pkgs/development/python-modules/textual/default.nix +++ b/pkgs/development/python-modules/textual/default.nix @@ -1,22 +1,29 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, - jinja2, + + # build-system + poetry-core, + + # dependencies markdown-it-py, platformdirs, - poetry-core, + rich, + typing-extensions, + + # optional-dependencies + tree-sitter, + tree-sitter-languages, + + # tests + jinja2, pytest-aiohttp, pytest-xdist, pytestCheckHook, - pythonAtLeast, - rich, syrupy, time-machine, - tree-sitter, - tree-sitter-languages, - typing-extensions, + pythonAtLeast, }: buildPythonPackage rec { @@ -35,8 +42,8 @@ buildPythonPackage rec { dependencies = [ - platformdirs markdown-it-py + platformdirs rich typing-extensions ] @@ -63,7 +70,7 @@ buildPythonPackage rec { # Snapshot tests require syrupy<4 "tests/snapshot_tests/test_snapshots.py" - # Flaky + # Flaky: https://github.com/Textualize/textual/issues/5511 # RuntimeError: There is no current event loop in thread 'MainThread'. "tests/test_focus.py" ]; From ef183ce7b5b1efc8ae8142adbb4cf77e610a15ab Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 12:11:02 +0100 Subject: [PATCH 1942/2168] python312Packages.textual: add gepbird as maintainer --- pkgs/development/python-modules/textual/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix index 7f70b2b6b5bd..288d4d1e297f 100644 --- a/pkgs/development/python-modules/textual/default.nix +++ b/pkgs/development/python-modules/textual/default.nix @@ -107,6 +107,6 @@ buildPythonPackage rec { homepage = "https://github.com/Textualize/textual"; changelog = "https://github.com/Textualize/textual/releases/tag/v${version}"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = with lib.maintainers; [ gepbird ]; }; } From 71bc331784284db170f3b3ecc50cd38a5ed8e2d0 Mon Sep 17 00:00:00 2001 From: ZHAO Jin-Xiang Date: Fri, 14 Feb 2025 19:14:38 +0800 Subject: [PATCH 1943/2168] affine: fix yarn outputHash --- pkgs/by-name/af/affine/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine/package.nix index 2d4b018bc060..2a1fca94b6fb 100644 --- a/pkgs/by-name/af/affine/package.nix +++ b/pkgs/by-name/af/affine/package.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: { ''; dontInstall = true; outputHashMode = "recursive"; - outputHash = "sha256-E9l5zjOOfyDBzYJOU94VrRvt7Hi4XkRTDav9bVlXvlQ="; + outputHash = "sha256-OuBxx0nrZ/KVFD1JinjBBXiQUcePWx5zRACld1CoHX0="; }; nativeBuildInputs = [ From 25d3e5cb4919baf5d47ef85d5ccbbb10cd5766b0 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 12:23:16 +0100 Subject: [PATCH 1944/2168] pcl: move to by-name --- .../pc/pcl/package.nix} | 33 ++++++------------- pkgs/top-level/all-packages.nix | 4 --- 2 files changed, 10 insertions(+), 27 deletions(-) rename pkgs/{development/libraries/pcl/default.nix => by-name/pc/pcl/package.nix} (72%) diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/by-name/pc/pcl/package.nix similarity index 72% rename from pkgs/development/libraries/pcl/default.nix rename to pkgs/by-name/pc/pcl/package.nix index 7f2b0e9f1c9e..ed3b851cbc0d 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/by-name/pc/pcl/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - wrapQtAppsHook, cmake, qhull, flann, @@ -10,15 +9,12 @@ vtk, eigen, pkg-config, - qtbase, + libsForQt5, libusb1, libpcap, libtiff, libXt, libpng, - Cocoa, - AGL, - OpenGL, config, cudaSupport ? config.cudaSupport, cudaPackages, @@ -44,21 +40,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ]; - buildInputs = - [ - eigen - libusb1 - libpcap - qtbase - libXt - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa - AGL - ]; + buildInputs = [ + eigen + libusb1 + libpcap + libsForQt5.qtbase + libXt + ]; propagatedBuildInputs = [ boost @@ -69,11 +60,7 @@ stdenv.mkDerivation rec { vtk ]; - cmakeFlags = - lib.optionals stdenv.hostPlatform.isDarwin [ - "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" - ] - ++ lib.optionals cudaSupport [ "-DWITH_CUDA=true" ]; + cmakeFlags = lib.optionals cudaSupport [ "-DWITH_CUDA=true" ]; meta = { homepage = "https://pointclouds.org/"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb3618d837a1..fb3d2a8a54f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10214,10 +10214,6 @@ with pkgs; buildPythonPackage buildPythonApplication setuptools pycsdr pydigiham; }; - pcl = libsForQt5.callPackage ../development/libraries/pcl { - inherit (darwin.apple_sdk_11_0.frameworks) Cocoa AGL OpenGL; - }; - pcre = callPackage ../development/libraries/pcre { }; pcre16 = res.pcre.override { variant = "pcre16"; }; # pcre32 seems unused From 18ad364f55eff8f310780e618fa99013246af02b Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Fri, 14 Feb 2025 12:25:01 +0100 Subject: [PATCH 1945/2168] lpcnetfreedv: remove unnecessary rec --- pkgs/by-name/lp/lpcnetfreedv/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/lp/lpcnetfreedv/package.nix b/pkgs/by-name/lp/lpcnetfreedv/package.nix index 50860d1335cd..37d40ebada4e 100644 --- a/pkgs/by-name/lp/lpcnetfreedv/package.nix +++ b/pkgs/by-name/lp/lpcnetfreedv/package.nix @@ -14,7 +14,7 @@ let sha256 = "sha256-UJRAkkdR/dh/+qVoPuPd3ZN69cgzuRBMzOZdUWFJJsg="; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "lpcnetfreedv"; version = "unstable-2022-08-22"; From 9e1a6426bf2fcdeaf0cf28be2c3279860cac81c2 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Fri, 14 Feb 2025 12:25:43 +0100 Subject: [PATCH 1946/2168] lpcnetfreedv: remove use of with lib; --- pkgs/by-name/lp/lpcnetfreedv/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/lp/lpcnetfreedv/package.nix b/pkgs/by-name/lp/lpcnetfreedv/package.nix index 37d40ebada4e..a4c37279f2ee 100644 --- a/pkgs/by-name/lp/lpcnetfreedv/package.nix +++ b/pkgs/by-name/lp/lpcnetfreedv/package.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation { extraArgs = [ "--version=branch" ]; }; - meta = with lib; { + meta = { homepage = "https://freedv.org/"; description = "Experimental Neural Net speech coding for FreeDV"; - license = licenses.bsd3; - maintainers = with maintainers; [ mvs ]; - platforms = platforms.all; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ mvs ]; + platforms = lib.platforms.all; }; } From 7d4f75ca88feccc23fd827bff4e875ade695e995 Mon Sep 17 00:00:00 2001 From: Emily Trau Date: Fri, 14 Feb 2025 22:26:53 +1100 Subject: [PATCH 1947/2168] hashcat: use system zlib, fix darwin build --- pkgs/tools/security/hashcat/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/security/hashcat/default.nix b/pkgs/tools/security/hashcat/default.nix index 03e99733500b..d3eda42db806 100644 --- a/pkgs/tools/security/hashcat/default.nix +++ b/pkgs/tools/security/hashcat/default.nix @@ -7,9 +7,11 @@ cudaSupport ? config.cudaSupport, fetchurl, makeWrapper, + minizip, opencl-headers, ocl-icd, xxHash, + zlib, Foundation, IOKit, Metal, @@ -46,8 +48,10 @@ stdenv.mkDerivation rec { buildInputs = [ + minizip opencl-headers xxHash + zlib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation @@ -64,6 +68,7 @@ stdenv.mkDerivation rec { "VERSION_TAG=${version}" "USE_SYSTEM_OPENCL=1" "USE_SYSTEM_XXHASH=1" + "USE_SYSTEM_ZLIB=1" ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform) [ "IS_APPLE_SILICON='${if stdenv.hostPlatform.isAarch64 then "1" else "0"}'" From 7e8cf0e3fdaf4fdd49cbcbf1742e1c96e8c0d53a Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Fri, 14 Feb 2025 12:27:26 +0100 Subject: [PATCH 1948/2168] lpcnetfreedv: unstable-2022-08-22 -> 0.5-unstable-2025-01-19 --- pkgs/by-name/lp/lpcnetfreedv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/lp/lpcnetfreedv/package.nix b/pkgs/by-name/lp/lpcnetfreedv/package.nix index a4c37279f2ee..3a6ed87b37da 100644 --- a/pkgs/by-name/lp/lpcnetfreedv/package.nix +++ b/pkgs/by-name/lp/lpcnetfreedv/package.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation { pname = "lpcnetfreedv"; - version = "unstable-2022-08-22"; + version = "0.5-unstable-2025-01-19"; src = fetchFromGitHub { owner = "drowe67"; repo = "LPCNet"; - rev = "67a6eb74d0c07faddcdce199856862cc45779d25"; - sha256 = "sha256-eHYZoDgoZBuuLvQn9X7H/zmK5onOAniOgY1/8RVn8gk="; + rev = "c8e51ac5e2fe674849cb53e7da44689b572cc246"; + sha256 = "sha256-0Knoym+deTuFAyJrrD55MijVh6DlhJp3lss66BJUHiA="; }; nativeBuildInputs = [ cmake ]; From c59049bc04fbb564371a6bbfe27af6302358082d Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Fri, 14 Feb 2025 12:34:22 +0100 Subject: [PATCH 1949/2168] freedv: use finalAttrs pattern --- pkgs/by-name/fr/freedv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fr/freedv/package.nix b/pkgs/by-name/fr/freedv/package.nix index 91bfa5a71c0b..57e325b268d0 100644 --- a/pkgs/by-name/fr/freedv/package.nix +++ b/pkgs/by-name/fr/freedv/package.nix @@ -20,14 +20,14 @@ pulseSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "freedv"; version = "1.9.9.2"; src = fetchFromGitHub { owner = "drowe67"; repo = "freedv-gui"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-oFuAH81mduiSQGIDgDDy1IPskqqCBmfWbpqQstUIw9g="; }; @@ -86,4 +86,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "freedv"; }; -} +}) From 9a52b65360026b3e4496378fa40a7000cf5e01f2 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Fri, 14 Feb 2025 12:35:06 +0100 Subject: [PATCH 1950/2168] freedv: provide update script --- pkgs/by-name/fr/freedv/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/fr/freedv/package.nix b/pkgs/by-name/fr/freedv/package.nix index 57e325b268d0..7a01ca62e4c6 100644 --- a/pkgs/by-name/fr/freedv/package.nix +++ b/pkgs/by-name/fr/freedv/package.nix @@ -18,6 +18,7 @@ wxGTK32, sioclient, pulseSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { @@ -75,6 +76,14 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper $out/Applications/FreeDV.app/Contents/MacOS/FreeDV $out/bin/freedv ''; + passthru.updateScript = nix-update-script { + extraArgs = [ + # avoid pre‐releases + "--version-regex" + ''^v(\d\.\d\.\d(\.\d)?)$'' + ]; + }; + meta = { homepage = "https://freedv.org/"; description = "Digital voice for HF radio"; From 4d714e967db191e1d947bce4c53f1082595872c5 Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 14 Feb 2025 20:50:07 +0900 Subject: [PATCH 1951/2168] terraform-providers.sakuracloud: init at 2.26.1 --- .../cluster/terraform-providers/providers.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 870de8c0b5ba..da2363af3bda 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1092,6 +1092,15 @@ "spdx": "MPL-2.0", "vendorHash": null }, + "sakuracloud": { + "hash": "sha256-KrzqIAK6ImUW22Iik97R4HARoXN4lG6AquitLjCqS/A=", + "homepage": "https://registry.terraform.io/providers/sacloud/sakuracloud", + "owner": "sacloud", + "repo": "terraform-provider-sakuracloud", + "rev": "v2.26.1", + "spdx": "Apache-2.0", + "vendorHash": "sha256-Ry791h5AuYP03nex9nM8X5Mk6PeL7hNDbFyVRvVPJNE=" + }, "scaleway": { "hash": "sha256-8aESalFQaA6Qwod4rDeUzrKe80rbHfVJZIKtLliKUME=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", From 827ae76e186a0ed1243435a88162b42627c061eb Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Fri, 14 Feb 2025 12:51:15 +0100 Subject: [PATCH 1952/2168] kappanhang: remove use of with lib; --- pkgs/by-name/ka/kappanhang/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ka/kappanhang/package.nix b/pkgs/by-name/ka/kappanhang/package.nix index 8429279cafcd..a397ebbce694 100644 --- a/pkgs/by-name/ka/kappanhang/package.nix +++ b/pkgs/by-name/ka/kappanhang/package.nix @@ -22,12 +22,12 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ pulseaudio ]; - meta = with lib; { + meta = { homepage = "https://github.com/nonoo/kappanhang"; description = "Remote control for Icom radio transceivers"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ mvs ]; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ mvs ]; mainProgram = "kappanhang"; }; } From 868ebd68e6f5cdec3bdac6a3336bf29a6bf70218 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Fri, 14 Feb 2025 12:52:24 +0100 Subject: [PATCH 1953/2168] kappanhang: provide update script --- pkgs/by-name/ka/kappanhang/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ka/kappanhang/package.nix b/pkgs/by-name/ka/kappanhang/package.nix index a397ebbce694..7dd736dd30b4 100644 --- a/pkgs/by-name/ka/kappanhang/package.nix +++ b/pkgs/by-name/ka/kappanhang/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, pkg-config, pulseaudio, + nix-update-script, }: buildGoModule rec { @@ -22,6 +23,8 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ pulseaudio ]; + passthru.updateScript = nix-update-script { }; + meta = { homepage = "https://github.com/nonoo/kappanhang"; description = "Remote control for Icom radio transceivers"; From fefc5bc4d5d5e83f15738c0090c0205fa26dbce8 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Fri, 14 Feb 2025 12:57:10 +0100 Subject: [PATCH 1954/2168] flex-ndax: remove use of with lib; --- pkgs/by-name/fl/flex-ndax/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fl/flex-ndax/package.nix b/pkgs/by-name/fl/flex-ndax/package.nix index cc75ff1d7751..29ac6022ded2 100644 --- a/pkgs/by-name/fl/flex-ndax/package.nix +++ b/pkgs/by-name/fl/flex-ndax/package.nix @@ -21,12 +21,12 @@ buildGoModule rec { vendorHash = "sha256-05LWJm4MoJqjJaFrBZvutKlqSTGl4dSp433AfHHO6LU="; - meta = with lib; { + meta = { broken = stdenv.hostPlatform.isDarwin; homepage = "https://github.com/kc2g-flex-tools/nDAX"; description = "FlexRadio digital audio transport (DAX) connector for PulseAudio"; - license = licenses.mit; - maintainers = with maintainers; [ mvs ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ mvs ]; mainProgram = "nDAX"; }; } From ebc5f97fc87fc798d1b3a6a21e90a047aaec2ace Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Fri, 14 Feb 2025 13:01:55 +0100 Subject: [PATCH 1955/2168] flex-ndax: provide update script --- pkgs/by-name/fl/flex-ndax/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/fl/flex-ndax/package.nix b/pkgs/by-name/fl/flex-ndax/package.nix index 29ac6022ded2..abc0e79ff7cc 100644 --- a/pkgs/by-name/fl/flex-ndax/package.nix +++ b/pkgs/by-name/fl/flex-ndax/package.nix @@ -4,6 +4,7 @@ buildGoModule, fetchFromGitHub, libpulseaudio, + nix-update-script, }: buildGoModule rec { @@ -21,6 +22,8 @@ buildGoModule rec { vendorHash = "sha256-05LWJm4MoJqjJaFrBZvutKlqSTGl4dSp433AfHHO6LU="; + passthru.updateScript = nix-update-script { }; + meta = { broken = stdenv.hostPlatform.isDarwin; homepage = "https://github.com/kc2g-flex-tools/nDAX"; From 62172c1d3a55eb82a277908f045ebac7db272e9a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Dec 2024 00:42:38 +0000 Subject: [PATCH 1956/2168] ocamlPackages.qcheck-core: 0.22 -> 0.23 --- pkgs/development/ocaml-modules/qcheck/core.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/qcheck/core.nix b/pkgs/development/ocaml-modules/qcheck/core.nix index a2e5d8910dc1..1e90ac725bee 100644 --- a/pkgs/development/ocaml-modules/qcheck/core.nix +++ b/pkgs/development/ocaml-modules/qcheck/core.nix @@ -6,7 +6,7 @@ buildDunePackage rec { pname = "qcheck-core"; - version = "0.22"; + version = "0.23"; minimalOCamlVersion = "4.08"; @@ -14,7 +14,7 @@ buildDunePackage rec { owner = "c-cube"; repo = "qcheck"; rev = "v${version}"; - hash = "sha256-JXnrfce/V7Bdu8uH98ZJCLjIHZoONiQ02ltFx6Fbvhg="; + hash = "sha256-tH7NFpAFKOb0jXxLK+zNOIZS9TSORKXe8FuwY13iEUY="; }; meta = { From 49d4f866a5af44f1e5795486dc7c32ce60de641d Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Fri, 14 Feb 2025 13:05:36 +0100 Subject: [PATCH 1957/2168] flex-ncat: remove use of with lib; --- pkgs/by-name/fl/flex-ncat/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fl/flex-ncat/package.nix b/pkgs/by-name/fl/flex-ncat/package.nix index b68933b6c027..33b81699680d 100644 --- a/pkgs/by-name/fl/flex-ncat/package.nix +++ b/pkgs/by-name/fl/flex-ncat/package.nix @@ -17,11 +17,11 @@ buildGoModule rec { vendorHash = "sha256-RqQMCP9rmdTG5AXLXkIQz0vE7qF+3RZ1BDdVRYoHHQs="; - meta = with lib; { + meta = { homepage = "https://github.com/kc2g-flex-tools/nCAT"; description = "FlexRadio remote control (CAT) via hamlib/rigctl protocol"; - license = licenses.mit; - maintainers = with maintainers; [ mvs ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ mvs ]; mainProgram = "nCAT"; }; } From 92ef11c9e1cd5a7b7963012c2ee1aa5125189747 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Fri, 14 Feb 2025 13:06:25 +0100 Subject: [PATCH 1958/2168] flex-ncat: provide update script --- pkgs/by-name/fl/flex-ncat/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/fl/flex-ncat/package.nix b/pkgs/by-name/fl/flex-ncat/package.nix index 33b81699680d..9066cd6290e6 100644 --- a/pkgs/by-name/fl/flex-ncat/package.nix +++ b/pkgs/by-name/fl/flex-ncat/package.nix @@ -2,6 +2,7 @@ lib, buildGoModule, fetchFromGitHub, + nix-update-script, }: buildGoModule rec { @@ -17,6 +18,8 @@ buildGoModule rec { vendorHash = "sha256-RqQMCP9rmdTG5AXLXkIQz0vE7qF+3RZ1BDdVRYoHHQs="; + passthru.updateScript = nix-update-script { }; + meta = { homepage = "https://github.com/kc2g-flex-tools/nCAT"; description = "FlexRadio remote control (CAT) via hamlib/rigctl protocol"; From 6fa6f314bb652ea2ba9931ab89a63e75b47c1453 Mon Sep 17 00:00:00 2001 From: networkException Date: Fri, 31 Jan 2025 14:32:14 +0100 Subject: [PATCH 1959/2168] python313Packages.pgpy-dtc: init at 0.1.1 --- .../python-modules/pgpy-dtc/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/pgpy-dtc/default.nix diff --git a/pkgs/development/python-modules/pgpy-dtc/default.nix b/pkgs/development/python-modules/pgpy-dtc/default.nix new file mode 100644 index 000000000000..f59c3b01c949 --- /dev/null +++ b/pkgs/development/python-modules/pgpy-dtc/default.nix @@ -0,0 +1,44 @@ +{ + lib, + pythonOlder, + fetchFromGitHub, + buildPythonPackage, + setuptools, + pyasn1, + cryptography, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "pgpy-dtc"; + version = "0.1.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "DigitalTrustCenter"; + repo = "PGPy_dtc"; + tag = version; + hash = "sha256-0zv2gtgp/iGDQescaDpng1gqbgjv7iXFvtwEt3YIPy4="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + pyasn1 + cryptography + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "pgpy_dtc" ]; + + meta = { + homepage = "https://github.com/DigitalTrustCenter/PGPy_dtc"; + changelog = "https://github.com/DigitalTrustCenter/PGPy_dtc/releases/tag/${src.tag}"; + description = "Pretty Good Privacy for Python"; + license = lib.licenses.eupl12; + maintainers = with lib.maintainers; [ networkexception ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a00e9a101d49..121f532055c8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10277,6 +10277,8 @@ self: super: with self; { pgpy = callPackage ../development/python-modules/pgpy { }; + pgpy-dtc = callPackage ../development/python-modules/pgpy-dtc { }; + pgsanity = callPackage ../development/python-modules/pgsanity { }; pgspecial = callPackage ../development/python-modules/pgspecial { }; From 34e43a34d4e61e07ead911adb313fc4884bb25ed Mon Sep 17 00:00:00 2001 From: networkException Date: Fri, 31 Jan 2025 14:33:43 +0100 Subject: [PATCH 1960/2168] python313Packages.sectxt: init at 0.9.6 --- .../python-modules/sectxt/default.nix | 61 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 63 insertions(+) create mode 100644 pkgs/development/python-modules/sectxt/default.nix diff --git a/pkgs/development/python-modules/sectxt/default.nix b/pkgs/development/python-modules/sectxt/default.nix new file mode 100644 index 000000000000..186ffe143690 --- /dev/null +++ b/pkgs/development/python-modules/sectxt/default.nix @@ -0,0 +1,61 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pythonOlder, + requests, + python-dateutil, + langcodes, + pgpy-dtc, + validators, + requests-mock, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "sectxt"; + version = "0.9.6"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "DigitalTrustCenter"; + repo = "sectxt"; + tag = version; + hash = "sha256-49YxhcOpi1wofKMRuNxt8esBtfaSoBrGu+yBCRFWZYY="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + requests + python-dateutil + langcodes + pgpy-dtc + validators + ]; + + pythonRelaxDeps = [ + "requests" + "langcodes" + "pgpy-dtc" + "validators" + ]; + + nativeCheckInputs = [ + pytestCheckHook + requests-mock + ]; + + pythonImportsCheck = [ "sectxt" ]; + + meta = { + homepage = "https://github.com/DigitalTrustCenter/sectxt"; + changelog = "https://github.com/DigitalTrustCenter/sectxt/releases/tag/${src.tag}"; + description = "security.txt parser and validator"; + license = lib.licenses.eupl12; + maintainers = with lib.maintainers; [ networkexception ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 121f532055c8..67f371aaf081 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14650,6 +14650,8 @@ self: super: with self; { sectools = callPackage ../development/python-modules/sectools { }; + sectxt = callPackage ../development/python-modules/sectxt { }; + seedir = callPackage ../development/python-modules/seedir { }; seekpath = callPackage ../development/python-modules/seekpath { }; From cee8169987839f8975a720af3108dc7f92683db2 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 11:39:57 +0100 Subject: [PATCH 1961/2168] python312Packages.dscribe: fix build --- .../python-modules/dscribe/default.nix | 66 +++++++++++++++---- 1 file changed, 52 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/dscribe/default.nix b/pkgs/development/python-modules/dscribe/default.nix index 33229ab03075..c2644b3da134 100644 --- a/pkgs/development/python-modules/dscribe/default.nix +++ b/pkgs/development/python-modules/dscribe/default.nix @@ -1,47 +1,85 @@ { - buildPythonPackage, lib, + stdenv, + buildPythonPackage, fetchFromGitHub, - numpy, - scipy, + + # build-system + pybind11, + setuptools, + + # dependencies ase, joblib, - sparse, - pybind11, + numpy, scikit-learn, + scipy, + sparse, + + # tests + pytestCheckHook, }: buildPythonPackage rec { pname = "dscribe"; version = "2.1.1"; + pyproject = true; + src = fetchFromGitHub { owner = "singroup"; repo = "dscribe"; - rev = "v${version}"; + tag = "v${version}"; fetchSubmodules = true; # Bundles a specific version of Eigen hash = "sha256-2JY24cR2ie4+4svVWC4rm3Iy6Wfg0n2vkINz032kPWc="; }; - pyproject = true; - build-system = [ pybind11 + setuptools ]; dependencies = [ - numpy - scipy ase joblib - sparse + numpy scikit-learn + scipy + sparse ]; - meta = with lib; { + pythonImportsCheck = [ + "dscribe" + "dscribe.ext" + ]; + + # Prevents python from loading dscribe from the current working directory instead of using $out + preCheck = '' + rm -rf dscribe + ''; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = + [ + # AttributeError: module 'numpy' has no attribute 'product' + "test_extended_system" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # AssertionError on a numerical test + "test_cell_list" + + # Fatal Python error: Aborted + # matplotlib/backend_bases.py", line 2654 in create_with_canvas + "test_examples" + ]; + + meta = { description = "Machine learning descriptors for atomistic systems"; homepage = "https://github.com/SINGROUP/dscribe"; - license = licenses.asl20; - maintainers = [ maintainers.sheepforce ]; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.sheepforce ]; }; } From 0521237635b870be3e11704287180ecdb61b4cc9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 12:32:24 +0000 Subject: [PATCH 1962/2168] vscode-extensions.marus25.cortex-debug: 1.6.10 -> 1.12.1 --- .../vscode/extensions/marus25.cortex-debug/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/marus25.cortex-debug/default.nix b/pkgs/applications/editors/vscode/extensions/marus25.cortex-debug/default.nix index e0fcee449198..19fa9e22929e 100644 --- a/pkgs/applications/editors/vscode/extensions/marus25.cortex-debug/default.nix +++ b/pkgs/applications/editors/vscode/extensions/marus25.cortex-debug/default.nix @@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "cortex-debug"; publisher = "marus25"; - version = "1.6.10"; - hash = "sha256-6b3JDkX6Xd91VE1h7gYyeukxLsBkn/nNzDQgBm0axRA="; + version = "1.12.1"; + hash = "sha256-ioK6gwtkaAcfxn11lqpwhrpILSfft/byeEqoEtJIfM0="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/marus25.cortex-debug/changelog"; From 1d8d6005ee57d72c4812648f809010dc3ae8574e Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 14 Feb 2025 13:32:33 +0100 Subject: [PATCH 1963/2168] truecrack: fix cuda --- pkgs/by-name/tr/truecrack/package.nix | 17 ++++++---- .../tr/truecrack/remove-opencc-options.patch | 26 +++++++++++++++ .../by-name/tr/truecrack/set-cuda-archs.patch | 32 +++++++++++++++++++ 3 files changed, 69 insertions(+), 6 deletions(-) create mode 100644 pkgs/by-name/tr/truecrack/remove-opencc-options.patch create mode 100644 pkgs/by-name/tr/truecrack/set-cuda-archs.patch diff --git a/pkgs/by-name/tr/truecrack/package.nix b/pkgs/by-name/tr/truecrack/package.nix index 5c952f5ed409..888ede92cd7d 100644 --- a/pkgs/by-name/tr/truecrack/package.nix +++ b/pkgs/by-name/tr/truecrack/package.nix @@ -1,15 +1,18 @@ { lib, gccStdenv, + cudaPackages, fetchFromGitLab, - cudatoolkit, config, cudaSupport ? config.cudaSupport, pkg-config, versionCheckHook, }: -gccStdenv.mkDerivation rec { +let + stdenv = if cudaSupport then cudaPackages.backendStdenv else gccStdenv; +in +stdenv.mkDerivation rec { pname = "truecrack"; version = "3.6"; @@ -22,12 +25,14 @@ gccStdenv.mkDerivation rec { patches = [ ./fix-empty-return.patch + ./remove-opencc-options.patch + ./set-cuda-archs.patch ]; configureFlags = ( if cudaSupport then [ - "--with-cuda=${cudatoolkit}" + "--with-cuda=${cudaPackages.cudatoolkit}" ] else [ @@ -40,7 +45,8 @@ gccStdenv.mkDerivation rec { ]; buildInputs = lib.optionals cudaSupport [ - cudatoolkit + cudaPackages.cudatoolkit + cudaPackages.cuda_cudart ]; env.NIX_CFLAGS_COMPILE = toString ([ @@ -61,7 +67,7 @@ gccStdenv.mkDerivation rec { installFlags = [ "prefix=$(out)" ]; - doInstallCheck = true; + doInstallCheck = !cudaSupport; installCheckPhase = '' runHook preInstallCheck @@ -88,7 +94,6 @@ gccStdenv.mkDerivation rec { description = "Brute-force password cracker for TrueCrypt volumes, optimized for Nvidia Cuda technology"; mainProgram = "truecrack"; homepage = "https://gitlab.com/kalilinux/packages/truecrack"; - broken = cudaSupport; license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ ethancedwards8 ]; diff --git a/pkgs/by-name/tr/truecrack/remove-opencc-options.patch b/pkgs/by-name/tr/truecrack/remove-opencc-options.patch new file mode 100644 index 000000000000..e9b2ef6024c7 --- /dev/null +++ b/pkgs/by-name/tr/truecrack/remove-opencc-options.patch @@ -0,0 +1,26 @@ +diff --git a/src/Makefile.am b/src/Makefile.am +index e4cac89..50d9b02 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -56,7 +56,7 @@ $(OBJ_CUDA): + cat Cuda/Sha2.cu >> Cuda.cu + cat Cuda/Whirlpool.cu >> Cuda.cu + +- $(COMPILER) -c Cuda.cu $(CFLAGS) --opencc-options -OPT:Olimit=0 $< -o $@ ++ $(COMPILER) -c Cuda.cu $(CFLAGS) $< -o $@ + + $(OBJS_COMMON): %.o: Common/%.c + $(COMPILER) -c $(CFLAGS) $< -o $@ +diff --git a/src/Makefile.in b/src/Makefile.in +index 86f76ad..7a5c77b 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -435,7 +435,7 @@ $(OBJ_CUDA): + cat Cuda/Sha2.cu >> Cuda.cu + cat Cuda/Whirlpool.cu >> Cuda.cu + +- $(COMPILER) -c Cuda.cu $(CFLAGS) --opencc-options -OPT:Olimit=0 $< -o $@ ++ $(COMPILER) -c Cuda.cu $(CFLAGS) $< -o $@ + + $(OBJS_COMMON): %.o: Common/%.c + $(COMPILER) -c $(CFLAGS) $< -o $@ diff --git a/pkgs/by-name/tr/truecrack/set-cuda-archs.patch b/pkgs/by-name/tr/truecrack/set-cuda-archs.patch new file mode 100644 index 000000000000..f46980d58db2 --- /dev/null +++ b/pkgs/by-name/tr/truecrack/set-cuda-archs.patch @@ -0,0 +1,32 @@ +diff --git a/src/Makefile.am b/src/Makefile.am +index e4cac89..599b7a3 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -30,10 +30,7 @@ OBJ_CUDA=Cuda.o + CFLAGS += -D_GPU_ + COMPILER=$(NVCC) + # CUDA code generation flags +-GENCODE_SM10= -gencode arch=compute_10,code=sm_10 +-GENCODE_SM20= -gencode arch=compute_20,code=sm_20 +-GENCODE_SM30= -gencode arch=compute_30,code=sm_30 -gencode arch=compute_35,code=sm_35 +-GENCODE_FLAGS= $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30) ++GENCODE_FLAGS= -gencode arch=compute_60,code=sm_60 -gencode arch=compute_61,code=sm_61 -gencode arch=compute_70,code=sm_70 -gencode arch=compute_75,code=sm_75 -gencode arch=compute_80,code=sm_80 -gencode arch=compute_86,code=sm_86 -gencode arch=compute_89,code=sm_89 -gencode arch=compute_90,code=sm_90 -gencode arch=compute_90a,code=sm_90a + CFLAGS += $(GENCODE_FLAGS) -ftz=true -use_fast_math + endif + +diff --git a/src/Makefile.in b/src/Makefile.in +index 86f76ad..123255b 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -181,10 +181,7 @@ LFLAGS = -lm -O3 + @ENABLE_CPU_TRUE@COMPILER = $(CC) + @ENABLE_CPU_FALSE@OBJ_CUDA = Cuda.o + # CUDA code generation flags +-@ENABLE_CPU_FALSE@GENCODE_SM10 = -gencode arch=compute_10,code=sm_10 +-@ENABLE_CPU_FALSE@GENCODE_SM20 = -gencode arch=compute_20,code=sm_20 +-@ENABLE_CPU_FALSE@GENCODE_SM30 = -gencode arch=compute_30,code=sm_30 -gencode arch=compute_35,code=sm_35 +-@ENABLE_CPU_FALSE@GENCODE_FLAGS = $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30) ++@ENABLE_CPU_FALSE@GENCODE_FLAGS = -gencode arch=compute_60,code=sm_60 -gencode arch=compute_61,code=sm_61 -gencode arch=compute_70,code=sm_70 -gencode arch=compute_75,code=sm_75 -gencode arch=compute_80,code=sm_80 -gencode arch=compute_86,code=sm_86 -gencode arch=compute_89,code=sm_89 -gencode arch=compute_90,code=sm_90 -gencode arch=compute_90a,code=sm_90a + truecrack_SOURCES = + truecrack_CFLAGS = $(CUDA_CFLAGS) + truecrack_LDADD = $(CUDA_LIBS) From 00399cdd47b58bcb36bddd0fba851fda870df951 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 12:34:44 +0000 Subject: [PATCH 1964/2168] gworkspace: 1.0.0 -> 1.1.0 --- pkgs/by-name/gw/gworkspace/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gw/gworkspace/package.nix b/pkgs/by-name/gw/gworkspace/package.nix index 0f12f00838b6..14ee2c6b694e 100644 --- a/pkgs/by-name/gw/gworkspace/package.nix +++ b/pkgs/by-name/gw/gworkspace/package.nix @@ -9,11 +9,11 @@ clangStdenv.mkDerivation (finalAttrs: { pname = "gworkspace"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { url = "ftp://ftp.gnustep.org/pub/gnustep/usr-apps/gworkspace-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-M7dV7RVatw8gdYHQlRi5wNBd6MGT9GqW04R/DoKNu6I="; + sha256 = "sha256-zjBOtVgQAILI5EozTzyO5pKglG2BBrwaZqVJCxT/Pzw="; }; # additional dependencies: From 09eec57ad12da10666dad2252f127c663a74d2f6 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 14 Feb 2025 13:40:34 +0100 Subject: [PATCH 1965/2168] lpcnetfreedv: fix darwin build --- pkgs/by-name/lp/lpcnetfreedv/darwin.patch | 13 +++++++++++++ pkgs/by-name/lp/lpcnetfreedv/package.nix | 5 +++++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/by-name/lp/lpcnetfreedv/darwin.patch diff --git a/pkgs/by-name/lp/lpcnetfreedv/darwin.patch b/pkgs/by-name/lp/lpcnetfreedv/darwin.patch new file mode 100644 index 000000000000..a82ac9b330d5 --- /dev/null +++ b/pkgs/by-name/lp/lpcnetfreedv/darwin.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1600871..1536c55 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -158,7 +158,7 @@ elseif(${SSE} AND (${SSE_PRESENT} OR ${SSE_PRESENT} GREATER 0)) + # AVX and AVX2 machines will also match on SSE + message(STATUS "sse processor flags found or enabled.") + set(LPCNET_C_PROC_FLAGS -msse4.1) +-elseif(${NEON} AND (${NEON_PRESENT} OR ${NEON_PRESENT} GREATER 0)) ++elseif(${NEON} AND (${NEON_PRESENT} OR ${NEON_PRESENT} GREATER 0) AND NOT APPLE) + # RPi / ARM 32bit + message(STATUS "neon processor flags found or enabled.") + set(LPCNET_C_PROC_FLAGS -mfpu=neon -march=armv8-a -mtune=cortex-a53) diff --git a/pkgs/by-name/lp/lpcnetfreedv/package.nix b/pkgs/by-name/lp/lpcnetfreedv/package.nix index 3a6ed87b37da..bfc773ad47cd 100644 --- a/pkgs/by-name/lp/lpcnetfreedv/package.nix +++ b/pkgs/by-name/lp/lpcnetfreedv/package.nix @@ -27,6 +27,11 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; + patches = [ + # extracted from https://github.com/drowe67/LPCNet/pull/59 + ./darwin.patch + ]; + postPatch = '' mkdir build ln -s ${data} build/lpcnet_${dataVersion}.tgz From 0d69c495bf911c409c0a148c008a42a47ae584c2 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 12:29:21 +0100 Subject: [PATCH 1966/2168] pcl: cleanup --- pkgs/by-name/pc/pcl/package.nix | 60 +++++++++++++++++++++------------ 1 file changed, 38 insertions(+), 22 deletions(-) diff --git a/pkgs/by-name/pc/pcl/package.nix b/pkgs/by-name/pc/pcl/package.nix index ed3b851cbc0d..32c31cae9785 100644 --- a/pkgs/by-name/pc/pcl/package.nix +++ b/pkgs/by-name/pc/pcl/package.nix @@ -1,34 +1,43 @@ { lib, stdenv, - fetchFromGitHub, - cmake, - qhull, - flann, - boost, - vtk, - eigen, - pkg-config, - libsForQt5, - libusb1, - libpcap, - libtiff, - libXt, - libpng, config, + fetchFromGitHub, + + # nativeBuildInputs + cmake, + libsForQt5, + pkg-config, + + # buildInputs + eigen, + libXt, + libpcap, + libusb1, + + # nativeBuildInputs + boost, + flann, + libpng, + libtiff, + qhull, + vtk, + + gitUpdater, + cudaSupport ? config.cudaSupport, cudaPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pcl"; version = "1.13.0"; src = fetchFromGitHub { owner = "PointCloudLibrary"; repo = "pcl"; - rev = "${pname}-${version}"; - sha256 = "sha256-JDiDAmdpwUR3Sff63ehyvetIFXAgGOrI+HEaZ5lURps="; + tag = "pcl-${finalAttrs.version}"; + hash = "sha256-T/zvev1x4w87j6Zn9dpqwIQfmfg2MsHt2Xto8Z1vhuQ="; }; # remove attempt to prevent (x86/x87-specific) extended precision use @@ -38,17 +47,17 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - pkg-config cmake libsForQt5.wrapQtAppsHook + pkg-config ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ]; buildInputs = [ eigen - libusb1 + libXt libpcap libsForQt5.qtbase - libXt + libusb1 ]; propagatedBuildInputs = [ @@ -60,13 +69,20 @@ stdenv.mkDerivation rec { vtk ]; - cmakeFlags = lib.optionals cudaSupport [ "-DWITH_CUDA=true" ]; + cmakeFlags = lib.optionals cudaSupport [ + (lib.cmakeBool "WITH_CUDA" true) + ]; + + passthru = { + updateScript = gitUpdater { rev-prefix = "pcl-"; }; + }; meta = { homepage = "https://pointclouds.org/"; description = "Open project for 2D/3D image and point cloud processing"; + changelog = "https://github.com/PointCloudLibrary/pcl/blob/pcl-${finalAttrs.version}/CHANGES.md"; license = lib.licenses.bsd3; maintainers = [ ]; platforms = with lib.platforms; linux ++ darwin; }; -} +}) From 02cf64767c938de70e1defa07e9773e083fc81e5 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 12:30:17 +0100 Subject: [PATCH 1967/2168] pcl: 1.13.0 -> 1.15.0-rc1 Diff: https://github.com/PointCloudLibrary/pcl/compare/refs/tags/pcl-1.13.0...pcl-1.15.0-rc1 Changelog: https://github.com/PointCloudLibrary/pcl/blob/pcl-1.15.0-rc1/CHANGES.md --- pkgs/by-name/pc/pcl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pc/pcl/package.nix b/pkgs/by-name/pc/pcl/package.nix index 32c31cae9785..c3e954c034e5 100644 --- a/pkgs/by-name/pc/pcl/package.nix +++ b/pkgs/by-name/pc/pcl/package.nix @@ -16,7 +16,7 @@ libusb1, # nativeBuildInputs - boost, + boost186, flann, libpng, libtiff, @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "pcl"; - version = "1.13.0"; + version = "1.15.0-rc1"; src = fetchFromGitHub { owner = "PointCloudLibrary"; @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { ]; propagatedBuildInputs = [ - boost + boost186 flann libpng libtiff From dd356dbd4587d596cdd0ca4bcd43f43fdcff6946 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 13:14:37 +0100 Subject: [PATCH 1968/2168] pcl: add GaetanLepage as maintainer --- pkgs/by-name/pc/pcl/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/pc/pcl/package.nix b/pkgs/by-name/pc/pcl/package.nix index c3e954c034e5..c8e2372e994b 100644 --- a/pkgs/by-name/pc/pcl/package.nix +++ b/pkgs/by-name/pc/pcl/package.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Open project for 2D/3D image and point cloud processing"; changelog = "https://github.com/PointCloudLibrary/pcl/blob/pcl-${finalAttrs.version}/CHANGES.md"; license = lib.licenses.bsd3; - maintainers = [ ]; + maintainers = with lib.maintainers; [ GaetanLepage ]; platforms = with lib.platforms; linux ++ darwin; }; }) From 40f5f68c88c6a9c81dbb04138528a0517bd2eb3f Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 13:53:44 +0100 Subject: [PATCH 1969/2168] pcl: mark as broken on darwin /nix/store/8z1vw2lkj3d5333lppbgbl9fbkk0n65p-eigen-3.4.0/include/eigen3/Eigen/Core:70:10: fatal error: 'omp.h' file not found --- pkgs/by-name/pc/pcl/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/pc/pcl/package.nix b/pkgs/by-name/pc/pcl/package.nix index c8e2372e994b..b96bdbb24a39 100644 --- a/pkgs/by-name/pc/pcl/package.nix +++ b/pkgs/by-name/pc/pcl/package.nix @@ -84,5 +84,9 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ GaetanLepage ]; platforms = with lib.platforms; linux ++ darwin; + badPlatforms = [ + # fatal error: 'omp.h' file not found + lib.systems.inspect.patterns.isDarwin + ]; }; }) From ab58e267e35e3653777722e05bbcd3fbef5b870f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 13:04:46 +0000 Subject: [PATCH 1970/2168] evolve-core: 1.6 -> 1.7 --- pkgs/by-name/ev/evolve-core/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ev/evolve-core/package.nix b/pkgs/by-name/ev/evolve-core/package.nix index f9da5c20318c..6f6d0e8c0e03 100644 --- a/pkgs/by-name/ev/evolve-core/package.nix +++ b/pkgs/by-name/ev/evolve-core/package.nix @@ -9,13 +9,13 @@ flutter327.buildFlutterApplication rec { pname = "evolve-core"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "arcnations-united"; repo = "evolve-core"; tag = "v${version}"; - hash = "sha256-W8KpGQ81wjv/tAl09ax/a4Any5PNhhl1DIABhWgAwdc="; + hash = "sha256-U5qMJ3aquD2EzWXwTKw0GJPdaCmK68v8DLdJMAwKrzs="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; From 8b88cf15ae174551d46fe12ea22e4688cd8fa386 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Sun, 11 Aug 2024 17:35:33 -0400 Subject: [PATCH 1971/2168] all-the-package-names: init at 2.0.2042 Used for shell completions with `npm install`. --- .../al/all-the-package-names/package.nix | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 pkgs/by-name/al/all-the-package-names/package.nix diff --git a/pkgs/by-name/al/all-the-package-names/package.nix b/pkgs/by-name/al/all-the-package-names/package.nix new file mode 100644 index 000000000000..35410e4611d3 --- /dev/null +++ b/pkgs/by-name/al/all-the-package-names/package.nix @@ -0,0 +1,30 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nix-update-script, +}: + +buildNpmPackage rec { + pname = "all-the-package-names"; + version = "2.0.2042"; + + src = fetchFromGitHub { + owner = "nice-registry"; + repo = "all-the-package-names"; + tag = "v${version}"; + hash = "sha256-663gKreskI6Fleg5YNYTmqXx0HBZS+as/yc/XGqtpVc="; + }; + + npmDepsHash = "sha256-YmSNf3rdQghHxNT/ziOqtpBx2MWAJb2NcG0KwPN6mmk="; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "List of all the public package names on npm"; + homepage = "https://github.com/nice-registry/all-the-package-names"; + license = lib.licenses.mit; + mainProgram = "all-the-package-names"; + maintainers = with lib.maintainers; [ donovanglover ]; + }; +} From aa37835ab17be2486dd92f88569a688ebad8cabb Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 14 Feb 2025 21:02:58 +0800 Subject: [PATCH 1972/2168] pantheon.switchboard-plug-network: 8.0.1 -> 8.1.0 https://github.com/elementary/switchboard-plug-network/compare/8.0.1...8.1.0 --- .../pantheon/apps/switchboard-plugs/network/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix index 1a4eccfe26c1..ee7c56c606d3 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-network"; - version = "8.0.1"; + version = "8.1.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - hash = "sha256-DXXEMST/EIckZkp5BozNP+NlyutlxF92ZeJngj8+EdM="; + hash = "sha256-mTTcavuxnRSBiifFpga14xPReHguvp9wIUS71Djorjk="; }; patches = [ From cb6001d3de4521188809cf114b0af2f96d3400d8 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 14 Feb 2025 21:05:35 +0800 Subject: [PATCH 1973/2168] pantheon.switchboard-plug-about: 8.1.0 -> 8.2.0 https://github.com/elementary/switchboard-plug-about/compare/8.1.0...8.2.0 --- .../pantheon/apps/switchboard-plugs/about/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix index 42df4bea777e..2583f609718c 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-about"; - version = "8.1.0"; + version = "8.2.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-Z+dhNUGDDLxzPLAaFkvWA+d6YvfM5NayOMu3SKjswLs="; + sha256 = "sha256-NMi+QyIunUIzg9IlzeUCz2eQrQlF28lufFc51XOQljU="; }; nativeBuildInputs = [ From 6f7cbedccd4cabfd2c89486a04ea85745db04f54 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 14 Feb 2025 21:07:42 +0800 Subject: [PATCH 1974/2168] pantheon.elementary-terminal: 6.3.1 -> 7.0.0 https://github.com/elementary/terminal/compare/6.3.1...7.0.0 --- pkgs/desktops/pantheon/apps/elementary-terminal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix index ba36581173b1..5497a0a77e9f 100644 --- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "elementary-terminal"; - version = "6.3.1"; + version = "7.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = "terminal"; rev = version; - sha256 = "sha256-W06J+QqouoZBWGm/w5aBuL009IO4odmSKHoeJkXnVpA="; + sha256 = "sha256-2Z56U6nbqwlbrSMzTYv7cSI7LT7pvDhW0w4f3wxv6ZA="; }; nativeBuildInputs = [ From cee1dfaec651086b5a2ac4bb35922afee62f8a2e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 12:56:36 +0000 Subject: [PATCH 1975/2168] gpscorrelate: 2.2 -> 2.3 --- pkgs/by-name/gp/gpscorrelate/package.nix | 27 ++++++++++++------------ 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/gp/gpscorrelate/package.nix b/pkgs/by-name/gp/gpscorrelate/package.nix index c03d9204a765..5d9107343c26 100644 --- a/pkgs/by-name/gp/gpscorrelate/package.nix +++ b/pkgs/by-name/gp/gpscorrelate/package.nix @@ -14,15 +14,15 @@ desktopToDarwinBundle, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gpscorrelate"; - version = "2.2"; + version = "2.3"; src = fetchFromGitHub { owner = "dfandrich"; repo = "gpscorrelate"; - rev = version; - hash = "sha256-H1kqOzL79/Y1kHVEQ5y9JRWTDCBMbtEPo75drm8+7Qo="; + tag = finalAttrs.version; + hash = "sha256-7uNYwnMkW9jlt3kBrNqkhJsDoVkUFbCmqt0lQv8bRE0="; }; nativeBuildInputs = [ @@ -55,14 +55,14 @@ stdenv.mkDerivation rec { "install-desktop-file" ]; - meta = with lib; { + meta = { description = "GPS photo correlation tool, to add EXIF geotags"; longDescription = '' - Digital cameras are cool. So is GPS. And, EXIF tags are really + Digital cameras are cool. So is GPS. And, EXIF tags are really cool too. - What happens when you merge the three? You end up with a set of + What happens when you merge the three? You end up with a set of photos taken with a digital camera that are "stamped" with the location at which they were taken. @@ -70,14 +70,15 @@ stdenv.mkDerivation rec { A variety of programs exist around the place to match GPS data with digital camera photos, but most of them are Windows or - MacOS only. Which doesn't really suit me that much. Also, each + MacOS only. Which doesn't really suit me that much. Also, each one takes the GPS data in a different format. ''; - license = licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; homepage = "https://dfandrich.github.io/gpscorrelate/"; - changelog = "https://github.com/dfandrich/gpscorrelate/releases/tag/${src.rev}"; - platforms = platforms.unix; - maintainers = with maintainers; [ sikmir ]; + changelog = "https://github.com/dfandrich/gpscorrelate/releases/tag/${finalAttrs.version}"; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ sikmir ]; + mainProgram = "gpscorrelate"; }; -} +}) From c7e6aa5a9db1f4ef78cd699cfb1f7b695c56ef97 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 14:00:49 +0100 Subject: [PATCH 1976/2168] rtabmap: move to by-name --- .../rtabmap/default.nix => by-name/rt/rtabmap/package.nix} | 7 +++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) rename pkgs/{applications/video/rtabmap/default.nix => by-name/rt/rtabmap/package.nix} (95%) diff --git a/pkgs/applications/video/rtabmap/default.nix b/pkgs/by-name/rt/rtabmap/package.nix similarity index 95% rename from pkgs/applications/video/rtabmap/default.nix rename to pkgs/by-name/rt/rtabmap/package.nix index fc22d8988eae..fed1babcb608 100644 --- a/pkgs/applications/video/rtabmap/default.nix +++ b/pkgs/by-name/rt/rtabmap/package.nix @@ -8,8 +8,6 @@ pcl, libusb1, eigen, - wrapQtAppsHook, - qtbase, g2o, ceres-solver, zed-open-capture, @@ -17,6 +15,7 @@ octomap, freenect, libdc1394, + libsForQt5, libGL, libGLU, vtkWithQt5, @@ -39,7 +38,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - wrapQtAppsHook + libsForQt5.wrapQtAppsHook wrapGAppsHook3 ]; buildInputs = [ @@ -61,7 +60,7 @@ stdenv.mkDerivation rec { freenect libdc1394 # librealsense - missing includedir - qtbase + libsForQt5.qtbase libGL libGLU vtkWithQt5 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb3d2a8a54f9..f20d87d0fe1c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4780,7 +4780,7 @@ with pkgs; rocket = libsForQt5.callPackage ../tools/graphics/rocket { }; - rtabmap = libsForQt5.callPackage ../applications/video/rtabmap/default.nix { + rtabmap = callPackage ../by-name/rt/rtabmap/package.nix { pcl = pcl.override { vtk = vtkWithQt5; }; }; From e5102e873de18e4aa9374bc365c7b8d75c3f3edb Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 14:03:59 +0100 Subject: [PATCH 1977/2168] rtabmap: cleanup --- pkgs/by-name/rt/rtabmap/package.nix | 43 +++++++++++++++++++---------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/rt/rtabmap/package.nix b/pkgs/by-name/rt/rtabmap/package.nix index fed1babcb608..c3e5f9d5814e 100644 --- a/pkgs/by-name/rt/rtabmap/package.nix +++ b/pkgs/by-name/rt/rtabmap/package.nix @@ -2,45 +2,53 @@ lib, stdenv, fetchFromGitHub, - pkg-config, + + # nativeBuildInputs cmake, + libsForQt5, + pkg-config, + wrapGAppsHook3, + + # buildInputs opencv, pcl, + liblapack, + xorg, libusb1, eigen, g2o, ceres-solver, - zed-open-capture, - hidapi, octomap, freenect, libdc1394, - libsForQt5, libGL, libGLU, vtkWithQt5, - wrapGAppsHook3, - liblapack, - xorg, + zed-open-capture, + hidapi, + + # passthru + gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rtabmap"; version = "0.21.4.1"; src = fetchFromGitHub { owner = "introlab"; repo = "rtabmap"; - tag = version; + tag = finalAttrs.version; hash = "sha256-y/p1uFSxVQNXO383DLGCg4eWW7iu1esqpWlyPMF3huk="; }; nativeBuildInputs = [ cmake - pkg-config libsForQt5.wrapQtAppsHook + pkg-config wrapGAppsHook3 ]; + buildInputs = [ ## Required opencv @@ -71,11 +79,16 @@ stdenv.mkDerivation rec { # Disable warnings that are irrelevant to us as packagers cmakeFlags = [ "-Wno-dev" ]; - meta = with lib; { + passthru = { + updateScript = gitUpdater { }; + }; + + meta = { description = "Real-Time Appearance-Based 3D Mapping"; homepage = "https://introlab.github.io/rtabmap/"; - license = licenses.bsd3; - maintainers = with maintainers; [ marius851000 ]; - platforms = with platforms; linux; + changelog = "https://github.com/introlab/rtabmap/releases/tag/${finalAttrs.version}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ marius851000 ]; + platforms = with lib.platforms; linux; }; -} +}) From 744e64b561bf82a0023028bdf7d56cc98a419d21 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 14:04:49 +0100 Subject: [PATCH 1978/2168] rtabmap: mark as broken --- pkgs/by-name/rt/rtabmap/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/rt/rtabmap/package.nix b/pkgs/by-name/rt/rtabmap/package.nix index c3e5f9d5814e..bfa968d43e2e 100644 --- a/pkgs/by-name/rt/rtabmap/package.nix +++ b/pkgs/by-name/rt/rtabmap/package.nix @@ -90,5 +90,7 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ marius851000 ]; platforms = with lib.platforms; linux; + # pcl/io/io.h: No such file or directory + broken = true; }; }) From c407726f4fbbe6a6c88a78a532ecb47fd9f10e88 Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Fri, 14 Feb 2025 10:10:52 +0100 Subject: [PATCH 1979/2168] coqPackages.mathcomp: remove Stdlib dependency Adapting to https://github.com/math-comp/math-comp/pull/1343 --- pkgs/development/coq-modules/autosubst/default.nix | 3 ++- pkgs/development/coq-modules/coq-bits/default.nix | 4 +++- pkgs/development/coq-modules/coq-elpi/default.nix | 11 +++++++++-- pkgs/development/coq-modules/coquelicot/default.nix | 3 ++- pkgs/development/coq-modules/deriving/default.nix | 3 ++- pkgs/development/coq-modules/fourcolor/default.nix | 2 ++ pkgs/development/coq-modules/gaia/default.nix | 2 ++ pkgs/development/coq-modules/graph-theory/default.nix | 2 ++ .../coq-modules/mathcomp-finmap/default.nix | 3 ++- .../coq-modules/mathcomp-real-closed/default.nix | 2 ++ .../coq-modules/mathcomp-tarjan/default.nix | 2 ++ .../development/coq-modules/mathcomp-zify/default.nix | 2 ++ pkgs/development/coq-modules/mathcomp/default.nix | 11 +++++++++-- pkgs/development/coq-modules/odd-order/default.nix | 2 ++ pkgs/development/coq-modules/reglang/default.nix | 3 ++- 15 files changed, 45 insertions(+), 10 deletions(-) diff --git a/pkgs/development/coq-modules/autosubst/default.nix b/pkgs/development/coq-modules/autosubst/default.nix index ce28e4a0d911..415756ad2dcb 100644 --- a/pkgs/development/coq-modules/autosubst/default.nix +++ b/pkgs/development/coq-modules/autosubst/default.nix @@ -3,6 +3,7 @@ mkCoqDerivation, coq, mathcomp-ssreflect, + stdlib, version ? null, }: @@ -33,7 +34,7 @@ mkCoqDerivation { } ] null; - propagatedBuildInputs = [ mathcomp-ssreflect ]; + propagatedBuildInputs = [ mathcomp-ssreflect stdlib ]; meta = with lib; { homepage = "https://www.ps.uni-saarland.de/autosubst/"; diff --git a/pkgs/development/coq-modules/coq-bits/default.nix b/pkgs/development/coq-modules/coq-bits/default.nix index 6754ba4d66a7..bdf4e0714f26 100644 --- a/pkgs/development/coq-modules/coq-bits/default.nix +++ b/pkgs/development/coq-modules/coq-bits/default.nix @@ -3,6 +3,8 @@ mkCoqDerivation, coq, mathcomp, + mathcomp-algebra-tactics, + stdlib, version ? null, }: @@ -35,7 +37,7 @@ mkCoqDerivation { release."1.1.0".sha256 = "sha256-TCw1kSXeW0ysIdLeNr+EGmpGumEE9i8tinEMp57UXaE="; release."1.0.0".sha256 = "0nv5mdgrd075dpd8bc7h0xc5i95v0pkm0bfyq5rj6ii1s54dwcjl"; - propagatedBuildInputs = [ mathcomp.algebra ]; + propagatedBuildInputs = [ mathcomp.algebra mathcomp-algebra-tactics stdlib ]; meta = with lib; { description = "Formalization of bitset operations in Coq"; diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix index 927f9d282131..5c0f9d2a6e9e 100644 --- a/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/pkgs/development/coq-modules/coq-elpi/default.nix @@ -27,7 +27,6 @@ default-elpi-version = if elpi-version != null then elpi-version else ( elpi = coq.ocamlPackages.elpi.override { version = default-elpi-version; }; propagatedBuildInputs_wo_elpi = [ coq.ocamlPackages.findlib - stdlib ]; derivation = mkCoqDerivation { pname = "elpi"; @@ -120,4 +119,12 @@ patched-derivation2 = patched-derivation1.overrideAttrs propagatedBuildInputs = o.propagatedBuildInputs ++ [ coq.ocamlPackages.ppx_optcomp ]; } ); -in patched-derivation2 +patched-derivation3 = patched-derivation2.overrideAttrs + ( + o: + lib.optionalAttrs (o.version != null && o.version == "2.4.0") + { + propagatedBuildInputs = o.propagatedBuildInputs ++ [ stdlib ]; + } + ); +in patched-derivation3 diff --git a/pkgs/development/coq-modules/coquelicot/default.nix b/pkgs/development/coq-modules/coquelicot/default.nix index 806d7d1304b9..c26fc70c7ba3 100644 --- a/pkgs/development/coq-modules/coquelicot/default.nix +++ b/pkgs/development/coq-modules/coquelicot/default.nix @@ -3,6 +3,7 @@ mkCoqDerivation, autoconf, coq, + stdlib, ssreflect, version ? null, }: @@ -56,7 +57,7 @@ mkCoqDerivation { releaseRev = v: "coquelicot-${v}"; nativeBuildInputs = [ autoconf ]; - propagatedBuildInputs = [ ssreflect ]; + propagatedBuildInputs = [ stdlib ssreflect ]; useMelquiondRemake.logpath = "Coquelicot"; meta = with lib; { diff --git a/pkgs/development/coq-modules/deriving/default.nix b/pkgs/development/coq-modules/deriving/default.nix index 259cf724c316..aa9a802b4bf5 100644 --- a/pkgs/development/coq-modules/deriving/default.nix +++ b/pkgs/development/coq-modules/deriving/default.nix @@ -4,6 +4,7 @@ coq, version ? null, ssreflect, + stdlib, }: mkCoqDerivation { @@ -47,7 +48,7 @@ mkCoqDerivation { release."0.1.1".sha256 = "sha256-Gu8aInLxTXfAFE0/gWRYI046Dx3Gv1j1+gx92v/UnPI="; release."0.1.0".sha256 = "sha256:11crnjm8hyis1qllkks3d7r07s1rfzwvyvpijya3s6iqfh8c7xwh"; - propagatedBuildInputs = [ ssreflect ]; + propagatedBuildInputs = [ ssreflect stdlib ]; mlPlugin = true; diff --git a/pkgs/development/coq-modules/fourcolor/default.nix b/pkgs/development/coq-modules/fourcolor/default.nix index 39f6b75135eb..6b3b169f8d2b 100644 --- a/pkgs/development/coq-modules/fourcolor/default.nix +++ b/pkgs/development/coq-modules/fourcolor/default.nix @@ -3,6 +3,7 @@ mkCoqDerivation, coq, mathcomp, + stdlib, version ? null, }: @@ -67,6 +68,7 @@ mkCoqDerivation { mathcomp.algebra mathcomp.ssreflect mathcomp.fingroup + stdlib ]; meta = with lib; { diff --git a/pkgs/development/coq-modules/gaia/default.nix b/pkgs/development/coq-modules/gaia/default.nix index 05079005b6c0..6110407c94e7 100644 --- a/pkgs/development/coq-modules/gaia/default.nix +++ b/pkgs/development/coq-modules/gaia/default.nix @@ -3,6 +3,7 @@ mkCoqDerivation, coq, mathcomp, + stdlib, version ? null, }: @@ -52,6 +53,7 @@ mkCoqDerivation { mathcomp.ssreflect mathcomp.algebra mathcomp.fingroup + stdlib ]; meta = with lib; { diff --git a/pkgs/development/coq-modules/graph-theory/default.nix b/pkgs/development/coq-modules/graph-theory/default.nix index 6ef59a006de5..1f0b0eb41f28 100644 --- a/pkgs/development/coq-modules/graph-theory/default.nix +++ b/pkgs/development/coq-modules/graph-theory/default.nix @@ -4,6 +4,7 @@ coq, mathcomp, mathcomp-finmap, + mathcomp-algebra-tactics, fourcolor, hierarchy-builder, version ? null, @@ -68,6 +69,7 @@ mkCoqDerivation { mathcomp.algebra mathcomp-finmap mathcomp.fingroup + mathcomp-algebra-tactics fourcolor hierarchy-builder ]; diff --git a/pkgs/development/coq-modules/mathcomp-finmap/default.nix b/pkgs/development/coq-modules/mathcomp-finmap/default.nix index fe408966797b..db0a28594d8c 100644 --- a/pkgs/development/coq-modules/mathcomp-finmap/default.nix +++ b/pkgs/development/coq-modules/mathcomp-finmap/default.nix @@ -2,6 +2,7 @@ coq, mkCoqDerivation, mathcomp, + stdlib, lib, version ? null, }: @@ -107,7 +108,7 @@ mkCoqDerivation { "1.0.0".sha256 = "0sah7k9qm8sw17cgd02f0x84hki8vj8kdz7h15i7rmz08rj0whpa"; }; - propagatedBuildInputs = [ mathcomp.ssreflect ]; + propagatedBuildInputs = [ mathcomp.ssreflect stdlib ]; meta = { description = "Finset and finmap library"; diff --git a/pkgs/development/coq-modules/mathcomp-real-closed/default.nix b/pkgs/development/coq-modules/mathcomp-real-closed/default.nix index 7654c47abf08..722df10efe7b 100644 --- a/pkgs/development/coq-modules/mathcomp-real-closed/default.nix +++ b/pkgs/development/coq-modules/mathcomp-real-closed/default.nix @@ -3,6 +3,7 @@ mkCoqDerivation, mathcomp, mathcomp-bigenough, + stdlib, lib, version ? null, }: @@ -115,6 +116,7 @@ mkCoqDerivation { mathcomp.fingroup mathcomp.solvable mathcomp-bigenough + stdlib ]; meta = { diff --git a/pkgs/development/coq-modules/mathcomp-tarjan/default.nix b/pkgs/development/coq-modules/mathcomp-tarjan/default.nix index 9246a0b0682e..a681e9fb2347 100644 --- a/pkgs/development/coq-modules/mathcomp-tarjan/default.nix +++ b/pkgs/development/coq-modules/mathcomp-tarjan/default.nix @@ -3,6 +3,7 @@ mkCoqDerivation, mathcomp-ssreflect, mathcomp-fingroup, + stdlib, lib, version ? null, }@args: @@ -52,6 +53,7 @@ mkCoqDerivation { propagatedBuildInputs = [ mathcomp-ssreflect mathcomp-fingroup + stdlib ]; meta = { diff --git a/pkgs/development/coq-modules/mathcomp-zify/default.nix b/pkgs/development/coq-modules/mathcomp-zify/default.nix index ec0c7cdcaa95..fe2535af6cf9 100644 --- a/pkgs/development/coq-modules/mathcomp-zify/default.nix +++ b/pkgs/development/coq-modules/mathcomp-zify/default.nix @@ -5,6 +5,7 @@ mathcomp-algebra, mathcomp-ssreflect, mathcomp-fingroup, + stdlib, version ? null, }: @@ -56,6 +57,7 @@ mkCoqDerivation rec { mathcomp-algebra mathcomp-ssreflect mathcomp-fingroup + stdlib ]; meta = { diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index c4442ba1283c..5bc97ccade5f 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -136,13 +136,20 @@ let installFlags = o.installFlags ++ [ "-f Makefile.coq" ]; } ); - patched-derivation = patched-derivation2.overrideAttrs (o: + patched-derivation3 = patched-derivation2.overrideAttrs (o: lib.optionalAttrs (o.version != null && (o.version == "dev" || lib.versions.isGe "2.0.0" o.version)) { propagatedBuildInputs = o.propagatedBuildInputs ++ [ hierarchy-builder ]; } ); - in patched-derivation; + patched-derivation4 = patched-derivation3.overrideAttrs (o: + lib.optionalAttrs (o.version != null + && lib.versions.isLe "2.3.0" o.version) + { + propagatedBuildInputs = o.propagatedBuildInputs ++ [ stdlib ]; + } + ); + in patched-derivation4; in mathcomp_ (if single then "single" else "all") diff --git a/pkgs/development/coq-modules/odd-order/default.nix b/pkgs/development/coq-modules/odd-order/default.nix index 1e4e044ae558..76a09f6d2bc1 100644 --- a/pkgs/development/coq-modules/odd-order/default.nix +++ b/pkgs/development/coq-modules/odd-order/default.nix @@ -2,6 +2,7 @@ lib, mkCoqDerivation, mathcomp, + stdlib, version ? null, }: @@ -45,6 +46,7 @@ mkCoqDerivation { mathcomp.solvable mathcomp.field mathcomp.all + stdlib ]; meta = with lib; { diff --git a/pkgs/development/coq-modules/reglang/default.nix b/pkgs/development/coq-modules/reglang/default.nix index cd0513a6e02a..9b4fd8efea59 100644 --- a/pkgs/development/coq-modules/reglang/default.nix +++ b/pkgs/development/coq-modules/reglang/default.nix @@ -3,6 +3,7 @@ mkCoqDerivation, coq, mathcomp, + stdlib, version ? null, }: @@ -46,7 +47,7 @@ mkCoqDerivation { ] null; - propagatedBuildInputs = [ mathcomp.ssreflect ]; + propagatedBuildInputs = [ mathcomp.ssreflect stdlib ]; meta = with lib; { description = "Regular Language Representations in Coq"; From 7be289122c258603e7b6912a48e568347fb0bd12 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 13:24:17 +0000 Subject: [PATCH 1980/2168] istioctl: 1.24.2 -> 1.24.3 --- pkgs/by-name/is/istioctl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/is/istioctl/package.nix b/pkgs/by-name/is/istioctl/package.nix index 183d130cd051..4a8ab59fc285 100644 --- a/pkgs/by-name/is/istioctl/package.nix +++ b/pkgs/by-name/is/istioctl/package.nix @@ -7,15 +7,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.24.2"; + version = "1.24.3"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - hash = "sha256-JJ/zLW6ri53qSTmbGZS2FhY2AJ1h3L/hk0rnj0swml4="; + hash = "sha256-/ABy0zZF/+rxYkpS5H6EAXZVYZxt7I4SCjLtrtkacGw="; }; - vendorHash = "sha256-0sUxqOW3PeMXZvlTmMBvs6vnc3pSLzSISfUSo9YdToQ="; + vendorHash = "sha256-B4MxvOzKxsQJmc9dKQFt1CGi1PnElOt8H72H2JVaZUU="; nativeBuildInputs = [ installShellFiles ]; From b169aae532c58fb37ab906326fe5cd43d1b66a5d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 13:27:58 +0000 Subject: [PATCH 1981/2168] typos-lsp: 0.1.33 -> 0.1.34 --- pkgs/by-name/ty/typos-lsp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ty/typos-lsp/package.nix b/pkgs/by-name/ty/typos-lsp/package.nix index 212d9ef86092..ef55209fb3b3 100644 --- a/pkgs/by-name/ty/typos-lsp/package.nix +++ b/pkgs/by-name/ty/typos-lsp/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "typos-lsp"; # Please update the corresponding VSCode extension too. # See pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix - version = "0.1.33"; + version = "0.1.34"; src = fetchFromGitHub { owner = "tekumara"; repo = "typos-lsp"; tag = "v${version}"; - hash = "sha256-FunbE4HxDmugLmR2XwFFAjvNBTVbLAhiHtacxuPXMVE="; + hash = "sha256-WqICNpheCJJAmmbj5QIejFeUIW/7ghrhQRP73PLLMJ4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-JFsDq9FaOvQmCCO2He2BIUJO6E8x5aMTBQy0B5kY4lQ="; + cargoHash = "sha256-tmBRUoBsNQlJY0JYtDknD5xeeFnokTE9cnHzktMIiBU="; # fix for compilation on aarch64 # see https://github.com/NixOS/nixpkgs/issues/145726 From c71264034d52bdf794c716c9dde7bd5202ad6222 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 13:38:47 +0000 Subject: [PATCH 1982/2168] libdatachannel: 0.22.4 -> 0.22.5 --- pkgs/by-name/li/libdatachannel/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libdatachannel/package.nix b/pkgs/by-name/li/libdatachannel/package.nix index a24fc8380f0c..7139b7d0c087 100644 --- a/pkgs/by-name/li/libdatachannel/package.nix +++ b/pkgs/by-name/li/libdatachannel/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "libdatachannel"; - version = "0.22.4"; + version = "0.22.5"; src = fetchFromGitHub { owner = "paullouisageneau"; repo = "libdatachannel"; rev = "v${version}"; - hash = "sha256-mnBB2UyeQ73NckE3uF91RhezJDKMQeoOKn8515ygrU0="; + hash = "sha256-6oJf7yHI47VOZtE2AKan+3GrcAgMMxJaZziNsSe7pdg="; }; outputs = [ From 9d6fdd0c179540f268952ba59eaa4f5cd229b84b Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 14 Feb 2025 14:58:29 +0100 Subject: [PATCH 1983/2168] python3Packages.boxx: fix build - fn dependency is no longer required - run tests only on Linux because xvfb is not available on other platforms --- pkgs/development/python-modules/boxx/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boxx/default.nix b/pkgs/development/python-modules/boxx/default.nix index 1a0821f7d5fb..2a3cba0cda64 100644 --- a/pkgs/development/python-modules/boxx/default.nix +++ b/pkgs/development/python-modules/boxx/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchPypi, python, @@ -10,7 +11,6 @@ pandas, imageio, snakeviz, - fn, pyopengl, seaborn, torch, @@ -37,7 +37,6 @@ buildPythonPackage rec { pandas imageio snakeviz - fn pyopengl seaborn ]; @@ -50,6 +49,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "boxx" ]; + doCheck = stdenv.hostPlatform.isLinux; + checkPhase = '' xvfb-run ${python.interpreter} -m unittest ''; From 9a02ca1c76e67805cdd780b0e45dff89c87b2fdf Mon Sep 17 00:00:00 2001 From: Arian van Putten Date: Mon, 16 Dec 2024 21:42:25 +0100 Subject: [PATCH 1984/2168] amazon-ec2-metadata-mock: init at 1.13.0 --- .../am/amazon-ec2-metadata-mock/package.nix | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 pkgs/by-name/am/amazon-ec2-metadata-mock/package.nix diff --git a/pkgs/by-name/am/amazon-ec2-metadata-mock/package.nix b/pkgs/by-name/am/amazon-ec2-metadata-mock/package.nix new file mode 100644 index 000000000000..e69614c4ee15 --- /dev/null +++ b/pkgs/by-name/am/amazon-ec2-metadata-mock/package.nix @@ -0,0 +1,43 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, + versionCheckHook, +}: + +buildGoModule rec { + pname = "amazon-ec2-metadata-mock"; + version = "1.13.0"; + + src = fetchFromGitHub { + owner = "aws"; + repo = "amazon-ec2-metadata-mock"; + tag = "v${version}"; + hash = "sha256-gqzROHfwhd3i1GWSp58dBKjS1EU7Xu0Fqbzv2PoLaF8="; + }; + + vendorHash = "sha256-Px4vhFW1mhXbBuPbxEpukmeLZewF7zooOXKxL8sEFLU="; + + subPackages = [ "cmd/ec2-metadata-mock" ]; + + doInstallCheck = true; + + nativeInstallCheckInputs = [ versionCheckHook ]; + + versionCheckProgram = "${builtins.placeholder "out"}/bin/ec2-metadata-mock"; + + versionCheckProgramArg = "--version"; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Tool to simulate Amazon EC2 instance metadata"; + homepage = "https://github.com/aws/amazon-ec2-metadata-mock"; + license = lib.licenses.asl20; + mainProgram = "ec2-metadata-mock"; + maintainers = with lib.maintainers; [ arianvp ]; + }; +} From c9dfe44a7da08a3384f3589e05ded6a312fbb70d Mon Sep 17 00:00:00 2001 From: Sean Behan Date: Fri, 14 Feb 2025 08:39:27 -0500 Subject: [PATCH 1985/2168] foundry: 0.3.0 -> 1.0.0 --- pkgs/by-name/fo/foundry/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fo/foundry/package.nix b/pkgs/by-name/fo/foundry/package.nix index e4165faabc7e..ff494616db3c 100644 --- a/pkgs/by-name/fo/foundry/package.nix +++ b/pkgs/by-name/fo/foundry/package.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "foundry"; - version = "0.3.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "foundry-rs"; repo = "foundry"; tag = "v${version}"; - hash = "sha256-SdxcNbe8/dNZ4JcxKksWmDBAvQorpC8ePvQgnyeKgxU="; + hash = "sha256-YTsneUj5OPw7EyKZMFLJJeAtZoD0je1DdmfMjVju4L8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-5URvuHnpaceRbMqzTA+NRvpp/WLdf+zfmYhIMPiOhNk="; + cargoHash = "sha256-vVRFS7o0zV+ek9ho+URks6peOryMpFCE1sDzN9g7uH0="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ darwin.DarwinTools ]; From 46de81e809539503a8f69fcc835b9b0d61879491 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 14:03:59 +0000 Subject: [PATCH 1986/2168] apk-tools: 2.14.9 -> 2.14.10 --- pkgs/tools/package-management/apk-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/apk-tools/default.nix b/pkgs/tools/package-management/apk-tools/default.nix index a05efc5e6f6d..fee68c48e21c 100644 --- a/pkgs/tools/package-management/apk-tools/default.nix +++ b/pkgs/tools/package-management/apk-tools/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "apk-tools"; - version = "2.14.9"; + version = "2.14.10"; src = fetchFromGitLab { domain = "gitlab.alpinelinux.org"; owner = "alpine"; repo = "apk-tools"; rev = "v${version}"; - sha256 = "sha256-EYTchTfkMqREBQ1kAeQDP6LUhEfJKeEs1DjlE8RsvMg="; + sha256 = "sha256-9TSkcJe7FVdTtfcCmwp+IWMYa/OL9OXJwPcKLyj5AAA="; }; nativeBuildInputs = [ pkg-config scdoc ] From 6ae1e543d0b6dcaa3f972625c35763713473df82 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 14:06:59 +0000 Subject: [PATCH 1987/2168] cargo-tarpaulin: 0.31.5 -> 0.32.0 --- pkgs/development/tools/analysis/cargo-tarpaulin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index 9e5d4f009b32..644b14f3cbda 100644 --- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tarpaulin"; - version = "0.31.5"; + version = "0.32.0"; src = fetchFromGitHub { owner = "xd009642"; repo = "tarpaulin"; rev = version; - hash = "sha256-7RSwRKLfNEZQczMriaeXH8uMMqR5Drdmtc68RCO2xTA="; + hash = "sha256-ghmsglKQrHa1nyUAj4oXry8GR0u0qdeY+fmWTh+S64M="; }; useFetchCargoVendor = true; - cargoHash = "sha256-z89LPoXsJKoKm+Aqi7PHtRn4iI77hAJQPVjKWNTgm8U="; + cargoHash = "sha256-niwQi6spvul1jIYsjwAVksuHo/cTm2QoROuaPv8vuNs="; nativeBuildInputs = [ pkg-config From b99fa6e0290e4d50d491e037930bd8d469655bc1 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 13 Feb 2025 12:28:48 +0700 Subject: [PATCH 1988/2168] python312Packages: dash-bootstrap-templates: init at 1.3.0 This introduces a collection of 52 Plotly figure templates with a Bootstrap theme. Two theme switch components. Stylesheet to apply Bootstrap themes to Plotly Dash components. It is the last 1.x version. The recently released 2.x version is only compatible with Plotly 6, while everything in nixpkgs currently still uses Plotly 5. --- .../dash-bootstrap-templates/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/dash-bootstrap-templates/default.nix diff --git a/pkgs/development/python-modules/dash-bootstrap-templates/default.nix b/pkgs/development/python-modules/dash-bootstrap-templates/default.nix new file mode 100644 index 000000000000..29457bf57494 --- /dev/null +++ b/pkgs/development/python-modules/dash-bootstrap-templates/default.nix @@ -0,0 +1,46 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + setuptools-scm, + dash, + dash-bootstrap-components, + numpy, +}: + +buildPythonPackage rec { + pname = "dash-bootstrap-templates"; + version = "1.3.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "AnnMarieW"; + repo = "dash-bootstrap-templates"; + rev = "V${version}"; + hash = "sha256-dbXqqncxfIZ6traVQ2a/2E1Co4MVdoiU8ox6nBnqviE="; + }; + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + dash + dash-bootstrap-components + numpy + ]; + + pythonImportsCheck = [ "dash_bootstrap_templates" ]; + + # There are no tests. + doCheck = false; + + meta = { + description = "A collection of 52 Plotly figure templates with a Bootstrap theme"; + homepage = "https://github.com/AnnMarieW/dash-bootstrap-templates"; + changelog = "https://github.com/AnnMarieW/dash-bootstrap-templates/releases/tag/V${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ flokli ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b98d245a8297..284cd9cfa267 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2949,6 +2949,8 @@ self: super: with self; { dash-bootstrap-components = callPackage ../development/python-modules/dash-bootstrap-components { }; + dash-bootstrap-templates = callPackage ../development/python-modules/dash-bootstrap-templates { }; + dash-core-components = callPackage ../development/python-modules/dash-core-components { }; dash-html-components = callPackage ../development/python-modules/dash-html-components { }; From 7a5b52d0af20d488ff401643e4837a54dab64b6a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 14:10:17 +0000 Subject: [PATCH 1989/2168] prometheus-postfix-exporter: 0.7.0 -> 0.8.0 --- pkgs/servers/monitoring/prometheus/postfix-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix index 14487935f6ac..8bbfcc9e8fe3 100644 --- a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "postfix_exporter"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "Hsn723"; repo = "postfix_exporter"; tag = "v${version}"; - sha256 = "sha256-Bu8Y0UgB9D8psfRg/TRZqWqP5bj1+dWtAihLwCL+cTQ="; + sha256 = "sha256-g/Y+amX3vyyhkxvJAxPimFDgFdpcA5+zWTu2Mhq3Dyw="; }; - vendorHash = "sha256-GkEHFcclILMst1je/1N7NNnO6F/LMv+e5Abq3uqtH+k="; + vendorHash = "sha256-hcS7BBs54RmBu1d2EXedc9bU2eXmB9bQ4yAyYgp85xY="; ldflags = [ "-s" From 144ab8d5c4a21a89cbcf913e0e9dc350fe606acd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Fri, 14 Feb 2025 15:12:47 +0100 Subject: [PATCH 1990/2168] ansible: consolidate setuptools replace --- .../development/python-modules/ansible/core.nix | 3 +-- pkgs/top-level/all-packages.nix | 17 ----------------- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index 3be6d5c6a68a..5f67400c5a39 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -49,8 +49,7 @@ buildPythonPackage rec { patchShebangs --build packaging/cli-doc/build.py - substituteInPlace pyproject.toml \ - --replace-fail "setuptools >= 66.1.0, <= 75.6.0" setuptools + sed -E 's|"setuptools[0-9 <>=.,]+"|"setuptools"|g' -i pyproject.toml ''; nativeBuildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74a0806edebc..182af4fb4401 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7465,16 +7465,6 @@ with pkgs; inherit version; hash = "sha256-Ob6KeYaix9NgabDZciC8L2eDxl/qfG1+Di0A0ayK+Hc="; }; - - postPatch = '' - substituteInPlace lib/ansible/executor/task_executor.py \ - --replace "[python," "[" - - patchShebangs --build packaging/cli-doc/build.py - - substituteInPlace pyproject.toml \ - --replace-fail "setuptools >= 66.1.0, <= 75.8.0" setuptools - ''; })); ansible_2_16 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec { version = "2.16.8"; @@ -7482,13 +7472,6 @@ with pkgs; inherit version; hash = "sha256-WeSqQO1azbTvm789BYkY//k/ZqFJNz2BWciilgRBC9o="; }; - - postPatch = '' - substituteInPlace lib/ansible/executor/task_executor.py \ - --replace "[python," "[" - - patchShebangs --build packaging/cli-doc/build.py - ''; })); ansible-builder = with python3Packages; toPythonApplication ansible-builder; From e50930826bfbac5613198684ec56dba664ccbafb Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 14 Feb 2025 15:16:27 +0100 Subject: [PATCH 1991/2168] python3Packages.boxx: remove tests since they are broken on all platforms --- .../python-modules/boxx/default.nix | 32 ++++--------------- 1 file changed, 6 insertions(+), 26 deletions(-) diff --git a/pkgs/development/python-modules/boxx/default.nix b/pkgs/development/python-modules/boxx/default.nix index 2a3cba0cda64..de23a4934ce0 100644 --- a/pkgs/development/python-modules/boxx/default.nix +++ b/pkgs/development/python-modules/boxx/default.nix @@ -1,21 +1,15 @@ { lib, - stdenv, buildPythonPackage, fetchPypi, - python, - xvfb-run, + imageio, matplotlib, - scikit-image, numpy, pandas, - imageio, - snakeviz, pyopengl, + scikit-image, seaborn, - torch, - pythonOlder, - torchvision, + snakeviz, }: buildPythonPackage rec { @@ -23,38 +17,24 @@ buildPythonPackage rec { version = "0.10.14"; format = "setuptools"; - disabled = pythonOlder "3.7"; - src = fetchPypi { inherit pname version; hash = "sha256-unGnmPksEuqFXHTWJkj9Gv2G/qPDgT6AZXYiG2gtkEA="; }; propagatedBuildInputs = [ + imageio matplotlib - scikit-image numpy pandas - imageio - snakeviz pyopengl + scikit-image seaborn - ]; - - nativeCheckInputs = [ - xvfb-run - torch - torchvision + snakeviz ]; pythonImportsCheck = [ "boxx" ]; - doCheck = stdenv.hostPlatform.isLinux; - - checkPhase = '' - xvfb-run ${python.interpreter} -m unittest - ''; - meta = with lib; { description = "Tool-box for efficient build and debug for Scientific Computing and Computer Vision"; homepage = "https://github.com/DIYer22/boxx"; From abcfab4cf157eab6850b07a9bfdbcdbf47abed98 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 14 Feb 2025 15:16:47 +0100 Subject: [PATCH 1992/2168] python3Packages.bpycv: unbreak on aarch64 --- pkgs/development/python-modules/bpycv/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/bpycv/default.nix b/pkgs/development/python-modules/bpycv/default.nix index 923c4d0ced49..5e7da42a9713 100644 --- a/pkgs/development/python-modules/bpycv/default.nix +++ b/pkgs/development/python-modules/bpycv/default.nix @@ -57,7 +57,6 @@ buildPythonPackage rec { homepage = "https://github.com/DIYer22/bpycv"; license = licenses.mit; maintainers = [ maintainers.lucasew ]; - broken = stdenv.hostPlatform.isAarch64; inherit (blender.meta) platforms; }; } From 429299c5705e21f18ce7d12145c86675dc130de0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Fri, 14 Feb 2025 15:36:24 +0100 Subject: [PATCH 1993/2168] ansible*: fail if setuptools pattern not found --- pkgs/development/python-modules/ansible/core.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index 5f67400c5a39..08648dd7b42d 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -49,7 +49,14 @@ buildPythonPackage rec { patchShebangs --build packaging/cli-doc/build.py - sed -E 's|"setuptools[0-9 <>=.,]+"|"setuptools"|g' -i pyproject.toml + SETUPTOOLS_PATTERN='"setuptools[0-9 <>=.,]+"' + PYPROJECT=$(cat pyproject.toml) + if [[ "$PYPROJECT" =~ $SETUPTOOLS_PATTERN ]]; then + echo "setuptools replace: ''${BASH_REMATCH[0]}" + echo "''${PYPROJECT//''${BASH_REMATCH[0]}/'"setuptools"'}" > pyproject.toml + else + exit 2 + fi ''; nativeBuildInputs = [ From 4ab80660c4bdae89aa5c8331248da505adb7608e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 14:37:28 +0000 Subject: [PATCH 1994/2168] nix-search-tv: 1.0.0 -> 2.0.0 --- pkgs/by-name/ni/nix-search-tv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ni/nix-search-tv/package.nix b/pkgs/by-name/ni/nix-search-tv/package.nix index a1e4c7299c4f..b880fef48987 100644 --- a/pkgs/by-name/ni/nix-search-tv/package.nix +++ b/pkgs/by-name/ni/nix-search-tv/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "nix-search-tv"; - version = "1.0.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "3timeslazy"; repo = "nix-search-tv"; tag = "v${version}"; - hash = "sha256-SKLvN67GHLHGj0bUYdFutiLzRVCCtxNokWP0z3Za9UU="; + hash = "sha256-C8RTUwTkMgROipLgoDrm3L5aTBwOJ+cVr38xx1+sJCQ="; }; - vendorHash = "sha256-uzNDhkovlXx0tIgSJ3E08d0TNmktSrlOOe8Iwi4ZfmU="; + vendorHash = "sha256-0spLr6Qn2eQZC5Wwe6d+0o6B3r9CIgJt2X5/E/UMvg8="; subPackages = [ "cmd/nix-search-tv" ]; From c7032bb4d4028c63115c3a2d6c4f49a032a7d900 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 15:31:49 +0100 Subject: [PATCH 1995/2168] python312Packages.ale-py: 0.10.1 -> 0.10.2 Diff: https://github.com/Farama-Foundation/Arcade-Learning-Environment/compare/refs/tags/v0.10.1...v0.10.2 Changelog: https://github.com/Farama-Foundation/Arcade-Learning-Environment/releases/tag/v0.10.2 --- .../python-modules/ale-py/default.nix | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/ale-py/default.nix b/pkgs/development/python-modules/ale-py/default.nix index 8eebc721928e..73798537809a 100644 --- a/pkgs/development/python-modules/ale-py/default.nix +++ b/pkgs/development/python-modules/ale-py/default.nix @@ -1,7 +1,7 @@ { lib, + stdenv, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -19,25 +19,22 @@ importlib-resources, numpy, typing-extensions, - importlib-metadata, - # checks + # tests gymnasium, pytestCheckHook, - - stdenv, }: buildPythonPackage rec { pname = "ale-py"; - version = "0.10.1"; + version = "0.10.2"; pyproject = true; src = fetchFromGitHub { owner = "Farama-Foundation"; repo = "Arcade-Learning-Environment"; tag = "v${version}"; - hash = "sha256-MDMCYnyLZYbQXwyr5VuPeVEop825nD++yQ7hhsW4BX8="; + hash = "sha256-CGUlQFQoQZqs+Jd3IU/o50VwX+tEHrs3KHrcVWahEpo="; }; build-system = [ @@ -57,7 +54,7 @@ buildPythonPackage rec { importlib-resources numpy typing-extensions - ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; + ]; postPatch = # Relax the pybind11 version @@ -75,10 +72,13 @@ buildPythonPackage rec { pytestCheckHook ]; - # test_atari_env.py::test_check_env fails on the majority of the environments because the ROM are missing. - # The user is expected to manually download the roms: - # https://github.com/Farama-Foundation/Arcade-Learning-Environment/blob/v0.9.0/docs/faq.md#i-downloaded-ale-and-i-installed-it-successfully-but-i-cannot-find-any-rom-file-at-roms-do-i-have-to-get-them-somewhere-else - disabledTests = [ "test_check_env" ]; + disabledTests = [ + # test_atari_env.py tests fail on the majority of the environments because the ROM are missing. + # The user is expected to manually download the roms: + # https://github.com/Farama-Foundation/Arcade-Learning-Environment/blob/v0.9.0/docs/faq.md#i-downloaded-ale-and-i-installed-it-successfully-but-i-cannot-find-any-rom-file-at-roms-do-i-have-to-get-them-somewhere-else + "test_check_env" + "test_sound_obs" + ]; meta = { description = "Simple framework that allows researchers and hobbyists to develop AI agents for Atari 2600 games"; @@ -87,6 +87,9 @@ buildPythonPackage rec { changelog = "https://github.com/Farama-Foundation/Arcade-Learning-Environment/releases/tag/v${version}"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ billhuang ]; - broken = stdenv.hostPlatform.isDarwin; # fails to link with missing library + badPlatforms = [ + # fails to link with missing library + lib.systems.inspect.patterns.isDarwin + ]; }; } From 0173155bc5bcc5692f371d49d3a5365d496d8da0 Mon Sep 17 00:00:00 2001 From: ners Date: Fri, 14 Feb 2025 16:00:46 +0100 Subject: [PATCH 1996/2168] jetbrains: 2024.3.2 -> 2024.3.5 jetbrains.clion: 2024.3.2 -> 2024.3.3 jetbrains.datagrip: 2024.3.3 -> 2024.3.4 jetbrains.gateway: 2024.3.2 -> 2024.3.3 jetbrains.goland: 2024.3.2.1 -> 2024.3.3 jetbrains.idea-community: 2024.3.2.2 -> 2024.3.3 jetbrains.idea-ultimate: 2024.3.2.2 -> 2024.3.3 jetbrains.phpstorm: 2024.3.2.1 -> 2024.3.3 jetbrains.pycharm-community: 2024.3.2 -> 2024.3.3 jetbrains.pycharm-professional: 2024.3.2 -> 2024.3.3 jetbrains.rider: 2024.3.4 -> 2024.3.5 --- .../editors/jetbrains/bin/versions.json | 320 +++++++++--------- 1 file changed, 160 insertions(+), 160 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/bin/versions.json b/pkgs/applications/editors/jetbrains/bin/versions.json index 5cf8080d0466..ddd4120931df 100644 --- a/pkgs/applications/editors/jetbrains/bin/versions.json +++ b/pkgs/applications/editors/jetbrains/bin/versions.json @@ -11,18 +11,18 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", - "version": "2024.3.2", - "sha256": "f21d72269bc0f3ce618f925ded44b5da440bcf1ec4ef3d83335acd90d020b6fa", - "url": "https://download.jetbrains.com/cpp/CLion-2024.3.2.tar.gz", - "build_number": "243.23654.114" + "version": "2024.3.3", + "sha256": "a221d8c602452775df6ff09adad39f2b057a367f7616b7c739df33204b103a4a", + "url": "https://download.jetbrains.com/cpp/CLion-2024.3.3.tar.gz", + "build_number": "243.24978.55" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz", - "version": "2024.3.3", - "sha256": "84158baba8040ea4a6fac4663b9205c410ff7f04d803c2af1e9b4746a6270445", - "url": "https://download.jetbrains.com/datagrip/datagrip-2024.3.3.tar.gz", - "build_number": "243.23654.19" + "version": "2024.3.4", + "sha256": "34f20d0aba3b0ecbad39cf2c8fdf326ff8d4abb6202d9cff60a2622cf8b241a2", + "url": "https://download.jetbrains.com/datagrip/datagrip-2024.3.4.tar.gz", + "build_number": "243.23654.183" }, "dataspell": { "update-channel": "DataSpell RELEASE", @@ -35,34 +35,34 @@ "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz", - "version": "2024.3.2", - "sha256": "39c8f8414cfeaacbbb011c33c539d7ca4007d7f867421438292572dc51398664", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.3.2.tar.gz", - "build_number": "243.23654.132" + "version": "2024.3.3", + "sha256": "4266bc5bceba9c053d5a3b7b74591bf5bc52f11a4deb4bbe4bab03fc97c5b36c", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.3.3.tar.gz", + "build_number": "243.24978.56" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", - "version": "2024.3.2.1", - "sha256": "8bd2420312acd4936ca3d2a4f9ceb0f0fcf96da538f6042d219c6839d25c6a6a", - "url": "https://download.jetbrains.com/go/goland-2024.3.2.1.tar.gz", - "build_number": "243.23654.166" + "version": "2024.3.3", + "sha256": "fb0908ce2b4e43222758cc5c9b7498677f924271ca5d9a790e794e8ade28177d", + "url": "https://download.jetbrains.com/go/goland-2024.3.3.tar.gz", + "build_number": "243.24978.59" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz", - "version": "2024.3.2.2", - "sha256": "d73fd631943c300d55729bd33e06e193751478a83477153807cfa941e4bf12e5", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.3.2.2.tar.gz", - "build_number": "243.23654.189" + "version": "2024.3.3", + "sha256": "ae3c45fe515fef672f52ce5c4701bc40a5f82cb94f21fed2c6e66c22e3dc91db", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.3.3.tar.gz", + "build_number": "243.24978.46" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz", - "version": "2024.3.2.2", - "sha256": "7094daa174aa74c163ecbc3958405c99b209333ca23e5accd02ed8100c015e38", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.3.2.2.tar.gz", - "build_number": "243.23654.189" + "version": "2024.3.3", + "sha256": "9860a8d2a15c1033a8fcac9ffdabd797403318b516b63fdee474fa82ff0d738d", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.3.3.tar.gz", + "build_number": "243.24978.46" }, "mps": { "update-channel": "MPS RELEASE", @@ -75,35 +75,35 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", - "version": "2024.3.2.1", - "sha256": "d6f7e7c60659fb4215da32ac7daeae5202a86bbb2e971963081ee4a56e579685", - "url": "https://download.jetbrains.com/webide/PhpStorm-2024.3.2.1.tar.gz", - "build_number": "243.23654.168", + "version": "2024.3.3", + "sha256": "274001fc0e628ed9b5496f24da11d3e97f07b0fe3f45303235c37d124121a14a", + "url": "https://download.jetbrains.com/webide/PhpStorm-2024.3.3.tar.gz", + "build_number": "243.24978.50", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz", - "version": "2024.3.2", - "sha256": "1674426c19a62f1046500b2bb170c849ddd259b2c4a4394bb2c90106aa316c4b", - "url": "https://download.jetbrains.com/python/pycharm-community-2024.3.2.tar.gz", - "build_number": "243.23654.177" + "version": "2024.3.3", + "sha256": "fbcbb8c5a23f5eabb1ab4b8e66ffb3b00988eab39df0b547c41ffbb1fc13968e", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.3.3.tar.gz", + "build_number": "243.24978.54" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz", - "version": "2024.3.2", - "sha256": "520ffc8c2d4ebd2d75663c74567882af28c3a5d595d165a494394842330b2b5a", - "url": "https://download.jetbrains.com/python/pycharm-professional-2024.3.2.tar.gz", - "build_number": "243.23654.177" + "version": "2024.3.3", + "sha256": "044029b647711a8b9d3e377e97ee4df8502c1894951981719c9ee0a19d81dbdb", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.3.3.tar.gz", + "build_number": "243.24978.54" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz", - "version": "2024.3.4", - "sha256": "8f63b8ae5be2834212b629a0d3f7d8a17c03154f069920dab8e24f61dbe5a4a5", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.3.4.tar.gz", - "build_number": "243.23654.126" + "version": "2024.3.5", + "sha256": "f2a78ee6d23eb580bc73f6005f9a069f2785786e0b39c88108d882ab9c9b925f", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.3.5.tar.gz", + "build_number": "243.24978.27" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", @@ -150,18 +150,18 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.tar.gz", - "version": "2024.3.2", - "sha256": "95c19bbc97ebac6e61db214548a547dd3892e0e3520682a443006b4a682451df", - "url": "https://download.jetbrains.com/cpp/CLion-2024.3.2-aarch64.tar.gz", - "build_number": "243.23654.114" + "version": "2024.3.3", + "sha256": "c30c7d94c65d093d65099ce5a4e99358972710875d266759263e1f6cb39bb80a", + "url": "https://download.jetbrains.com/cpp/CLion-2024.3.3-aarch64.tar.gz", + "build_number": "243.24978.55" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.tar.gz", - "version": "2024.3.3", - "sha256": "b6413cb0855f1beb64b7095f2e21c856e367319440f11ffad787ae88bc80af66", - "url": "https://download.jetbrains.com/datagrip/datagrip-2024.3.3-aarch64.tar.gz", - "build_number": "243.23654.19" + "version": "2024.3.4", + "sha256": "d5ec9d34302baf51efc2450d23efd5ed2384bf9c649900fca56746d89ecf5038", + "url": "https://download.jetbrains.com/datagrip/datagrip-2024.3.4-aarch64.tar.gz", + "build_number": "243.23654.183" }, "dataspell": { "update-channel": "DataSpell RELEASE", @@ -174,34 +174,34 @@ "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.tar.gz", - "version": "2024.3.2", - "sha256": "8f8dafbd75fe134235053d58b495dc017e8c9399976613b08b4c724579847f71", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.3.2-aarch64.tar.gz", - "build_number": "243.23654.132" + "version": "2024.3.3", + "sha256": "e7050cfb1b603c6f0bd0dbb90f32a49b3fe9155fb696f12dd261afc000043b81", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.3.3-aarch64.tar.gz", + "build_number": "243.24978.56" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.tar.gz", - "version": "2024.3.2.1", - "sha256": "4738ad9275c9a08c4a1e5bec7432a5338eeb4c02662179d1c6e9efa9226277a1", - "url": "https://download.jetbrains.com/go/goland-2024.3.2.1-aarch64.tar.gz", - "build_number": "243.23654.166" + "version": "2024.3.3", + "sha256": "5235a1dfeb4df21f42baa77c2ba47f9c3e2ef2c744bbb3612baa7bc7a33feee0", + "url": "https://download.jetbrains.com/go/goland-2024.3.3-aarch64.tar.gz", + "build_number": "243.24978.59" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.tar.gz", - "version": "2024.3.2.2", - "sha256": "ffdf4a5bdf8ba88c7afdbcd777aee7ce4113af016f0a671fa8a7fe6703734c7f", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.3.2.2-aarch64.tar.gz", - "build_number": "243.23654.189" + "version": "2024.3.3", + "sha256": "9ce7e15135e97e92601654f456a6211127c165b35f62784886c4ec3b466af8f9", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.3.3-aarch64.tar.gz", + "build_number": "243.24978.46" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.tar.gz", - "version": "2024.3.2.2", - "sha256": "1e279d974b0134bdfc2cfb2ab8f46576c3372e5fa868e5c6a6e40916b9144f6c", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.3.2.2-aarch64.tar.gz", - "build_number": "243.23654.189" + "version": "2024.3.3", + "sha256": "e730c61185146c8afc181d058873932dd1ea7ef528d3dc3eaba2d3c4337b6b3b", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.3.3-aarch64.tar.gz", + "build_number": "243.24978.46" }, "mps": { "update-channel": "MPS RELEASE", @@ -214,35 +214,35 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.tar.gz", - "version": "2024.3.2.1", - "sha256": "637edd1410045c6c42d54909c4548dbd82fc02d809401d817606efc7e1afe4bd", - "url": "https://download.jetbrains.com/webide/PhpStorm-2024.3.2.1-aarch64.tar.gz", - "build_number": "243.23654.168", + "version": "2024.3.3", + "sha256": "933472aab8dbf1f27ad04c32d2f5857f14f252a1bd75a4cbeb9d0a6864ee58e8", + "url": "https://download.jetbrains.com/webide/PhpStorm-2024.3.3-aarch64.tar.gz", + "build_number": "243.24978.50", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.tar.gz", - "version": "2024.3.2", - "sha256": "9fff53f58d2ba25b076725e9087ee4c2e0d550b5358137e435d9224f7b5dda45", - "url": "https://download.jetbrains.com/python/pycharm-community-2024.3.2-aarch64.tar.gz", - "build_number": "243.23654.177" + "version": "2024.3.3", + "sha256": "8a2c6064ac71769164f896ab4a6a72fffcadd6350875d43dbcf45ff853b6e5ce", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.3.3-aarch64.tar.gz", + "build_number": "243.24978.54" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.tar.gz", - "version": "2024.3.2", - "sha256": "7e7a4ebe5e78414695c3701eecf7e170a0574b2ca511a545594efa2587ea1a47", - "url": "https://download.jetbrains.com/python/pycharm-professional-2024.3.2-aarch64.tar.gz", - "build_number": "243.23654.177" + "version": "2024.3.3", + "sha256": "96108ca87d9def71143f88bf72033811cfe32812e0755f5778b4335a47353038", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.3.3-aarch64.tar.gz", + "build_number": "243.24978.54" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.tar.gz", - "version": "2024.3.4", - "sha256": "11107efdd6d15965817709d283362f0b0c522ffdc4f8175e85180bf9b0451443", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.3.4-aarch64.tar.gz", - "build_number": "243.23654.126" + "version": "2024.3.5", + "sha256": "572be78c88f925d35ec4521f1459780774c523c59a6257db2be4a465abb4088e", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.3.5-aarch64.tar.gz", + "build_number": "243.24978.27" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", @@ -289,18 +289,18 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg", - "version": "2024.3.2", - "sha256": "ecfb07f2ed3985a82faa940df4bbf195c421ba9a32c2c85dd56f057f40b9af38", - "url": "https://download.jetbrains.com/cpp/CLion-2024.3.2.dmg", - "build_number": "243.23654.114" + "version": "2024.3.3", + "sha256": "a5c50b3d615e93ee3461a420bb151b1af31a1f21356333522f4211f7c34bdc3e", + "url": "https://download.jetbrains.com/cpp/CLion-2024.3.3.dmg", + "build_number": "243.24978.55" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg", - "version": "2024.3.3", - "sha256": "e266609ab3555bbf213edd35f9c0b032dd4c27012334066212b391a5bc972ca4", - "url": "https://download.jetbrains.com/datagrip/datagrip-2024.3.3.dmg", - "build_number": "243.23654.19" + "version": "2024.3.4", + "sha256": "d56e34743ceaa76ee1fb5fa7a9da383dee83789dbab356c6267c912983b57029", + "url": "https://download.jetbrains.com/datagrip/datagrip-2024.3.4.dmg", + "build_number": "243.23654.183" }, "dataspell": { "update-channel": "DataSpell RELEASE", @@ -313,34 +313,34 @@ "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg", - "version": "2024.3.2", - "sha256": "6c3e4d0bb7b93e522be59c00243589e571d7575ae71678fa807645ea00a9dcae", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.3.2.dmg", - "build_number": "243.23654.132" + "version": "2024.3.3", + "sha256": "75cc932a4d7bd2f28f641e21cfc0667ce645dd38109b37cbe3621321f1eb3a2d", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.3.3.dmg", + "build_number": "243.24978.56" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", - "version": "2024.3.2.1", - "sha256": "694feba07f9ded15403971396d54c94bb7e306f1d6c37a995c83d229c73218dc", - "url": "https://download.jetbrains.com/go/goland-2024.3.2.1.dmg", - "build_number": "243.23654.166" + "version": "2024.3.3", + "sha256": "a31af21ba0c08465e815e79c37bf90910af085bdf5f362ebc77e8879b5d18e8d", + "url": "https://download.jetbrains.com/go/goland-2024.3.3.dmg", + "build_number": "243.24978.59" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg", - "version": "2024.3.2.2", - "sha256": "7a537dc57f88657bda1efc1d9c0ad86b3defa2c232b0cf678779ac6fcf90efa7", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.3.2.2.dmg", - "build_number": "243.23654.189" + "version": "2024.3.3", + "sha256": "f5c94cc249e231464e0ad9497e2638d758ed16c6d260bac838cef771d244ea58", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.3.3.dmg", + "build_number": "243.24978.46" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", - "version": "2024.3.2.2", - "sha256": "acedea9b54e3de575aa7679d478731d681d99b6b448230cf0c99e0b7c0cc8754", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.3.2.2.dmg", - "build_number": "243.23654.189" + "version": "2024.3.3", + "sha256": "c48b52537f23c3fe9647406beee4e2c7af2fcd39008d69beef0627b7d4b63c38", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.3.3.dmg", + "build_number": "243.24978.46" }, "mps": { "update-channel": "MPS RELEASE", @@ -353,35 +353,35 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", - "version": "2024.3.2.1", - "sha256": "d0eb3ee21d3c79cc262e0186b70c52a8d887100881b2691537744b97656ed187", - "url": "https://download.jetbrains.com/webide/PhpStorm-2024.3.2.1.dmg", - "build_number": "243.23654.168", + "version": "2024.3.3", + "sha256": "358f3a161ef31279bd7bc44325266864d57f79a00e5b5139a9cd52caa76e66da", + "url": "https://download.jetbrains.com/webide/PhpStorm-2024.3.3.dmg", + "build_number": "243.24978.50", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg", - "version": "2024.3.2", - "sha256": "7244a81461290b1e555e5de9e00ddfad18ece5d31383a6539e0feaa1a734b233", - "url": "https://download.jetbrains.com/python/pycharm-community-2024.3.2.dmg", - "build_number": "243.23654.177" + "version": "2024.3.3", + "sha256": "b32d12edbc56c4bfb071bc13a657499db1294d727a020017874b4da60f9b0e9a", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.3.3.dmg", + "build_number": "243.24978.54" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg", - "version": "2024.3.2", - "sha256": "71544961bab32d6dd3af554bc2af0af59e9f748fc0a7a87d6026d5aebf3a6105", - "url": "https://download.jetbrains.com/python/pycharm-professional-2024.3.2.dmg", - "build_number": "243.23654.177" + "version": "2024.3.3", + "sha256": "b31ed5d07c435146df5a48b5c77caf5b635396ebb023c8acd7ebbd76b8901cde", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.3.3.dmg", + "build_number": "243.24978.54" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg", - "version": "2024.3.4", - "sha256": "7a8be161e0574cbe699b82f5bf0bd74de8d13b9ff8851f620f90c4c301469680", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.3.4.dmg", - "build_number": "243.23654.126" + "version": "2024.3.5", + "sha256": "1ae18866cb007a1133aba937f1c46a98de7e3f881a23da3b6ad736a38e3500f7", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.3.5.dmg", + "build_number": "243.24978.27" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", @@ -428,18 +428,18 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg", - "version": "2024.3.2", - "sha256": "fd9fdca6467ddc6baf24f85afb1b5f07b907521102523a8379ea35acd58492ee", - "url": "https://download.jetbrains.com/cpp/CLion-2024.3.2-aarch64.dmg", - "build_number": "243.23654.114" + "version": "2024.3.3", + "sha256": "6784b68f9c827a5cacd9247376b17229a8ce6514a6142caa96ceb9df2f47fd0d", + "url": "https://download.jetbrains.com/cpp/CLion-2024.3.3-aarch64.dmg", + "build_number": "243.24978.55" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg", - "version": "2024.3.3", - "sha256": "56a31779b85e53da711a47bf3a6b801e7dd7565057f5feceb67fa456350f7830", - "url": "https://download.jetbrains.com/datagrip/datagrip-2024.3.3-aarch64.dmg", - "build_number": "243.23654.19" + "version": "2024.3.4", + "sha256": "d968a1fcb1f34b59ce06103e05b20a582346e5cc81c3cf3f799dfc8940e7d79b", + "url": "https://download.jetbrains.com/datagrip/datagrip-2024.3.4-aarch64.dmg", + "build_number": "243.23654.183" }, "dataspell": { "update-channel": "DataSpell RELEASE", @@ -452,34 +452,34 @@ "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg", - "version": "2024.3.2", - "sha256": "a8a36e25cf011941156344bc6b6f7f6b6de8e6905a2ad0c3d8106dda6b40342f", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.3.2-aarch64.dmg", - "build_number": "243.23654.132" + "version": "2024.3.3", + "sha256": "846eb50e707231e34bc9ad467a5237a43a865061b10a1be6b4abe4a0cc08161b", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.3.3-aarch64.dmg", + "build_number": "243.24978.56" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", - "version": "2024.3.2.1", - "sha256": "d93f3bd0ca598f37032110275336c98c5aa46ef566e51e2d290b986416e4bd7a", - "url": "https://download.jetbrains.com/go/goland-2024.3.2.1-aarch64.dmg", - "build_number": "243.23654.166" + "version": "2024.3.3", + "sha256": "a66df6461724bcd1b2d4ada74ae4fafced3cfb6f9e2206554d786655cb067cc3", + "url": "https://download.jetbrains.com/go/goland-2024.3.3-aarch64.dmg", + "build_number": "243.24978.59" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg", - "version": "2024.3.2.2", - "sha256": "8a0435dabe4ff169430b46d119afcaa053b8d7d8d5d6a666e56292f6d470a2c7", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.3.2.2-aarch64.dmg", - "build_number": "243.23654.189" + "version": "2024.3.3", + "sha256": "02c436d5cbccee9ac9f2aa50f8254d9352b971296322a3b8efbcb990298b98d0", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.3.3-aarch64.dmg", + "build_number": "243.24978.46" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg", - "version": "2024.3.2.2", - "sha256": "da5e9c6ea95d1709e1602efeb5736d8daf2c5d108c9e04e544eb30bd6c2dac11", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.3.2.2-aarch64.dmg", - "build_number": "243.23654.189" + "version": "2024.3.3", + "sha256": "d20b880918218b5dd75812a34817d4016f1109a23977f1de8aaf1fbad89ad06e", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.3.3-aarch64.dmg", + "build_number": "243.24978.46" }, "mps": { "update-channel": "MPS RELEASE", @@ -492,35 +492,35 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg", - "version": "2024.3.2.1", - "sha256": "42d0243042485928bc2a3c390e78d7de721c8a54b388e5ae8cff0d8982aaa521", - "url": "https://download.jetbrains.com/webide/PhpStorm-2024.3.2.1-aarch64.dmg", - "build_number": "243.23654.168", + "version": "2024.3.3", + "sha256": "48bee7b2dd008ab5fe81052336da2030ac45f6a2de9e2650005f3f3edddb0204", + "url": "https://download.jetbrains.com/webide/PhpStorm-2024.3.3-aarch64.dmg", + "build_number": "243.24978.50", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg", - "version": "2024.3.2", - "sha256": "855440e5a38705d8cd1d0d6b5d3fe4817fdfde62fd1bc934c51de16cd6227ba9", - "url": "https://download.jetbrains.com/python/pycharm-community-2024.3.2-aarch64.dmg", - "build_number": "243.23654.177" + "version": "2024.3.3", + "sha256": "4737c340527ebe7b434010d21aac57b3e23625739a06130d7b1058773a2306a9", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.3.3-aarch64.dmg", + "build_number": "243.24978.54" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg", - "version": "2024.3.2", - "sha256": "793c9c03a6c4d3c6446a0f068a5d8e0fd3611e096aabc04918ae0daf739c134d", - "url": "https://download.jetbrains.com/python/pycharm-professional-2024.3.2-aarch64.dmg", - "build_number": "243.23654.177" + "version": "2024.3.3", + "sha256": "9ae7ed7aac293c86db6b7210ff8a53099b4a76d017fc76c24a8b5f73109cacbb", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.3.3-aarch64.dmg", + "build_number": "243.24978.54" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg", - "version": "2024.3.4", - "sha256": "6d0439fb5ce9364ceab5b839aafd1f904ccda99483b4e8f3d41ffbcb8469afe7", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.3.4-aarch64.dmg", - "build_number": "243.23654.126" + "version": "2024.3.5", + "sha256": "e0b1a2b44c9943b2fa00536ee9f311c5738d711dad60bba6b779dc75fb3d8113", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.3.5-aarch64.dmg", + "build_number": "243.24978.27" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", From 5fb152a9d42a4f0d6e685b60363ea2326c910b36 Mon Sep 17 00:00:00 2001 From: ners Date: Fri, 14 Feb 2025 16:01:26 +0100 Subject: [PATCH 1997/2168] jetbrains.plugins: update --- .../editors/jetbrains/plugins/plugins.json | 841 +++++++++--------- 1 file changed, 422 insertions(+), 419 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/plugins/plugins.json b/pkgs/applications/editors/jetbrains/plugins/plugins.json index 1d20c7cb005f..2f34fb49828b 100644 --- a/pkgs/applications/editors/jetbrains/plugins/plugins.json +++ b/pkgs/applications/editors/jetbrains/plugins/plugins.json @@ -17,19 +17,19 @@ "webstorm" ], "builds": { - "243.21565.447": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip", - "243.22562.218": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip", - "243.23654.114": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip", - "243.23654.126": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip", - "243.23654.157": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip", - "243.23654.166": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip", - "243.23654.167": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip", - "243.23654.168": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip", - "243.23654.177": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip", - "243.23654.180": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip", - "243.23654.19": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip" + "243.21565.447": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", + "243.22562.218": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", + "243.22562.220": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", + "243.23654.157": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", + "243.23654.167": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", + "243.23654.180": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", + "243.23654.183": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", + "243.24978.27": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", + "243.24978.46": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", + "243.24978.50": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", + "243.24978.54": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", + "243.24978.55": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", + "243.24978.59": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip" }, "name": "ideavim" }, @@ -38,7 +38,7 @@ "idea-ultimate" ], "builds": { - "243.23654.189": "https://plugins.jetbrains.com/files/631/673131/python-243.23654.189.zip" + "243.24978.46": "https://plugins.jetbrains.com/files/631/680216/python-243.24978.46.zip" }, "name": "python" }, @@ -49,7 +49,7 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/1347/667258/scala-intellij-bin-2024.3.35.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/1347/667258/scala-intellij-bin-2024.3.35.zip" + "243.24978.46": "https://plugins.jetbrains.com/files/1347/681279/scala-intellij-bin-2024.3.38.zip" }, "name": "scala" }, @@ -73,16 +73,16 @@ "243.21565.447": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", "243.22562.218": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", "243.22562.220": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", - "243.23654.114": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", - "243.23654.126": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", "243.23654.157": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", - "243.23654.166": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", "243.23654.167": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", - "243.23654.168": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", - "243.23654.177": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", "243.23654.180": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", - "243.23654.19": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip" + "243.23654.183": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", + "243.24978.27": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", + "243.24978.46": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", + "243.24978.50": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", + "243.24978.54": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", + "243.24978.55": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", + "243.24978.59": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip" }, "name": "string-manipulation" }, @@ -106,16 +106,16 @@ "243.21565.447": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", "243.22562.218": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", "243.22562.220": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", - "243.23654.114": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", - "243.23654.126": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", "243.23654.157": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", - "243.23654.166": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", "243.23654.167": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", - "243.23654.168": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", - "243.23654.177": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", "243.23654.180": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", - "243.23654.19": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip" + "243.23654.183": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", + "243.24978.27": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", + "243.24978.46": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", + "243.24978.50": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", + "243.24978.54": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", + "243.24978.55": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", + "243.24978.59": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip" }, "name": "handlebars-mustache" }, @@ -139,16 +139,16 @@ "243.21565.447": null, "243.22562.218": null, "243.22562.220": null, - "243.23654.114": null, - "243.23654.126": null, "243.23654.157": null, - "243.23654.166": null, "243.23654.167": null, - "243.23654.168": null, - "243.23654.177": null, "243.23654.180": null, - "243.23654.189": null, - "243.23654.19": null + "243.23654.183": null, + "243.24978.27": null, + "243.24978.46": null, + "243.24978.50": null, + "243.24978.54": null, + "243.24978.55": null, + "243.24978.59": null }, "name": "kotlin" }, @@ -169,19 +169,19 @@ "webstorm" ], "builds": { - "243.21565.447": "https://plugins.jetbrains.com/files/6981/633889/ini-243.21565.208.zip", + "243.21565.447": null, "243.22562.218": "https://plugins.jetbrains.com/files/6981/654905/ini-243.22562.236.zip", "243.22562.220": "https://plugins.jetbrains.com/files/6981/654905/ini-243.22562.236.zip", - "243.23654.114": "https://plugins.jetbrains.com/files/6981/672286/ini-243.23654.177.zip", - "243.23654.126": "https://plugins.jetbrains.com/files/6981/672286/ini-243.23654.177.zip", "243.23654.157": "https://plugins.jetbrains.com/files/6981/672286/ini-243.23654.177.zip", - "243.23654.166": "https://plugins.jetbrains.com/files/6981/672286/ini-243.23654.177.zip", "243.23654.167": "https://plugins.jetbrains.com/files/6981/672286/ini-243.23654.177.zip", - "243.23654.168": "https://plugins.jetbrains.com/files/6981/672286/ini-243.23654.177.zip", - "243.23654.177": "https://plugins.jetbrains.com/files/6981/672286/ini-243.23654.177.zip", "243.23654.180": "https://plugins.jetbrains.com/files/6981/672286/ini-243.23654.177.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/6981/672286/ini-243.23654.177.zip", - "243.23654.19": "https://plugins.jetbrains.com/files/6981/672286/ini-243.23654.177.zip" + "243.23654.183": "https://plugins.jetbrains.com/files/6981/672286/ini-243.23654.177.zip", + "243.24978.27": "https://plugins.jetbrains.com/files/6981/680778/ini-243.24978.60.zip", + "243.24978.46": "https://plugins.jetbrains.com/files/6981/680778/ini-243.24978.60.zip", + "243.24978.50": "https://plugins.jetbrains.com/files/6981/680778/ini-243.24978.60.zip", + "243.24978.54": "https://plugins.jetbrains.com/files/6981/680778/ini-243.24978.60.zip", + "243.24978.55": "https://plugins.jetbrains.com/files/6981/680778/ini-243.24978.60.zip", + "243.24978.59": "https://plugins.jetbrains.com/files/6981/680778/ini-243.24978.60.zip" }, "name": "ini" }, @@ -205,16 +205,16 @@ "243.21565.447": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", "243.22562.218": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", "243.22562.220": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "243.23654.114": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "243.23654.126": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", "243.23654.157": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "243.23654.166": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", "243.23654.167": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "243.23654.168": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "243.23654.177": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", "243.23654.180": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "243.23654.19": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip" + "243.23654.183": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "243.24978.27": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "243.24978.46": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "243.24978.50": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "243.24978.54": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "243.24978.55": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "243.24978.59": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip" }, "name": "acejump" }, @@ -238,16 +238,16 @@ "243.21565.447": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", "243.22562.218": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", "243.22562.220": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", - "243.23654.114": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", - "243.23654.126": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", "243.23654.157": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", - "243.23654.166": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", "243.23654.167": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", - "243.23654.168": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", - "243.23654.177": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", "243.23654.180": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", - "243.23654.19": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip" + "243.23654.183": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", + "243.24978.27": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", + "243.24978.46": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", + "243.24978.50": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", + "243.24978.54": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", + "243.24978.55": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", + "243.24978.59": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip" }, "name": "grep-console" }, @@ -271,16 +271,16 @@ "243.21565.447": "https://plugins.jetbrains.com/files/7177/630032/fileWatcher-243.21565.122.zip", "243.22562.218": "https://plugins.jetbrains.com/files/7177/636663/fileWatcher-243.22562.13.zip", "243.22562.220": "https://plugins.jetbrains.com/files/7177/636663/fileWatcher-243.22562.13.zip", - "243.23654.114": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", - "243.23654.126": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", "243.23654.157": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", - "243.23654.166": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", "243.23654.167": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", - "243.23654.168": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", - "243.23654.177": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", "243.23654.180": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", - "243.23654.19": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip" + "243.23654.183": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", + "243.24978.27": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", + "243.24978.46": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", + "243.24978.50": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", + "243.24978.54": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", + "243.24978.55": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", + "243.24978.59": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip" }, "name": "file-watchers" }, @@ -290,8 +290,8 @@ "phpstorm" ], "builds": { - "243.23654.168": "https://plugins.jetbrains.com/files/7219/605730/Symfony_Plugin-2024.1.276.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/7219/605730/Symfony_Plugin-2024.1.276.zip" + "243.24978.46": "https://plugins.jetbrains.com/files/7219/605730/Symfony_Plugin-2024.1.276.zip", + "243.24978.50": "https://plugins.jetbrains.com/files/7219/605730/Symfony_Plugin-2024.1.276.zip" }, "name": "symfony-support" }, @@ -301,8 +301,8 @@ "phpstorm" ], "builds": { - "243.23654.168": "https://plugins.jetbrains.com/files/7320/630497/PHP_Annotations-11.1.1.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/7320/630497/PHP_Annotations-11.1.1.zip" + "243.24978.46": "https://plugins.jetbrains.com/files/7320/630497/PHP_Annotations-11.1.1.zip", + "243.24978.50": "https://plugins.jetbrains.com/files/7320/630497/PHP_Annotations-11.1.1.zip" }, "name": "php-annotations" }, @@ -321,14 +321,14 @@ "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/7322/646590/python-ce-243.22562.145.zip", "243.22562.220": "https://plugins.jetbrains.com/files/7322/646590/python-ce-243.22562.145.zip", - "243.23654.114": "https://plugins.jetbrains.com/files/7322/673130/python-ce-243.23654.189.zip", - "243.23654.126": "https://plugins.jetbrains.com/files/7322/673130/python-ce-243.23654.189.zip", "243.23654.157": "https://plugins.jetbrains.com/files/7322/673130/python-ce-243.23654.189.zip", - "243.23654.166": "https://plugins.jetbrains.com/files/7322/673130/python-ce-243.23654.189.zip", - "243.23654.177": "https://plugins.jetbrains.com/files/7322/673130/python-ce-243.23654.189.zip", "243.23654.180": "https://plugins.jetbrains.com/files/7322/673130/python-ce-243.23654.189.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/7322/673130/python-ce-243.23654.189.zip", - "243.23654.19": "https://plugins.jetbrains.com/files/7322/673130/python-ce-243.23654.189.zip" + "243.23654.183": "https://plugins.jetbrains.com/files/7322/673130/python-ce-243.23654.189.zip", + "243.24978.27": "https://plugins.jetbrains.com/files/7322/680217/python-ce-243.24978.46.zip", + "243.24978.46": "https://plugins.jetbrains.com/files/7322/680217/python-ce-243.24978.46.zip", + "243.24978.54": "https://plugins.jetbrains.com/files/7322/680217/python-ce-243.24978.46.zip", + "243.24978.55": "https://plugins.jetbrains.com/files/7322/680217/python-ce-243.24978.46.zip", + "243.24978.59": "https://plugins.jetbrains.com/files/7322/680217/python-ce-243.24978.46.zip" }, "name": "python-community-edition" }, @@ -352,16 +352,16 @@ "243.21565.447": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", "243.22562.218": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", "243.22562.220": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", - "243.23654.114": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", - "243.23654.126": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", "243.23654.157": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", - "243.23654.166": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", "243.23654.167": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", - "243.23654.168": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", - "243.23654.177": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", "243.23654.180": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", - "243.23654.19": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip" + "243.23654.183": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", + "243.24978.27": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", + "243.24978.46": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", + "243.24978.50": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", + "243.24978.54": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", + "243.24978.55": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", + "243.24978.59": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip" }, "name": "asciidoc" }, @@ -385,16 +385,16 @@ "243.21565.447": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", "243.22562.218": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", "243.22562.220": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", - "243.23654.114": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", - "243.23654.126": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", "243.23654.157": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", - "243.23654.166": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", "243.23654.167": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", - "243.23654.168": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", - "243.23654.177": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", "243.23654.180": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", - "243.23654.189": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", - "243.23654.19": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar" + "243.23654.183": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", + "243.24978.27": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", + "243.24978.46": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", + "243.24978.50": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", + "243.24978.54": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", + "243.24978.55": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", + "243.24978.59": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar" }, "name": "wakatime" }, @@ -418,16 +418,16 @@ "243.21565.447": "https://plugins.jetbrains.com/files/7499/667439/gittoolbox-600.0.14_243-signed.zip", "243.22562.218": "https://plugins.jetbrains.com/files/7499/667439/gittoolbox-600.0.14_243-signed.zip", "243.22562.220": "https://plugins.jetbrains.com/files/7499/667439/gittoolbox-600.0.14_243-signed.zip", - "243.23654.114": "https://plugins.jetbrains.com/files/7499/667439/gittoolbox-600.0.14_243-signed.zip", - "243.23654.126": "https://plugins.jetbrains.com/files/7499/667439/gittoolbox-600.0.14_243-signed.zip", "243.23654.157": "https://plugins.jetbrains.com/files/7499/667439/gittoolbox-600.0.14_243-signed.zip", - "243.23654.166": "https://plugins.jetbrains.com/files/7499/667439/gittoolbox-600.0.14_243-signed.zip", "243.23654.167": "https://plugins.jetbrains.com/files/7499/667439/gittoolbox-600.0.14_243-signed.zip", - "243.23654.168": "https://plugins.jetbrains.com/files/7499/667439/gittoolbox-600.0.14_243-signed.zip", - "243.23654.177": "https://plugins.jetbrains.com/files/7499/667439/gittoolbox-600.0.14_243-signed.zip", "243.23654.180": "https://plugins.jetbrains.com/files/7499/667439/gittoolbox-600.0.14_243-signed.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/7499/667439/gittoolbox-600.0.14_243-signed.zip", - "243.23654.19": "https://plugins.jetbrains.com/files/7499/667439/gittoolbox-600.0.14_243-signed.zip" + "243.23654.183": "https://plugins.jetbrains.com/files/7499/667439/gittoolbox-600.0.14_243-signed.zip", + "243.24978.27": "https://plugins.jetbrains.com/files/7499/667439/gittoolbox-600.0.14_243-signed.zip", + "243.24978.46": "https://plugins.jetbrains.com/files/7499/667439/gittoolbox-600.0.14_243-signed.zip", + "243.24978.50": "https://plugins.jetbrains.com/files/7499/667439/gittoolbox-600.0.14_243-signed.zip", + "243.24978.54": "https://plugins.jetbrains.com/files/7499/667439/gittoolbox-600.0.14_243-signed.zip", + "243.24978.55": "https://plugins.jetbrains.com/files/7499/667439/gittoolbox-600.0.14_243-signed.zip", + "243.24978.59": "https://plugins.jetbrains.com/files/7499/667439/gittoolbox-600.0.14_243-signed.zip" }, "name": "gittoolbox" }, @@ -450,15 +450,15 @@ "243.21565.447": null, "243.22562.218": null, "243.22562.220": null, - "243.23654.114": null, - "243.23654.126": null, "243.23654.157": null, - "243.23654.166": null, "243.23654.167": null, - "243.23654.168": null, - "243.23654.177": null, - "243.23654.189": null, - "243.23654.19": null + "243.23654.183": null, + "243.24978.27": null, + "243.24978.46": null, + "243.24978.50": null, + "243.24978.54": null, + "243.24978.55": null, + "243.24978.59": null }, "name": "-deprecated-rust" }, @@ -481,15 +481,15 @@ "243.21565.447": null, "243.22562.218": null, "243.22562.220": null, - "243.23654.114": null, - "243.23654.126": null, "243.23654.157": null, - "243.23654.166": null, "243.23654.167": null, - "243.23654.168": null, - "243.23654.177": null, - "243.23654.189": null, - "243.23654.19": null + "243.23654.183": null, + "243.24978.27": null, + "243.24978.46": null, + "243.24978.50": null, + "243.24978.54": null, + "243.24978.55": null, + "243.24978.59": null }, "name": "-deprecated-rust-beta" }, @@ -513,16 +513,16 @@ "243.21565.447": "https://plugins.jetbrains.com/files/8195/630064/toml-243.21565.122.zip", "243.22562.218": "https://plugins.jetbrains.com/files/8195/630064/toml-243.21565.122.zip", "243.22562.220": "https://plugins.jetbrains.com/files/8195/630064/toml-243.21565.122.zip", - "243.23654.114": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", - "243.23654.126": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", "243.23654.157": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", - "243.23654.166": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", "243.23654.167": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", - "243.23654.168": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", - "243.23654.177": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", "243.23654.180": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", - "243.23654.19": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip" + "243.23654.183": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", + "243.24978.27": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", + "243.24978.46": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", + "243.24978.50": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", + "243.24978.54": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", + "243.24978.55": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", + "243.24978.59": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip" }, "name": "toml" }, @@ -533,7 +533,7 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/8327/615097/Minecraft_Development-2024.3-1.8.2.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/8327/615097/Minecraft_Development-2024.3-1.8.2.zip" + "243.24978.46": "https://plugins.jetbrains.com/files/8327/615097/Minecraft_Development-2024.3-1.8.2.zip" }, "name": "minecraft-development" }, @@ -557,16 +557,16 @@ "243.21565.447": "https://plugins.jetbrains.com/files/8554/633920/featuresTrainer-243.21565.204.zip", "243.22562.218": "https://plugins.jetbrains.com/files/8554/654690/featuresTrainer-243.22562.233.zip", "243.22562.220": "https://plugins.jetbrains.com/files/8554/654690/featuresTrainer-243.22562.233.zip", - "243.23654.114": "https://plugins.jetbrains.com/files/8554/672476/featuresTrainer-243.23654.180.zip", - "243.23654.126": "https://plugins.jetbrains.com/files/8554/672476/featuresTrainer-243.23654.180.zip", "243.23654.157": "https://plugins.jetbrains.com/files/8554/672476/featuresTrainer-243.23654.180.zip", - "243.23654.166": "https://plugins.jetbrains.com/files/8554/672476/featuresTrainer-243.23654.180.zip", "243.23654.167": "https://plugins.jetbrains.com/files/8554/672476/featuresTrainer-243.23654.180.zip", - "243.23654.168": "https://plugins.jetbrains.com/files/8554/672476/featuresTrainer-243.23654.180.zip", - "243.23654.177": "https://plugins.jetbrains.com/files/8554/672476/featuresTrainer-243.23654.180.zip", "243.23654.180": "https://plugins.jetbrains.com/files/8554/672476/featuresTrainer-243.23654.180.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/8554/672476/featuresTrainer-243.23654.180.zip", - "243.23654.19": "https://plugins.jetbrains.com/files/8554/672476/featuresTrainer-243.23654.180.zip" + "243.23654.183": "https://plugins.jetbrains.com/files/8554/672476/featuresTrainer-243.23654.180.zip", + "243.24978.27": "https://plugins.jetbrains.com/files/8554/680571/featuresTrainer-243.24978.50.zip", + "243.24978.46": "https://plugins.jetbrains.com/files/8554/680571/featuresTrainer-243.24978.50.zip", + "243.24978.50": "https://plugins.jetbrains.com/files/8554/680571/featuresTrainer-243.24978.50.zip", + "243.24978.54": "https://plugins.jetbrains.com/files/8554/680571/featuresTrainer-243.24978.50.zip", + "243.24978.55": "https://plugins.jetbrains.com/files/8554/680571/featuresTrainer-243.24978.50.zip", + "243.24978.59": "https://plugins.jetbrains.com/files/8554/680571/featuresTrainer-243.24978.50.zip" }, "name": "ide-features-trainer" }, @@ -590,16 +590,16 @@ "243.21565.447": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", "243.22562.218": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", "243.22562.220": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", - "243.23654.114": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", - "243.23654.126": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", "243.23654.157": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", - "243.23654.166": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", "243.23654.167": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", - "243.23654.168": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", - "243.23654.177": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", "243.23654.180": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", - "243.23654.19": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip" + "243.23654.183": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", + "243.24978.27": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", + "243.24978.46": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", + "243.24978.50": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", + "243.24978.54": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", + "243.24978.55": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", + "243.24978.59": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip" }, "name": "nixidea" }, @@ -623,16 +623,16 @@ "243.21565.447": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", "243.22562.218": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", "243.22562.220": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", - "243.23654.114": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", - "243.23654.126": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", "243.23654.157": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", - "243.23654.166": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", "243.23654.167": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", - "243.23654.168": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", - "243.23654.177": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", "243.23654.180": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", - "243.23654.19": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip" + "243.23654.183": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", + "243.24978.27": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", + "243.24978.46": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", + "243.24978.50": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", + "243.24978.54": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", + "243.24978.55": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", + "243.24978.59": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip" }, "name": "-env-files" }, @@ -642,8 +642,8 @@ "idea-ultimate" ], "builds": { - "243.23654.166": "https://plugins.jetbrains.com/files/9568/666746/go-plugin-243.23654.117.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/9568/666746/go-plugin-243.23654.117.zip" + "243.24978.46": "https://plugins.jetbrains.com/files/9568/680198/go-plugin-243.24978.46.zip", + "243.24978.59": "https://plugins.jetbrains.com/files/9568/680198/go-plugin-243.24978.46.zip" }, "name": "go" }, @@ -667,16 +667,16 @@ "243.21565.447": "https://plugins.jetbrains.com/files/9707/628343/ansi-highlighter-premium-24.3.1.jar", "243.22562.218": "https://plugins.jetbrains.com/files/9707/628343/ansi-highlighter-premium-24.3.1.jar", "243.22562.220": "https://plugins.jetbrains.com/files/9707/628343/ansi-highlighter-premium-24.3.1.jar", - "243.23654.114": "https://plugins.jetbrains.com/files/9707/628343/ansi-highlighter-premium-24.3.1.jar", - "243.23654.126": "https://plugins.jetbrains.com/files/9707/628343/ansi-highlighter-premium-24.3.1.jar", "243.23654.157": "https://plugins.jetbrains.com/files/9707/628343/ansi-highlighter-premium-24.3.1.jar", - "243.23654.166": "https://plugins.jetbrains.com/files/9707/628343/ansi-highlighter-premium-24.3.1.jar", "243.23654.167": "https://plugins.jetbrains.com/files/9707/628343/ansi-highlighter-premium-24.3.1.jar", - "243.23654.168": "https://plugins.jetbrains.com/files/9707/628343/ansi-highlighter-premium-24.3.1.jar", - "243.23654.177": "https://plugins.jetbrains.com/files/9707/628343/ansi-highlighter-premium-24.3.1.jar", "243.23654.180": "https://plugins.jetbrains.com/files/9707/628343/ansi-highlighter-premium-24.3.1.jar", - "243.23654.189": "https://plugins.jetbrains.com/files/9707/628343/ansi-highlighter-premium-24.3.1.jar", - "243.23654.19": "https://plugins.jetbrains.com/files/9707/628343/ansi-highlighter-premium-24.3.1.jar" + "243.23654.183": "https://plugins.jetbrains.com/files/9707/628343/ansi-highlighter-premium-24.3.1.jar", + "243.24978.27": "https://plugins.jetbrains.com/files/9707/628343/ansi-highlighter-premium-24.3.1.jar", + "243.24978.46": "https://plugins.jetbrains.com/files/9707/628343/ansi-highlighter-premium-24.3.1.jar", + "243.24978.50": "https://plugins.jetbrains.com/files/9707/628343/ansi-highlighter-premium-24.3.1.jar", + "243.24978.54": "https://plugins.jetbrains.com/files/9707/628343/ansi-highlighter-premium-24.3.1.jar", + "243.24978.55": "https://plugins.jetbrains.com/files/9707/628343/ansi-highlighter-premium-24.3.1.jar", + "243.24978.59": "https://plugins.jetbrains.com/files/9707/628343/ansi-highlighter-premium-24.3.1.jar" }, "name": "ansi-highlighter-premium" }, @@ -700,16 +700,16 @@ "243.21565.447": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", "243.22562.218": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", "243.22562.220": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", - "243.23654.114": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", - "243.23654.126": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", "243.23654.157": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", - "243.23654.166": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", "243.23654.167": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", - "243.23654.168": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", - "243.23654.177": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", "243.23654.180": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", - "243.23654.19": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip" + "243.23654.183": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", + "243.24978.27": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", + "243.24978.46": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", + "243.24978.50": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", + "243.24978.54": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", + "243.24978.55": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", + "243.24978.59": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip" }, "name": "key-promoter-x" }, @@ -733,16 +733,16 @@ "243.21565.447": "https://plugins.jetbrains.com/files/9836/672013/intellij-randomness-3.3.5-signed.zip", "243.22562.218": "https://plugins.jetbrains.com/files/9836/672013/intellij-randomness-3.3.5-signed.zip", "243.22562.220": "https://plugins.jetbrains.com/files/9836/672013/intellij-randomness-3.3.5-signed.zip", - "243.23654.114": "https://plugins.jetbrains.com/files/9836/672013/intellij-randomness-3.3.5-signed.zip", - "243.23654.126": "https://plugins.jetbrains.com/files/9836/672013/intellij-randomness-3.3.5-signed.zip", "243.23654.157": "https://plugins.jetbrains.com/files/9836/672013/intellij-randomness-3.3.5-signed.zip", - "243.23654.166": "https://plugins.jetbrains.com/files/9836/672013/intellij-randomness-3.3.5-signed.zip", "243.23654.167": "https://plugins.jetbrains.com/files/9836/672013/intellij-randomness-3.3.5-signed.zip", - "243.23654.168": "https://plugins.jetbrains.com/files/9836/672013/intellij-randomness-3.3.5-signed.zip", - "243.23654.177": "https://plugins.jetbrains.com/files/9836/672013/intellij-randomness-3.3.5-signed.zip", "243.23654.180": "https://plugins.jetbrains.com/files/9836/672013/intellij-randomness-3.3.5-signed.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/9836/672013/intellij-randomness-3.3.5-signed.zip", - "243.23654.19": "https://plugins.jetbrains.com/files/9836/672013/intellij-randomness-3.3.5-signed.zip" + "243.23654.183": "https://plugins.jetbrains.com/files/9836/672013/intellij-randomness-3.3.5-signed.zip", + "243.24978.27": "https://plugins.jetbrains.com/files/9836/672013/intellij-randomness-3.3.5-signed.zip", + "243.24978.46": "https://plugins.jetbrains.com/files/9836/672013/intellij-randomness-3.3.5-signed.zip", + "243.24978.50": "https://plugins.jetbrains.com/files/9836/672013/intellij-randomness-3.3.5-signed.zip", + "243.24978.54": "https://plugins.jetbrains.com/files/9836/672013/intellij-randomness-3.3.5-signed.zip", + "243.24978.55": "https://plugins.jetbrains.com/files/9836/672013/intellij-randomness-3.3.5-signed.zip", + "243.24978.59": "https://plugins.jetbrains.com/files/9836/672013/intellij-randomness-3.3.5-signed.zip" }, "name": "randomness" }, @@ -766,16 +766,16 @@ "243.21565.447": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", "243.22562.218": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", "243.22562.220": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", - "243.23654.114": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", - "243.23654.126": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", "243.23654.157": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", - "243.23654.166": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", "243.23654.167": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", - "243.23654.168": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", - "243.23654.177": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", "243.23654.180": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", - "243.23654.19": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip" + "243.23654.183": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", + "243.24978.27": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", + "243.24978.46": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", + "243.24978.50": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", + "243.24978.54": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", + "243.24978.55": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", + "243.24978.59": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip" }, "name": "csv-editor" }, @@ -799,16 +799,16 @@ "243.21565.447": "https://plugins.jetbrains.com/files/10080/645834/intellij-rainbow-brackets-2024.2.8-241.zip", "243.22562.218": "https://plugins.jetbrains.com/files/10080/645834/intellij-rainbow-brackets-2024.2.8-241.zip", "243.22562.220": "https://plugins.jetbrains.com/files/10080/645834/intellij-rainbow-brackets-2024.2.8-241.zip", - "243.23654.114": "https://plugins.jetbrains.com/files/10080/645834/intellij-rainbow-brackets-2024.2.8-241.zip", - "243.23654.126": "https://plugins.jetbrains.com/files/10080/645834/intellij-rainbow-brackets-2024.2.8-241.zip", "243.23654.157": "https://plugins.jetbrains.com/files/10080/645834/intellij-rainbow-brackets-2024.2.8-241.zip", - "243.23654.166": "https://plugins.jetbrains.com/files/10080/645834/intellij-rainbow-brackets-2024.2.8-241.zip", "243.23654.167": "https://plugins.jetbrains.com/files/10080/645834/intellij-rainbow-brackets-2024.2.8-241.zip", - "243.23654.168": "https://plugins.jetbrains.com/files/10080/645834/intellij-rainbow-brackets-2024.2.8-241.zip", - "243.23654.177": "https://plugins.jetbrains.com/files/10080/645834/intellij-rainbow-brackets-2024.2.8-241.zip", "243.23654.180": "https://plugins.jetbrains.com/files/10080/645834/intellij-rainbow-brackets-2024.2.8-241.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/10080/645834/intellij-rainbow-brackets-2024.2.8-241.zip", - "243.23654.19": "https://plugins.jetbrains.com/files/10080/645834/intellij-rainbow-brackets-2024.2.8-241.zip" + "243.23654.183": "https://plugins.jetbrains.com/files/10080/645834/intellij-rainbow-brackets-2024.2.8-241.zip", + "243.24978.27": "https://plugins.jetbrains.com/files/10080/645834/intellij-rainbow-brackets-2024.2.8-241.zip", + "243.24978.46": "https://plugins.jetbrains.com/files/10080/645834/intellij-rainbow-brackets-2024.2.8-241.zip", + "243.24978.50": "https://plugins.jetbrains.com/files/10080/645834/intellij-rainbow-brackets-2024.2.8-241.zip", + "243.24978.54": "https://plugins.jetbrains.com/files/10080/645834/intellij-rainbow-brackets-2024.2.8-241.zip", + "243.24978.55": "https://plugins.jetbrains.com/files/10080/645834/intellij-rainbow-brackets-2024.2.8-241.zip", + "243.24978.59": "https://plugins.jetbrains.com/files/10080/645834/intellij-rainbow-brackets-2024.2.8-241.zip" }, "name": "rainbow-brackets" }, @@ -832,16 +832,16 @@ "243.21565.447": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", "243.22562.218": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", "243.22562.220": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", - "243.23654.114": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", - "243.23654.126": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", "243.23654.157": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", - "243.23654.166": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", "243.23654.167": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", - "243.23654.168": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", - "243.23654.177": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", "243.23654.180": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", - "243.23654.19": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip" + "243.23654.183": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", + "243.24978.27": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", + "243.24978.46": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", + "243.24978.50": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", + "243.24978.54": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", + "243.24978.55": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", + "243.24978.59": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip" }, "name": "dot-language" }, @@ -865,16 +865,16 @@ "243.21565.447": "https://plugins.jetbrains.com/files/11058/668614/Extra_Icons-2025.1.1.zip", "243.22562.218": "https://plugins.jetbrains.com/files/11058/668614/Extra_Icons-2025.1.1.zip", "243.22562.220": "https://plugins.jetbrains.com/files/11058/668614/Extra_Icons-2025.1.1.zip", - "243.23654.114": "https://plugins.jetbrains.com/files/11058/668614/Extra_Icons-2025.1.1.zip", - "243.23654.126": "https://plugins.jetbrains.com/files/11058/668614/Extra_Icons-2025.1.1.zip", "243.23654.157": "https://plugins.jetbrains.com/files/11058/668614/Extra_Icons-2025.1.1.zip", - "243.23654.166": "https://plugins.jetbrains.com/files/11058/668614/Extra_Icons-2025.1.1.zip", "243.23654.167": "https://plugins.jetbrains.com/files/11058/668614/Extra_Icons-2025.1.1.zip", - "243.23654.168": "https://plugins.jetbrains.com/files/11058/668614/Extra_Icons-2025.1.1.zip", - "243.23654.177": "https://plugins.jetbrains.com/files/11058/668614/Extra_Icons-2025.1.1.zip", "243.23654.180": "https://plugins.jetbrains.com/files/11058/668614/Extra_Icons-2025.1.1.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/11058/668614/Extra_Icons-2025.1.1.zip", - "243.23654.19": "https://plugins.jetbrains.com/files/11058/668614/Extra_Icons-2025.1.1.zip" + "243.23654.183": "https://plugins.jetbrains.com/files/11058/668614/Extra_Icons-2025.1.1.zip", + "243.24978.27": "https://plugins.jetbrains.com/files/11058/668614/Extra_Icons-2025.1.1.zip", + "243.24978.46": "https://plugins.jetbrains.com/files/11058/668614/Extra_Icons-2025.1.1.zip", + "243.24978.50": "https://plugins.jetbrains.com/files/11058/668614/Extra_Icons-2025.1.1.zip", + "243.24978.54": "https://plugins.jetbrains.com/files/11058/668614/Extra_Icons-2025.1.1.zip", + "243.24978.55": "https://plugins.jetbrains.com/files/11058/668614/Extra_Icons-2025.1.1.zip", + "243.24978.59": "https://plugins.jetbrains.com/files/11058/668614/Extra_Icons-2025.1.1.zip" }, "name": "extra-icons" }, @@ -895,19 +895,19 @@ "webstorm" ], "builds": { - "243.21565.447": "https://plugins.jetbrains.com/files/11349/674043/aws-toolkit-jetbrains-standalone-3.51-243.zip", - "243.22562.218": "https://plugins.jetbrains.com/files/11349/674043/aws-toolkit-jetbrains-standalone-3.51-243.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/11349/674043/aws-toolkit-jetbrains-standalone-3.51-243.zip", - "243.23654.114": "https://plugins.jetbrains.com/files/11349/674043/aws-toolkit-jetbrains-standalone-3.51-243.zip", - "243.23654.126": "https://plugins.jetbrains.com/files/11349/674043/aws-toolkit-jetbrains-standalone-3.51-243.zip", - "243.23654.157": "https://plugins.jetbrains.com/files/11349/674043/aws-toolkit-jetbrains-standalone-3.51-243.zip", - "243.23654.166": "https://plugins.jetbrains.com/files/11349/674043/aws-toolkit-jetbrains-standalone-3.51-243.zip", - "243.23654.167": "https://plugins.jetbrains.com/files/11349/674043/aws-toolkit-jetbrains-standalone-3.51-243.zip", - "243.23654.168": "https://plugins.jetbrains.com/files/11349/674043/aws-toolkit-jetbrains-standalone-3.51-243.zip", - "243.23654.177": "https://plugins.jetbrains.com/files/11349/674043/aws-toolkit-jetbrains-standalone-3.51-243.zip", - "243.23654.180": "https://plugins.jetbrains.com/files/11349/674043/aws-toolkit-jetbrains-standalone-3.51-243.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/11349/674043/aws-toolkit-jetbrains-standalone-3.51-243.zip", - "243.23654.19": "https://plugins.jetbrains.com/files/11349/674043/aws-toolkit-jetbrains-standalone-3.51-243.zip" + "243.21565.447": "https://plugins.jetbrains.com/files/11349/681068/aws-toolkit-jetbrains-standalone-3.55-243.zip", + "243.22562.218": "https://plugins.jetbrains.com/files/11349/681068/aws-toolkit-jetbrains-standalone-3.55-243.zip", + "243.22562.220": "https://plugins.jetbrains.com/files/11349/681068/aws-toolkit-jetbrains-standalone-3.55-243.zip", + "243.23654.157": "https://plugins.jetbrains.com/files/11349/681068/aws-toolkit-jetbrains-standalone-3.55-243.zip", + "243.23654.167": "https://plugins.jetbrains.com/files/11349/681068/aws-toolkit-jetbrains-standalone-3.55-243.zip", + "243.23654.180": "https://plugins.jetbrains.com/files/11349/681068/aws-toolkit-jetbrains-standalone-3.55-243.zip", + "243.23654.183": "https://plugins.jetbrains.com/files/11349/681068/aws-toolkit-jetbrains-standalone-3.55-243.zip", + "243.24978.27": "https://plugins.jetbrains.com/files/11349/681068/aws-toolkit-jetbrains-standalone-3.55-243.zip", + "243.24978.46": "https://plugins.jetbrains.com/files/11349/681068/aws-toolkit-jetbrains-standalone-3.55-243.zip", + "243.24978.50": "https://plugins.jetbrains.com/files/11349/681068/aws-toolkit-jetbrains-standalone-3.55-243.zip", + "243.24978.54": "https://plugins.jetbrains.com/files/11349/681068/aws-toolkit-jetbrains-standalone-3.55-243.zip", + "243.24978.55": "https://plugins.jetbrains.com/files/11349/681068/aws-toolkit-jetbrains-standalone-3.55-243.zip", + "243.24978.59": "https://plugins.jetbrains.com/files/11349/681068/aws-toolkit-jetbrains-standalone-3.55-243.zip" }, "name": "aws-toolkit" }, @@ -916,7 +916,7 @@ "rider" ], "builds": { - "243.23654.126": "https://plugins.jetbrains.com/files/12024/622380/ReSharperPlugin.CognitiveComplexity-2024.3.0-eap04.zip" + "243.24978.27": "https://plugins.jetbrains.com/files/12024/622380/ReSharperPlugin.CognitiveComplexity-2024.3.0-eap04.zip" }, "name": "cognitivecomplexity" }, @@ -940,16 +940,16 @@ "243.21565.447": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", "243.22562.218": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", "243.22562.220": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", - "243.23654.114": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", - "243.23654.126": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", "243.23654.157": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", - "243.23654.166": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", "243.23654.167": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", - "243.23654.168": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", - "243.23654.177": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", "243.23654.180": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", - "243.23654.19": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip" + "243.23654.183": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", + "243.24978.27": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", + "243.24978.46": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", + "243.24978.50": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", + "243.24978.54": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", + "243.24978.55": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", + "243.24978.59": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip" }, "name": "vscode-keymap" }, @@ -973,16 +973,16 @@ "243.21565.447": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", "243.22562.218": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", "243.22562.220": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", - "243.23654.114": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", - "243.23654.126": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", "243.23654.157": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", - "243.23654.166": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", "243.23654.167": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", - "243.23654.168": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", - "243.23654.177": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", "243.23654.180": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", - "243.23654.19": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip" + "243.23654.183": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", + "243.24978.27": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", + "243.24978.46": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", + "243.24978.50": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", + "243.24978.54": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", + "243.24978.55": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", + "243.24978.59": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip" }, "name": "eclipse-keymap" }, @@ -1006,16 +1006,16 @@ "243.21565.447": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", "243.22562.218": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", "243.22562.220": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", - "243.23654.114": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", - "243.23654.126": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", "243.23654.157": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", - "243.23654.166": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", "243.23654.167": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", - "243.23654.168": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", - "243.23654.177": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", "243.23654.180": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", - "243.23654.19": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip" + "243.23654.183": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", + "243.24978.27": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", + "243.24978.46": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", + "243.24978.50": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", + "243.24978.54": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", + "243.24978.55": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", + "243.24978.59": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip" }, "name": "rainbow-csv" }, @@ -1039,16 +1039,16 @@ "243.21565.447": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", "243.22562.218": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", "243.22562.220": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", - "243.23654.114": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", - "243.23654.126": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", "243.23654.157": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", - "243.23654.166": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", "243.23654.167": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", - "243.23654.168": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", - "243.23654.177": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", "243.23654.180": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", - "243.23654.19": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip" + "243.23654.183": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", + "243.24978.27": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", + "243.24978.46": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", + "243.24978.50": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", + "243.24978.54": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", + "243.24978.55": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", + "243.24978.59": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip" }, "name": "visual-studio-keymap" }, @@ -1072,16 +1072,16 @@ "243.21565.447": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", "243.22562.218": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", "243.22562.220": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", - "243.23654.114": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", - "243.23654.126": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", "243.23654.157": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", - "243.23654.166": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", "243.23654.167": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", - "243.23654.168": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", - "243.23654.177": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", "243.23654.180": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", - "243.23654.19": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip" + "243.23654.183": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", + "243.24978.27": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", + "243.24978.46": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", + "243.24978.50": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", + "243.24978.54": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", + "243.24978.55": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", + "243.24978.59": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip" }, "name": "indent-rainbow" }, @@ -1105,16 +1105,16 @@ "243.21565.447": "https://plugins.jetbrains.com/files/14004/629971/protoeditor-243.21565.122.zip", "243.22562.218": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", "243.22562.220": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", - "243.23654.114": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", - "243.23654.126": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", "243.23654.157": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", - "243.23654.166": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", "243.23654.167": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", - "243.23654.168": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", - "243.23654.177": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", "243.23654.180": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", - "243.23654.19": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip" + "243.23654.183": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", + "243.24978.27": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", + "243.24978.46": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", + "243.24978.50": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", + "243.24978.54": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", + "243.24978.55": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", + "243.24978.59": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip" }, "name": "protocol-buffers" }, @@ -1138,16 +1138,16 @@ "243.21565.447": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "243.22562.218": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "243.22562.220": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "243.23654.114": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "243.23654.126": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "243.23654.157": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "243.23654.166": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "243.23654.167": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "243.23654.168": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "243.23654.177": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "243.23654.180": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "243.23654.189": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "243.23654.19": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" + "243.23654.183": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "243.24978.27": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "243.24978.46": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "243.24978.50": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "243.24978.54": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "243.24978.55": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "243.24978.59": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" }, "name": "darcula-pitch-black" }, @@ -1171,16 +1171,16 @@ "243.21565.447": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", "243.22562.218": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", "243.22562.220": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", - "243.23654.114": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", - "243.23654.126": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", "243.23654.157": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", - "243.23654.166": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", "243.23654.167": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", - "243.23654.168": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", - "243.23654.177": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", "243.23654.180": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", - "243.23654.189": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", - "243.23654.19": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar" + "243.23654.183": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", + "243.24978.27": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", + "243.24978.46": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", + "243.24978.50": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", + "243.24978.54": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", + "243.24978.55": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", + "243.24978.59": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar" }, "name": "mario-progress-bar" }, @@ -1204,16 +1204,16 @@ "243.21565.447": "https://plugins.jetbrains.com/files/16604/671364/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.3.zip", "243.22562.218": "https://plugins.jetbrains.com/files/16604/671364/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.3.zip", "243.22562.220": "https://plugins.jetbrains.com/files/16604/671364/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.3.zip", - "243.23654.114": "https://plugins.jetbrains.com/files/16604/671364/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.3.zip", - "243.23654.126": "https://plugins.jetbrains.com/files/16604/671364/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.3.zip", "243.23654.157": "https://plugins.jetbrains.com/files/16604/671364/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.3.zip", - "243.23654.166": "https://plugins.jetbrains.com/files/16604/671364/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.3.zip", "243.23654.167": "https://plugins.jetbrains.com/files/16604/671364/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.3.zip", - "243.23654.168": "https://plugins.jetbrains.com/files/16604/671364/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.3.zip", - "243.23654.177": "https://plugins.jetbrains.com/files/16604/671364/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.3.zip", "243.23654.180": "https://plugins.jetbrains.com/files/16604/671364/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.3.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/16604/671364/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.3.zip", - "243.23654.19": "https://plugins.jetbrains.com/files/16604/671364/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.3.zip" + "243.23654.183": "https://plugins.jetbrains.com/files/16604/671364/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.3.zip", + "243.24978.27": "https://plugins.jetbrains.com/files/16604/671364/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.3.zip", + "243.24978.46": "https://plugins.jetbrains.com/files/16604/671364/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.3.zip", + "243.24978.50": "https://plugins.jetbrains.com/files/16604/671364/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.3.zip", + "243.24978.54": "https://plugins.jetbrains.com/files/16604/671364/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.3.zip", + "243.24978.55": "https://plugins.jetbrains.com/files/16604/671364/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.3.zip", + "243.24978.59": "https://plugins.jetbrains.com/files/16604/671364/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.3.zip" }, "name": "extra-toolwindow-colorful-icons" }, @@ -1234,19 +1234,19 @@ "webstorm" ], "builds": { - "243.21565.447": "https://plugins.jetbrains.com/files/17718/671850/github-copilot-intellij-1.5.32-242.zip", - "243.22562.218": "https://plugins.jetbrains.com/files/17718/671850/github-copilot-intellij-1.5.32-242.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/17718/671850/github-copilot-intellij-1.5.32-242.zip", - "243.23654.114": "https://plugins.jetbrains.com/files/17718/671850/github-copilot-intellij-1.5.32-242.zip", - "243.23654.126": "https://plugins.jetbrains.com/files/17718/671850/github-copilot-intellij-1.5.32-242.zip", - "243.23654.157": "https://plugins.jetbrains.com/files/17718/671850/github-copilot-intellij-1.5.32-242.zip", - "243.23654.166": "https://plugins.jetbrains.com/files/17718/671850/github-copilot-intellij-1.5.32-242.zip", - "243.23654.167": "https://plugins.jetbrains.com/files/17718/671850/github-copilot-intellij-1.5.32-242.zip", - "243.23654.168": "https://plugins.jetbrains.com/files/17718/671850/github-copilot-intellij-1.5.32-242.zip", - "243.23654.177": "https://plugins.jetbrains.com/files/17718/671850/github-copilot-intellij-1.5.32-242.zip", - "243.23654.180": "https://plugins.jetbrains.com/files/17718/671850/github-copilot-intellij-1.5.32-242.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/17718/671850/github-copilot-intellij-1.5.32-242.zip", - "243.23654.19": "https://plugins.jetbrains.com/files/17718/671850/github-copilot-intellij-1.5.32-242.zip" + "243.21565.447": "https://plugins.jetbrains.com/files/17718/681217/github-copilot-intellij-1.5.33-242.zip", + "243.22562.218": "https://plugins.jetbrains.com/files/17718/681217/github-copilot-intellij-1.5.33-242.zip", + "243.22562.220": "https://plugins.jetbrains.com/files/17718/681217/github-copilot-intellij-1.5.33-242.zip", + "243.23654.157": "https://plugins.jetbrains.com/files/17718/681217/github-copilot-intellij-1.5.33-242.zip", + "243.23654.167": "https://plugins.jetbrains.com/files/17718/681217/github-copilot-intellij-1.5.33-242.zip", + "243.23654.180": "https://plugins.jetbrains.com/files/17718/681217/github-copilot-intellij-1.5.33-242.zip", + "243.23654.183": "https://plugins.jetbrains.com/files/17718/681217/github-copilot-intellij-1.5.33-242.zip", + "243.24978.27": "https://plugins.jetbrains.com/files/17718/681217/github-copilot-intellij-1.5.33-242.zip", + "243.24978.46": "https://plugins.jetbrains.com/files/17718/681217/github-copilot-intellij-1.5.33-242.zip", + "243.24978.50": "https://plugins.jetbrains.com/files/17718/681217/github-copilot-intellij-1.5.33-242.zip", + "243.24978.54": "https://plugins.jetbrains.com/files/17718/681217/github-copilot-intellij-1.5.33-242.zip", + "243.24978.55": "https://plugins.jetbrains.com/files/17718/681217/github-copilot-intellij-1.5.33-242.zip", + "243.24978.59": "https://plugins.jetbrains.com/files/17718/681217/github-copilot-intellij-1.5.33-242.zip" }, "name": "github-copilot" }, @@ -1270,16 +1270,16 @@ "243.21565.447": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "243.22562.218": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "243.22562.220": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "243.23654.114": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "243.23654.126": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "243.23654.157": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "243.23654.166": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "243.23654.167": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "243.23654.168": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "243.23654.177": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "243.23654.180": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "243.23654.19": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" + "243.23654.183": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "243.24978.27": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "243.24978.46": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "243.24978.50": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "243.24978.54": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "243.24978.55": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "243.24978.59": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" }, "name": "netbeans-6-5-keymap" }, @@ -1303,16 +1303,16 @@ "243.21565.447": "https://plugins.jetbrains.com/files/18824/671527/CodeGlancePro-1.9.6-signed.zip", "243.22562.218": "https://plugins.jetbrains.com/files/18824/671527/CodeGlancePro-1.9.6-signed.zip", "243.22562.220": "https://plugins.jetbrains.com/files/18824/671527/CodeGlancePro-1.9.6-signed.zip", - "243.23654.114": "https://plugins.jetbrains.com/files/18824/671527/CodeGlancePro-1.9.6-signed.zip", - "243.23654.126": "https://plugins.jetbrains.com/files/18824/671527/CodeGlancePro-1.9.6-signed.zip", "243.23654.157": "https://plugins.jetbrains.com/files/18824/671527/CodeGlancePro-1.9.6-signed.zip", - "243.23654.166": "https://plugins.jetbrains.com/files/18824/671527/CodeGlancePro-1.9.6-signed.zip", "243.23654.167": "https://plugins.jetbrains.com/files/18824/671527/CodeGlancePro-1.9.6-signed.zip", - "243.23654.168": "https://plugins.jetbrains.com/files/18824/671527/CodeGlancePro-1.9.6-signed.zip", - "243.23654.177": "https://plugins.jetbrains.com/files/18824/671527/CodeGlancePro-1.9.6-signed.zip", "243.23654.180": "https://plugins.jetbrains.com/files/18824/671527/CodeGlancePro-1.9.6-signed.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/18824/671527/CodeGlancePro-1.9.6-signed.zip", - "243.23654.19": "https://plugins.jetbrains.com/files/18824/671527/CodeGlancePro-1.9.6-signed.zip" + "243.23654.183": "https://plugins.jetbrains.com/files/18824/671527/CodeGlancePro-1.9.6-signed.zip", + "243.24978.27": "https://plugins.jetbrains.com/files/18824/671527/CodeGlancePro-1.9.6-signed.zip", + "243.24978.46": "https://plugins.jetbrains.com/files/18824/671527/CodeGlancePro-1.9.6-signed.zip", + "243.24978.50": "https://plugins.jetbrains.com/files/18824/671527/CodeGlancePro-1.9.6-signed.zip", + "243.24978.54": "https://plugins.jetbrains.com/files/18824/671527/CodeGlancePro-1.9.6-signed.zip", + "243.24978.55": "https://plugins.jetbrains.com/files/18824/671527/CodeGlancePro-1.9.6-signed.zip", + "243.24978.59": "https://plugins.jetbrains.com/files/18824/671527/CodeGlancePro-1.9.6-signed.zip" }, "name": "codeglance-pro" }, @@ -1333,19 +1333,19 @@ "webstorm" ], "builds": { - "243.21565.447": "https://plugins.jetbrains.com/files/18922/659279/GerryThemes.jar", - "243.22562.218": "https://plugins.jetbrains.com/files/18922/659279/GerryThemes.jar", - "243.22562.220": "https://plugins.jetbrains.com/files/18922/659279/GerryThemes.jar", - "243.23654.114": "https://plugins.jetbrains.com/files/18922/659279/GerryThemes.jar", - "243.23654.126": "https://plugins.jetbrains.com/files/18922/659279/GerryThemes.jar", - "243.23654.157": "https://plugins.jetbrains.com/files/18922/659279/GerryThemes.jar", - "243.23654.166": "https://plugins.jetbrains.com/files/18922/659279/GerryThemes.jar", - "243.23654.167": "https://plugins.jetbrains.com/files/18922/659279/GerryThemes.jar", - "243.23654.168": "https://plugins.jetbrains.com/files/18922/659279/GerryThemes.jar", - "243.23654.177": "https://plugins.jetbrains.com/files/18922/659279/GerryThemes.jar", - "243.23654.180": "https://plugins.jetbrains.com/files/18922/659279/GerryThemes.jar", - "243.23654.189": "https://plugins.jetbrains.com/files/18922/659279/GerryThemes.jar", - "243.23654.19": "https://plugins.jetbrains.com/files/18922/659279/GerryThemes.jar" + "243.21565.447": "https://plugins.jetbrains.com/files/18922/676794/GerryThemes.jar", + "243.22562.218": "https://plugins.jetbrains.com/files/18922/676794/GerryThemes.jar", + "243.22562.220": "https://plugins.jetbrains.com/files/18922/676794/GerryThemes.jar", + "243.23654.157": "https://plugins.jetbrains.com/files/18922/676794/GerryThemes.jar", + "243.23654.167": "https://plugins.jetbrains.com/files/18922/676794/GerryThemes.jar", + "243.23654.180": "https://plugins.jetbrains.com/files/18922/676794/GerryThemes.jar", + "243.23654.183": "https://plugins.jetbrains.com/files/18922/676794/GerryThemes.jar", + "243.24978.27": "https://plugins.jetbrains.com/files/18922/676794/GerryThemes.jar", + "243.24978.46": "https://plugins.jetbrains.com/files/18922/676794/GerryThemes.jar", + "243.24978.50": "https://plugins.jetbrains.com/files/18922/676794/GerryThemes.jar", + "243.24978.54": "https://plugins.jetbrains.com/files/18922/676794/GerryThemes.jar", + "243.24978.55": "https://plugins.jetbrains.com/files/18922/676794/GerryThemes.jar", + "243.24978.59": "https://plugins.jetbrains.com/files/18922/676794/GerryThemes.jar" }, "name": "gerry-themes" }, @@ -1369,16 +1369,16 @@ "243.21565.447": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", "243.22562.218": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", "243.22562.220": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", - "243.23654.114": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", - "243.23654.126": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", "243.23654.157": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", - "243.23654.166": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", "243.23654.167": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", - "243.23654.168": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", - "243.23654.177": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", "243.23654.180": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", - "243.23654.19": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip" + "243.23654.183": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", + "243.24978.27": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", + "243.24978.46": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", + "243.24978.50": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", + "243.24978.54": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", + "243.24978.55": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", + "243.24978.59": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip" }, "name": "better-direnv" }, @@ -1402,16 +1402,16 @@ "243.21565.447": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", "243.22562.218": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", "243.22562.220": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", - "243.23654.114": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", - "243.23654.126": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", "243.23654.157": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", - "243.23654.166": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", "243.23654.167": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", - "243.23654.168": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", - "243.23654.177": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", "243.23654.180": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", - "243.23654.19": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip" + "243.23654.183": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", + "243.24978.27": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", + "243.24978.46": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", + "243.24978.50": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", + "243.24978.54": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", + "243.24978.55": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", + "243.24978.59": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip" }, "name": "mermaid" }, @@ -1435,16 +1435,16 @@ "243.21565.447": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", "243.22562.218": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", "243.22562.220": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", - "243.23654.114": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", - "243.23654.126": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", "243.23654.157": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", - "243.23654.166": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", "243.23654.167": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", - "243.23654.168": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", - "243.23654.177": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", "243.23654.180": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", - "243.23654.19": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip" + "243.23654.183": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", + "243.24978.27": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", + "243.24978.46": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", + "243.24978.50": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", + "243.24978.54": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", + "243.24978.55": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", + "243.24978.59": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip" }, "name": "ferris" }, @@ -1468,16 +1468,16 @@ "243.21565.447": "https://plugins.jetbrains.com/files/21667/618339/code-complexity-plugin-1.6.1.zip", "243.22562.218": "https://plugins.jetbrains.com/files/21667/618339/code-complexity-plugin-1.6.1.zip", "243.22562.220": "https://plugins.jetbrains.com/files/21667/618339/code-complexity-plugin-1.6.1.zip", - "243.23654.114": "https://plugins.jetbrains.com/files/21667/618339/code-complexity-plugin-1.6.1.zip", - "243.23654.126": "https://plugins.jetbrains.com/files/21667/618339/code-complexity-plugin-1.6.1.zip", "243.23654.157": "https://plugins.jetbrains.com/files/21667/618339/code-complexity-plugin-1.6.1.zip", - "243.23654.166": "https://plugins.jetbrains.com/files/21667/618339/code-complexity-plugin-1.6.1.zip", "243.23654.167": "https://plugins.jetbrains.com/files/21667/618339/code-complexity-plugin-1.6.1.zip", - "243.23654.168": "https://plugins.jetbrains.com/files/21667/618339/code-complexity-plugin-1.6.1.zip", - "243.23654.177": "https://plugins.jetbrains.com/files/21667/618339/code-complexity-plugin-1.6.1.zip", "243.23654.180": "https://plugins.jetbrains.com/files/21667/618339/code-complexity-plugin-1.6.1.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/21667/618339/code-complexity-plugin-1.6.1.zip", - "243.23654.19": "https://plugins.jetbrains.com/files/21667/618339/code-complexity-plugin-1.6.1.zip" + "243.23654.183": "https://plugins.jetbrains.com/files/21667/618339/code-complexity-plugin-1.6.1.zip", + "243.24978.27": "https://plugins.jetbrains.com/files/21667/618339/code-complexity-plugin-1.6.1.zip", + "243.24978.46": "https://plugins.jetbrains.com/files/21667/618339/code-complexity-plugin-1.6.1.zip", + "243.24978.50": "https://plugins.jetbrains.com/files/21667/618339/code-complexity-plugin-1.6.1.zip", + "243.24978.54": "https://plugins.jetbrains.com/files/21667/618339/code-complexity-plugin-1.6.1.zip", + "243.24978.55": "https://plugins.jetbrains.com/files/21667/618339/code-complexity-plugin-1.6.1.zip", + "243.24978.59": "https://plugins.jetbrains.com/files/21667/618339/code-complexity-plugin-1.6.1.zip" }, "name": "code-complexity" }, @@ -1501,16 +1501,16 @@ "243.21565.447": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", "243.22562.218": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", "243.22562.220": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", - "243.23654.114": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", - "243.23654.126": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", "243.23654.157": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", - "243.23654.166": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", "243.23654.167": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", - "243.23654.168": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", - "243.23654.177": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", "243.23654.180": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", - "243.23654.19": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip" + "243.23654.183": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", + "243.24978.27": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", + "243.24978.46": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", + "243.24978.50": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", + "243.24978.54": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", + "243.24978.55": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", + "243.24978.59": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip" }, "name": "developer-tools" }, @@ -1527,15 +1527,15 @@ "webstorm" ], "builds": { - "243.23654.114": "https://plugins.jetbrains.com/files/21962/654853/clouds-docker-gateway-243.23654.19.zip", - "243.23654.126": "https://plugins.jetbrains.com/files/21962/654853/clouds-docker-gateway-243.23654.19.zip", "243.23654.157": "https://plugins.jetbrains.com/files/21962/654853/clouds-docker-gateway-243.23654.19.zip", - "243.23654.166": "https://plugins.jetbrains.com/files/21962/654853/clouds-docker-gateway-243.23654.19.zip", "243.23654.167": "https://plugins.jetbrains.com/files/21962/654853/clouds-docker-gateway-243.23654.19.zip", - "243.23654.168": "https://plugins.jetbrains.com/files/21962/654853/clouds-docker-gateway-243.23654.19.zip", - "243.23654.177": "https://plugins.jetbrains.com/files/21962/654853/clouds-docker-gateway-243.23654.19.zip", "243.23654.180": "https://plugins.jetbrains.com/files/21962/654853/clouds-docker-gateway-243.23654.19.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/21962/654853/clouds-docker-gateway-243.23654.19.zip" + "243.24978.27": "https://plugins.jetbrains.com/files/21962/654853/clouds-docker-gateway-243.23654.19.zip", + "243.24978.46": "https://plugins.jetbrains.com/files/21962/654853/clouds-docker-gateway-243.23654.19.zip", + "243.24978.50": "https://plugins.jetbrains.com/files/21962/654853/clouds-docker-gateway-243.23654.19.zip", + "243.24978.54": "https://plugins.jetbrains.com/files/21962/654853/clouds-docker-gateway-243.23654.19.zip", + "243.24978.55": "https://plugins.jetbrains.com/files/21962/654853/clouds-docker-gateway-243.23654.19.zip", + "243.24978.59": "https://plugins.jetbrains.com/files/21962/654853/clouds-docker-gateway-243.23654.19.zip" }, "name": "dev-containers" }, @@ -1546,9 +1546,9 @@ "rust-rover" ], "builds": { - "243.23654.114": "https://plugins.jetbrains.com/files/22407/672481/intellij-rust-243.23654.180.zip", "243.23654.180": "https://plugins.jetbrains.com/files/22407/672481/intellij-rust-243.23654.180.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/22407/672481/intellij-rust-243.23654.180.zip" + "243.24978.46": "https://plugins.jetbrains.com/files/22407/672481/intellij-rust-243.23654.180.zip", + "243.24978.55": "https://plugins.jetbrains.com/files/22407/672481/intellij-rust-243.23654.180.zip" }, "name": "rust" }, @@ -1569,19 +1569,19 @@ "webstorm" ], "builds": { - "243.21565.447": "https://plugins.jetbrains.com/files/22707/645830/continue-intellij-extension-0.0.83.zip", - "243.22562.218": "https://plugins.jetbrains.com/files/22707/645830/continue-intellij-extension-0.0.83.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/22707/645830/continue-intellij-extension-0.0.83.zip", - "243.23654.114": "https://plugins.jetbrains.com/files/22707/645830/continue-intellij-extension-0.0.83.zip", - "243.23654.126": "https://plugins.jetbrains.com/files/22707/645830/continue-intellij-extension-0.0.83.zip", - "243.23654.157": "https://plugins.jetbrains.com/files/22707/645830/continue-intellij-extension-0.0.83.zip", - "243.23654.166": "https://plugins.jetbrains.com/files/22707/645830/continue-intellij-extension-0.0.83.zip", - "243.23654.167": "https://plugins.jetbrains.com/files/22707/645830/continue-intellij-extension-0.0.83.zip", - "243.23654.168": "https://plugins.jetbrains.com/files/22707/645830/continue-intellij-extension-0.0.83.zip", - "243.23654.177": "https://plugins.jetbrains.com/files/22707/645830/continue-intellij-extension-0.0.83.zip", - "243.23654.180": "https://plugins.jetbrains.com/files/22707/645830/continue-intellij-extension-0.0.83.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/22707/645830/continue-intellij-extension-0.0.83.zip", - "243.23654.19": "https://plugins.jetbrains.com/files/22707/645830/continue-intellij-extension-0.0.83.zip" + "243.21565.447": "https://plugins.jetbrains.com/files/22707/678078/continue-intellij-extension-0.0.88.zip", + "243.22562.218": "https://plugins.jetbrains.com/files/22707/678078/continue-intellij-extension-0.0.88.zip", + "243.22562.220": "https://plugins.jetbrains.com/files/22707/678078/continue-intellij-extension-0.0.88.zip", + "243.23654.157": "https://plugins.jetbrains.com/files/22707/678078/continue-intellij-extension-0.0.88.zip", + "243.23654.167": "https://plugins.jetbrains.com/files/22707/678078/continue-intellij-extension-0.0.88.zip", + "243.23654.180": "https://plugins.jetbrains.com/files/22707/678078/continue-intellij-extension-0.0.88.zip", + "243.23654.183": "https://plugins.jetbrains.com/files/22707/678078/continue-intellij-extension-0.0.88.zip", + "243.24978.27": "https://plugins.jetbrains.com/files/22707/678078/continue-intellij-extension-0.0.88.zip", + "243.24978.46": "https://plugins.jetbrains.com/files/22707/678078/continue-intellij-extension-0.0.88.zip", + "243.24978.50": "https://plugins.jetbrains.com/files/22707/678078/continue-intellij-extension-0.0.88.zip", + "243.24978.54": "https://plugins.jetbrains.com/files/22707/678078/continue-intellij-extension-0.0.88.zip", + "243.24978.55": "https://plugins.jetbrains.com/files/22707/678078/continue-intellij-extension-0.0.88.zip", + "243.24978.59": "https://plugins.jetbrains.com/files/22707/678078/continue-intellij-extension-0.0.88.zip" }, "name": "continue" }, @@ -1605,16 +1605,16 @@ "243.21565.447": "https://plugins.jetbrains.com/files/22857/633914/vcs-gitlab-243.21565.204.zip", "243.22562.218": "https://plugins.jetbrains.com/files/22857/640903/vcs-gitlab-243.22562.53.zip", "243.22562.220": "https://plugins.jetbrains.com/files/22857/640903/vcs-gitlab-243.22562.53.zip", - "243.23654.114": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", - "243.23654.126": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", "243.23654.157": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", - "243.23654.166": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", "243.23654.167": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", - "243.23654.168": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", - "243.23654.177": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", "243.23654.180": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", - "243.23654.19": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip" + "243.23654.183": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", + "243.24978.27": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", + "243.24978.46": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", + "243.24978.50": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", + "243.24978.54": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", + "243.24978.55": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", + "243.24978.59": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip" }, "name": "gitlab" }, @@ -1638,16 +1638,16 @@ "243.21565.447": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", "243.22562.218": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", "243.22562.220": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", - "243.23654.114": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", - "243.23654.126": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", "243.23654.157": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", - "243.23654.166": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", "243.23654.167": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", - "243.23654.168": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", - "243.23654.177": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", "243.23654.180": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", - "243.23654.19": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip" + "243.23654.183": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", + "243.24978.27": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", + "243.24978.46": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", + "243.24978.50": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", + "243.24978.54": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", + "243.24978.55": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", + "243.24978.59": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip" }, "name": "mermaid-chart" }, @@ -1671,16 +1671,16 @@ "243.21565.447": "https://plugins.jetbrains.com/files/23927/668616/Extra_IDE_Tweaks-2025.1.1.zip", "243.22562.218": "https://plugins.jetbrains.com/files/23927/668616/Extra_IDE_Tweaks-2025.1.1.zip", "243.22562.220": "https://plugins.jetbrains.com/files/23927/668616/Extra_IDE_Tweaks-2025.1.1.zip", - "243.23654.114": "https://plugins.jetbrains.com/files/23927/668616/Extra_IDE_Tweaks-2025.1.1.zip", - "243.23654.126": "https://plugins.jetbrains.com/files/23927/668616/Extra_IDE_Tweaks-2025.1.1.zip", "243.23654.157": "https://plugins.jetbrains.com/files/23927/668616/Extra_IDE_Tweaks-2025.1.1.zip", - "243.23654.166": "https://plugins.jetbrains.com/files/23927/668616/Extra_IDE_Tweaks-2025.1.1.zip", "243.23654.167": "https://plugins.jetbrains.com/files/23927/668616/Extra_IDE_Tweaks-2025.1.1.zip", - "243.23654.168": "https://plugins.jetbrains.com/files/23927/668616/Extra_IDE_Tweaks-2025.1.1.zip", - "243.23654.177": "https://plugins.jetbrains.com/files/23927/668616/Extra_IDE_Tweaks-2025.1.1.zip", "243.23654.180": "https://plugins.jetbrains.com/files/23927/668616/Extra_IDE_Tweaks-2025.1.1.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/23927/668616/Extra_IDE_Tweaks-2025.1.1.zip", - "243.23654.19": "https://plugins.jetbrains.com/files/23927/668616/Extra_IDE_Tweaks-2025.1.1.zip" + "243.23654.183": "https://plugins.jetbrains.com/files/23927/668616/Extra_IDE_Tweaks-2025.1.1.zip", + "243.24978.27": "https://plugins.jetbrains.com/files/23927/668616/Extra_IDE_Tweaks-2025.1.1.zip", + "243.24978.46": "https://plugins.jetbrains.com/files/23927/668616/Extra_IDE_Tweaks-2025.1.1.zip", + "243.24978.50": "https://plugins.jetbrains.com/files/23927/668616/Extra_IDE_Tweaks-2025.1.1.zip", + "243.24978.54": "https://plugins.jetbrains.com/files/23927/668616/Extra_IDE_Tweaks-2025.1.1.zip", + "243.24978.55": "https://plugins.jetbrains.com/files/23927/668616/Extra_IDE_Tweaks-2025.1.1.zip", + "243.24978.59": "https://plugins.jetbrains.com/files/23927/668616/Extra_IDE_Tweaks-2025.1.1.zip" }, "name": "extra-ide-tweaks" }, @@ -1704,16 +1704,16 @@ "243.21565.447": "https://plugins.jetbrains.com/files/24559/672148/Extra_Tools_Pack-2025.1.2.zip", "243.22562.218": "https://plugins.jetbrains.com/files/24559/672148/Extra_Tools_Pack-2025.1.2.zip", "243.22562.220": "https://plugins.jetbrains.com/files/24559/672148/Extra_Tools_Pack-2025.1.2.zip", - "243.23654.114": "https://plugins.jetbrains.com/files/24559/672148/Extra_Tools_Pack-2025.1.2.zip", - "243.23654.126": "https://plugins.jetbrains.com/files/24559/672148/Extra_Tools_Pack-2025.1.2.zip", "243.23654.157": "https://plugins.jetbrains.com/files/24559/672148/Extra_Tools_Pack-2025.1.2.zip", - "243.23654.166": "https://plugins.jetbrains.com/files/24559/672148/Extra_Tools_Pack-2025.1.2.zip", "243.23654.167": "https://plugins.jetbrains.com/files/24559/672148/Extra_Tools_Pack-2025.1.2.zip", - "243.23654.168": "https://plugins.jetbrains.com/files/24559/672148/Extra_Tools_Pack-2025.1.2.zip", - "243.23654.177": "https://plugins.jetbrains.com/files/24559/672148/Extra_Tools_Pack-2025.1.2.zip", "243.23654.180": "https://plugins.jetbrains.com/files/24559/672148/Extra_Tools_Pack-2025.1.2.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/24559/672148/Extra_Tools_Pack-2025.1.2.zip", - "243.23654.19": "https://plugins.jetbrains.com/files/24559/672148/Extra_Tools_Pack-2025.1.2.zip" + "243.23654.183": "https://plugins.jetbrains.com/files/24559/672148/Extra_Tools_Pack-2025.1.2.zip", + "243.24978.27": "https://plugins.jetbrains.com/files/24559/672148/Extra_Tools_Pack-2025.1.2.zip", + "243.24978.46": "https://plugins.jetbrains.com/files/24559/672148/Extra_Tools_Pack-2025.1.2.zip", + "243.24978.50": "https://plugins.jetbrains.com/files/24559/672148/Extra_Tools_Pack-2025.1.2.zip", + "243.24978.54": "https://plugins.jetbrains.com/files/24559/672148/Extra_Tools_Pack-2025.1.2.zip", + "243.24978.55": "https://plugins.jetbrains.com/files/24559/672148/Extra_Tools_Pack-2025.1.2.zip", + "243.24978.59": "https://plugins.jetbrains.com/files/24559/672148/Extra_Tools_Pack-2025.1.2.zip" }, "name": "extra-tools-pack" }, @@ -1731,16 +1731,16 @@ "webstorm" ], "builds": { - "243.23654.114": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip", - "243.23654.126": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip", "243.23654.157": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip", - "243.23654.166": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip", "243.23654.167": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip", - "243.23654.168": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip", - "243.23654.177": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip", "243.23654.180": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip", - "243.23654.19": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip" + "243.23654.183": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip", + "243.24978.27": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip", + "243.24978.46": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip", + "243.24978.50": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip", + "243.24978.54": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip", + "243.24978.55": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip", + "243.24978.59": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip" }, "name": "nix-lsp" }, @@ -1760,18 +1760,18 @@ "webstorm" ], "builds": { - "243.22562.218": "https://plugins.jetbrains.com/files/26084/673826/markdtask-2025.1.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/26084/673826/markdtask-2025.1.zip", - "243.23654.114": "https://plugins.jetbrains.com/files/26084/673826/markdtask-2025.1.zip", - "243.23654.126": "https://plugins.jetbrains.com/files/26084/673826/markdtask-2025.1.zip", - "243.23654.157": "https://plugins.jetbrains.com/files/26084/673826/markdtask-2025.1.zip", - "243.23654.166": "https://plugins.jetbrains.com/files/26084/673826/markdtask-2025.1.zip", - "243.23654.167": "https://plugins.jetbrains.com/files/26084/673826/markdtask-2025.1.zip", - "243.23654.168": "https://plugins.jetbrains.com/files/26084/673826/markdtask-2025.1.zip", - "243.23654.177": "https://plugins.jetbrains.com/files/26084/673826/markdtask-2025.1.zip", - "243.23654.180": "https://plugins.jetbrains.com/files/26084/673826/markdtask-2025.1.zip", - "243.23654.189": "https://plugins.jetbrains.com/files/26084/673826/markdtask-2025.1.zip", - "243.23654.19": "https://plugins.jetbrains.com/files/26084/673826/markdtask-2025.1.zip" + "243.22562.218": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", + "243.22562.220": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", + "243.23654.157": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", + "243.23654.167": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", + "243.23654.180": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", + "243.23654.183": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", + "243.24978.27": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", + "243.24978.46": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", + "243.24978.50": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", + "243.24978.54": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", + "243.24978.55": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", + "243.24978.59": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip" }, "name": "markdtask" } @@ -1781,7 +1781,7 @@ "https://plugins.jetbrains.com/files/10080/645834/intellij-rainbow-brackets-2024.2.8-241.zip": "sha256-IWRvV8NDYnoxxvQVOf3K3pueD+Hp7ctaWOmFHnaVTJg=", "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip": "sha256-25vtwXuBNiYL9E0pKG4dqJDkwX1FckAErdqRPKXybQA=", "https://plugins.jetbrains.com/files/11058/668614/Extra_Icons-2025.1.1.zip": "sha256-bQHgzbSUh7cZEzVGrZQxUJ+fGY7GB4Sy5izwadkkQiQ=", - "https://plugins.jetbrains.com/files/11349/674043/aws-toolkit-jetbrains-standalone-3.51-243.zip": "sha256-x+QcNCjBZWwRWa6OuQPhFJMlm4/HeDnlshYmSYYT1GA=", + "https://plugins.jetbrains.com/files/11349/681068/aws-toolkit-jetbrains-standalone-3.55-243.zip": "sha256-4ASbkcoRUjHks3pXqMz3K7KVCIEnpjebJ9I23hMKkzA=", "https://plugins.jetbrains.com/files/12024/622380/ReSharperPlugin.CognitiveComplexity-2024.3.0-eap04.zip": "sha256-X2x7uyWoV4aBI8E5bw35QfzmySWzbEAZ2nvdo5i+t+s=", "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip": "sha256-phv8MTGKNGzRviKzX+nIVTbkX4WkU82QVO5zXUQLtAo=", "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip": "sha256-/g1ucT18ywVJnCePH7WyMWKgM9umowBz5wFObmO7cws=", @@ -1789,16 +1789,17 @@ "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip": "sha256-VQqK0Cm9ddXN63KYIqimuGOh7EB9VvdlErp/VrWx8SA=", "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip": "sha256-eKwDE+PMtYhrGbDDZPS5cimssH+1xV4GF6RXXg/3urU=", "https://plugins.jetbrains.com/files/1347/667258/scala-intellij-bin-2024.3.35.zip": "sha256-4I75KqXyFl73S63O+00usrg8QBcuBRBgfjRmCQMpNks=", + "https://plugins.jetbrains.com/files/1347/681279/scala-intellij-bin-2024.3.38.zip": "sha256-l1ZevtqN/70ii1jbXYYxkbH263UrL3YMVFnwFl+n5rE=", "https://plugins.jetbrains.com/files/14004/629971/protoeditor-243.21565.122.zip": "sha256-cv6JTujoD5g90ngXTtnj5x31wjbIZlKZ6Zn0H+vHCTk=", "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip": "sha256-Tgu8CfDhO6KugfuLNhmxe89dMm+Qo3fmAg/8hwjUaoc=", "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar": "sha256-eXInfAqY3yEZRXCAuv3KGldM1pNKEioNwPB0rIGgJFw=", "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar": "sha256-mB09zvUg1hLXl9lgW1NEU+DyVel1utZv6s+mFykckYY=", - "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip": "sha256-wkh88imoNLt9Q7M6chu28+e0EhudpVGN4ZhvfSdj/l4=", + "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip": "sha256-yKpWQZGxfsKwPVTJLHpF4KGJ5ANCd73uxHlfdFE4Qf4=", "https://plugins.jetbrains.com/files/16604/671364/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.3.zip": "sha256-U2kNQtumZ71+G3maxxXPVsLL8Q+8YonpC4ejr1DYMbo=", - "https://plugins.jetbrains.com/files/17718/671850/github-copilot-intellij-1.5.32-242.zip": "sha256-WJxjcazelBgNBusqiv9ws9XhtszKpdk+8iNV+jP+ros=", + "https://plugins.jetbrains.com/files/17718/681217/github-copilot-intellij-1.5.33-242.zip": "sha256-1n5GSKUUlGfwVjDpGlu99KgXIcT85v/J9oFT2NaxUWk=", "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip": "sha256-KrzZTKZMQqoEMw+vDUv2jjs0EX0leaPBkU8H/ecq/oI=", "https://plugins.jetbrains.com/files/18824/671527/CodeGlancePro-1.9.6-signed.zip": "sha256-AEHZxuRMBEZlT3xTxBUbHEPjEJBOCLxdj1wEYBzlNdk=", - "https://plugins.jetbrains.com/files/18922/659279/GerryThemes.jar": "sha256-c6sxbcrEI9sgVxFeSdGhTXrsqiu9oW75zMYbHVpc8aI=", + "https://plugins.jetbrains.com/files/18922/676794/GerryThemes.jar": "sha256-0oqK4f802IoOMJs4g6ipwxpo1e0SBIYMNEQDXeUpTYw=", "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip": "sha256-hoFfIid7lClHDiT+ZH3H+tFSvWYb1tSRZH1iif+kWrM=", "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip": "sha256-jGWRU0g120qYvvFiUFI10zvprTsemuIq3XmIjYxZGts=", "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip": "sha256-N66Bh0AwHmg5N9PNguRAGtpJ/dLMWMp3rxjTgz9poFo=", @@ -1807,7 +1808,7 @@ "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip": "sha256-TEx5wg3Sf3rkhl6oj0hRrMdBJW9KMjZ/yNDgNYaeP28=", "https://plugins.jetbrains.com/files/21962/654853/clouds-docker-gateway-243.23654.19.zip": "sha256-l4XCXUq7ECeHhSjPvvCnwlXIGBylsolw3jIQMZ4Geag=", "https://plugins.jetbrains.com/files/22407/672481/intellij-rust-243.23654.180.zip": "sha256-9MB+kR8GZePzVU6i9sr+vFyeGqGnXwGRThTv6lKouVU=", - "https://plugins.jetbrains.com/files/22707/645830/continue-intellij-extension-0.0.83.zip": "sha256-vMV26l2J4vhFnjrJnluwf/3qKoWNSvTfMFKPmquJJ50=", + "https://plugins.jetbrains.com/files/22707/678078/continue-intellij-extension-0.0.88.zip": "sha256-aNhXdXzOVvT9Sy76gh5M5YfFH5+rwZWjp3XMwsidR4w=", "https://plugins.jetbrains.com/files/22857/633914/vcs-gitlab-243.21565.204.zip": "sha256-dnnbmo9OILtgVr8vXGSqQ6uSGDfxbrPptToAMs9SPRM=", "https://plugins.jetbrains.com/files/22857/640903/vcs-gitlab-243.22562.53.zip": "sha256-lDStIaRy9ZtCXZxM2RRrz/5oZeL90aRVS63wC4XkJNw=", "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip": "sha256-VKGZLlL8ALjr6JEQtjhXiIxNrnTPXIoXMToJkJux2dw=", @@ -1815,12 +1816,12 @@ "https://plugins.jetbrains.com/files/23927/668616/Extra_IDE_Tweaks-2025.1.1.zip": "sha256-nOPYnvLuApgpQwHBhRE3MJLDl2pE4bCz/6XHQQTZfA8=", "https://plugins.jetbrains.com/files/24559/672148/Extra_Tools_Pack-2025.1.2.zip": "sha256-U3gxwqLNGWNM26gTLJ7Q/9pBf9hbriSPvMvrE8EZVmc=", "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip": "sha256-Uq5RdVQTyqRMsEwDZT6Kldv2alt0EVMCABEt/xQUHow=", - "https://plugins.jetbrains.com/files/26084/673826/markdtask-2025.1.zip": "sha256-Gd2yg0nkI312x4kobfSfFiiOWOduSN+N65kcrIQRmwE=", - "https://plugins.jetbrains.com/files/631/673131/python-243.23654.189.zip": "sha256-4uuHNZhmSh+vqARBZ+ilRmkYnr0otZdgeZUPziv+lQc=", + "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip": "sha256-NFHB5zWH8pUwz6OT8F7eIiapeEvHX24fj0Eo1qH45Aw=", + "https://plugins.jetbrains.com/files/631/680216/python-243.24978.46.zip": "sha256-dmCzUbfVRRqfKeRGSdoCbCWoblrxdmJ7qFButTwm9LI=", "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip": "sha256-pFKAZ8xFNfUh7/Hi4NYPDQAhRRYm4WKTpCQELqBfb40=", - "https://plugins.jetbrains.com/files/6981/633889/ini-243.21565.208.zip": "sha256-CJjUYj3GR9MrNhrejrxJ4reZX/80XQ+gkZffFKd0nhc=", "https://plugins.jetbrains.com/files/6981/654905/ini-243.22562.236.zip": "sha256-kL/A2R8j2JKMU61T/xJahPwKPYmwFCFy55NPSoBh/Xc=", "https://plugins.jetbrains.com/files/6981/672286/ini-243.23654.177.zip": "sha256-5IgVW7Aa+eVh5hUF7/Qa1g7nQtkAQkFKyGY5ROr/5fM=", + "https://plugins.jetbrains.com/files/6981/680778/ini-243.24978.60.zip": "sha256-m2iKdm4f1h+k1XdQvJCd8T83jEKip+H1E1p8XMfrGcg=", "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip": "sha256-kVUEgfEKUupV/qlB4Dpzi5pFHjhVvX74XIPetKtjysM=", "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip": "sha256-KY5VRiLJJwa9OVVog1W3MboZjwVboYwYm+i4eqooo44=", "https://plugins.jetbrains.com/files/7177/630032/fileWatcher-243.21565.122.zip": "sha256-Pjn9LPdlTug6WQaydD2sgjBeqdzTd6KRXPawgl4KM74=", @@ -1830,6 +1831,7 @@ "https://plugins.jetbrains.com/files/7320/630497/PHP_Annotations-11.1.1.zip": "sha256-05aBYbqNIuwe/JTwntFdIqML8NHbTOwVusl1P9FzuYY=", "https://plugins.jetbrains.com/files/7322/646590/python-ce-243.22562.145.zip": "sha256-45UtQRZMtKF6addrrB3A+goeyICMfcZ2FKcJvJSqgg4=", "https://plugins.jetbrains.com/files/7322/673130/python-ce-243.23654.189.zip": "sha256-7P9JsxCDWUf0HPHZNPjoF8Ivh3Ks7AO5s2kWm+Cq9j4=", + "https://plugins.jetbrains.com/files/7322/680217/python-ce-243.24978.46.zip": "sha256-4KkUOSN9KnBjpo92LvkN/7ZtDG/gSAFHgDf5ESSsgoY=", "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip": "sha256-3RJ7YVFtynyqeLIzdrirCMbWNZmUkJ+DT/9my71H0Dk=", "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar": "sha256-Z7ZWDomXnTdHFKOElMkt53imef6aT7H5XeD6lOOFxfQ=", "https://plugins.jetbrains.com/files/7499/667439/gittoolbox-600.0.14_243-signed.zip": "sha256-rpJ0tPIf3mw5KLSv+wx16mXVKA1PxKTktgCYzKU3cU4=", @@ -1839,9 +1841,10 @@ "https://plugins.jetbrains.com/files/8554/633920/featuresTrainer-243.21565.204.zip": "sha256-3MCG1SNEy2Mf9r+nTLcRwJ+rIJRvtO0kYKFNjIan86E=", "https://plugins.jetbrains.com/files/8554/654690/featuresTrainer-243.22562.233.zip": "sha256-JugbJM8Lr2kbhP9hdLE3kUStl2vOMUB5wGTwNLxAZd0=", "https://plugins.jetbrains.com/files/8554/672476/featuresTrainer-243.23654.180.zip": "sha256-YRf5sj+quf/dQv6eFU6f190vWW+RHtyGS+S2a6DhUoM=", + "https://plugins.jetbrains.com/files/8554/680571/featuresTrainer-243.24978.50.zip": "sha256-ukyMPINMP5ZQQGr38ibsWwzhYJhlQ+zTHaHvAWCEj0g=", "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip": "sha256-OFisV6Vs/xlbDvchxfrREDVgVh7wcfGnot+zUrgQU6M=", "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip": "sha256-hR7hC2phDJnHXxPy80WlEDFAhZHtMCu7nqYvAb0VeTI=", - "https://plugins.jetbrains.com/files/9568/666746/go-plugin-243.23654.117.zip": "sha256-8Y7JyjX8ytias4ix1azWkhPEVYXDomWRiMQlrKco9zM=", + "https://plugins.jetbrains.com/files/9568/680198/go-plugin-243.24978.46.zip": "sha256-H2zxIwMN/m7s7Ewhy55QO45lQcUOhG/xD29wj6V/vIM=", "https://plugins.jetbrains.com/files/9707/628343/ansi-highlighter-premium-24.3.1.jar": "sha256-X+Xks9sajsSVRXLQghJ5k2GuwmllNsZ9SrYBbf36P0c=", "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip": "sha256-Mzmmq0RzMKZeKfBSo7FHvzeEtPGIrwqEDLAONQEsR1M=", "https://plugins.jetbrains.com/files/9836/672013/intellij-randomness-3.3.5-signed.zip": "sha256-2vb1sYPM0td8B95m7bVYfJfKVW+jObWpAHTTqLZB7Ak=" From 0102b4d6ca96a1afa2aed446ee300e8070a54a2d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 14:37:41 +0000 Subject: [PATCH 1998/2168] tippecanoe: 2.75.0 -> 2.75.1 --- pkgs/by-name/ti/tippecanoe/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ti/tippecanoe/package.nix b/pkgs/by-name/ti/tippecanoe/package.nix index 3e55a2fa7159..e298a641dc70 100644 --- a/pkgs/by-name/ti/tippecanoe/package.nix +++ b/pkgs/by-name/ti/tippecanoe/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tippecanoe"; - version = "2.75.0"; + version = "2.75.1"; src = fetchFromGitHub { owner = "felt"; repo = "tippecanoe"; - rev = finalAttrs.version; - hash = "sha256-0ayEGmIUw5jI5utp689oxlFR15TeQ1gbLJIos4AXdd4="; + tag = finalAttrs.version; + hash = "sha256-rBuk34lOrp9aW7yK0LOTRqFJg3J8IogR01kcFhgK12Y="; }; buildInputs = [ @@ -37,12 +37,12 @@ stdenv.mkDerivation (finalAttrs: { version = "v${finalAttrs.version}"; }; - meta = with lib; { + meta = { description = "Build vector tilesets from large collections of GeoJSON features"; homepage = "https://github.com/felt/tippecanoe"; - license = licenses.bsd2; - maintainers = teams.geospatial.members; - platforms = platforms.unix; + license = lib.licenses.bsd2; + maintainers = lib.teams.geospatial.members; + platforms = lib.platforms.unix; mainProgram = "tippecanoe"; }; }) From 26014d3455751e9e304d71ceb3996a8bb18c3566 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 14 Feb 2025 09:59:12 -0600 Subject: [PATCH 1999/2168] yabai: 7.1.9 -> 7.1.10 --- pkgs/by-name/ya/yabai/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ya/yabai/package.nix b/pkgs/by-name/ya/yabai/package.nix index e842f1d0bc27..71f473315ff7 100644 --- a/pkgs/by-name/ya/yabai/package.nix +++ b/pkgs/by-name/ya/yabai/package.nix @@ -14,7 +14,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "yabai"; - version = "7.1.9"; + version = "7.1.10"; src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system} @@ -66,13 +66,13 @@ stdenv.mkDerivation (finalAttrs: { # See the comments on https://github.com/NixOS/nixpkgs/pull/188322 for more information. "aarch64-darwin" = fetchzip { url = "https://github.com/koekeishiya/yabai/releases/download/v${finalAttrs.version}/yabai-v${finalAttrs.version}.tar.gz"; - hash = "sha256-x5V269Jilpv9XdSw5AtLpOBc4io8i1+duj62S4h9eXM="; + hash = "sha256-mWN59BfexCmaahADzUP+B1xGQK8TNyrKOBKKJ00D7tg="; }; "x86_64-darwin" = fetchFromGitHub { owner = "koekeishiya"; repo = "yabai"; rev = "v${finalAttrs.version}"; - hash = "sha256-STgd51fatxGahhYyCDo35mZbhYwX5n76cdu2NnzjdDM="; + hash = "sha256-4OYB+RlAUD8LcRcUNIEXWfFFedTmQFzcTgqd1g/tdWc="; }; }; From 0de36a55a07b92f3577ad62e9642caac497fe5f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 16:17:08 +0000 Subject: [PATCH 2000/2168] weaviate: 1.28.4 -> 1.28.5 --- pkgs/by-name/we/weaviate/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/we/weaviate/package.nix b/pkgs/by-name/we/weaviate/package.nix index b5417d5bc1c4..063475fe0b09 100644 --- a/pkgs/by-name/we/weaviate/package.nix +++ b/pkgs/by-name/we/weaviate/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "weaviate"; - version = "1.28.4"; + version = "1.28.5"; src = fetchFromGitHub { owner = "weaviate"; repo = "weaviate"; rev = "v${version}"; - hash = "sha256-nHvN+VSk+kw4jmniKXmUJEf4cRDH7s5yMOL/asXkTNM="; + hash = "sha256-avFO+FrhTWGxt5FGEIczu+3qL29WroqJFaYfNDP1gpI="; }; - vendorHash = "sha256-OYLHHIOZWmkAxVethJNJfJOz3kDIXefu/aAUJ/rvxeQ="; + vendorHash = "sha256-4JM+MGrlZLCWGcOG5bAuVO/Z+VUB09pvyv/T9r6z/qo="; subPackages = [ "cmd/weaviate-server" ]; From 4ff952cca3e4c1b954e867bb587f029a98af6e15 Mon Sep 17 00:00:00 2001 From: Pablo Ovelleiro Corral Date: Fri, 14 Feb 2025 17:23:59 +0100 Subject: [PATCH 2001/2168] netbootxyz-efi: add maintainer --- pkgs/by-name/ne/netbootxyz-efi/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ne/netbootxyz-efi/package.nix b/pkgs/by-name/ne/netbootxyz-efi/package.nix index bd2fc9fa09d1..63ce75a494cb 100644 --- a/pkgs/by-name/ne/netbootxyz-efi/package.nix +++ b/pkgs/by-name/ne/netbootxyz-efi/package.nix @@ -17,7 +17,7 @@ fetchurl { homepage = "https://netboot.xyz/"; description = "Tool to boot OS installers and utilities over the network, to be run from a bootloader"; license = licenses.asl20; - maintainers = [ ]; + maintainers = with maintainers; [ pinpox ]; platforms = platforms.linux; }; } From 3c3ddddbe858afa40222bd79612bb36ae13f095a Mon Sep 17 00:00:00 2001 From: ruro Date: Sat, 8 Feb 2025 16:58:15 +0300 Subject: [PATCH 2002/2168] python3Packages.bpycv: remove The bpycv package is incompatible with blender version 4 or later. It seems that neither upstream author nor the nixpkgs maintainer are currently interested in updating/maintaining this package. See: - https://github.com/NixOS/nixpkgs/issues/379872 - https://github.com/DIYer22/bpycv/issues/51 - https://github.com/NixOS/nixpkgs/pull/380403 - https://github.com/NixOS/nixpkgs/pull/380443 --- .../manual/release-notes/rl-2505.section.md | 2 + .../python-modules/bpycv/bpycv-test.py | 80 ------------------- .../python-modules/bpycv/default.nix | 62 -------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - pkgs/top-level/release-cuda.nix | 1 - 6 files changed, 3 insertions(+), 145 deletions(-) delete mode 100644 pkgs/development/python-modules/bpycv/bpycv-test.py delete mode 100644 pkgs/development/python-modules/bpycv/default.nix diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 65a61e88f388..cdcc182577df 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -290,6 +290,8 @@ - The behavior of the `networking.nat.externalIP` and `networking.nat.externalIPv6` options has been changed. `networking.nat.forwardPorts` now only forwards packets destined for the specified IP addresses. +- `python3Packages.bpycv` has been removed due to being incompatible with Blender 4 and unmaintained. + - `python3Packages.jaeger-client` was removed because it was deprecated upstream. [OpenTelemetry](https://opentelemetry.io) is the recommended replacement. - `nodePackages.meshcommander` has been removed, as the package was deprecated by Intel. diff --git a/pkgs/development/python-modules/bpycv/bpycv-test.py b/pkgs/development/python-modules/bpycv/bpycv-test.py deleted file mode 100644 index 1bf2b9f5a8d3..000000000000 --- a/pkgs/development/python-modules/bpycv/bpycv-test.py +++ /dev/null @@ -1,80 +0,0 @@ -# based on https://github.com/DIYer22/bpycv/blob/c576e01622d87eb3534f73bf1a5686bd2463de97/example/ycb_demo.py -import bpy -import bpycv - -import os -import glob -import random -from pathlib import Path - -example_data_dir = os.environ['BPY_EXAMPLE_DATA'] -out_dir = Path(os.environ['out']) -out_dir.mkdir(parents=True, exist_ok=True) - -models = sorted(glob.glob(os.path.join(example_data_dir, "model", "*", "*.obj"))) -cat_id_to_model_path = dict(enumerate(sorted(models), 1)) - -distractors = sorted(glob.glob(os.path.join(example_data_dir, "distractor", "*.obj"))) - -bpycv.clear_all() -bpy.context.scene.frame_set(1) -bpy.context.scene.render.engine = "CYCLES" -bpy.context.scene.cycles.samples = 32 -bpy.context.scene.render.resolution_y = 1024 -bpy.context.scene.render.resolution_x = 1024 -bpy.context.view_layer.cycles.denoising_store_passes = False - -# A transparency stage for holding rigid body -stage = bpycv.add_stage(transparency=True) - -bpycv.set_cam_pose(cam_radius=1, cam_deg=45) - -hdri_dir = os.path.join(example_data_dir, "background_and_light") -hdri_manager = bpycv.HdriManager( - hdri_dir=hdri_dir, download=False -) # if download is True, will auto download .hdr file from HDRI Haven -hdri_path = hdri_manager.sample() -bpycv.load_hdri_world(hdri_path, random_rotate_z=True) - -# load 5 objects -for index in range(5): - cat_id = random.choice(list(cat_id_to_model_path)) - model_path = cat_id_to_model_path[cat_id] - obj = bpycv.load_obj(model_path) - obj.location = ( - random.uniform(-0.2, 0.2), - random.uniform(-0.2, 0.2), - random.uniform(0.1, 0.3), - ) - obj.rotation_euler = [random.uniform(-3.1415, 3.1415) for _ in range(3)] - # set each instance a unique inst_id, which is used to generate instance annotation. - obj["inst_id"] = cat_id * 1000 + index - with bpycv.activate_obj(obj): - bpy.ops.rigidbody.object_add() - -# load 6 distractors -for index in range(6): - distractor_path = random.choice(distractors) - target_size = random.uniform(0.1, 0.3) - distractor = bpycv.load_distractor(distractor_path, target_size=target_size) - distractor.location = ( - random.uniform(-0.2, 0.2), - random.uniform(-0.2, 0.2), - random.uniform(0.1, 0.3), - ) - distractor.rotation_euler = [random.uniform(-3.1415, 3.1415) for _ in range(3)] - with bpycv.activate_obj(distractor): - bpy.ops.rigidbody.object_add() - -# run pyhsic engine for 20 frames -for i in range(20): - bpy.context.scene.frame_set(bpy.context.scene.frame_current + 1) - -# render image, instance annoatation and depth in one line code -result = bpycv.render_data() - - -result.save(dataset_dir=str(out_dir.resolve()), fname="0", save_blend=True) -print(f'Save to "{out_dir}"') -print(f'Open "{out_dir}/vis/" to see visualize result.') - diff --git a/pkgs/development/python-modules/bpycv/default.nix b/pkgs/development/python-modules/bpycv/default.nix deleted file mode 100644 index 5e7da42a9713..000000000000 --- a/pkgs/development/python-modules/bpycv/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ - stdenv, - lib, - beautifulsoup4, - blender, - boxx, - buildPythonPackage, - fetchFromGitHub, - fetchPypi, - minexr, - opencv-python, - requests, - runCommand, - zcs, -}: - -buildPythonPackage rec { - pname = "bpycv"; - version = "0.4.0"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-qqNGemDB0aagCXjrECuh6kLksf+KujPejpnXVqFG8GY="; - }; - - propagatedBuildInputs = [ - beautifulsoup4 - minexr - zcs - requests - opencv-python - boxx - ]; - - # pythonImportsCheck = [ "bpycv" ]; # this import depends on bpy that is only available inside blender - doCheck = false; - - passthru.tests = { - render = - runCommand "bpycv-render-test" - { - BPY_EXAMPLE_DATA = fetchFromGitHub { - owner = "DIYer22"; - repo = "bpycv_example_data"; - hash = "sha256-dGb6KvbXTGTu5f4AqhA+i4AwTqBoR5SdXk0vsMEcD3Q="; - rev = "6ce0e65c107d572011394da16ffdf851e988dbb4"; - }; - } - '' - ${blender.withPackages (ps: [ ps.bpycv ])}/bin/blender-wrapped -b -P ${./bpycv-test.py} - ''; - }; - - meta = with lib; { - description = "Computer vision utils for Blender"; - homepage = "https://github.com/DIYer22/bpycv"; - license = licenses.mit; - maintainers = [ maintainers.lucasew ]; - inherit (blender.meta) platforms; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 7b137df6efd3..6e4f9beaf386 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -92,6 +92,7 @@ mapAliases ({ BlinkStick = blinkstick; # added 2023-02-19 blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # added 2020-11-29 boto = throw "boto was removed as it is deprecated upstream, had not been updated since 2018, and failed to build; please use boto3 and botocore"; # Added 2024-09-22 + bpycv = throw "bpycv was removed as it is incompatible with blender version 4 or later."; # added 2025-02-08 bsblan = python-bsblan; # added 2022-11-04 btchip = btchip-python; # added 2023-03-03 bugz = throw "use pkgs.pybugz instead"; # added 2024-12-31 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 782cf2c469a9..7031dfa10743 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1880,8 +1880,6 @@ self: super: with self; { bpemb = callPackage ../development/python-modules/bpemb { }; - bpycv = callPackage ../development/python-modules/bpycv {}; - bpylist2 = callPackage ../development/python-modules/bpylist2 { }; bpython = callPackage ../development/python-modules/bpython { }; diff --git a/pkgs/top-level/release-cuda.nix b/pkgs/top-level/release-cuda.nix index 0c00d73e750e..34b9ed1212c9 100644 --- a/pkgs/top-level/release-cuda.nix +++ b/pkgs/top-level/release-cuda.nix @@ -118,7 +118,6 @@ let python3Packages = { boxx = linux; - bpycv = linux; catboost = linux; cupy = linux; faiss = linux; From 744912a96cf4755ec5fca2f05b029b352b003e8a Mon Sep 17 00:00:00 2001 From: ruro Date: Sat, 8 Feb 2025 16:58:48 +0300 Subject: [PATCH 2003/2168] python3Packages.zcs: remove This package was only used as a dependency of bpycv which was removed in the previous commit. --- .../python-modules/zcs/default.nix | 41 ------------------- .../python-modules/zcs/fix-test-yaml.patch | 13 ------ pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 4 files changed, 1 insertion(+), 56 deletions(-) delete mode 100644 pkgs/development/python-modules/zcs/default.nix delete mode 100644 pkgs/development/python-modules/zcs/fix-test-yaml.patch diff --git a/pkgs/development/python-modules/zcs/default.nix b/pkgs/development/python-modules/zcs/default.nix deleted file mode 100644 index d6aaad9d8ab7..000000000000 --- a/pkgs/development/python-modules/zcs/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - python, - yacs, - boxx, - pythonOlder, -}: - -buildPythonPackage rec { - pname = "zcs"; - version = "0.1.25"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-/QIyRQtxLDVW+vcQi5bL8rJ0o3+OhqGhQEALR1YO1pg="; - }; - - patches = [ ./fix-test-yaml.patch ]; - - propagatedBuildInputs = [ yacs ]; - - pythonImportsCheck = [ "zcs" ]; - - nativeCheckInputs = [ boxx ]; - - checkPhase = '' - ${python.interpreter} test/test_zcs.py - ''; - - meta = with lib; { - description = "Configuration system which takes advantage of both argparse and yacs"; - homepage = "https://github.com/DIYer22/zcs"; - license = licenses.mit; - maintainers = with maintainers; [ lucasew ]; - }; -} diff --git a/pkgs/development/python-modules/zcs/fix-test-yaml.patch b/pkgs/development/python-modules/zcs/fix-test-yaml.patch deleted file mode 100644 index a046f1808296..000000000000 --- a/pkgs/development/python-modules/zcs/fix-test-yaml.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/test/test_zcs.py b/test/test_zcs.py -index e4981d3..893999f 100644 ---- a/test/test_zcs.py -+++ b/test/test_zcs.py -@@ -65,7 +65,7 @@ class TestCfgNode(unittest.TestCase): - cfg = self.cfg.clone() - yamlp = pathjoin(tmpboxx(), "test.yaml") - cfg.dump(yamlp) -- cfg_dict = yaml.load(open(yamlp)) -+ cfg_dict = yaml.load(open(yamlp), yaml.Loader) - cfgd = CfgNode(cfg_dict) - self.assertTrue(str(cfg.dump()) == str(cfgd.dump())) - diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 6e4f9beaf386..4f86ef14f255 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -761,6 +761,7 @@ mapAliases ({ zc_buildout_nix = throw "zc_buildout_nix was pinned to a version no longer compatible with other modules"; zc-buildout221 = zc-buildout; # added 2021-07-21 zc_lockfile = zc-lockfile; # added 2024-01-06 + zcs = throw "zcs was removed as it is no longer used by any packages in nixpkgs."; # added 2025-02-08 zipstream = throw "zipstream has been removed, because it has been unmaintained for 6 years and there are no dependent packages"; # added 2024-05-26 zipstream-new = throw "zipstream-new has been removed, because it was packaged as a dependency for octoprint, which has switched to zipstream-ng since."; # added 2024-01-05 zope_broken = throw "zope_broken has been removed because it is obsolete and not needed in zodb>=3.10"; # added 2023-07-26 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7031dfa10743..4935604cd262 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18687,8 +18687,6 @@ self: super: with self; { zconfig = callPackage ../development/python-modules/zconfig { }; - zcs = callPackage ../development/python-modules/zcs { }; - zdaemon = callPackage ../development/python-modules/zdaemon { }; zeek = (toPythonModule (pkgs.zeek.broker.override { From 34d1bd445950aec629fdf70a3f22fcc6bc9aa84b Mon Sep 17 00:00:00 2001 From: ruro Date: Sat, 8 Feb 2025 16:58:29 +0300 Subject: [PATCH 2004/2168] python3Packages.boxx: remove This package was only used as a dependency of bpycv which was removed in the previous commit. --- .../python-modules/boxx/default.nix | 44 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - pkgs/top-level/release-cuda.nix | 1 - 4 files changed, 1 insertion(+), 47 deletions(-) delete mode 100644 pkgs/development/python-modules/boxx/default.nix diff --git a/pkgs/development/python-modules/boxx/default.nix b/pkgs/development/python-modules/boxx/default.nix deleted file mode 100644 index de23a4934ce0..000000000000 --- a/pkgs/development/python-modules/boxx/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - imageio, - matplotlib, - numpy, - pandas, - pyopengl, - scikit-image, - seaborn, - snakeviz, -}: - -buildPythonPackage rec { - pname = "boxx"; - version = "0.10.14"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-unGnmPksEuqFXHTWJkj9Gv2G/qPDgT6AZXYiG2gtkEA="; - }; - - propagatedBuildInputs = [ - imageio - matplotlib - numpy - pandas - pyopengl - scikit-image - seaborn - snakeviz - ]; - - pythonImportsCheck = [ "boxx" ]; - - meta = with lib; { - description = "Tool-box for efficient build and debug for Scientific Computing and Computer Vision"; - homepage = "https://github.com/DIYer22/boxx"; - license = licenses.mit; - maintainers = with maintainers; [ lucasew ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 4f86ef14f255..776b509a8361 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -92,6 +92,7 @@ mapAliases ({ BlinkStick = blinkstick; # added 2023-02-19 blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # added 2020-11-29 boto = throw "boto was removed as it is deprecated upstream, had not been updated since 2018, and failed to build; please use boto3 and botocore"; # Added 2024-09-22 + boxx = throw "boxx was removed as it is no longer used by any packages in nixpkgs."; # added 2025-02-08 bpycv = throw "bpycv was removed as it is incompatible with blender version 4 or later."; # added 2025-02-08 bsblan = python-bsblan; # added 2022-11-04 btchip = btchip-python; # added 2023-03-03 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4935604cd262..75a2e80215fd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1876,8 +1876,6 @@ self: super: with self; { bottleneck = callPackage ../development/python-modules/bottleneck { }; - boxx = callPackage ../development/python-modules/boxx { }; - bpemb = callPackage ../development/python-modules/bpemb { }; bpylist2 = callPackage ../development/python-modules/bpylist2 { }; diff --git a/pkgs/top-level/release-cuda.nix b/pkgs/top-level/release-cuda.nix index 34b9ed1212c9..a7f4d481b013 100644 --- a/pkgs/top-level/release-cuda.nix +++ b/pkgs/top-level/release-cuda.nix @@ -117,7 +117,6 @@ let xgboost = linux; python3Packages = { - boxx = linux; catboost = linux; cupy = linux; faiss = linux; From 1320c069c95a6fd26829d4b781c5a9853de3d62c Mon Sep 17 00:00:00 2001 From: ruro Date: Sat, 8 Feb 2025 16:58:39 +0300 Subject: [PATCH 2005/2168] python3Packages.fn: remove This package was only used as a dependency of bpycv which was removed in the previous commit. --- .../development/python-modules/fn/default.nix | 39 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 41 deletions(-) delete mode 100644 pkgs/development/python-modules/fn/default.nix diff --git a/pkgs/development/python-modules/fn/default.nix b/pkgs/development/python-modules/fn/default.nix deleted file mode 100644 index 186937474c9f..000000000000 --- a/pkgs/development/python-modules/fn/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchpatch, - fetchPypi, - pythonAtLeast, -}: - -buildPythonPackage rec { - pname = "fn"; - version = "0.4.3"; - format = "setuptools"; - - # Python 3.11 changed the API of the `inspect` module and fn was never - # updated to adapt; last commit was in 2014. - disabled = pythonAtLeast "3.11"; - - src = fetchPypi { - inherit pname version; - sha256 = "1nmsjmn8jb4gp22ksx0j0hhdf4y0zm8rjykyy2i6flzimg6q1kgq"; - }; - - patches = [ - (fetchpatch { - url = "https://github.com/kachayev/fn.py/commit/a54fc0bd8aeae277de2db726131d249ce607c0c2.patch"; - hash = "sha256-I0ZISOgVibsc1k7gwSfeW6qV9PspQqdaHlRLr/IusQ8="; - excludes = [ "fn/monad.py" ]; - }) - ]; - - meta = with lib; { - description = '' - Functional programming in Python: implementation of missing - features to enjoy FP - ''; - homepage = "https://github.com/kachayev/fn.py"; - license = licenses.asl20; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 776b509a8361..22a2330c9203 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -241,6 +241,7 @@ mapAliases ({ flufl_bounce = flufl-bounce; # added 2023-11-03 flufl_i18n = flufl-i18n; # added 2023-11-03 flufl_lock = flufl-lock; # added 2023-11-03 + fn = throw "fn was removed as it is no longer used by any package in nixpkgs, it is not compatible with python 3.11 or newer and it was last updated in 2014."; # added 2025-02-08 forbiddenfruit = throw "forbiddenfruit has been removed, because it was unmaintained and relied on the nose test framework"; # added 2024-07-08 FormEncode = formencode; # added 2023-02-19 foundationdb51 = throw "foundationdb51 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 75a2e80215fd..dfc874d1c469 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4894,8 +4894,6 @@ self: super: with self; { flynt = callPackage ../development/python-modules/flynt { }; - fn = callPackage ../development/python-modules/fn { }; - fnv-hash-fast = callPackage ../development/python-modules/fnv-hash-fast { }; fnvhash = callPackage ../development/python-modules/fnvhash { }; From b58df7fc9d5f02c269091f2b0b81a6e06fc859bb Mon Sep 17 00:00:00 2001 From: Kiskae Date: Fri, 14 Feb 2025 17:30:35 +0100 Subject: [PATCH 2006/2168] linuxPackages.nvidiaPackages.vulkan_beta: 550.40.83 -> 550.40.85 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index d87a45fa6e7b..7f62b99c1da9 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -106,11 +106,11 @@ rec { # Vulkan developer beta driver # See here for more information: https://developer.nvidia.com/vulkan-driver vulkan_beta = generic rec { - version = "550.40.83"; + version = "550.40.85"; persistencedVersion = "550.54.14"; settingsVersion = "550.54.14"; - sha256_64bit = "sha256-2zfiVA7H4erkdbqyNH+2MHexclT+ZF2PifYkD5Dmo7M="; - openSha256 = "sha256-Tqj8g/KUOtUc815tZo1wOrj7XMbDp7JL7oq7t3h1r+I="; + sha256_64bit = "sha256-2LYrpW5/l5HnAWXehiu6fAM7fqr2kHsh55aAx99MWPU="; + openSha256 = "sha256-waGF6tH5f+0frcyqOJA0MHiB9BM0r5oF75rkLzxo3Js="; settingsSha256 = "sha256-m2rNASJp0i0Ez2OuqL+JpgEF0Yd8sYVCyrOoo/ln2a4="; persistencedSha256 = "sha256-XaPN8jVTjdag9frLPgBtqvO/goB5zxeGzaTU0CdL6C4="; url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitVersion version)}-linux"; From acdaaa59bde5c2a6f21f1d73a67f2d00a1e421b8 Mon Sep 17 00:00:00 2001 From: rein Date: Fri, 14 Feb 2025 16:43:46 +0000 Subject: [PATCH 2007/2168] tabby: v0.23.1 -> v0.24.0 --- pkgs/by-name/ta/tabby/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ta/tabby/package.nix b/pkgs/by-name/ta/tabby/package.nix index 85893b378fe7..223e779790eb 100644 --- a/pkgs/by-name/ta/tabby/package.nix +++ b/pkgs/by-name/ta/tabby/package.nix @@ -31,7 +31,7 @@ let # https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/ollama/default.nix pname = "tabby"; - version = "0.23.1"; + version = "0.24.0"; availableAccelerations = flatten [ (optional cudaSupport "cuda") @@ -120,7 +120,7 @@ rustPlatform.buildRustPackage { owner = "TabbyML"; repo = "tabby"; tag = "v${version}"; - hash = "sha256-8eQFsLiAHF/9gD1SdtsbDwHm0WjQ3Db6QIyxMF2dIM0="; + hash = "sha256-poWUfPp/7w6dNjh6yoP5oTbaP4lL91hb1+zQG8tjUDE="; fetchSubmodules = true; }; From 6825d6f9f634a9fee82d980b2ef1672c6011e01c Mon Sep 17 00:00:00 2001 From: Dionysis Grigoropoulos Date: Fri, 14 Feb 2025 19:03:45 +0200 Subject: [PATCH 2008/2168] martian-mono: fix build Upstream changed the released zip files so the hash changed Closes #382089 --- pkgs/by-name/ma/martian-mono/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ma/martian-mono/package.nix b/pkgs/by-name/ma/martian-mono/package.nix index 223b22009c3e..3b42445e2f2d 100644 --- a/pkgs/by-name/ma/martian-mono/package.nix +++ b/pkgs/by-name/ma/martian-mono/package.nix @@ -10,7 +10,7 @@ stdenvNoCC.mkDerivation rec { src = fetchzip { url = "https://github.com/evilmartians/mono/releases/download/v${version}/martian-mono-${version}-otf.zip"; - sha256 = "sha256-L+T9XxTH7+yFJwhZ8UXAlq3rAkPFn/8dRBoGfbiHuGA="; + sha256 = "sha256-W6ewNtFDS1O1fwoAe27tIgNZn7AAKo965dWkZYzsg+o="; stripRoot = false; }; From adbf994b8612d66422ca9d27bf403eb27d287e7c Mon Sep 17 00:00:00 2001 From: Fazzi Date: Fri, 14 Feb 2025 17:06:24 +0000 Subject: [PATCH 2009/2168] obs-studio-plugins.obs-pipewire-audio-capture: 1.1.5 -> 1.2.0 --- .../plugins/obs-pipewire-audio-capture.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix b/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix index dc03e00a192e..fefdefc8eb4f 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix @@ -8,16 +8,15 @@ pipewire, pkg-config, }: - stdenv.mkDerivation rec { pname = "obs-pipewire-audio-capture"; - version = "1.1.5"; + version = "1.2.0"; src = fetchFromGitHub { owner = "dimtpap"; repo = pname; rev = version; - sha256 = "sha256-qYHU0m+jz/mQmjleITnzxNkTio5ir8dFkHKfmY4l0Es="; + sha256 = "sha256-nkd/AoMsEUUxQQH5CjbnPbNwAwkd1y6j2nCa1GIAFPs="; }; nativeBuildInputs = [ @@ -31,13 +30,17 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DCMAKE_INSTALL_LIBDIR=/lib" + "-DCMAKE_INSTALL_LIBDIR=./lib" + "-DCMAKE_INSTALL_DATADIR=./usr" ]; meta = with lib; { description = "Audio device and application capture for OBS Studio using PipeWire"; homepage = "https://github.com/dimtpap/obs-pipewire-audio-capture"; - maintainers = with maintainers; [ Elinvention ]; + maintainers = with maintainers; [ + Elinvention + fazzi + ]; license = licenses.gpl2Plus; platforms = [ "x86_64-linux" From 19c429fdf98a3f9c3db5595420c9090261e7a2e6 Mon Sep 17 00:00:00 2001 From: Fazzi Date: Fri, 14 Feb 2025 17:07:16 +0000 Subject: [PATCH 2010/2168] maintainers: add fazzi to maintainer list --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8aea451f3a0a..5648f2654386 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7390,6 +7390,12 @@ name = "A Frederick Christensen"; keys = [ { fingerprint = "5A49 F4F9 3EDC 21E9 B7CC 4E94 9EEF 4142 5355 8AC4"; } ]; }; + fazzi = { + email = "faaris.ansari@proton.me"; + github = "fxzzi"; + githubId = 18248986; + name = "Faaris Ansari"; + }; fbeffa = { email = "beffa@fbengineering.ch"; github = "fedeinthemix"; From 0080181fc63c5eab6767fbca18a41390620325da Mon Sep 17 00:00:00 2001 From: rein Date: Fri, 14 Feb 2025 17:17:16 +0000 Subject: [PATCH 2011/2168] tabby: use useFetchCargoVendor --- pkgs/by-name/ta/tabby/Cargo.lock | 7316 ----------------------------- pkgs/by-name/ta/tabby/package.nix | 49 +- 2 files changed, 16 insertions(+), 7349 deletions(-) delete mode 100644 pkgs/by-name/ta/tabby/Cargo.lock diff --git a/pkgs/by-name/ta/tabby/Cargo.lock b/pkgs/by-name/ta/tabby/Cargo.lock deleted file mode 100644 index 450526e04694..000000000000 --- a/pkgs/by-name/ta/tabby/Cargo.lock +++ /dev/null @@ -1,7316 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 4 - -[[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 = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if", - "getrandom 0.2.15", - "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 = "aim-downloader" -version = "0.23.1" -dependencies = [ - "async-stream", - "clap", - "custom_error", - "dotenvy", - "futures-util", - "home", - "indicatif", - "netrc", - "regex", - "reqwest", - "serial_test 2.0.0", - "sha2", - "strfmt", - "tokio", - "tokio-util", - "url-parse", -] - -[[package]] -name = "allocator-api2" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" - -[[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 = "anstream" -version = "0.6.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "is_terminal_polyfill", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" - -[[package]] -name = "anstyle-parse" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" -dependencies = [ - "anstyle", - "windows-sys 0.52.0", -] - -[[package]] -name = "anyhow" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" - -[[package]] -name = "arc-swap" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" - -[[package]] -name = "argon2" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3610892ee6e0cbce8ae2700349fcf8f98adb0dbfbee85aec3c9179d29cc072" -dependencies = [ - "base64ct", - "blake2", - "cpufeatures", - "password-hash", -] - -[[package]] -name = "ascii" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eab1c04a571841102f5345a8fc0f6bb3d31c315dec879b5c6e42e40ce7ffa34e" - -[[package]] -name = "assert-json-diff" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12" -dependencies = [ - "serde", - "serde_json", -] - -[[package]] -name = "assert_matches" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" - -[[package]] -name = "async-convert" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d416feee97712e43152cd42874de162b8f9b77295b1c85e5d92725cc8310bae" -dependencies = [ - "async-trait", -] - -[[package]] -name = "async-openai" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11e97f9c5e0ee3260caee9700ba1bb61a6fdc34d2b6786a31e018c5de5198491" -dependencies = [ - "async-convert", - "backoff", - "base64 0.22.1", - "bytes", - "derive_builder", - "futures", - "rand 0.8.5", - "reqwest", - "reqwest-eventsource", - "secrecy 0.8.0", - "serde", - "serde_json", - "thiserror", - "tokio", - "tokio-stream", - "tokio-util", - "tracing", -] - -[[package]] -name = "async-stream" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" -dependencies = [ - "async-stream-impl", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-stream-impl" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "async-trait" -version = "0.1.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "atoi" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" -dependencies = [ - "num-traits", -] - -[[package]] -name = "atomic-waker" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" - -[[package]] -name = "auto_enums" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1899bfcfd9340ceea3533ea157360ba8fa864354eccbceab58e1006ecab35393" -dependencies = [ - "derive_utils", - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "autocfg" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" - -[[package]] -name = "axum" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" -dependencies = [ - "async-trait", - "axum-core", - "base64 0.21.7", - "bytes", - "futures-util", - "http 1.1.0", - "http-body 1.0.0", - "http-body-util", - "hyper 1.3.1", - "hyper-util", - "itoa 1.0.11", - "matchit", - "memchr", - "mime", - "percent-encoding", - "pin-project-lite", - "rustversion", - "serde", - "serde_json", - "serde_path_to_error", - "serde_urlencoded", - "sha1", - "sync_wrapper 1.0.1", - "tokio", - "tokio-tungstenite", - "tower 0.4.13", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "axum-core" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" -dependencies = [ - "async-trait", - "bytes", - "futures-util", - "http 1.1.0", - "http-body 1.0.0", - "http-body-util", - "mime", - "pin-project-lite", - "rustversion", - "sync_wrapper 0.1.2", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "axum-extra" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0be6ea09c9b96cb5076af0de2e383bd2bc0c18f827cf1967bdd353e0b910d733" -dependencies = [ - "axum", - "axum-core", - "bytes", - "futures-util", - "headers", - "http 1.1.0", - "http-body 1.0.0", - "http-body-util", - "mime", - "pin-project-lite", - "serde", - "tower 0.4.13", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "axum-prometheus" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b683cbc43010e9a3d72c2f31ca464155ff4f95819e88a32924b0f47a43898978" -dependencies = [ - "axum", - "bytes", - "futures", - "futures-core", - "http 1.1.0", - "http-body 1.0.0", - "matchit", - "metrics", - "metrics-exporter-prometheus", - "once_cell", - "pin-project", - "tokio", - "tower 0.4.13", - "tower-http 0.5.2", -] - -[[package]] -name = "backoff" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" -dependencies = [ - "futures-core", - "getrandom 0.2.15", - "instant", - "pin-project-lite", - "rand 0.8.5", - "tokio", -] - -[[package]] -name = "backtrace" -version = "0.3.71" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - -[[package]] -name = "base64" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" - -[[package]] -name = "base64ct" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" - -[[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.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" -dependencies = [ - "serde", -] - -[[package]] -name = "bitpacking" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c1d3e2bfd8d06048a179f7b17afc3188effa10385e7b00dc65af6aae732ea92" -dependencies = [ - "crunchy", -] - -[[package]] -name = "blake2" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" -dependencies = [ - "digest", -] - -[[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 = "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 = "build-target" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "832133bbabbbaa9fbdba793456a2827627a7d2b8fb96032fa1e7666d7895832b" - -[[package]] -name = "bumpalo" -version = "3.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "bytes" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" - -[[package]] -name = "cached" -version = "0.49.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e8e463fceca5674287f32d252fb1d94083758b8709c160efae66d263e5f4eba" -dependencies = [ - "ahash", - "async-trait", - "cached_proc_macro", - "cached_proc_macro_types", - "futures", - "hashbrown 0.14.5", - "instant", - "once_cell", - "thiserror", - "tokio", -] - -[[package]] -name = "cached_proc_macro" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad9f16c0d84de31a2ab7fdf5f7783c14631f7075cf464eb3bb43119f61c9cb2a" -dependencies = [ - "darling 0.14.4", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "cached_proc_macro_types" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade8366b8bd5ba243f0a58f036cc0ca8a2f069cff1a2351ef1cac6b083e16fc0" - -[[package]] -name = "cc" -version = "1.0.98" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" -dependencies = [ - "jobserver", - "libc", - "once_cell", -] - -[[package]] -name = "census" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f4c707c6a209cbe82d10abd08e1ea8995e9ea937d2550646e02798948992be0" - -[[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.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "serde", - "wasm-bindgen", - "windows-targets 0.52.5", -] - -[[package]] -name = "chumsky" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eebd66744a15ded14960ab4ccdbfb51ad3b81f51f3f04a80adac98c985396c9" -dependencies = [ - "hashbrown 0.14.5", - "stacker", -] - -[[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", -] - -[[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 2.0.66", -] - -[[package]] -name = "clap_lex" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" - -[[package]] -name = "clocksource" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "129026dd5a8a9592d96916258f3a5379589e513ea5e86aeb0bd2530286e44e9e" -dependencies = [ - "libc", - "time", - "winapi", -] - -[[package]] -name = "cmake" -version = "0.1.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" -dependencies = [ - "cc", -] - -[[package]] -name = "color-eyre" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5" -dependencies = [ - "backtrace", - "color-spantrace", - "eyre", - "indenter", - "once_cell", - "owo-colors", - "tracing-error", -] - -[[package]] -name = "color-spantrace" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2" -dependencies = [ - "once_cell", - "owo-colors", - "tracing-core", - "tracing-error", -] - -[[package]] -name = "colorchoice" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" - -[[package]] -name = "combine" -version = "3.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da3da6baa321ec19e1cc41d31bf599f00c783d0517095cdaf0332e3fe8d20680" -dependencies = [ - "ascii", - "byteorder", - "either", - "memchr", - "unreachable", -] - -[[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 = "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 = "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" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" - -[[package]] -name = "cpufeatures" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" -dependencies = [ - "libc", -] - -[[package]] -name = "crc" -version = "3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" -dependencies = [ - "crc-catalog", -] - -[[package]] -name = "crc-catalog" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" - -[[package]] -name = "crc32fast" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "cron" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f8c3e73077b4b4a6ab1ea5047c37c57aee77657bc8ecd6f29b0af082d0b0c07" -dependencies = [ - "chrono", - "nom", - "once_cell", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" -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.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" - -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "cssparser" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a" -dependencies = [ - "cssparser-macros", - "dtoa-short", - "itoa 0.4.8", - "matches", - "phf 0.8.0", - "proc-macro2", - "quote", - "smallvec", - "syn 1.0.109", -] - -[[package]] -name = "cssparser-macros" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" -dependencies = [ - "quote", - "syn 2.0.66", -] - -[[package]] -name = "custom_error" -version = "1.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f8a51dd197fa6ba5b4dc98a990a43cc13693c23eb0089ebb0fcc1f04152bca6" - -[[package]] -name = "darling" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" -dependencies = [ - "darling_core 0.14.4", - "darling_macro 0.14.4", -] - -[[package]] -name = "darling" -version = "0.20.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" -dependencies = [ - "darling_core 0.20.9", - "darling_macro 0.20.9", -] - -[[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", - "quote", - "strsim 0.10.0", - "syn 1.0.109", -] - -[[package]] -name = "darling_core" -version = "0.20.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.11.1", - "syn 2.0.66", -] - -[[package]] -name = "darling_macro" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" -dependencies = [ - "darling_core 0.14.4", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "darling_macro" -version = "0.20.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" -dependencies = [ - "darling_core 0.20.9", - "quote", - "syn 2.0.66", -] - -[[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 = "data-encoding" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" - -[[package]] -name = "der" -version = "0.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" -dependencies = [ - "const-oid", - "pem-rfc7468", - "zeroize", -] - -[[package]] -name = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", - "serde", -] - -[[package]] -name = "derive_builder" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7" -dependencies = [ - "derive_builder_macro", -] - -[[package]] -name = "derive_builder_core" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" -dependencies = [ - "darling 0.20.9", - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "derive_builder_macro" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" -dependencies = [ - "derive_builder_core", - "syn 2.0.66", -] - -[[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", - "quote", - "rustc_version", - "syn 1.0.109", -] - -[[package]] -name = "derive_utils" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61bb5a1014ce6dfc2a378578509abe775a5aa06bff584a547555d9efdb81b926" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[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 = "dotenvy" -version = "0.15.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" - -[[package]] -name = "downcast-rs" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" - -[[package]] -name = "dtoa" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" - -[[package]] -name = "dtoa-short" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbaceec3c6e4211c79e7b1800fb9680527106beb2f9c51904a3210c03a448c74" -dependencies = [ - "dtoa", -] - -[[package]] -name = "either" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" -dependencies = [ - "serde", -] - -[[package]] -name = "email-encoding" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60d1d33cdaede7e24091f039632eb5d3c7469fe5b066a985281a34fc70fa317f" -dependencies = [ - "base64 0.22.1", - "memchr", -] - -[[package]] -name = "email_address" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2153bd83ebc09db15bcbdc3e2194d901804952e3dc96967e1cd3b0c5c32d112" - -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - -[[package]] -name = "encoder" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03f6928ad5c6efcdae42eb068dff8a555ef2f057c92bbd491ddf5610f6444987" -dependencies = [ - "encoder-ryu", - "indexmap 2.2.6", - "serde_json", - "simd-json", -] - -[[package]] -name = "encoder-ryu" -version = "1.0.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e27addc39f5f73c85604bfe21b59fe93717f9765194015d92bde1db11e8ccef" - -[[package]] -name = "encoding_rs" -version = "0.8.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "encoding_rs_io" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cc3c5651fb62ab8aa3103998dade57efdd028544bd300516baa31840c252a83" -dependencies = [ - "encoding_rs", -] - -[[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.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "etcetera" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" -dependencies = [ - "cfg-if", - "home", - "windows-sys 0.48.0", -] - -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[package]] -name = "eventsource-stream" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74fef4569247a5f429d9156b9d0a2599914385dd189c539334c625d8099d90ab" -dependencies = [ - "futures-core", - "nom", - "pin-project-lite", -] - -[[package]] -name = "eyre" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" -dependencies = [ - "indenter", - "once_cell", -] - -[[package]] -name = "fastdivide" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59668941c55e5c186b8b58c391629af56774ec768f73c08bbcd56f09348eb00b" - -[[package]] -name = "fastrand" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" - -[[package]] -name = "fid-rs" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c28658c0c3420305705adde833a0d2d614207507d013a5f25707553fb2ae2cd" -dependencies = [ - "rayon", -] - -[[package]] -name = "flate2" -version = "1.0.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" -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", - "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.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "fs4" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73969b81e8bc90a3828d913dd3973d80771bfb9d7fbe1a78a79122aad456af15" -dependencies = [ - "rustix", - "windows-sys 0.52.0", -] - -[[package]] -name = "fs_extra" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" - -[[package]] -name = "fslock" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04412b8935272e3a9bae6f48c7bfff74c2911f60525404edfdd28e49884c3bfb" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "futf" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" -dependencies = [ - "mac", - "new_debug_unreachable", -] - -[[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-intrusive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" -dependencies = [ - "futures-core", - "lock_api", - "parking_lot", -] - -[[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", - "quote", - "syn 2.0.66", -] - -[[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-timer" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" - -[[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 = "generator" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" -dependencies = [ - "cc", - "libc", - "log", - "rustversion", - "windows 0.48.0", -] - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "wasm-bindgen", -] - -[[package]] -name = "gimli" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" - -[[package]] -name = "git2" -version = "0.18.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "232e6a7bfe35766bf715e55a88b39a700596c0ccfd88cd3680b4cdb40d66ef70" -dependencies = [ - "bitflags 2.6.0", - "libc", - "libgit2-sys", - "log", - "openssl-probe", - "openssl-sys", - "url", -] - -[[package]] -name = "gitlab" -version = "0.1700.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65f36adc608cffeec1cc08ecf1977c038cbb1af9184b2174ca006ebeb817991c" -dependencies = [ - "async-trait", - "base64 0.22.1", - "bytes", - "chrono", - "cron", - "derive_builder", - "futures-util", - "graphql_client", - "http 1.1.0", - "itertools 0.12.1", - "log", - "percent-encoding", - "reqwest", - "serde", - "serde_json", - "serde_urlencoded", - "thiserror", - "url", -] - -[[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 = "graphql-introspection-query" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2a4732cf5140bd6c082434494f785a19cfb566ab07d1382c3671f5812fed6d" -dependencies = [ - "serde", -] - -[[package]] -name = "graphql-parser" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2ebc8013b4426d5b81a4364c419a95ed0b404af2b82e2457de52d9348f0e474" -dependencies = [ - "combine", - "thiserror", -] - -[[package]] -name = "graphql_client" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a50cfdc7f34b7f01909d55c2dcb71d4c13cbcbb4a1605d6c8bd760d654c1144b" -dependencies = [ - "graphql_query_derive", - "serde", - "serde_json", -] - -[[package]] -name = "graphql_client_codegen" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e27ed0c2cf0c0cc52c6bcf3b45c907f433015e580879d14005386251842fb0a" -dependencies = [ - "graphql-introspection-query", - "graphql-parser", - "heck 0.4.1", - "lazy_static", - "proc-macro2", - "quote", - "serde", - "serde_json", - "syn 1.0.109", -] - -[[package]] -name = "graphql_query_derive" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83febfa838f898cfa73dfaa7a8eb69ff3409021ac06ee94cfb3d622f6eeb1a97" -dependencies = [ - "graphql_client_codegen", - "proc-macro2", - "syn 1.0.109", -] - -[[package]] -name = "grep" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2b024ec1e686cb64d78beb852030b0e632af93817f1ed25be0173af0e94939" -dependencies = [ - "grep-cli", - "grep-matcher", - "grep-printer", - "grep-regex", - "grep-searcher", -] - -[[package]] -name = "grep-cli" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea40788c059ab8b622c4d074732750bfb3bd2912e2dd58eabc11798a4d5ad725" -dependencies = [ - "bstr", - "globset", - "libc", - "log", - "termcolor", - "winapi-util", -] - -[[package]] -name = "grep-matcher" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47a3141a10a43acfedc7c98a60a834d7ba00dfe7bec9071cbfc19b55b292ac02" -dependencies = [ - "memchr", -] - -[[package]] -name = "grep-printer" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "743c12a03c8aee38b6e5bd0168d8ebb09345751323df4a01c56e792b1f38ceb2" -dependencies = [ - "bstr", - "grep-matcher", - "grep-searcher", - "log", - "serde", - "serde_json", - "termcolor", -] - -[[package]] -name = "grep-regex" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f748bb135ca835da5cbc67ca0e6955f968db9c5df74ca4f56b18e1ddbc68230d" -dependencies = [ - "bstr", - "grep-matcher", - "log", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", -] - -[[package]] -name = "grep-searcher" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba536ae4f69bec62d8839584dd3153d3028ef31bb229f04e09fb5a9e5a193c54" -dependencies = [ - "bstr", - "encoding_rs", - "encoding_rs_io", - "grep-matcher", - "log", - "memchr", - "memmap2", -] - -[[package]] -name = "h2" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" -dependencies = [ - "atomic-waker", - "bytes", - "fnv", - "futures-core", - "futures-sink", - "http 1.1.0", - "indexmap 2.2.6", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "halfbrown" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8588661a8607108a5ca69cab034063441a0413a0b041c13618a7dd348021ef6f" -dependencies = [ - "hashbrown 0.14.5", - "serde", -] - -[[package]] -name = "hash-ids" -version = "0.23.1" - -[[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 = "hashlink" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" -dependencies = [ - "hashbrown 0.14.5", -] - -[[package]] -name = "headers" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322106e6bd0cba2d5ead589ddb8150a13d7c4217cf80d7c4f682ca994ccc6aa9" -dependencies = [ - "base64 0.21.7", - "bytes", - "headers-core", - "http 1.1.0", - "httpdate", - "mime", - "sha1", -] - -[[package]] -name = "headers-core" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54b4a22553d4242c49fddb9ba998a99962b5cc6f22cb5a3482bec22522403ce4" -dependencies = [ - "http 1.1.0", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" -dependencies = [ - "unicode-segmentation", -] - -[[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 = "hex" -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.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.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba" -dependencies = [ - "cfg-if", - "libc", - "windows 0.52.0", -] - -[[package]] -name = "htmd" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fff09744b11deed5946dd1b61c806bb9a94ded93cf28da819935599b69b987" -dependencies = [ - "html5ever 0.27.0", - "markup5ever_rcdom", -] - -[[package]] -name = "html5ever" -version = "0.25.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148" -dependencies = [ - "log", - "mac", - "markup5ever 0.10.1", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "html5ever" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c13771afe0e6e846f1e67d038d4cb29998a6779f93c809212e4e9c32efd244d4" -dependencies = [ - "log", - "mac", - "markup5ever 0.12.1", - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "htmlescape" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9025058dae765dee5070ec375f591e2ba14638c63feff74f13805a72e523163" - -[[package]] -name = "http" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" -dependencies = [ - "bytes", - "fnv", - "itoa 1.0.11", -] - -[[package]] -name = "http" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" -dependencies = [ - "bytes", - "fnv", - "itoa 1.0.11", -] - -[[package]] -name = "http-api-bindings" -version = "0.23.1" -dependencies = [ - "anyhow", - "async-openai", - "async-stream", - "async-trait", - "futures", - "leaky-bucket", - "ollama-api-bindings", - "reqwest", - "reqwest-eventsource", - "serde", - "serde_json", - "tabby-common", - "tabby-inference", - "tokio", - "tracing", -] - -[[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.12", - "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.1.0", -] - -[[package]] -name = "http-body-util" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" -dependencies = [ - "bytes", - "futures-core", - "http 1.1.0", - "http-body 1.0.0", - "pin-project-lite", -] - -[[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 = "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", - "http 0.2.12", - "http-body 0.4.6", - "httparse", - "httpdate", - "itoa 1.0.11", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "h2", - "http 1.1.0", - "http-body 1.0.0", - "httparse", - "httpdate", - "itoa 1.0.11", - "pin-project-lite", - "smallvec", - "tokio", - "want", -] - -[[package]] -name = "hyper-rustls" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" -dependencies = [ - "futures-util", - "http 1.1.0", - "hyper 1.3.1", - "hyper-util", - "rustls 0.22.4", - "rustls-pki-types", - "tokio", - "tokio-rustls 0.25.0", - "tower-service", -] - -[[package]] -name = "hyper-rustls" -version = "0.27.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" -dependencies = [ - "futures-util", - "http 1.1.0", - "hyper 1.3.1", - "hyper-util", - "log", - "rustls 0.23.20", - "rustls-native-certs 0.8.1", - "rustls-pki-types", - "tokio", - "tokio-rustls 0.26.1", - "tower-service", -] - -[[package]] -name = "hyper-timeout" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3203a961e5c83b6f5498933e78b6b263e208c197b63e9c6c53cc82ffd3f63793" -dependencies = [ - "hyper 1.3.1", - "hyper-util", - "pin-project-lite", - "tokio", - "tower-service", -] - -[[package]] -name = "hyper-tls" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" -dependencies = [ - "bytes", - "http-body-util", - "hyper 1.3.1", - "hyper-util", - "native-tls", - "tokio", - "tokio-native-tls", - "tower-service", -] - -[[package]] -name = "hyper-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "http 1.1.0", - "http-body 1.0.0", - "hyper 1.3.1", - "pin-project-lite", - "socket2", - "tokio", - "tower 0.4.13", - "tower-service", - "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.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 = "indenter" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" - -[[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", -] - -[[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", -] - -[[package]] -name = "insta" -version = "1.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "810ae6042d48e2c9e9215043563a58a80b877bc863228a74cf10c49d4620a6f5" -dependencies = [ - "console", - "lazy_static", - "linked-hash-map", - "pest", - "pest_derive", - "serde", - "similar", -] - -[[package]] -name = "instant" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "ipnet" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" - -[[package]] -name = "iri-string" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f5f6c2df22c009ac44f6f1499308e7a3ac7ba42cd2378475cc691510e1eef1b" -dependencies = [ - "memchr", - "serde", -] - -[[package]] -name = "is_terminal_polyfill" -version = "1.70.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" - -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" - -[[package]] -name = "itoa" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - -[[package]] -name = "jobserver" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" -dependencies = [ - "libc", -] - -[[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 = "jsonwebtoken" -version = "9.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ae10193d25051e74945f1ea2d0b42e03cc3b890f7e4cc5faa44997d808193f" -dependencies = [ - "base64 0.21.7", - "js-sys", - "pem", - "ring 0.17.8", - "serde", - "serde_json", - "simple_asn1", -] - -[[package]] -name = "juniper" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "943306315b1a7a03d27af9dfb0c288d9f4da8830c17df4bceb7d50a47da0982c" -dependencies = [ - "async-trait", - "auto_enums", - "chrono", - "fnv", - "futures", - "graphql-parser", - "indexmap 2.2.6", - "juniper_codegen", - "serde", - "smartstring", - "static_assertions", - "void", -] - -[[package]] -name = "juniper_axum" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f81e883bc6ffb2e5a3cc7276bfe9519c49108bdc1330d5aab1b79cb088f2f26" -dependencies = [ - "axum", - "bytes", - "futures", - "juniper", - "juniper_graphql_ws", - "serde", - "serde_json", -] - -[[package]] -name = "juniper_codegen" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "760dbe46660494d469023d661e8d268f413b2cb68c999975dcc237407096a693" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", - "url", -] - -[[package]] -name = "juniper_graphql_ws" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "709eb11c716072f5c9fcbfa705dd684bd3c070943102f9fc56ccb812a36ba017" -dependencies = [ - "juniper", - "juniper_subscriptions", - "serde", - "tokio", -] - -[[package]] -name = "juniper_subscriptions" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6208a839bd4ca2131924a238311d088d6604ea267c0917903392bad7b70a92c" -dependencies = [ - "futures", - "juniper", -] - -[[package]] -name = "kuchiki" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ea8e9c6e031377cff82ee3001dc8026cdf431ed4e2e6b51f98ab8c73484a358" -dependencies = [ - "cssparser", - "html5ever 0.25.2", - "matches", - "selectors", -] - -[[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 = "leaky-bucket" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a396bb213c2d09ed6c5495fd082c991b6ab39c9daf4fff59e6727f85c73e4c5" -dependencies = [ - "parking_lot", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "lettre" -version = "0.11.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a62049a808f1c4e2356a2a380bd5f2aca3b011b0b482cf3b914ba1731426969" -dependencies = [ - "async-trait", - "base64 0.22.1", - "chumsky", - "email-encoding", - "email_address", - "fastrand", - "futures-io", - "futures-util", - "hostname", - "httpdate", - "idna", - "mime", - "native-tls", - "nom", - "percent-encoding", - "quoted_printable", - "socket2", - "tokio", - "tokio-native-tls", - "url", -] - -[[package]] -name = "levenshtein_automata" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2cdeb66e45e9f36bfad5bbdb4d2384e70936afbee843c6f6543f0c551ebb25" - -[[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.169" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" - -[[package]] -name = "libgit2-sys" -version = "0.16.2+1.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8" -dependencies = [ - "cc", - "libc", - "libssh2-sys", - "libz-sys", - "openssl-sys", - "pkg-config", -] - -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] - -[[package]] -name = "libm" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" - -[[package]] -name = "libsqlite3-sys" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "libssh2-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee" -dependencies = [ - "cc", - "libc", - "libz-sys", - "openssl-sys", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "libz-sys" -version = "1.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e" -dependencies = [ - "cc", - "libc", - "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.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" - -[[package]] -name = "llama-cpp-server" -version = "0.23.1" -dependencies = [ - "anyhow", - "async-openai", - "async-trait", - "cmake", - "futures", - "http-api-bindings", - "omnicopy_to_output", - "reqwest", - "serde", - "serdeconv", - "tabby-common", - "tabby-inference", - "tokio", - "tracing", - "which", -] - -[[package]] -name = "lock_api" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" - -[[package]] -name = "logkit" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b517d00135d2ea552dc1f6cbc5da9d8953f895c91db680c288d53c50ca309767" -dependencies = [ - "backtrace", - "chrono", - "encoder", -] - -[[package]] -name = "loom" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" -dependencies = [ - "cfg-if", - "generator", - "pin-utils", - "scoped-tls", - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "louds-rs" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e16a91fb20f74b6d9a758a0103a2884af525a2fa34fbfe19f4b3c5482a4a54e9" -dependencies = [ - "fid-rs", -] - -[[package]] -name = "lru" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" -dependencies = [ - "hashbrown 0.14.5", -] - -[[package]] -name = "lz4_flex" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75761162ae2b0e580d7e7c390558127e5f01b4194debd6221fd8c207fc80e3f5" - -[[package]] -name = "mac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" - -[[package]] -name = "maplit" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" - -[[package]] -name = "markup5ever" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd" -dependencies = [ - "log", - "phf 0.8.0", - "phf_codegen 0.8.0", - "string_cache", - "string_cache_codegen", - "tendril", -] - -[[package]] -name = "markup5ever" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16ce3abbeba692c8b8441d036ef91aea6df8da2c6b6e21c7e14d3c18e526be45" -dependencies = [ - "log", - "phf 0.11.2", - "phf_codegen 0.11.2", - "string_cache", - "string_cache_codegen", - "tendril", -] - -[[package]] -name = "markup5ever_rcdom" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edaa21ab3701bfee5099ade5f7e1f84553fd19228cf332f13cd6e964bf59be18" -dependencies = [ - "html5ever 0.27.0", - "markup5ever 0.12.1", - "tendril", - "xml5ever", -] - -[[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.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" - -[[package]] -name = "md-5" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" -dependencies = [ - "cfg-if", - "digest", -] - -[[package]] -name = "measure_time" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbefd235b0aadd181626f281e1d684e116972988c14c264e42069d5e8a5775cc" -dependencies = [ - "instant", - "log", -] - -[[package]] -name = "memchr" -version = "2.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" - -[[package]] -name = "memmap2" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" -dependencies = [ - "libc", -] - -[[package]] -name = "metrics" -version = "0.22.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2be3cbd384d4e955b231c895ce10685e3d8260c5ccffae898c96c723b0772835" -dependencies = [ - "ahash", - "portable-atomic", -] - -[[package]] -name = "metrics-exporter-prometheus" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bf4e7146e30ad172c42c39b3246864bd2d3c6396780711a1baf749cfe423e21" -dependencies = [ - "base64 0.21.7", - "hyper 0.14.28", - "indexmap 2.2.6", - "ipnet", - "metrics", - "metrics-util", - "quanta", - "thiserror", - "tokio", -] - -[[package]] -name = "metrics-util" -version = "0.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b07a5eb561b8cbc16be2d216faf7757f9baf3bfb94dbb0fae3df8387a5bb47f" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", - "hashbrown 0.14.5", - "metrics", - "num_cpus", - "quanta", - "sketches-ddsketch", -] - -[[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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" -dependencies = [ - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", -] - -[[package]] -name = "murmurhash32" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2195bf6aa996a481483b29d62a7663eed3fe39600c460e323f8ff41e90bdd89b" - -[[package]] -name = "native-tls" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" -dependencies = [ - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework 2.11.0", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "netrc" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9a91b326434fca226707ed8ec1fd22d4e1c96801abdf10c412afdc7d97116e0" - -[[package]] -name = "new_debug_unreachable" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" - -[[package]] -name = "nodrop" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" - -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "ntapi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" -dependencies = [ - "winapi", -] - -[[package]] -name = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi", -] - -[[package]] -name = "nucleo" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5262af4c94921c2646c5ac6ff7900c2af9cbb08dc26a797e18130a7019c039d4" -dependencies = [ - "nucleo-matcher", - "parking_lot", - "rayon", -] - -[[package]] -name = "nucleo-matcher" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf33f538733d1a5a3494b836ba913207f14d9d4a1d3cd67030c5061bdd2cac85" -dependencies = [ - "memchr", - "unicode-segmentation", -] - -[[package]] -name = "num-bigint" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" -dependencies = [ - "num-integer", - "num-traits", -] - -[[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 0.8.5", - "smallvec", - "zeroize", -] - -[[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.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -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", - "libc", -] - -[[package]] -name = "num_threads" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" -dependencies = [ - "libc", -] - -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - -[[package]] -name = "nvml-wrapper" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cd21b9f5a1cce3c3515c9ffa85f5c7443e07162dae0ccf4339bb7ca38ad3454" -dependencies = [ - "bitflags 1.3.2", - "libloading", - "nvml-wrapper-sys", - "static_assertions", - "thiserror", - "wrapcenum-derive", -] - -[[package]] -name = "nvml-wrapper-sys" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c961a2ea9e91c59a69b78e69090f6f5b867bb46c0c56de9482da232437c4987e" -dependencies = [ - "libloading", -] - -[[package]] -name = "object" -version = "0.32.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" -dependencies = [ - "memchr", -] - -[[package]] -name = "octocrab" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b97f949a7cb04608441c2ddb28e15a377e8b5142c2d1835ad2686d434de8558" -dependencies = [ - "arc-swap", - "async-trait", - "base64 0.22.1", - "bytes", - "cfg-if", - "chrono", - "either", - "futures", - "futures-util", - "http 1.1.0", - "http-body 1.0.0", - "http-body-util", - "hyper 1.3.1", - "hyper-rustls 0.27.3", - "hyper-timeout", - "hyper-util", - "jsonwebtoken", - "once_cell", - "percent-encoding", - "pin-project", - "secrecy 0.10.3", - "serde", - "serde_json", - "serde_path_to_error", - "serde_urlencoded", - "snafu", - "tokio", - "tower 0.5.2", - "tower-http 0.6.2", - "tracing", - "url", - "web-time", -] - -[[package]] -name = "ollama-api-bindings" -version = "0.23.1" -dependencies = [ - "anyhow", - "async-stream", - "async-trait", - "futures", - "ollama-rs", - "tabby-common", - "tabby-inference", - "tracing", -] - -[[package]] -name = "ollama-rs" -version = "0.1.9" -source = "git+https://github.com/pepperoni21/ollama-rs.git?rev=56e8157d98d4185bc171fe9468d3d09bc56e9dd3#56e8157d98d4185bc171fe9468d3d09bc56e9dd3" -dependencies = [ - "reqwest", - "serde", - "serde_json", - "tokio", - "tokio-stream", - "url", -] - -[[package]] -name = "omnicopy_to_output" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10aff4d07c3656c416a997301d51ed83be62cbb256b421f86b014931217f2393" -dependencies = [ - "anyhow", - "build-target", - "fs_extra", - "project-root", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "oneshot" -version = "0.1.6" -source = "git+https://github.com/fulmicoton/oneshot.git?rev=b208f49#b208f493e505f5f37e180b5cdec4c22b6f99abaa" -dependencies = [ - "loom", -] - -[[package]] -name = "openssl" -version = "0.10.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" -dependencies = [ - "bitflags 2.6.0", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-src" -version = "300.3.0+3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eba8804a1c5765b18c4b3f907e6897ebabeedebc9830e1a0046c4a4cf44663e1" -dependencies = [ - "cc", -] - -[[package]] -name = "openssl-sys" -version = "0.9.102" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" -dependencies = [ - "cc", - "libc", - "openssl-src", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "opentelemetry" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d6c3d7288a106c0a363e4b0e8d308058d56902adefb16f4936f417ffef086e" -dependencies = [ - "opentelemetry_api", - "opentelemetry_sdk 0.18.0", -] - -[[package]] -name = "opentelemetry" -version = "0.27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab70038c28ed37b97d8ed414b6429d343a8bbf44c9f79ec854f3a643029ba6d7" -dependencies = [ - "futures-core", - "futures-sink", - "js-sys", - "pin-project-lite", - "thiserror", - "tracing", -] - -[[package]] -name = "opentelemetry-otlp" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91cf61a1868dacc576bf2b2a1c3e9ab150af7272909e80085c3173384fe11f76" -dependencies = [ - "async-trait", - "futures-core", - "http 1.1.0", - "opentelemetry 0.27.1", - "opentelemetry-proto", - "opentelemetry_sdk 0.27.1", - "prost", - "thiserror", - "tokio", - "tonic", - "tracing", -] - -[[package]] -name = "opentelemetry-proto" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6e05acbfada5ec79023c85368af14abd0b307c015e9064d249b2a950ef459a6" -dependencies = [ - "opentelemetry 0.27.1", - "opentelemetry_sdk 0.27.1", - "prost", - "tonic", -] - -[[package]] -name = "opentelemetry-semantic-conventions" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc1b6902ff63b32ef6c489e8048c5e253e2e4a803ea3ea7e783914536eb15c52" - -[[package]] -name = "opentelemetry_api" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c24f96e21e7acc813c7a8394ee94978929db2bcc46cf6b5014fc612bf7760c22" -dependencies = [ - "futures-channel", - "futures-util", - "indexmap 1.9.3", - "js-sys", - "once_cell", - "pin-project-lite", - "thiserror", -] - -[[package]] -name = "opentelemetry_sdk" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca41c4933371b61c2a2f214bf16931499af4ec90543604ec828f7a625c09113" -dependencies = [ - "async-trait", - "crossbeam-channel", - "futures-channel", - "futures-executor", - "futures-util", - "once_cell", - "opentelemetry_api", - "percent-encoding", - "rand 0.8.5", - "thiserror", -] - -[[package]] -name = "opentelemetry_sdk" -version = "0.27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "231e9d6ceef9b0b2546ddf52335785ce41252bc7474ee8ba05bfad277be13ab8" -dependencies = [ - "async-trait", - "futures-channel", - "futures-executor", - "futures-util", - "glob", - "opentelemetry 0.27.1", - "percent-encoding", - "rand 0.8.5", - "serde_json", - "thiserror", - "tokio", - "tokio-stream", -] - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[package]] -name = "ownedbytes" -version = "0.7.0" -source = "git+https://github.com/quickwit-oss/tantivy?rev=4143d31#4143d31865cbae9a9a7a286b0420a95814408ec7" -dependencies = [ - "stable_deref_trait", -] - -[[package]] -name = "owo-colors" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" - -[[package]] -name = "parking_lot" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.5.1", - "smallvec", - "windows-targets 0.52.5", -] - -[[package]] -name = "parse-git-url" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cd626725d3855a68fdede6483fae43429129bf246f42d8db598911c8036cf47" -dependencies = [ - "tracing", - "url", -] - -[[package]] -name = "password-hash" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" -dependencies = [ - "base64ct", - "rand_core 0.6.4", - "subtle", -] - -[[package]] -name = "paste" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" - -[[package]] -name = "pem" -version = "3.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae" -dependencies = [ - "base64 0.22.1", - "serde", -] - -[[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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "pest" -version = "2.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" -dependencies = [ - "memchr", - "thiserror", - "ucd-trie", -] - -[[package]] -name = "pest_derive" -version = "2.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459" -dependencies = [ - "pest", - "pest_generator", -] - -[[package]] -name = "pest_generator" -version = "2.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687" -dependencies = [ - "pest", - "pest_meta", - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "pest_meta" -version = "2.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd" -dependencies = [ - "once_cell", - "pest", - "sha2", -] - -[[package]] -name = "phf" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" -dependencies = [ - "phf_macros", - "phf_shared 0.8.0", - "proc-macro-hack", -] - -[[package]] -name = "phf" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" -dependencies = [ - "phf_shared 0.11.2", -] - -[[package]] -name = "phf_codegen" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" -dependencies = [ - "phf_generator 0.8.0", - "phf_shared 0.8.0", -] - -[[package]] -name = "phf_codegen" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" -dependencies = [ - "phf_generator 0.11.2", - "phf_shared 0.11.2", -] - -[[package]] -name = "phf_generator" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" -dependencies = [ - "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.5", -] - -[[package]] -name = "phf_generator" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" -dependencies = [ - "phf_shared 0.11.2", - "rand 0.8.5", -] - -[[package]] -name = "phf_macros" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c" -dependencies = [ - "phf_generator 0.8.0", - "phf_shared 0.8.0", - "proc-macro-hack", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "phf_shared" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" -dependencies = [ - "siphasher", -] - -[[package]] -name = "phf_shared" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" -dependencies = [ - "siphasher", -] - -[[package]] -name = "phf_shared" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" -dependencies = [ - "siphasher", -] - -[[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.66", -] - -[[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" -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 = "portable-atomic" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" - -[[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 = "precomputed-hash" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro-hack" -version = "0.5.20+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" - -[[package]] -name = "proc-macro2" -version = "1.0.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "project-root" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bccbff07d5ed689c4087d20d7307a52ab6141edeedf487c3876a55b86cf63df" - -[[package]] -name = "prost" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c0fef6c4230e4ccf618a35c59d7ede15dea37de8427500f50aff708806e42ec" -dependencies = [ - "bytes", - "prost-derive", -] - -[[package]] -name = "prost-derive" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "157c5a9d7ea5c2ed2d9fb8f495b64759f7816c7eaea54ba3978f0d63000162e3" -dependencies = [ - "anyhow", - "itertools 0.13.0", - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "psm" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" -dependencies = [ - "cc", -] - -[[package]] -name = "quanta" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5167a477619228a0b284fac2674e3c388cba90631d7b7de620e6f1fcd08da5" -dependencies = [ - "crossbeam-utils", - "libc", - "once_cell", - "raw-cpuid", - "wasi 0.11.0+wasi-snapshot-preview1", - "web-sys", - "winapi", -] - -[[package]] -name = "querystring" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9318ead08c799aad12a55a3e78b82e0b6167271ffd1f627b758891282f739187" - -[[package]] -name = "quote" -version = "1.0.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "quoted_printable" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79ec282e887b434b68c18fe5c121d38e72a5cf35119b59e54ec5b992ea9c8eb0" - -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", - "rand_pcg", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom 0.2.15", -] - -[[package]] -name = "rand_distr" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" -dependencies = [ - "num-traits", - "rand 0.8.5", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rand_pcg" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "ratelimit" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36ea961700fd7260e7fa3701c8287d901b2172c51f9c1421fa0f21d7f7e184b7" -dependencies = [ - "clocksource", - "parking_lot", - "thiserror", -] - -[[package]] -name = "raw-cpuid" -version = "11.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e29830cbb1290e404f24c73af91c5d8d631ce7e128691e9477556b540cd01ecd" -dependencies = [ - "bitflags 2.6.0", -] - -[[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 = "readable-readability" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17015928a25bff296b0471dfa7a784e406664e1d091781db66e885b18708a8d" -dependencies = [ - "html5ever 0.25.2", - "kuchiki", - "lazy_static", - "log", - "regex", - "url", -] - -[[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_syscall" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" -dependencies = [ - "bitflags 2.6.0", -] - -[[package]] -name = "ref-cast" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccf0a6f84d5f1d581da8b41b47ec8600871962f2a528115b542b362d4b744931" -dependencies = [ - "ref-cast-impl", -] - -[[package]] -name = "ref-cast-impl" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[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 = "reqwest" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" -dependencies = [ - "base64 0.22.1", - "bytes", - "encoding_rs", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http 1.1.0", - "http-body 1.0.0", - "http-body-util", - "hyper 1.3.1", - "hyper-rustls 0.26.0", - "hyper-tls", - "hyper-util", - "ipnet", - "js-sys", - "log", - "mime", - "mime_guess", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls 0.22.4", - "rustls-native-certs 0.7.0", - "rustls-pemfile", - "rustls-pki-types", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper 0.1.2", - "system-configuration", - "tokio", - "tokio-native-tls", - "tokio-rustls 0.25.0", - "tokio-util", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-streams", - "web-sys", - "webpki-roots", - "winreg", -] - -[[package]] -name = "reqwest-eventsource" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "632c55746dbb44275691640e7b40c907c16a2dc1a5842aa98aaec90da6ec6bde" -dependencies = [ - "eventsource-stream", - "futures-core", - "futures-timer", - "mime", - "nom", - "pin-project-lite", - "reqwest", - "thiserror", -] - -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted 0.7.1", - "web-sys", - "winapi", -] - -[[package]] -name = "ring" -version = "0.17.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" -dependencies = [ - "cc", - "cfg-if", - "getrandom 0.2.15", - "libc", - "spin 0.9.8", - "untrusted 0.9.0", - "windows-sys 0.52.0", -] - -[[package]] -name = "rmp" -version = "0.8.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" -dependencies = [ - "byteorder", - "num-traits", - "paste", -] - -[[package]] -name = "rmp-serde" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db" -dependencies = [ - "byteorder", - "rmp", - "serde", -] - -[[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 0.6.4", - "signature", - "spki", - "subtle", - "zeroize", -] - -[[package]] -name = "rust-embed" -version = "8.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19549741604902eb99a7ed0ee177a0663ee1eda51a29f71401f166e47e77806a" -dependencies = [ - "rust-embed-impl", - "rust-embed-utils", - "walkdir", -] - -[[package]] -name = "rust-embed-impl" -version = "8.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb9f96e283ec64401f30d3df8ee2aaeb2561f34c824381efa24a35f79bf40ee4" -dependencies = [ - "proc-macro2", - "quote", - "rust-embed-utils", - "syn 2.0.66", - "walkdir", -] - -[[package]] -name = "rust-embed-utils" -version = "8.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38c74a686185620830701348de757fd36bef4aa9680fd23c49fc539ddcc1af32" -dependencies = [ - "sha2", - "walkdir", -] - -[[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-demangle" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" - -[[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.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] -name = "rustix" -version = "0.38.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" -dependencies = [ - "bitflags 2.6.0", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustls" -version = "0.20.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" -dependencies = [ - "log", - "ring 0.16.20", - "sct", - "webpki", -] - -[[package]] -name = "rustls" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" -dependencies = [ - "log", - "ring 0.17.8", - "rustls-pki-types", - "rustls-webpki", - "subtle", - "zeroize", -] - -[[package]] -name = "rustls" -version = "0.23.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5065c3f250cbd332cd894be57c40fa52387247659b14a2d6041d121547903b1b" -dependencies = [ - "log", - "once_cell", - "ring 0.17.8", - "rustls-pki-types", - "rustls-webpki", - "subtle", - "zeroize", -] - -[[package]] -name = "rustls-native-certs" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" -dependencies = [ - "openssl-probe", - "rustls-pemfile", - "rustls-pki-types", - "schannel", - "security-framework 2.11.0", -] - -[[package]] -name = "rustls-native-certs" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcff2dd52b58a8d98a70243663a0d234c4e2b79235637849d15913394a247d3" -dependencies = [ - "openssl-probe", - "rustls-pki-types", - "schannel", - "security-framework 3.0.1", -] - -[[package]] -name = "rustls-pemfile" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" -dependencies = [ - "base64 0.22.1", - "rustls-pki-types", -] - -[[package]] -name = "rustls-pki-types" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" - -[[package]] -name = "rustls-webpki" -version = "0.102.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" -dependencies = [ - "ring 0.17.8", - "rustls-pki-types", - "untrusted 0.9.0", -] - -[[package]] -name = "rustversion" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" - -[[package]] -name = "ryu" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" - -[[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 = "scc" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76ad2bbb0ae5100a07b7a6f2ed7ab5fd0045551a4c507989b7a620046ea3efdc" -dependencies = [ - "sdd", -] - -[[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 = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", -] - -[[package]] -name = "sdd" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84345e4c9bd703274a082fb80caaa99b7612be48dfaa1dd9266577ec412309d" - -[[package]] -name = "secrecy" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bd1c54ea06cfd2f6b63219704de0b9b4f72dcc2b8fdef820be6cd799780e91e" -dependencies = [ - "serde", - "zeroize", -] - -[[package]] -name = "secrecy" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e891af845473308773346dc847b2c23ee78fe442e0472ac50e22a18a93d3ae5a" -dependencies = [ - "zeroize", -] - -[[package]] -name = "security-framework" -version = "2.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" -dependencies = [ - "bitflags 2.6.0", - "core-foundation 0.9.4", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1415a607e92bec364ea2cf9264646dcce0f91e6d65281bd6f2819cca3bf39c8" -dependencies = [ - "bitflags 2.6.0", - "core-foundation 0.10.0", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "selectors" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe" -dependencies = [ - "bitflags 1.3.2", - "cssparser", - "derive_more", - "fxhash", - "log", - "matches", - "phf 0.8.0", - "phf_codegen 0.8.0", - "precomputed-hash", - "servo_arc", - "smallvec", - "thin-slice", -] - -[[package]] -name = "semver" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" - -[[package]] -name = "serde" -version = "1.0.203" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde-jsonlines" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e228faf5f94badfe42723177b62cfb9b187351994cb4e852cd4a6a4c96dbeea8" -dependencies = [ - "serde", - "serde_json", -] - -[[package]] -name = "serde_derive" -version = "1.0.203" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "serde_json" -version = "1.0.117" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" -dependencies = [ - "itoa 1.0.11", - "ryu", - "serde", -] - -[[package]] -name = "serde_path_to_error" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" -dependencies = [ - "itoa 1.0.11", - "serde", -] - -[[package]] -name = "serde_spanned" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" -dependencies = [ - "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 1.0.11", - "ryu", - "serde", -] - -[[package]] -name = "serdeconv" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8897696def1d25e554294b168e0e8e77c860483666eeb8d3d33ae58b06f47221" -dependencies = [ - "rmp-serde", - "serde", - "serde_json", - "toml", - "trackable", -] - -[[package]] -name = "serial_test" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e56dd856803e253c8f298af3f4d7eb0ae5e23a737252cd90bb4f3b435033b2d" -dependencies = [ - "dashmap", - "futures", - "lazy_static", - "log", - "parking_lot", - "serial_test_derive 2.0.0", -] - -[[package]] -name = "serial_test" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b4b487fe2acf240a021cf57c6b2b4903b1e78ca0ecd862a71b71d2a51fed77d" -dependencies = [ - "fslock", - "futures", - "log", - "once_cell", - "parking_lot", - "scc", - "serial_test_derive 3.1.1", -] - -[[package]] -name = "serial_test_derive" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "serial_test_derive" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82fe9db325bcef1fbcde82e078a5cc4efdf787e96b3b9cf45b50b529f2083d67" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "servo_arc" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d98238b800e0d1576d8b6e3de32827c2d74bee68bb97748dcf5071fb53965432" -dependencies = [ - "nodrop", - "stable_deref_trait", -] - -[[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "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 = "signal-hook-registry" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" -dependencies = [ - "libc", -] - -[[package]] -name = "signature" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" -dependencies = [ - "digest", - "rand_core 0.6.4", -] - -[[package]] -name = "simd-json" -version = "0.13.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "570c430b3d902ea083097e853263ae782dfe40857d93db019a12356c8e8143fa" -dependencies = [ - "getrandom 0.2.15", - "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 = "similar" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640" - -[[package]] -name = "simple_asn1" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" -dependencies = [ - "num-bigint", - "num-traits", - "thiserror", - "time", -] - -[[package]] -name = "siphasher" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" - -[[package]] -name = "sketches-ddsketch" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85636c14b73d81f541e525f585c0a2109e6744e1565b5c1668e31c70c10ed65c" -dependencies = [ - "serde", -] - -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - -[[package]] -name = "smartstring" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29" -dependencies = [ - "autocfg", - "static_assertions", - "version_check", -] - -[[package]] -name = "snafu" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418b8136fec49956eba89be7da2847ec1909df92a9ae4178b5ff0ff092c8d95e" -dependencies = [ - "snafu-derive", -] - -[[package]] -name = "snafu-derive" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a4812a669da00d17d8266a0439eddcacbc88b17f732f927e52eeb9d196f7fb5" -dependencies = [ - "heck 0.5.0", - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "socket2" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[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 = "spinners" -version = "4.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0ef947f358b9c238923f764c72a4a9d42f2d637c46e059dbd319d6e7cfb4f82" -dependencies = [ - "lazy_static", - "maplit", - "strum 0.24.1", -] - -[[package]] -name = "spki" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" -dependencies = [ - "base64ct", - "der", -] - -[[package]] -name = "sql_query_builder" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a85dbaf3c8d08abe8a95a51860550236a07bd6fc097e2bff054ad8c2bf9a0df5" - -[[package]] -name = "sqlformat" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce81b7bd7c4493975347ef60d8c7e8b742d4694f4c49f93e0a12ea263938176c" -dependencies = [ - "itertools 0.12.1", - "nom", - "unicode_categories", -] - -[[package]] -name = "sqlx" -version = "0.7.4" -source = "git+https://github.com/wsxiaoys/sqlx?rev=8ca573c#8ca573cc0e323a637261a8f2cbc4a7c3c7b4e133" -dependencies = [ - "sqlx-core", - "sqlx-macros", - "sqlx-mysql", - "sqlx-postgres", - "sqlx-sqlite", -] - -[[package]] -name = "sqlx-core" -version = "0.7.4" -source = "git+https://github.com/wsxiaoys/sqlx?rev=8ca573c#8ca573cc0e323a637261a8f2cbc4a7c3c7b4e133" -dependencies = [ - "ahash", - "atoi", - "byteorder", - "bytes", - "chrono", - "crc", - "crossbeam-queue", - "either", - "event-listener", - "futures-channel", - "futures-core", - "futures-intrusive", - "futures-io", - "futures-util", - "hashlink", - "hex", - "indexmap 2.2.6", - "log", - "memchr", - "once_cell", - "paste", - "percent-encoding", - "serde", - "serde_json", - "sha2", - "smallvec", - "sqlformat", - "thiserror", - "tokio", - "tokio-stream", - "tracing", - "url", -] - -[[package]] -name = "sqlx-macros" -version = "0.7.4" -source = "git+https://github.com/wsxiaoys/sqlx?rev=8ca573c#8ca573cc0e323a637261a8f2cbc4a7c3c7b4e133" -dependencies = [ - "proc-macro2", - "quote", - "sqlx-core", - "sqlx-macros-core", - "syn 1.0.109", -] - -[[package]] -name = "sqlx-macros-core" -version = "0.7.4" -source = "git+https://github.com/wsxiaoys/sqlx?rev=8ca573c#8ca573cc0e323a637261a8f2cbc4a7c3c7b4e133" -dependencies = [ - "dotenvy", - "either", - "heck 0.4.1", - "hex", - "once_cell", - "proc-macro2", - "quote", - "serde", - "serde_json", - "sha2", - "sqlx-core", - "sqlx-mysql", - "sqlx-postgres", - "sqlx-sqlite", - "syn 1.0.109", - "tempfile", - "tokio", - "url", -] - -[[package]] -name = "sqlx-migrate-validate" -version = "0.23.1" -dependencies = [ - "anyhow", - "async-trait", - "sqlx", - "sqlx-rt", - "thiserror", - "tokio", -] - -[[package]] -name = "sqlx-mysql" -version = "0.7.4" -source = "git+https://github.com/wsxiaoys/sqlx?rev=8ca573c#8ca573cc0e323a637261a8f2cbc4a7c3c7b4e133" -dependencies = [ - "atoi", - "base64 0.21.7", - "bitflags 2.6.0", - "byteorder", - "bytes", - "chrono", - "crc", - "digest", - "dotenvy", - "either", - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "generic-array", - "hex", - "hkdf", - "hmac", - "itoa 1.0.11", - "log", - "md-5", - "memchr", - "once_cell", - "percent-encoding", - "rand 0.8.5", - "rsa", - "serde", - "sha1", - "sha2", - "smallvec", - "sqlx-core", - "stringprep", - "thiserror", - "tracing", - "whoami", -] - -[[package]] -name = "sqlx-postgres" -version = "0.7.4" -source = "git+https://github.com/wsxiaoys/sqlx?rev=8ca573c#8ca573cc0e323a637261a8f2cbc4a7c3c7b4e133" -dependencies = [ - "atoi", - "base64 0.21.7", - "bitflags 2.6.0", - "byteorder", - "chrono", - "crc", - "dotenvy", - "etcetera", - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "hex", - "hkdf", - "hmac", - "home", - "itoa 1.0.11", - "log", - "md-5", - "memchr", - "once_cell", - "rand 0.8.5", - "serde", - "serde_json", - "sha2", - "smallvec", - "sqlx-core", - "stringprep", - "thiserror", - "tracing", - "whoami", -] - -[[package]] -name = "sqlx-rt" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "804d3f245f894e61b1e6263c84b23ca675d96753b5abfd5cc8597d86806e8024" -dependencies = [ - "once_cell", - "tokio", - "tokio-rustls 0.23.4", -] - -[[package]] -name = "sqlx-sqlite" -version = "0.7.4" -source = "git+https://github.com/wsxiaoys/sqlx?rev=8ca573c#8ca573cc0e323a637261a8f2cbc4a7c3c7b4e133" -dependencies = [ - "atoi", - "chrono", - "flume", - "futures-channel", - "futures-core", - "futures-executor", - "futures-intrusive", - "futures-util", - "libsqlite3-sys", - "log", - "percent-encoding", - "serde", - "sqlx-core", - "tracing", - "url", - "urlencoding", -] - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "stacker" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" -dependencies = [ - "cc", - "cfg-if", - "libc", - "psm", - "winapi", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "strfmt" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a8348af2d9fc3258c8733b8d9d8db2e56f54b2363a4b5b81585c7875ed65e65" - -[[package]] -name = "string_cache" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" -dependencies = [ - "new_debug_unreachable", - "once_cell", - "parking_lot", - "phf_shared 0.10.0", - "precomputed-hash", - "serde", -] - -[[package]] -name = "string_cache_codegen" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", - "proc-macro2", - "quote", -] - -[[package]] -name = "stringprep" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1" -dependencies = [ - "unicode-bidi", - "unicode-normalization", - "unicode-properties", -] - -[[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.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" -dependencies = [ - "strum_macros 0.24.3", -] - -[[package]] -name = "strum" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" -dependencies = [ - "strum_macros 0.26.2", -] - -[[package]] -name = "strum_macros" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "rustversion", - "syn 1.0.109", -] - -[[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 2.0.66", -] - -[[package]] -name = "subtle" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - -[[package]] -name = "sync_wrapper" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" - -[[package]] -name = "sysinfo" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "948512566b1895f93b1592c7574baeb2de842f224f2aab158799ecadb8ebbb46" -dependencies = [ - "core-foundation-sys", - "libc", - "memchr", - "ntapi", - "rayon", - "windows 0.57.0", -] - -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation 0.9.4", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "tabby" -version = "0.23.1" -dependencies = [ - "anyhow", - "assert-json-diff", - "async-openai", - "async-stream", - "async-trait", - "axum", - "axum-extra", - "axum-prometheus", - "chrono", - "clap", - "color-eyre", - "futures", - "http-api-bindings", - "hyper 1.3.1", - "insta", - "lazy_static", - "llama-cpp-server", - "nvml-wrapper", - "openssl", - "opentelemetry 0.27.1", - "opentelemetry-otlp", - "opentelemetry-semantic-conventions", - "opentelemetry_sdk 0.27.1", - "regex", - "reqwest", - "reqwest-eventsource", - "serde", - "serde-jsonlines", - "serde_json", - "serdeconv", - "serial_test 3.1.1", - "spinners", - "strfmt", - "strum 0.24.1", - "sysinfo", - "tabby-common", - "tabby-download", - "tabby-inference", - "tabby-webserver", - "tantivy", - "thiserror", - "tokio", - "tower-http 0.5.2", - "tracing", - "tracing-opentelemetry 0.28.0", - "tracing-subscriber", - "utoipa", - "utoipa-swagger-ui", - "uuid", - "vergen", -] - -[[package]] -name = "tabby-common" -version = "0.23.1" -dependencies = [ - "anyhow", - "async-trait", - "axum", - "axum-extra", - "chrono", - "derive_builder", - "hash-ids", - "home", - "lazy_static", - "parse-git-url", - "reqwest", - "serde", - "serde_json", - "serdeconv", - "tantivy", - "temp_testdir", - "thiserror", - "tokio", - "tracing", - "url", - "utoipa", - "uuid", -] - -[[package]] -name = "tabby-crawler" -version = "0.23.1" -dependencies = [ - "anyhow", - "async-stream", - "futures", - "htmd", - "logkit", - "readable-readability", - "regex", - "serde", - "serde_json", - "tokio", - "tracing", - "tracing-test", - "url", -] - -[[package]] -name = "tabby-db" -version = "0.23.1" -dependencies = [ - "anyhow", - "assert_matches", - "cached", - "chrono", - "hash-ids", - "lazy_static", - "serde", - "sql_query_builder", - "sqlx", - "sqlx-migrate-validate", - "tabby-db-macros", - "tokio", - "uuid", -] - -[[package]] -name = "tabby-db-macros" -version = "0.23.1" -dependencies = [ - "quote", - "syn 2.0.66", -] - -[[package]] -name = "tabby-download" -version = "0.23.1" -dependencies = [ - "aim-downloader", - "anyhow", - "serial_test 3.1.1", - "tabby-common", - "tokio-retry", - "tracing", -] - -[[package]] -name = "tabby-git" -version = "0.23.1" -dependencies = [ - "anyhow", - "assert_matches", - "async-stream", - "axum", - "futures", - "git2", - "grep", - "ignore", - "mime_guess", - "nucleo", - "serde", - "serde_json", - "temp_testdir", - "tokio", - "tracing", -] - -[[package]] -name = "tabby-index" -version = "0.23.1" -dependencies = [ - "anyhow", - "async-stream", - "async-trait", - "chrono", - "futures", - "git2", - "ignore", - "insta", - "lazy_static", - "logkit", - "serde", - "serde_json", - "serial_test 3.1.1", - "tabby-common", - "tabby-inference", - "tantivy", - "temp_testdir", - "text-splitter", - "tokio", - "tracing", - "tracing-subscriber", - "tracing-test", - "tree-sitter-c", - "tree-sitter-c-sharp", - "tree-sitter-cpp", - "tree-sitter-elixir", - "tree-sitter-go", - "tree-sitter-java", - "tree-sitter-kotlin", - "tree-sitter-lua", - "tree-sitter-python", - "tree-sitter-ruby", - "tree-sitter-rust", - "tree-sitter-solidity", - "tree-sitter-tags", - "tree-sitter-typescript", -] - -[[package]] -name = "tabby-index-cli" -version = "0.23.1" -dependencies = [ - "anyhow", - "clap", - "serde", - "serde_json", - "tabby-common", - "tantivy", -] - -[[package]] -name = "tabby-inference" -version = "0.23.1" -dependencies = [ - "anyhow", - "async-openai", - "async-stream", - "async-trait", - "dashmap", - "derive_builder", - "futures", - "reqwest", - "secrecy 0.8.0", - "tabby-common", - "tracing", - "trie-rs", -] - -[[package]] -name = "tabby-schema" -version = "0.23.1" -dependencies = [ - "anyhow", - "async-openai", - "async-trait", - "axum", - "base64 0.22.1", - "chrono", - "futures", - "hash-ids", - "juniper", - "lazy_static", - "regex", - "serde", - "strum 0.24.1", - "tabby-common", - "tabby-db", - "tabby-inference", - "thiserror", - "tokio", - "tracing", - "url", - "validator", -] - -[[package]] -name = "tabby-webserver" -version = "0.23.1" -dependencies = [ - "anyhow", - "argon2", - "assert_matches", - "async-openai", - "async-stream", - "async-trait", - "axum", - "axum-extra", - "bincode", - "cached", - "chrono", - "cron", - "fs_extra", - "futures", - "gitlab", - "hyper 1.3.1", - "insta", - "jsonwebtoken", - "juniper", - "juniper_axum", - "juniper_graphql_ws", - "lazy_static", - "lettre", - "logkit", - "mime_guess", - "octocrab", - "pin-project", - "querystring", - "ratelimit", - "reqwest", - "rust-embed", - "serde", - "serde_json", - "serial_test 3.1.1", - "strum 0.24.1", - "tabby-common", - "tabby-crawler", - "tabby-db", - "tabby-git", - "tabby-index", - "tabby-inference", - "tabby-schema", - "tarpc", - "temp_testdir", - "thiserror", - "tokio", - "tokio-tungstenite", - "tracing", - "url", - "urlencoding", - "uuid", -] - -[[package]] -name = "tantivy" -version = "0.23.0" -source = "git+https://github.com/quickwit-oss/tantivy?rev=4143d31#4143d31865cbae9a9a7a286b0420a95814408ec7" -dependencies = [ - "aho-corasick", - "arc-swap", - "base64 0.22.1", - "bitpacking", - "byteorder", - "census", - "crc32fast", - "crossbeam-channel", - "downcast-rs", - "fastdivide", - "fnv", - "fs4", - "htmlescape", - "itertools 0.13.0", - "levenshtein_automata", - "log", - "lru", - "lz4_flex", - "measure_time", - "memmap2", - "once_cell", - "oneshot", - "rayon", - "regex", - "rust-stemmers", - "rustc-hash", - "serde", - "serde_json", - "sketches-ddsketch", - "smallvec", - "tantivy-bitpacker", - "tantivy-columnar", - "tantivy-common", - "tantivy-fst", - "tantivy-query-grammar", - "tantivy-stacker", - "tantivy-tokenizer-api", - "tempfile", - "thiserror", - "time", - "uuid", - "winapi", -] - -[[package]] -name = "tantivy-bitpacker" -version = "0.6.0" -source = "git+https://github.com/quickwit-oss/tantivy?rev=4143d31#4143d31865cbae9a9a7a286b0420a95814408ec7" -dependencies = [ - "bitpacking", -] - -[[package]] -name = "tantivy-columnar" -version = "0.3.0" -source = "git+https://github.com/quickwit-oss/tantivy?rev=4143d31#4143d31865cbae9a9a7a286b0420a95814408ec7" -dependencies = [ - "downcast-rs", - "fastdivide", - "itertools 0.13.0", - "serde", - "tantivy-bitpacker", - "tantivy-common", - "tantivy-sstable", - "tantivy-stacker", -] - -[[package]] -name = "tantivy-common" -version = "0.7.0" -source = "git+https://github.com/quickwit-oss/tantivy?rev=4143d31#4143d31865cbae9a9a7a286b0420a95814408ec7" -dependencies = [ - "async-trait", - "byteorder", - "ownedbytes", - "serde", - "time", -] - -[[package]] -name = "tantivy-fst" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d60769b80ad7953d8a7b2c70cdfe722bbcdcac6bccc8ac934c40c034d866fc18" -dependencies = [ - "byteorder", - "regex-syntax 0.8.3", - "utf8-ranges", -] - -[[package]] -name = "tantivy-query-grammar" -version = "0.22.0" -source = "git+https://github.com/quickwit-oss/tantivy?rev=4143d31#4143d31865cbae9a9a7a286b0420a95814408ec7" -dependencies = [ - "nom", -] - -[[package]] -name = "tantivy-sstable" -version = "0.3.0" -source = "git+https://github.com/quickwit-oss/tantivy?rev=4143d31#4143d31865cbae9a9a7a286b0420a95814408ec7" -dependencies = [ - "tantivy-bitpacker", - "tantivy-common", - "tantivy-fst", - "zstd", -] - -[[package]] -name = "tantivy-stacker" -version = "0.3.0" -source = "git+https://github.com/quickwit-oss/tantivy?rev=4143d31#4143d31865cbae9a9a7a286b0420a95814408ec7" -dependencies = [ - "murmurhash32", - "rand_distr", - "tantivy-common", -] - -[[package]] -name = "tantivy-tokenizer-api" -version = "0.3.0" -source = "git+https://github.com/quickwit-oss/tantivy?rev=4143d31#4143d31865cbae9a9a7a286b0420a95814408ec7" -dependencies = [ - "serde", -] - -[[package]] -name = "tarpc" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f41bce44d290df0598ae4b9cd6ea7f58f651fd3aa4af1b26060c4fa32b08af7" -dependencies = [ - "anyhow", - "fnv", - "futures", - "humantime", - "opentelemetry 0.18.0", - "pin-project", - "rand 0.8.5", - "serde", - "static_assertions", - "tarpc-plugins", - "thiserror", - "tokio", - "tokio-serde", - "tokio-util", - "tracing", - "tracing-opentelemetry 0.18.0", -] - -[[package]] -name = "tarpc-plugins" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ee42b4e559f17bce0385ebf511a7beb67d5cc33c12c96b7f4e9789919d9c10f" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "temp_testdir" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "921f1e9c427802414907a48b21a6504ff6b3a15a1a3cf37e699590949ad9befc" - -[[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 = "tendril" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" -dependencies = [ - "futf", - "mac", - "utf-8", -] - -[[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-splitter" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab9dc04b7cf08eb01c07c272bf699fa55679a326ddf7dd075e14094efc80fb9" -dependencies = [ - "ahash", - "auto_enums", - "either", - "itertools 0.13.0", - "once_cell", - "regex", - "strum 0.26.2", - "thiserror", - "tree-sitter", - "unicode-segmentation", -] - -[[package]] -name = "thin-slice" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" - -[[package]] -name = "thiserror" -version = "1.0.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[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 = "time" -version = "0.3.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" -dependencies = [ - "deranged", - "itoa 1.0.11", - "libc", - "num-conv", - "num_threads", - "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.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" -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 = "tokio" -version = "1.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" -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", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-retry" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f" -dependencies = [ - "pin-project", - "rand 0.8.5", - "tokio", -] - -[[package]] -name = "tokio-rustls" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" -dependencies = [ - "rustls 0.20.9", - "tokio", - "webpki", -] - -[[package]] -name = "tokio-rustls" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" -dependencies = [ - "rustls 0.22.4", - "rustls-pki-types", - "tokio", -] - -[[package]] -name = "tokio-rustls" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37" -dependencies = [ - "rustls 0.23.20", - "tokio", -] - -[[package]] -name = "tokio-serde" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "911a61637386b789af998ee23f50aa30d5fd7edcec8d6d3dedae5e5815205466" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project", -] - -[[package]] -name = "tokio-stream" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-tungstenite" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" -dependencies = [ - "futures-util", - "log", - "tokio", - "tungstenite", -] - -[[package]] -name = "tokio-util" -version = "0.7.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" -dependencies = [ - "bytes", - "futures-core", - "futures-io", - "futures-sink", - "futures-util", - "hashbrown 0.14.5", - "pin-project-lite", - "slab", - "tokio", -] - -[[package]] -name = "toml" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap 2.2.6", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "tonic" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52" -dependencies = [ - "async-stream", - "async-trait", - "axum", - "base64 0.22.1", - "bytes", - "h2", - "http 1.1.0", - "http-body 1.0.0", - "http-body-util", - "hyper 1.3.1", - "hyper-timeout", - "hyper-util", - "percent-encoding", - "pin-project", - "prost", - "socket2", - "tokio", - "tokio-stream", - "tower 0.4.13", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "indexmap 1.9.3", - "pin-project", - "pin-project-lite", - "rand 0.8.5", - "slab", - "tokio", - "tokio-util", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" -dependencies = [ - "futures-core", - "futures-util", - "pin-project-lite", - "sync_wrapper 1.0.1", - "tokio", - "tokio-util", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-http" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" -dependencies = [ - "bitflags 2.6.0", - "bytes", - "http 1.1.0", - "http-body 1.0.0", - "http-body-util", - "pin-project-lite", - "tokio", - "tower-layer", - "tower-service", -] - -[[package]] -name = "tower-http" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "403fa3b783d4b626a8ad51d766ab03cb6d2dbfc46b1c5d4448395e6628dc9697" -dependencies = [ - "bitflags 2.6.0", - "bytes", - "futures-util", - "http 1.1.0", - "http-body 1.0.0", - "iri-string", - "pin-project-lite", - "tower 0.5.2", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-layer" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" - -[[package]] -name = "tower-service" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" - -[[package]] -name = "tracing" -version = "0.1.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 2.0.66", -] - -[[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-error" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" -dependencies = [ - "tracing", - "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-opentelemetry" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21ebb87a95ea13271332df069020513ab70bdb5637ca42d6e492dc3bbbad48de" -dependencies = [ - "once_cell", - "opentelemetry 0.18.0", - "tracing", - "tracing-core", - "tracing-subscriber", -] - -[[package]] -name = "tracing-opentelemetry" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a971f6058498b5c0f1affa23e7ea202057a7301dbff68e968b2d578bcbd053" -dependencies = [ - "js-sys", - "once_cell", - "opentelemetry 0.27.1", - "opentelemetry_sdk 0.27.1", - "smallvec", - "tracing", - "tracing-core", - "tracing-log", - "tracing-subscriber", - "web-time", -] - -[[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 = "tracing-test" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a2c0ff408fe918a94c428a3f2ad04e4afd5c95bbc08fcf868eff750c15728a4" -dependencies = [ - "lazy_static", - "tracing-core", - "tracing-subscriber", - "tracing-test-macro", -] - -[[package]] -name = "tracing-test-macro" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258bc1c4f8e2e73a977812ab339d503e6feeb92700f6d07a6de4d321522d5c08" -dependencies = [ - "lazy_static", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "trackable" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15bd114abb99ef8cee977e517c8f37aee63f184f2d08e3e6ceca092373369ae" -dependencies = [ - "trackable_derive", -] - -[[package]] -name = "trackable_derive" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebeb235c5847e2f82cfe0f07eb971d1e5f6804b18dac2ae16349cc604380f82f" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] -name = "tree-sitter" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df7cc499ceadd4dcdf7ec6d4cbc34ece92c3fa07821e287aedecd4416c516dca" -dependencies = [ - "cc", - "regex", -] - -[[package]] -name = "tree-sitter-c" -version = "0.21.3" -source = "git+https://github.com/tree-sitter/tree-sitter-c/?rev=00ed08f#00ed08f1a6c18141bfd7a81638e4d239a0bb55cc" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-c-sharp" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff899037068a1ffbb891891b7e94db1400ddf12c3d934b85b8c9e30be5cd18da" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-cpp" -version = "0.22.1" -source = "git+https://github.com/tree-sitter/tree-sitter-cpp?rev=d29fbff#d29fbff09a8c9ff4f3074de2595dfca12cb33da9" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-elixir" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df94bf7f057768b1cab2ee1f14812ed4ae33f9e04d09254043eeaa797db4ef70" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-go" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55cb318be5ccf75f44e054acf6898a5c95d59b53443eed578e16be0cd7ec037f" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-java" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33bc21adf831a773c075d9d00107ab43965e6a6ea7607b47fd9ec6f3db4b481b" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-kotlin" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c88dfbb22333118a5d5c5c10b19f93d115a6fa3c8a69dd0e6a260a64f9f5a79b" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-lua" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9fe6fc87bd480e1943fc1fcb02453fb2da050e4e8ce0daa67d801544046856" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-python" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4066c6cf678f962f8c2c4561f205945c84834cce73d981e71392624fdc390a9" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-ruby" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0031f687c0772f2dad7b77104c43428611099a1804c81244ada21560f41f0b1" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-rust" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "277690f420bf90741dea984f3da038ace46c4fe6047cba57a66822226cde1c93" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-solidity" -version = "1.2.6" -source = "git+https://github.com/JoranHonig/tree-sitter-solidity?rev=0e86ae647bda22c9bee00ec59752df7b3d3b000b#0e86ae647bda22c9bee00ec59752df7b3d3b000b" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-tags" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34380416097ab36d1b4cd83f887d9e150ea4feaeb6ee9a5ecfe53d26839acc69" -dependencies = [ - "memchr", - "regex", - "thiserror", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-typescript" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f07523e51e3b88529360a89038c0cca7ee877db40a40141514eece8b4cddcbb4" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "trie-rs" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5096c019d49566aff57593a06e401c7f588da84e9a575d0ed2ac0913f51928c0" -dependencies = [ - "louds-rs", -] - -[[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.1.0", - "httparse", - "log", - "rand 0.8.5", - "sha1", - "thiserror", - "url", - "utf-8", -] - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "ucd-trie" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" - -[[package]] -name = "unicase" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check", -] - -[[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-normalization" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-properties" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" - -[[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.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" - -[[package]] -name = "unicode_categories" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" - -[[package]] -name = "unreachable" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56" -dependencies = [ - "void", -] - -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - -[[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 = "url-parse" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "865ece61c15cae30f180636ae551daa25c318c181938da07f3ab3ed06750bdd2" -dependencies = [ - "regex", -] - -[[package]] -name = "urlencoding" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" - -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - -[[package]] -name = "utf8-ranges" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcfc827f90e53a02eaef5e535ee14266c1d569214c6aa70133a624d8a3164ba" - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "utoipa" -version = "4.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5afb1a60e207dca502682537fefcfd9921e71d0b83e9576060f09abc6efab23" -dependencies = [ - "indexmap 2.2.6", - "serde", - "serde_json", - "utoipa-gen", -] - -[[package]] -name = "utoipa-gen" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bf0e16c02bc4bf5322ab65f10ab1149bdbcaa782cba66dc7057370a3f8190be" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "regex", - "syn 2.0.66", -] - -[[package]] -name = "utoipa-swagger-ui" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b39868d43c011961e04b41623e050aedf2cc93652562ff7935ce0f819aaf2da" -dependencies = [ - "axum", - "mime_guess", - "regex", - "rust-embed", - "serde", - "serde_json", - "utoipa", - "zip", -] - -[[package]] -name = "uuid" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" -dependencies = [ - "getrandom 0.2.15", - "rand 0.8.5", - "serde", - "uuid-macro-internal", -] - -[[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 2.0.66", -] - -[[package]] -name = "validator" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db79c75af171630a3148bd3e6d7c4f42b6a9a014c2945bc5ed0020cbb8d9478e" -dependencies = [ - "idna", - "once_cell", - "regex", - "serde", - "serde_derive", - "serde_json", - "url", - "validator_derive", -] - -[[package]] -name = "validator_derive" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55591299b7007f551ed1eb79a684af7672c19c3193fb9e0a31936987bb2438ec" -dependencies = [ - "darling 0.20.9", - "once_cell", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[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 1.0.11", - "ryu", -] - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "vergen" -version = "8.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e27d6bdd219887a9eadd19e1c34f32e47fa332301184935c6d9bca26f3cca525" -dependencies = [ - "anyhow", - "cfg-if", - "rustversion", - "time", -] - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "void" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" - -[[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 = "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.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasite" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" - -[[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 2.0.66", - "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 2.0.66", - "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-streams" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" -dependencies = [ - "futures-util", - "js-sys", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[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 = "web-time" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" -dependencies = [ - "js-sys", - "serde", - "wasm-bindgen", -] - -[[package]] -name = "webpki" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" -dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", -] - -[[package]] -name = "webpki-roots" -version = "0.26.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" -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 = "whoami" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" -dependencies = [ - "redox_syscall 0.4.1", - "wasite", -] - -[[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" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" -dependencies = [ - "windows-core 0.52.0", - "windows-targets 0.52.5", -] - -[[package]] -name = "windows" -version = "0.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143" -dependencies = [ - "windows-core 0.57.0", - "windows-targets 0.52.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.5", -] - -[[package]] -name = "windows-core" -version = "0.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" -dependencies = [ - "windows-implement", - "windows-interface", - "windows-result", - "windows-targets 0.52.5", -] - -[[package]] -name = "windows-implement" -version = "0.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "windows-interface" -version = "0.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "windows-result" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" -dependencies = [ - "windows-targets 0.52.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.5.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] - -[[package]] -name = "winreg" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "winsafe" -version = "0.0.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" - -[[package]] -name = "wrapcenum-derive" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76ff259533532054cfbaefb115c613203c73707017459206380f03b3b3f266e" -dependencies = [ - "darling 0.20.9", - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "xml5ever" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c376f76ed09df711203e20c3ef5ce556f0166fa03d39590016c0fd625437fad" -dependencies = [ - "log", - "mac", - "markup5ever 0.12.1", -] - -[[package]] -name = "zerocopy" -version = "0.7.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "zeroize" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" - -[[package]] -name = "zip" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" -dependencies = [ - "byteorder", - "crc32fast", - "crossbeam-utils", - "flate2", -] - -[[package]] -name = "zstd" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a" -dependencies = [ - "zstd-safe", -] - -[[package]] -name = "zstd-safe" -version = "7.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a" -dependencies = [ - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "2.0.10+zstd.1.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa" -dependencies = [ - "cc", - "pkg-config", -] diff --git a/pkgs/by-name/ta/tabby/package.nix b/pkgs/by-name/ta/tabby/package.nix index 223e779790eb..987d08c8efaa 100644 --- a/pkgs/by-name/ta/tabby/package.nix +++ b/pkgs/by-name/ta/tabby/package.nix @@ -10,6 +10,7 @@ openssl, pkg-config, protobuf, + cmake, llama-cpp, @@ -124,37 +125,18 @@ rustPlatform.buildRustPackage { fetchSubmodules = true; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "ollama-rs-0.1.9" = "sha256-d6sKUxc8VQbRkVqMOeNFqDdKesq5k32AQShK67y2ssg="; - "oneshot-0.1.6" = "sha256-PmYuHuNTqToMyMHPRFDUaHUvFkVftx9ZCOBwXj+4Hc4="; - "ownedbytes-0.7.0" = "sha256-p0+ohtW0VLmfDTZw/LfwX2gYfuYuoOBcE+JsguK7Wn8="; - "sqlx-0.7.4" = "sha256-tcISzoSfOZ0jjNgGpuPPxjMxmBUPw/5FVDoALZEAHKY="; - "tree-sitter-c-0.21.3" = "sha256-ucbHLS2xyGo1uyKZv/K1HNXuMo4GpTY327cgdVS9F3c="; - "tree-sitter-cpp-0.22.1" = "sha256-3akSuQltFMF6I32HwRU08+Hcl9ojxPGk2ZuOX3gAObw="; - "tree-sitter-solidity-1.2.6" = "sha256-S00hdzMoIccPYBEvE092/RIMnG8YEnDGk6GJhXlr4ng="; - }; - }; + useFetchCargoVendor = true; + cargoHash = "sha256-CTn/b42FI+Y6qy3MKVESIbIlsXmIkZBlxUXnRtHWZcc="; - # https://github.com/TabbyML/tabby/blob/v0.7.0/.github/workflows/release.yml#L39 - cargoBuildFlags = - [ - # Don't need to build llama-cpp-server (included in default build) - "--no-default-features" - "--features" - "ee" - "--package" - "tabby" - ] - ++ optionals enableRocm [ - "--features" - "rocm" - ] - ++ optionals enableCuda [ - "--features" - "cuda" - ]; + # Don't need to build llama-cpp-server (included in default build) + # We also don't add CUDA features here since we're using the overridden llama-cpp package + cargoBuildFlags = [ + "--no-default-features" + "--features" + "ee" + "--package" + "tabby" + ]; nativeInstallCheckInputs = [ versionCheckHook @@ -167,6 +149,7 @@ rustPlatform.buildRustPackage { git pkg-config protobuf + cmake ] ++ optionals enableCuda [ autoAddDriverRunpath @@ -199,13 +182,13 @@ rustPlatform.buildRustPackage { ]; }; - meta = with lib; { + meta = { homepage = "https://github.com/TabbyML/tabby"; changelog = "https://github.com/TabbyML/tabby/releases/tag/v${version}"; description = "Self-hosted AI coding assistant"; mainProgram = "tabby"; - license = licenses.asl20; - maintainers = [ maintainers.ghthor ]; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.ghthor ]; broken = stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isAarch64; }; } From de8b060c2c522026298808b490eb49c9cbb12c33 Mon Sep 17 00:00:00 2001 From: hot burger <33610620+hotburger@users.noreply.github.com> Date: Wed, 12 Feb 2025 18:04:47 -0800 Subject: [PATCH 2012/2168] nixos/conduwuit: block mistakenly allowed syscalls Copied directly from the upstream service file instead of doing any unnecessary translating. --- nixos/modules/services/matrix/conduwuit.nix | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/nixos/modules/services/matrix/conduwuit.nix b/nixos/modules/services/matrix/conduwuit.nix index e887c55f42e6..b4d9fdd1c95e 100644 --- a/nixos/modules/services/matrix/conduwuit.nix +++ b/nixos/modules/services/matrix/conduwuit.nix @@ -246,22 +246,8 @@ in RestrictRealtime = true; SystemCallArchitectures = "native"; SystemCallFilter = [ - "@system-service" - "@resources" - "~@clock" - "@debug" - "@module" - "@mount" - "@reboot" - "@swap" - "@cpu-emulation" - "@obsolete" - "@timer" - "@chown" - "@setuid" - "@privileged" - "@keyring" - "@ipc" + "@system-service @resources" + "~@clock @debug @module @mount @reboot @swap @cpu-emulation @obsolete @timer @chown @setuid @privileged @keyring @ipc" ]; SystemCallErrorNumber = "EPERM"; From e8832afeb3c33557d5db59a11eed3e41909b1732 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Wed, 12 Feb 2025 20:23:23 -0500 Subject: [PATCH 2013/2168] scry: drop --- pkgs/development/tools/scry/default.nix | 55 ------------------------- pkgs/development/tools/scry/shards.nix | 14 ------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 1 insertion(+), 71 deletions(-) delete mode 100644 pkgs/development/tools/scry/default.nix delete mode 100644 pkgs/development/tools/scry/shards.nix diff --git a/pkgs/development/tools/scry/default.nix b/pkgs/development/tools/scry/default.nix deleted file mode 100644 index e1982a96df90..000000000000 --- a/pkgs/development/tools/scry/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - lib, - fetchFromGitHub, - crystal, - coreutils, - makeWrapper, - bash, -}: - -crystal.buildCrystalPackage rec { - pname = "scry"; - version = "0.9.1"; - - src = fetchFromGitHub { - owner = "crystal-lang-tools"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-hqyG1aKY3M8q8lZEKzpUUKl9jS7NF+VMsma6+C0sCbg="; - }; - - # a bunch of tests fail when built in the sandbox while perfectly fine outside - postPatch = '' - rm spec/scry/{client,completion_provider,context,executable}_spec.cr - ''; - - format = "shards"; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ bash ]; - - shardsFile = ./shards.nix; - - postFixup = '' - wrapProgram $out/bin/scry \ - --prefix PATH : ${ - lib.makeBinPath [ - crystal - coreutils - ] - } - ''; - - # the binary doesn't take any arguments, so this will hang - doInstallCheck = false; - - meta = with lib; { - description = "Code analysis server for the Crystal programming language"; - homepage = "https://github.com/crystal-lang-tools/scry"; - license = licenses.mit; - maintainers = with maintainers; [ - peterhoeg - Br1ght0ne - ]; - }; -} diff --git a/pkgs/development/tools/scry/shards.nix b/pkgs/development/tools/scry/shards.nix deleted file mode 100644 index df3d0848471a..000000000000 --- a/pkgs/development/tools/scry/shards.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - json_mapping = { - owner = "crystal-lang"; - repo = "json_mapping.cr"; - rev = "v0.1.0"; - sha256 = "1qq5vs2085x7cwmp96rrjns0yz9kiz1lycxynfbz5psxll6b8p55"; - }; - lsp = { - owner = "crystal-lang-tools"; - repo = "lsp"; - rev = "v0.2.0"; - sha256 = "1lnviqrywh0w05mx67mzw7d1qz328p52z4k69pcqw66gs44i7b5c"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 006911d444a7..c5cb1be5ddf5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1261,6 +1261,7 @@ mapAliases { schildichat-desktop = schildichat-web; schildichat-desktop-wayland = schildichat-web; scitoken-cpp = scitokens-cpp; # Added 2024-02-12 + scry = "'scry' has been removed as it was archived upstream. Use 'crystalline' instead"; # Added 2025-02-12 semeru-bin-16 = throw "Semeru 16 has been removed as it has reached its end of life"; # Added 2024-08-01 semeru-jre-bin-16 = throw "Semeru 16 has been removed as it has reached its end of life"; # Added 2024-08-01 sensu = throw "sensu has been removed as the upstream project is deprecated. Consider using `sensu-go`"; # Added 2024-10-28 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 44dd93183688..bf6aea87e193 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5760,8 +5760,6 @@ with pkgs; llvmPackages = crystal.llvmPackages; }; - scry = callPackage ../development/tools/scry { crystal = crystal_1_2; }; - devpi-client = python3Packages.callPackage ../development/tools/devpi-client { }; devpi-server = python3Packages.callPackage ../development/tools/devpi-server { }; From d5b260a837ba7ae84e76a5f9b5a02997da11d2e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 17:43:23 +0000 Subject: [PATCH 2014/2168] netatalk: 4.1.1 -> 4.1.2 --- pkgs/by-name/ne/netatalk/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/netatalk/package.nix b/pkgs/by-name/ne/netatalk/package.nix index d39fb5fe6810..9832c80527c5 100644 --- a/pkgs/by-name/ne/netatalk/package.nix +++ b/pkgs/by-name/ne/netatalk/package.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "netatalk"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { url = "mirror://sourceforge/netatalk/netatalk/netatalk-${finalAttrs.version}.tar.xz"; - hash = "sha256-LI0xIkWzmotzSsmo60URC8A94wiJKOV0MQqZDTuAAkE="; + hash = "sha256-qCX2/37+2wm7nKdXJ6tDEmeXAA+Jd123LI2VIL9IHpw="; }; nativeBuildInputs = [ From 140858cd719da8b0725ce8a5ff5904c5d342e0a5 Mon Sep 17 00:00:00 2001 From: Nadir Ishiguro <23151917+nadir-ishiguro@users.noreply.github.com> Date: Fri, 14 Feb 2025 15:32:18 +0100 Subject: [PATCH 2015/2168] fractal: 10 -> 10.1 --- pkgs/by-name/fr/fractal/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fr/fractal/package.nix b/pkgs/by-name/fr/fractal/package.nix index 91a0bebe73e5..5f5def674258 100644 --- a/pkgs/by-name/fr/fractal/package.nix +++ b/pkgs/by-name/fr/fractal/package.nix @@ -30,19 +30,19 @@ stdenv.mkDerivation rec { pname = "fractal"; - version = "10"; + version = "10.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "fractal"; tag = version; - hash = "sha256-dXmdoEBvHhOoICIDCpi2JTPo7j/kQzlv+Q/S/7LNyv0="; + hash = "sha256-61xiHVzmLMbLNZlobH6JVcvuO9eoFwqBZBo1rVtPYOc="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-qRxJvlorS5S3Wj3HjfvvR2nM/ZWzefz4x791UeSXm0w="; + hash = "sha256-e3IW8D4aLU6d36ErUHDUDiXF1lN4HCn5OCX6GwaT3iQ="; }; # Dirty approach to add patches after cargoSetupPostUnpackHook From 7a0aff7a8a05caa18d7373a9b42634a5c892e402 Mon Sep 17 00:00:00 2001 From: bandithedoge Date: Fri, 14 Feb 2025 18:58:57 +0100 Subject: [PATCH 2016/2168] oxlint: build oxc_language_server binary --- pkgs/by-name/ox/oxlint/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ox/oxlint/package.nix b/pkgs/by-name/ox/oxlint/package.nix index b5ef568ecff4..bc05238d8f0b 100644 --- a/pkgs/by-name/ox/oxlint/package.nix +++ b/pkgs/by-name/ox/oxlint/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { env.OXC_VERSION = version; - cargoBuildFlags = [ "--bin=oxlint" ]; + cargoBuildFlags = [ "--bin=oxlint" "--bin=oxc_language_server" ]; cargoTestFlags = cargoBuildFlags; meta = with lib; { From 9634bf5216c29531b9e85a4504a9108f0b440e70 Mon Sep 17 00:00:00 2001 From: Jonas Rembser Date: Fri, 14 Feb 2025 19:01:22 +0100 Subject: [PATCH 2017/2168] xrootd: disable features requiring isa-l if not available Follows up on d230a4e059c38b05dc4, which disable isa-l for a specific platform (aarch64-darwin). This makes xrootd and dependent packages like ROOT build again on Apple silicon. --- pkgs/by-name/xr/xrootd/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/xr/xrootd/package.nix b/pkgs/by-name/xr/xrootd/package.nix index 80ebf42778d5..b36594aac04e 100644 --- a/pkgs/by-name/xr/xrootd/package.nix +++ b/pkgs/by-name/xr/xrootd/package.nix @@ -68,7 +68,6 @@ stdenv.mkDerivation (finalAttrs: { [ davix curl - isa-l libkrb5 libuuid libxcrypt @@ -83,6 +82,7 @@ stdenv.mkDerivation (finalAttrs: { fuse ] ++ lib.filter (lib.meta.availableOn stdenv.hostPlatform) [ + isa-l # not available on Apple silicon systemd # only available on specific non-static Linux platforms voms # only available on Linux due to gsoap failing to build on Darwin ]; @@ -122,6 +122,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "ENABLE_SCITOKENS" true) (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck) (lib.cmakeBool "ENABLE_VOMS" stdenv.hostPlatform.isLinux) + (lib.cmakeBool "ENABLE_XRDEC" (lib.meta.availableOn stdenv.hostPlatform isa-l)) # requires isa-l ]; # TODO(@ShamrockLee): Enable the checks. From b60e5490ec9de74024535fddcc4bf0517e319bf0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 18:17:05 +0000 Subject: [PATCH 2018/2168] bosh-cli: 7.8.6 -> 7.9.2 --- pkgs/by-name/bo/bosh-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bo/bosh-cli/package.nix b/pkgs/by-name/bo/bosh-cli/package.nix index b5ec1b059286..72e2fcd5cc79 100644 --- a/pkgs/by-name/bo/bosh-cli/package.nix +++ b/pkgs/by-name/bo/bosh-cli/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "bosh-cli"; - version = "7.8.6"; + version = "7.9.2"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rrYB8W1Zq9rCRgVyAPFZ5i37uEKXvV83hpkLaB7N9zQ="; + sha256 = "sha256-+t1gJJMp2x+V5Wrbt/HnygFa1LlDQWB1NPTKi399HhA="; }; vendorHash = null; From d59655560f925fd983ae1f83e68d43c6817a51db Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Fri, 14 Feb 2025 13:22:06 -0500 Subject: [PATCH 2019/2168] zed-editor: 0.173.8 -> 0.173.9 --- pkgs/by-name/ze/zed-editor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 8f91dab205a0..07cee8c62c41 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -96,7 +96,7 @@ let in rustPlatform.buildRustPackage rec { pname = "zed-editor"; - version = "0.173.8"; + version = "0.173.9"; outputs = [ "out" ] ++ lib.optional buildRemoteServer "remote_server"; @@ -104,7 +104,7 @@ rustPlatform.buildRustPackage rec { owner = "zed-industries"; repo = "zed"; tag = "v${version}"; - hash = "sha256-xAmPfCRzgsH5305GTJj9000Jd8AQVyFzI3jVAcTGfYo="; + hash = "sha256-zCzMjULJLZCoi2v8eJHWDkUM3I8me/AQrkuT41SdaUU="; }; patches = [ @@ -124,7 +124,7 @@ rustPlatform.buildRustPackage rec { ''; useFetchCargoVendor = true; - cargoHash = "sha256-4MIfIU4z/Ot6XczmnCXKhE+DiR4vSguStgZLImXQ6Cg="; + cargoHash = "sha256-TJiXWHhKmY2z6Mk2xOfMfGIUnqr1sbf/6HB5Gn1kitg="; nativeBuildInputs = [ From fefeb81dd41f0b12975bd5f5f5d298b4f6221128 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 18:40:55 +0000 Subject: [PATCH 2020/2168] python312Packages.google-cloud-dataproc: 5.16.0 -> 5.17.0 --- .../python-modules/google-cloud-dataproc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix index 039d89b18faa..e5e343f3e4fb 100644 --- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "5.16.0"; + version = "5.17.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_dataproc"; inherit version; - hash = "sha256-I7LYrk9kjgG2b+0KvqEUtgDTNj2VW4VYx2Rak/KNbjw="; + hash = "sha256-2CLpaitrhHOSL+5DLiHc81312qEs4v2JXwWWospGBEA="; }; build-system = [ setuptools ]; From 4252194be61c4e2249f5b7590f148fc341286160 Mon Sep 17 00:00:00 2001 From: drainpixie <121581793+drainpixie@users.noreply.github.com> Date: Fri, 14 Feb 2025 19:43:18 +0100 Subject: [PATCH 2021/2168] proselint: 0.13.0 -> 0.14.0 (#381194) * proselint: 0.13.0 -> 0.14.0 * fix: omitted lib from replaceStrings * chore: format --- pkgs/tools/text/proselint/default.nix | 27 +++++++++++++++------------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/text/proselint/default.nix b/pkgs/tools/text/proselint/default.nix index a5bb06bc5b75..f78e46f6a2b0 100644 --- a/pkgs/tools/text/proselint/default.nix +++ b/pkgs/tools/text/proselint/default.nix @@ -1,33 +1,36 @@ { lib, + python3Packages, fetchurl, buildPythonApplication, click, - future, - six, }: - buildPythonApplication rec { pname = "proselint"; - version = "0.13.0"; + version = "0.14.0"; doCheck = false; # fails to pass because it tries to run in home directory + format = "pyproject"; src = fetchurl { url = "mirror://pypi/p/proselint/${pname}-${version}.tar.gz"; - sha256 = "7dd2b63cc2aa390877c4144fcd3c80706817e860b017f04882fbcd2ab0852a58"; + sha256 = "YklkJyvqFHZ+XfJWHYfdMHZ5OMjLUvsjWFvDdYBoDoY="; }; - propagatedBuildInputs = [ - click - future - six - ]; + nativeBuildInputs = [ python3Packages.poetry-core ]; + propagatedBuildInputs = [ click ]; meta = with lib; { - description = "Linter for prose"; + description = "A linter for prose."; mainProgram = "proselint"; - homepage = "http://proselint.com"; + + homepage = "https://github.com/amperser/proselint"; + changelog = "https://github.com/amperser/proselint/blob/main/CHANGELOG.md#proselint${ + lib.replaceStrings [ "." ] [ "" ] version + }"; + + downloadPage = "https://pypi.org/project/proselint/${version}/#files"; + license = licenses.bsd3; maintainers = [ ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf6aea87e193..111a1449b895 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10283,7 +10283,7 @@ with pkgs; proselint = callPackage ../tools/text/proselint { inherit (python3Packages) - buildPythonApplication click future six; + buildPythonApplication click; }; prospector = callPackage ../development/tools/prospector { }; From 8554543f4a80110a0d838a96c7846fd3545c2e91 Mon Sep 17 00:00:00 2001 From: amesgen Date: Fri, 14 Feb 2025 19:49:10 +0100 Subject: [PATCH 2022/2168] bazecor: 1.6.3 -> 1.6.4 --- pkgs/by-name/ba/bazecor/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ba/bazecor/package.nix b/pkgs/by-name/ba/bazecor/package.nix index 4bc884dd98a7..f1bfe96ef1d8 100644 --- a/pkgs/by-name/ba/bazecor/package.nix +++ b/pkgs/by-name/ba/bazecor/package.nix @@ -6,12 +6,12 @@ }: let pname = "bazecor"; - version = "1.6.3"; + version = "1.6.4"; src = appimageTools.extract { inherit pname version; src = fetchurl { url = "https://github.com/Dygmalab/Bazecor/releases/download/v${version}/Bazecor-${version}-x64.AppImage"; - hash = "sha256-wlPuQGfMq3rHWHMZ30xm5MGWu/ddnajz7GM3QUSrZPo="; + hash = "sha256-S0fJNkDDZAssum7wDDxHkzH9WZcGSEX05nl3S/DOH14="; }; # Workaround for https://github.com/Dygmalab/Bazecor/issues/370 From ecd8ad91c25ff26a2af0383fa74d5f3e66112c6f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 19:08:11 +0000 Subject: [PATCH 2023/2168] dotnet-ef: 9.0.1 -> 9.0.2 --- pkgs/by-name/do/dotnet-ef/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/do/dotnet-ef/package.nix b/pkgs/by-name/do/dotnet-ef/package.nix index d6db19a3c784..07584ad7db11 100644 --- a/pkgs/by-name/do/dotnet-ef/package.nix +++ b/pkgs/by-name/do/dotnet-ef/package.nix @@ -2,9 +2,9 @@ buildDotnetGlobalTool { pname = "dotnet-ef"; - version = "9.0.1"; + version = "9.0.2"; - nugetHash = "sha256-b1dxnBDnsn4kWvcy95eQj3qrL4ucAqw/pXvU3aFpPk8="; + nugetHash = "sha256-aevR1w8IDXrRLnrR5ax2BaAjGpjOWuBKJ9TzI43p7mc="; meta = { description = "The Entity Framework Core tools help with design-time development tasks."; From 584bfab2efbe16240298e8d29fc5f4076690b8a5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 19:08:21 +0000 Subject: [PATCH 2024/2168] phpExtensions.openswoole: 22.1.2 -> 25.2.0 --- pkgs/development/php-packages/openswoole/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/openswoole/default.nix b/pkgs/development/php-packages/openswoole/default.nix index 0a56b3f0e774..c7b8b5e2a94d 100644 --- a/pkgs/development/php-packages/openswoole/default.nix +++ b/pkgs/development/php-packages/openswoole/default.nix @@ -9,7 +9,7 @@ }: let - version = "22.1.2"; + version = "25.2.0"; in buildPecl { inherit version; @@ -19,7 +19,7 @@ buildPecl { owner = "openswoole"; repo = "swoole-src"; rev = "v${version}"; - hash = "sha256-Z26E1PdKypB/MImCHFgA3rJW5LvVaLZsQUxRv0RcFuo="; + hash = "sha256-1Bq/relLhjPRROikpCzSzzrelxW3AiMA5G17Ln2lg34="; }; buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ valgrind ]; From fc8665b70f0246039f707a4d756a1bc88ec80d07 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 19:20:01 +0000 Subject: [PATCH 2025/2168] phpPackages.phpstan: 2.1.2 -> 2.1.5 --- pkgs/development/php-packages/phpstan/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index 63ff80082b05..5fc971fe3d90 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -6,16 +6,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "phpstan"; - version = "2.1.2"; + version = "2.1.5"; src = fetchFromGitHub { owner = "phpstan"; repo = "phpstan-src"; tag = finalAttrs.version; - hash = "sha256-Wh0dBO5tokAJXxndL5QsgWUiYh0cE4B4EDmHKGC6uFk="; + hash = "sha256-mhptuyX3tp0ABo8MEp+jL+P7jV6BiQhNPaxVlWggfjs="; }; - vendorHash = "sha256-rkrJ36jugPyZ0v92bPSm4/77POLGqncOGo1PBQQdsds="; + vendorHash = "sha256-WILu0qPmN4O6qiu9CF1R6Y2N8fNbdqWBbbS6lwdzo7k="; composerStrictValidation = false; meta = { From f10bc7af57a0142a6ed8d737056bf3038286bb70 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 19:35:21 +0000 Subject: [PATCH 2026/2168] phpExtensions.swoole: 6.0.0 -> 6.0.1 --- pkgs/development/php-packages/swoole/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/swoole/default.nix b/pkgs/development/php-packages/swoole/default.nix index b821906095c7..2ecf5bde03e2 100644 --- a/pkgs/development/php-packages/swoole/default.nix +++ b/pkgs/development/php-packages/swoole/default.nix @@ -9,7 +9,7 @@ }: let - version = "6.0.0"; + version = "6.0.1"; in buildPecl { inherit version; @@ -19,7 +19,7 @@ buildPecl { owner = "swoole"; repo = "swoole-src"; rev = "v${version}"; - hash = "sha256-h49TMwtEaaRfQO69Z9sAPsCqLYt/w/6Vx9ZVBajAU5U="; + hash = "sha256-WeTl+/OVcXFl39qfYoYRk2MQ7PYKlbjHxddp/kFov6g="; }; buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ valgrind ]; From 6fc6d7e8ed57bd9df9390846b6e0c38e7e5c6fc8 Mon Sep 17 00:00:00 2001 From: Alexis Praga Date: Sun, 9 Feb 2025 19:43:31 +0100 Subject: [PATCH 2027/2168] bwa-mem2: fix compilation isssue On latest unstable, there are several implicit function declaration. in safestrlib, which was not a seperate package but simply a submodule. It is now a separate package (see previous commit) and using latest unstable for this libary fixes the issue. --- pkgs/by-name/bw/bwa-mem2/no-submodule.patch | 42 +++++++++++++++++ pkgs/by-name/bw/bwa-mem2/package.nix | 52 +++++++++++++++------ 2 files changed, 79 insertions(+), 15 deletions(-) create mode 100644 pkgs/by-name/bw/bwa-mem2/no-submodule.patch diff --git a/pkgs/by-name/bw/bwa-mem2/no-submodule.patch b/pkgs/by-name/bw/bwa-mem2/no-submodule.patch new file mode 100644 index 000000000000..07785cb89edc --- /dev/null +++ b/pkgs/by-name/bw/bwa-mem2/no-submodule.patch @@ -0,0 +1,42 @@ +diff --git a/Makefile b/Makefile +index 359585f..13ec279 100644 +--- a/Makefile ++++ b/Makefile +@@ -49,7 +49,6 @@ OBJS= src/fastmap.o src/bwtindex.o src/utils.o src/memcpy_bwamem.o src/kthread. + src/FMI_search.o src/read_index_ele.o src/bwamem_pair.o src/kswv.o src/bwa.o \ + src/bwamem_extra.o src/kopen.o + BWA_LIB= libbwa.a +-SAFE_STR_LIB= ext/safestringlib/libsafestring.a + + ifeq ($(arch),sse41) + ifeq ($(CXX), icpc) +@@ -101,16 +100,6 @@ CXXFLAGS+= -g -O3 -fpermissive $(ARCH_FLAGS) #-Wall ##-xSSE2 + all:$(EXE) + + multi: +- rm -f src/*.o $(BWA_LIB); cd ext/safestringlib/ && $(MAKE) clean; +- $(MAKE) arch=sse41 EXE=bwa-mem2.sse41 CXX=$(CXX) all +- rm -f src/*.o $(BWA_LIB); cd ext/safestringlib/ && $(MAKE) clean; +- $(MAKE) arch=sse42 EXE=bwa-mem2.sse42 CXX=$(CXX) all +- rm -f src/*.o $(BWA_LIB); cd ext/safestringlib/ && $(MAKE) clean; +- $(MAKE) arch=avx EXE=bwa-mem2.avx CXX=$(CXX) all +- rm -f src/*.o $(BWA_LIB); cd ext/safestringlib/ && $(MAKE) clean; +- $(MAKE) arch=avx2 EXE=bwa-mem2.avx2 CXX=$(CXX) all +- rm -f src/*.o $(BWA_LIB); cd ext/safestringlib/ && $(MAKE) clean; +- $(MAKE) arch=avx512 EXE=bwa-mem2.avx512bw CXX=$(CXX) all + $(CXX) -Wall -O3 src/runsimd.cpp -Iext/safestringlib/include -Lext/safestringlib/ -lsafestring $(STATIC_GCC) -o bwa-mem2 + + +@@ -120,12 +109,8 @@ $(EXE):$(BWA_LIB) $(SAFE_STR_LIB) src/main.o + $(BWA_LIB):$(OBJS) + ar rcs $(BWA_LIB) $(OBJS) + +-$(SAFE_STR_LIB): +- cd ext/safestringlib/ && $(MAKE) clean && $(MAKE) CC=$(CC) directories libsafestring.a +- + clean: + rm -fr src/*.o $(BWA_LIB) $(EXE) bwa-mem2.sse41 bwa-mem2.sse42 bwa-mem2.avx bwa-mem2.avx2 bwa-mem2.avx512bw +- cd ext/safestringlib/ && $(MAKE) clean + + depend: + (LC_ALL=C; export LC_ALL; makedepend -Y -- $(CXXFLAGS) $(CPPFLAGS) -I. -- src/*.cpp) diff --git a/pkgs/by-name/bw/bwa-mem2/package.nix b/pkgs/by-name/bw/bwa-mem2/package.nix index f0f6cb7c0b8f..97e902dbb562 100644 --- a/pkgs/by-name/bw/bwa-mem2/package.nix +++ b/pkgs/by-name/bw/bwa-mem2/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + safestringlib, zlib, }: @@ -13,21 +14,11 @@ stdenv.mkDerivation (finalAttrs: { owner = "bwa-mem2"; repo = "bwa-mem2"; rev = "cf4306a47dac35e7e79a9e75398a35f33900cfd0"; - fetchSubmodules = true; - hash = "sha256-1AYSn7nBrDwbX7oSrdEoa1d3t6xzwKnA0S87Y/XeXJg="; + hash = "sha256-hY8nLRFWt0GAElhDIcYdUX6cJrzOE3NlYRQr0tC3on4="; }; buildInputs = [ zlib ]; - # see https://github.com/bwa-mem2/bwa-mem2/issues/93 - postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' - sed -i 's/memset_s/memset8_s/g' ext/safestringlib/include/safe_mem_lib.h - sed -i 's/memset_s/memset8_s/g' ext/safestringlib/safeclib/memset16_s.c - sed -i 's/memset_s/memset8_s/g' ext/safestringlib/safeclib/memset32_s.c - sed -i 's/memset_s/memset8_s/g' ext/safestringlib/safeclib/memset_s.c - sed -i 's/memset_s/memset8_s/g' ext/safestringlib/safeclib/wmemset_s.c - ''; - buildFlags = [ ( if stdenv.hostPlatform.sse4_2Support then @@ -43,14 +34,45 @@ stdenv.mkDerivation (finalAttrs: { ) ]; - env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { - NIX_CFLAGS_COMPILE = toString [ + patches = [ + ./no-submodule.patch + ]; + + # Also, patch the tests + postPatch = + # Force path to static link, otherwise, it fails at runtime to + # find the shared library + '' + substituteInPlace Makefile \ + --replace-fail "-Iext/safestringlib/include" "-I${safestringlib}/include" \ + --replace-fail "-Lext/safestringlib" "-L${safestringlib}/lib" + '' + # Make test compile by changing the compiler and path to library + # Remove xeonbsw test that fails to compile due to missing _rdsc + # also, not portable + + '' + substituteInPlace test/Makefile \ + --replace-fail "icpc" "g++" \ + --replace-fail "../ext/safestringlib/libsafestring.a" \ + "${safestringlib}/lib/libsafestring.a" \ + --replace-fail \ + "fmi_test smem2_test bwt_seed_strategy_test sa2ref_test xeonbsw" \ + "fmi_test smem2_test bwt_seed_strategy_test sa2ref_test" + ''; + + env.NIX_CFLAGS_COMPILE = toString ( + lib.optionals stdenv.hostPlatform.isDarwin [ "-Wno-error=register" "-Wno-error=implicit-function-declaration" - ]; - }; + ] + ); + + nativeBuildInputs = [ + safestringlib + ]; enableParallelBuilding = true; + installPhase = '' runHook preInstall From 1e132c67b25a6404e988171c5acdfd12242f7af6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 19:55:31 +0000 Subject: [PATCH 2028/2168] phpExtensions.relay: 0.10.0 -> 0.10.1 --- .../php-packages/relay/default.nix | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/development/php-packages/relay/default.nix b/pkgs/development/php-packages/relay/default.nix index 2dba7c619475..c4d7d4e2cea9 100644 --- a/pkgs/development/php-packages/relay/default.nix +++ b/pkgs/development/php-packages/relay/default.nix @@ -15,36 +15,36 @@ }: let - version = "0.10.0"; + version = "0.10.1"; hashes = { "aarch64-darwin" = { platform = "darwin-arm64"; hash = { - "8.1" = "sha256-aEuYKo31dKV7TSOeKt4BSShstNxfS4EdibJ2279XTbg="; - "8.2" = "sha256-tjE+bAiVWYh6od8rW7flZ6ajMGxMJszw7H055VtDJsc="; - "8.3" = "1czi5sfic13068hj8x1fgzkwsykbrr1g5ifc53zxds5vqywa74d7"; - "8.4" = "sha256-QUryARS5omADR3kEykCnoK4IFau1RpTQKDcCJ+lN/SY="; - "8.5" = "0k33qfrlxb9v0d15mdzzqsgdcik8z65nv1q9spn7ibdxg6clzykj"; + "8.1" = "sha256-0p24kOzj4l0wBPzmjAzTv1a0EUa4In1pjWHhNhrmsyM="; + "8.2" = "sha256-mgRjWEmtCFg7711RgC2lpSDs5cCcs+ZPqks/uj1mAJo="; + "8.3" = "16nESEzMRDIiVfwjXsGhJsK9UG5UKgfSunHPeyNnyz0="; + "8.4" = "sha256-g8H4vRb1XTnFQo2Db1qvzsENqPYg89/0HSxsW2tDLQQ="; + "8.5" = "6NAzMBqBV0BUI4/KlIbnyz0kcD/hucO4tzbuwPSptig="; }; }; "aarch64-linux" = { platform = "debian-aarch64+libssl3"; hash = { - "8.1" = "sha256-Aq4jZyo5JzVtJM96HzzsnSnx8jOCAmHB6f3eo1922gs="; - "8.2" = "sha256-Yd1bWEsRXuG30aDE9lCgLa/qlnXyeMehR3ROF0uAVTY="; - "8.3" = "sha256-j6qhr04zQDi+mQh968nVxlTGEnhQobI7kG8DK35sCiM="; - "8.4" = "0av8g5n4h3g2r4jbv3v1bwyx256z58wyygnd5jk4jzpx0ik2c1vv"; - "8.5" = "1aav4lh29d507av5ydxjvgm20fljl5lwdljdyq3038g3gi06yjaj"; + "8.1" = "sha256-E6GDFgRgm5I1acqLYFs9kw3TAuHq5aq7TatLnPHJseA="; + "8.2" = "sha256-59Un0hAidN/Diu9utUnOgMIdt5ZtOcBFtWrLdHkdME4="; + "8.3" = "sha256-ssqZ85KrQG69fZ39RKceEJPXyGfxxLPI21tnPXtPZDE="; + "8.4" = "JhFUplu9zMgXX2k2RArWWf0pFweAV+1+/T3yUwblJ2A="; + "8.5" = "Ii2bsG4AMMwAKopyOz/qX1RxMaGcstO8kYgup8Vb50w="; }; }; "x86_64-linux" = { platform = "debian-x86-64+libssl3"; hash = { - "8.1" = "sha256-306YMQr/UCJ+LOgEdzmqAPVBvbq2TDXnvSxdh4u6Nbc="; - "8.2" = "sha256-tapNth0vqNlCh1c3HryIYOs+V9jadTV1rMvoz+tVbeI="; - "8.3" = "sha256-f0eKpHcdiOHM55VuPYq+AJnbIwnBDLaECv+hYMBh0dw="; - "8.4" = "05h2ikl0ymd2xmqifvv700xazhllsm234s41ipdgfwdj7zyxv58s"; - "8.5" = "0frnd7y3zvj8vq10r4479lx04lj606xzd3hjg61lg5mq65i6xih0"; + "8.1" = "sha256-MmRAfRDcG1qV8FrZmhME3UtmXe7Mapk2vSrtE/fQRcE="; + "8.2" = "sha256-2ZRxJJhQaIkWQJX7bdti6+UFk7zY9yCJ9KWTtE3uGAE="; + "8.3" = "sha256-QlUk6q5LQuhWbuqWgb8/JdRfO8V+M6GcTu7rjRqJeiI="; + "8.4" = "V+tl7jTrq8PWEAXXu9IsqIlFiQcZBtMBDTlltWSO9CI="; + "8.5" = "w4Ba1Oh4JDsuZc5nrYH8lITP6Gk4/0i1wwOHmr4BO44="; }; }; }; From 4c1177576b66694b861a3c03c59aab21924defc9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 20:05:40 +0000 Subject: [PATCH 2029/2168] google-alloydb-auth-proxy: 1.12.1 -> 1.12.2 --- pkgs/by-name/go/google-alloydb-auth-proxy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix b/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix index 13c822cd88e2..2e7a9d8a89b8 100644 --- a/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix +++ b/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix @@ -7,18 +7,18 @@ buildGoModule rec { pname = "google-alloydb-auth-proxy"; - version = "1.12.1"; + version = "1.12.2"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "alloydb-auth-proxy"; tag = "v${version}"; - hash = "sha256-FnYVkZxdWFxY0aIUbHTSDLJ+AgYE2L03vNya1K2e3SI="; + hash = "sha256-3zJAwkl+fqiiGvrXWzTwFHmAOYOw1NVb/JUok5qZxNs="; }; subPackages = [ "." ]; - vendorHash = "sha256-0VksnkdN7E6VEzzxSIc6AfOvxlPm67vEj+HVR6N+BqA="; + vendorHash = "sha256-cGrJIbo4qEKIc7/XBwZtK5OrqE4t/Cmp54YKJMst8h8="; checkFlags = [ "-short" From 3952142b9363829730ee9dd51fb9186d75671139 Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Fri, 14 Feb 2025 16:00:00 -0500 Subject: [PATCH 2030/2168] python3Packages.moviepy: increase test timeout to 60s Fix https://github.com/NixOS/nixpkgs/issues/381908. --- pkgs/development/python-modules/moviepy/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix index 81b45f7fdeff..16fb3111c608 100644 --- a/pkgs/development/python-modules/moviepy/default.nix +++ b/pkgs/development/python-modules/moviepy/default.nix @@ -71,7 +71,8 @@ buildPythonPackage rec { pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies); - pytestFlagsArray = [ "--timeout=30" ]; + # See https://github.com/NixOS/nixpkgs/issues/381908. + pytestFlagsArray = [ "--timeout=60" ]; pythonImportsCheck = [ "moviepy" ]; From db9bc910a059df8f7effbf1a59e4124c70d1daed Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Fri, 14 Feb 2025 12:55:22 -0800 Subject: [PATCH 2031/2168] widevine-cdm: fix eval outside unsupported platforms --- pkgs/by-name/wi/widevine-cdm/package.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wi/widevine-cdm/package.nix b/pkgs/by-name/wi/widevine-cdm/package.nix index f4e0d12fbe49..bae718940d20 100644 --- a/pkgs/by-name/wi/widevine-cdm/package.nix +++ b/pkgs/by-name/wi/widevine-cdm/package.nix @@ -1,3 +1,13 @@ -{ stdenv, callPackage }: +{ + lib, + stdenv, + callPackage, +}: -callPackage (./. + "/${stdenv.hostPlatform.system}.nix") { inherit stdenv; } +let + targets = lib.genAttrs [ + "aarch64-linux" + "x86_64-linux" + ] (name: ./. + "/${name}.nix"); +in +callPackage (targets."${stdenv.hostPlatform.system}" or targets.x86_64-linux) { inherit stdenv; } From 857374c887a37944b73bdaf1f84d8abb83489820 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 17:23:11 +0100 Subject: [PATCH 2032/2168] python312Packages.optuna: 4.2.0 -> 4.2.1 Diff: https://github.com/optuna/optuna/compare/refs/tags/v4.2.0...v4.2.1 Changelog: https://github.com/optuna/optuna/releases/tag/4.2.1 --- .../python-modules/optuna/default.nix | 94 +++++++++++++------ 1 file changed, 65 insertions(+), 29 deletions(-) diff --git a/pkgs/development/python-modules/optuna/default.nix b/pkgs/development/python-modules/optuna/default.nix index aff26527574f..86ea64441f97 100644 --- a/pkgs/development/python-modules/optuna/default.nix +++ b/pkgs/development/python-modules/optuna/default.nix @@ -1,48 +1,56 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, - pythonOlder, + + # build-system + setuptools, + + # dependencies alembic, + colorlog, + numpy, + packaging, + sqlalchemy, + tqdm, + pyyaml, + + # optional-dependencies boto3, cmaes, - colorlog, - fakeredis, fvcore, google-cloud-storage, grpcio, - kaleido, matplotlib, - moto, - numpy, - packaging, pandas, plotly, protobuf, - pytest-xdist, - pyyaml, redis, scikit-learn, scipy, - setuptools, - sqlalchemy, + + # tests + addBinToPathHook, + fakeredis, + kaleido, + moto, + pytest-xdist, + pytestCheckHook, torch, - tqdm, + versionCheckHook, }: buildPythonPackage rec { pname = "optuna"; - version = "4.2.0"; + version = "4.2.1"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "optuna"; repo = "optuna"; tag = "v${version}"; - hash = "sha256-NNlwrVrGg2WvkC42nmW7K/mRktE3B97GaL8GaSOKF1Y="; + hash = "sha256-WLrdHrdfCtCZMW2J375N8vmod7FcKCMwQPGKicRA878="; }; build-system = [ @@ -76,40 +84,68 @@ buildPythonPackage rec { ]; }; + # grpc tests are racy preCheck = '' - export PATH=$out/bin:$PATH - - # grpc tests are racy sed -i '/"grpc",/d' optuna/testing/storages.py ''; nativeCheckInputs = [ + addBinToPathHook fakeredis kaleido moto pytest-xdist pytestCheckHook torch + versionCheckHook ] ++ fakeredis.optional-dependencies.lua ++ optional-dependencies.optional; + versionCheckProgramArg = [ "--version" ]; - disabledTests = [ - # ValueError: Transform failed with error code 525: error creating static canvas/context for image server - "test_get_pareto_front_plot" - # too narrow time limit - "test_get_timeline_plot_with_killed_running_trials" - ]; + disabledTests = + [ + # ValueError: Transform failed with error code 525: error creating static canvas/context for image server + "test_get_pareto_front_plot" + # too narrow time limit + "test_get_timeline_plot_with_killed_running_trials" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # ValueError: Failed to start Kaleido subprocess. Error stream + # kaleido/executable/kaleido: line 5: 5956 Illegal instruction: 4 ./bin/kaleido $@ + "test_get_optimization_history_plot" + "test_plot_intermediate_values" + "test_plot_rank" + "test_plot_terminator_improvement" + + # Fatal Python error: Aborted + # matplotlib/backend_bases.py", line 2654 in create_with_canvas + "test_edf_plot_no_trials" + "test_get_timeline_plot" + "test_plot_contour" + "test_plot_contour_customized_target_name" + "test_plot_edf_with_multiple_studies" + "test_plot_edf_with_target" + "test_plot_parallel_coordinate" + "test_plot_parallel_coordinate_customized_target_name" + "test_plot_param_importances" + "test_plot_param_importances_customized_target_name" + "test_plot_param_importances_multiobjective_all_objectives_displayed" + "test_plot_slice" + "test_plot_slice_customized_target_name" + "test_target_is_none_and_study_is_multi_obj" + "test_visualizations_with_single_objectives" + ]; pythonImportsCheck = [ "optuna" ]; - meta = with lib; { + meta = { description = "Hyperparameter optimization framework"; homepage = "https://optuna.org/"; changelog = "https://github.com/optuna/optuna/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ natsukium ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ natsukium ]; mainProgram = "optuna"; }; } From 6d79b0b9f33c6c3346f964f4598eaa89ecd9a5fd Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 20:49:13 +0100 Subject: [PATCH 2033/2168] python312Packages.librosa: mark as broken on aarch64-linux --- pkgs/development/python-modules/librosa/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/librosa/default.nix b/pkgs/development/python-modules/librosa/default.nix index 2e3ea5640e19..2479c885aaee 100644 --- a/pkgs/development/python-modules/librosa/default.nix +++ b/pkgs/development/python-modules/librosa/default.nix @@ -32,12 +32,13 @@ pytestCheckHook, resampy, samplerate, + writableTmpDirAsHomeHook, }: buildPythonPackage rec { pname = "librosa"; version = "0.10.2.post1"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "librosa"; @@ -94,12 +95,9 @@ buildPythonPackage rec { pytestCheckHook resampy samplerate + writableTmpDirAsHomeHook ] ++ optional-dependencies.matplotlib; - preCheck = '' - export HOME=$(mktemp -d) - ''; - disabledTests = [ # requires network access @@ -137,5 +135,10 @@ buildPythonPackage rec { changelog = "https://github.com/librosa/librosa/releases/tag/${version}"; license = lib.licenses.isc; maintainers = with lib.maintainers; [ GuillaumeDesforges ]; + badPlatforms = [ + # Several non-deterministic occurances of "Fatal Python error: Segmentation fault", both in + # numpy's and in this package's code. + "aarch64-linux" + ]; }; } From 4840ab7258c81090e40e3332ed1d9d5523ae7001 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 21:55:56 +0100 Subject: [PATCH 2034/2168] python312Packages.librosa: disable on python3.13 --- pkgs/development/python-modules/librosa/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/librosa/default.nix b/pkgs/development/python-modules/librosa/default.nix index 2479c885aaee..c8489e4a97e8 100644 --- a/pkgs/development/python-modules/librosa/default.nix +++ b/pkgs/development/python-modules/librosa/default.nix @@ -2,6 +2,7 @@ lib, stdenv, buildPythonPackage, + pythonAtLeast, fetchFromGitHub, fetchpatch2, @@ -40,6 +41,8 @@ buildPythonPackage rec { version = "0.10.2.post1"; pyproject = true; + disabled = pythonAtLeast "3.13"; + src = fetchFromGitHub { owner = "librosa"; repo = "librosa"; From ec6a3fdebbea68f250ee716d363f87c0f3dde575 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 15:29:30 +0100 Subject: [PATCH 2035/2168] python312Packages.asn1tools: skip failing tests https://github.com/eerimoq/asn1tools/issues/191 --- .../python-modules/asn1tools/default.nix | 36 ++++++++++++++----- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/asn1tools/default.nix b/pkgs/development/python-modules/asn1tools/default.nix index 0d1cab628056..57f797c72614 100644 --- a/pkgs/development/python-modules/asn1tools/default.nix +++ b/pkgs/development/python-modules/asn1tools/default.nix @@ -1,15 +1,23 @@ { lib, - bitstruct, buildPythonPackage, - diskcache, fetchFromGitHub, - prompt-toolkit, + + # build-system + setuptools, + + # dependencies + bitstruct, pyparsing, + + # optional-dependencies + prompt-toolkit, + diskcache, + + # tests pytest-xdist, pytestCheckHook, - pythonOlder, - setuptools, + versionCheckHook, }: buildPythonPackage rec { @@ -17,8 +25,6 @@ buildPythonPackage rec { version = "0.167.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "eerimoq"; repo = "asn1tools"; @@ -41,7 +47,9 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-xdist pytestCheckHook + versionCheckHook ] ++ lib.flatten (builtins.attrValues optional-dependencies); + versionCheckProgramArg = [ "--version" ]; pythonImportsCheck = [ "asn1tools" ]; @@ -49,13 +57,23 @@ buildPythonPackage rec { # assert exact error message of pyparsing which changed and no longer matches # https://github.com/eerimoq/asn1tools/issues/167 "test_parse_error" + + # IndexError: string index out of range + # https://github.com/eerimoq/asn1tools/issues/191 + "test_c_source" + "test_command_line_generate_c_source_oer" + "test_missing_parameterized_value" + "test_parse_parameterization" + # SystemExit: error: string index out of range + "test_command_line_generate_c_source_uper" + "test_command_line_generate_rust_source_uper" ]; - meta = with lib; { + meta = { description = "ASN.1 parsing, encoding and decoding"; homepage = "https://github.com/eerimoq/asn1tools"; changelog = "https://github.com/eerimoq/asn1tools/releases/tag/${version}"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = [ ]; mainProgram = "asn1tools"; }; From 31f600f01400298f6ca022de44f4968c6c785bf2 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 15:48:12 +0100 Subject: [PATCH 2036/2168] python312Packages.eth-account: 0.13.4 -> 0.13.5 Diff: https://github.com/ethereum/eth-account/compare/refs/tags/v0.13.4...v0.13.5 Changelog: https://github.com/ethereum/eth-account/blob/v0.13.5/docs/release_notes.rst --- .../python-modules/eth-account/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/eth-account/default.nix b/pkgs/development/python-modules/eth-account/default.nix index 918100ec7f57..be26789c0623 100644 --- a/pkgs/development/python-modules/eth-account/default.nix +++ b/pkgs/development/python-modules/eth-account/default.nix @@ -2,7 +2,10 @@ lib, buildPythonPackage, fetchFromGitHub, + + # build-system setuptools, + # dependencies bitarray, ckzg, @@ -14,7 +17,8 @@ hexbytes, rlp, websockets, - # nativeCheckInputs + + # tests hypothesis, pydantic, pytestCheckHook, @@ -23,14 +27,14 @@ buildPythonPackage rec { pname = "eth-account"; - version = "0.13.4"; + version = "0.13.5"; pyproject = true; src = fetchFromGitHub { owner = "ethereum"; repo = "eth-account"; tag = "v${version}"; - hash = "sha256-Y55WCgWJd2AaDNKbyBe9oi1soT19RdUjQWy5884Pcq8="; + hash = "sha256-CBD0vJLYA+3FreOTsVXJlDJhRvPbDUn4X55o6EF+uBA="; }; build-system = [ setuptools ]; @@ -60,8 +64,12 @@ buildPythonPackage rec { "test_messages_where_all_3_sigs_match" "test_messages_where_eth_account_matches_ethers_but_not_metamask" "test_messages_where_eth_account_matches_metamask_but_not_ethers" + # disable flaky fuzzing test "test_compatibility" + + # Attempts at installing the wheel + "test_install_local_wheel" ]; pythonImportsCheck = [ "eth_account" ]; From 05d5ff4d55a0307007f18ae50ea6eb5afe6b0e29 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 15:41:58 +0100 Subject: [PATCH 2037/2168] python312Packages.web3: 7.6.1 -> 7.8.0 Diff: https://github.com/ethereum/web3.py/compare/refs/tags/v7.6.1...v7.8.0 --- .../python-modules/web3/default.nix | 49 +++++++++++++------ 1 file changed, 34 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/web3/default.nix b/pkgs/development/python-modules/web3/default.nix index df894986b3ed..282de6e5824a 100644 --- a/pkgs/development/python-modules/web3/default.nix +++ b/pkgs/development/python-modules/web3/default.nix @@ -2,7 +2,10 @@ lib, buildPythonPackage, fetchFromGitHub, + + # build-system setuptools, + # dependencies aiohttp, eth-abi, @@ -11,7 +14,6 @@ eth-typing, eth-utils, hexbytes, - ipfshttpclient, jsonschema, lru-dict, protobuf, @@ -19,37 +21,40 @@ requests, types-requests, websockets, - # nativeCheckInputs + + # optional-dependencies + ipfshttpclient, + + # tests eth-tester, flaky, hypothesis, py-evm, pytest-asyncio_0_21, - pytestCheckHook, pytest-mock, pytest-xdist, + pytestCheckHook, pyunormalize, }: buildPythonPackage rec { pname = "web3"; - version = "7.6.1"; + version = "7.8.0"; pyproject = true; src = fetchFromGitHub { owner = "ethereum"; repo = "web3.py"; tag = "v${version}"; - hash = "sha256-rpXSkQtqUZiCLMF2XlElbsjFjJmX+3j/NdAU2oaPU54="; - }; - - # Note: to reflect the extra_requires in main/setup.py. - optional-dependencies = { - ipfs = [ ipfshttpclient ]; + hash = "sha256-Rk12QZK47oF0ri1+kCquW4vaqPPPO5UPYOhq4StR1+U="; }; build-system = [ setuptools ]; + pythonRelaxDeps = [ + "websockets" + ]; + dependencies = [ aiohttp @@ -71,39 +76,53 @@ buildPythonPackage rec { websockets ]; + # Note: to reflect the extra_requires in main/setup.py. + optional-dependencies = { + ipfs = [ ipfshttpclient ]; + }; + nativeCheckInputs = [ eth-tester flaky hypothesis py-evm pytest-asyncio_0_21 - pytestCheckHook pytest-mock pytest-xdist + pytestCheckHook pyunormalize ]; disabledTests = [ # side-effect: runs pip online check and is blocked by sandbox "test_install_local_wheel" + # not sure why they fail - "test_init_multiple_contracts_performance" "test_async_init_multiple_contracts_performance" + "test_init_multiple_contracts_performance" + + # AssertionError: assert '/build/geth.ipc' == '/tmp/geth.ipc + "test_get_dev_ipc_path" + + # Require network access + "test_websocket_provider_timeout" ]; disabledTestPaths = [ # requires geth library and binaries "tests/integration/go_ethereum" + # requires local running beacon node "tests/beacon" ]; pythonImportsCheck = [ "web3" ]; - meta = with lib; { + meta = { description = "Python interface for interacting with the Ethereum blockchain and ecosystem"; homepage = "https://web3py.readthedocs.io/"; - license = licenses.mit; - maintainers = with maintainers; [ hellwolf ]; + changelog = "https://web3py.readthedocs.io/en/stable/release_notes.html"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hellwolf ]; }; } From 0c87981c32d0ada22c1cd910e06d61236b70ed43 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 16:08:44 +0100 Subject: [PATCH 2038/2168] python312Packages.blis: fallback to generic architecure when needed --- .../python-modules/blis/default.nix | 48 +++++++++++++------ 1 file changed, 34 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix index 91a41aaf54d8..c17823eb0717 100644 --- a/pkgs/development/python-modules/blis/default.nix +++ b/pkgs/development/python-modules/blis/default.nix @@ -1,13 +1,19 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, + + # build-system setuptools, cython, - hypothesis, numpy, + + # tests + hypothesis, pytestCheckHook, - pythonOlder, + + # passthru blis, numpy_1, gitUpdater, @@ -18,8 +24,6 @@ buildPythonPackage rec { version = "1.2.1"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "explosion"; repo = "cython-blis"; @@ -27,25 +31,41 @@ buildPythonPackage rec { hash = "sha256-krUqAEPxJXdlolSbV5R0ZqrWaFuXh7IxSeFTsCr6iss="; }; - preCheck = '' - # remove src module, so tests use the installed module instead - rm -rf ./blis - ''; - build-system = [ setuptools cython numpy ]; + env = + # Fallback to generic architectures when necessary: + # https://github.com/explosion/cython-blis?tab=readme-ov-file#building-blis-for-alternative-architectures + lib.optionalAttrs + ( + # error: [Errno 2] No such file or directory: '/build/source/blis/_src/make/linux-cortexa57.jsonl' + (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) + + # clang: error: unknown argument '-mavx512pf'; did you mean '-mavx512f'? + # Patching blis/_src/config/knl/make_defs.mk to remove the said flag does not work + || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) + ) + { + BLIS_ARCH = "generic"; + }; + dependencies = [ numpy ]; + pythonImportsCheck = [ "blis" ]; + nativeCheckInputs = [ hypothesis pytestCheckHook ]; - pythonImportsCheck = [ "blis" ]; + # remove src module, so tests use the installed module instead + preCheck = '' + rm -rf ./blis + ''; passthru = { tests = { @@ -58,11 +78,11 @@ buildPythonPackage rec { }; }; - meta = with lib; { - changelog = "https://github.com/explosion/cython-blis/releases/tag/release-${src.tag}"; + meta = { + changelog = "https://github.com/explosion/cython-blis/releases/tag/release-${version}"; description = "BLAS-like linear algebra library"; homepage = "https://github.com/explosion/cython-blis"; - license = licenses.bsd3; - maintainers = with maintainers; [ nickcao ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ nickcao ]; }; } From c6afce43c2c16765b7bc48b69fc16a855f8041ea Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 17:11:18 +0100 Subject: [PATCH 2039/2168] python312Packages.textnets: fix build on darwin --- .../python-modules/textnets/default.nix | 49 ++++++++++++------- 1 file changed, 31 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/textnets/default.nix b/pkgs/development/python-modules/textnets/default.nix index 00b1ea7b6244..2db378b5a0f5 100644 --- a/pkgs/development/python-modules/textnets/default.nix +++ b/pkgs/development/python-modules/textnets/default.nix @@ -1,24 +1,30 @@ { lib, + stdenv, buildPythonPackage, - cairocffi, - cython, - en_core_web_sm, fetchFromGitHub, + + # build-system + cython, + poetry-core, + setuptools, + + # dependencies + cairocffi, igraph, leidenalg, pandas, - poetry-core, pyarrow, - pytestCheckHook, - pythonOlder, scipy, - setuptools, - spacy-lookups-data, spacy, + spacy-lookups-data, toolz, tqdm, wasabi, + + # tests + en_core_web_sm, + pytestCheckHook, }: buildPythonPackage rec { @@ -26,8 +32,6 @@ buildPythonPackage rec { version = "0.9.5"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "jboynyc"; repo = "textnets"; @@ -63,8 +67,8 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytestCheckHook en_core_web_sm + pytestCheckHook ]; pythonImportsCheck = [ "textnets" ]; @@ -74,16 +78,25 @@ buildPythonPackage rec { rm -r textnets ''; - disabledTests = [ - # Test fails: Throws a UserWarning asking the user to install `textnets[fca]`. - "test_context" - ]; + disabledTests = + [ + # Test fails: Throws a UserWarning asking the user to install `textnets[fca]`. + "test_context" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # MemoryError: ("cairo returned CAIRO_STATUS_NO_MEMORY: b'out of memory'", 1) + "test_plot_backbone" + "test_plot_filtered" + "test_plot_layout" + "test_plot_projected" + "test_plot_scaled" + ]; - meta = with lib; { + meta = { description = "Text analysis with networks"; homepage = "https://textnets.readthedocs.io"; changelog = "https://github.com/jboynyc/textnets/blob/v${version}/HISTORY.rst"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ jboy ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ jboy ]; }; } From 2c12bbf0e69660d6fdd936aa5ac260f65294d98b Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Fri, 14 Feb 2025 16:55:29 -0500 Subject: [PATCH 2040/2168] zed-editor: 0.173.9 -> 0.173.10 --- pkgs/by-name/ze/zed-editor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 07cee8c62c41..8b64da7f2ac4 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -96,7 +96,7 @@ let in rustPlatform.buildRustPackage rec { pname = "zed-editor"; - version = "0.173.9"; + version = "0.173.10"; outputs = [ "out" ] ++ lib.optional buildRemoteServer "remote_server"; @@ -104,7 +104,7 @@ rustPlatform.buildRustPackage rec { owner = "zed-industries"; repo = "zed"; tag = "v${version}"; - hash = "sha256-zCzMjULJLZCoi2v8eJHWDkUM3I8me/AQrkuT41SdaUU="; + hash = "sha256-6GVRJUBCXD9ohRcOATK/tzh7e7icyZzA/SuCAL9DauQ="; }; patches = [ @@ -124,7 +124,7 @@ rustPlatform.buildRustPackage rec { ''; useFetchCargoVendor = true; - cargoHash = "sha256-TJiXWHhKmY2z6Mk2xOfMfGIUnqr1sbf/6HB5Gn1kitg="; + cargoHash = "sha256-xtziusGBsSni/ZtG+OzIkWxp3azg54G4r/5Wi9n9cyc="; nativeBuildInputs = [ From ba19afabbd55dd324cddabbc6a172aaab5f50d62 Mon Sep 17 00:00:00 2001 From: azahi Date: Wed, 5 Feb 2025 12:41:58 +0300 Subject: [PATCH 2041/2168] dnstap: init at 0.4.0 --- pkgs/by-name/dn/dnstap/package.nix | 47 ++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 pkgs/by-name/dn/dnstap/package.nix diff --git a/pkgs/by-name/dn/dnstap/package.nix b/pkgs/by-name/dn/dnstap/package.nix new file mode 100644 index 000000000000..ec767eb33c93 --- /dev/null +++ b/pkgs/by-name/dn/dnstap/package.nix @@ -0,0 +1,47 @@ +{ + buildGoModule, + fetchFromGitHub, + installShellFiles, + lib, + stdenv, +}: +buildGoModule rec { + pname = "dnstap"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "dnstap"; + repo = "golang-dnstap"; + tag = "v${version}"; + hash = "sha256-GmwHJ6AQ4HcPEFNeodKqJe/mYE1Fa95hRiQWoka/nv4="; + }; + + vendorHash = "sha256-xDui88YgLqIETIR34ZdqT6Iz12v+Rdf6BssAIXgaMLU="; + + nativeBuildInputs = [ + installShellFiles + ]; + + postInstall = '' + installManPage dnstap/dnstap.8 + ''; + + meta = { + description = "Structured DNS server events decoding utility"; + longDescription = '' + dnstap implements an encoding format for DNS server events. It uses a + lightweight framing on top of event payloads encoded using Protocol + Buffers and is transport neutral. + + dnstap can represent internal state inside a DNS server that is difficult + to obtain using techniques based on traditional packet capture or + unstructured textual format logging. + ''; + homepage = "https://dnstap.info"; + changelog = "https://github.com/dnstap/golang-dnstap/releases/tag/${src.rev}"; + license = lib.licenses.asl20; + broken = stdenv.isDarwin; + maintainers = [ lib.maintainers.azahi ]; + mainProgram = "dnstap"; + }; +} From a253bad5e91c8d74ce5be438d4b40175aea58606 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 Feb 2025 21:39:14 +0100 Subject: [PATCH 2042/2168] python313Packages.hass-nabucasa: 0.90.0 -> 0.92.0 https://github.com/NabuCasa/hass-nabucasa/releases/tag/0.92.0 --- pkgs/development/python-modules/hass-nabucasa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index 5a60e8a71fff..930cdc526631 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.90.0"; + version = "0.92.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "nabucasa"; repo = "hass-nabucasa"; tag = version; - hash = "sha256-OP+KUh0WsE6I0hKUvUBHhzrLCKM7jc5GhO++9OrLh4s="; + hash = "sha256-OwU3HxUj8M3/3Xv+9WPNbV8sVVR8S9u9U3mSK/P+4o8="; }; pythonRelaxDeps = [ "acme" ]; From 1ce18a7278d31e6d1d119295dcc94ee2563bde39 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 Feb 2025 21:42:48 +0100 Subject: [PATCH 2043/2168] python313Packages.py-synologydsm-api: 2.6.2 -> 2.6.3 https://github.com/mib1185/py-synologydsm-api/releases/tag/v2.6.3 --- .../development/python-modules/py-synologydsm-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/py-synologydsm-api/default.nix b/pkgs/development/python-modules/py-synologydsm-api/default.nix index 2d5b39a48fc2..f269875ec423 100644 --- a/pkgs/development/python-modules/py-synologydsm-api/default.nix +++ b/pkgs/development/python-modules/py-synologydsm-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "py-synologydsm-api"; - version = "2.6.2"; + version = "2.6.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mib1185"; repo = "py-synologydsm-api"; tag = "v${version}"; - hash = "sha256-mkwHw10IzVWtuLGbpY/v7yCJgI6TBIJEo1XSB/NlZKs="; + hash = "sha256-BkkI2dhzf58vBoT6UhBsn6MyS7KvYo70C80ZLGOJG08="; }; build-system = [ setuptools ]; From 2379040e8c247f18a04370f162442ea0cf2bbd90 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 Feb 2025 21:43:05 +0100 Subject: [PATCH 2044/2168] python313Packages.pyseventeentrack: 1.0.1 -> 1.0.2 https://github.com/shaiu/pyseventeentrack/releases/tag/v1.0.2 --- pkgs/development/python-modules/pyseventeentrack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyseventeentrack/default.nix b/pkgs/development/python-modules/pyseventeentrack/default.nix index 55fba001214c..0fcad12ddb9d 100644 --- a/pkgs/development/python-modules/pyseventeentrack/default.nix +++ b/pkgs/development/python-modules/pyseventeentrack/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyseventeentrack"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; src = fetchFromGitHub { owner = "shaiu"; repo = "pyseventeentrack"; tag = "v${version}"; - hash = "sha256-AHFJu2z3UWBR6BzwdxAKl3wpqBnsyj8pn16z1rgFVpw="; + hash = "sha256-B/p+7wuXMtdOlIOySGQdtiiErcVD8DaVJPvSX4lPnos="; }; build-system = [ poetry-core ]; From 2fa9ad136b224ce6767cb5a9711a89bae918cfd2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 Feb 2025 21:43:33 +0100 Subject: [PATCH 2045/2168] python313Packages.zha-quirks: 0.0.132 -> 0.0.133 https://github.com/zigpy/zha-device-handlers/releases/tag/0.0.133 --- pkgs/development/python-modules/zha-quirks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 27e070a78790..af1b3ccd7599 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.132"; + version = "0.0.133"; pyproject = true; disabled = pythonOlder "3.12"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; tag = version; - hash = "sha256-T5A6XIYdV0SxEj3Rw/zOAE74B1ans2FDyuWD5Hnbd5k="; + hash = "sha256-9nw9eEUzIIp679LSMRmO5kW5Qvz3vcL3AEXHdhNFtG8="; }; postPatch = '' From 6aeaa71ff594b93e661c75042d81ff0ca2d22022 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 Feb 2025 21:47:39 +0100 Subject: [PATCH 2046/2168] python313Packages.zha: 0.0.48 -> 0.0.49 https://github.com/zigpy/zha/releases/tag/0.0.49 --- pkgs/development/python-modules/zha/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zha/default.nix b/pkgs/development/python-modules/zha/default.nix index 70e0c5d08d60..ecae00d4942b 100644 --- a/pkgs/development/python-modules/zha/default.nix +++ b/pkgs/development/python-modules/zha/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "zha"; - version = "0.0.48"; + version = "0.0.49"; pyproject = true; disabled = pythonOlder "3.12"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha"; tag = version; - hash = "sha256-qPqFmFfvCR6gk4qmZNrkC/DcdOUzyLv7KALv35R6oNw="; + hash = "sha256-QW/FrmZIRr2xt+a6Se9nEp4ttfhNJx79/qV9A+hmNSU="; }; postPatch = '' From d00446c603f820a609dbc46c51ff404d664fccea Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 Feb 2025 21:47:48 +0100 Subject: [PATCH 2047/2168] home-assistant: 2025.2.3 -> 2025.2.4 https://github.com/home-assistant/core/releases/tag/2025.2.4 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 6 +++--- pkgs/servers/home-assistant/frontend.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index dce16055ac29..d62cbf943f9a 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2025.2.3"; + version = "2025.2.4"; components = { "3_day_blinds" = ps: with ps; [ diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index a0a24e45fc1c..806473fdde53 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -369,7 +369,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2025.2.3"; + hassVersion = "2025.2.4"; in python.pkgs.buildPythonApplication rec { @@ -390,13 +390,13 @@ python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-1hCNkBIqRg3YDQn6TSytugxkQwve4/Z7p1/BY4Zwcv0="; + hash = "sha256-Zrr4keJwY1q/PrHZEVUphxhA3dAOkyE5vCEa3Msr9Yk="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-4LojranZ9xLR3kpBvvzZ/XJchbgr9ZVYydntNoBkCVE="; + hash = "sha256-24AOIyC00U6J1Abg1zj4BbSLsRik2tQZSFaoAu7w85M="; }; build-system = with python.pkgs; [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index b9a0224adc46..1ca6e8574c99 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20250210.0"; + version = "20250214.0"; format = "wheel"; src = fetchPypi { @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-Pm9lnD+3ywHtLWPbuIm7brWzY+804+V84pH6g561LAU="; + hash = "sha256-dIV0P/9GsHV4xN84+HGe/I7ay1FM3jLw9F60WpxaEIM="; }; # there is nothing to strip in this package From a4b27b3f7b23dc007d05d98b6428ab86dd8558ba Mon Sep 17 00:00:00 2001 From: kilianar Date: Fri, 14 Feb 2025 23:41:14 +0100 Subject: [PATCH 2048/2168] oxipng: 9.1.3 -> 9.1.4 https://github.com/shssoichiro/oxipng/releases/tag/v9.1.4 --- pkgs/by-name/ox/oxipng/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ox/oxipng/package.nix b/pkgs/by-name/ox/oxipng/package.nix index def5dee39458..b661fd536110 100644 --- a/pkgs/by-name/ox/oxipng/package.nix +++ b/pkgs/by-name/ox/oxipng/package.nix @@ -7,7 +7,7 @@ }: rustPlatform.buildRustPackage rec { - version = "9.1.3"; + version = "9.1.4"; pname = "oxipng"; # do not use fetchCrate (only repository includes tests) @@ -15,11 +15,11 @@ rustPlatform.buildRustPackage rec { owner = "shssoichiro"; repo = "oxipng"; tag = "v${version}"; - hash = "sha256-8EOEcIw10hCyYi9SwDLDZ8J3ezLXa30RUY5I9ksfqTs="; + hash = "sha256-cwujBgvGdNvD8vKp3+jNxcxkw/+M2FooNgsw+RejyrM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-4c9YcIQRZsbDJvl8P9Pkd3atTVM+RbQ/4BMb7rE84po="; + cargoHash = "sha256-Z0otTCFwtGuSC1XBM3jcgGDFPZuMzQikZaYCnR+S6Us="; # See https://github.com/shssoichiro/oxipng/blob/14b8b0e93a/.cargo/config.toml#L5 nativeCheckInputs = [ qemu ]; From 0345b336c2cc3c1b42a7742f89252819aad04384 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 23:51:58 +0100 Subject: [PATCH 2049/2168] python312Packages.islpy: 2025.1 -> 2025.1.1 Diff: https://github.com/inducer/islpy/compare/refs/tags/v2025.1...v2025.1.1 Changelog: https://github.com/inducer/islpy/releases/tag/v2025.1.1 --- pkgs/development/python-modules/islpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/islpy/default.nix b/pkgs/development/python-modules/islpy/default.nix index f69c15e52a2b..8a4a5b2ef4d4 100644 --- a/pkgs/development/python-modules/islpy/default.nix +++ b/pkgs/development/python-modules/islpy/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "islpy"; - version = "2025.1"; + version = "2025.1.1"; pyproject = true; src = fetchFromGitHub { owner = "inducer"; repo = "islpy"; tag = "v${version}"; - hash = "sha256-njwNijl7kAbU7v6Bd6p0J9KnYzXZi9gVdqSf8qD0FXE="; + hash = "sha256-SCrEHz5gMPSfrgyPQcTf4k2YlzVs7WWdhgnw7U0Tv30="; }; build-system = [ From b8f2b116bbdf5c302ef6f0d8c63f85f2c462befb Mon Sep 17 00:00:00 2001 From: Marcel Date: Fri, 14 Feb 2025 23:08:59 +0100 Subject: [PATCH 2050/2168] flare-signal: 0.15.8 -> 0.15.9 --- pkgs/by-name/fl/flare-signal/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fl/flare-signal/package.nix b/pkgs/by-name/fl/flare-signal/package.nix index f1db4dafe0da..1593954ba040 100644 --- a/pkgs/by-name/fl/flare-signal/package.nix +++ b/pkgs/by-name/fl/flare-signal/package.nix @@ -22,19 +22,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "flare"; - version = "0.15.8"; + version = "0.15.9"; src = fetchFromGitLab { domain = "gitlab.com"; owner = "schmiddi-on-mobile"; repo = "flare"; rev = finalAttrs.version; - hash = "sha256-uvqLcFHtoXn4VALd/SOWg5i6ndjsvcZ+Uxokjg7YEO8="; + hash = "sha256-48BJ2k0j6y2IjwZg6ZBwdVNUV+u3lLNYdA04vyKP2U4="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-ZKq/6MEYq99lLS2b7o1iXXgnmTIzvhmPhRXbQeYPONA="; + hash = "sha256-ckTROUWLAkkWfqOyUjEa/RQGd7CYSupqf4Sr6dOLfwU="; }; nativeBuildInputs = [ From ed1db774f090570cc5fd023487f2b0e4a1999756 Mon Sep 17 00:00:00 2001 From: Mitchell Pleune Date: Mon, 18 Nov 2024 13:51:26 -0500 Subject: [PATCH 2051/2168] onnxruntime cuda support fix dlopen path onnxruntime loads some libraries at runtime with dlopen, and needs to know where in the nix store to look for them. --- pkgs/development/libraries/onnxruntime/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix index 93a8e7c65a1c..7ae6315af6fe 100644 --- a/pkgs/development/libraries/onnxruntime/default.nix +++ b/pkgs/development/libraries/onnxruntime/default.nix @@ -229,6 +229,11 @@ effectiveStdenv.mkDerivation rec { postPatch = '' substituteInPlace cmake/libonnxruntime.pc.cmake.in \ --replace-fail '$'{prefix}/@CMAKE_INSTALL_ @CMAKE_INSTALL_ + + # https://github.com/microsoft/onnxruntime/blob/c4f3742bb456a33ee9c826ce4e6939f8b84ce5b0/onnxruntime/core/platform/env.h#L249 + substituteInPlace onnxruntime/core/platform/env.h --replace-fail \ + "GetRuntimePath() const { return PathString(); }" \ + "GetRuntimePath() const { return PathString(\"$out/lib/\"); }" '' + lib.optionalString (effectiveStdenv.hostPlatform.system == "aarch64-linux") '' # https://github.com/NixOS/nixpkgs/pull/226734#issuecomment-1663028691 rm -v onnxruntime/test/optimizer/nhwc_transformer_test.cc From 7465b675ae0c7d7e598e3e88885de0a186a06680 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 23:17:25 +0000 Subject: [PATCH 2052/2168] vuetorrent: 2.21.0 -> 2.22.0 --- pkgs/by-name/vu/vuetorrent/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vu/vuetorrent/package.nix b/pkgs/by-name/vu/vuetorrent/package.nix index f20860a64533..c0074d970cde 100644 --- a/pkgs/by-name/vu/vuetorrent/package.nix +++ b/pkgs/by-name/vu/vuetorrent/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "vuetorrent"; - version = "2.21.0"; + version = "2.22.0"; src = fetchFromGitHub { owner = "VueTorrent"; repo = "VueTorrent"; tag = "v${version}"; - hash = "sha256-+DB1C7lWB1bBdQIxXhil5LYORgy7cTZISnU60mbPNK0="; + hash = "sha256-4tjYvH9JQpHaCmG+5t+K7tyBOqN+RssbYTAHz6BgZw8="; }; - npmDepsHash = "sha256-mfYLCErwVrL9PZDKGa0NiL+CQnJk1fDnB3bvCcvupHw="; + npmDepsHash = "sha256-QLbfinszfRrpDDrG4UqzGW4yviry3jftCzlVB0vmRsI="; installPhase = '' runHook preInstall From f36ffa86463ade1cd13e24cc0f35ba0d9b8a6fb7 Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 14 Feb 2025 20:17:37 +0900 Subject: [PATCH 2053/2168] apprun-cli: init at 0.0.2 --- pkgs/by-name/ap/apprun-cli/package.nix | 36 ++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 pkgs/by-name/ap/apprun-cli/package.nix diff --git a/pkgs/by-name/ap/apprun-cli/package.nix b/pkgs/by-name/ap/apprun-cli/package.nix new file mode 100644 index 000000000000..1f2d7f5ced4e --- /dev/null +++ b/pkgs/by-name/ap/apprun-cli/package.nix @@ -0,0 +1,36 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: + +buildGoModule rec { + pname = "apprun-cli"; + version = "0.0.2"; + + src = fetchFromGitHub { + owner = "fujiwara"; + repo = "apprun-cli"; + tag = "v${version}"; + hash = "sha256-SvFShjAHjIKhz/YolgmFeaAxflh3FRPEZDx57+AtXeQ="; + }; + + vendorHash = "sha256-pz97Eihc/6b2J+JuEZJQoqBkKtf1J5XbSFMQa1CJrRo="; + + ldflags = [ + "-s" + "-w" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "CLI for sakura AppRun"; + homepage = "https://github.com/fujiwara/apprun-cli"; + changelog = "https://github.com/fujiwara/apprun-cli/blob/v${version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ natsukium ]; + mainProgram = "apprun-cli"; + }; +} From 7ef96705d3a6135f60581bc9d8fd55bbc5446c92 Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 14 Feb 2025 22:43:39 +0900 Subject: [PATCH 2054/2168] usacloud: init at 1.14.1 --- pkgs/by-name/us/usacloud/package.nix | 42 ++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 pkgs/by-name/us/usacloud/package.nix diff --git a/pkgs/by-name/us/usacloud/package.nix b/pkgs/by-name/us/usacloud/package.nix new file mode 100644 index 000000000000..670c3f1e8b66 --- /dev/null +++ b/pkgs/by-name/us/usacloud/package.nix @@ -0,0 +1,42 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + versionCheckHook, + nix-update-script, +}: + +buildGoModule rec { + pname = "usacloud"; + version = "1.14.1"; + + src = fetchFromGitHub { + owner = "sacloud"; + repo = "usacloud"; + tag = "v${version}"; + hash = "sha256-bIVC0pa+54a/OpGKOM3LH7IMZnuYDvfGOMxcIwhHI7U="; + }; + + vendorHash = "sha256-m89iw5nk34KkCh8vlnKcwoPQXprUKzETYQNzi2CtX4c="; + + ldflags = [ + "-s" + "-w" + "-X=github.com/sacloud/usacloud/pkg/version.Revision=${src.rev}" + ]; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = [ "--version" ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "CLI client for the Sakura Cloud"; + homepage = "https://github.com/sacloud/usacloud"; + changelog = "https://github.com/sacloud/usacloud/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ natsukium ]; + mainProgram = "usacloud"; + }; +} From ab65a7bcbf1fb4cc0812c13e3db121bb2ab02047 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 23:44:22 +0000 Subject: [PATCH 2055/2168] python312Packages.google-cloud-dlp: 3.26.0 -> 3.27.0 --- pkgs/development/python-modules/google-cloud-dlp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index 0b19ec7c7a37..4791c06add4e 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.26.0"; + version = "3.27.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_dlp"; inherit version; - hash = "sha256-+kxjk9deiNQU+Vhjs53Xpgo/UZEtA2gDylr7WR1obzQ="; + hash = "sha256-T+BJScEpKwR3ArpBf6yQ6EZfhC7h+EusM987mJaebjM="; }; build-system = [ setuptools ]; From 773e30cab9c1c1ebb37487ea342ed682e94ee5c0 Mon Sep 17 00:00:00 2001 From: Defelo Date: Fri, 14 Feb 2025 21:46:50 +0100 Subject: [PATCH 2056/2168] zipline: 3.7.12 -> 3.7.13 --- pkgs/by-name/zi/zipline/package.nix | 6 +- pkgs/by-name/zi/zipline/prisma6.patch | 443 +++++++++++++++----------- 2 files changed, 258 insertions(+), 191 deletions(-) diff --git a/pkgs/by-name/zi/zipline/package.nix b/pkgs/by-name/zi/zipline/package.nix index 65af21fe35d7..cdaa256a5f40 100644 --- a/pkgs/by-name/zi/zipline/package.nix +++ b/pkgs/by-name/zi/zipline/package.nix @@ -29,13 +29,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "zipline"; - version = "3.7.12"; + version = "3.7.13"; src = fetchFromGitHub { owner = "diced"; repo = "zipline"; tag = "v${finalAttrs.version}"; - hash = "sha256-i3IGcSxIhy8jmCMsDJGGszYoFsShBfbv7SjTQL1dDM0="; + hash = "sha256-3+gDOlTj47qvQ3CrInT1rgBhLpyT+QA65r6OnokreWM="; }; patches = [ @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { yarn install --immutable --mode skip-build ''; - outputHash = "sha256-c7U/PMlulbjzWx0w4jstgfjeDYPkmfcXIRCDEQxhirA="; + outputHash = "sha256-niO+obo1JHAoWbLgjf1ttB6UqTCCjEuhiILvfT3O0q4="; outputHashMode = "recursive"; }; diff --git a/pkgs/by-name/zi/zipline/prisma6.patch b/pkgs/by-name/zi/zipline/prisma6.patch index e2daba87c638..c4b6f324e8b4 100644 --- a/pkgs/by-name/zi/zipline/prisma6.patch +++ b/pkgs/by-name/zi/zipline/prisma6.patch @@ -1,11 +1,11 @@ diff --git a/package.json b/package.json -index 41a84b7..eab012b 100644 +index 0d8bb1f..7c8dc67 100644 --- a/package.json +++ b/package.json @@ -39,9 +39,9 @@ - "@mantine/notifications": "^6.0.21", - "@mantine/prism": "^6.0.21", - "@mantine/spotlight": "^6.0.21", + "@mantine/notifications": "6.x", + "@mantine/prism": "6.x", + "@mantine/spotlight": "6.x", - "@prisma/client": "^5.1.1", - "@prisma/internals": "^5.1.1", - "@prisma/migrate": "^5.1.1", @@ -25,7 +25,7 @@ index 41a84b7..eab012b 100644 "qrcode": "^1.5.3", "react": "^18.2.0", diff --git a/yarn.lock b/yarn.lock -index 633a054..73e8f77 100644 +index 83a9ba4..9ea108c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12,201 +12,6 @@ __metadata: @@ -241,9 +241,9 @@ index 633a054..73e8f77 100644 - languageName: node - linkType: hard - - "@mantine/core@npm:^6.0.21": - version: 6.0.21 - resolution: "@mantine/core@npm:6.0.21" + "@mantine/core@npm:6.x": + version: 6.0.22 + resolution: "@mantine/core@npm:6.0.22" @@ -970,15 +768,6 @@ __metadata: languageName: node linkType: hard @@ -619,7 +619,7 @@ index 633a054..73e8f77 100644 version: 4.1.12 resolution: "@types/debug@npm:4.1.12" dependencies: -@@ -1839,13 +1521,6 @@ __metadata: +@@ -1855,13 +1537,6 @@ __metadata: languageName: node linkType: hard @@ -630,10 +630,10 @@ index 633a054..73e8f77 100644 - languageName: node - linkType: hard - - "@types/hast@npm:^2.0.0": - version: 2.3.8 - resolution: "@types/hast@npm:2.3.8" -@@ -1972,20 +1647,6 @@ __metadata: + "@types/hast@npm:^3.0.0": + version: 3.0.4 + resolution: "@types/hast@npm:3.0.4" +@@ -1979,20 +1654,6 @@ __metadata: languageName: node linkType: hard @@ -692,7 +692,23 @@ index 633a054..73e8f77 100644 "@typescript-eslint/eslint-plugin@npm:^6.11.0": version: 6.11.0 resolution: "@typescript-eslint/eslint-plugin@npm:6.11.0" -@@ -2436,15 +2073,6 @@ __metadata: +@@ -2343,15 +1980,6 @@ __metadata: + languageName: node + linkType: hard + +-"abort-controller@npm:^3.0.0": +- version: 3.0.0 +- resolution: "abort-controller@npm:3.0.0" +- dependencies: +- event-target-shim: ^5.0.0 +- checksum: 170bdba9b47b7e65906a28c8ce4f38a7a369d78e2271706f020849c1bfe0ee2067d4261df8bbb66eb84f79208fd5b710df759d64191db58cfba7ce8ef9c54b75 +- languageName: node +- linkType: hard +- + "abstract-logging@npm:^2.0.1": + version: 2.0.1 + resolution: "abstract-logging@npm:2.0.1" +@@ -2443,15 +2071,6 @@ __metadata: languageName: node linkType: hard @@ -708,7 +724,7 @@ index 633a054..73e8f77 100644 "ansi-regex@npm:^5.0.1": version: 5.0.1 resolution: "ansi-regex@npm:5.0.1" -@@ -2515,35 +2143,6 @@ __metadata: +@@ -2522,35 +2141,6 @@ __metadata: languageName: node linkType: hard @@ -741,10 +757,10 @@ index 633a054..73e8f77 100644 - languageName: node - linkType: hard - - "archy@npm:^1.0.0": - version: 1.0.0 - resolution: "archy@npm:1.0.0" -@@ -2706,13 +2305,6 @@ __metadata: + "are-we-there-yet@npm:^2.0.0": + version: 2.0.0 + resolution: "are-we-there-yet@npm:2.0.0" +@@ -2706,13 +2296,6 @@ __metadata: languageName: node linkType: hard @@ -758,7 +774,7 @@ index 633a054..73e8f77 100644 "async@npm:^3.2.4": version: 3.2.5 resolution: "async@npm:3.2.5" -@@ -2729,13 +2321,6 @@ __metadata: +@@ -2729,13 +2312,6 @@ __metadata: languageName: node linkType: hard @@ -772,7 +788,7 @@ index 633a054..73e8f77 100644 "atomic-sleep@npm:^1.0.0": version: 1.0.0 resolution: "atomic-sleep@npm:1.0.0" -@@ -2844,7 +2429,7 @@ __metadata: +@@ -2843,7 +2419,7 @@ __metadata: languageName: node linkType: hard @@ -781,7 +797,7 @@ index 633a054..73e8f77 100644 version: 4.1.0 resolution: "bl@npm:4.1.0" dependencies: -@@ -2855,17 +2440,6 @@ __metadata: +@@ -2854,17 +2430,6 @@ __metadata: languageName: node linkType: hard @@ -799,7 +815,7 @@ index 633a054..73e8f77 100644 "block-stream2@npm:^2.1.0": version: 2.1.0 resolution: "block-stream2@npm:2.1.0" -@@ -2919,27 +2493,13 @@ __metadata: +@@ -2918,27 +2483,13 @@ __metadata: languageName: node linkType: hard @@ -828,7 +844,7 @@ index 633a054..73e8f77 100644 "buffer-from@npm:^1.0.0": version: 1.1.2 resolution: "buffer-from@npm:1.1.2" -@@ -2954,13 +2514,6 @@ __metadata: +@@ -2953,13 +2504,6 @@ __metadata: languageName: node linkType: hard @@ -842,7 +858,24 @@ index 633a054..73e8f77 100644 "buffer@npm:^5.5.0": version: 5.7.1 resolution: "buffer@npm:5.7.1" -@@ -3094,7 +2647,7 @@ __metadata: +@@ -2970,16 +2514,6 @@ __metadata: + languageName: node + linkType: hard + +-"buffer@npm:^6.0.3": +- version: 6.0.3 +- resolution: "buffer@npm:6.0.3" +- dependencies: +- base64-js: ^1.3.1 +- ieee754: ^1.2.1 +- checksum: 5ad23293d9a731e4318e420025800b42bf0d264004c0286c8cc010af7a270c7a0f6522e84f54b9ad65cbd6db20b8badbfd8d2ebf4f80fa03dab093b89e68c3f9 +- languageName: node +- linkType: hard +- + "bundle-name@npm:^3.0.0": + version: 3.0.0 + resolution: "bundle-name@npm:3.0.0" +@@ -3093,7 +2627,7 @@ __metadata: languageName: node linkType: hard @@ -851,7 +884,7 @@ index 633a054..73e8f77 100644 version: 4.1.2 resolution: "chalk@npm:4.1.2" dependencies: -@@ -3111,20 +2664,6 @@ __metadata: +@@ -3131,20 +2665,6 @@ __metadata: languageName: node linkType: hard @@ -872,7 +905,7 @@ index 633a054..73e8f77 100644 "chokidar@npm:^3.5.1": version: 3.5.3 resolution: "chokidar@npm:3.5.3" -@@ -3158,13 +2697,6 @@ __metadata: +@@ -3178,13 +2698,6 @@ __metadata: languageName: node linkType: hard @@ -886,7 +919,7 @@ index 633a054..73e8f77 100644 "clean-stack@npm:^2.0.0": version: 2.2.0 resolution: "clean-stack@npm:2.2.0" -@@ -3172,32 +2704,6 @@ __metadata: +@@ -3192,32 +2705,6 @@ __metadata: languageName: node linkType: hard @@ -919,7 +952,7 @@ index 633a054..73e8f77 100644 "client-only@npm:0.0.1": version: 0.0.1 resolution: "client-only@npm:0.0.1" -@@ -3216,13 +2722,6 @@ __metadata: +@@ -3236,13 +2723,6 @@ __metadata: languageName: node linkType: hard @@ -933,7 +966,7 @@ index 633a054..73e8f77 100644 "clsx@npm:1.1.1": version: 1.1.1 resolution: "clsx@npm:1.1.1" -@@ -3298,15 +2797,6 @@ __metadata: +@@ -3318,15 +2798,6 @@ __metadata: languageName: node linkType: hard @@ -949,7 +982,7 @@ index 633a054..73e8f77 100644 "comma-separated-tokens@npm:^2.0.0": version: 2.0.3 resolution: "comma-separated-tokens@npm:2.0.3" -@@ -3314,13 +2804,6 @@ __metadata: +@@ -3334,13 +2805,6 @@ __metadata: languageName: node linkType: hard @@ -963,7 +996,7 @@ index 633a054..73e8f77 100644 "commander@npm:^4.0.0": version: 4.1.1 resolution: "commander@npm:4.1.1" -@@ -3335,25 +2818,6 @@ __metadata: +@@ -3355,25 +2819,6 @@ __metadata: languageName: node linkType: hard @@ -989,7 +1022,7 @@ index 633a054..73e8f77 100644 "concat-map@npm:0.0.1": version: 0.0.1 resolution: "concat-map@npm:0.0.1" -@@ -3433,25 +2897,6 @@ __metadata: +@@ -3453,25 +2898,6 @@ __metadata: languageName: node linkType: hard @@ -1015,7 +1048,7 @@ index 633a054..73e8f77 100644 "cross-env@npm:^7.0.3": version: 7.0.3 resolution: "cross-env@npm:7.0.3" -@@ -3464,17 +2909,6 @@ __metadata: +@@ -3484,17 +2910,6 @@ __metadata: languageName: node linkType: hard @@ -1033,7 +1066,7 @@ index 633a054..73e8f77 100644 "cross-spawn@npm:^6.0.5": version: 6.0.5 resolution: "cross-spawn@npm:6.0.5" -@@ -3488,10 +2922,14 @@ __metadata: +@@ -3508,10 +2923,14 @@ __metadata: languageName: node linkType: hard @@ -1052,7 +1085,7 @@ index 633a054..73e8f77 100644 languageName: node linkType: hard -@@ -3616,7 +3054,7 @@ __metadata: +@@ -3636,7 +3055,7 @@ __metadata: languageName: node linkType: hard @@ -1061,7 +1094,7 @@ index 633a054..73e8f77 100644 version: 4.3.4 resolution: "debug@npm:4.3.4" dependencies: -@@ -3712,16 +3150,7 @@ __metadata: +@@ -3732,16 +3151,7 @@ __metadata: languageName: node linkType: hard @@ -1079,7 +1112,7 @@ index 633a054..73e8f77 100644 version: 1.1.1 resolution: "define-data-property@npm:1.1.1" dependencies: -@@ -3732,13 +3161,6 @@ __metadata: +@@ -3752,13 +3162,6 @@ __metadata: languageName: node linkType: hard @@ -1093,7 +1126,7 @@ index 633a054..73e8f77 100644 "define-lazy-prop@npm:^3.0.0": version: 3.0.0 resolution: "define-lazy-prop@npm:3.0.0" -@@ -3757,29 +3179,6 @@ __metadata: +@@ -3777,29 +3180,6 @@ __metadata: languageName: node linkType: hard @@ -1123,7 +1156,7 @@ index 633a054..73e8f77 100644 "delegates@npm:^1.0.0": version: 1.0.0 resolution: "delegates@npm:1.0.0" -@@ -3787,13 +3186,6 @@ __metadata: +@@ -3807,13 +3187,6 @@ __metadata: languageName: node linkType: hard @@ -1137,7 +1170,7 @@ index 633a054..73e8f77 100644 "dequal@npm:^2.0.0, dequal@npm:^2.0.3": version: 2.0.3 resolution: "dequal@npm:2.0.3" -@@ -3929,13 +3321,6 @@ __metadata: +@@ -3942,13 +3315,6 @@ __metadata: languageName: node linkType: hard @@ -1151,7 +1184,7 @@ index 633a054..73e8f77 100644 "dotenv@npm:^16.3.1": version: 16.3.1 resolution: "dotenv@npm:16.3.1" -@@ -3959,15 +3344,6 @@ __metadata: +@@ -3972,15 +3338,6 @@ __metadata: languageName: node linkType: hard @@ -1167,7 +1200,7 @@ index 633a054..73e8f77 100644 "emoji-regex@npm:^8.0.0": version: 8.0.0 resolution: "emoji-regex@npm:8.0.0" -@@ -4031,7 +3407,7 @@ __metadata: +@@ -4044,7 +3401,7 @@ __metadata: languageName: node linkType: hard @@ -1176,7 +1209,7 @@ index 633a054..73e8f77 100644 version: 2.2.1 resolution: "env-paths@npm:2.2.1" checksum: 65b5df55a8bab92229ab2b40dad3b387fad24613263d103a97f91c9fe43ceb21965cd3392b1ccb5d77088021e525c4e0481adb309625d0cb94ade1d1fb8dc17e -@@ -4101,22 +3477,6 @@ __metadata: +@@ -4114,22 +3471,6 @@ __metadata: languageName: node linkType: hard @@ -1199,7 +1232,7 @@ index 633a054..73e8f77 100644 "es-iterator-helpers@npm:^1.0.12, es-iterator-helpers@npm:^1.0.15": version: 1.0.15 resolution: "es-iterator-helpers@npm:1.0.15" -@@ -4247,13 +3607,6 @@ __metadata: +@@ -4260,13 +3601,6 @@ __metadata: languageName: node linkType: hard @@ -1213,7 +1246,7 @@ index 633a054..73e8f77 100644 "escape-string-regexp@npm:^1.0.5": version: 1.0.5 resolution: "escape-string-regexp@npm:1.0.5" -@@ -4261,10 +3614,10 @@ __metadata: +@@ -4274,10 +3608,10 @@ __metadata: languageName: node linkType: hard @@ -1228,24 +1261,37 @@ index 633a054..73e8f77 100644 languageName: node linkType: hard -@@ -4601,14 +3954,14 @@ __metadata: +@@ -4607,13 +3941,6 @@ __metadata: + languageName: node + linkType: hard + +-"event-target-shim@npm:^5.0.0": +- version: 5.0.1 +- resolution: "event-target-shim@npm:5.0.1" +- checksum: 1ffe3bb22a6d51bdeb6bf6f7cf97d2ff4a74b017ad12284cc9e6a279e727dc30a5de6bb613e5596ff4dc3e517841339ad09a7eec44266eccb1aa201a30448166 +- languageName: node +- linkType: hard +- + "eventemitter3@npm:^4.0.1": + version: 4.0.7 + resolution: "eventemitter3@npm:4.0.7" +@@ -4621,14 +3948,7 @@ __metadata: languageName: node linkType: hard -"events@npm:^3.0.0, events@npm:^3.3.0": -+"events@npm:^3.3.0": - version: 3.3.0 - resolution: "events@npm:3.3.0" - checksum: f6f487ad2198aa41d878fa31452f1a3c00958f46e9019286ff4787c84aac329332ab45c9cdc8c445928fc6d7ded294b9e005a7fce9426488518017831b272780 - languageName: node - linkType: hard - +- version: 3.3.0 +- resolution: "events@npm:3.3.0" +- checksum: f6f487ad2198aa41d878fa31452f1a3c00958f46e9019286ff4787c84aac329332ab45c9cdc8c445928fc6d7ded294b9e005a7fce9426488518017831b272780 +- languageName: node +- linkType: hard +- -"execa@npm:5.1.1, execa@npm:^5.0.0": +"execa@npm:^5.0.0": version: 5.1.1 resolution: "execa@npm:5.1.1" dependencies: -@@ -4908,17 +4261,6 @@ __metadata: +@@ -4937,17 +4257,6 @@ __metadata: languageName: node linkType: hard @@ -1263,7 +1309,7 @@ index 633a054..73e8f77 100644 "find-my-way@npm:^7.7.0": version: 7.7.0 resolution: "find-my-way@npm:7.7.0" -@@ -4937,26 +4279,7 @@ __metadata: +@@ -4977,26 +4286,7 @@ __metadata: languageName: node linkType: hard @@ -1291,7 +1337,7 @@ index 633a054..73e8f77 100644 version: 4.1.0 resolution: "find-up@npm:4.1.0" dependencies: -@@ -4966,6 +4289,16 @@ __metadata: +@@ -5006,6 +4296,16 @@ __metadata: languageName: node linkType: hard @@ -1308,7 +1354,7 @@ index 633a054..73e8f77 100644 "flat-cache@npm:^3.0.4": version: 3.1.1 resolution: "flat-cache@npm:3.1.1" -@@ -5003,17 +4336,6 @@ __metadata: +@@ -5043,17 +4343,6 @@ __metadata: languageName: node linkType: hard @@ -1326,7 +1372,7 @@ index 633a054..73e8f77 100644 "forwarded@npm:0.2.0": version: 0.2.0 resolution: "forwarded@npm:0.2.0" -@@ -5021,13 +4343,6 @@ __metadata: +@@ -5061,13 +4350,6 @@ __metadata: languageName: node linkType: hard @@ -1340,7 +1386,7 @@ index 633a054..73e8f77 100644 "fs-constants@npm:^1.0.0": version: 1.0.0 resolution: "fs-constants@npm:1.0.0" -@@ -5046,15 +4361,6 @@ __metadata: +@@ -5086,15 +4368,6 @@ __metadata: languageName: node linkType: hard @@ -1356,7 +1402,7 @@ index 633a054..73e8f77 100644 "fs-minipass@npm:^2.0.0": version: 2.1.0 resolution: "fs-minipass@npm:2.1.0" -@@ -5080,7 +4386,7 @@ __metadata: +@@ -5120,7 +4393,7 @@ __metadata: languageName: node linkType: hard @@ -1365,7 +1411,7 @@ index 633a054..73e8f77 100644 version: 2.3.3 resolution: "fsevents@npm:2.3.3" dependencies: -@@ -5090,7 +4396,7 @@ __metadata: +@@ -5130,7 +4403,7 @@ __metadata: languageName: node linkType: hard @@ -1374,7 +1420,7 @@ index 633a054..73e8f77 100644 version: 2.3.3 resolution: "fsevents@patch:fsevents@npm%3A2.3.3#~builtin::version=2.3.3&hash=df0bf1" dependencies: -@@ -5168,13 +4474,6 @@ __metadata: +@@ -5208,13 +4481,6 @@ __metadata: languageName: node linkType: hard @@ -1388,7 +1434,7 @@ index 633a054..73e8f77 100644 "get-stream@npm:^6.0.0, get-stream@npm:^6.0.1": version: 6.0.1 resolution: "get-stream@npm:6.0.1" -@@ -5290,28 +4589,6 @@ __metadata: +@@ -5330,28 +4596,6 @@ __metadata: languageName: node linkType: hard @@ -1417,7 +1463,7 @@ index 633a054..73e8f77 100644 "globals@npm:^13.19.0": version: 13.23.0 resolution: "globals@npm:13.23.0" -@@ -5330,7 +4607,7 @@ __metadata: +@@ -5370,7 +4614,7 @@ __metadata: languageName: node linkType: hard @@ -1426,7 +1472,7 @@ index 633a054..73e8f77 100644 version: 11.1.0 resolution: "globby@npm:11.1.0" dependencies: -@@ -5434,23 +4711,6 @@ __metadata: +@@ -5474,23 +4718,6 @@ __metadata: languageName: node linkType: hard @@ -1450,7 +1496,7 @@ index 633a054..73e8f77 100644 "hasown@npm:^2.0.0": version: 2.0.0 resolution: "hasown@npm:2.0.0" -@@ -5550,7 +4810,7 @@ __metadata: +@@ -5622,7 +4849,7 @@ __metadata: languageName: node linkType: hard @@ -1459,7 +1505,7 @@ index 633a054..73e8f77 100644 version: 7.0.0 resolution: "http-proxy-agent@npm:7.0.0" dependencies: -@@ -5560,17 +4820,6 @@ __metadata: +@@ -5632,17 +4859,6 @@ __metadata: languageName: node linkType: hard @@ -1477,7 +1523,7 @@ index 633a054..73e8f77 100644 "http-response-object@npm:^3.0.1": version: 3.0.2 resolution: "http-response-object@npm:3.0.2" -@@ -5580,16 +4829,6 @@ __metadata: +@@ -5652,16 +4868,6 @@ __metadata: languageName: node linkType: hard @@ -1494,7 +1540,7 @@ index 633a054..73e8f77 100644 "https-proxy-agent@npm:^5.0.0": version: 5.0.1 resolution: "https-proxy-agent@npm:5.0.1" -@@ -5600,6 +4839,16 @@ __metadata: +@@ -5672,6 +4878,16 @@ __metadata: languageName: node linkType: hard @@ -1511,7 +1557,7 @@ index 633a054..73e8f77 100644 "human-signals@npm:^2.1.0": version: 2.1.0 resolution: "human-signals@npm:2.1.0" -@@ -5614,7 +4863,7 @@ __metadata: +@@ -5686,7 +4902,7 @@ __metadata: languageName: node linkType: hard @@ -1520,7 +1566,15 @@ index 633a054..73e8f77 100644 version: 0.6.3 resolution: "iconv-lite@npm:0.6.3" dependencies: -@@ -5630,15 +4879,6 @@ __metadata: +@@ -5695,22 +4911,13 @@ __metadata: + languageName: node + linkType: hard + +-"ieee754@npm:^1.1.13, ieee754@npm:^1.2.1": ++"ieee754@npm:^1.1.13": + version: 1.2.1 + resolution: "ieee754@npm:1.2.1" + checksum: 5144c0c9815e54ada181d80a0b810221a253562422e7c6c3a60b1901154184f49326ec239d618c416c1c5945a2e197107aee8d986a3dd836b53dffefd99b5e7e languageName: node linkType: hard @@ -1536,7 +1590,7 @@ index 633a054..73e8f77 100644 "ignore@npm:^5.2.0": version: 5.2.4 resolution: "ignore@npm:5.2.4" -@@ -5670,7 +4910,7 @@ __metadata: +@@ -5742,7 +4949,7 @@ __metadata: languageName: node linkType: hard @@ -1545,7 +1599,7 @@ index 633a054..73e8f77 100644 version: 4.0.0 resolution: "indent-string@npm:4.0.0" checksum: 824cfb9929d031dabf059bebfe08cf3137365e112019086ed3dcff6a0a7b698cb80cf67ccccde0e25b9e2d7527aa6cc1fed1ac490c752162496caba3e6699612 -@@ -5694,13 +4934,6 @@ __metadata: +@@ -5766,13 +4973,6 @@ __metadata: languageName: node linkType: hard @@ -1559,7 +1613,7 @@ index 633a054..73e8f77 100644 "ini@npm:~1.3.0": version: 1.3.8 resolution: "ini@npm:1.3.8" -@@ -5867,7 +5100,7 @@ __metadata: +@@ -5963,7 +5163,7 @@ __metadata: languageName: node linkType: hard @@ -1568,7 +1622,7 @@ index 633a054..73e8f77 100644 version: 2.2.1 resolution: "is-docker@npm:2.2.1" bin: -@@ -5937,13 +5170,6 @@ __metadata: +@@ -6040,13 +5240,6 @@ __metadata: languageName: node linkType: hard @@ -1582,7 +1636,7 @@ index 633a054..73e8f77 100644 "is-lambda@npm:^1.0.1": version: 1.0.1 resolution: "is-lambda@npm:1.0.1" -@@ -5981,14 +5207,7 @@ __metadata: +@@ -6084,14 +5277,7 @@ __metadata: languageName: node linkType: hard @@ -1598,7 +1652,7 @@ index 633a054..73e8f77 100644 version: 3.0.3 resolution: "is-path-inside@npm:3.0.3" checksum: abd50f06186a052b349c15e55b182326f1936c89a78bf6c8f2b707412517c097ce04bc49a0ca221787bc44e1049f51f09a2ffb63d22899051988d3a618ba13e9 -@@ -6069,13 +5288,6 @@ __metadata: +@@ -6172,13 +5358,6 @@ __metadata: languageName: node linkType: hard @@ -1612,7 +1666,7 @@ index 633a054..73e8f77 100644 "is-weakmap@npm:^2.0.1": version: 2.0.1 resolution: "is-weakmap@npm:2.0.1" -@@ -6102,14 +5314,7 @@ __metadata: +@@ -6205,14 +5384,7 @@ __metadata: languageName: node linkType: hard @@ -1628,7 +1682,7 @@ index 633a054..73e8f77 100644 version: 2.2.0 resolution: "is-wsl@npm:2.2.0" dependencies: -@@ -6186,13 +5391,6 @@ __metadata: +@@ -6289,13 +5461,6 @@ __metadata: languageName: node linkType: hard @@ -1642,7 +1696,7 @@ index 633a054..73e8f77 100644 "js-tokens@npm:^3.0.0 || ^4.0.0, js-tokens@npm:^4.0.0": version: 4.0.0 resolution: "js-tokens@npm:4.0.0" -@@ -6211,13 +5409,6 @@ __metadata: +@@ -6314,13 +5479,6 @@ __metadata: languageName: node linkType: hard @@ -1656,7 +1710,7 @@ index 633a054..73e8f77 100644 "json-buffer@npm:3.0.1": version: 3.0.1 resolution: "json-buffer@npm:3.0.1" -@@ -6300,24 +5491,6 @@ __metadata: +@@ -6403,24 +5561,6 @@ __metadata: languageName: node linkType: hard @@ -1681,7 +1735,7 @@ index 633a054..73e8f77 100644 "jsx-ast-utils@npm:^2.4.1 || ^3.0.0, jsx-ast-utils@npm:^3.3.5": version: 3.3.5 resolution: "jsx-ast-utils@npm:3.3.5" -@@ -6330,55 +5503,6 @@ __metadata: +@@ -6433,55 +5573,6 @@ __metadata: languageName: node linkType: hard @@ -1737,11 +1791,11 @@ index 633a054..73e8f77 100644 "katex@npm:^0.16.9": version: 0.16.9 resolution: "katex@npm:0.16.9" -@@ -6399,13 +5523,6 @@ __metadata: +@@ -6502,13 +5593,6 @@ __metadata: languageName: node linkType: hard --"kleur@npm:4.1.5, kleur@npm:^4.0.3": +-"kleur@npm:4.1.5": - version: 4.1.5 - resolution: "kleur@npm:4.1.5" - checksum: 1dc476e32741acf0b1b5b0627ffd0d722e342c1b0da14de3e8ae97821327ca08f9fb944542fb3c126d90ac5f27f9d804edbe7c585bf7d12ef495d115e0f22c12 @@ -1751,21 +1805,7 @@ index 633a054..73e8f77 100644 "kleur@npm:^3.0.3": version: 3.0.3 resolution: "kleur@npm:3.0.3" -@@ -6413,6 +5530,13 @@ __metadata: - languageName: node - linkType: hard - -+"kleur@npm:^4.0.3": -+ version: 4.1.5 -+ resolution: "kleur@npm:4.1.5" -+ checksum: 1dc476e32741acf0b1b5b0627ffd0d722e342c1b0da14de3e8ae97821327ca08f9fb944542fb3c126d90ac5f27f9d804edbe7c585bf7d12ef495d115e0f22c12 -+ languageName: node -+ linkType: hard -+ - "klona@npm:^2.0.5": - version: 2.0.6 - resolution: "klona@npm:2.0.6" -@@ -6436,15 +5560,6 @@ __metadata: +@@ -6539,15 +5623,6 @@ __metadata: languageName: node linkType: hard @@ -1781,7 +1821,7 @@ index 633a054..73e8f77 100644 "levn@npm:^0.4.1": version: 0.4.1 resolution: "levn@npm:0.4.1" -@@ -6499,16 +5614,6 @@ __metadata: +@@ -6602,16 +5677,6 @@ __metadata: languageName: node linkType: hard @@ -1798,7 +1838,7 @@ index 633a054..73e8f77 100644 "locate-path@npm:^5.0.0": version: 5.0.0 resolution: "locate-path@npm:5.0.0" -@@ -6527,55 +5632,6 @@ __metadata: +@@ -6630,55 +5695,6 @@ __metadata: languageName: node linkType: hard @@ -1854,7 +1894,7 @@ index 633a054..73e8f77 100644 "lodash.merge@npm:^4.6.2": version: 4.6.2 resolution: "lodash.merge@npm:4.6.2" -@@ -6583,13 +5639,6 @@ __metadata: +@@ -6686,13 +5702,6 @@ __metadata: languageName: node linkType: hard @@ -1868,7 +1908,7 @@ index 633a054..73e8f77 100644 "lodash.sortby@npm:^4.7.0": version: 4.7.0 resolution: "lodash.sortby@npm:4.7.0" -@@ -6597,35 +5646,13 @@ __metadata: +@@ -6700,35 +5709,13 @@ __metadata: languageName: node linkType: hard @@ -1905,7 +1945,7 @@ index 633a054..73e8f77 100644 "longest-streak@npm:^3.0.0": version: 3.1.0 resolution: "longest-streak@npm:3.1.0" -@@ -6669,16 +5696,7 @@ __metadata: +@@ -6772,16 +5759,7 @@ __metadata: languageName: node linkType: hard @@ -1923,7 +1963,7 @@ index 633a054..73e8f77 100644 version: 3.1.0 resolution: "make-dir@npm:3.1.0" dependencies: -@@ -6717,19 +5735,6 @@ __metadata: +@@ -6820,19 +5798,6 @@ __metadata: languageName: node linkType: hard @@ -1943,7 +1983,7 @@ index 633a054..73e8f77 100644 "markdown-table@npm:^3.0.0": version: 3.0.3 resolution: "markdown-table@npm:3.0.3" -@@ -6944,13 +5949,6 @@ __metadata: +@@ -7056,13 +6021,6 @@ __metadata: languageName: node linkType: hard @@ -1957,7 +1997,7 @@ index 633a054..73e8f77 100644 "memorystream@npm:^0.3.1": version: 0.3.1 resolution: "memorystream@npm:0.3.1" -@@ -7554,7 +6552,7 @@ __metadata: +@@ -7430,7 +6388,7 @@ __metadata: languageName: node linkType: hard @@ -1966,7 +2006,7 @@ index 633a054..73e8f77 100644 version: 2.1.35 resolution: "mime-types@npm:2.1.35" dependencies: -@@ -7584,13 +6582,6 @@ __metadata: +@@ -7460,13 +6418,6 @@ __metadata: languageName: node linkType: hard @@ -1980,7 +2020,7 @@ index 633a054..73e8f77 100644 "minimatch@npm:^3.0.4, minimatch@npm:^3.0.5, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2": version: 3.1.2 resolution: "minimatch@npm:3.1.2" -@@ -7600,15 +6591,6 @@ __metadata: +@@ -7476,15 +6427,6 @@ __metadata: languageName: node linkType: hard @@ -1996,7 +2036,7 @@ index 633a054..73e8f77 100644 "minimatch@npm:^9.0.1": version: 9.0.3 resolution: "minimatch@npm:9.0.3" -@@ -7758,81 +6740,6 @@ __metadata: +@@ -7634,81 +6576,6 @@ __metadata: languageName: node linkType: hard @@ -2075,10 +2115,10 @@ index 633a054..73e8f77 100644 - languageName: node - linkType: hard - - "mri@npm:^1.1.0": - version: 1.2.0 - resolution: "mri@npm:1.2.0" -@@ -7847,7 +6754,7 @@ __metadata: + "ms@npm:2.1.2": + version: 2.1.2 + resolution: "ms@npm:2.1.2" +@@ -7716,7 +6583,7 @@ __metadata: languageName: node linkType: hard @@ -2087,7 +2127,7 @@ index 633a054..73e8f77 100644 version: 2.1.3 resolution: "ms@npm:2.1.3" checksum: aa92de608021b242401676e35cfa5aa42dd70cbdc082b916da7fb925c542173e36bce97ea3e804923fe92c0ad991434e4a38327e15a1b5b5f945d66df615ae6d -@@ -7861,22 +6768,6 @@ __metadata: +@@ -7730,22 +6597,6 @@ __metadata: languageName: node linkType: hard @@ -2110,7 +2150,7 @@ index 633a054..73e8f77 100644 "multer@npm:^1.4.5-lts.1": version: 1.4.5-lts.1 resolution: "multer@npm:1.4.5-lts.1" -@@ -7929,13 +6820,6 @@ __metadata: +@@ -7798,13 +6649,6 @@ __metadata: languageName: node linkType: hard @@ -2124,7 +2164,7 @@ index 633a054..73e8f77 100644 "natural-compare@npm:^1.4.0": version: 1.4.0 resolution: "natural-compare@npm:1.4.0" -@@ -7950,13 +6834,6 @@ __metadata: +@@ -7819,13 +6663,6 @@ __metadata: languageName: node linkType: hard @@ -2138,7 +2178,7 @@ index 633a054..73e8f77 100644 "next@npm:^14.0.3": version: 14.0.3 resolution: "next@npm:14.0.3" -@@ -8028,13 +6905,6 @@ __metadata: +@@ -7897,13 +6734,6 @@ __metadata: languageName: node linkType: hard @@ -2152,7 +2192,7 @@ index 633a054..73e8f77 100644 "node-addon-api@npm:^6.1.0": version: 6.1.0 resolution: "node-addon-api@npm:6.1.0" -@@ -8053,21 +6923,7 @@ __metadata: +@@ -7922,21 +6752,7 @@ __metadata: languageName: node linkType: hard @@ -2175,7 +2215,7 @@ index 633a054..73e8f77 100644 version: 2.7.0 resolution: "node-fetch@npm:2.7.0" dependencies: -@@ -8123,7 +6979,7 @@ __metadata: +@@ -7992,7 +6808,7 @@ __metadata: languageName: node linkType: hard @@ -2184,7 +2224,7 @@ index 633a054..73e8f77 100644 version: 2.5.0 resolution: "normalize-package-data@npm:2.5.0" dependencies: -@@ -8142,36 +6998,6 @@ __metadata: +@@ -8011,36 +6827,6 @@ __metadata: languageName: node linkType: hard @@ -2221,7 +2261,7 @@ index 633a054..73e8f77 100644 "npm-run-all@npm:^4.1.5": version: 4.1.5 resolution: "npm-run-all@npm:4.1.5" -@@ -8334,7 +7160,7 @@ __metadata: +@@ -8203,7 +6989,7 @@ __metadata: languageName: node linkType: hard @@ -2230,7 +2270,7 @@ index 633a054..73e8f77 100644 version: 5.1.2 resolution: "onetime@npm:5.1.2" dependencies: -@@ -8352,27 +7178,6 @@ __metadata: +@@ -8221,27 +7007,6 @@ __metadata: languageName: node linkType: hard @@ -2258,7 +2298,7 @@ index 633a054..73e8f77 100644 "open@npm:^9.1.0": version: 9.1.0 resolution: "open@npm:9.1.0" -@@ -8399,23 +7204,6 @@ __metadata: +@@ -8268,23 +7033,6 @@ __metadata: languageName: node linkType: hard @@ -2282,7 +2322,7 @@ index 633a054..73e8f77 100644 "otplib@npm:^12.0.1": version: 12.0.1 resolution: "otplib@npm:12.0.1" -@@ -8427,16 +7215,7 @@ __metadata: +@@ -8296,16 +7044,7 @@ __metadata: languageName: node linkType: hard @@ -2300,7 +2340,7 @@ index 633a054..73e8f77 100644 version: 2.3.0 resolution: "p-limit@npm:2.3.0" dependencies: -@@ -8454,15 +7233,6 @@ __metadata: +@@ -8323,15 +7062,6 @@ __metadata: languageName: node linkType: hard @@ -2316,7 +2356,7 @@ index 633a054..73e8f77 100644 "p-locate@npm:^4.1.0": version: 4.1.0 resolution: "p-locate@npm:4.1.0" -@@ -8481,7 +7251,7 @@ __metadata: +@@ -8350,7 +7080,7 @@ __metadata: languageName: node linkType: hard @@ -2325,7 +2365,7 @@ index 633a054..73e8f77 100644 version: 4.0.0 resolution: "p-map@npm:4.0.0" dependencies: -@@ -8490,23 +7260,6 @@ __metadata: +@@ -8359,23 +7089,6 @@ __metadata: languageName: node linkType: hard @@ -2349,7 +2389,7 @@ index 633a054..73e8f77 100644 "p-try@npm:^2.0.0": version: 2.2.0 resolution: "p-try@npm:2.2.0" -@@ -8514,13 +7267,6 @@ __metadata: +@@ -8383,13 +7096,6 @@ __metadata: languageName: node linkType: hard @@ -2363,7 +2403,7 @@ index 633a054..73e8f77 100644 "parent-module@npm:^1.0.0": version: 1.0.1 resolution: "parent-module@npm:1.0.1" -@@ -8559,13 +7305,6 @@ __metadata: +@@ -8443,13 +7149,6 @@ __metadata: languageName: node linkType: hard @@ -2377,7 +2417,7 @@ index 633a054..73e8f77 100644 "path-exists@npm:^4.0.0": version: 4.0.0 resolution: "path-exists@npm:4.0.0" -@@ -8634,89 +7373,6 @@ __metadata: +@@ -8518,89 +7217,6 @@ __metadata: languageName: node linkType: hard @@ -2467,7 +2507,7 @@ index 633a054..73e8f77 100644 "picocolors@npm:^1.0.0": version: 1.0.0 resolution: "picocolors@npm:1.0.0" -@@ -8792,24 +7448,6 @@ __metadata: +@@ -8675,24 +7291,6 @@ __metadata: languageName: node linkType: hard @@ -2492,7 +2532,7 @@ index 633a054..73e8f77 100644 "pngjs@npm:^5.0.0": version: 5.0.0 resolution: "pngjs@npm:5.0.0" -@@ -8846,36 +7484,6 @@ __metadata: +@@ -8729,36 +7327,6 @@ __metadata: languageName: node linkType: hard @@ -2529,7 +2569,7 @@ index 633a054..73e8f77 100644 "prebuild-install@npm:^7.1.1": version: 7.1.1 resolution: "prebuild-install@npm:7.1.1" -@@ -8932,14 +7540,23 @@ __metadata: +@@ -8815,14 +7383,23 @@ __metadata: languageName: node linkType: hard @@ -2558,16 +2598,23 @@ index 633a054..73e8f77 100644 languageName: node linkType: hard -@@ -8978,7 +7595,7 @@ __metadata: +@@ -8868,14 +7445,7 @@ __metadata: languageName: node linkType: hard +-"process@npm:^0.11.10": +- version: 0.11.10 +- resolution: "process@npm:0.11.10" +- checksum: bfcce49814f7d172a6e6a14d5fa3ac92cc3d0c3b9feb1279774708a719e19acd673995226351a082a9ae99978254e320ccda4240ddc474ba31a76c79491ca7c3 +- languageName: node +- linkType: hard +- -"progress@npm:2.0.3, progress@npm:^2.0.3": +"progress@npm:^2.0.3": version: 2.0.3 resolution: "progress@npm:2.0.3" checksum: f67403fe7b34912148d9252cb7481266a354bd99ce82c835f79070643bb3c6583d10dbcfda4d41e04bbc1d8437e9af0fb1e1f2135727878f5308682a579429b7 -@@ -9043,7 +7660,7 @@ __metadata: +@@ -8940,7 +7510,7 @@ __metadata: languageName: node linkType: hard @@ -2576,7 +2623,7 @@ index 633a054..73e8f77 100644 version: 2.3.1 resolution: "punycode@npm:2.3.1" checksum: bb0a0ceedca4c3c57a9b981b90601579058903c62be23c5e8e843d2c2d4148a3ecf029d5133486fb0e1822b098ba8bba09e89d6b21742d02fa26bda6441a6fb2 -@@ -9308,17 +7925,6 @@ __metadata: +@@ -9193,17 +7763,6 @@ __metadata: languageName: node linkType: hard @@ -2594,7 +2641,7 @@ index 633a054..73e8f77 100644 "read-pkg@npm:^3.0.0": version: 3.0.0 resolution: "read-pkg@npm:3.0.0" -@@ -9330,18 +7936,6 @@ __metadata: +@@ -9215,18 +7774,6 @@ __metadata: languageName: node linkType: hard @@ -2613,7 +2660,7 @@ index 633a054..73e8f77 100644 "readable-stream@npm:3, readable-stream@npm:^3.0.2, readable-stream@npm:^3.1.1, readable-stream@npm:^3.4.0, readable-stream@npm:^3.6.0": version: 3.6.2 resolution: "readable-stream@npm:3.6.2" -@@ -9353,7 +7947,7 @@ __metadata: +@@ -9238,7 +7785,7 @@ __metadata: languageName: node linkType: hard @@ -2622,16 +2669,27 @@ index 633a054..73e8f77 100644 version: 2.3.8 resolution: "readable-stream@npm:2.3.8" dependencies: -@@ -9368,7 +7962,7 @@ __metadata: +@@ -9253,19 +7800,6 @@ __metadata: languageName: node linkType: hard --"readable-stream@npm:^4.0.0, readable-stream@npm:^4.2.0": -+"readable-stream@npm:^4.0.0": - version: 4.4.2 - resolution: "readable-stream@npm:4.4.2" - dependencies: -@@ -9393,15 +7987,6 @@ __metadata: +-"readable-stream@npm:^4.2.0": +- version: 4.4.2 +- resolution: "readable-stream@npm:4.4.2" +- dependencies: +- abort-controller: ^3.0.0 +- buffer: ^6.0.3 +- events: ^3.3.0 +- process: ^0.11.10 +- string_decoder: ^1.3.0 +- checksum: 6f4063763dbdb52658d22d3f49ca976420e1fbe16bbd241f744383715845350b196a2f08b8d6330f8e219153dff34b140aeefd6296da828e1041a7eab1f20d5e +- languageName: node +- linkType: hard +- + "readable-stream@npm:~1.0.17, readable-stream@npm:~1.0.27-1": + version: 1.0.34 + resolution: "readable-stream@npm:1.0.34" +@@ -9278,15 +7812,6 @@ __metadata: languageName: node linkType: hard @@ -2647,7 +2705,7 @@ index 633a054..73e8f77 100644 "readdirp@npm:~3.6.0": version: 3.6.0 resolution: "readdirp@npm:3.6.0" -@@ -9555,13 +8140,6 @@ __metadata: +@@ -9430,13 +7955,6 @@ __metadata: languageName: node linkType: hard @@ -2661,7 +2719,7 @@ index 633a054..73e8f77 100644 "require-directory@npm:^2.1.1": version: 2.1.1 resolution: "require-directory@npm:2.1.1" -@@ -9604,7 +8182,7 @@ __metadata: +@@ -9479,7 +7997,7 @@ __metadata: languageName: node linkType: hard @@ -2670,7 +2728,7 @@ index 633a054..73e8f77 100644 version: 1.22.8 resolution: "resolve@npm:1.22.8" dependencies: -@@ -9630,7 +8208,7 @@ __metadata: +@@ -9505,7 +8023,7 @@ __metadata: languageName: node linkType: hard @@ -2679,7 +2737,7 @@ index 633a054..73e8f77 100644 version: 1.22.8 resolution: "resolve@patch:resolve@npm%3A1.22.8#~builtin::version=1.22.8&hash=c3c19d" dependencies: -@@ -9656,16 +8234,6 @@ __metadata: +@@ -9531,16 +8049,6 @@ __metadata: languageName: node linkType: hard @@ -2696,7 +2754,7 @@ index 633a054..73e8f77 100644 "ret@npm:~0.2.0": version: 0.2.2 resolution: "ret@npm:0.2.2" -@@ -9680,13 +8248,6 @@ __metadata: +@@ -9562,13 +8070,6 @@ __metadata: languageName: node linkType: hard @@ -2710,7 +2768,7 @@ index 633a054..73e8f77 100644 "reusify@npm:^1.0.4": version: 1.0.4 resolution: "reusify@npm:1.0.4" -@@ -9701,7 +8262,7 @@ __metadata: +@@ -9583,7 +8084,7 @@ __metadata: languageName: node linkType: hard @@ -2719,7 +2777,7 @@ index 633a054..73e8f77 100644 version: 3.0.2 resolution: "rimraf@npm:3.0.2" dependencies: -@@ -9890,7 +8451,7 @@ __metadata: +@@ -9772,7 +8273,7 @@ __metadata: languageName: node linkType: hard @@ -2728,7 +2786,7 @@ index 633a054..73e8f77 100644 version: 7.5.4 resolution: "semver@npm:7.5.4" dependencies: -@@ -10005,14 +8566,7 @@ __metadata: +@@ -9887,14 +8388,7 @@ __metadata: languageName: node linkType: hard @@ -2744,7 +2802,7 @@ index 633a054..73e8f77 100644 version: 3.0.7 resolution: "signal-exit@npm:3.0.7" checksum: a2f098f247adc367dffc27845853e9959b9e88b01cb301658cfe4194352d8d2bb32e18467c786a7fe15f1d44b233ea35633d076d5e737870b7139949d1ab6318 -@@ -10067,28 +8621,6 @@ __metadata: +@@ -9949,28 +8443,6 @@ __metadata: languageName: node linkType: hard @@ -2773,7 +2831,7 @@ index 633a054..73e8f77 100644 "smart-buffer@npm:^4.2.0": version: 4.2.0 resolution: "smart-buffer@npm:4.2.0" -@@ -10156,15 +8688,6 @@ __metadata: +@@ -10038,15 +8510,6 @@ __metadata: languageName: node linkType: hard @@ -2789,7 +2847,7 @@ index 633a054..73e8f77 100644 "spdx-correct@npm:^3.0.0": version: 3.2.0 resolution: "spdx-correct@npm:3.2.0" -@@ -10206,20 +8729,13 @@ __metadata: +@@ -10088,20 +8551,13 @@ __metadata: languageName: node linkType: hard @@ -2811,7 +2869,7 @@ index 633a054..73e8f77 100644 "ssri@npm:^10.0.0": version: 10.0.5 resolution: "ssri@npm:10.0.5" -@@ -10229,13 +8745,6 @@ __metadata: +@@ -10111,13 +8567,6 @@ __metadata: languageName: node linkType: hard @@ -2825,7 +2883,7 @@ index 633a054..73e8f77 100644 "streamsearch@npm:^1.1.0": version: 1.1.0 resolution: "streamsearch@npm:1.1.0" -@@ -10260,7 +8769,7 @@ __metadata: +@@ -10142,7 +8591,7 @@ __metadata: languageName: node linkType: hard @@ -2834,7 +2892,16 @@ index 633a054..73e8f77 100644 version: 4.2.3 resolution: "string-width@npm:4.2.3" dependencies: -@@ -10368,7 +8877,7 @@ __metadata: +@@ -10225,7 +8674,7 @@ __metadata: + languageName: node + linkType: hard + +-"string_decoder@npm:^1.1.1, string_decoder@npm:^1.3.0": ++"string_decoder@npm:^1.1.1": + version: 1.3.0 + resolution: "string_decoder@npm:1.3.0" + dependencies: +@@ -10260,7 +8709,7 @@ __metadata: languageName: node linkType: hard @@ -2843,7 +2910,7 @@ index 633a054..73e8f77 100644 version: 6.0.1 resolution: "strip-ansi@npm:6.0.1" dependencies: -@@ -10407,15 +8916,6 @@ __metadata: +@@ -10299,15 +8748,6 @@ __metadata: languageName: node linkType: hard @@ -2859,7 +2926,7 @@ index 633a054..73e8f77 100644 "strip-json-comments@npm:^3.1.1": version: 3.1.1 resolution: "strip-json-comments@npm:3.1.1" -@@ -10514,7 +9014,7 @@ __metadata: +@@ -10406,7 +8846,7 @@ __metadata: languageName: node linkType: hard @@ -2868,7 +2935,7 @@ index 633a054..73e8f77 100644 version: 7.2.0 resolution: "supports-color@npm:7.2.0" dependencies: -@@ -10523,16 +9023,6 @@ __metadata: +@@ -10415,16 +8855,6 @@ __metadata: languageName: node linkType: hard @@ -2885,7 +2952,7 @@ index 633a054..73e8f77 100644 "supports-preserve-symlinks-flag@npm:^1.0.0": version: 1.0.0 resolution: "supports-preserve-symlinks-flag@npm:1.0.0" -@@ -10600,7 +9090,7 @@ __metadata: +@@ -10492,7 +8922,7 @@ __metadata: languageName: node linkType: hard @@ -2894,7 +2961,7 @@ index 633a054..73e8f77 100644 version: 3.1.6 resolution: "tar-stream@npm:3.1.6" dependencies: -@@ -10625,63 +9115,6 @@ __metadata: +@@ -10517,63 +8947,6 @@ __metadata: languageName: node linkType: hard @@ -2958,7 +3025,7 @@ index 633a054..73e8f77 100644 "text-table@npm:^0.2.0": version: 0.2.0 resolution: "text-table@npm:0.2.0" -@@ -10763,15 +9196,6 @@ __metadata: +@@ -10655,15 +9028,6 @@ __metadata: languageName: node linkType: hard @@ -2974,7 +3041,7 @@ index 633a054..73e8f77 100644 "to-fast-properties@npm:^2.0.0": version: 2.0.0 resolution: "to-fast-properties@npm:2.0.0" -@@ -10804,15 +9228,6 @@ __metadata: +@@ -10696,15 +9060,6 @@ __metadata: languageName: node linkType: hard @@ -2990,7 +3057,7 @@ index 633a054..73e8f77 100644 "tr46@npm:~0.0.3": version: 0.0.3 resolution: "tr46@npm:0.0.3" -@@ -10859,13 +9274,6 @@ __metadata: +@@ -10751,13 +9106,6 @@ __metadata: languageName: node linkType: hard @@ -3004,7 +3071,7 @@ index 633a054..73e8f77 100644 "tsconfig-paths@npm:^3.14.2": version: 3.14.2 resolution: "tsconfig-paths@npm:3.14.2" -@@ -10878,7 +9286,7 @@ __metadata: +@@ -10770,7 +9118,7 @@ __metadata: languageName: node linkType: hard @@ -3013,7 +3080,7 @@ index 633a054..73e8f77 100644 version: 2.6.2 resolution: "tslib@npm:2.6.2" checksum: 329ea56123005922f39642318e3d1f0f8265d1e7fcb92c633e0809521da75eeaca28d2cf96d7248229deb40e5c19adf408259f4b9640afd20d13aecc1430f3ad -@@ -10942,13 +9350,6 @@ __metadata: +@@ -10834,13 +9182,6 @@ __metadata: languageName: node linkType: hard @@ -3027,7 +3094,7 @@ index 633a054..73e8f77 100644 "type-fest@npm:^0.20.2": version: 0.20.2 resolution: "type-fest@npm:0.20.2" -@@ -10956,27 +9357,6 @@ __metadata: +@@ -10848,27 +9189,6 @@ __metadata: languageName: node linkType: hard @@ -3055,7 +3122,7 @@ index 633a054..73e8f77 100644 "type-is@npm:^1.6.4": version: 1.6.18 resolution: "type-is@npm:1.6.18" -@@ -11128,15 +9508,6 @@ __metadata: +@@ -11005,15 +9325,6 @@ __metadata: languageName: node linkType: hard @@ -3068,10 +3135,10 @@ index 633a054..73e8f77 100644 - languageName: node - linkType: hard - - "unist-util-generated@npm:^2.0.0": - version: 2.0.1 - resolution: "unist-util-generated@npm:2.0.1" -@@ -11349,24 +9720,6 @@ __metadata: + "unist-util-is@npm:^6.0.0": + version: 6.0.0 + resolution: "unist-util-is@npm:6.0.0" +@@ -11180,24 +9491,6 @@ __metadata: languageName: node linkType: hard @@ -3093,10 +3160,10 @@ index 633a054..73e8f77 100644 - languageName: node - linkType: hard - - "uvu@npm:^0.5.0": - version: 0.5.6 - resolution: "uvu@npm:0.5.6" -@@ -11466,15 +9819,6 @@ __metadata: + "validate-npm-package-license@npm:^3.0.1": + version: 3.0.4 + resolution: "validate-npm-package-license@npm:3.0.4" +@@ -11261,15 +9554,6 @@ __metadata: languageName: node linkType: hard @@ -3112,7 +3179,7 @@ index 633a054..73e8f77 100644 "web-encoding@npm:^1.1.5": version: 1.1.5 resolution: "web-encoding@npm:1.1.5" -@@ -11502,23 +9846,6 @@ __metadata: +@@ -11297,23 +9581,6 @@ __metadata: languageName: node linkType: hard @@ -3136,7 +3203,7 @@ index 633a054..73e8f77 100644 "whatwg-url@npm:^5.0.0": version: 5.0.0 resolution: "whatwg-url@npm:5.0.0" -@@ -11791,17 +10118,6 @@ __metadata: +@@ -11586,17 +9853,6 @@ __metadata: languageName: node linkType: hard @@ -3154,10 +3221,10 @@ index 633a054..73e8f77 100644 "zipline@workspace:.": version: 0.0.0-use.local resolution: "zipline@workspace:." -@@ -11817,9 +10133,9 @@ __metadata: - "@mantine/notifications": ^6.0.21 - "@mantine/prism": ^6.0.21 - "@mantine/spotlight": ^6.0.21 +@@ -11612,9 +9868,9 @@ __metadata: + "@mantine/notifications": 6.x + "@mantine/prism": 6.x + "@mantine/spotlight": 6.x - "@prisma/client": ^5.1.1 - "@prisma/internals": ^5.1.1 - "@prisma/migrate": ^5.1.1 @@ -3167,7 +3234,7 @@ index 633a054..73e8f77 100644 "@sapphire/shapeshift": ^3.9.3 "@tabler/icons-react": ^2.41.0 "@tanstack/react-query": ^4.28.0 -@@ -11859,7 +10175,7 @@ __metadata: +@@ -11654,7 +9910,7 @@ __metadata: npm-run-all: ^4.1.5 otplib: ^12.0.1 prettier: ^3.1.0 From 0fc3a5b9a6af472e5a725883e56248d7ecc7080f Mon Sep 17 00:00:00 2001 From: aftix Date: Fri, 14 Feb 2025 17:48:47 -0600 Subject: [PATCH 2057/2168] nushellPlugins.skim: 0.11.1 -> 0.12.0 Diff: https://github.com/idanarye/nu_plugin_skim/compare/v0.11.1...v0.12.0 --- pkgs/shells/nushell/plugins/skim.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/shells/nushell/plugins/skim.nix b/pkgs/shells/nushell/plugins/skim.nix index 8bfba8cc5d43..3e206f5e9cc2 100644 --- a/pkgs/shells/nushell/plugins/skim.nix +++ b/pkgs/shells/nushell/plugins/skim.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "nu_plugin_skim"; - version = "0.11.1"; + version = "0.12.0"; src = fetchFromGitHub { owner = "idanarye"; repo = pname; - rev = "v${version}"; - hash = "sha256-z+NT5WjwBn5yrdQNuERswZgsfM4OJPKssWPyClIi0Fk="; + tag = "v${version}"; + hash = "sha256-TFKybgV2sJqDcTR+F1Kwm03XW0+tt9fLilhSQpX4jSg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-ssRUUwRS21TsnBfofb53MhcqZFUJ3GlxV4AirPDdVzw="; + cargoHash = "sha256-5KwosdiWc7K+35d06lvFHaPP52d7ru7tjMG+X9H5oCQ="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ From 815a35a18fce66ccc1ae0e08150773b9a0086122 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 14:18:42 +0100 Subject: [PATCH 2058/2168] python312Packages.s3fs: 2024.12.0 -> 2025.2.0 Changelog: https://github.com/fsspec/s3fs/raw/2025.2.0/docs/source/changelog.rst --- .../python-modules/s3fs/default.nix | 113 ++++++++++++++++-- 1 file changed, 100 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index 8586914416eb..af5ae376c84f 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -1,35 +1,46 @@ { lib, + buildPythonPackage, + fetchFromGitHub, + + # buildInputs + docutils, + + # build-system + setuptools, + + # dependencies aiobotocore, aiohttp, - buildPythonPackage, - docutils, - fetchPypi, + fsspec, + + # tests flask, flask-cors, - fsspec, moto, pytestCheckHook, - pythonOlder, - setuptools, }: buildPythonPackage rec { pname = "s3fs"; - version = "2024.12.0"; + version = "2025.2.0"; pyproject = true; - disabled = pythonOlder "3.9"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-Gw86j1lGzKW6KYcdZ5KrHkUo7XYjJ9iu+vyBtzuZ/VY="; + src = fetchFromGitHub { + owner = "fsspec"; + repo = "s3fs"; + tag = version; + hash = "sha256-nnfvccORDspj54sRxL3d0hn4MpzKYGKE2Kl0v/wLaNw="; }; buildInputs = [ docutils ]; build-system = [ setuptools ]; + pythonRelaxDeps = [ + "fsspec" + ]; + dependencies = [ aiobotocore aiohttp @@ -48,12 +59,88 @@ buildPythonPackage rec { disabledTests = [ # require network access "test_async_close" + + # AssertionError: assert ['x', 'y'] == [] + "test_with_data" + + # AssertionError: assert ['1', 'x', 'y'] == [] + "test_clear_empty" + "test_no_dircache" + + # KeyError: 'ChecksumAlgorithm' + "test_info" + + # KeyError: + # del d[1] + "test_complex_keys" + + # TypeError: string indices must be integers, not 'str' + "test_bucket_versioning" + "test_bulk_delete" + "test_copy_with_source_and_destination_as_list" + "test_cp_directory_recursive" + "test_dynamic_add_rm" + "test_get_directory_to_existing_directory" + "test_get_directory_to_new_directory" + "test_get_directory_without_files_with_same_name_prefix" + "test_get_file_info_with_selector" + "test_get_file_to_existing_directory" + "test_get_file_to_file_in_existing_directory" + "test_get_file_to_file_in_new_directory" + "test_get_file_to_new_directory" + "test_get_glob_edge_cases" + "test_get_glob_to_existing_directory" + "test_get_glob_to_new_directory" + "test_get_list_of_files_to_existing_directory" + "test_get_list_of_files_to_new_directory" + "test_get_with_source_and_destination_as_list" + "test_move[False]" + "test_move[True]" + "test_new_bucket" + "test_new_bucket_auto" + "test_pipe_exclusive" + "test_put_directory_recursive" + "test_put_directory_to_existing_directory" + "test_put_directory_to_new_directory" + "test_put_directory_without_files_with_same_name_prefix" + "test_put_file_to_existing_directory" + "test_put_file_to_file_in_existing_directory" + "test_put_file_to_file_in_new_directory" + "test_put_file_to_new_directory" + "test_put_glob_edge_cases" + "test_put_glob_to_existing_directory" + "test_put_glob_to_new_directory" + "test_put_list_of_files_to_existing_directory" + "test_put_list_of_files_to_new_directory" + "test_rm" + "test_rm_invalidates_cache" + "test_rm_recursive_folder" + "test_s3_big_ls" + "test_s3fs_etag_preserving_multipart_copy" + "test_tags" + + # ExceptionGroup: errors while tearing down (2 sub-exceptions) + "test_copy_directory_to_existing_directory" + "test_copy_directory_to_new_directory" + "test_copy_directory_without_files_with_same_name_prefix" + "test_copy_file_to_existing_directory" + "test_copy_file_to_file_in_existing_directory" + "test_copy_file_to_file_in_new_directory" + "test_copy_file_to_new_directory" + "test_copy_glob_edge_cases" + "test_copy_glob_to_existing_directory" + "test_copy_glob_to_new_directory" + "test_copy_list_of_files_to_existing_directory" + "test_copy_list_of_files_to_new_directory" + "test_copy_two_files_new_directory" ]; + __darwinAllowLocalNetworking = true; + meta = { description = "Pythonic file interface for S3"; homepage = "https://github.com/fsspec/s3fs"; - changelog = "https://github.com/fsspec/s3fs/raw/${version}/docs/source/changelog.rst"; + changelog = "https://github.com/fsspec/s3fs/blob/${version}/docs/source/changelog.rst"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ teh ]; }; From 3b988f718d397360bb3b4e8089bd533824f096ad Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 16:04:22 +0100 Subject: [PATCH 2059/2168] python312Packages.ome-zarr: fix --- .../python-modules/ome-zarr/default.nix | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/ome-zarr/default.nix b/pkgs/development/python-modules/ome-zarr/default.nix index 7da0d0cad4e8..08d7a6857d4a 100644 --- a/pkgs/development/python-modules/ome-zarr/default.nix +++ b/pkgs/development/python-modules/ome-zarr/default.nix @@ -1,9 +1,13 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, - pytestCheckHook, + + # build-system + setuptools, + setuptools-scm, + + # dependencies aiohttp, dask, distributed, @@ -11,9 +15,11 @@ numpy, requests, scikit-image, - setuptools, toolz, zarr, + + # tests + pytestCheckHook, }: buildPythonPackage rec { @@ -21,8 +27,6 @@ buildPythonPackage rec { version = "0.10.3"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "ome"; repo = "ome-zarr-py"; @@ -32,21 +36,24 @@ buildPythonPackage rec { build-system = [ setuptools + setuptools-scm ]; dependencies = [ - numpy + aiohttp dask distributed - zarr fsspec - aiohttp + numpy requests scikit-image toolz + zarr ] ++ fsspec.optional-dependencies.s3; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; disabledTests = [ # attempts to access network @@ -90,7 +97,7 @@ buildPythonPackage rec { meta = { description = "Implementation of next-generation file format (NGFF) specifications for storing bioimaging data in the cloud"; homepage = "https://pypi.org/project/ome-zarr"; - changelog = "https://github.com/ome/ome-zarr-py/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/ome/ome-zarr-py/blob/v${version}/CHANGELOG.md"; license = lib.licenses.bsd2; maintainers = [ lib.maintainers.bcdarwin ]; mainProgram = "ome_zarr"; From 232ef93013d3d05bf94ff89adc280a5a88851e77 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 16:06:41 +0100 Subject: [PATCH 2060/2168] python312Packages.pyiceberg: fix on darwin --- .../python-modules/pyiceberg/default.nix | 113 ++++++++++-------- 1 file changed, 61 insertions(+), 52 deletions(-) diff --git a/pkgs/development/python-modules/pyiceberg/default.nix b/pkgs/development/python-modules/pyiceberg/default.nix index ba91974b3101..1b6a75329b2c 100644 --- a/pkgs/development/python-modules/pyiceberg/default.nix +++ b/pkgs/development/python-modules/pyiceberg/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, @@ -49,7 +50,6 @@ pytest-mock, pytest-timeout, requests-mock, - pythonOlder, }: buildPythonPackage rec { @@ -185,61 +185,70 @@ buildPythonPackage rec { "tests/integration" ]; - disabledTests = [ - # botocore.exceptions.EndpointConnectionError: Could not connect to the endpoint URL - "test_checking_if_a_file_exists" - "test_closing_a_file" - "test_fsspec_file_tell" - "test_fsspec_getting_length_of_file" - "test_fsspec_pickle_round_trip_s3" - "test_fsspec_raise_on_opening_file_not_found" - "test_fsspec_read_specified_bytes_for_file" - "test_fsspec_write_and_read_file" - "test_writing_avro_file" + disabledTests = + [ + # botocore.exceptions.EndpointConnectionError: Could not connect to the endpoint URL + "test_checking_if_a_file_exists" + "test_closing_a_file" + "test_fsspec_file_tell" + "test_fsspec_getting_length_of_file" + "test_fsspec_pickle_round_trip_s3" + "test_fsspec_raise_on_opening_file_not_found" + "test_fsspec_read_specified_bytes_for_file" + "test_fsspec_write_and_read_file" + "test_writing_avro_file" - # Require unpackaged gcsfs - "test_fsspec_converting_an_outputfile_to_an_inputfile_gcs" - "test_fsspec_new_input_file_gcs" - "test_fsspec_new_output_file_gcs" - "test_fsspec_pickle_roundtrip_gcs" + # Require unpackaged gcsfs + "test_fsspec_converting_an_outputfile_to_an_inputfile_gcs" + "test_fsspec_new_input_file_gcs" + "test_fsspec_new_output_file_gcs" + "test_fsspec_pickle_roundtrip_gcs" - # Timeout (network access) - "test_fsspec_converting_an_outputfile_to_an_inputfile_adls" - "test_fsspec_new_abfss_output_file_adls" - "test_fsspec_new_input_file_adls" - "test_fsspec_pickle_round_trip_aldfs" + # Timeout (network access) + "test_fsspec_converting_an_outputfile_to_an_inputfile_adls" + "test_fsspec_new_abfss_output_file_adls" + "test_fsspec_new_input_file_adls" + "test_fsspec_pickle_round_trip_aldfs" - # TypeError: pyarrow.lib.large_list() takes no keyword argument - # From tests/io/test_pyarrow_stats.py: - "test_bounds" - "test_column_metrics_mode" - "test_column_sizes" - "test_metrics_mode_counts" - "test_metrics_mode_full" - "test_metrics_mode_non_default_trunc" - "test_metrics_mode_none" - "test_null_and_nan_counts" - "test_offsets" - "test_read_missing_statistics" - "test_record_count" - "test_value_counts" - "test_write_and_read_stats_schema" - # From tests/io/test_pyarrow.py: - "test_list_type_to_pyarrow" - "test_projection_add_column" - "test_projection_list_of_structs" - "test_read_list" - "test_schema_compatible_missing_nullable_field_nested" - "test_schema_compatible_nested" - "test_schema_mismatch_missing_required_field_nested" - "test_schema_to_pyarrow_schema_exclude_field_ids" - "test_schema_to_pyarrow_schema_include_field_ids" - # From tests/io/test_pyarrow_visitor.py - "test_round_schema_conversion_nested" + # TypeError: pyarrow.lib.large_list() takes no keyword argument + # From tests/io/test_pyarrow_stats.py: + "test_bounds" + "test_column_metrics_mode" + "test_column_sizes" + "test_metrics_mode_counts" + "test_metrics_mode_full" + "test_metrics_mode_non_default_trunc" + "test_metrics_mode_none" + "test_null_and_nan_counts" + "test_offsets" + "test_read_missing_statistics" + "test_record_count" + "test_value_counts" + "test_write_and_read_stats_schema" + # From tests/io/test_pyarrow.py: + "test_list_type_to_pyarrow" + "test_projection_add_column" + "test_projection_list_of_structs" + "test_read_list" + "test_schema_compatible_missing_nullable_field_nested" + "test_schema_compatible_nested" + "test_schema_mismatch_missing_required_field_nested" + "test_schema_to_pyarrow_schema_exclude_field_ids" + "test_schema_to_pyarrow_schema_include_field_ids" + # From tests/io/test_pyarrow_visitor.py + "test_round_schema_conversion_nested" - # Hangs forever (from tests/io/test_pyarrow.py) - "test_getting_length_of_file_gcs" - ]; + # Hangs forever (from tests/io/test_pyarrow.py) + "test_getting_length_of_file_gcs" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # ImportError: The pyarrow installation is not built with support for 'GcsFileSystem' + "test_converting_an_outputfile_to_an_inputfile_gcs" + "test_new_input_file_gcs" + "test_new_output_file_gc" + ]; + + __darwinAllowLocalNetworking = true; meta = { description = "Python library for programmatic access to Apache Iceberg"; From ccb1480d93f16c7034752798c3831d7773d8a021 Mon Sep 17 00:00:00 2001 From: "re:fi.64" Date: Wed, 29 Jan 2025 17:49:07 -0600 Subject: [PATCH 2061/2168] uv: Use system jemalloc jemalloc-sys hardcodes the build system's pagesize (#202863), making it incompatible with systems that don't have the standard 4k page size (such as Asahi Linux). --- pkgs/by-name/uv/uv/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 39ca6935e304..731cfe04d77d 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -4,6 +4,9 @@ rustPlatform, fetchFromGitHub, + # buildInputs + rust-jemalloc-sys, + # nativeBuildInputs cmake, installShellFiles, @@ -29,6 +32,10 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-dop61TB9w2r+our4DiKzPvw9lI07cx9bT0Ujtvhko1E="; + buildInputs = [ + rust-jemalloc-sys + ]; + nativeBuildInputs = [ cmake installShellFiles From e2ea971c1364ee9a2524b5894dcd1daf8b7877e0 Mon Sep 17 00:00:00 2001 From: Benjamin Sparks Date: Sat, 15 Feb 2025 00:56:43 +0100 Subject: [PATCH 2062/2168] python3Packages.types-enum34: remove --- .../python-modules/types-enum34/default.nix | 25 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 pkgs/development/python-modules/types-enum34/default.nix diff --git a/pkgs/development/python-modules/types-enum34/default.nix b/pkgs/development/python-modules/types-enum34/default.nix deleted file mode 100644 index ace209f28c86..000000000000 --- a/pkgs/development/python-modules/types-enum34/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, -}: - -buildPythonPackage rec { - pname = "types-enum34"; - version = "1.1.8"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "0421lr89vv3fpg77kkj5nmzd7z3nmhw4vh8ibsjp6vfh86b7d73g"; - }; - - pythonImportsCheck = [ "enum-python2-stubs" ]; - - meta = with lib; { - description = "Typing stubs for enum34"; - homepage = "https://github.com/python/typeshed"; - license = licenses.asl20; - maintainers = with maintainers; [ jpetrucciani ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 7b137df6efd3..8369c2f18669 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -719,6 +719,7 @@ mapAliases ({ twitter-common-log = throw "twitter-common-log has been removed because it is abandoned and unmaintained"; # added 2024-07-14 twitter-common-options = throw "twitter-common-options has been removed because it is abandoned and unmaintained"; # added 2024-07-14 types-cryptography = throw "types-cryptography has been removed because it is obsolete since cryptography version 3.4.4."; # added 2022-05-30 + types-enum34 = throw "types-enum34 is obselete since Python 3.4"; # added 2025-02-15 types-paramiko = throw "types-paramiko has been removed because it was unused."; # added 2022-05-30 ufoLib2 = ufolib2; # added 2024-01-07 ukrainealarm = throw "ukrainealarm has been removed, as it has been replaced as a home-assistant dependency by uasiren."; # added 2024-01-05 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 782cf2c469a9..34c3ba4022d3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17579,8 +17579,6 @@ self: super: with self; { types-docutils = callPackage ../development/python-modules/types-docutils { }; - types-enum34 = callPackage ../development/python-modules/types-enum34 { }; - types-freezegun = callPackage ../development/python-modules/types-freezegun { }; types-futures = callPackage ../development/python-modules/types-futures { }; From d6abd8ac41e751ca0a3688e5154cf4c9c6c79077 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 00:35:33 +0000 Subject: [PATCH 2063/2168] ivm: 0.5.0 -> 0.6.0 --- pkgs/by-name/iv/ivm/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/iv/ivm/package.nix b/pkgs/by-name/iv/ivm/package.nix index 24259d902f6d..532483df6915 100644 --- a/pkgs/by-name/iv/ivm/package.nix +++ b/pkgs/by-name/iv/ivm/package.nix @@ -14,17 +14,17 @@ rustPlatform.buildRustPackage rec { pname = "ivm"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "inko-lang"; repo = "ivm"; rev = "v${version}"; - hash = "sha256-z0oo1JUZbX3iT8N9+14NcqUzalpARImcbtUiQYS4djA="; + hash = "sha256-pqqUvHK6mPrK1Mir2ILANxtih9OrAKDJPE0nRWc5JOY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-NiZGSg0EU3yw5YS4eq/AJt/9AcdqwKEJAaWBmF5NwWw="; + cargoHash = "sha256-voUucoSLsKn0QhCpr52U8x9K4ykkx7iQ3SsHfjrXu+Q="; buildInputs = [ (lib.getLib stdenv.cc.cc) From 4f6e736362e3132c3da1af11d0c35149dd9e3d20 Mon Sep 17 00:00:00 2001 From: Bazyli Cyran Date: Sat, 15 Feb 2025 01:39:55 +0100 Subject: [PATCH 2064/2168] hyprlandPlugins.hy3: 0.47.0 -> 0.47.0-1 (#382126) --- .../window-managers/hyprwm/hyprland-plugins/hy3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix index b9262fd6d216..2fa2d3c273ac 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix @@ -8,13 +8,13 @@ }: mkHyprlandPlugin hyprland rec { pluginName = "hy3"; - version = "0.47.0"; + version = "0.47.0-1"; src = fetchFromGitHub { owner = "outfoxxed"; repo = "hy3"; rev = "refs/tags/hl${version}"; - hash = "sha256-DicW4xltTHVk1L34xtEJwrKb9nSBWJ+zLVrh28Fr6Fg="; + hash = "sha256-fkYjCOyZ9z3mjId/RrXH5FjML7ULFyCNv1EQXhv0Kgo="; }; nativeBuildInputs = [ cmake ]; From 118f0c5fc0f083af784065913e73ffe851affe63 Mon Sep 17 00:00:00 2001 From: r4v3n6101 Date: Sat, 15 Feb 2025 04:06:01 +0300 Subject: [PATCH 2065/2168] zmusic: optional alsa-lib only for linux --- pkgs/by-name/zm/zmusic/package.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/zm/zmusic/package.nix b/pkgs/by-name/zm/zmusic/package.nix index 6c7c04f4a648..c9f1cf10187d 100644 --- a/pkgs/by-name/zm/zmusic/package.nix +++ b/pkgs/by-name/zm/zmusic/package.nix @@ -29,9 +29,7 @@ stdenv.mkDerivation rec { "dev" ]; - patches = [ - ./fluidsynth.patch - ]; + patches = [ ./fluidsynth.patch ]; postPatch = '' substituteInPlace source/mididevices/music_fluidsynth_mididevice.cpp \ @@ -46,12 +44,11 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - alsa-lib fluidsynth libsndfile mpg123 zlib - ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ]; meta = { description = "GZDoom's music system as a standalone library"; From df24527b130577444f22dcf07352f63a8fac0d0b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 01:13:20 +0000 Subject: [PATCH 2066/2168] focuswriter: 1.8.9 -> 1.8.10 --- pkgs/applications/editors/focuswriter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix index 1319120a1991..b5640cb61a3f 100644 --- a/pkgs/applications/editors/focuswriter/default.nix +++ b/pkgs/applications/editors/focuswriter/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "focuswriter"; - version = "1.8.9"; + version = "1.8.10"; src = fetchFromGitHub { owner = "gottcode"; repo = "focuswriter"; rev = "v${version}"; - hash = "sha256-FFfNjjVwi0bE6oc8LYhXrCKd+nwRQrjWzK5P4DSIIgs="; + hash = "sha256-p+0upsmEMkqMRsIcPWq4pelPdlqrzHaNL5PNFtuiecY="; }; nativeBuildInputs = [ From 01b9b5404335b443e969050d3d77676b85c0bd0b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 01:24:48 +0000 Subject: [PATCH 2067/2168] kube-router: 2.4.1 -> 2.5.0 --- pkgs/by-name/ku/kube-router/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ku/kube-router/package.nix b/pkgs/by-name/ku/kube-router/package.nix index e1d4854bbe4c..a92a58dc1e80 100644 --- a/pkgs/by-name/ku/kube-router/package.nix +++ b/pkgs/by-name/ku/kube-router/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kube-router"; - version = "2.4.1"; + version = "2.5.0"; src = fetchFromGitHub { owner = "cloudnativelabs"; repo = pname; rev = "v${version}"; - hash = "sha256-N1AC4r5NLW7hxBHGFRKcDZ1sLLKlcqqNmXeh8Zt3l1g="; + hash = "sha256-bt7BnMIq/tkRL8d1pf/gG5qBq/1yiMqXDpBrIICo780="; }; - vendorHash = "sha256-Yai6nszdaw2TwOi9N3BkY/4zz2aJGdCqWskHmnBKTDk="; + vendorHash = "sha256-BH0yLr7oVtpMPfljDIjzpQiABtwRKOPXNvejh8l8lE8="; env.CGO_ENABLED = 0; From a2fca55c8a48dc4b35cf5a13781ee8975ff3dc7a Mon Sep 17 00:00:00 2001 From: nayeko <196556004+nayeko@users.noreply.github.com> Date: Sat, 15 Feb 2025 01:26:20 +0000 Subject: [PATCH 2068/2168] nvchecker: remove with lib --- pkgs/development/python-modules/nvchecker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix index 57f0a7c68240..fbfcd1cd1b66 100644 --- a/pkgs/development/python-modules/nvchecker/default.nix +++ b/pkgs/development/python-modules/nvchecker/default.nix @@ -76,11 +76,11 @@ buildPythonPackage rec { htmlparser = [ lxml ]; }; - meta = with lib; { + meta = { description = "New version checker for software"; homepage = "https://github.com/lilydjwg/nvchecker"; changelog = "https://github.com/lilydjwg/nvchecker/releases/tag/v${version}"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = [ ]; }; } From 4f23e34c1bbcfc3a18dc05f5dd67293568dd8296 Mon Sep 17 00:00:00 2001 From: nayeko <196556004+nayeko@users.noreply.github.com> Date: Sat, 15 Feb 2025 01:27:08 +0000 Subject: [PATCH 2069/2168] nvchecker: 2.15.1 -> 2.16 --- pkgs/development/python-modules/nvchecker/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix index fbfcd1cd1b66..d93ae1ba406d 100644 --- a/pkgs/development/python-modules/nvchecker/default.nix +++ b/pkgs/development/python-modules/nvchecker/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "nvchecker"; - version = "2.15.1"; + version = "2.16"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,12 +30,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "lilydjwg"; repo = "nvchecker"; - rev = "v${version}"; - hash = "sha256-dK3rZCoSukCzPOFVectQiF6qplUuDBh9qyN8JL0+j20="; + tag = "v${version}"; + hash = "sha256-HdL3BnjQZzKXtjhQqDst6dJH82g3BONFsGUnwzDMRDA="; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ - setuptools docutils installShellFiles ]; From b4884bcab139c4f59348e6096bd0cf29d6c75d5c Mon Sep 17 00:00:00 2001 From: nayeko <196556004+nayeko@users.noreply.github.com> Date: Sat, 15 Feb 2025 01:30:22 +0000 Subject: [PATCH 2070/2168] falkor: 0.0.92 -> 0.1.0 --- pkgs/by-name/fa/falkor/package.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/fa/falkor/package.nix b/pkgs/by-name/fa/falkor/package.nix index 86f94d287f5f..3bcf0da92424 100644 --- a/pkgs/by-name/fa/falkor/package.nix +++ b/pkgs/by-name/fa/falkor/package.nix @@ -10,11 +10,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "falkor"; - version = "0.0.92"; + version = "0.1.0"; src = fetchurl { - url = "https://github.com/Team-Falkor/falkor/releases/download/v${finalAttrs.version}/falkor.deb"; - hash = "sha256-yDpYu2ehrRQuD29jcyTQla2R2IT1zfBDeWDDRnmqc8Y="; + url = "https://github.com/Team-Falkor/falkor/releases/download/v0.1.0-alpha/Falkor.deb"; + hash = "sha256-L1EBJ49+g7n6NtKs1BTBD30glL/K0SerL/k5Dl2SgqM="; }; nativeBuildInputs = [ @@ -28,8 +28,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { mkdir -p $out/bin mv usr/share $out/share mkdir -p $out/share/falkor - sed -i "s|Exec=.*|Exec=falkor|" $out/share/applications/*.desktop - mv opt/falkor/{resources,resources.pak,locales} $out/share/falkor + substituteInPlace $out/share/applications/falkor.desktop \ + --replace-fail "/opt/Falkor/" "" + mv opt/Falkor/{resources,resources.pak,locales} $out/share/falkor makeWrapper ${lib.getExe electron} $out/bin/falkor \ --argv0 "falkor" \ From 958bbd8bc2a115f89ae43a6c57966f638d5f6b31 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 23:42:34 +0000 Subject: [PATCH 2071/2168] python312Packages.hg-git: 1.1.4 -> 1.2.0 --- pkgs/development/python-modules/hg-git/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/hg-git/default.nix b/pkgs/development/python-modules/hg-git/default.nix index ea51b918130f..04e8fe1cc581 100644 --- a/pkgs/development/python-modules/hg-git/default.nix +++ b/pkgs/development/python-modules/hg-git/default.nix @@ -11,15 +11,15 @@ buildPythonPackage rec { pname = "hg-git"; - version = "1.1.4"; + version = "1.2.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchPypi { pname = "hg_git"; inherit version; - hash = "sha256-XF9vAtvUK5yRP4OxZv83/AA2jde5t7za3jqgyuXc5eU="; + hash = "sha256-Pr+rNkqBubVlsQCyqd5mdr8D357FzSd3Kuz5EWeez8M="; }; build-system = [ From 7e379d28dcd5c7ef04c80bb7d598b125af039f52 Mon Sep 17 00:00:00 2001 From: r4v3n6101 Date: Sat, 15 Feb 2025 04:46:18 +0300 Subject: [PATCH 2072/2168] gzdoom: add darwin builds support --- pkgs/by-name/gz/gzdoom/package.nix | 39 +++++++++++++++--------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/gz/gzdoom/package.nix b/pkgs/by-name/gz/gzdoom/package.nix index 17051d7692e6..e0f3fbd2a66e 100644 --- a/pkgs/by-name/gz/gzdoom/package.nix +++ b/pkgs/by-name/gz/gzdoom/package.nix @@ -8,16 +8,13 @@ SDL2, bzip2, cmake, - fluidsynth, game-music-emu, gtk3, imagemagick, libGL, libjpeg, - libsndfile, libvpx, libwebp, - mpg123, ninja, openal, pkg-config, @@ -40,35 +37,32 @@ stdenv.mkDerivation rec { patches = [ ./string_format.patch ]; - outputs = [ - "out" - "doc" - ]; + outputs = [ "out" ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "doc" ]; nativeBuildInputs = [ cmake - copyDesktopItems imagemagick makeWrapper ninja pkg-config - ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems ]; buildInputs = [ SDL2 + zlib bzip2 - fluidsynth - game-music-emu gtk3 + + # Graphics libGL libjpeg - libsndfile libvpx libwebp - mpg123 - openal vulkan-loader - zlib + + # Sound (ZMusic contain MIDI libs) + game-music-emu + openal zmusic ]; @@ -80,12 +74,14 @@ stdenv.mkDerivation rec { --replace-fail "" "${src.rev}" ''; + # Apple dropped GL support + # Shader's loading will throw an error while linking cmakeFlags = [ "-DDYN_GTK=OFF" "-DDYN_OPENAL=OFF" - ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DHAVE_GLES2=OFF" ]; - desktopItems = [ + desktopItems = lib.optionals stdenv.hostPlatform.isLinux [ (makeDesktopItem { name = "gzdoom"; exec = "gzdoom"; @@ -96,7 +92,12 @@ stdenv.mkDerivation rec { }) ]; - postInstall = '' + installPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p "$out/Applications" + mv gzdoom.app "$out/Applications/" + ''; + + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' mv $out/bin/gzdoom $out/share/games/doom/gzdoom makeWrapper $out/share/games/doom/gzdoom $out/bin/gzdoom \ --set LD_LIBRARY_PATH ${lib.makeLibraryPath [ vulkan-loader ]} @@ -117,7 +118,7 @@ stdenv.mkDerivation rec { ZDoom, adding an OpenGL renderer and powerful scripting capabilities. ''; license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; + platforms = with lib.platforms; linux ++ darwin; maintainers = with lib.maintainers; [ azahi lassulus From dae82373e6a879e89b12c4863d54376f2984a740 Mon Sep 17 00:00:00 2001 From: r4v3n6101 Date: Sat, 15 Feb 2025 04:48:26 +0300 Subject: [PATCH 2073/2168] maintainers: add r4v3n6101 --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b02dee4fe9a9..90e1575b2440 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -19200,6 +19200,13 @@ githubId = 20760527; name = "Madelyn"; }; + r4v3n6101 = { + name = "r4v3n6101"; + email = "raven6107@gmail.com"; + github = "r4v3n6101"; + githubId = 30029970; + keys = [ { fingerprint = "FA05 8A29 B45E 06C0 8FE9 4907 05D2 BE42 F3EC D7CC"; } ]; + }; raboof = { email = "arnout@bzzt.net"; matrix = "@raboof:matrix.org"; From dd09946e74ac76ff654f164d52f31748c5974014 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 01:49:05 +0000 Subject: [PATCH 2074/2168] gqlgen: 0.17.64 -> 0.17.65 --- pkgs/by-name/gq/gqlgen/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gq/gqlgen/package.nix b/pkgs/by-name/gq/gqlgen/package.nix index 6679f6f11717..02ee9092ca30 100644 --- a/pkgs/by-name/gq/gqlgen/package.nix +++ b/pkgs/by-name/gq/gqlgen/package.nix @@ -6,7 +6,7 @@ }: let - version = "0.17.64"; + version = "0.17.65"; in buildGoModule { pname = "gqlgen"; @@ -16,10 +16,10 @@ buildGoModule { owner = "99designs"; repo = "gqlgen"; tag = "v${version}"; - hash = "sha256-JzXjUOhj49rp+aALfP48mRkySObd7z5qaHH6Na649+4="; + hash = "sha256-6Gsu7ff/7nqWZ/MMfUdESbW3ECkFvq69bEkFPkaMBzg="; }; - vendorHash = "sha256-p285G/EfkrLrmbEc10J/QXIn6Hi3KIXH0f+BYeFpE4s="; + vendorHash = "sha256-6miXaPMSX1CctY0nrOM/3KIAc/bz4h1+AzLK5Neybbk="; subPackages = [ "." ]; From f01992f743bb5ea7eb55300c23896821b16f385d Mon Sep 17 00:00:00 2001 From: r4v3n6101 Date: Sat, 15 Feb 2025 04:50:39 +0300 Subject: [PATCH 2075/2168] gzdoom: add r4v3n6101 as maintainer zmusic: add r4v3n6101 as maintainer --- pkgs/by-name/gz/gzdoom/package.nix | 1 + pkgs/by-name/zm/zmusic/package.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/by-name/gz/gzdoom/package.nix b/pkgs/by-name/gz/gzdoom/package.nix index e0f3fbd2a66e..0a71bda14202 100644 --- a/pkgs/by-name/gz/gzdoom/package.nix +++ b/pkgs/by-name/gz/gzdoom/package.nix @@ -123,6 +123,7 @@ stdenv.mkDerivation rec { azahi lassulus Gliczy + r4v3n6101 ]; }; } diff --git a/pkgs/by-name/zm/zmusic/package.nix b/pkgs/by-name/zm/zmusic/package.nix index c9f1cf10187d..e68cb3db7368 100644 --- a/pkgs/by-name/zm/zmusic/package.nix +++ b/pkgs/by-name/zm/zmusic/package.nix @@ -64,6 +64,7 @@ stdenv.mkDerivation rec { azahi lassulus Gliczy + r4v3n6101 ]; }; } From 8b656d9a7e760f2a490c169d1206d7e94bcfca18 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 01:57:36 +0000 Subject: [PATCH 2076/2168] python312Packages.gvm-tools: 25.1.1 -> 25.2.0 --- pkgs/development/python-modules/gvm-tools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/gvm-tools/default.nix b/pkgs/development/python-modules/gvm-tools/default.nix index 5ceb8a4729c4..761ddcfb2a1e 100644 --- a/pkgs/development/python-modules/gvm-tools/default.nix +++ b/pkgs/development/python-modules/gvm-tools/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "gvm-tools"; - version = "25.1.1"; + version = "25.2.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = "gvm-tools"; tag = "v${version}"; - hash = "sha256-2IE2Nxz0EBWlbL09XgA/AtfFi9gOE/VSMZmb5Op+clY="; + hash = "sha256-WWt/wWuni1rf2A3ggzbVF6l2ApDHm5Z5TBk5UWseo74="; }; __darwinAllowLocalNetworking = true; @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Collection of APIs that help with remote controlling a Greenbone Security Manager"; homepage = "https://github.com/greenbone/gvm-tools"; - changelog = "https://github.com/greenbone/gvm-tools/releases/tag/v${version}"; + changelog = "https://github.com/greenbone/gvm-tools/releases/tag/${src.tag}"; license = with licenses; [ gpl3Plus ]; maintainers = with maintainers; [ fab ]; }; From 875e8468734fb728643c81b69d65a9fc9d37a677 Mon Sep 17 00:00:00 2001 From: nayeko <196556004+nayeko@users.noreply.github.com> Date: Sat, 15 Feb 2025 01:58:51 +0000 Subject: [PATCH 2077/2168] mailspring: 1.14.0 -> 1.15.1 --- pkgs/by-name/ma/mailspring/darwin.nix | 2 +- pkgs/by-name/ma/mailspring/linux.nix | 2 +- pkgs/by-name/ma/mailspring/package.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/mailspring/darwin.nix b/pkgs/by-name/ma/mailspring/darwin.nix index b27ec6a069cf..24eb8bf7a5db 100644 --- a/pkgs/by-name/ma/mailspring/darwin.nix +++ b/pkgs/by-name/ma/mailspring/darwin.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://github.com/Foundry376/Mailspring/releases/download/${finalAttrs.version}/Mailspring-AppleSilicon.zip"; - hash = "sha256-5f0jtQPwwnkFNCtw0Kf2AaLbIHoOtTAc9+z000gTuBo="; + hash = "sha256-MMJ26p3Kp/rBMtyuOFDyvmAz5J0Fcw5tiFnMiPZ34vA="; }; dontUnpack = true; diff --git a/pkgs/by-name/ma/mailspring/linux.nix b/pkgs/by-name/ma/mailspring/linux.nix index 372104e954a2..452c86178b62 100644 --- a/pkgs/by-name/ma/mailspring/linux.nix +++ b/pkgs/by-name/ma/mailspring/linux.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://github.com/Foundry376/Mailspring/releases/download/${finalAttrs.version}/mailspring-${finalAttrs.version}-amd64.deb"; - hash = "sha256-ZpmL6d0QkHKKxn+KF1OEDeAb1bFp9uohBobCvblE+L8="; + hash = "sha256-+glQaz36mKMtnNeyHH4brZmzYe9SHCtccO6CIJpTH2k="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ma/mailspring/package.nix b/pkgs/by-name/ma/mailspring/package.nix index 389ee42d77f7..98f49438b4b3 100644 --- a/pkgs/by-name/ma/mailspring/package.nix +++ b/pkgs/by-name/ma/mailspring/package.nix @@ -5,7 +5,7 @@ }: let pname = "mailspring"; - version = "1.14.0"; + version = "1.15.1"; meta = { description = "Beautiful, fast and maintained fork of Nylas Mail by one of the original authors"; From 087e4d2e2efd9006c1cadaee15ed777761339f6c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 11:02:38 +0000 Subject: [PATCH 2078/2168] python312Packages.evdev: 1.7.1 -> 1.9.0 --- pkgs/development/python-modules/evdev/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/evdev/default.nix b/pkgs/development/python-modules/evdev/default.nix index 5cb92f9c6615..719c7d2cbaa5 100644 --- a/pkgs/development/python-modules/evdev/default.nix +++ b/pkgs/development/python-modules/evdev/default.nix @@ -3,20 +3,17 @@ buildPythonPackage, fetchPypi, linuxHeaders, - pythonOlder, setuptools, }: buildPythonPackage rec { pname = "evdev"; - version = "1.7.1"; + version = "1.9.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchPypi { inherit pname version; - hash = "sha256-DHLDcL2inYV+GI2TEBnDJlGpweqXfAjI2TmxztFjf94="; + hash = "sha256-OCGLyVUHytdWvGIaX+enekHrjZwSE4Vd6OS6Croo558="; }; patchPhase = '' From 6079ebac7ea7a1c2d4991324ac02f79951ddd17c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 03:19:16 +0000 Subject: [PATCH 2079/2168] xcp: 0.23.0 -> 0.23.1 --- pkgs/by-name/xc/xcp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/xc/xcp/package.nix b/pkgs/by-name/xc/xcp/package.nix index 796f50bbb8f3..b2602541c340 100644 --- a/pkgs/by-name/xc/xcp/package.nix +++ b/pkgs/by-name/xc/xcp/package.nix @@ -6,20 +6,20 @@ rustPlatform.buildRustPackage rec { pname = "xcp"; - version = "0.23.0"; + version = "0.23.1"; src = fetchFromGitHub { owner = "tarka"; repo = pname; rev = "v${version}"; - hash = "sha256-W9gSVZcL171ibcBBblQo1+baux78q+ZuGAOC7nAyQ20="; + hash = "sha256-LtIPuktZYl3JdudsiOtOumR7omF9u5Z4lR1+a2W4qiI="; }; # no such file or directory errors doCheck = false; useFetchCargoVendor = true; - cargoHash = "sha256-X3zXCiMZAolPLjCKSKocc00t3/P2tS57a2+BWW3VaD0="; + cargoHash = "sha256-I1v4DDWflroZwp0vprWP0SXj2PnlCgQ5dusFykoT3zg="; meta = with lib; { description = "Extended cp(1)"; From 8b55618ed91ff2876915f158a1e9186455a82f12 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 03:31:05 +0000 Subject: [PATCH 2080/2168] zola: 0.19.2 -> 0.20.0 --- pkgs/by-name/zo/zola/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/zo/zola/package.nix b/pkgs/by-name/zo/zola/package.nix index 6dedf2ab7a54..155c6a492eec 100644 --- a/pkgs/by-name/zo/zola/package.nix +++ b/pkgs/by-name/zo/zola/package.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "zola"; - version = "0.19.2"; + version = "0.20.0"; src = fetchFromGitHub { owner = "getzola"; repo = "zola"; rev = "v${version}"; - hash = "sha256-BjHAHj3EGE1L+EQdniS4OGOViOmcRDR5RhgmYK2zmVY="; + hash = "sha256-pk7xlNgYybKHm7Zn6cbO1CMUOAKVtX1uxq+6vl48FZk="; }; useFetchCargoVendor = true; - cargoHash = "sha256-B53Bt4/1HuNdPUU3pkmi6FoSOmRsk97ohdAz9RUvUfI="; + cargoHash = "sha256-3Po9PA5XJeiwkMaq/8glfaC1E7QmSeuR81BwOyMznOM="; nativeBuildInputs = [ pkg-config From 4be8d88fd22026cdc8c154d0b49b908e6422e565 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 11:30:25 +0000 Subject: [PATCH 2081/2168] python312Packages.lingva: 5.0.4 -> 5.0.5 --- pkgs/development/python-modules/lingva/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/lingva/default.nix b/pkgs/development/python-modules/lingva/default.nix index 5deff1a94709..0f366a24c7d3 100644 --- a/pkgs/development/python-modules/lingva/default.nix +++ b/pkgs/development/python-modules/lingva/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "lingva"; - version = "5.0.4"; + version = "5.0.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,25 +21,28 @@ buildPythonPackage rec { owner = "vacanza"; repo = "lingva"; tag = "v${version}"; - hash = "sha256-2h3J+pvXRmjD7noMA7Cyu5Tf/9R8Akv08A7xJMLVD08="; + hash = "sha256-zKEGRLaqQSqbOP4ZAidIxMgGQbDIC9pAGfjWqoQTouc="; }; build-system = [ setuptools ]; dependencies = [ - chameleon click polib ]; - nativeCheckInputs = [ pytestCheckHook ]; + optional-dependencies = { + chameleon = [ chameleon ]; + }; + + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.chameleon; pythonImportsCheck = [ "lingva" ]; meta = with lib; { description = "Module with tools to extract translatable texts from your code"; homepage = "https://github.com/vacanza/lingva"; - changelog = "https://github.com/vacanza/lingva/blob/${version}/changes.rst"; + changelog = "https://github.com/vacanza/lingva/blob/${src.tag}/changes.rst"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; From 43ab098cb1e04a4dd4113abed10f6c6fa11640a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 04:30:28 +0000 Subject: [PATCH 2082/2168] candy-icons: 0-unstable-2025-01-29 -> 0-unstable-2025-02-08 --- pkgs/by-name/ca/candy-icons/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/candy-icons/package.nix b/pkgs/by-name/ca/candy-icons/package.nix index e95950c4fce0..d4398af3e19e 100644 --- a/pkgs/by-name/ca/candy-icons/package.nix +++ b/pkgs/by-name/ca/candy-icons/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation { pname = "candy-icons"; - version = "0-unstable-2025-01-29"; + version = "0-unstable-2025-02-08"; src = fetchFromGitHub { owner = "EliverLara"; repo = "candy-icons"; - rev = "907231dcea3008532ec912757d106b4155937331"; - hash = "sha256-Y56gg6dROTaKGvIwsi7xZim8Bc66x3zAWPTsAjYjALc="; + rev = "19b7c01be70bb29475cd939638972ddbb7a33194"; + hash = "sha256-fUQCC4B3+DOxjvX6Fjxy8BBE+piPfbvbKbrIj1Yc6us="; }; nativeBuildInputs = [ gtk3 ]; From 844df576a13664bf958c85c2b831f78000f15fc5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 04:32:00 +0000 Subject: [PATCH 2083/2168] vscode-extensions.saoudrizwan.claude-dev: 3.2.9 -> 3.3.0 --- .../vscode/extensions/saoudrizwan.claude-dev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix index f4eff7e17f31..c47ad307a798 100644 --- a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix +++ b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "claude-dev"; publisher = "saoudrizwan"; - version = "3.2.9"; - hash = "sha256-afLLe/RUd5QTZnXY3wi5qr1bsCmJth2TaDVWbPUVLzc="; + version = "3.3.0"; + hash = "sha256-5ZZUkI/QhD50cfgadXjqxPoi7iShd88EsH5ophHGb3s="; }; meta = { From 5749c98d588d11a24379a3ff1dccba632e7e6372 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 04:49:28 +0000 Subject: [PATCH 2084/2168] hermitcli: 0.42.1 -> 0.44.0 --- pkgs/by-name/he/hermitcli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/he/hermitcli/package.nix b/pkgs/by-name/he/hermitcli/package.nix index d1fe19e65dea..2a35c1467ef7 100644 --- a/pkgs/by-name/he/hermitcli/package.nix +++ b/pkgs/by-name/he/hermitcli/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "hermit"; - version = "0.42.1"; + version = "0.44.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "cashapp"; repo = "hermit"; - hash = "sha256-OaYZMqe1bU5CKfs9IfFmTb3LUvJTFDAkU2uojZ9aRmw="; + hash = "sha256-sEgl/DA0W0KNhVkB4zDYWlOS6X4YBaTIqI7Z6tFI33I="; }; vendorHash = "sha256-GPIJ3IvTM2da962M1FLHKn8OitHDPZ9zp8nSLaeRq10="; From f2fd95077e34b0f364f46a0a1244d2c3c1138a0d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 04:58:30 +0000 Subject: [PATCH 2085/2168] seaweedfs: 3.82 -> 3.84 --- pkgs/by-name/se/seaweedfs/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/se/seaweedfs/package.nix b/pkgs/by-name/se/seaweedfs/package.nix index 5eab0c6f72d3..018b64895ecd 100644 --- a/pkgs/by-name/se/seaweedfs/package.nix +++ b/pkgs/by-name/se/seaweedfs/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "seaweedfs"; - version = "3.82"; + version = "3.84"; src = fetchFromGitHub { owner = "seaweedfs"; repo = "seaweedfs"; rev = version; - hash = "sha256-cjcqPw1RnwMJLvV8JriOG8/AIQTg5PrSjbDFy5IbxqI="; + hash = "sha256-LdwgO+w8DMxZp5n+RxASWp0LvTBSFd9wYOsxr/oSckk="; }; - vendorHash = "sha256-NgpdANUf8hZDTAc7HAuE6wqqZ/KlQSio+lNN6Uk9fAI="; + vendorHash = "sha256-35+UA6aOwCd077tNoNg6WzrGyS7170bUIugRsBnB5AQ="; subPackages = [ "weed" ]; From cc484d83e65489f4dfa8b6fa7a881a066477473f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 05:01:46 +0000 Subject: [PATCH 2086/2168] simdjson: 3.12.0 -> 3.12.2 --- pkgs/by-name/si/simdjson/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/simdjson/package.nix b/pkgs/by-name/si/simdjson/package.nix index a8fc3d76ec83..e5750b6e5cd4 100644 --- a/pkgs/by-name/si/simdjson/package.nix +++ b/pkgs/by-name/si/simdjson/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "3.12.0"; + version = "3.12.2"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-F5yqhDBDoWgB4YkFOYUFEczdu24aBdbsTly4LcFZqDQ="; + sha256 = "sha256-TjUPySFwwTlD4fLpHoUywAeWvVvi7Hg1wxzgE9vohrs="; }; nativeBuildInputs = [ cmake ]; From 208049c89c44392671da094529ed699a422c61d5 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Fri, 14 Feb 2025 23:04:58 -0600 Subject: [PATCH 2087/2168] docs(lib): fix weird structures in attrsets docstrings --- lib/attrsets.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 3001e4ec93b5..180c585961d7 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -17,7 +17,7 @@ rec { /** Return an attribute from nested attribute sets. - Nix has an [attribute selection operator `. or`](https://nixos.org/manual/nix/stable/language/operators#attribute-selection) which is sufficient for such queries, as long as the number of attributes is static. For example: + Nix has an [attribute selection operator `.`](https://nixos.org/manual/nix/stable/language/operators#attribute-selection) which is sufficient for such queries, as long as the number of attributes is static. For example: ```nix (x.a.b or 6) == attrByPath ["a" "b"] 6 x @@ -319,7 +319,7 @@ rec { getAttrFromPath = attrPath: set: - attrByPath attrPath (abort ("cannot find attribute `" + concatStringsSep "." attrPath + "'")) set; + attrByPath attrPath (abort ("cannot find attribute '" + concatStringsSep "." attrPath + "'")) set; /** Map each attribute in the given set and merge them into a new attribute set. From c66e4fe7f873f44714850f3d8908ca21671c35ee Mon Sep 17 00:00:00 2001 From: Mathew Polzin Date: Sat, 15 Feb 2025 00:05:48 -0600 Subject: [PATCH 2088/2168] elmPackages.elm-test: 0.19.1-revision12 -> 0.19.1-revision13 Release notes: https://github.com/rtfeldman/node-test-runner/releases/tag/0.19.1-revision13 --- .../development/compilers/elm/packages/elm-test/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/elm/packages/elm-test/default.nix b/pkgs/development/compilers/elm/packages/elm-test/default.nix index 47beae2c4918..7e413845bf91 100644 --- a/pkgs/development/compilers/elm/packages/elm-test/default.nix +++ b/pkgs/development/compilers/elm/packages/elm-test/default.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "elm-test"; - version = "0.19.1-revision12"; + version = "0.19.1-revision13"; src = fetchFromGitHub { owner = "rtfeldman"; repo = "node-test-runner"; rev = version; - hash = "sha256-cnxAOFcPTJjtHi4VYCO9oltb5iOeDnLvRgnuJnNzjsY="; + hash = "sha256-yA8RLJBytosvcLfuE29EtkCmY8FYJ9cUoHPxF+NVaQo="; }; - npmDepsHash = "sha256-QljHVrmF6uBem9sW67CYduCro3BqF34EPGn1BtKqom0="; + npmDepsHash = "sha256-6nUXyM7b9cV7IYWL+S3Cti1uUlh69/oSMjPHr4r+7y0="; postPatch = '' sed -i '/elm-tooling install/d' package.json From 6ecd1cb5263f638c672e7c0dad7eddd12dcf389d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 06:06:23 +0000 Subject: [PATCH 2089/2168] lessc: 4.2.0 -> 4.2.2 --- pkgs/by-name/le/lessc/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/le/lessc/package.nix b/pkgs/by-name/le/lessc/package.nix index 637f55a762a4..ae8dd4d91fc1 100644 --- a/pkgs/by-name/le/lessc/package.nix +++ b/pkgs/by-name/le/lessc/package.nix @@ -12,17 +12,17 @@ buildNpmPackage rec { pname = "lessc"; - version = "4.2.0"; + version = "4.2.2"; src = fetchFromGitHub { owner = "less"; repo = "less.js"; rev = "v${version}"; - hash = "sha256-pOTKw+orCl2Y8lhw5ZyAqjFJDoka7uG7V5ae6RS1yqw="; + hash = "sha256-vO/1laFb1yC+OESXTx9KuGdwSNC9Iv49F3V7kfXnyJU="; }; sourceRoot = "${src.name}/packages/less"; - npmDepsHash = "sha256-oPE2lo/lMiU8cnOciPW/gwzOtiehl9MGNncCrq1Hk+g="; + npmDepsHash = "sha256-3GlngmaxcUGXSv+ZwN2aovwEqcek6FJ1ZaL5KpjwNn4="; postPatch = '' sed -i ./package.json \ From 02f9c742acbece70f720c6b88e14860a1b9ae7e9 Mon Sep 17 00:00:00 2001 From: Mathew Polzin Date: Sat, 15 Feb 2025 00:06:30 -0600 Subject: [PATCH 2090/2168] elmPackages.elm-test: fix noBrokenSymlinks errors Broken symlinks to build tools for elm-test can be cleaned up in the installed node_modules folder. --- .../compilers/elm/packages/elm-test/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/compilers/elm/packages/elm-test/default.nix b/pkgs/development/compilers/elm/packages/elm-test/default.nix index 7e413845bf91..6b4e66a11f99 100644 --- a/pkgs/development/compilers/elm/packages/elm-test/default.nix +++ b/pkgs/development/compilers/elm/packages/elm-test/default.nix @@ -23,6 +23,13 @@ buildNpmPackage rec { dontNpmBuild = true; + postInstall = '' + # clean up broken symlinks to build tool binaries + find $out/lib/node_modules/elm-test/node_modules/.bin \ + -xtype l \ + -delete + ''; + meta = { changelog = "https://github.com/rtfeldman/node-test-runner/blob/${src.rev}/CHANGELOG.md"; description = "Runs elm-test suites from Node.js"; From d5bf4f6f8b78e9581b97e5b62906aa21d18fcaac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 06:07:11 +0000 Subject: [PATCH 2091/2168] okta-aws-cli: 2.4.0 -> 2.4.1 --- pkgs/by-name/ok/okta-aws-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ok/okta-aws-cli/package.nix b/pkgs/by-name/ok/okta-aws-cli/package.nix index a5a0ae350889..10a9d4ea348c 100644 --- a/pkgs/by-name/ok/okta-aws-cli/package.nix +++ b/pkgs/by-name/ok/okta-aws-cli/package.nix @@ -6,7 +6,7 @@ buildGoModule rec { pname = "okta-aws-cli"; - version = "2.4.0"; + version = "2.4.1"; subPackages = [ "cmd/okta-aws-cli" ]; @@ -14,10 +14,10 @@ buildGoModule rec { owner = "okta"; repo = "okta-aws-cli"; rev = "v${version}"; - sha256 = "sha256-+QNy8slVfoC85AVIcAOF4LAHX7rGac3srRyX3zDffDs="; + sha256 = "sha256-4S7pXPdHUgMNg+3bCsalEH9m9Hl15mX9IEl2eBqIWqA="; }; - vendorHash = "sha256-7PuB4fsclHg9YwY8ezp/pUA7c41PIzSZtEc6qjLeIcY="; + vendorHash = "sha256-MnK0zCwPOTzsPrkULEYwnmIBmVrPiwK2yDr3tqVHHRY="; ldflags = [ "-s" From 06e93819583505b3bf29fc328ab3a7d9f84f5bde Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 06:09:32 +0000 Subject: [PATCH 2092/2168] media-downloader: 5.2.1 -> 5.2.2 --- pkgs/by-name/me/media-downloader/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/me/media-downloader/package.nix b/pkgs/by-name/me/media-downloader/package.nix index 422a37979eff..f6bb77fe596f 100644 --- a/pkgs/by-name/me/media-downloader/package.nix +++ b/pkgs/by-name/me/media-downloader/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "media-downloader"; - version = "5.2.1"; + version = "5.2.2"; src = fetchFromGitHub { owner = "mhogomchungu"; repo = "media-downloader"; rev = finalAttrs.version; - hash = "sha256-GoAKCOi6CegS+GtA/UCMrtvzvfIIj0ye97hKeFJ45gU="; + hash = "sha256-1qeqbV6Puk66JqmBCSSvLIQLJMsosVm6GrLVt+McWRw="; }; nativeBuildInputs = [ From 4be1432d23ce1a8d88a9cf22054c1299f3741fb8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 06:16:20 +0000 Subject: [PATCH 2093/2168] cargo-release: 0.25.16 -> 0.25.17 --- pkgs/by-name/ca/cargo-release/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-release/package.nix b/pkgs/by-name/ca/cargo-release/package.nix index 6646ea443e37..7f8baef63270 100644 --- a/pkgs/by-name/ca/cargo-release/package.nix +++ b/pkgs/by-name/ca/cargo-release/package.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-release"; - version = "0.25.16"; + version = "0.25.17"; src = fetchFromGitHub { owner = "crate-ci"; repo = "cargo-release"; tag = "v${version}"; - hash = "sha256-5crd28XBm6M/hOKzkQG2jaw017dQI5AReg5XnUYdXXc="; + hash = "sha256-SFuEcku6NZlOqLVYrlCJB+ofa8WaL9HJzJcZ42uJ434="; }; useFetchCargoVendor = true; - cargoHash = "sha256-pFSsOSTTpjEl3Od9c05qY26SsXEtfi9HS3E87wVr5y8="; + cargoHash = "sha256-663u8pUnMlUE/6+1WitbLJlJjtLKohns4FM5Iup/WzU="; nativeBuildInputs = [ pkg-config From 8aebc9c281b640da89321956f90e1d55d59a2099 Mon Sep 17 00:00:00 2001 From: adamjhf Date: Sat, 15 Feb 2025 17:33:30 +1100 Subject: [PATCH 2094/2168] tailwindcss-language-server: v0.14.1 -> v0.14.4 --- pkgs/by-name/ta/tailwindcss-language-server/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ta/tailwindcss-language-server/package.nix b/pkgs/by-name/ta/tailwindcss-language-server/package.nix index 63746aa22028..287908ce87fe 100644 --- a/pkgs/by-name/ta/tailwindcss-language-server/package.nix +++ b/pkgs/by-name/ta/tailwindcss-language-server/package.nix @@ -8,7 +8,7 @@ }: let - version = "0.14.1"; + version = "0.14.4"; in stdenv.mkDerivation (finalAttrs: { pname = "tailwindcss-language-server"; @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "tailwindlabs"; repo = "tailwindcss-intellisense"; rev = "v${finalAttrs.version}"; - hash = "sha256-8hP61zBsNWolA60yzSBb+fPlRuHCTvRfnC1DduB4KkA="; + hash = "sha256-ZSKvD0OnI+/i5MHHlrgYbcaa8g95fVwjb2oryaEParQ="; }; pnpmDeps = pnpm_9.fetchDeps { @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmWorkspaces prePnpmInstall ; - hash = "sha256-bxapagJcVPFxtKUuS4ATKr6rpAaDIFiccSANG0p3Ybc="; + hash = "sha256-f7eNBQl6/qLE7heoCFnYpjq57cjZ9pwT9Td4WmY1oag="; }; nativeBuildInputs = [ From bfd6b6d878eb985bd9ffabf0fec2c1a769030aa0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 06:36:10 +0000 Subject: [PATCH 2095/2168] serie: 0.4.3 -> 0.4.4 --- pkgs/by-name/se/serie/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/se/serie/package.nix b/pkgs/by-name/se/serie/package.nix index 9ffd036fa45f..2b14244649ad 100644 --- a/pkgs/by-name/se/serie/package.nix +++ b/pkgs/by-name/se/serie/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "serie"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = "lusingander"; repo = "serie"; rev = "v${version}"; - hash = "sha256-NjEom/UZQ/so27sYU5ADEJQL7KhwnunTjjkh3MLliGA="; + hash = "sha256-Uf7HYcN/lJc2TSl2dZQcOKyEeLHMb2RTQwSzXWZnBkw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-r6fJ2NsBJaJVJzEnST89VY4wEQdpH1FsadV9BuF/K6E="; + cargoHash = "sha256-NbBF747sSxmjlTbcYknNZFFsaIVZ6+wHhjMJ6akg4BU="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; From af23262e446782f3006717407268215e9ff582fa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 06:40:04 +0000 Subject: [PATCH 2096/2168] pretender: 1.3.0 -> 1.3.1 --- pkgs/by-name/pr/pretender/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/pretender/package.nix b/pkgs/by-name/pr/pretender/package.nix index b60667f0be14..a993fbf8b373 100644 --- a/pkgs/by-name/pr/pretender/package.nix +++ b/pkgs/by-name/pr/pretender/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "pretender"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "RedTeamPentesting"; repo = pname; tag = "v${version}"; - hash = "sha256-msxGCQkF5u5sIjvy4GCRBIivzoiIDsOjesIf3d8goVI="; + hash = "sha256-vIVlFt13DU0PgZ5kTIxiCghyFIjkqVGFpgXp9pOqdsQ="; }; vendorHash = "sha256-UzKprzkxqG7FOPWcFQGuZtn+gHMeMy4jqCLUSdyO2l0="; From eb52707c89e3321936a03a404157b8b7759339cd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 07:07:44 +0000 Subject: [PATCH 2097/2168] python312Packages.speechrecognition: 3.14.0 -> 3.14.1 --- pkgs/development/python-modules/speechrecognition/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/speechrecognition/default.nix b/pkgs/development/python-modules/speechrecognition/default.nix index c28f04c67c72..dda30d0a278b 100644 --- a/pkgs/development/python-modules/speechrecognition/default.nix +++ b/pkgs/development/python-modules/speechrecognition/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "speechrecognition"; - version = "3.14.0"; + version = "3.14.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "Uberi"; repo = "speech_recognition"; tag = version; - hash = "sha256-1tZ3w77VYPO7BK6y572MwY1BV2+UeSwEL1E3mpdkqJg="; + hash = "sha256-4FrFiDRqTZnLB3hTy8hZovlakZsRFEg2ZGitJhJ6DA0="; }; postPatch = '' From dd3d2d92d12eb98a932cd3bc0345f78b5df4bef2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 07:15:49 +0000 Subject: [PATCH 2098/2168] weaver: 0.12.0 -> 0.13.2 --- pkgs/by-name/we/weaver/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/we/weaver/package.nix b/pkgs/by-name/we/weaver/package.nix index 43ad2ffe995f..80e838b23272 100644 --- a/pkgs/by-name/we/weaver/package.nix +++ b/pkgs/by-name/we/weaver/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "weaver"; - version = "0.12.0"; + version = "0.13.2"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "weaver"; rev = "v${version}"; - hash = "sha256-FBf+X0Xs3Yr9Sk5v86f2N9WOyv/rW/RSGlAYJ6UCBGY="; + hash = "sha256-kfBWI+1f39oSSKYflXfXnBTc96OZch7o5HWfOgOfuxs="; }; useFetchCargoVendor = true; - cargoHash = "sha256-rxBij00NQySBVK3lJSm5rWo4YUZZvxk6tnNUzCj75FQ="; + cargoHash = "sha256-KK6Cp6viQPp9cSxs1dP1tf/bIMgkKiaKPE6VytyHyZA="; checkFlags = [ # Skip tests requiring network From f7320bf80ab5d48ba478758c94809dfba0963690 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 07:25:54 +0000 Subject: [PATCH 2099/2168] ts_query_ls: 1.5.0 -> 1.8.0 --- pkgs/by-name/ts/ts_query_ls/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ts/ts_query_ls/package.nix b/pkgs/by-name/ts/ts_query_ls/package.nix index 035c2a18eadc..f7034446ab4a 100644 --- a/pkgs/by-name/ts/ts_query_ls/package.nix +++ b/pkgs/by-name/ts/ts_query_ls/package.nix @@ -6,7 +6,7 @@ }: let pname = "ts_query_ls"; - version = "1.5.0"; + version = "1.8.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -15,13 +15,13 @@ rustPlatform.buildRustPackage { owner = "ribru17"; repo = "ts_query_ls"; rev = "v${version}"; - hash = "sha256-XcW5A3l+qAm4PcXX23D7B2/0VVjBYBQFukni5Fo5qHk="; + hash = "sha256-HSYPYiYoU8bcMJkq27gSDELLxL8uCU9bHvf1JQq9tVI="; }; nativeBuildInputs = [ cmake ]; useFetchCargoVendor = true; - cargoHash = "sha256-t5VPev32fAQbBf2NAtLOUizmLLzVPochwWMy8BhuitM="; + cargoHash = "sha256-h1Qm4DSknSmeo7KKrdC8b7VNw/dzQ6fEgX4MWQcrAnk="; meta = { description = "LSP implementation for Tree-sitter's query files"; From 62836a5eb548efd645ef1b4bbf048543e1e3669c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 07:28:54 +0000 Subject: [PATCH 2100/2168] zenoh-plugin-mqtt: 1.2.0 -> 1.2.1 --- pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix b/pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix index 861e9d05129d..644b956da84e 100644 --- a/pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix +++ b/pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "zenoh-plugin-mqtt"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "eclipse-zenoh"; repo = "zenoh-plugin-mqtt"; tag = version; - hash = "sha256-ath1RWr+5nU2GJY6rlWPPBKHX9K/92DFUhgQWVXoWb8="; + hash = "sha256-5/obCmi9rbbe9kEkAQTla/4W8ebKj80F4sLKli6oSmw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Sj50OcIbpP9O+cp5FxmmOg/9iYBFvqh8s2cOOaDwHSA="; + cargoHash = "sha256-tMvBAn2FCpvT9O96Nt646t3LMWqhBHWWzRrMGVP1G1g="; # Some test time out doCheck = false; From 0fa2add3344fa7bf36cd51c407150cdde90409e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 07:34:52 +0000 Subject: [PATCH 2101/2168] zenoh-plugin-webserver: 1.2.0 -> 1.2.1 --- pkgs/by-name/ze/zenoh-plugin-webserver/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zenoh-plugin-webserver/package.nix b/pkgs/by-name/ze/zenoh-plugin-webserver/package.nix index 82d217f6da51..a2a5ea6bff9d 100644 --- a/pkgs/by-name/ze/zenoh-plugin-webserver/package.nix +++ b/pkgs/by-name/ze/zenoh-plugin-webserver/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "zenoh-plugin-webserver"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "eclipse-zenoh"; repo = "zenoh-plugin-webserver"; tag = version; - hash = "sha256-+2ta3LdT1YwRs62dyrbmJDCfKDhpWdig1bX0Qq8EoCY="; + hash = "sha256-GvJWyH0kW6POQaliPhahEFen1CcwDrrQNMdL2LtHkmc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-5gN1BzNqB4xWV0a2Qh1PLzw+bOnln9Nua1+NGes6jaQ="; + cargoHash = "sha256-S6Dn7ZOfonUo5FMh0rMzrZiKMaBjYDZs2LeUUAVCJOw="; meta = { description = "Implements an HTTP server mapping URLs to zenoh paths"; From 806dc63c0f71614e3416627ae1329ee2431e0ea6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 07:37:06 +0000 Subject: [PATCH 2102/2168] zenoh-backend-influxdb: 1.2.0 -> 1.2.1 --- pkgs/by-name/ze/zenoh-backend-influxdb/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zenoh-backend-influxdb/package.nix b/pkgs/by-name/ze/zenoh-backend-influxdb/package.nix index 61c285c85aed..1a385f2dcba7 100644 --- a/pkgs/by-name/ze/zenoh-backend-influxdb/package.nix +++ b/pkgs/by-name/ze/zenoh-backend-influxdb/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "zenoh-backend-influxdb"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "eclipse-zenoh"; repo = "zenoh-backend-influxdb"; tag = version; - hash = "sha256-npkQEr1tzY+CW9dDRe+JipXnWa5y38wv7J+kUMlcH54="; + hash = "sha256-Bdsu/1+lotvGyvKia8ZxRnD0o2Y2yoq5xmok4/hE0mI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-k4EakfuONQxj9jz39pnyp3Ofu+V/oyIFLHpfQqg0q+8="; + cargoHash = "sha256-YcDTwbaVRpl+xULArqSwjni9pWhgE8XGcY67xiDxFa4="; meta = { description = "Backend and Storages for zenoh using InfluxDB"; From aa62dfa76fac4b2b90ef8a4803f09201e017d431 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 07:41:53 +0000 Subject: [PATCH 2103/2168] zenoh-backend-rocksdb: 1.2.0 -> 1.2.1 --- pkgs/by-name/ze/zenoh-backend-rocksdb/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zenoh-backend-rocksdb/package.nix b/pkgs/by-name/ze/zenoh-backend-rocksdb/package.nix index 0985c9804d9d..64ef7811a1a3 100644 --- a/pkgs/by-name/ze/zenoh-backend-rocksdb/package.nix +++ b/pkgs/by-name/ze/zenoh-backend-rocksdb/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "zenoh-backend-rocksdb"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "eclipse-zenoh"; repo = "zenoh-backend-rocksdb"; tag = version; - hash = "sha256-YZf3riWMzcyguZbfGheIbAlCijML7zPG+XAJso6ku9E="; + hash = "sha256-pqeeH44/0+ok/DmH81JykvwOIC/pIUiLjzPzVEnekag="; }; useFetchCargoVendor = true; - cargoHash = "sha256-SstJKOx52JHnDsqbb9CcejYDsfQfKHF2FKfGVxBQPmw="; + cargoHash = "sha256-dUQ9qGE+QphDH/vW1LXWzkJE2GSOU7Sn+xCENOvTsSc="; nativeBuildInputs = [ pkg-config From 250231c2f7f5f402d88acfec7fb85ca38ac04511 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 07:51:50 +0000 Subject: [PATCH 2104/2168] zenoh-backend-filesystem: 1.2.0 -> 1.2.1 --- pkgs/by-name/ze/zenoh-backend-filesystem/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zenoh-backend-filesystem/package.nix b/pkgs/by-name/ze/zenoh-backend-filesystem/package.nix index ece671fb5a7a..674bffd814fe 100644 --- a/pkgs/by-name/ze/zenoh-backend-filesystem/package.nix +++ b/pkgs/by-name/ze/zenoh-backend-filesystem/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "zenoh-backend-filesystem"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "eclipse-zenoh"; repo = "zenoh-backend-filesystem"; tag = version; - hash = "sha256-e7jVje4kI3/xRNk1s1z8WtpUIwPdMleyb0PvDz+vJ08="; + hash = "sha256-AQHJkUE2utFn4910+KGnf0wdXDMO6AmLVq1glp6k8Fc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-88QVaneHBV9Lubd8M1c/HHWj4V3d2i1z8+tWY9CMA5c="; + cargoHash = "sha256-batUPE2/goNxmxNDW11EC3+ImrPv3UouuKHKSDDd4Gs="; nativeBuildInputs = [ pkg-config From dc3c2bc82a5dc3ee828978e9432250f1cbe102fa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 08:00:53 +0000 Subject: [PATCH 2105/2168] stackit-cli: 0.22.0 -> 0.24.0 --- pkgs/by-name/st/stackit-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/stackit-cli/package.nix b/pkgs/by-name/st/stackit-cli/package.nix index 13f97943f057..190338cdce61 100644 --- a/pkgs/by-name/st/stackit-cli/package.nix +++ b/pkgs/by-name/st/stackit-cli/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "stackit-cli"; - version = "0.22.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "stackitcloud"; repo = "stackit-cli"; rev = "v${version}"; - hash = "sha256-05x7nH3XSbO5iLF46BDgtkwBb3XLkAvOw0WIoVf/FkU="; + hash = "sha256-n1F/DjGvNzU5aF05y3K6/vDuFa/ed2XZLfpafi5+NWg="; }; - vendorHash = "sha256-5amIW9DA1F3q0W7s+TpbiyeW0W7PAlzpDyBRRVZ/4eA="; + vendorHash = "sha256-EaHRYdP7w1PQFYNxAWiTYcCpfipuqvbtbBUYNXNM6nc="; subPackages = [ "." ]; From 7cff9ab2483a94a1c0b0a08e137ed75afcb033c7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 08:29:33 +0000 Subject: [PATCH 2106/2168] python312Packages.pysol-cards: 0.18.0 -> 0.18.1 --- pkgs/development/python-modules/pysol-cards/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysol-cards/default.nix b/pkgs/development/python-modules/pysol-cards/default.nix index b9612be0978c..aa468b5af4ce 100644 --- a/pkgs/development/python-modules/pysol-cards/default.nix +++ b/pkgs/development/python-modules/pysol-cards/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pysol-cards"; - version = "0.18.0"; + version = "0.18.1"; format = "setuptools"; src = fetchPypi { inherit version; pname = "pysol_cards"; - hash = "sha256-KRlurdUaVKe/hT0K7LoWiFOQOiSAO4VUcT6Mf8xzLCw="; + hash = "sha256-EDx8DDGecug24Jm7tH/1S+cp2XXjXBG6dNSsXkKGuOs="; }; propagatedBuildInputs = [ From 5555f5f846bea2dcc70a66e118a34411c5629c27 Mon Sep 17 00:00:00 2001 From: Tim Englart Date: Sun, 9 Feb 2025 19:55:48 +1000 Subject: [PATCH 2107/2168] nixos/autobrr: update serivce default port value to be a number --- nixos/modules/services/misc/autobrr.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/autobrr.nix b/nixos/modules/services/misc/autobrr.nix index c898351c4316..9ea4cef85ac5 100644 --- a/nixos/modules/services/misc/autobrr.nix +++ b/nixos/modules/services/misc/autobrr.nix @@ -31,7 +31,7 @@ in type = lib.types.submodule { freeformType = configFormat.type; }; default = { host = "127.0.0.1"; - port = "7474"; + port = 7474; checkForUpdates = true; }; example = { From 2fd6e913b2d72ab94223d051c7b87234407b8fef Mon Sep 17 00:00:00 2001 From: Neyts Zupan Date: Sat, 15 Feb 2025 15:54:40 +0700 Subject: [PATCH 2108/2168] pgweb: add NixOS test I maintain this package and I'd llike to be able to merge minor version bumps without having to manually test the package. refs https://github.com/Thaigersprint/thaigersprint-2025/issues/1 --- nixos/tests/all-tests.nix | 1 + nixos/tests/pgweb.nix | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 nixos/tests/pgweb.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 3e29907f3c5a..c84fd7cc84ed 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -822,6 +822,7 @@ in { pgadmin4 = handleTest ./pgadmin4.nix {}; pgbouncer = handleTest ./pgbouncer.nix {}; pghero = runTest ./pghero.nix; + pgweb = runTest ./pgweb.nix; pgmanage = handleTest ./pgmanage.nix {}; phosh = handleTest ./phosh.nix {}; photonvision = handleTest ./photonvision.nix {}; diff --git a/nixos/tests/pgweb.nix b/nixos/tests/pgweb.nix new file mode 100644 index 000000000000..3939ae958d70 --- /dev/null +++ b/nixos/tests/pgweb.nix @@ -0,0 +1,32 @@ +{ lib, ... }: +{ + name = "pgweb"; + meta.maintainers = [ lib.maintainers.zupo ]; + + nodes.machine = + { config, pkgs, ... }: + { + services.postgresql = { + enable = true; + authentication = '' + host all all ::1/128 trust + ''; + }; + environment.systemPackages = [ pkgs.pgweb ]; + + systemd.services.myservice = { + serviceConfig = { + ExecStart = "${pkgs.pgweb}/bin/pgweb --url postgresql://postgres@localhost:5432/postgres"; + }; + path = [ pkgs.getent ]; + after = [ "postgresql.service" ]; + wantedBy = [ "multi-user.target" ]; + }; + }; + + testScript = '' + machine.wait_for_unit("myservice.service") + machine.wait_for_open_port(8081) + machine.wait_until_succeeds("curl -sSf localhost:8081 | grep '
Table Information
'") + ''; +} From f3f931cd11fe24e1fff21e00e87f2b87fff2de3f Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Sat, 15 Feb 2025 09:36:27 +0100 Subject: [PATCH 2109/2168] lazygit: 0.45.2 -> 0.46.0 Changelog: https://github.com/jesseduffield/lazygit/releases Diff: https://github.com/jesseduffield/lazygit/compare/v0.45.2...v0.46.0 --- pkgs/by-name/la/lazygit/package.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/la/lazygit/package.nix b/pkgs/by-name/la/lazygit/package.nix index bd2ea5951233..448616b7bb2b 100644 --- a/pkgs/by-name/la/lazygit/package.nix +++ b/pkgs/by-name/la/lazygit/package.nix @@ -1,20 +1,19 @@ { lib, - buildGo122Module, + buildGoModule, fetchFromGitHub, lazygit, testers, }: -# Regression in go1.23 see https://github.com/jesseduffield/lazygit/issues/4002 -buildGo122Module rec { +buildGoModule rec { pname = "lazygit"; - version = "0.45.2"; + version = "0.46.0"; src = fetchFromGitHub { owner = "jesseduffield"; repo = pname; tag = "v${version}"; - hash = "sha256-B8z0NqCFdCAYVZnujfDJ9Y4qFXuhy5A/RG51Qb2J4ts="; + hash = "sha256-KUJ6+GPtQ5wNbbmCnOopifdxHTo67Y9kW3zwm6f9bXc="; }; vendorHash = null; From 6c2e91a2d512c0531cc76712fa7e344dc8557931 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 09:20:56 +0000 Subject: [PATCH 2110/2168] python312Packages.django-import-export: 4.3.4 -> 4.3.5 --- .../python-modules/django-import-export/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/django-import-export/default.nix b/pkgs/development/python-modules/django-import-export/default.nix index 276d60fc3f93..152f78cd13cc 100644 --- a/pkgs/development/python-modules/django-import-export/default.nix +++ b/pkgs/development/python-modules/django-import-export/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "django-import-export"; - version = "4.3.4"; + version = "4.3.5"; pyproject = true; src = fetchFromGitHub { owner = "django-import-export"; repo = "django-import-export"; tag = version; - hash = "sha256-o21xT+gu1vuar/QJbXhg2hpHkrBCVOMhGAFngi32d10="; + hash = "sha256-jHF1En3lmNhHAiN/3o6eRUub8RhD8+mTXwbDqDP4Zlw="; }; pythonRelaxDeps = [ "tablib" ]; @@ -61,7 +61,7 @@ buildPythonPackage rec { meta = with lib; { description = "Django application and library for importing and exporting data with admin integration"; homepage = "https://github.com/django-import-export/django-import-export"; - changelog = "https://github.com/django-import-export/django-import-export/blob/${version}/docs/changelog.rst"; + changelog = "https://github.com/django-import-export/django-import-export/blob/${src.tag}/docs/changelog.rst"; license = licenses.bsd2; maintainers = with maintainers; [ sephi ]; }; From 76505dfcb6b8ee6ee97ee7cf6fc27f7a69352cb5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 09:26:06 +0000 Subject: [PATCH 2111/2168] python312Packages.ihm: 1.8 -> 2.2 --- pkgs/development/python-modules/ihm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ihm/default.nix b/pkgs/development/python-modules/ihm/default.nix index 01d6bc77234f..76ae7acb649e 100644 --- a/pkgs/development/python-modules/ihm/default.nix +++ b/pkgs/development/python-modules/ihm/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "ihm"; - version = "1.8"; + version = "2.2"; pyproject = true; src = fetchFromGitHub { owner = "ihmwg"; repo = "python-ihm"; tag = version; - hash = "sha256-Uz/4Egd7swY4kDl6FR564eiaYEdY9IUoz2Lv5pJ1C30="; + hash = "sha256-1SJPP2Lgw7thh9aCUe+U9O+LrZFAaMD4DoWl93xuQkM="; }; nativeBuildInputs = [ swig ]; @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python package for handling IHM mmCIF and BinaryCIF files"; homepage = "https://github.com/ihmwg/python-ihm"; - changelog = "https://github.com/ihmwg/python-ihm/blob/${src.rev}/ChangeLog.rst"; + changelog = "https://github.com/ihmwg/python-ihm/blob/${src.tag}/ChangeLog.rst"; license = licenses.mit; maintainers = with maintainers; [ natsukium ]; }; From 4214516b11be1818042d5df6886cadc43f5cb071 Mon Sep 17 00:00:00 2001 From: misilelab Date: Sat, 15 Feb 2025 18:26:10 +0900 Subject: [PATCH 2112/2168] python3Packages.pbs-installer: 2025.02.05 -> 2025.02.12 --- pkgs/development/python-modules/pbs-installer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pbs-installer/default.nix b/pkgs/development/python-modules/pbs-installer/default.nix index 521916500989..1484154683ad 100644 --- a/pkgs/development/python-modules/pbs-installer/default.nix +++ b/pkgs/development/python-modules/pbs-installer/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pbs-installer"; - version = "2025.02.05"; + version = "2025.02.12"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "frostming"; repo = "pbs-installer"; tag = version; - hash = "sha256-lJDniOqJHgMan5fZ8/MvT3xHEXwZuibbnPBn6KiRLaE="; + hash = "sha256-Ko9gLGLQ6O0yPg4aLZXBlTLxCrikOOwO9VdcnUuNEu8="; }; build-system = [ pdm-backend ]; From 8993ae20cb34a1414ed31366593f6f0ac985a049 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 09:29:59 +0000 Subject: [PATCH 2113/2168] scala-cli: 1.6.1 -> 1.6.2 --- .../tools/build-managers/scala-cli/sources.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/build-managers/scala-cli/sources.json b/pkgs/development/tools/build-managers/scala-cli/sources.json index cf576bf4f850..381f50754913 100644 --- a/pkgs/development/tools/build-managers/scala-cli/sources.json +++ b/pkgs/development/tools/build-managers/scala-cli/sources.json @@ -1,21 +1,21 @@ { - "version": "1.6.1", + "version": "1.6.2", "assets": { "aarch64-darwin": { "asset": "scala-cli-aarch64-apple-darwin.gz", - "sha256": "0qvd3899bw19d7mavx5n50n3w5qry9jmzdyfmkql2r5xb8sb071z" + "sha256": "039cprk224i1vszk86vhxg6rz637smrrnfbz449sy7pk6qlzq7xi" }, "aarch64-linux": { "asset": "scala-cli-aarch64-pc-linux.gz", - "sha256": "1xmz5lb1d3k5jya3kk6bdymrdl1856gl95c4h736pramlc275277" + "sha256": "1p0vf33m0nrb8s6hhm4c931ialp20v37w2v7m3f46w11s4hmk6qj" }, "x86_64-darwin": { "asset": "scala-cli-x86_64-apple-darwin.gz", - "sha256": "12hgknbxvj2d193rap01qjqh1scl7a359rx4mcy5mvjb5ah977i6" + "sha256": "1y9x84s7k8lcnb074q0pljjcgr8in2ll7lqxfwh5yrapxzjm7jh8" }, "x86_64-linux": { "asset": "scala-cli-x86_64-pc-linux.gz", - "sha256": "1k6ym1ak097q0biwll3jajq86mi7wyvzmhp4wkia63vmnimgkdzz" + "sha256": "15xx7ijj7cahhkzn5knnx3kcc2rrycshhqfk24l73lf0j2b5gzhf" } } } From ab258194953712e9bd0e24c1bf673f20016b4f78 Mon Sep 17 00:00:00 2001 From: misilelab Date: Sat, 15 Feb 2025 18:32:15 +0900 Subject: [PATCH 2114/2168] uv: 0.5.31 -> 0.6.0 --- pkgs/by-name/uv/uv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 39ca6935e304..8b8fe6b3d61b 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -17,17 +17,17 @@ rustPlatform.buildRustPackage rec { pname = "uv"; - version = "0.5.31"; + version = "0.6.0"; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = version; - hash = "sha256-Gxn/fBXPoehLkKN1PAg31sL/eMxqQMk1+oineuAO17g="; + hash = "sha256-1D1/LY8nJI14nLghYI60a4CFmu8McUIUnxB7SeXPs1o="; }; useFetchCargoVendor = true; - cargoHash = "sha256-dop61TB9w2r+our4DiKzPvw9lI07cx9bT0Ujtvhko1E="; + cargoHash = "sha256-2XLkMk6IsWho/BlPr+uxfuliAsTDat+nY0h/MJN8sXU="; nativeBuildInputs = [ cmake From 543745ab7e8840747f6e4db20f1dd758d43fc425 Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Sat, 15 Feb 2025 10:53:58 +0100 Subject: [PATCH 2115/2168] hedgedoc: 1.10.1 -> 1.10.2 --- pkgs/by-name/he/hedgedoc/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/he/hedgedoc/package.nix b/pkgs/by-name/he/hedgedoc/package.nix index 3611302884ea..460b44b2062f 100644 --- a/pkgs/by-name/he/hedgedoc/package.nix +++ b/pkgs/by-name/he/hedgedoc/package.nix @@ -13,13 +13,13 @@ }: let - version = "1.10.1"; + version = "1.10.2"; src = fetchFromGitHub { owner = "hedgedoc"; repo = "hedgedoc"; tag = version; - hash = "sha256-fqpIPKU8B+T65PL11ipu0xkkioJf4k/8tdl045djfNk="; + hash = "sha256-WDLcBnqhoKt6E41CzumOZg/5qvKFccN6gwirLTcwWYo="; }; # we cannot use fetchYarnDeps because that doesn't support yarn 2/berry lockfiles @@ -44,7 +44,7 @@ let ''; outputHashMode = "recursive"; - outputHash = "sha256-cx/VNThgGJSd8sDqsb7Fe7l4Fb8kT/NSxOD+KTq2RNA="; + outputHash = "sha256-u/t2uvQ9oJnfjkSoPGjGsESWIsQHWvj9GP08aD6RkJk="; }; in From 23c5bd55d4b41c7c55f46c259a1e769ff04ee2c4 Mon Sep 17 00:00:00 2001 From: Artur Manuel Date: Sat, 15 Feb 2025 04:48:20 +0000 Subject: [PATCH 2116/2168] xonsh: 0.19.1 -> 0.19.2 --- pkgs/by-name/xo/xonsh/unwrapped.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xo/xonsh/unwrapped.nix b/pkgs/by-name/xo/xonsh/unwrapped.nix index 3e7686d340c2..236562e8065f 100644 --- a/pkgs/by-name/xo/xonsh/unwrapped.nix +++ b/pkgs/by-name/xo/xonsh/unwrapped.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "xonsh"; - version = "0.19.1"; + version = "0.19.2"; pyproject = true; # PyPI package ships incomplete tests @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "xonsh"; repo = "xonsh"; tag = version; - hash = "sha256-20egNKlJjJO1wdy1anApz0ADBnaHPUSqhfrsPe3QQIs="; + hash = "sha256-h5WK/7PZQKHajiaj3BTHLeW4TYhSB/IV0eRZPCSD6qg="; }; build-system = [ From 90ca0500a33ac0331d8f14fed7da5cf0d1b63a72 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Thu, 6 Feb 2025 14:49:24 +0100 Subject: [PATCH 2117/2168] rustPlatform.fetchCargoVendor: use proxyImpureEnvVars --- pkgs/build-support/rust/fetch-cargo-vendor.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/build-support/rust/fetch-cargo-vendor.nix b/pkgs/build-support/rust/fetch-cargo-vendor.nix index e346ab659af6..7c7c8b793342 100644 --- a/pkgs/build-support/rust/fetch-cargo-vendor.nix +++ b/pkgs/build-support/rust/fetch-cargo-vendor.nix @@ -56,6 +56,8 @@ let { name = "${name}-vendor-staging"; + impureEnvVars = lib.fetchers.proxyImpureEnvVars; + nativeBuildInputs = [ fetchCargoVendorUtil From d3a25714afb114e816ba9b6ae04bf76f996e7c5d Mon Sep 17 00:00:00 2001 From: merrkry Date: Sat, 15 Feb 2025 11:30:46 +0100 Subject: [PATCH 2118/2168] asusctl: 6.1.2 -> 6.1.4 --- pkgs/by-name/as/asusctl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/as/asusctl/package.nix b/pkgs/by-name/as/asusctl/package.nix index 5de7b319bb37..86e8190dc46d 100644 --- a/pkgs/by-name/as/asusctl/package.nix +++ b/pkgs/by-name/as/asusctl/package.nix @@ -17,17 +17,17 @@ }: rustPlatform.buildRustPackage rec { pname = "asusctl"; - version = "6.1.2"; + version = "6.1.4"; src = fetchFromGitLab { owner = "asus-linux"; repo = "asusctl"; rev = version; - hash = "sha256-nhhlimr1w0tgfzPQTr/Opey2Hviy1YAdSVUe5YINnZE="; + hash = "sha256-t5wjfazKadpYEc29LJmnh3Zdc53wQQY2DYpj3ijZ534="; }; useFetchCargoVendor = true; - cargoHash = "sha256-qgnMPICq7K3UT5l2T/nEvvWfEeNBpxwJburVJeAhQSs="; + cargoHash = "sha256-1IwGjdx2BM6kA17mgYg5+pAr6UOiIuP6//05tcjmJBM="; postPatch = '' files=" From 0babef382e7eae390861e80a3d59fa6db4485caf Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Tue, 11 Feb 2025 11:33:03 +0000 Subject: [PATCH 2119/2168] scx.full: 1.0.8 -> 1.0.9 Changelog: https://github.com/sched-ext/scx/releases/tag/v1.0.9 Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com> --- pkgs/os-specific/linux/scx/version.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/scx/version.json b/pkgs/os-specific/linux/scx/version.json index e603cab61294..91b2346e4447 100644 --- a/pkgs/os-specific/linux/scx/version.json +++ b/pkgs/os-specific/linux/scx/version.json @@ -1,8 +1,8 @@ { "scx": { - "version": "1.0.8", - "hash": "sha256-eXui9fvi8C/HHp8wU7STrDC8b950YZzyhoLoGHXZ6S8=", - "cargoHash": "sha256-TdwymmaP6rG+Shh/9ByhXIlo+9yZapi9vWN5/5Rd3RY=" + "version": "1.0.9", + "hash": "sha256-9F6/fkNnyHa9Ud7Kcp2TvRLQE/QEt/rDFETvwiPtx8E=", + "cargoHash": "sha256-0K9NyvCgS1Y/puDSFgGoZmGJ5u9E/lEcFuiBUHReC7g=" }, "bpftool": { "rev": "183e7010387d1fc9f08051426e9a9fbd5f8d409e", From da2615649fcc90c706a4f67eacd64929bcebce05 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Sat, 15 Feb 2025 16:39:16 +0530 Subject: [PATCH 2120/2168] scx.full: don't build on aarch64-linux As per https://github.com/NixOS/nixpkgs/pull/381138#issuecomment-2653368487 scx releases often breaks building on aarch64-linux, and besides the package does not seem to have proper support for this platform This reverts commit 0f40303097696a5cbb31cc583ae37c79540aa80f. This can be reverted again if we feel upstream has improved its aarch64-linux support. Link: https://github.com/sched-ext/scx/issues/1320 --- pkgs/os-specific/linux/scx/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/scx/default.nix b/pkgs/os-specific/linux/scx/default.nix index fdac201f5a5f..6e645f2f210e 100644 --- a/pkgs/os-specific/linux/scx/default.nix +++ b/pkgs/os-specific/linux/scx/default.nix @@ -21,6 +21,7 @@ let changelog = "https://github.com/sched-ext/scx/releases/tag/v${versionInfo.scx.version}"; license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; + badPlatforms = [ "aarch64-linux" ]; maintainers = with lib.maintainers; [ johnrtitor ]; }; }; From d8d64f444353da0af0f30a6f2452fbf03e5f13e4 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Tue, 11 Feb 2025 16:37:51 +0530 Subject: [PATCH 2121/2168] rose-pine-hyprcursor: init at 0.3.2 Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com> --- .../ro/rose-pine-hyprcursor/package.nix | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 pkgs/by-name/ro/rose-pine-hyprcursor/package.nix diff --git a/pkgs/by-name/ro/rose-pine-hyprcursor/package.nix b/pkgs/by-name/ro/rose-pine-hyprcursor/package.nix new file mode 100644 index 000000000000..bef43596d05e --- /dev/null +++ b/pkgs/by-name/ro/rose-pine-hyprcursor/package.nix @@ -0,0 +1,40 @@ +{ + lib, + stdenv, + fetchFromGitHub, + nix-update-script, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "rose-pine-hyprcursor"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "ndom91"; + repo = "rose-pine-hyprcursor"; + tag = "v${finalAttrs.version}"; + hash = "sha256-ArUX5qlqAXUqcRqHz4QxXy3KgkfasTPA/Qwf6D2kV0U="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/icons/rose-pine-hyprcursor + cp -R . $out/share/icons/rose-pine-hyprcursor/ + + runHook postInstall + ''; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Rose Pine theme for Hyprcursor"; + homepage = "https://github.com/ndom91/rose-pine-hyprcursor"; + changelog = "https://github.com/ndom91/rose-pine-hyprcursor/releases/tag/v${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ + johnrtitor + ]; + }; +}) From 1a8195d4af87a5265d280624a3214ba67f54dcea Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 15 Feb 2025 12:34:35 +0100 Subject: [PATCH 2122/2168] presenterm: 0.10.0 -> 0.10.1 Diff: https://github.com/mfontanini/presenterm/compare/refs/tags/v0.10.0...v0.10.1 Changelog: https://github.com/mfontanini/presenterm/releases/tag/v0.10.1 --- pkgs/by-name/pr/presenterm/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/presenterm/package.nix b/pkgs/by-name/pr/presenterm/package.nix index c3cfc34c3091..12e1adfbef6f 100644 --- a/pkgs/by-name/pr/presenterm/package.nix +++ b/pkgs/by-name/pr/presenterm/package.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage rec { pname = "presenterm"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "mfontanini"; repo = "presenterm"; tag = "v${version}"; - hash = "sha256-giTEDk5bj1x0cE53zEkQ0SU3SQJZabhr1X3keV07rN4="; + hash = "sha256-ow87vKHfdstL2k73wHD06HsX28mLvTrWh5yIbo/a54M="; }; buildInputs = [ @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { ]; useFetchCargoVendor = true; - cargoHash = "sha256-N3g7QHgsfr8QH6HWA3/Ar7ZZYN8JPE7D7+/2JVJzW9o="; + cargoHash = "sha256-KpwW2lblX4aCN73jWFY9Ylp+AEbGWCu/jb/c8wTao08="; checkFlags = [ # failed to load .tmpEeeeaQ: No such file or directory (os error 2) From f6a54e46f8d94c1087b6d9ebaa9b34efab2cb2b7 Mon Sep 17 00:00:00 2001 From: Neyts Zupan Date: Sat, 15 Feb 2025 19:05:59 +0700 Subject: [PATCH 2123/2168] pgweb: fix tests Register NixOS tests from https://github.com/NixOS/nixpkgs/pull/382268 in passthru.tests so they automatically run when the package version is updated. Refs https://github.com/Thaigersprint/thaigersprint-2025/issues/1 --- pkgs/by-name/pg/pgweb/package.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pg/pgweb/package.nix b/pkgs/by-name/pg/pgweb/package.nix index 9de3a6cd89ed..7b59121c4f54 100644 --- a/pkgs/by-name/pg/pgweb/package.nix +++ b/pkgs/by-name/pg/pgweb/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, testers, pgweb, + nixosTests, }: buildGoModule rec { @@ -41,10 +42,13 @@ buildGoModule rec { "${builtins.concatStringsSep "|" skippedTests}" ]; - passthru.tests.version = testers.testVersion { - version = "v${version}"; - package = pgweb; - command = "pgweb --version"; + passthru.tests = { + version = testers.testVersion { + version = "v${version}"; + package = pgweb; + command = "pgweb --version"; + }; + integration_test = nixosTests.pgweb; }; meta = with lib; { From 39706cd65f7daa433d2b00c960705673ccd70eb3 Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Sat, 15 Feb 2025 11:54:49 +0000 Subject: [PATCH 2124/2168] doc: remove redundant fetchCargoVendor section Was made redundant by 3e5b235146f3b6d73e9a6aa999c0bd8a011cb221 --- doc/languages-frameworks/rust.section.md | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index d0ba09b51621..34ac80cac998 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -461,17 +461,6 @@ also be used: the `Cargo.lock`/`Cargo.toml` files need to be patched before vendoring. -In case the lockfile contains cargo `git` dependencies, you can use -`fetchCargoVendor` instead. -```nix -{ - cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - hash = "sha256-RqPVFovDaD2rW31HyETJfQ0qVwFxoGEvqkIgag3H6KU="; - }; -} -``` - If a `Cargo.lock` file is available, you can alternatively use the `importCargoLock` function. In contrast to `fetchCargoVendor`, this function does not require a hash (unless git dependencies are used) From 23fed8e6f5be7cc0b744fd2f4d7ed1f16a7ba962 Mon Sep 17 00:00:00 2001 From: Neyts Zupan Date: Sat, 15 Feb 2025 17:24:59 +0700 Subject: [PATCH 2125/2168] elmReview: 2.12.0 -> 2.13.1 Rewriten from node2nix to buildNpmPackage. Previous work on this started in https://github.com/NixOS/nixpkgs/pull/351767/files. Also, added a simple test. Refs https://github.com/Thaigersprint/thaigersprint-2025/issues/1 --- pkgs/development/compilers/elm/default.nix | 2 + .../elm/packages/elm-review/default.nix | 45 +++++++++++++++++++ .../compilers/elm/packages/node/default.nix | 10 ----- .../elm/packages/node/node-packages.json | 1 - pkgs/development/node-packages/aliases.nix | 1 + 5 files changed, 48 insertions(+), 11 deletions(-) create mode 100644 pkgs/development/compilers/elm/packages/elm-review/default.nix diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index ca9f37ff5367..c9a6c0f48a4f 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -47,6 +47,8 @@ lib.makeScope pkgs.newScope elm-json = callPackage ./packages/elm-json { }; + elm-review = callPackage ./packages/elm-review { }; + elm-test-rs = callPackage ./packages/elm-test-rs { }; elm-test = callPackage ./packages/elm-test { }; diff --git a/pkgs/development/compilers/elm/packages/elm-review/default.nix b/pkgs/development/compilers/elm/packages/elm-review/default.nix new file mode 100644 index 000000000000..94422e7b6e6b --- /dev/null +++ b/pkgs/development/compilers/elm/packages/elm-review/default.nix @@ -0,0 +1,45 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + testers, + elm-review, +}: + +buildNpmPackage rec { + pname = "elm-review"; + version = "2.13.1"; + + src = fetchFromGitHub { + owner = "jfmengels"; + repo = "node-elm-review"; + rev = "v${version}"; + hash = "sha256-f7VEYTvFbNbHnl/aGeQdDxCr/PtkaLBJw9FVpk2T9is="; + }; + + npmDepsHash = "sha256-5tSe/nK3X1MgX7uwTrFApw60i8c14ZWbk+IrgXMxTVc"; + + postPatch = '' + sed -i "s/elm-tooling install/echo 'skipping elm-tooling install'/g" package.json + ''; + + dontNpmBuild = true; + + passthru.tests.version = testers.testVersion { + version = "${version}"; + package = elm-review; + command = "elm-review --version"; + }; + + meta = { + changelog = "https://github.com/jfmengels/node-elm-review/blob/v${src.rev}/CHANGELOG.md"; + description = "Analyzes Elm projects, to help find mistakes before your users find them"; + mainProgram = "elm-review"; + homepage = "https://github.com/jfmengels/node-elm-review"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ + turbomack + zupo + ]; + }; +} diff --git a/pkgs/development/compilers/elm/packages/node/default.nix b/pkgs/development/compilers/elm/packages/node/default.nix index 3d6f550f4331..e5692b916a2e 100644 --- a/pkgs/development/compilers/elm/packages/node/default.nix +++ b/pkgs/development/compilers/elm/packages/node/default.nix @@ -91,16 +91,6 @@ with self; with elmLib; { }; }; - elm-review = - nodePkgs.elm-review // { - meta = with lib; nodePkgs.elm-review.meta // { - description = "Analyzes Elm projects, to help find mistakes before your users find them"; - homepage = "https://package.elm-lang.org/packages/jfmengels/elm-review/${nodePkgs.elm-review.version}"; - license = licenses.bsd3; - maintainers = [ maintainers.turbomack ]; - }; - }; - elm-language-server = nodePkgs."@elm-tooling/elm-language-server" // { meta = with lib; nodePkgs."@elm-tooling/elm-language-server".meta // { description = "Language server implementation for Elm"; diff --git a/pkgs/development/compilers/elm/packages/node/node-packages.json b/pkgs/development/compilers/elm/packages/node/node-packages.json index 8112b01bc9e8..cdd6fef3738e 100644 --- a/pkgs/development/compilers/elm/packages/node/node-packages.json +++ b/pkgs/development/compilers/elm/packages/node/node-packages.json @@ -13,7 +13,6 @@ "create-elm-app", "elm-optimize-level-2", "elm-pages", - "elm-review", "elm-git-install", "@dillonkearns/elm-graphql" ] diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index dff8b0a81218..51c3fb93e49e 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -95,6 +95,7 @@ mapAliases { inherit (pkgs) dotenv-cli; # added 2024-06-26 eask = pkgs.eask; # added 2023-08-17 inherit (pkgs.elmPackages) elm-test; + inherit (pkgs.elmPackages) elm-review; inherit (pkgs) eslint; # Added 2024-08-28 inherit (pkgs) eslint_d; # Added 2023-05-26 inherit (pkgs) eas-cli; # added 2025-01-08 From e60d73f51452f044789e6d71c4fd200f244df062 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 12:27:51 +0000 Subject: [PATCH 2126/2168] oxigraph: 0.4.7 -> 0.4.8 --- pkgs/servers/oxigraph/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/oxigraph/default.nix b/pkgs/servers/oxigraph/default.nix index f77a1c45b465..de17fe6bea77 100644 --- a/pkgs/servers/oxigraph/default.nix +++ b/pkgs/servers/oxigraph/default.nix @@ -9,18 +9,18 @@ rustPlatform.buildRustPackage rec { pname = "oxigraph"; - version = "0.4.7"; + version = "0.4.8"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-xkmCfOLlNvQe8VwUS/jFHACxzo8RwIvX3jGGarj1LSg="; + hash = "sha256-yMXNt7pGiwYDXjmHxKUQpqNrAmnFpg21Vc5R1DmwsHc="; fetchSubmodules = true; }; useFetchCargoVendor = true; - cargoHash = "sha256-sAAwQnV7p7x0bQb/VIJ9hh+UncYB6aGRorjhD2wgosk="; + cargoHash = "sha256-qOGpM3SOAOMO5W3wj4ruXlymp9bV4sqOU75gMVSEyfk="; nativeBuildInputs = [ rustPlatform.bindgenHook From 21c0b615a02c47a9b8b20ea8888b06b9d7389b29 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 13:09:26 +0000 Subject: [PATCH 2127/2168] efmt: 0.18.3 -> 0.19.0 --- pkgs/by-name/ef/efmt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ef/efmt/package.nix b/pkgs/by-name/ef/efmt/package.nix index 9674dfc73c62..8bbcda98f5b6 100644 --- a/pkgs/by-name/ef/efmt/package.nix +++ b/pkgs/by-name/ef/efmt/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "efmt"; - version = "0.18.3"; + version = "0.19.0"; src = fetchFromGitHub { owner = "sile"; repo = "efmt"; rev = version; - hash = "sha256-3CL9NcwDsAs6fHUWA/ibkwqOW0Ur4glpHVZTrfLQUXs="; + hash = "sha256-TvDIw9BNeqvsq13Ov9pBREj4d9FWtwfu7mzACc+qlZ4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-5cGnbIF2HrpYhoMvcLHRj3O5L2vP5O5nvtJ0hUf6yTY="; + cargoHash = "sha256-U9W9GIU4Ofqy2BW4onJSUPhyiFfTspj06Gzj6NeTwcI="; meta = { description = "Erlang code formatter"; From ed4f956f5acf0abbf6236a9b131638c030246cb1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Feb 2025 23:29:40 +1000 Subject: [PATCH 2128/2168] ananicy-rules-cachyos: 0-unstable-2025-01-25 -> 0-unstable-2025-02-05 (#382308) --- pkgs/by-name/an/ananicy-rules-cachyos/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix index e494bd5baf70..d7af6f0428c0 100644 --- a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix +++ b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "ananicy-rules-cachyos"; - version = "0-unstable-2025-01-25"; + version = "0-unstable-2025-02-05"; src = fetchFromGitHub { owner = "CachyOS"; repo = "ananicy-rules"; - rev = "03cc642f7b8e38d3d3c4e9bb8754659c8c64fd38"; - hash = "sha256-OoyQKuEzxNmrbNX5d3tzofH2Xvxi/T8bbe03So5CiuI="; + rev = "3c08a607ffb1511237fb5dfe8ca7501571b3ae8b"; + hash = "sha256-ISkL6/tGKmlQRjl92HTiy4KQn9Spxume8YJU2KKWcYw="; }; dontConfigure = true; From f5c8247583828a5d5774468b24c7da56ce1407ba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 10:28:26 +0000 Subject: [PATCH 2129/2168] python312Packages.cmd2: 2.5.9 -> 2.5.11 --- pkgs/development/python-modules/cmd2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index 8a708a934050..ea1ee3098074 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "cmd2"; - version = "2.5.9"; + version = "2.5.11"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-CbsTY3gyvIGKrVV3zN9dvrDJ++W5QS/3jVCE94Rvg6s="; + hash = "sha256-MKDThQIfvkpBFmcoReVpW75W62gvkJYGZ3Y5T5VKdCk="; }; postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' From 5c10bbf1b28f580f9cc89de61c6059319d00a3f9 Mon Sep 17 00:00:00 2001 From: Marcel Date: Sat, 21 Dec 2024 22:55:04 +0100 Subject: [PATCH 2130/2168] nixos/weblate: improve smtp setup; make local postgresql optional; fix ssh --- nixos/modules/services/web-apps/weblate.nix | 89 ++++++++++++++------- 1 file changed, 61 insertions(+), 28 deletions(-) diff --git a/nixos/modules/services/web-apps/weblate.nix b/nixos/modules/services/web-apps/weblate.nix index 24995009b118..921330db4422 100644 --- a/nixos/modules/services/web-apps/weblate.nix +++ b/nixos/modules/services/web-apps/weblate.nix @@ -48,15 +48,6 @@ let COMPRESS_OFFLINE = True DEBUG = False - DATABASES = { - "default": { - "ENGINE": "django.db.backends.postgresql", - "HOST": "/run/postgresql", - "NAME": "weblate", - "USER": "weblate", - } - } - with open("${cfg.djangoSecretKeyFile}") as f: SECRET_KEY = f.read().rstrip("\n") @@ -65,9 +56,9 @@ let "BACKEND": "django_redis.cache.RedisCache", "LOCATION": "unix://${config.services.redis.servers.weblate.unixSocket}", "OPTIONS": { - "CLIENT_CLASS": "django_redis.client.DefaultClient", - "PASSWORD": None, - "CONNECTION_POOL_KWARGS": {}, + "CLIENT_CLASS": "django_redis.client.DefaultClient", + "PASSWORD": None, + "CONNECTION_POOL_KWARGS": {}, }, "KEY_PREFIX": "weblate", "TIMEOUT": 3600, @@ -80,7 +71,6 @@ let } } - CELERY_TASK_ALWAYS_EAGER = False CELERY_BROKER_URL = "redis+socket://${config.services.redis.servers.weblate.unixSocket}" CELERY_RESULT_BACKEND = CELERY_BROKER_URL @@ -93,20 +83,31 @@ let OTP_WEBAUTHN_RP_NAME = SITE_TITLE OTP_WEBAUTHN_RP_ID = SITE_DOMAIN.split(":")[0] OTP_WEBAUTHN_ALLOWED_ORIGINS = [SITE_URL] - + '' + + lib.optionalString cfg.configurePostgresql '' + DATABASES = { + "default": { + "ENGINE": "django.db.backends.postgresql", + "HOST": "/run/postgresql", + "NAME": "weblate", + "USER": "weblate", + } + } '' + lib.optionalString cfg.smtp.enable '' - ADMINS = (("Weblate Admin", "${cfg.smtp.user}"),) - EMAIL_HOST = "${cfg.smtp.host}" EMAIL_USE_TLS = True + EMAIL_PORT = ${builtins.toString cfg.smtp.port} + SERVER_EMAIL = "${cfg.smtp.from}" + DEFAULT_FROM_EMAIL = "${cfg.smtp.from}" + '' + + lib.optionalString (cfg.smtp.enable && cfg.smtp.user != null) '' + ADMINS = (("Weblate Admin", "${cfg.smtp.user}"),) EMAIL_HOST_USER = "${cfg.smtp.user}" - SERVER_EMAIL = "${cfg.smtp.user}" - DEFAULT_FROM_EMAIL = "${cfg.smtp.user}" - EMAIL_PORT = 587 + '' + + lib.optionalString (cfg.smtp.enable && cfg.smtp.passwordFile != null) '' with open("${cfg.smtp.passwordFile}") as f: EMAIL_HOST_PASSWORD = f.read().rstrip("\n") - '' + cfg.extraConfig; settings_py = @@ -139,6 +140,7 @@ let tesseract licensee mercurial + openssh ]; in { @@ -166,6 +168,15 @@ in type = lib.types.path; }; + configurePostgresql = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Whether to enable and configure a local PostgreSQL server by creating a user and database for weblate. + The default `settings` reference this database, if you disable this option you must provide a database URL in `extraConfig`. + ''; + }; + extraConfig = lib.mkOption { type = lib.types.lines; default = ""; @@ -176,10 +187,20 @@ in smtp = { enable = lib.mkEnableOption "Weblate SMTP support"; + + from = lib.mkOption { + description = "The from address being used in sent emails."; + example = "weblate@example.com"; + default = config.services.weblate.smtp.user; + defaultText = "config.services.weblate.smtp.user"; + type = lib.types.str; + }; + user = lib.mkOption { description = "SMTP login name."; example = "weblate@example.org"; - type = lib.types.str; + type = lib.types.nullOr lib.types.str; + default = null; }; host = lib.mkOption { @@ -188,16 +209,23 @@ in example = "127.0.0.1"; }; + port = lib.mkOption { + description = "SMTP port used when sending emails to users."; + type = lib.types.port; + default = 587; + example = 25; + }; + passwordFile = lib.mkOption { description = '' Location of a file containing the SMTP password. This should be a path pointing to a file with secure permissions (not /nix/store). ''; - type = lib.types.path; + type = lib.types.nullOr lib.types.path; + default = null; }; }; - }; }; @@ -218,7 +246,6 @@ in "/media/".alias = "/var/lib/weblate/media/"; "/".proxyPass = "http://unix:///run/weblate.socket"; }; - }; }; @@ -237,8 +264,14 @@ in systemd.services.weblate-migrate = { description = "Weblate migration"; - after = [ "weblate-postgresql-setup.service" ]; - requires = [ "weblate-postgresql-setup.service" ]; + after = [ + "weblate-postgresql-setup.service" + "redis-weblate.service" + ]; + requires = [ + "weblate-postgresql-setup.service" + "redis-weblate.service" + ]; # We want this to be active on boot, not just on socket activation wantedBy = [ "multi-user.target" ]; inherit environment; @@ -256,7 +289,7 @@ in description = "Weblate Celery"; after = [ "network.target" - "redis.service" + "redis-weblate.service" "postgresql.service" ]; # We want this to be active on boot, not just on socket activation @@ -371,7 +404,7 @@ in unixSocketPerm = 770; }; - services.postgresql = { + services.postgresql = lib.mkIf cfg.configurePostgresql { enable = true; ensureUsers = [ { From 69f7502aaae928a8e5f30257ee000a33bcfed6d6 Mon Sep 17 00:00:00 2001 From: "Matthieu C." <886074+teto@users.noreply.github.com> Date: Fri, 14 Feb 2025 23:53:36 +0100 Subject: [PATCH 2131/2168] lua51Packages.nvim-nio: run tests upstream uses the convoluted PlenaryBusted scheme via scripts/test but we can simplify this into one invokation of busted with nlua. If anyone feels like upstreaming this, please do --- pkgs/development/lua-modules/overrides.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 76e459e66922..883f25b6998f 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -606,6 +606,19 @@ in ''; }); + nvim-nio = prev.nvim-nio.overrideAttrs (oa: { + doCheck = lua.luaversion == "5.1"; + nativeCheckInputs = [ final.nlua final.busted ]; + + # upstream uses PlenaryBusted which is a pain to setup + checkPhase = '' + runHook preCheck + export HOME=$(mktemp -d) + busted --lua=nlua --lpath='lua/?.lua' --lpath='lua/?/init.lua' tests/ + runHook postCheck + ''; + }); + plenary-nvim = prev.plenary-nvim.overrideAttrs (oa: { postPatch = '' sed -Ei lua/plenary/curl.lua \ From 050400f1123a5672b99ea05b01df30572ebe6a63 Mon Sep 17 00:00:00 2001 From: PerchunPak Date: Sat, 15 Feb 2025 15:18:30 +0100 Subject: [PATCH 2132/2168] ags: 2.2.1 -> 2.3.0 --- pkgs/by-name/ag/ags/package.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/ag/ags/package.nix b/pkgs/by-name/ag/ags/package.nix index 7171970174b3..481bb38f4244 100644 --- a/pkgs/by-name/ag/ags/package.nix +++ b/pkgs/by-name/ag/ags/package.nix @@ -7,7 +7,6 @@ dart-sass, symlinkJoin, fetchFromGitHub, - fetchpatch2, gjs, glib, gobject-introspection, @@ -22,23 +21,15 @@ }: buildGoModule rec { pname = "ags"; - version = "2.2.1"; + version = "2.3.0"; src = fetchFromGitHub { owner = "Aylur"; repo = "ags"; tag = "v${version}"; - hash = "sha256-snHhAgcH8hACWZFaAqHr5uXH412UrAuA603OK02MxN8="; + hash = "sha256-GLyNtU9A2VN22jNRHZ2OXuFfTJLh8uEVVt+ftsKUX0c="; }; - patches = [ - # refactor for better nix support - (fetchpatch2 { - url = "https://github.com/Aylur/ags/commit/17df94c576d0023185770f901186db427f2ec0a2.diff?full_index=1"; - hash = "sha256-tcoifkYmXjV+ZbeAFRHuk8cVmxWMrS64syvQMGGKAVA="; - }) - ]; - vendorHash = "sha256-Pw6UNT5YkDVz4HcH7b5LfOg+K3ohrBGPGB9wYGAQ9F4="; proxyVendor = true; From 09e3bb7c939701a732392dfcb92e1419d1c65d78 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 14:19:27 +0000 Subject: [PATCH 2133/2168] lunar-client: 3.3.3 -> 3.3.4 --- pkgs/by-name/lu/lunar-client/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lu/lunar-client/package.nix b/pkgs/by-name/lu/lunar-client/package.nix index 48fd47fc2205..0550d522acf2 100644 --- a/pkgs/by-name/lu/lunar-client/package.nix +++ b/pkgs/by-name/lu/lunar-client/package.nix @@ -7,11 +7,11 @@ appimageTools.wrapType2 rec { pname = "lunarclient"; - version = "3.3.3"; + version = "3.3.4"; src = fetchurl { url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage"; - hash = "sha512-WS23Kz/9iVsFGuds/vD/kc2k6aCsLkNy6b/vFeYEkbqrXQ3FHiNMl6ELPFXuOznEo/AiuqNp0O623G7r7SrKlw=="; + hash = "sha512-Cyhj7TEZMsGHYxYslgEsG6ATM5YFrS/LuzDwbf3DrzzvNGPx1ETmuiNGKDI28aSswqRsNQ2kl+DoZalOLVJM7A=="; }; nativeBuildInputs = [ makeWrapper ]; From 6ca8f623a64a86eb2e10406103faebcdaac7f34b Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Sat, 15 Feb 2025 11:26:15 -0300 Subject: [PATCH 2134/2168] tasks: remove `with lib` from meta --- pkgs/by-name/ta/tasks/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ta/tasks/package.nix b/pkgs/by-name/ta/tasks/package.nix index 068eb2c2ba93..3d6490f31f04 100644 --- a/pkgs/by-name/ta/tasks/package.nix +++ b/pkgs/by-name/ta/tasks/package.nix @@ -87,12 +87,12 @@ rustPlatform.buildRustPackage rec { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { description = "Simple task management application for the COSMIC desktop"; homepage = "https://github.com/edfloreshz/tasks"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ GaetanLepage ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ GaetanLepage ]; + platforms = lib.platforms.linux; mainProgram = "tasks"; }; } From 9592b65426b7bc647476c09c8062e786fe25c505 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Sat, 15 Feb 2025 11:28:53 -0300 Subject: [PATCH 2135/2168] tasks: update source repository owner --- pkgs/by-name/ta/tasks/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ta/tasks/package.nix b/pkgs/by-name/ta/tasks/package.nix index 3d6490f31f04..c1deb5f03f25 100644 --- a/pkgs/by-name/ta/tasks/package.nix +++ b/pkgs/by-name/ta/tasks/package.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { version = "0.1.0"; src = fetchFromGitHub { - owner = "edfloreshz"; + owner = "cosmic-utils"; repo = "tasks"; tag = version; hash = "sha256-0bXzeKnJ5MIl7vCo+7kyXm3L6QrCdm5sPreca1SPi8U="; @@ -89,7 +89,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Simple task management application for the COSMIC desktop"; - homepage = "https://github.com/edfloreshz/tasks"; + homepage = "https://github.com/cosmic-utils/tasks"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ GaetanLepage ]; platforms = lib.platforms.linux; From e59e8e9ed3396b6f2ed16866a12db91c857704a6 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Sat, 15 Feb 2025 11:30:20 -0300 Subject: [PATCH 2136/2168] tasks: add `changelog` to meta --- pkgs/by-name/ta/tasks/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ta/tasks/package.nix b/pkgs/by-name/ta/tasks/package.nix index c1deb5f03f25..068ec21a4af6 100644 --- a/pkgs/by-name/ta/tasks/package.nix +++ b/pkgs/by-name/ta/tasks/package.nix @@ -88,6 +88,7 @@ rustPlatform.buildRustPackage rec { }; meta = { + changelog = "https://github.com/cosmic-utils/tasks/releases/tag/${version}"; description = "Simple task management application for the COSMIC desktop"; homepage = "https://github.com/cosmic-utils/tasks"; license = lib.licenses.gpl3Only; From bdd331b13c6171a9cff0975e497cb9c36254630a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 14:47:53 +0000 Subject: [PATCH 2137/2168] dbeaver-bin: 24.3.3 -> 24.3.4 --- pkgs/by-name/db/dbeaver-bin/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix index e543b159ad78..bc85dc350031 100644 --- a/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/pkgs/by-name/db/dbeaver-bin/package.nix @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbeaver-bin"; - version = "24.3.3"; + version = "24.3.4"; src = let @@ -30,10 +30,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { aarch64-darwin = "macos-aarch64.dmg"; }; hash = selectSystem { - x86_64-linux = "sha256-vj9C12bGJbWjmcjp2jVyvLmLHYdLjbEU0SVvevhkd4A="; - aarch64-linux = "sha256-vQArRJZvf38JEfDBNE4GfemddM4M1ar7RojXNTb6YaU="; - x86_64-darwin = "sha256-r+CLBy4zetjPXDzm6abQqY8IvE0UfROg5Ga0nIrb9oc="; - aarch64-darwin = "sha256-W8NAs5Z8Ogl1uv2zngi4A4viBL51izsv7ksS7gygh9I="; + x86_64-linux = "sha256-t9yhOgcka7zRSP1QyZvnc3iefKn9gv+pjobFJongb3A="; + aarch64-linux = "sha256-JanACJPOgHqhjLt2BzR+H9ZHwA2uPIrmyluVkRBqAhY="; + x86_64-darwin = "sha256-6FFMRBj6Z4UhqENclixtcgOrrmcYuabBqeIFGEqRQEA="; + aarch64-darwin = "sha256-vBb1w7Y8ADvhpEx/bf4W5llNIlng6kfZEUKB5bzQ8TY="; }; in fetchurl { From 8b74af8d7bce42c7cbd42083e226043e3b51d4eb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 14:50:57 +0000 Subject: [PATCH 2138/2168] gh-copilot: 1.0.6 -> 1.1.0 --- pkgs/by-name/gh/gh-copilot/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/gh/gh-copilot/package.nix b/pkgs/by-name/gh/gh-copilot/package.nix index 6534917bfcde..02f78eed2627 100644 --- a/pkgs/by-name/gh/gh-copilot/package.nix +++ b/pkgs/by-name/gh/gh-copilot/package.nix @@ -10,26 +10,26 @@ let systemToPlatform = { "x86_64-linux" = { name = "linux-amd64"; - hash = "sha256-HDyPQ7/suk6LA6mchwE+LHcO1+9aB7o+60lX6OKFLGQ="; + hash = "sha256-KIiwIv0VzJf0GVkuDsevEah48hv4VybLuBhy4dJvggo="; }; "aarch64-linux" = { name = "linux-arm64"; - hash = "sha256-IfAfduUMAQ53oi2ZgRxc825oMyX6PvATkQpvxmFjMHo="; + hash = "sha256-hNXDIB7r3Hdo7g2pPZKAYYrOaBJmAq7UKc+ZnRnVeoA="; }; "x86_64-darwin" = { name = "darwin-amd64"; - hash = "sha256-I4EG6T//+YFLOlQMpW1ERpBzR/882lXMPqpO7em/QJY="; + hash = "sha256-1tN734huSBzke8j8H/dyFS90LsWGFuGtLdYdrLbGeOs="; }; "aarch64-darwin" = { name = "darwin-arm64"; - hash = "sha256-QtHCvTgfrQilIbd3S3/zkyBLccukGfFckCrZPCIMNMg="; + hash = "sha256-lGhgND1E4jWZmoAaPXcxNlew9eqWOrMHAYVnpFnqeio="; }; }; platform = systemToPlatform.${system} or throwSystem; in stdenv.mkDerivation (finalAttrs: { pname = "gh-copilot"; - version = "1.0.6"; + version = "1.1.0"; src = fetchurl { name = "gh-copilot"; From f038769baf66d44374c9b9eaf544c54299847f32 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Sat, 15 Feb 2025 11:34:32 -0300 Subject: [PATCH 2139/2168] tasks: migrate to `useFetchCargoVendor` --- pkgs/by-name/ta/tasks/Cargo.lock | 6716 ----------------------------- pkgs/by-name/ta/tasks/package.nix | 19 +- 2 files changed, 2 insertions(+), 6733 deletions(-) delete mode 100644 pkgs/by-name/ta/tasks/Cargo.lock diff --git a/pkgs/by-name/ta/tasks/Cargo.lock b/pkgs/by-name/ta/tasks/Cargo.lock deleted file mode 100644 index 62e5c8c1585e..000000000000 --- a/pkgs/by-name/ta/tasks/Cargo.lock +++ /dev/null @@ -1,6716 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "ab_glyph" -version = "0.2.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e53b0a3d5760cd2ba9b787ae0c6440ad18ee294ff71b05e3381c900a7d16cfd" -dependencies = [ - "ab_glyph_rasterizer", - "owned_ttf_parser", -] - -[[package]] -name = "ab_glyph_rasterizer" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" - -[[package]] -name = "accesskit" -version = "0.12.2" -source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#5f9b61c8264000d001499c902562422e13efa7a8" - -[[package]] -name = "accesskit_consumer" -version = "0.17.0" -source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#5f9b61c8264000d001499c902562422e13efa7a8" -dependencies = [ - "accesskit", -] - -[[package]] -name = "accesskit_macos" -version = "0.11.0" -source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#5f9b61c8264000d001499c902562422e13efa7a8" -dependencies = [ - "accesskit", - "accesskit_consumer", - "icrate 0.1.2", - "objc2 0.5.2", - "once_cell", -] - -[[package]] -name = "accesskit_unix" -version = "0.7.1" -source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#5f9b61c8264000d001499c902562422e13efa7a8" -dependencies = [ - "accesskit", - "accesskit_consumer", - "async-channel", - "async-executor", - "async-task", - "atspi", - "futures-lite 1.13.0", - "futures-util", - "once_cell", - "serde", - "zbus 3.15.2", -] - -[[package]] -name = "accesskit_windows" -version = "0.16.0" -source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#5f9b61c8264000d001499c902562422e13efa7a8" -dependencies = [ - "accesskit", - "accesskit_consumer", - "once_cell", - "paste", - "static_assertions", - "windows 0.48.0", -] - -[[package]] -name = "accesskit_winit" -version = "0.18.1" -source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#5f9b61c8264000d001499c902562422e13efa7a8" -dependencies = [ - "accesskit", - "accesskit_macos", - "accesskit_unix", - "accesskit_windows", - "raw-window-handle", - "winit", -] - -[[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 = "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 = "aliasable" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" - -[[package]] -name = "allocator-api2" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" - -[[package]] -name = "almost" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3aa2999eb46af81abb65c2d30d446778d7e613b60bbf4e174a027e80f90a3c14" - -[[package]] -name = "android-activity" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" -dependencies = [ - "android-properties", - "bitflags 2.5.0", - "cc", - "cesu8", - "jni", - "jni-sys", - "libc", - "log", - "ndk", - "ndk-context", - "ndk-sys", - "num_enum", - "thiserror", -] - -[[package]] -name = "android-properties" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" - -[[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 = "anstream" -version = "0.6.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "is_terminal_polyfill", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" - -[[package]] -name = "anstyle-parse" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" -dependencies = [ - "anstyle", - "windows-sys 0.52.0", -] - -[[package]] -name = "anyhow" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" - -[[package]] -name = "apply" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f47b57fc4521e3cae26a4d45b5227f8fadee4c345be0fefd8d5d1711afb8aeb9" - -[[package]] -name = "approx" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" -dependencies = [ - "num-traits", -] - -[[package]] -name = "arc-swap" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" - -[[package]] -name = "arrayref" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" - -[[package]] -name = "arrayvec" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" - -[[package]] -name = "as-raw-xcb-connection" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" - -[[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 = "ashpd" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093" -dependencies = [ - "async-fs 2.1.2", - "async-net", - "enumflags2", - "futures-channel", - "futures-util", - "rand", - "serde", - "serde_repr", - "tokio", - "url", - "zbus 4.2.2", -] - -[[package]] -name = "async-broadcast" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" -dependencies = [ - "event-listener 2.5.3", - "futures-core", -] - -[[package]] -name = "async-broadcast" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb" -dependencies = [ - "event-listener 5.3.0", - "event-listener-strategy 0.5.2", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-channel" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" -dependencies = [ - "concurrent-queue", - "event-listener-strategy 0.5.2", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-executor" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" -dependencies = [ - "async-task", - "concurrent-queue", - "fastrand 2.1.0", - "futures-lite 2.3.0", - "slab", -] - -[[package]] -name = "async-fs" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" -dependencies = [ - "async-lock 2.8.0", - "autocfg", - "blocking", - "futures-lite 1.13.0", -] - -[[package]] -name = "async-fs" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" -dependencies = [ - "async-lock 3.3.0", - "blocking", - "futures-lite 2.3.0", -] - -[[package]] -name = "async-io" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" -dependencies = [ - "async-lock 2.8.0", - "autocfg", - "cfg-if", - "concurrent-queue", - "futures-lite 1.13.0", - "log", - "parking", - "polling 2.8.0", - "rustix 0.37.27", - "slab", - "socket2 0.4.10", - "waker-fn", -] - -[[package]] -name = "async-io" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" -dependencies = [ - "async-lock 3.3.0", - "cfg-if", - "concurrent-queue", - "futures-io", - "futures-lite 2.3.0", - "parking", - "polling 3.7.0", - "rustix 0.38.34", - "slab", - "tracing", - "windows-sys 0.52.0", -] - -[[package]] -name = "async-lock" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" -dependencies = [ - "event-listener 2.5.3", -] - -[[package]] -name = "async-lock" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" -dependencies = [ - "event-listener 4.0.3", - "event-listener-strategy 0.4.0", - "pin-project-lite", -] - -[[package]] -name = "async-net" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7" -dependencies = [ - "async-io 2.3.2", - "blocking", - "futures-lite 2.3.0", -] - -[[package]] -name = "async-process" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" -dependencies = [ - "async-io 1.13.0", - "async-lock 2.8.0", - "async-signal", - "blocking", - "cfg-if", - "event-listener 3.1.0", - "futures-lite 1.13.0", - "rustix 0.38.34", - "windows-sys 0.48.0", -] - -[[package]] -name = "async-process" -version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a53fc6301894e04a92cb2584fedde80cb25ba8e02d9dc39d4a87d036e22f397d" -dependencies = [ - "async-channel", - "async-io 2.3.2", - "async-lock 3.3.0", - "async-signal", - "async-task", - "blocking", - "cfg-if", - "event-listener 5.3.0", - "futures-lite 2.3.0", - "rustix 0.38.34", - "tracing", - "windows-sys 0.52.0", -] - -[[package]] -name = "async-recursion" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "async-signal" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afe66191c335039c7bb78f99dc7520b0cbb166b3a1cb33a03f53d8a1c6f2afda" -dependencies = [ - "async-io 2.3.2", - "async-lock 3.3.0", - "atomic-waker", - "cfg-if", - "futures-core", - "futures-io", - "rustix 0.38.34", - "signal-hook-registry", - "slab", - "windows-sys 0.52.0", -] - -[[package]] -name = "async-task" -version = "4.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" - -[[package]] -name = "async-trait" -version = "0.1.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "atoi" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" -dependencies = [ - "num-traits", -] - -[[package]] -name = "atomic-waker" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" - -[[package]] -name = "atomicwrites" -version = "0.4.2" -source = "git+https://github.com/jackpot51/rust-atomicwrites#043ab4859d53ffd3d55334685303d8df39c9f768" -dependencies = [ - "rustix 0.38.34", - "tempfile", - "windows-sys 0.48.0", -] - -[[package]] -name = "atomicwrites" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7b2dbe9169059af0f821e811180fddc971fc210c776c133c7819ccd6e478db" -dependencies = [ - "rustix 0.38.34", - "tempfile", - "windows-sys 0.52.0", -] - -[[package]] -name = "atspi" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6059f350ab6f593ea00727b334265c4dfc7fd442ee32d264794bd9bdc68e87ca" -dependencies = [ - "atspi-common", - "atspi-connection", - "atspi-proxies", -] - -[[package]] -name = "atspi-common" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92af95f966d2431f962bc632c2e68eda7777330158bf640c4af4249349b2cdf5" -dependencies = [ - "enumflags2", - "serde", - "static_assertions", - "zbus 3.15.2", - "zbus_names 2.6.1", - "zvariant 3.15.2", -] - -[[package]] -name = "atspi-connection" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c65e7d70f86d4c0e3b2d585d9bf3f979f0b19d635a336725a88d279f76b939" -dependencies = [ - "atspi-common", - "atspi-proxies", - "futures-lite 1.13.0", - "zbus 3.15.2", -] - -[[package]] -name = "atspi-proxies" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6495661273703e7a229356dcbe8c8f38223d697aacfaf0e13590a9ac9977bb52" -dependencies = [ - "atspi-common", - "serde", - "zbus 3.15.2", -] - -[[package]] -name = "autocfg" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" - -[[package]] -name = "backtrace" -version = "0.3.71" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - -[[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 = "bit_field" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" - -[[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" -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-sys" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7" -dependencies = [ - "objc-sys", -] - -[[package]] -name = "block2" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68" -dependencies = [ - "block-sys", - "objc2 0.4.1", -] - -[[package]] -name = "block2" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e58aa60e59d8dbfcc36138f5f18be5f24394d33b38b24f7fd0b1caa33095f22f" -dependencies = [ - "block-sys", - "objc2 0.5.2", -] - -[[package]] -name = "blocking" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" -dependencies = [ - "async-channel", - "async-task", - "futures-io", - "futures-lite 2.3.0", - "piper", -] - -[[package]] -name = "bumpalo" -version = "3.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" - -[[package]] -name = "by_address" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64fa3c856b712db6612c019f14756e64e4bcea13337a6b33b696333a9eaa2d06" - -[[package]] -name = "bytemuck" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" -dependencies = [ - "bytemuck_derive", -] - -[[package]] -name = "bytemuck_derive" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "369cfaf2a5bed5d8f8202073b2e093c9f508251de1551a0deb4253e4c7d80909" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "bytes" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" - -[[package]] -name = "calloop" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" -dependencies = [ - "bitflags 2.5.0", - "log", - "polling 3.7.0", - "rustix 0.38.34", - "slab", - "thiserror", -] - -[[package]] -name = "calloop" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" -dependencies = [ - "bitflags 2.5.0", - "log", - "polling 3.7.0", - "rustix 0.38.34", - "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 0.12.4", - "rustix 0.38.34", - "wayland-backend", - "wayland-client 0.31.2", -] - -[[package]] -name = "calloop-wayland-source" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" -dependencies = [ - "calloop 0.13.0", - "rustix 0.38.34", - "wayland-backend", - "wayland-client 0.31.2", -] - -[[package]] -name = "cc" -version = "1.0.98" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" -dependencies = [ - "jobserver", - "libc", - "once_cell", -] - -[[package]] -name = "cesu8" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" - -[[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 = "cfg_aliases" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" - -[[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", - "js-sys", - "num-traits", - "serde", - "wasm-bindgen", - "windows-targets 0.52.5", -] - -[[package]] -name = "cli-clipboard" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04087c1d4a2aa259784a563932aee09cbb0869d490775e051096174b070f3e3d" -dependencies = [ - "clipboard-win 4.5.0", - "objc", - "objc-foundation", - "objc_id", - "wl-clipboard-rs", - "x11-clipboard", -] - -[[package]] -name = "clipboard-win" -version = "4.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" -dependencies = [ - "error-code 2.3.1", - "str-buf", - "winapi", -] - -[[package]] -name = "clipboard-win" -version = "5.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79f4473f5144e20d9aceaf2972478f06ddf687831eafeeb434fbaf0acc4144ad" -dependencies = [ - "error-code 3.2.0", -] - -[[package]] -name = "clipboard_macos" -version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-6#8a816d8f218e290041bb5ef6d3b695c38e0a53b7" -dependencies = [ - "objc", - "objc-foundation", - "objc_id", -] - -[[package]] -name = "clipboard_wayland" -version = "0.2.2" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-6#8a816d8f218e290041bb5ef6d3b695c38e0a53b7" -dependencies = [ - "dnd", - "mime", - "smithay-clipboard", -] - -[[package]] -name = "clipboard_x11" -version = "0.4.2" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-6#8a816d8f218e290041bb5ef6d3b695c38e0a53b7" -dependencies = [ - "thiserror", - "x11rb 0.13.1", -] - -[[package]] -name = "cocoa" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" -dependencies = [ - "bitflags 1.3.2", - "block", - "cocoa-foundation", - "core-foundation", - "core-graphics", - "foreign-types", - "libc", - "objc", -] - -[[package]] -name = "cocoa-foundation" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" -dependencies = [ - "bitflags 1.3.2", - "block", - "core-foundation", - "core-graphics-types", - "libc", - "objc", -] - -[[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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" - -[[package]] -name = "com" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e17887fd17353b65b1b2ef1c526c83e26cd72e74f598a8dc1bee13a48f3d9f6" -dependencies = [ - "com_macros", -] - -[[package]] -name = "com_macros" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d375883580a668c7481ea6631fc1a8863e33cc335bf56bfad8d7e6d4b04b13a5" -dependencies = [ - "com_macros_support", - "proc-macro2", - "syn 1.0.109", -] - -[[package]] -name = "com_macros_support" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad899a1087a9296d5644792d7cb72b8e34c1bec8e7d4fbc002230169a6e8710c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "combine" -version = "4.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" -dependencies = [ - "bytes", - "memchr", -] - -[[package]] -name = "concurrent-queue" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "const-random" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" -dependencies = [ - "const-random-macro", -] - -[[package]] -name = "const-random-macro" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" -dependencies = [ - "getrandom", - "once_cell", - "tiny-keccak", -] - -[[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" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-graphics-types", - "foreign-types", - "libc", -] - -[[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 = "cosmic-config" -version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#f60c6893eb828f0e5c2caa8e0a96938938bb3262" -dependencies = [ - "atomicwrites 0.4.2", - "cosmic-config-derive", - "dirs", - "iced_futures", - "known-folders", - "notify", - "once_cell", - "ron", - "serde", - "tokio", - "tracing", - "xdg", -] - -[[package]] -name = "cosmic-config-derive" -version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#f60c6893eb828f0e5c2caa8e0a96938938bb3262" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] -name = "cosmic-text" -version = "0.11.2" -source = "git+https://github.com/pop-os/cosmic-text.git#b0a70c70ffba883ac6ff022b535db195712f552f" -dependencies = [ - "bitflags 2.5.0", - "fontdb", - "libm", - "log", - "rangemap", - "rustc-hash", - "rustybuzz", - "self_cell 1.0.4", - "swash", - "sys-locale", - "ttf-parser 0.20.0", - "unicode-bidi", - "unicode-linebreak", - "unicode-script", - "unicode-segmentation", -] - -[[package]] -name = "cosmic-theme" -version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#f60c6893eb828f0e5c2caa8e0a96938938bb3262" -dependencies = [ - "almost", - "cosmic-config", - "csscolorparser", - "dirs", - "lazy_static", - "palette", - "ron", - "serde", - "serde_json", - "thiserror", -] - -[[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 = "3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" -dependencies = [ - "crc-catalog", -] - -[[package]] -name = "crc-catalog" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" - -[[package]] -name = "crc32fast" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" -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.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" - -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "css-color" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42aaeae719fd78ce501d77c6cdf01f7e96f26bcd5617a4903a1c2b97e388543a" - -[[package]] -name = "csscolorparser" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf" -dependencies = [ - "phf", - "serde", -] - -[[package]] -name = "ctor" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" -dependencies = [ - "quote", - "syn 2.0.66", -] - -[[package]] -name = "cursor-icon" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" - -[[package]] -name = "d3d12" -version = "0.19.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" -dependencies = [ - "bitflags 2.5.0", - "libloading 0.8.3", - "winapi", -] - -[[package]] -name = "darling" -version = "0.20.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.20.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.11.1", - "syn 2.0.66", -] - -[[package]] -name = "darling_macro" -version = "0.20.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" -dependencies = [ - "darling_core", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "dashmap" -version = "5.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" -dependencies = [ - "cfg-if", - "hashbrown", - "lock_api", - "once_cell", - "parking_lot_core 0.9.10", -] - -[[package]] -name = "data-url" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" - -[[package]] -name = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", -] - -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "derive-getters" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2c35ab6e03642397cdda1dd58abbc05d418aef8e36297f336d5aba060fe8df" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "derive-new" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3418329ca0ad70234b9735dc4ceed10af4df60eff9c8e7b06cb5e520d92c3535" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "derive_setters" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e8ef033054e131169b8f0f9a7af8f5533a9436fadf3c500ed547f730f07090d" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "crypto-common", -] - -[[package]] -name = "dirs" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users", - "windows-sys 0.48.0", -] - -[[package]] -name = "dispatch" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" - -[[package]] -name = "displaydoc" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "dlib" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" -dependencies = [ - "libloading 0.8.3", -] - -[[package]] -name = "dlv-list" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f" -dependencies = [ - "const-random", -] - -[[package]] -name = "dnd" -version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-6#8a816d8f218e290041bb5ef6d3b695c38e0a53b7" -dependencies = [ - "bitflags 2.5.0", - "mime", - "raw-window-handle", - "smithay-client-toolkit 0.18.0", - "smithay-clipboard", -] - -[[package]] -name = "dotenvy" -version = "0.15.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" - -[[package]] -name = "downcast-rs" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" - -[[package]] -name = "drm" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0f8a69e60d75ae7dab4ef26a59ca99f2a89d4c142089b537775ae0c198bdcde" -dependencies = [ - "bitflags 2.5.0", - "bytemuck", - "drm-ffi", - "drm-fourcc", - "rustix 0.38.34", -] - -[[package]] -name = "drm-ffi" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6" -dependencies = [ - "drm-sys", - "rustix 0.38.34", -] - -[[package]] -name = "drm-fourcc" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4" - -[[package]] -name = "drm-sys" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d09ff881f92f118b11105ba5e34ff8f4adf27b30dae8f12e28c193af1c83176" -dependencies = [ - "libc", - "linux-raw-sys 0.6.4", -] - -[[package]] -name = "either" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" -dependencies = [ - "serde", -] - -[[package]] -name = "emojis" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f619a926616ae7149a0d82610b051134a0d6c4ae2962d990c06c847a445c5d9" -dependencies = [ - "phf", -] - -[[package]] -name = "endi" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" - -[[package]] -name = "enumflags2" -version = "0.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" -dependencies = [ - "enumflags2_derive", - "serde", -] - -[[package]] -name = "enumflags2_derive" -version = "0.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[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.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "error-code" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21" -dependencies = [ - "libc", - "str-buf", -] - -[[package]] -name = "error-code" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" - -[[package]] -name = "etagere" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "306960881d6c46bd0dd6b7f07442a441418c08d0d3e63d8d080b0f64c6343e4e" -dependencies = [ - "euclid", - "svg_fmt", -] - -[[package]] -name = "euclid" -version = "0.22.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0f0eb73b934648cd7a4a61f1b15391cd95dab0b4da6e2e66c2a072c144b4a20" -dependencies = [ - "num-traits", -] - -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[package]] -name = "event-listener" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener" -version = "4.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener" -version = "5.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener-strategy" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" -dependencies = [ - "event-listener 4.0.3", - "pin-project-lite", -] - -[[package]] -name = "event-listener-strategy" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" -dependencies = [ - "event-listener 5.3.0", - "pin-project-lite", -] - -[[package]] -name = "exr" -version = "1.72.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4" -dependencies = [ - "bit_field", - "flume", - "half", - "lebe", - "miniz_oxide", - "rayon-core", - "smallvec", - "zune-inflate", -] - -[[package]] -name = "fast-srgb8" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" - -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "fastrand" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" - -[[package]] -name = "fdeflate" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" -dependencies = [ - "simd-adler32", -] - -[[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 0.4.1", - "windows-sys 0.52.0", -] - -[[package]] -name = "find-crate" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59a98bbaacea1c0eb6a0876280051b892eb73594fd90cf3b20e9c817029c57d2" -dependencies = [ - "toml 0.5.11", -] - -[[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.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "float-cmp" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" - -[[package]] -name = "float_next_after" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8" - -[[package]] -name = "fluent" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb74634707bebd0ce645a981148e8fb8c7bccd4c33c652aeffd28bf2f96d555a" -dependencies = [ - "fluent-bundle", - "unic-langid", -] - -[[package]] -name = "fluent-bundle" -version = "0.15.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe0a21ee80050c678013f82edf4b705fe2f26f1f9877593d13198612503f493" -dependencies = [ - "fluent-langneg", - "fluent-syntax", - "intl-memoizer", - "intl_pluralrules", - "rustc-hash", - "self_cell 0.10.3", - "smallvec", - "unic-langid", -] - -[[package]] -name = "fluent-langneg" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c4ad0989667548f06ccd0e306ed56b61bd4d35458d54df5ec7587c0e8ed5e94" -dependencies = [ - "unic-langid", -] - -[[package]] -name = "fluent-syntax" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a530c4694a6a8d528794ee9bbd8ba0122e779629ac908d15ad5a7ae7763a33d" -dependencies = [ - "thiserror", -] - -[[package]] -name = "flume" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" -dependencies = [ - "futures-core", - "futures-sink", - "spin", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "font-types" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf6aa1de86490d8e39e04589bd04eb5953cc2a5ef0c25e389e807f44fd24e41" -dependencies = [ - "bytemuck", -] - -[[package]] -name = "fontconfig-parser" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d" -dependencies = [ - "roxmltree", -] - -[[package]] -name = "fontdb" -version = "0.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3" -dependencies = [ - "fontconfig-parser", - "log", - "memmap2 0.9.4", - "slotmap", - "tinyvec", - "ttf-parser 0.20.0", -] - -[[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", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "foreign-types-shared" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" - -[[package]] -name = "fork" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60e74d3423998a57e9d906e49252fb79eb4a04d5cdfe188fb1b7ff9fc076a8ed" -dependencies = [ - "libc", -] - -[[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 = "fraction" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59a78dd758a47a7305478e0e054f9fde4e983b9f9eccda162bf7ca03b79e9d40" -dependencies = [ - "lazy_static", - "num", -] - -[[package]] -name = "freedesktop-icons" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8ef34245e0540c9a3ce7a28340b98d2c12b75da0d446da4e8224923fcaa0c16" -dependencies = [ - "dirs", - "once_cell", - "rust-ini", - "thiserror", - "xdg", -] - -[[package]] -name = "fsevent-sys" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" -dependencies = [ - "libc", -] - -[[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", - "num_cpus", -] - -[[package]] -name = "futures-intrusive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" -dependencies = [ - "futures-core", - "lock_api", - "parking_lot 0.12.3", -] - -[[package]] -name = "futures-io" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" - -[[package]] -name = "futures-lite" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" -dependencies = [ - "fastrand 1.9.0", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] - -[[package]] -name = "futures-lite" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" -dependencies = [ - "fastrand 2.1.0", - "futures-core", - "futures-io", - "parking", - "pin-project-lite", -] - -[[package]] -name = "futures-macro" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[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 = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "gethostname" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "gethostname" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" -dependencies = [ - "libc", - "windows-targets 0.48.5", -] - -[[package]] -name = "getrandom" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "gif" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" -dependencies = [ - "color_quant", - "weezl", -] - -[[package]] -name = "gif" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" -dependencies = [ - "color_quant", - "weezl", -] - -[[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 = "glam" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945" - -[[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 = "glyphon" -version = "0.5.0" -source = "git+https://github.com/pop-os/glyphon.git?tag=v0.5.0#1b0646ff8f74da92d3be704dfc2257d7f4d7eed8" -dependencies = [ - "cosmic-text", - "etagere", - "lru", - "wgpu", -] - -[[package]] -name = "gpu-alloc" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" -dependencies = [ - "bitflags 2.5.0", - "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.5.0", -] - -[[package]] -name = "gpu-allocator" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f56f6318968d03c18e1bcf4857ff88c61157e9da8e47c5f29055d60e1228884" -dependencies = [ - "log", - "presser", - "thiserror", - "winapi", - "windows 0.52.0", -] - -[[package]] -name = "gpu-descriptor" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" -dependencies = [ - "bitflags 2.5.0", - "gpu-descriptor-types", - "hashbrown", -] - -[[package]] -name = "gpu-descriptor-types" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" -dependencies = [ - "bitflags 2.5.0", -] - -[[package]] -name = "grid" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df00eed8d1f0db937f6be10e46e8072b0671accb504cf0f959c5c52c679f5b9" - -[[package]] -name = "guillotiere" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62d5865c036cb1393e23c50693df631d3f5d7bcca4c04fe4cc0fd592e74a782" -dependencies = [ - "euclid", - "svg_fmt", -] - -[[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.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" -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", -] - -[[package]] -name = "hassle-rs" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890" -dependencies = [ - "bitflags 2.5.0", - "com", - "libc", - "libloading 0.8.3", - "thiserror", - "widestring", - "winapi", -] - -[[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.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - -[[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 = "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 = "i18n-config" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c9ce3c48cbc21fd5b22b9331f32b5b51f6ad85d969b99e793427332e76e7640" -dependencies = [ - "log", - "serde", - "serde_derive", - "thiserror", - "toml 0.8.13", - "unic-langid", -] - -[[package]] -name = "i18n-embed" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94205d95764f5bb9db9ea98fa77f89653365ca748e27161f5bbea2ffd50e459c" -dependencies = [ - "arc-swap", - "fluent", - "fluent-langneg", - "fluent-syntax", - "i18n-embed-impl", - "intl-memoizer", - "lazy_static", - "locale_config", - "log", - "parking_lot 0.12.3", - "rust-embed", - "thiserror", - "unic-langid", - "walkdir", -] - -[[package]] -name = "i18n-embed-fl" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8241a781f49e923415e106fcd1f89c3fab92cc9f699a521c56e95dee273903d3" -dependencies = [ - "dashmap", - "find-crate", - "fluent", - "fluent-syntax", - "i18n-config", - "i18n-embed", - "lazy_static", - "proc-macro-error", - "proc-macro2", - "quote", - "strsim 0.10.0", - "syn 2.0.66", - "unic-langid", -] - -[[package]] -name = "i18n-embed-impl" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81093c4701672f59416582fe3145676126fd23ba5db910acad0793c1108aaa58" -dependencies = [ - "find-crate", - "i18n-config", - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[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 = "iced" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#f60c6893eb828f0e5c2caa8e0a96938938bb3262" -dependencies = [ - "dnd", - "iced_accessibility", - "iced_core", - "iced_futures", - "iced_renderer", - "iced_widget", - "iced_winit", - "image", - "mime", - "thiserror", - "window_clipboard", -] - -[[package]] -name = "iced_accessibility" -version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#f60c6893eb828f0e5c2caa8e0a96938938bb3262" -dependencies = [ - "accesskit", - "accesskit_winit", -] - -[[package]] -name = "iced_core" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#f60c6893eb828f0e5c2caa8e0a96938938bb3262" -dependencies = [ - "bitflags 2.5.0", - "dnd", - "log", - "mime", - "num-traits", - "palette", - "raw-window-handle", - "serde", - "smol_str", - "thiserror", - "web-time", - "window_clipboard", - "xxhash-rust", -] - -[[package]] -name = "iced_futures" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#f60c6893eb828f0e5c2caa8e0a96938938bb3262" -dependencies = [ - "futures", - "iced_core", - "log", - "tokio", - "wasm-bindgen-futures", - "wasm-timer", -] - -[[package]] -name = "iced_graphics" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#f60c6893eb828f0e5c2caa8e0a96938938bb3262" -dependencies = [ - "bitflags 2.5.0", - "bytemuck", - "cosmic-text", - "glam", - "half", - "iced_core", - "iced_futures", - "image", - "kamadak-exif", - "log", - "lyon_path", - "once_cell", - "raw-window-handle", - "rustc-hash", - "thiserror", - "unicode-segmentation", - "xxhash-rust", -] - -[[package]] -name = "iced_renderer" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#f60c6893eb828f0e5c2caa8e0a96938938bb3262" -dependencies = [ - "iced_graphics", - "iced_tiny_skia", - "iced_wgpu", - "log", - "thiserror", -] - -[[package]] -name = "iced_runtime" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#f60c6893eb828f0e5c2caa8e0a96938938bb3262" -dependencies = [ - "dnd", - "iced_core", - "iced_futures", - "thiserror", - "window_clipboard", -] - -[[package]] -name = "iced_style" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#f60c6893eb828f0e5c2caa8e0a96938938bb3262" -dependencies = [ - "iced_core", - "once_cell", - "palette", -] - -[[package]] -name = "iced_tiny_skia" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#f60c6893eb828f0e5c2caa8e0a96938938bb3262" -dependencies = [ - "bytemuck", - "cosmic-text", - "iced_graphics", - "kurbo", - "log", - "resvg", - "rustc-hash", - "softbuffer", - "tiny-skia", - "xxhash-rust", -] - -[[package]] -name = "iced_wgpu" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#f60c6893eb828f0e5c2caa8e0a96938938bb3262" -dependencies = [ - "bitflags 2.5.0", - "bytemuck", - "futures", - "glam", - "glyphon", - "guillotiere", - "iced_graphics", - "log", - "lyon", - "once_cell", - "raw-window-handle", - "resvg", - "rustix 0.38.34", - "smithay-client-toolkit 0.18.0", - "wayland-backend", - "wayland-client 0.31.2", - "wayland-protocols 0.31.2", - "wayland-sys 0.31.1", - "wgpu", -] - -[[package]] -name = "iced_widget" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#f60c6893eb828f0e5c2caa8e0a96938938bb3262" -dependencies = [ - "dnd", - "iced_renderer", - "iced_runtime", - "iced_style", - "num-traits", - "ouroboros", - "thiserror", - "unicode-segmentation", - "window_clipboard", -] - -[[package]] -name = "iced_winit" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#f60c6893eb828f0e5c2caa8e0a96938938bb3262" -dependencies = [ - "dnd", - "iced_graphics", - "iced_runtime", - "iced_style", - "log", - "thiserror", - "tracing", - "web-sys", - "winapi", - "window_clipboard", - "winit", -] - -[[package]] -name = "icrate" -version = "0.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" -dependencies = [ - "block2 0.3.0", - "dispatch", - "objc2 0.4.1", -] - -[[package]] -name = "icrate" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb69199826926eb864697bddd27f73d9fddcffc004f5733131e15b465e30642" -dependencies = [ - "block2 0.4.0", - "objc2 0.5.2", -] - -[[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 = "image" -version = "0.24.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "exr", - "gif 0.13.1", - "jpeg-decoder", - "num-traits", - "png", - "qoi", - "tiff", -] - -[[package]] -name = "imagesize" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" - -[[package]] -name = "indexmap" -version = "2.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" -dependencies = [ - "equivalent", - "hashbrown", -] - -[[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 = "instant" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "intl-memoizer" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe22e020fce238ae18a6d5d8c502ee76a52a6e880d99477657e6acc30ec57bda" -dependencies = [ - "type-map", - "unic-langid", -] - -[[package]] -name = "intl_pluralrules" -version = "7.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "078ea7b7c29a2b4df841a7f6ac8775ff6074020c6776d48491ce2268e068f972" -dependencies = [ - "unic-langid", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.48.0", -] - -[[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-wsl" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5" -dependencies = [ - "is-docker", - "once_cell", -] - -[[package]] -name = "is_terminal_polyfill" -version = "1.70.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" - -[[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 = "jni" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" -dependencies = [ - "cesu8", - "cfg-if", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", - "windows-sys 0.45.0", -] - -[[package]] -name = "jni-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" - -[[package]] -name = "jobserver" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" -dependencies = [ - "libc", -] - -[[package]] -name = "jpeg-decoder" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" -dependencies = [ - "rayon", -] - -[[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 = "kamadak-exif" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef4fc70d0ab7e5b6bafa30216a6b48705ea964cdfc29c050f2412295eba58077" -dependencies = [ - "mutate_once", -] - -[[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.3", - "pkg-config", -] - -[[package]] -name = "khronos_api" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" - -[[package]] -name = "known-folders" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4397c789f2709d23cfcb703b316e0766a8d4b17db2d47b0ab096ef6047cae1d8" -dependencies = [ - "windows-sys 0.52.0", -] - -[[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 = "kurbo" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" -dependencies = [ - "arrayvec", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "lebe" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" - -[[package]] -name = "libc" -version = "0.2.155" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" - -[[package]] -name = "libcosmic" -version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#f60c6893eb828f0e5c2caa8e0a96938938bb3262" -dependencies = [ - "apply", - "ashpd", - "chrono", - "cosmic-config", - "cosmic-theme", - "css-color", - "derive_setters", - "fraction", - "freedesktop-icons", - "iced", - "iced_core", - "iced_futures", - "iced_renderer", - "iced_runtime", - "iced_style", - "iced_tiny_skia", - "iced_wgpu", - "iced_widget", - "iced_winit", - "lazy_static", - "palette", - "rfd", - "serde", - "slotmap", - "taffy", - "thiserror", - "tokio", - "tracing", - "unicode-segmentation", - "url", - "zbus 4.2.2", -] - -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] - -[[package]] -name = "libloading" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" -dependencies = [ - "cfg-if", - "windows-targets 0.52.5", -] - -[[package]] -name = "libm" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" - -[[package]] -name = "libredox" -version = "0.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" -dependencies = [ - "bitflags 2.5.0", - "libc", - "redox_syscall 0.4.1", -] - -[[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 = "libset" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca4f69ca250aaaabde93b0f13d19a22a25b808fb9bc28a1f0869cf3e84cee28d" -dependencies = [ - "atomicwrites 0.4.3", - "dirs", - "known-folders", - "serde", - "serde_json", - "thiserror", - "tracing", - "xdg", -] - -[[package]] -name = "libsqlite3-sys" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "linux-raw-sys" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" - -[[package]] -name = "linux-raw-sys" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0b5399f6804fbab912acbd8878ed3532d506b7c951b8f9f164ef90fef39e3f4" - -[[package]] -name = "locale_config" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" -dependencies = [ - "lazy_static", - "objc", - "objc-foundation", - "regex", - "winapi", -] - -[[package]] -name = "lock_api" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" - -[[package]] -name = "lru" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" -dependencies = [ - "hashbrown", -] - -[[package]] -name = "lyon" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e7f9cda98b5430809e63ca5197b06c7d191bf7e26dfc467d5a3f0290e2a74f" -dependencies = [ - "lyon_algorithms", - "lyon_tessellation", -] - -[[package]] -name = "lyon_algorithms" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3bca95f9a4955b3e4a821fbbcd5edfbd9be2a9a50bb5758173e5358bfb4c623" -dependencies = [ - "lyon_path", - "num-traits", -] - -[[package]] -name = "lyon_geom" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edecfb8d234a2b0be031ab02ebcdd9f3b9ee418fb35e265f7a540a48d197bff9" -dependencies = [ - "arrayvec", - "euclid", - "num-traits", -] - -[[package]] -name = "lyon_path" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c08a606c7a59638d6c6aa18ac91a06aa9fb5f765a7efb27e6a4da58700740d7" -dependencies = [ - "lyon_geom", - "num-traits", -] - -[[package]] -name = "lyon_tessellation" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579d42360a4b09846eff2feef28f538696c7d6c7439bfa65874ff3cbe0951b2c" -dependencies = [ - "float_next_after", - "lyon_path", - "num-traits", -] - -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - -[[package]] -name = "memchr" -version = "2.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" - -[[package]] -name = "memmap2" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -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", -] - -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - -[[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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" -dependencies = [ - "autocfg", -] - -[[package]] -name = "metal" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" -dependencies = [ - "bitflags 2.5.0", - "block", - "core-graphics-types", - "foreign-types", - "log", - "objc", - "paste", -] - -[[package]] -name = "mime" -version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-6#8a816d8f218e290041bb5ef6d3b695c38e0a53b7" -dependencies = [ - "smithay-clipboard", -] - -[[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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" -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 = "mutate_once" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" - -[[package]] -name = "naga" -version = "0.19.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" -dependencies = [ - "arrayvec", - "bit-set", - "bitflags 2.5.0", - "codespan-reporting", - "hexf-parse", - "indexmap", - "log", - "num-traits", - "rustc-hash", - "spirv", - "termcolor", - "thiserror", - "unicode-xid", -] - -[[package]] -name = "ndk" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" -dependencies = [ - "bitflags 2.5.0", - "jni-sys", - "log", - "ndk-sys", - "num_enum", - "raw-window-handle", - "thiserror", -] - -[[package]] -name = "ndk-context" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" - -[[package]] -name = "ndk-sys" -version = "0.5.0+25.2.9519653" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" -dependencies = [ - "jni-sys", -] - -[[package]] -name = "nix" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset 0.6.5", -] - -[[package]] -name = "nix" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset 0.7.1", -] - -[[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 0.1.1", - "libc", - "memoffset 0.9.1", -] - -[[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 = "num" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" -dependencies = [ - "num-bigint", - "num-complex", - "num-integer", - "num-iter", - "num-rational", - "num-traits", -] - -[[package]] -name = "num-bigint" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" -dependencies = [ - "num-integer", - "num-traits", -] - -[[package]] -name = "num-complex" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" -dependencies = [ - "num-traits", -] - -[[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.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" -dependencies = [ - "num-bigint", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -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", - "libc", -] - -[[package]] -name = "num_enum" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" -dependencies = [ - "num_enum_derive", -] - -[[package]] -name = "num_enum_derive" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" -dependencies = [ - "proc-macro-crate 3.1.0", - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "num_threads" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" -dependencies = [ - "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-foundation" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" -dependencies = [ - "block", - "objc", - "objc_id", -] - -[[package]] -name = "objc-sys" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" - -[[package]] -name = "objc2" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" -dependencies = [ - "objc-sys", - "objc2-encode 3.0.0", -] - -[[package]] -name = "objc2" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" -dependencies = [ - "objc-sys", - "objc2-encode 4.0.3", -] - -[[package]] -name = "objc2-encode" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" - -[[package]] -name = "objc2-encode" -version = "4.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" - -[[package]] -name = "objc_exception" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" -dependencies = [ - "cc", -] - -[[package]] -name = "objc_id" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" -dependencies = [ - "objc", -] - -[[package]] -name = "object" -version = "0.32.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "open" -version = "5.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb49fbd5616580e9974662cb96a3463da4476e649a7e4b258df0de065db0657" -dependencies = [ - "is-wsl", - "libc", - "pathdiff", -] - -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - -[[package]] -name = "orbclient" -version = "0.3.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52f0d54bde9774d3a51dcf281a5def240c71996bc6ca05d2c847ec8b2b216166" -dependencies = [ - "libredox 0.0.2", -] - -[[package]] -name = "ordered-multimap" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79" -dependencies = [ - "dlv-list", - "hashbrown", -] - -[[package]] -name = "ordered-stream" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" -dependencies = [ - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "os_pipe" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57119c3b893986491ec9aa85056780d3a0f3cf4da7cc09dd3650dbd6c6738fb9" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "ouroboros" -version = "0.17.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2ba07320d39dfea882faa70554b4bd342a5f273ed59ba7c1c6b4c840492c954" -dependencies = [ - "aliasable", - "ouroboros_macro", - "static_assertions", -] - -[[package]] -name = "ouroboros_macro" -version = "0.17.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec4c6225c69b4ca778c0aea097321a64c421cf4577b331c61b229267edabb6f8" -dependencies = [ - "heck", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "owned_ttf_parser" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b41438d2fc63c46c74a2203bf5ccd82c41ba04347b2fcf5754f230b167067d5" -dependencies = [ - "ttf-parser 0.21.1", -] - -[[package]] -name = "palette" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cbf71184cc5ecc2e4e1baccdb21026c20e5fc3dcf63028a086131b3ab00b6e6" -dependencies = [ - "approx", - "fast-srgb8", - "palette_derive", - "phf", - "serde", -] - -[[package]] -name = "palette_derive" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5030daf005bface118c096f510ffb781fc28f9ab6a32ab224d8631be6851d30" -dependencies = [ - "by_address", - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "parking" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" - -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - -[[package]] -name = "parking_lot" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" -dependencies = [ - "lock_api", - "parking_lot_core 0.9.10", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.5.1", - "smallvec", - "windows-targets 0.52.5", -] - -[[package]] -name = "paste" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" - -[[package]] -name = "pathdiff" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "petgraph" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" -dependencies = [ - "fixedbitset", - "indexmap", -] - -[[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", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "phf_shared" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pico-args" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" - -[[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" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "piper" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "464db0c665917b13ebb5d453ccdec4add5658ee1adc7affc7677615356a8afaf" -dependencies = [ - "atomic-waker", - "fastrand 2.1.0", - "futures-io", -] - -[[package]] -name = "pkg-config" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" - -[[package]] -name = "png" -version = "0.17.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" -dependencies = [ - "bitflags 1.3.2", - "crc32fast", - "fdeflate", - "flate2", - "miniz_oxide", -] - -[[package]] -name = "polling" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" -dependencies = [ - "autocfg", - "bitflags 1.3.2", - "cfg-if", - "concurrent-queue", - "libc", - "log", - "pin-project-lite", - "windows-sys 0.48.0", -] - -[[package]] -name = "polling" -version = "3.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" -dependencies = [ - "cfg-if", - "concurrent-queue", - "hermit-abi", - "pin-project-lite", - "rustix 0.38.34", - "tracing", - "windows-sys 0.52.0", -] - -[[package]] -name = "pollster" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2" - -[[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 = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit 0.19.15", -] - -[[package]] -name = "proc-macro-crate" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" -dependencies = [ - "toml_edit 0.21.1", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro2" -version = "1.0.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "profiling" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" - -[[package]] -name = "qoi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" -dependencies = [ - "bytemuck", -] - -[[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 = "range-alloc" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" - -[[package]] -name = "rangemap" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684" - -[[package]] -name = "raw-window-handle" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" - -[[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 = "rctree" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" - -[[package]] -name = "read-fonts" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af4749db2bd1c853db31a7ae5ee2fc6c30bbddce353ea8fedf673fed187c68c7" -dependencies = [ - "bytemuck", - "font-types", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - -[[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_syscall" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" -dependencies = [ - "bitflags 2.5.0", -] - -[[package]] -name = "redox_users" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" -dependencies = [ - "getrandom", - "libredox 0.1.3", - "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", - "regex-syntax", -] - -[[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", -] - -[[package]] -name = "regex-syntax" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" - -[[package]] -name = "renderdoc-sys" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" - -[[package]] -name = "resvg" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cadccb3d99a9efb8e5e00c16fbb732cbe400db2ec7fc004697ee7d97d86cf1f4" -dependencies = [ - "gif 0.12.0", - "jpeg-decoder", - "log", - "pico-args", - "png", - "rgb", - "svgtypes", - "tiny-skia", - "usvg", -] - -[[package]] -name = "rfd" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25a73a7337fc24366edfca76ec521f51877b114e42dab584008209cca6719251" -dependencies = [ - "ashpd", - "block", - "dispatch", - "js-sys", - "log", - "objc", - "objc-foundation", - "objc_id", - "pollster", - "raw-window-handle", - "urlencoding", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "windows-sys 0.48.0", -] - -[[package]] -name = "rgb" -version = "0.8.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" -dependencies = [ - "bytemuck", -] - -[[package]] -name = "ron" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" -dependencies = [ - "base64", - "bitflags 2.5.0", - "serde", - "serde_derive", -] - -[[package]] -name = "roxmltree" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" - -[[package]] -name = "rust-embed" -version = "8.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19549741604902eb99a7ed0ee177a0663ee1eda51a29f71401f166e47e77806a" -dependencies = [ - "rust-embed-impl", - "rust-embed-utils", - "walkdir", -] - -[[package]] -name = "rust-embed-impl" -version = "8.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb9f96e283ec64401f30d3df8ee2aaeb2561f34c824381efa24a35f79bf40ee4" -dependencies = [ - "proc-macro2", - "quote", - "rust-embed-utils", - "syn 2.0.66", - "walkdir", -] - -[[package]] -name = "rust-embed-utils" -version = "8.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38c74a686185620830701348de757fd36bef4aa9680fd23c49fc539ddcc1af32" -dependencies = [ - "sha2", - "walkdir", -] - -[[package]] -name = "rust-ini" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e0698206bcb8882bf2a9ecb4c1e7785db57ff052297085a6efd4fe42302068a" -dependencies = [ - "cfg-if", - "ordered-multimap", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" - -[[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.37.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - -[[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 0.4.14", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustversion" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" - -[[package]] -name = "rustybuzz" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c" -dependencies = [ - "bitflags 2.5.0", - "bytemuck", - "libm", - "smallvec", - "ttf-parser 0.20.0", - "unicode-bidi-mirroring", - "unicode-ccc", - "unicode-properties", - "unicode-script", -] - -[[package]] -name = "ryu" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" - -[[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 = "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 = "sctk-adwaita" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b2eaf3a5b264a521b988b2e73042e742df700c4f962cde845d1541adb46550" -dependencies = [ - "ab_glyph", - "log", - "memmap2 0.9.4", - "smithay-client-toolkit 0.18.1", - "tiny-skia", -] - -[[package]] -name = "self_cell" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14e4d63b804dc0c7ec4a1e52bcb63f02c7ac94476755aa579edac21e01f915d" -dependencies = [ - "self_cell 1.0.4", -] - -[[package]] -name = "self_cell" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a" - -[[package]] -name = "serde" -version = "1.0.203" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.203" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "serde_json" -version = "1.0.117" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" -dependencies = [ - "indexmap", - "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 2.0.66", -] - -[[package]] -name = "serde_spanned" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" -dependencies = [ - "serde", -] - -[[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" -dependencies = [ - "libc", -] - -[[package]] -name = "simd-adler32" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" - -[[package]] -name = "simplecss" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a11be7c62927d9427e9f40f3444d5499d868648e2edbc4e2116de69e7ec0e89d" -dependencies = [ - "log", -] - -[[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", -] - -[[package]] -name = "smallvec" -version = "1.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - -[[package]] -name = "smithay-client-toolkit" -version = "0.18.0" -source = "git+https://github.com/smithay/client-toolkit?rev=3bed072#3bed072b966022f5f929d12f3aff089b1ace980b" -dependencies = [ - "bitflags 2.5.0", - "bytemuck", - "calloop 0.13.0", - "calloop-wayland-source 0.3.0", - "cursor-icon", - "libc", - "log", - "memmap2 0.9.4", - "pkg-config", - "rustix 0.38.34", - "thiserror", - "wayland-backend", - "wayland-client 0.31.2", - "wayland-csd-frame", - "wayland-cursor", - "wayland-protocols 0.31.2", - "wayland-protocols-wlr", - "wayland-scanner 0.31.1", - "xkbcommon", - "xkeysym", -] - -[[package]] -name = "smithay-client-toolkit" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" -dependencies = [ - "bitflags 2.5.0", - "calloop 0.12.4", - "calloop-wayland-source 0.2.0", - "cursor-icon", - "libc", - "log", - "memmap2 0.9.4", - "rustix 0.38.34", - "thiserror", - "wayland-backend", - "wayland-client 0.31.2", - "wayland-csd-frame", - "wayland-cursor", - "wayland-protocols 0.31.2", - "wayland-protocols-wlr", - "wayland-scanner 0.31.1", - "xkeysym", -] - -[[package]] -name = "smithay-clipboard" -version = "0.8.0" -source = "git+https://github.com/pop-os/smithay-clipboard?tag=pop-dnd-4#ab422ddcc95a9a1717df094f9c8fe69e2fdb2a27" -dependencies = [ - "libc", - "raw-window-handle", - "smithay-client-toolkit 0.18.0", - "wayland-backend", -] - -[[package]] -name = "smol_str" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead" -dependencies = [ - "serde", -] - -[[package]] -name = "socket2" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "socket2" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "softbuffer" -version = "0.4.1" -source = "git+https://github.com/pop-os/softbuffer?tag=cosmic-4.0#6e75b1ad7e98397d37cb187886d05969bc480995" -dependencies = [ - "as-raw-xcb-connection", - "bytemuck", - "cfg_aliases 0.2.1", - "cocoa", - "core-graphics", - "drm", - "fastrand 2.1.0", - "foreign-types", - "js-sys", - "log", - "memmap2 0.9.4", - "objc", - "raw-window-handle", - "redox_syscall 0.4.1", - "rustix 0.38.34", - "tiny-xlib", - "wasm-bindgen", - "wayland-backend", - "wayland-client 0.31.2", - "wayland-sys 0.31.1", - "web-sys", - "windows-sys 0.52.0", - "x11rb 0.13.1", -] - -[[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.3.0+sdk-1.3.268.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" -dependencies = [ - "bitflags 2.5.0", -] - -[[package]] -name = "sqlformat" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce81b7bd7c4493975347ef60d8c7e8b742d4694f4c49f93e0a12ea263938176c" -dependencies = [ - "itertools", - "nom", - "unicode_categories", -] - -[[package]] -name = "sqlx" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9a2ccff1a000a5a59cd33da541d9f2fdcd9e6e8229cc200565942bff36d0aaa" -dependencies = [ - "sqlx-core", - "sqlx-macros", - "sqlx-sqlite", -] - -[[package]] -name = "sqlx-core" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ba59a9342a3d9bab6c56c118be528b27c9b60e490080e9711a04dccac83ef6" -dependencies = [ - "ahash", - "atoi", - "byteorder", - "bytes", - "crc", - "crossbeam-queue", - "either", - "event-listener 2.5.3", - "futures-channel", - "futures-core", - "futures-intrusive", - "futures-io", - "futures-util", - "hashlink", - "hex", - "indexmap", - "log", - "memchr", - "once_cell", - "paste", - "percent-encoding", - "serde", - "sha2", - "smallvec", - "sqlformat", - "thiserror", - "tracing", - "url", -] - -[[package]] -name = "sqlx-macros" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea40e2345eb2faa9e1e5e326db8c34711317d2b5e08d0d5741619048a803127" -dependencies = [ - "proc-macro2", - "quote", - "sqlx-core", - "sqlx-macros-core", - "syn 1.0.109", -] - -[[package]] -name = "sqlx-macros-core" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5833ef53aaa16d860e92123292f1f6a3d53c34ba8b1969f152ef1a7bb803f3c8" -dependencies = [ - "dotenvy", - "either", - "heck", - "hex", - "once_cell", - "proc-macro2", - "quote", - "serde", - "serde_json", - "sha2", - "sqlx-core", - "sqlx-sqlite", - "syn 1.0.109", - "tempfile", - "url", -] - -[[package]] -name = "sqlx-sqlite" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b244ef0a8414da0bed4bb1910426e890b19e5e9bccc27ada6b797d05c55ae0aa" -dependencies = [ - "atoi", - "flume", - "futures-channel", - "futures-core", - "futures-executor", - "futures-intrusive", - "futures-util", - "libsqlite3-sys", - "log", - "percent-encoding", - "serde", - "sqlx-core", - "tracing", - "url", - "urlencoding", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "str-buf" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" - -[[package]] -name = "strict-num" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" -dependencies = [ - "float-cmp", -] - -[[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 = "svg_fmt" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20e16a0f46cf5fd675563ef54f26e83e20f2366bcf027bcb3cc3ed2b98aaf2ca" - -[[package]] -name = "svgtypes" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e44e288cd960318917cbd540340968b90becc8bc81f171345d706e7a89d9d70" -dependencies = [ - "kurbo", - "siphasher", -] - -[[package]] -name = "swash" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "682a612b50baf09e8a039547ecf49e6c155690dcb751b1bcb19c93cdeb3d42d4" -dependencies = [ - "read-fonts", - "yazi", - "zeno", -] - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "sys-locale" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0" -dependencies = [ - "libc", -] - -[[package]] -name = "taffy" -version = "0.3.11" -source = "git+https://github.com/DioxusLabs/taffy?rev=7781c70#7781c70241f7f572130c13106f2a869a9cf80885" -dependencies = [ - "arrayvec", - "grid", - "num-traits", - "slotmap", -] - -[[package]] -name = "tasks" -version = "0.1.0" -dependencies = [ - "chrono", - "cli-clipboard", - "dirs", - "emojis", - "env_logger", - "fork", - "i18n-embed", - "i18n-embed-fl", - "libcosmic", - "log", - "once_cell", - "open", - "paste", - "rust-embed", - "serde", - "slotmap", - "smol_str", - "tasks-core", - "tokio", - "tracing", - "vergen", -] - -[[package]] -name = "tasks-core" -version = "0.1.0" -dependencies = [ - "anyhow", - "async-trait", - "chrono", - "derive-getters", - "derive_setters", - "dirs", - "emojis", - "libset", - "ron", - "serde", - "serde_json", - "sqlx", - "tracing", - "uuid", -] - -[[package]] -name = "tempfile" -version = "3.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" -dependencies = [ - "cfg-if", - "fastrand 2.1.0", - "rustix 0.38.34", - "windows-sys 0.52.0", -] - -[[package]] -name = "termcolor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "thiserror" -version = "1.0.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "tiff" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" -dependencies = [ - "flate2", - "jpeg-decoder", - "weezl", -] - -[[package]] -name = "time" -version = "0.3.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" -dependencies = [ - "deranged", - "itoa", - "libc", - "num-conv", - "num_threads", - "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.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" -dependencies = [ - "num-conv", - "time-core", -] - -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - -[[package]] -name = "tiny-skia" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab" -dependencies = [ - "arrayref", - "arrayvec", - "bytemuck", - "cfg-if", - "log", - "png", - "tiny-skia-path", -] - -[[package]] -name = "tiny-skia-path" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93" -dependencies = [ - "arrayref", - "bytemuck", - "strict-num", -] - -[[package]] -name = "tiny-xlib" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4098d49269baa034a8d1eae9bd63e9fa532148d772121dace3bcd6a6c98eb6d" -dependencies = [ - "as-raw-xcb-connection", - "ctor", - "libloading 0.8.3", - "tracing", -] - -[[package]] -name = "tinystr" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c02bf3c538ab32ba913408224323915f4ef9a6d61c0e85d493f355921c0ece" -dependencies = [ - "displaydoc", -] - -[[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 = "tokio" -version = "1.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "num_cpus", - "pin-project-lite", - "signal-hook-registry", - "socket2 0.5.7", - "tracing", - "windows-sys 0.48.0", -] - -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - -[[package]] -name = "toml" -version = "0.8.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.22.13", -] - -[[package]] -name = "toml_datetime" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.22.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow 0.6.8", -] - -[[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 2.0.66", -] - -[[package]] -name = "tracing-core" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", -] - -[[package]] -name = "tree_magic_mini" -version = "3.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ee137597cdb361b55a4746983e4ac1b35ab6024396a419944ad473bb915265" -dependencies = [ - "fnv", - "home", - "memchr", - "nom", - "once_cell", - "petgraph", -] - -[[package]] -name = "ttf-parser" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" - -[[package]] -name = "ttf-parser" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8" - -[[package]] -name = "type-map" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deb68604048ff8fa93347f02441e4487594adc20bb8a084f9e564d2b827a0a9f" -dependencies = [ - "rustc-hash", -] - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "uds_windows" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" -dependencies = [ - "memoffset 0.9.1", - "tempfile", - "winapi", -] - -[[package]] -name = "unic-langid" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23dd9d1e72a73b25e07123a80776aae3e7b0ec461ef94f9151eed6ec88005a44" -dependencies = [ - "unic-langid-impl", -] - -[[package]] -name = "unic-langid-impl" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a5422c1f65949306c99240b81de9f3f15929f5a8bfe05bb44b034cc8bf593e5" -dependencies = [ - "serde", - "tinystr", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - -[[package]] -name = "unicode-bidi-mirroring" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694" - -[[package]] -name = "unicode-ccc" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" - -[[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-properties" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" - -[[package]] -name = "unicode-script" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd" - -[[package]] -name = "unicode-segmentation" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" - -[[package]] -name = "unicode-vo" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" - -[[package]] -name = "unicode-width" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" - -[[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 = "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 = "urlencoding" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" - -[[package]] -name = "usvg" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b0a51b72ab80ca511d126b77feeeb4fb1e972764653e61feac30adc161a756" -dependencies = [ - "base64", - "log", - "pico-args", - "usvg-parser", - "usvg-text-layout", - "usvg-tree", - "xmlwriter", -] - -[[package]] -name = "usvg-parser" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bd4e3c291f45d152929a31f0f6c819245e2921bfd01e7bd91201a9af39a2bdc" -dependencies = [ - "data-url", - "flate2", - "imagesize", - "kurbo", - "log", - "roxmltree", - "simplecss", - "siphasher", - "svgtypes", - "usvg-tree", -] - -[[package]] -name = "usvg-text-layout" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d383a3965de199d7f96d4e11a44dd859f46e86de7f3dca9a39bf82605da0a37c" -dependencies = [ - "fontdb", - "kurbo", - "log", - "rustybuzz", - "unicode-bidi", - "unicode-script", - "unicode-vo", - "usvg-tree", -] - -[[package]] -name = "usvg-tree" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ee3d202ebdb97a6215604b8f5b4d6ef9024efd623cf2e373a6416ba976ec7d3" -dependencies = [ - "rctree", - "strict-num", - "svgtypes", - "tiny-skia-path", -] - -[[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", -] - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "vergen" -version = "8.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e27d6bdd219887a9eadd19e1c34f32e47fa332301184935c6d9bca26f3cca525" -dependencies = [ - "anyhow", - "cfg-if", - "rustversion", - "time", -] - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "waker-fn" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" - -[[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 2.0.66", - "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 2.0.66", - "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-timer" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" -dependencies = [ - "futures", - "js-sys", - "parking_lot 0.11.2", - "pin-utils", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "wayland-backend" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40" -dependencies = [ - "cc", - "downcast-rs", - "rustix 0.38.34", - "scoped-tls", - "smallvec", - "wayland-sys 0.31.1", -] - -[[package]] -name = "wayland-client" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715" -dependencies = [ - "bitflags 1.3.2", - "downcast-rs", - "libc", - "nix 0.24.3", - "wayland-commons", - "wayland-scanner 0.29.5", - "wayland-sys 0.29.5", -] - -[[package]] -name = "wayland-client" -version = "0.31.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f" -dependencies = [ - "bitflags 2.5.0", - "rustix 0.38.34", - "wayland-backend", - "wayland-scanner 0.31.1", -] - -[[package]] -name = "wayland-commons" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902" -dependencies = [ - "nix 0.24.3", - "once_cell", - "smallvec", - "wayland-sys 0.29.5", -] - -[[package]] -name = "wayland-csd-frame" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" -dependencies = [ - "bitflags 2.5.0", - "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 0.38.34", - "wayland-client 0.31.2", - "xcursor", -] - -[[package]] -name = "wayland-protocols" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6" -dependencies = [ - "bitflags 1.3.2", - "wayland-client 0.29.5", - "wayland-commons", - "wayland-scanner 0.29.5", -] - -[[package]] -name = "wayland-protocols" -version = "0.31.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" -dependencies = [ - "bitflags 2.5.0", - "wayland-backend", - "wayland-client 0.31.2", - "wayland-scanner 0.31.1", -] - -[[package]] -name = "wayland-protocols-plasma" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" -dependencies = [ - "bitflags 2.5.0", - "wayland-backend", - "wayland-client 0.31.2", - "wayland-protocols 0.31.2", - "wayland-scanner 0.31.1", -] - -[[package]] -name = "wayland-protocols-wlr" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" -dependencies = [ - "bitflags 2.5.0", - "wayland-backend", - "wayland-client 0.31.2", - "wayland-protocols 0.31.2", - "wayland-scanner 0.31.1", -] - -[[package]] -name = "wayland-scanner" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53" -dependencies = [ - "proc-macro2", - "quote", - "xml-rs", -] - -[[package]] -name = "wayland-scanner" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283" -dependencies = [ - "proc-macro2", - "quick-xml", - "quote", -] - -[[package]] -name = "wayland-sys" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be12ce1a3c39ec7dba25594b97b42cb3195d54953ddb9d3d95a7c3902bc6e9d4" -dependencies = [ - "pkg-config", -] - -[[package]] -name = "wayland-sys" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" -dependencies = [ - "dlib", - "log", - "once_cell", - "pkg-config", -] - -[[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 = "web-time" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "weezl" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" - -[[package]] -name = "wgpu" -version = "0.19.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" -dependencies = [ - "arrayvec", - "cfg-if", - "cfg_aliases 0.1.1", - "js-sys", - "log", - "naga", - "parking_lot 0.12.3", - "profiling", - "raw-window-handle", - "smallvec", - "static_assertions", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "wgpu-core", - "wgpu-hal", - "wgpu-types", -] - -[[package]] -name = "wgpu-core" -version = "0.19.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" -dependencies = [ - "arrayvec", - "bit-vec", - "bitflags 2.5.0", - "cfg_aliases 0.1.1", - "codespan-reporting", - "indexmap", - "log", - "naga", - "once_cell", - "parking_lot 0.12.3", - "profiling", - "raw-window-handle", - "rustc-hash", - "smallvec", - "thiserror", - "web-sys", - "wgpu-hal", - "wgpu-types", -] - -[[package]] -name = "wgpu-hal" -version = "0.19.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" -dependencies = [ - "android_system_properties", - "arrayvec", - "ash", - "bit-set", - "bitflags 2.5.0", - "block", - "cfg_aliases 0.1.1", - "core-graphics-types", - "d3d12", - "glow", - "glutin_wgl_sys", - "gpu-alloc", - "gpu-allocator", - "gpu-descriptor", - "hassle-rs", - "js-sys", - "khronos-egl", - "libc", - "libloading 0.8.3", - "log", - "metal", - "naga", - "objc", - "once_cell", - "parking_lot 0.12.3", - "profiling", - "range-alloc", - "raw-window-handle", - "renderdoc-sys", - "rustc-hash", - "smallvec", - "thiserror", - "wasm-bindgen", - "web-sys", - "wgpu-types", - "winapi", -] - -[[package]] -name = "wgpu-types" -version = "0.19.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" -dependencies = [ - "bitflags 2.5.0", - "js-sys", - "web-sys", -] - -[[package]] -name = "widestring" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" - -[[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-wsapoll" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1eafc5f679c576995526e81635d0cf9695841736712b4e892f87abbe6fed3f28" -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 = "window_clipboard" -version = "0.4.1" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-6#8a816d8f218e290041bb5ef6d3b695c38e0a53b7" -dependencies = [ - "clipboard-win 5.3.1", - "clipboard_macos", - "clipboard_wayland", - "clipboard_x11", - "dnd", - "mime", - "raw-window-handle", - "thiserror", -] - -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-implement", - "windows-interface", - "windows-targets 0.48.5", -] - -[[package]] -name = "windows" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" -dependencies = [ - "windows-core", - "windows-targets 0.52.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.5", -] - -[[package]] -name = "windows-implement" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e2ee588991b9e7e6c8338edf3333fbe4da35dc72092643958ebb43f0ab2c49c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "windows-interface" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6fb8df20c9bcaa8ad6ab513f7b40104840c8867d5751126e4df3b08388d0cc7" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - -[[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.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "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-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.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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" - -[[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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" - -[[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.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.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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" - -[[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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" - -[[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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" - -[[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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" - -[[package]] -name = "winit" -version = "0.29.10" -source = "git+https://github.com/pop-os/winit.git?branch=winit-0.29#bdc66109acc85c912264c9e4b864520345bdb45f" -dependencies = [ - "ahash", - "android-activity", - "atomic-waker", - "bitflags 2.5.0", - "bytemuck", - "calloop 0.12.4", - "cfg_aliases 0.1.1", - "core-foundation", - "core-graphics", - "cursor-icon", - "icrate 0.0.4", - "js-sys", - "libc", - "log", - "memmap2 0.9.4", - "ndk", - "ndk-sys", - "objc2 0.4.1", - "once_cell", - "orbclient", - "percent-encoding", - "raw-window-handle", - "redox_syscall 0.3.5", - "rustix 0.38.34", - "sctk-adwaita", - "smithay-client-toolkit 0.18.1", - "smol_str", - "unicode-segmentation", - "wasm-bindgen", - "wasm-bindgen-futures", - "wayland-backend", - "wayland-client 0.31.2", - "wayland-protocols 0.31.2", - "wayland-protocols-plasma", - "web-sys", - "web-time", - "windows-sys 0.48.0", - "x11-dl", - "x11rb 0.13.1", - "xkbcommon-dl", -] - -[[package]] -name = "winnow" -version = "0.5.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] - -[[package]] -name = "winnow" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d" -dependencies = [ - "memchr", -] - -[[package]] -name = "wl-clipboard-rs" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "981a303dfbb75d659f6612d05a14b2e363c103d24f676a2d44a00d18507a1ad9" -dependencies = [ - "derive-new", - "libc", - "log", - "nix 0.24.3", - "os_pipe", - "tempfile", - "thiserror", - "tree_magic_mini", - "wayland-client 0.29.5", - "wayland-protocols 0.29.5", -] - -[[package]] -name = "x11-clipboard" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "980b9aa9226c3b7de8e2adb11bf20124327c054e0e5812d2aac0b5b5a87e7464" -dependencies = [ - "x11rb 0.10.1", -] - -[[package]] -name = "x11-dl" -version = "2.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" -dependencies = [ - "libc", - "once_cell", - "pkg-config", -] - -[[package]] -name = "x11rb" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "592b4883219f345e712b3209c62654ebda0bb50887f330cbd018d0f654bfd507" -dependencies = [ - "gethostname 0.2.3", - "nix 0.24.3", - "winapi", - "winapi-wsapoll", - "x11rb-protocol 0.10.0", -] - -[[package]] -name = "x11rb" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" -dependencies = [ - "as-raw-xcb-connection", - "gethostname 0.4.3", - "libc", - "libloading 0.8.3", - "once_cell", - "rustix 0.38.34", - "x11rb-protocol 0.13.1", -] - -[[package]] -name = "x11rb-protocol" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56b245751c0ac9db0e006dc812031482784e434630205a93c73cfefcaabeac67" -dependencies = [ - "nix 0.24.3", -] - -[[package]] -name = "x11rb-protocol" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" - -[[package]] -name = "xcursor" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" - -[[package]] -name = "xdg" -version = "2.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" - -[[package]] -name = "xdg-home" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" -dependencies = [ - "libc", - "winapi", -] - -[[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 = "xkbcommon-dl" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" -dependencies = [ - "bitflags 2.5.0", - "dlib", - "log", - "once_cell", - "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.8.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" - -[[package]] -name = "xmlwriter" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" - -[[package]] -name = "xxhash-rust" -version = "0.8.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927da81e25be1e1a2901d59b81b37dd2efd1fc9c9345a55007f09bf5a2d3ee03" - -[[package]] -name = "yazi" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1" - -[[package]] -name = "zbus" -version = "3.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" -dependencies = [ - "async-broadcast 0.5.1", - "async-executor", - "async-fs 1.6.0", - "async-io 1.13.0", - "async-lock 2.8.0", - "async-process 1.8.1", - "async-recursion", - "async-task", - "async-trait", - "blocking", - "byteorder", - "derivative", - "enumflags2", - "event-listener 2.5.3", - "futures-core", - "futures-sink", - "futures-util", - "hex", - "nix 0.26.4", - "once_cell", - "ordered-stream", - "rand", - "serde", - "serde_repr", - "sha1", - "static_assertions", - "tracing", - "uds_windows", - "winapi", - "xdg-home", - "zbus_macros 3.15.2", - "zbus_names 2.6.1", - "zvariant 3.15.2", -] - -[[package]] -name = "zbus" -version = "4.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "989c3977a7aafa97b12b9a35d21cdcff9b0d2289762b14683f45d66b1ba6c48f" -dependencies = [ - "async-broadcast 0.7.0", - "async-executor", - "async-fs 2.1.2", - "async-io 2.3.2", - "async-lock 3.3.0", - "async-process 2.2.2", - "async-recursion", - "async-task", - "async-trait", - "blocking", - "enumflags2", - "event-listener 5.3.0", - "futures-core", - "futures-sink", - "futures-util", - "hex", - "nix 0.28.0", - "ordered-stream", - "rand", - "serde", - "serde_repr", - "sha1", - "static_assertions", - "tokio", - "tracing", - "uds_windows", - "windows-sys 0.52.0", - "xdg-home", - "zbus_macros 4.2.2", - "zbus_names 3.0.0", - "zvariant 4.1.1", -] - -[[package]] -name = "zbus_macros" -version = "3.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "regex", - "syn 1.0.109", - "zvariant_utils 1.0.1", -] - -[[package]] -name = "zbus_macros" -version = "4.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fe9de53245dcf426b7be226a4217dd5e339080e5d46e64a02d6e5dcbf90fca1" -dependencies = [ - "proc-macro-crate 3.1.0", - "proc-macro2", - "quote", - "syn 2.0.66", - "zvariant_utils 2.0.0", -] - -[[package]] -name = "zbus_names" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" -dependencies = [ - "serde", - "static_assertions", - "zvariant 3.15.2", -] - -[[package]] -name = "zbus_names" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" -dependencies = [ - "serde", - "static_assertions", - "zvariant 4.1.1", -] - -[[package]] -name = "zeno" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd15f8e0dbb966fd9245e7498c7e9e5055d9e5c8b676b95bd67091cd11a1e697" - -[[package]] -name = "zerocopy" -version = "0.7.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "zune-inflate" -version = "0.2.54" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" -dependencies = [ - "simd-adler32", -] - -[[package]] -name = "zvariant" -version = "3.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db" -dependencies = [ - "byteorder", - "enumflags2", - "libc", - "serde", - "static_assertions", - "zvariant_derive 3.15.2", -] - -[[package]] -name = "zvariant" -version = "4.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aa6d31a02fbfb602bfde791de7fedeb9c2c18115b3d00f3a36e489f46ffbbc7" -dependencies = [ - "endi", - "enumflags2", - "serde", - "static_assertions", - "url", - "zvariant_derive 4.1.1", -] - -[[package]] -name = "zvariant_derive" -version = "3.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "syn 1.0.109", - "zvariant_utils 1.0.1", -] - -[[package]] -name = "zvariant_derive" -version = "4.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642bf1b6b6d527988b3e8193d20969d53700a36eac734d21ae6639db168701c8" -dependencies = [ - "proc-macro-crate 3.1.0", - "proc-macro2", - "quote", - "syn 2.0.66", - "zvariant_utils 2.0.0", -] - -[[package]] -name = "zvariant_utils" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "zvariant_utils" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] diff --git a/pkgs/by-name/ta/tasks/package.nix b/pkgs/by-name/ta/tasks/package.nix index 068ec21a4af6..f633835a4991 100644 --- a/pkgs/by-name/ta/tasks/package.nix +++ b/pkgs/by-name/ta/tasks/package.nix @@ -30,23 +30,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-0bXzeKnJ5MIl7vCo+7kyXm3L6QrCdm5sPreca1SPi8U="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "accesskit-0.12.2" = "sha256-ksaYMGT/oug7isQY8/1WD97XDUsX2ShBdabUzxWffYw="; - "atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA="; - "clipboard_macos-0.1.0" = "sha256-temNg+RdvquSLAdkwU5b6dtu9vZkXjnDASS/eJo2rz8="; - "cosmic-config-0.1.0" = "sha256-dYxBp/2JkgFUtkcfzQieHS7MPf6GoOIxuCN/8AZraio="; - "cosmic-text-0.11.2" = "sha256-O8l3Auo+7/aqPYvWQXpOdrVHHdjc1fjoU1nFxqdiZ5I="; - "d3d12-0.19.0" = "sha256-usrxQXWLGJDjmIdw1LBXtBvX+CchZDvE8fHC0LjvhD4="; - "glyphon-0.5.0" = "sha256-j1HrbEpUBqazWqNfJhpyjWuxYAxkvbXzRKeSouUoPWg="; - "smithay-client-toolkit-0.18.0" = "sha256-/7twYMt5/LpzxLXAQKTGNnWcfspUkkZsN5hJu7KaANc="; - "smithay-clipboard-0.8.0" = "sha256-MqzynFCZvzVg9/Ry/zrbH5R6//erlZV+nmQ2St63Wnc="; - "softbuffer-0.4.1" = "sha256-a0bUFz6O8CWRweNt/OxTvflnPYwO5nm6vsyc/WcXyNg="; - "taffy-0.3.11" = "sha256-SCx9GEIJjWdoNVyq+RZAGn0N71qraKZxf9ZWhvyzLaI="; - "winit-0.29.10" = "sha256-ScTII2AzK3SC8MVeASZ9jhVWsEaGrSQ2BnApTxgfxK4="; - }; - }; + useFetchCargoVendor = true; + cargoHash = "sha256-9H4xzjgFpUsY5d6IpFt744058tVvMK0YHYvbnMWxNm8="; # COSMIC applications now uses vergen for the About page # Update the COMMIT_DATE to match when the commit was made From f75a67c0981c2b9f2ac8c7f7e6f1019c33ae79ff Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 15 Feb 2025 10:11:15 -0500 Subject: [PATCH 2140/2168] zenoh: 1.2.0 -> 1.2.1 Diff: https://github.com/eclipse-zenoh/zenoh/compare/1.2.0...1.2.1 Changelog: https://github.com/eclipse-zenoh/zenoh/releases/tag/1.2.1 --- pkgs/by-name/ze/zenoh/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zenoh/package.nix b/pkgs/by-name/ze/zenoh/package.nix index 722e2424d5b3..4d04fb691f64 100644 --- a/pkgs/by-name/ze/zenoh/package.nix +++ b/pkgs/by-name/ze/zenoh/package.nix @@ -8,17 +8,17 @@ }: rustPlatform.buildRustPackage rec { pname = "zenoh"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "eclipse-zenoh"; repo = "zenoh"; rev = version; - hash = "sha256-X/jUANTwuOHIA+m8LB4UuJDJ0PwZuMQHtSdgSPiPYNI="; + hash = "sha256-iwimXL1jcBLwaek9tmvGuow56+LMCyA5qkvHsn72m+c="; }; useFetchCargoVendor = true; - cargoHash = "sha256-hCon4ydLLwvdglVfNn+eWMbDaTpcPZxzLWINPULYZwI="; + cargoHash = "sha256-UF5tZyAYluSZ+jR03W7h0azAGiNw48Hum1Si0G5lTqA="; cargoBuildFlags = [ "--workspace" From 1e8db50772c58f0d9fbbcb200792d27266f8585b Mon Sep 17 00:00:00 2001 From: TheColorman Date: Sat, 15 Feb 2025 16:12:36 +0100 Subject: [PATCH 2141/2168] displaylink: 6.0.0-24 -> 6.1.0-17 --- pkgs/os-specific/linux/displaylink/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix index 024cf5299b24..3318a9bc60b2 100644 --- a/pkgs/os-specific/linux/displaylink/default.nix +++ b/pkgs/os-specific/linux/displaylink/default.nix @@ -28,28 +28,28 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "displaylink"; - version = "6.0.0-24"; + version = "6.1.0-17"; src = requireFile rec { - name = "displaylink-600.zip"; - sha256 = "1ixrklwk67w25cy77n7l0pq6j9i4bp4lkdr30kp1jsmyz8daaypw"; + name = "displaylink-610.zip"; + hash = "sha256-RJgVrX+Y8Nvz106Xh+W9N9uRLC2VO00fBJeS8vs7fKw="; message = '' In order to install the DisplayLink drivers, you must first comply with DisplayLink's EULA and download the binaries and sources from here: - https://www.synaptics.com/products/displaylink-graphics/downloads/ubuntu-6.0 + https://www.synaptics.com/products/displaylink-usb-graphics-software-ubuntu-61 Once you have downloaded the file, please use the following commands and re-run the installation: - mv \$PWD/"DisplayLink USB Graphics Software for Ubuntu6.0-EXE.zip" \$PWD/${name} + mv \$PWD/"DisplayLink USB Graphics Software for Ubuntu6.1-EXE.zip" \$PWD/${name} nix-prefetch-url file://\$PWD/${name} Alternatively, you can use the following command to download the file directly: - nix-prefetch-url --name ${name} https://www.synaptics.com/sites/default/files/exe_files/2024-05/DisplayLink%20USB%20Graphics%20Software%20for%20Ubuntu6.0-EXE.zip + nix-prefetch-url --name ${name} https://www.synaptics.com/sites/default/files/exe_files/2024-10/DisplayLink%20USB%20Graphics%20Software%20for%20Ubuntu6.1-EXE.zip ''; }; From 3807717bd80d989ddade3667da0f3a53fdeacbfd Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 15 Feb 2025 10:19:20 -0500 Subject: [PATCH 2142/2168] zenoh: opt out of auto update --- pkgs/by-name/ze/zenoh/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ze/zenoh/package.nix b/pkgs/by-name/ze/zenoh/package.nix index 4d04fb691f64..ac38986f3bdb 100644 --- a/pkgs/by-name/ze/zenoh/package.nix +++ b/pkgs/by-name/ze/zenoh/package.nix @@ -8,7 +8,7 @@ }: rustPlatform.buildRustPackage rec { pname = "zenoh"; - version = "1.2.1"; + version = "1.2.1"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "eclipse-zenoh"; From ab133dceb86afd3c8db2454668b50f91db6ce991 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 15 Feb 2025 10:19:39 -0500 Subject: [PATCH 2143/2168] zenoh-backend-filesystem: opt out of auto update --- pkgs/by-name/ze/zenoh-backend-filesystem/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ze/zenoh-backend-filesystem/package.nix b/pkgs/by-name/ze/zenoh-backend-filesystem/package.nix index 674bffd814fe..f0118bb9af23 100644 --- a/pkgs/by-name/ze/zenoh-backend-filesystem/package.nix +++ b/pkgs/by-name/ze/zenoh-backend-filesystem/package.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { pname = "zenoh-backend-filesystem"; - version = "1.2.1"; + version = "1.2.1"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "eclipse-zenoh"; From d2a8134268b43d258c25ff199b90e2742b3d20d0 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 15 Feb 2025 10:19:50 -0500 Subject: [PATCH 2144/2168] zenoh-backend-influxdb: opt out of auto update --- pkgs/by-name/ze/zenoh-backend-influxdb/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ze/zenoh-backend-influxdb/package.nix b/pkgs/by-name/ze/zenoh-backend-influxdb/package.nix index 1a385f2dcba7..edb7ab5a5a5b 100644 --- a/pkgs/by-name/ze/zenoh-backend-influxdb/package.nix +++ b/pkgs/by-name/ze/zenoh-backend-influxdb/package.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec { pname = "zenoh-backend-influxdb"; - version = "1.2.1"; + version = "1.2.1"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "eclipse-zenoh"; From 91bb7044863af8daba11c2811de7f2aac782855f Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 15 Feb 2025 10:20:01 -0500 Subject: [PATCH 2145/2168] zenoh-backend-rocksdb: opt out of auto update --- pkgs/by-name/ze/zenoh-backend-rocksdb/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ze/zenoh-backend-rocksdb/package.nix b/pkgs/by-name/ze/zenoh-backend-rocksdb/package.nix index 64ef7811a1a3..ebae909402f2 100644 --- a/pkgs/by-name/ze/zenoh-backend-rocksdb/package.nix +++ b/pkgs/by-name/ze/zenoh-backend-rocksdb/package.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { pname = "zenoh-backend-rocksdb"; - version = "1.2.1"; + version = "1.2.1"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "eclipse-zenoh"; From aa448a3a0aebbb8eac4981f6359008428561c1bb Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 15 Feb 2025 10:20:17 -0500 Subject: [PATCH 2146/2168] zenoh-plugin-mqtt: opt out of auto update --- pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix b/pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix index 644b956da84e..2d0749368080 100644 --- a/pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix +++ b/pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec { pname = "zenoh-plugin-mqtt"; - version = "1.2.1"; + version = "1.2.1"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "eclipse-zenoh"; From 16e77b94d40bb55963be817fceb1381387509cf3 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 15 Feb 2025 10:20:35 -0500 Subject: [PATCH 2147/2168] zenoh-plugin-webserver: opt out of auto update --- pkgs/by-name/ze/zenoh-plugin-webserver/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ze/zenoh-plugin-webserver/package.nix b/pkgs/by-name/ze/zenoh-plugin-webserver/package.nix index a2a5ea6bff9d..1a04bf89d709 100644 --- a/pkgs/by-name/ze/zenoh-plugin-webserver/package.nix +++ b/pkgs/by-name/ze/zenoh-plugin-webserver/package.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec { pname = "zenoh-plugin-webserver"; - version = "1.2.1"; + version = "1.2.1"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "eclipse-zenoh"; From 269ba5b68a5b16c08e59d83777b54631d03ac3bf Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 15 Feb 2025 10:20:47 -0500 Subject: [PATCH 2148/2168] python312Packages.zenoh: opt out of auto update --- pkgs/development/python-modules/zenoh/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/zenoh/default.nix b/pkgs/development/python-modules/zenoh/default.nix index 6566e08e0465..5c3be767115f 100644 --- a/pkgs/development/python-modules/zenoh/default.nix +++ b/pkgs/development/python-modules/zenoh/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "zenoh"; - version = "1.2.0"; + version = "1.2.0"; # nixpkgs-update: no auto update pyproject = true; src = fetchFromGitHub { From d6e02156019525acd99f7d026838058e2c0d9166 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 15 Feb 2025 10:21:53 -0500 Subject: [PATCH 2149/2168] python312Packages.zenoh: 1.2.0 -> 1.2.1 Diff: https://github.com/eclipse-zenoh/zenoh-python/compare/1.2.0...1.2.1 --- pkgs/development/python-modules/zenoh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/zenoh/default.nix b/pkgs/development/python-modules/zenoh/default.nix index 5c3be767115f..0bae4d17d929 100644 --- a/pkgs/development/python-modules/zenoh/default.nix +++ b/pkgs/development/python-modules/zenoh/default.nix @@ -11,19 +11,19 @@ buildPythonPackage rec { pname = "zenoh"; - version = "1.2.0"; # nixpkgs-update: no auto update + version = "1.2.1"; # nixpkgs-update: no auto update pyproject = true; src = fetchFromGitHub { owner = "eclipse-zenoh"; repo = "zenoh-python"; rev = version; - hash = "sha256-N82KcLMYTOzkeFR6NLNR/g4MDjXk2aZRaAVMggXKwf0="; + hash = "sha256-AIsIjMcT9g0mTAgxOL/shBEjpeuOm/7Wn4EOSyYbShE="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src pname version; - hash = "sha256-5JdqANf5roFY3J+iPxg+WhmAyTWARhgav+/jt7rttqg="; + hash = "sha256-Y8fg/vFL7kLoARpp0BmDpQva9zNEEOWOHQk3GjeAoLk="; }; build-system = [ From c0719a6965db1068c92dda148272faad8d9bd064 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 15:58:50 +0000 Subject: [PATCH 2150/2168] dns-over-https: 2.3.7 -> 2.3.8 --- pkgs/by-name/dn/dns-over-https/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/dn/dns-over-https/package.nix b/pkgs/by-name/dn/dns-over-https/package.nix index 73998f2b96c4..524c957e8370 100644 --- a/pkgs/by-name/dn/dns-over-https/package.nix +++ b/pkgs/by-name/dn/dns-over-https/package.nix @@ -6,16 +6,16 @@ }: buildGoModule rec { pname = "dns-over-https"; - version = "2.3.7"; + version = "2.3.8"; src = fetchFromGitHub { owner = "m13253"; repo = "dns-over-https"; tag = "v${version}"; - hash = "sha256-3mg4kDlIqv+psQU/FxA9TksGVAYaOymEDpAhMBZuqKI="; + hash = "sha256-0tjqj67PWPRChspUQQeZqtW68IB2G8N2vhebMwHNbX4="; }; - vendorHash = "sha256-Dun1HWjV44PTpnijWBpGXqmKxtUw+Qu8rqsyMhEpkb4="; + vendorHash = "sha256-cASJYEglq2IrnxjqOCiepjExX/FmakeMjxPOsjUDTWM="; ldflags = [ "-w" From 7b1175e5fe121a1e52686fb06015a7a0178f4244 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 16:30:20 +0000 Subject: [PATCH 2151/2168] symfony-cli: 5.10.7 -> 5.10.9 --- pkgs/by-name/sy/symfony-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sy/symfony-cli/package.nix b/pkgs/by-name/sy/symfony-cli/package.nix index 69f52746f194..6120563559dd 100644 --- a/pkgs/by-name/sy/symfony-cli/package.nix +++ b/pkgs/by-name/sy/symfony-cli/package.nix @@ -11,14 +11,14 @@ buildGoModule rec { pname = "symfony-cli"; - version = "5.10.7"; + version = "5.10.9"; vendorHash = "sha256-UqaRZPCgjiexeeylfP8p0rye6oc+rWac87p8KbVKrdc="; src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; rev = "v${version}"; - hash = "sha256-l4atQdFRA2nwh2OXlF6a24Xe2WCAKbOdySu+r+rcTXQ="; + hash = "sha256-Y7wtWrEe1/aftHGdwRA+1Uw9vHJRST9yjhFGYVEgdgo="; leaveDotGit = true; postFetch = '' git --git-dir $out/.git log -1 --pretty=%cd --date=format:'%Y-%m-%dT%H:%M:%SZ' > $out/SOURCE_DATE From ab1b08f3c70db016b98003cdbfea7427e8cc61b6 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Sat, 15 Feb 2025 11:59:27 -0300 Subject: [PATCH 2152/2168] tasks: use libcosmicAppHook and just for building Also removed some unnecessary buildInputs that were not needed neither for tasks neither for its dependencies --- pkgs/by-name/ta/tasks/package.nix | 47 +++++++++++-------------------- 1 file changed, 16 insertions(+), 31 deletions(-) diff --git a/pkgs/by-name/ta/tasks/package.nix b/pkgs/by-name/ta/tasks/package.nix index f633835a4991..784696938612 100644 --- a/pkgs/by-name/ta/tasks/package.nix +++ b/pkgs/by-name/ta/tasks/package.nix @@ -1,21 +1,13 @@ { lib, + stdenv, rustPlatform, fetchFromGitHub, - pkg-config, - wrapGAppsHook3, - atk, - cairo, - gdk-pixbuf, - glib, - gtk3, + libcosmicAppHook, + just, libsecret, - libxkbcommon, openssl, - pango, sqlite, - vulkan-loader, - wayland, nix-update-script, }: @@ -39,34 +31,27 @@ rustPlatform.buildRustPackage rec { env.VERGEN_GIT_SHA = "0e8c728c88a9cac1bac130eb083ca0fe58c7121d"; nativeBuildInputs = [ - pkg-config - wrapGAppsHook3 + libcosmicAppHook + just ]; buildInputs = [ - atk - cairo - gdk-pixbuf - glib - gtk3 libsecret - libxkbcommon openssl - pango sqlite - vulkan-loader - wayland ]; - postFixup = '' - wrapProgram $out/bin/tasks \ - --prefix LD_LIBRARY_PATH : "${ - lib.makeLibraryPath [ - libxkbcommon - wayland - ] - }" - ''; + dontUseJustBuild = true; + dontUseJustCheck = true; + + justFlags = [ + "--set" + "prefix" + (placeholder "out") + "--set" + "bin-src" + "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/tasks" + ]; passthru = { updateScript = nix-update-script { }; From 6fc4a8772c8992ea1d33971b17bbb21ce85aedd8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 16:52:47 +0000 Subject: [PATCH 2153/2168] gpxsee: 13.34 -> 13.35 --- pkgs/applications/misc/gpxsee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 0246a6ba928b..b2bfa4c20ca9 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gpxsee"; - version = "13.34"; + version = "13.35"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = finalAttrs.version; - hash = "sha256-adZTcZGRE0PkG9rntvD3vLIqXOsVxP28LCZrfyVqy9M="; + hash = "sha256-TvDopZyrRx+604ARrOiy2OsswE8/K+W5LIhOitttt3U="; }; buildInputs = From 19916d96ae7471ebff8e54e1b3d302521eb95b78 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Sat, 15 Feb 2025 12:04:07 -0300 Subject: [PATCH 2154/2168] tasks: 0.1.0 -> 0.1.1 --- pkgs/by-name/ta/tasks/package.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ta/tasks/package.nix b/pkgs/by-name/ta/tasks/package.nix index 784696938612..fb2f82b1a707 100644 --- a/pkgs/by-name/ta/tasks/package.nix +++ b/pkgs/by-name/ta/tasks/package.nix @@ -13,22 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "tasks"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "cosmic-utils"; repo = "tasks"; tag = version; - hash = "sha256-0bXzeKnJ5MIl7vCo+7kyXm3L6QrCdm5sPreca1SPi8U="; + hash = "sha256-OKXkAJ+TyMnTzvlUPwPU2MWgCTIN3cDiPcVPOzU4WEg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-9H4xzjgFpUsY5d6IpFt744058tVvMK0YHYvbnMWxNm8="; - - # COSMIC applications now uses vergen for the About page - # Update the COMMIT_DATE to match when the commit was made - env.VERGEN_GIT_COMMIT_DATE = "2024-07-03"; - env.VERGEN_GIT_SHA = "0e8c728c88a9cac1bac130eb083ca0fe58c7121d"; + cargoHash = "sha256-3SbqKB9DI1Bl8u8rrAPCO/sPKMByYhQ3YT63K5BDVvE="; nativeBuildInputs = [ libcosmicAppHook From 06acfbb18f6b448469a28a4d9241d83335a7eadd Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Sat, 15 Feb 2025 12:04:49 -0300 Subject: [PATCH 2155/2168] tasks: add HeitorAugustoLN as a maintainer --- pkgs/by-name/ta/tasks/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ta/tasks/package.nix b/pkgs/by-name/ta/tasks/package.nix index fb2f82b1a707..67a3478818c2 100644 --- a/pkgs/by-name/ta/tasks/package.nix +++ b/pkgs/by-name/ta/tasks/package.nix @@ -57,7 +57,10 @@ rustPlatform.buildRustPackage rec { description = "Simple task management application for the COSMIC desktop"; homepage = "https://github.com/cosmic-utils/tasks"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ GaetanLepage ]; + maintainers = with lib.maintainers; [ + GaetanLepage + HeitorAugustoLN + ]; platforms = lib.platforms.linux; mainProgram = "tasks"; }; From 34cf170720f7704888b1680c6225f00d1a8861dd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 17:51:10 +0000 Subject: [PATCH 2156/2168] python312Packages.mpi4py: 4.0.2 -> 4.0.3 --- pkgs/development/python-modules/mpi4py/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix index e16d2cf007d6..13b538f12fa1 100644 --- a/pkgs/development/python-modules/mpi4py/default.nix +++ b/pkgs/development/python-modules/mpi4py/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "mpi4py"; - version = "4.0.2"; + version = "4.0.3"; pyproject = true; src = fetchFromGitHub { repo = "mpi4py"; owner = "mpi4py"; tag = version; - hash = "sha256-hsP4aonjiBit2un6EQWQxF+lVjsnMFFqLaAOqBWAzgo="; + hash = "sha256-eN/tjlnNla6RHYOXcprVVqtec1nwCEGn+MBcV/5mHJg="; }; build-system = [ @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = { description = "Python bindings for the Message Passing Interface standard"; homepage = "https://github.com/mpi4py/mpi4py"; - changelog = "https://github.com/mpi4py/mpi4py/blob/${version}/CHANGES.rst"; + changelog = "https://github.com/mpi4py/mpi4py/blob/${src.tag}/CHANGES.rst"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ doronbehar ]; }; From 8fb67d0fd8f0658bc8cbdc50e64f331c57a069c7 Mon Sep 17 00:00:00 2001 From: Will Date: Sat, 15 Feb 2025 17:11:35 +0000 Subject: [PATCH 2157/2168] vintagestory: 1.20.3 -> 1.20.4 --- pkgs/by-name/vi/vintagestory/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vi/vintagestory/package.nix b/pkgs/by-name/vi/vintagestory/package.nix index ed2d596272d9..8c59ae716d33 100644 --- a/pkgs/by-name/vi/vintagestory/package.nix +++ b/pkgs/by-name/vi/vintagestory/package.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "vintagestory"; - version = "1.20.3"; + version = "1.20.4"; src = fetchurl { url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${version}.tar.gz"; - hash = "sha256-+nEyFlLfTAOmd8HrngZOD1rReaXCXX/ficE/PCLcewg="; + hash = "sha256-Hgp2u/y2uPnJhAmPpwof76/woFGz4ISUXU+FIRMjMuQ="; }; nativeBuildInputs = [ From 98d475190fa1e72f5276a30139f9fbd79d266ce9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 17:29:15 +0000 Subject: [PATCH 2158/2168] phpunit: 11.5.6 -> 12.0.2 --- pkgs/by-name/ph/phpunit/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ph/phpunit/package.nix b/pkgs/by-name/ph/phpunit/package.nix index 7751d02f9a71..897886b53f52 100644 --- a/pkgs/by-name/ph/phpunit/package.nix +++ b/pkgs/by-name/ph/phpunit/package.nix @@ -9,16 +9,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "phpunit"; - version = "11.5.6"; + version = "12.0.2"; src = fetchFromGitHub { owner = "sebastianbergmann"; repo = "phpunit"; tag = finalAttrs.version; - hash = "sha256-D64FmqGalhhldMnYXD/IX6uF1a8pG/1PxLTKk6Uuapg="; + hash = "sha256-1623F3F9nGa+6cyBUqa1/gxQ9JqbWpgF9I8nhE0sDSQ="; }; - vendorHash = "sha256-o/ApdPy/gqklwpTWbZh25HXh5sv4S9+xtOV3YNJ4lvs="; + vendorHash = "sha256-GeoLTnPLeq4TPqgWue4Z8AC2AbzkH8NYJ/NrUyYWQ2U="; passthru = { updateScript = nix-update-script { }; From efffe2ad3172a1336c5a629b9e83dbbf1d7f14b7 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Sat, 15 Feb 2025 19:36:24 +0100 Subject: [PATCH 2159/2168] man-pages: use finalAttrs pattern --- pkgs/by-name/ma/man-pages/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/man-pages/package.nix b/pkgs/by-name/ma/man-pages/package.nix index 9154a4759420..66634bbc9f31 100644 --- a/pkgs/by-name/ma/man-pages/package.nix +++ b/pkgs/by-name/ma/man-pages/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "man-pages"; version = "6.9.1"; src = fetchurl { - url = "mirror://kernel/linux/docs/man-pages/${pname}-${version}.tar.xz"; + url = "mirror://kernel/linux/docs/man-pages/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; hash = "sha256-4jy6wp8RC6Vx8NqFI+edNzaRRm7X8qMTAXIYF9NFML0="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { platforms = with platforms; unix; priority = 30; # if a package comes with its own man page, prefer it }; -} +}) From 569d2da01d963edd64f9a21fcd5c789b25a03463 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Sat, 15 Feb 2025 19:38:37 +0100 Subject: [PATCH 2160/2168] man-pages: remove use of with lib; --- pkgs/by-name/ma/man-pages/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/man-pages/package.nix b/pkgs/by-name/ma/man-pages/package.nix index 66634bbc9f31..f7910b6e0c04 100644 --- a/pkgs/by-name/ma/man-pages/package.nix +++ b/pkgs/by-name/ma/man-pages/package.nix @@ -31,11 +31,11 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out/bin ''; - meta = with lib; { + meta = { description = "Linux development manual pages"; homepage = "https://www.kernel.org/doc/man-pages/"; - license = licenses.gpl2Plus; - platforms = with platforms; unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; priority = 30; # if a package comes with its own man page, prefer it }; }) From b75500d4113b98438ca0cb0faeba65512544248c Mon Sep 17 00:00:00 2001 From: happysalada Date: Sat, 15 Feb 2025 13:41:02 -0500 Subject: [PATCH 2161/2168] Revert "tailwindcss_4: init at 4.0.6 (#380210)" This reverts commit 4220d1333d6ccdf22cef1845b1dbc3faeb1c4254, reversing changes made to 3082c71e8da4081bea00d655c5d2ff88a6ac3cb8. --- maintainers/maintainer-list.nix | 5 -- pkgs/by-name/ta/tailwindcss_4/package.nix | 64 ----------------------- pkgs/by-name/ta/tailwindcss_4/update.sh | 30 ----------- 3 files changed, 99 deletions(-) delete mode 100644 pkgs/by-name/ta/tailwindcss_4/package.nix delete mode 100755 pkgs/by-name/ta/tailwindcss_4/update.sh diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b463474ccab5..a438077c23d9 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -574,11 +574,6 @@ githubId = 2071575; name = "Adam C. Stephens"; }; - adamjhf = { - github = "adamjhf"; - githubId = 50264672; - name = "Adam Freeth"; - }; adamt = { email = "mail@adamtulinius.dk"; github = "adamtulinius"; diff --git a/pkgs/by-name/ta/tailwindcss_4/package.nix b/pkgs/by-name/ta/tailwindcss_4/package.nix deleted file mode 100644 index 9dfc8a3967b7..000000000000 --- a/pkgs/by-name/ta/tailwindcss_4/package.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - runCommand, - tailwindcss_4, -}: -let - version = "4.0.6"; - inherit (stdenv.hostPlatform) system; - throwSystem = throw "tailwindcss has not been packaged for ${system} yet."; - - plat = - { - aarch64-darwin = "macos-arm64"; - aarch64-linux = "linux-arm64"; - x86_64-darwin = "macos-x64"; - x86_64-linux = "linux-x64"; - } - .${system} or throwSystem; - - hash = - { - aarch64-darwin = "sha256-FopnfuGYBjjQkfPHdIWacpom9WsAVRwHPQ/14waWR7s="; - aarch64-linux = "sha256-y+9d53skmoSZPhbtk9vUkhKNzIE1A868Lnkw7Cot/PU="; - x86_64-darwin = "sha256-rFjaDtPjJO9W6G//7Uu5CJE+pB0sqLrMByC5pv4FA4E="; - x86_64-linux = "sha256-14EMXenpvPsKlnu5kebNu3MmfWwa7UYfAgEkh5EwVRM="; - } - .${system} or throwSystem; -in -stdenv.mkDerivation { - inherit version; - pname = "tailwindcss_4"; - - src = fetchurl { - url = - "https://github.com/tailwindlabs/tailwindcss/releases/download/v${version}/tailwindcss-" + plat; - inherit hash; - }; - - dontUnpack = true; - dontConfigure = true; - dontBuild = true; - dontFixup = true; - - installPhase = '' - install -D $src $out/bin/tailwindcss - ''; - - passthru.tests.helptext = runCommand "tailwindcss-test-helptext" { } '' - ${tailwindcss_4}/bin/tailwindcss --help > $out - ''; - passthru.updateScript = ./update.sh; - - meta = with lib; { - description = "Command-line tool for the CSS framework with composable CSS classes, standalone v4 CLI"; - homepage = "https://tailwindcss.com/blog/tailwindcss-v4"; - license = licenses.mit; - sourceProvenance = [ sourceTypes.binaryNativeCode ]; - maintainers = [ maintainers.adamjhf ]; - mainProgram = "tailwindcss"; - platforms = platforms.darwin ++ platforms.linux; - }; -} diff --git a/pkgs/by-name/ta/tailwindcss_4/update.sh b/pkgs/by-name/ta/tailwindcss_4/update.sh deleted file mode 100755 index bcf057e6e9b9..000000000000 --- a/pkgs/by-name/ta/tailwindcss_4/update.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused jq nix-prefetch -set -eou pipefail - -ROOT="$(dirname "$(readlink -f "$0")")" - -CURRENT_VERSION=$(nix-instantiate --eval --strict --json -A tailwindcss.version . | jq -r .) -LATEST_VERSION=$(curl --fail --silent https://api.github.com/repos/tailwindlabs/tailwindcss/releases/latest | jq --raw-output .tag_name | sed 's/v//') -sed -i "s/version = \".*\"/version = \"${LATEST_VERSION}\"/" "$ROOT/default.nix" - -if [ "$CURRENT_VERSION" = "$LATEST_VERSION" ]; then - echo "tailwindcss already at latest version $CURRENT_VERSION, exiting" - exit 0 -fi - -function updatePlatform() { - NIXPLAT=$1 - TAILWINDPLAT=$2 - echo "Updating tailwindcss for $NIXPLAT" - - URL="https://github.com/tailwindlabs/tailwindcss/releases/download/v${LATEST_VERSION}/tailwindcss-${TAILWINDPLAT}" - HASH=$(nix hash to-sri --type sha256 "$(nix-prefetch-url --type sha256 "$URL")") - - sed -i "s,$NIXPLAT = \"sha256.*\",$NIXPLAT = \"${HASH}\"," "$ROOT/default.nix" -} - -updatePlatform aarch64-darwin macos-arm64 -updatePlatform aarch64-linux linux-arm64 -updatePlatform x86_64-darwin macos-x64 -updatePlatform x86_64-linux linux-x64 From 5aad5c6d28ce9133159c249c86a50433255daff7 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Sat, 15 Feb 2025 19:44:08 +0100 Subject: [PATCH 2162/2168] man-pages: provide update script --- pkgs/by-name/ma/man-pages/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/ma/man-pages/package.nix b/pkgs/by-name/ma/man-pages/package.nix index f7910b6e0c04..e200c071b97f 100644 --- a/pkgs/by-name/ma/man-pages/package.nix +++ b/pkgs/by-name/ma/man-pages/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + directoryListingUpdater, }: stdenv.mkDerivation (finalAttrs: { @@ -31,6 +32,10 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out/bin ''; + passthru.updateScript = directoryListingUpdater { + url = "https://www.kernel.org/pub/linux/docs/man-pages/"; + }; + meta = { description = "Linux development manual pages"; homepage = "https://www.kernel.org/doc/man-pages/"; From 6b86b540d0d63f3bc53982f42932e9d653e8b223 Mon Sep 17 00:00:00 2001 From: RodEsp <1084688+RodEsp@users.noreply.github.com> Date: Sat, 15 Feb 2025 14:11:58 -0500 Subject: [PATCH 2163/2168] warp-terminal: 0.2025.02.05.08.02.stable_03 -> 0.2025.02.12.16.51.stable_03 --- pkgs/by-name/wa/warp-terminal/versions.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json index eaba5a2558ed..0d0853a17d1a 100644 --- a/pkgs/by-name/wa/warp-terminal/versions.json +++ b/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,14 +1,14 @@ { "darwin": { - "hash": "sha256-Z5NCTgOs49Pld1jRyUngbSgkxuH4LPROx06bf7H0cuE=", - "version": "0.2025.02.05.08.02.stable_03" + "hash": "sha256-XEnwEb7z0NwXpD1OULegdkj9oHP1rPfUw+bxE/DqUSs=", + "version": "0.2025.02.12.16.51.stable_03" }, "linux_x86_64": { - "hash": "sha256-xvckfFXl/ECP5YS/+NZv1UJFkVpIMQ7qnbzM3ffVrmw=", - "version": "0.2025.02.05.08.02.stable_03" + "hash": "sha256-teHHwoijqNi17U1XbZLBKwgn1CDVnOoPk+c+5qfaSEM=", + "version": "0.2025.02.12.16.51.stable_03" }, "linux_aarch64": { - "hash": "sha256-x1U8EyZ+AoLdmF1LdXHEWz28+El/aBhD7JOG/XNaBJY=", - "version": "0.2025.02.05.08.02.stable_03" + "hash": "sha256-lsKkk7XU1uQ1lsbBtENe4vpfbGSozHV3TzClVHP3NxE=", + "version": "0.2025.02.12.16.51.stable_03" } } From 3f0ca40045e9ff0432825a3174eb949de27574d2 Mon Sep 17 00:00:00 2001 From: Antonio Date: Sat, 15 Feb 2025 12:15:16 +0100 Subject: [PATCH 2164/2168] sweet-folders: unstable-2023-03-18 -> 0-unstable-2025-02-15 --- pkgs/by-name/sw/sweet-folders/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sw/sweet-folders/package.nix b/pkgs/by-name/sw/sweet-folders/package.nix index dbbe7a949992..d33df2bd2eb3 100644 --- a/pkgs/by-name/sw/sweet-folders/package.nix +++ b/pkgs/by-name/sw/sweet-folders/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation { pname = "sweet-folders"; - version = "unstable-2023-03-18"; + version = "0-unstable-2025-02-15"; src = fetchFromGitHub { owner = "EliverLara"; repo = "Sweet-folders"; - rev = "b2192ff1412472f036fdf9778c6b9dbcb6c044ec"; - hash = "sha256-QexfqXH5a1IEhKBRjWSMdrEvThvLRzd4M32Xti1DCGE="; + rev = "40a5d36e50437901c7eaa1119bb9ae8006e2fe5c"; + hash = "sha256-Pb3xsNKM5yGT4uAUxrCds1JSSvU/whhTJcmqiM7EW+4="; }; installPhase = '' From 1d7850243f87a4b9f335a23ec71ea3fd51b2f9e8 Mon Sep 17 00:00:00 2001 From: arthsmn Date: Sat, 15 Feb 2025 17:36:32 -0300 Subject: [PATCH 2165/2168] brave: 1.75.175 -> 1.75.178 --- pkgs/by-name/br/brave/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix index be297053ef14..2de8a4321596 100644 --- a/pkgs/by-name/br/brave/package.nix +++ b/pkgs/by-name/br/brave/package.nix @@ -3,24 +3,24 @@ let pname = "brave"; - version = "1.75.175"; + version = "1.75.178"; allArchives = { aarch64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb"; - hash = "sha256-/tzdBTkNF8KtSG36Xs1MC+d//SVcGaQu1ODs9YXBKzc="; + hash = "sha256-e/HdEO8Z3woPGNR646M51En5/IBNh/KOwTjXTQLwOY0="; }; x86_64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - hash = "sha256-IhWUUvms/UMps3KOcOqm5YBRlSfCX/TLYEx7iIp9Nvc="; + hash = "sha256-Fl82K7W3awVxD7cflKVKcPrk4ZA7pxiQabCFlmp0U6w="; }; aarch64-darwin = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip"; - hash = "sha256-laiGVu0rNUMw9ybXGRdJKoUGJ9uo7FoFhekuL0UgtFY="; + hash = "sha256-juijrUlvkxlXXzP/5PY1ngO6EYdcGbxlyMpcEHj6bEU="; }; x86_64-darwin = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip"; - hash = "sha256-wht/l79wLG1Fr4KcbhLbS7AbozWSgKBJconjy1hRBOI="; + hash = "sha256-ipjLpENca6RlccXhd7sX5l8ycMKCFvSp3f2vCmkmcrA="; }; }; From 37005bb1601889adb1741a4101430cc353518c03 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Sat, 15 Feb 2025 22:36:51 +0100 Subject: [PATCH 2166/2168] kappanhang: provide literal repo attribute to fetchFromGitHub --- pkgs/by-name/ka/kappanhang/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ka/kappanhang/package.nix b/pkgs/by-name/ka/kappanhang/package.nix index 7dd736dd30b4..62e76c912db0 100644 --- a/pkgs/by-name/ka/kappanhang/package.nix +++ b/pkgs/by-name/ka/kappanhang/package.nix @@ -13,7 +13,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "nonoo"; - repo = pname; + repo = "kappanhang"; rev = "v${version}"; hash = "sha256-l0V2NVzLsnpPe5EJcr5i9U7OGaYzNRDd1f/ogrdCnvk="; }; From be2a5c11b6b4ff4c7d77b2476ee0a5cd18bae248 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Sat, 15 Feb 2025 19:44:47 +0100 Subject: [PATCH 2167/2168] man-pages: 6.9.1 -> 6.11 --- pkgs/by-name/ma/man-pages/package.nix | 31 ++++++++++++++------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/ma/man-pages/package.nix b/pkgs/by-name/ma/man-pages/package.nix index e200c071b97f..294db9387354 100644 --- a/pkgs/by-name/ma/man-pages/package.nix +++ b/pkgs/by-name/ma/man-pages/package.nix @@ -7,29 +7,30 @@ stdenv.mkDerivation (finalAttrs: { pname = "man-pages"; - version = "6.9.1"; + version = "6.11"; src = fetchurl { - url = "mirror://kernel/linux/docs/man-pages/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; - hash = "sha256-4jy6wp8RC6Vx8NqFI+edNzaRRm7X8qMTAXIYF9NFML0="; + url = "mirror://kernel/linux/docs/man-pages/man-pages-${finalAttrs.version}.tar.xz"; + hash = "sha256-3aou2i6NKG++wiHRFfEtP/9dNsxQZs3+zI0koljVixk="; }; + dontBuild = true; + enableParallelInstalling = true; + makeFlags = [ + "-R" + "VERSION=${finalAttrs.version}" "prefix=${placeholder "out"}" ]; - dontBuild = true; - - outputDocdev = "out"; - - enableParallelInstalling = true; - - postInstall = '' - # The manpath executable looks up manpages from PATH. And this package won't - # appear in PATH unless it has a /bin folder. Without the change - # 'nix-shell -p man-pages' does not pull in the search paths. - # See 'man 5 manpath' for the lookup order. - mkdir -p $out/bin + preConfigure = '' + # If not provided externally, the makefile will attempt to determine the + # date and time of the release from the Git repository log, which is not + # available in the distributed tarball. We therefore supply it from + # $SOURCE_DATE_EPOCH, which is based on the most recent modification time + # of all source files. Cf. + # nixpkgs/pkgs/build-support/setup-hooks/set-source-date-epoch-to-latest.sh + export DISTDATE="$(date --utc --date="@$SOURCE_DATE_EPOCH")" ''; passthru.updateScript = directoryListingUpdater { From 0bf298395140d9696ba7d46d8871f16020c8a656 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Sat, 15 Feb 2025 20:27:56 +0100 Subject: [PATCH 2168/2168] man-pages: provide simple install check --- pkgs/by-name/ma/man-pages/package.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/by-name/ma/man-pages/package.nix b/pkgs/by-name/ma/man-pages/package.nix index 294db9387354..f95b65867e4d 100644 --- a/pkgs/by-name/ma/man-pages/package.nix +++ b/pkgs/by-name/ma/man-pages/package.nix @@ -3,6 +3,7 @@ stdenv, fetchurl, directoryListingUpdater, + man, }: stdenv.mkDerivation (finalAttrs: { @@ -14,8 +15,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-3aou2i6NKG++wiHRFfEtP/9dNsxQZs3+zI0koljVixk="; }; + nativeInstallCheckInputs = [ man ]; + dontBuild = true; enableParallelInstalling = true; + doInstallCheck = true; makeFlags = [ "-R" @@ -33,6 +37,17 @@ stdenv.mkDerivation (finalAttrs: { export DISTDATE="$(date --utc --date="@$SOURCE_DATE_EPOCH")" ''; + installCheckPhase = '' + runHook preInstallCheck + + # Check for a few well‐known man pages + for page in ldd write printf null hosts random ld.so; do + man -M "$out/share/man" -P cat "$page" >/dev/null + done + + runHook postInstallCheck + ''; + passthru.updateScript = directoryListingUpdater { url = "https://www.kernel.org/pub/linux/docs/man-pages/"; };