diff options
119 files changed, 2868 insertions, 1684 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f7204627ada38..58e31f454f065 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11576,6 +11576,11 @@ githubId = 4158274; name = "Michiel Leenaars"; }; + legojames = { + github = "jrobinson-uk"; + githubId = 4701504; + name = "James Robinson"; + }; leifhelm = { email = "jakob.leifhelm@gmail.com"; github = "leifhelm"; diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index e9ef9c2e6d5c7..93d3816d077d5 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -30,6 +30,8 @@ `services.forgejo.secrets` is a small wrapper over systemd's `LoadCredential=`. It has the same structure (sections/keys) as `services.forgejo.settings` but takes file paths that will be read before service startup instead of some plaintext value. +- `services.ddclient.use` has been deprecated: `ddclient` now supports separate IPv4 and IPv6 configuration. Use `services.ddclient.usev4` and `services.ddclient.usev6` instead. + - The Invoiceplane module now only accepts the structured `settings` option. `extraConfig` is now removed. diff --git a/nixos/modules/services/desktop-managers/lomiri.nix b/nixos/modules/services/desktop-managers/lomiri.nix index 214ec17e0dc43..eec33597dc711 100644 --- a/nixos/modules/services/desktop-managers/lomiri.nix +++ b/nixos/modules/services/desktop-managers/lomiri.nix @@ -22,6 +22,7 @@ in { libusermetrics lomiri lomiri-download-manager + lomiri-filemanager-app lomiri-schemas # exposes some required dbus interfaces lomiri-session # wrappers to properly launch the session lomiri-sounds @@ -36,6 +37,10 @@ in { suru-icon-theme # telephony-service # currently broken: https://github.com/NixOS/nixpkgs/pull/314043 ]); + variables = { + # To override the keyboard layouts in Lomiri + NIXOS_XKB_LAYOUTS = config.services.xserver.xkb.layout; + }; }; hardware.pulseaudio.enable = lib.mkDefault true; diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix index b912550e1155e..272a50eb92de8 100644 --- a/nixos/modules/services/networking/ddclient.nix +++ b/nixos/modules/services/networking/ddclient.nix @@ -11,7 +11,9 @@ let # This file can be used as a template for configFile or is automatically generated by Nix options. cache=${dataDir}/ddclient.cache foreground=YES - use=${cfg.use} + ${lib.optionalString (cfg.use != "") "use=${cfg.use}"} + ${lib.optionalString (cfg.use == "" && cfg.usev4 != "") "usev4=${cfg.usev4}"} + ${lib.optionalString (cfg.use == "" && cfg.usev6 != "") "usev6=${cfg.usev6}"} login=${cfg.username} password=${if cfg.protocol == "nsupdate" then "/run/${RuntimeDirectory}/ddclient.key" else "@password_placeholder@"} protocol=${cfg.protocol} @@ -163,12 +165,26 @@ with lib; }; use = mkOption { - default = "web, web=checkip.dyndns.com/, web-skip='Current IP Address: '"; + default = ""; type = str; description = '' Method to determine the IP address to send to the dynamic DNS provider. ''; }; + usev4 = mkOption { + default = "webv4, webv4=checkip.dyndns.com/, webv4-skip='Current IP Address: '"; + type = str; + description = '' + Method to determine the IPv4 address to send to the dynamic DNS provider. Only used if `use` is not set. + ''; + }; + usev6 = mkOption { + default = "webv6, webv6=checkipv6.dyndns.com/, webv6-skip='Current IP Address: '"; + type = str; + description = '' + Method to determine the IPv6 address to send to the dynamic DNS provider. Only used if `use` is not set. + ''; + }; verbose = mkOption { default = false; @@ -204,6 +220,8 @@ with lib; ###### implementation config = mkIf config.services.ddclient.enable { + warnings = lib.optional (cfg.use != "") "Setting `use` is deprecated, ddclient now supports `usev4` and `usev6` for separate IPv4/IPv6 configuration."; + systemd.services.ddclient = { description = "Dynamic DNS Client"; wantedBy = [ "multi-user.target" ]; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index aa7e007e4fddb..ddeeeb298c356 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -516,6 +516,7 @@ in { lxd-image-server = handleTest ./lxd-image-server.nix {}; #logstash = handleTest ./logstash.nix {}; lomiri = handleTest ./lomiri.nix {}; + lomiri-filemanager-app = runTest ./lomiri-filemanager-app.nix; lomiri-system-settings = handleTest ./lomiri-system-settings.nix {}; lorri = handleTest ./lorri/default.nix {}; maddy = discoverTests (import ./maddy { inherit handleTest; }); diff --git a/nixos/tests/lomiri-filemanager-app.nix b/nixos/tests/lomiri-filemanager-app.nix new file mode 100644 index 0000000000000..de42c9d150894 --- /dev/null +++ b/nixos/tests/lomiri-filemanager-app.nix @@ -0,0 +1,48 @@ +{ pkgs, lib, ... }: +{ + name = "lomiri-filemanager-app-standalone"; + meta.maintainers = lib.teams.lomiri.members; + + nodes.machine = + { config, pkgs, ... }: + { + imports = [ ./common/x11.nix ]; + + services.xserver.enable = true; + + environment = { + systemPackages = with pkgs.lomiri; [ + suru-icon-theme + lomiri-filemanager-app + ]; + variables = { + UITK_ICON_THEME = "suru"; + }; + }; + + i18n.supportedLocales = [ "all" ]; + + fonts.packages = with pkgs; [ + # Intended font & helps with OCR + ubuntu_font_family + ]; + }; + + enableOCR = true; + + testScript = '' + machine.wait_for_x() + + with subtest("lomiri filemanager launches"): + machine.execute("lomiri-filemanager-app >&2 &") + machine.wait_for_text(r"(filemanager.ubports|alice|items|directories|files|folder)") + machine.screenshot("lomiri-filemanager_open") + + machine.succeed("pkill -f lomiri-filemanager-app") + + with subtest("lomiri filemanager localisation works"): + machine.execute("env LANG=de_DE.UTF-8 lomiri-filemanager-app >&2 &") + machine.wait_for_text(r"(Elemente|Verzeichnisse|Dateien|Ordner)") + machine.screenshot("lomiri-filemanager_localised") + ''; +} diff --git a/nixos/tests/lomiri.nix b/nixos/tests/lomiri.nix index 99f04a303be31..e9134a202cd17 100644 --- a/nixos/tests/lomiri.nix +++ b/nixos/tests/lomiri.nix @@ -268,7 +268,7 @@ in { machine.screenshot("settings_content-hub_peers") # Select Morph as content source - mouse_click(300, 100) + mouse_click(370, 100) # Expect Morph to be brought into the foreground, with its Downloads page open machine.wait_for_text("No downloads") diff --git a/pkgs/applications/audio/pyradio/default.nix b/pkgs/applications/audio/pyradio/default.nix index 7f6d3c87e5ba6..6e07d531514ce 100644 --- a/pkgs/applications/audio/pyradio/default.nix +++ b/pkgs/applications/audio/pyradio/default.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "pyradio"; - version = "0.9.3.7"; + version = "0.9.3.9"; src = fetchFromGitHub { owner = "coderholic"; repo = "pyradio"; rev = "refs/tags/${version}"; - hash = "sha256-NwDVytD6nIM++ixGmLh02FIE+hLKHBwwD3aEAXVZn7I="; + hash = "sha256-EoHCOg4nPkKRSFX/3AUKJaXzS6J1quwtv+mKeKBu5Ns="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/backup/timeshift/unwrapped.nix b/pkgs/applications/backup/timeshift/unwrapped.nix index dd0cff4d55553..74fff5fb87ed2 100644 --- a/pkgs/applications/backup/timeshift/unwrapped.nix +++ b/pkgs/applications/backup/timeshift/unwrapped.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "timeshift"; - version = "24.01.1"; + version = "24.06.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = "timeshift"; rev = version; - hash = "sha256-vAKUR0VsOuiQmB+1jPOR0KufzfXaxAsf3EOPzdgFt0A="; + hash = "sha256-H4PCZ1WwNg34WSDXgmH6pUPBglXafLTFfIzvmWiyeCw="; }; patches = [ diff --git a/pkgs/applications/editors/jetbrains/bin/versions.json b/pkgs/applications/editors/jetbrains/bin/versions.json index 8fc5468aa5882..00c1d864db255 100644 --- a/pkgs/applications/editors/jetbrains/bin/versions.json +++ b/pkgs/applications/editors/jetbrains/bin/versions.json @@ -3,18 +3,18 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", - "version": "2024.1.1", - "sha256": "299ff2eb9c91282df074c58c0ecf73ecf59c7d077bc309f085229eaa32fbd46d", - "url": "https://download.jetbrains.com/cpp/CLion-2024.1.1.tar.gz", - "build_number": "241.15989.121" + "version": "2024.1.2", + "sha256": "2353c1ea5e0fc82b37f4ac33e11cf16e22750e5a1dfa96ab5bc0e0467d1c0abf", + "url": "https://download.jetbrains.com/cpp/CLion-2024.1.2.tar.gz", + "build_number": "241.17011.124" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz", - "version": "2024.1.2", - "sha256": "449ca450179bda3a342f92ff0fe44e52b51c11adcda4d2836a215282ffc0fc95", - "url": "https://download.jetbrains.com/datagrip/datagrip-2024.1.2.tar.gz", - "build_number": "241.15989.49" + "version": "2024.1.3", + "sha256": "c1a651df7d681e9f87091aea2702f2423e526dd8472108f6b8d748e56bf8be02", + "url": "https://download.jetbrains.com/datagrip/datagrip-2024.1.3.tar.gz", + "build_number": "241.17011.41" }, "dataspell": { "update-channel": "DataSpell RELEASE", @@ -27,34 +27,34 @@ "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz", - "version": "2024.1.1", - "sha256": "d83df71dacb8d71cd7af6ca06267b7006b9172d121b316a8a3ad41db7c870193", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.1.1.tar.gz", - "build_number": "241.15989.158" + "version": "2024.1.2", + "sha256": "d0ca5471d4e445ea931b25d1ee55cec0c40bb455de1aec861d5aa5ca0bbc176d", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.1.2.tar.gz", + "build_number": "241.17011.87" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", - "version": "2024.1.1", - "sha256": "d952641bb05a38c771ae64b381f7d3735e20695df89180cc7f5ba9b31c0e437d", - "url": "https://download.jetbrains.com/go/goland-2024.1.1.tar.gz", - "build_number": "241.15989.157" + "version": "2024.1.2", + "sha256": "c20da56fe8f593f0620c741571fe149552f7472b9ab940da85f135c14067e14a", + "url": "https://download.jetbrains.com/go/goland-2024.1.2.tar.gz", + "build_number": "241.17011.92" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz", - "version": "2024.1.1", - "sha256": "4d4221630c4d1dcb9f198370f82d9364014a4a624684ad8b3958be9f01eb656a", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.1.1.tar.gz", - "build_number": "241.15989.150" + "version": "2024.1.2", + "sha256": "042f5510d9680fe325549ed0b3dbff2b0687a10994a1f491e81a5798d8396ed9", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.1.2.tar.gz", + "build_number": "241.17011.79" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz", - "version": "2024.1.1", - "sha256": "d78b5ad0cf8325ca0659aae36b9979a581dab6cf8c7cd127cfb7f86440f282c9", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.1.1.tar.gz", - "build_number": "241.15989.150" + "version": "2024.1.2", + "sha256": "c50ed70f90c69a7e6eaafab44d926d554aafbd7310608570e4085d97df3bf763", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.1.2.tar.gz", + "build_number": "241.17011.79" }, "mps": { "update-channel": "MPS RELEASE", @@ -67,85 +67,85 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", - "version": "2024.1.1", - "sha256": "bb3d10d5ce7419f5123937bcd40f1584fca4b844a2f83b6850fec57cd1f44282", - "url": "https://download.jetbrains.com/webide/PhpStorm-2024.1.1.tar.gz", - "build_number": "241.15989.102", + "version": "2024.1.2", + "sha256": "d7500a11166dd59744e27a939bd92702e26b5388341d15a5235d7eb721835b83", + "url": "https://download.jetbrains.com/webide/PhpStorm-2024.1.2.tar.gz", + "build_number": "241.17011.119", "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.1.1", - "sha256": "715f30966c5597adc6ef544051a796de8a6cc5a5182938b8e14a1e6ad5e5edfd", - "url": "https://download.jetbrains.com/python/pycharm-community-2024.1.1.tar.gz", - "build_number": "241.15989.155" + "version": "2024.1.2", + "sha256": "567065b35b6e34ced0696079e86aaa8a25ae7b36920e66e6a10bdd718ff613e3", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.1.2.tar.gz", + "build_number": "241.17011.127" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz", - "version": "2024.1.1", - "sha256": "b7e12b8d16164137f4cb0677fcac18af78aa117d33c511cce3fcf3972b4e3b17", - "url": "https://download.jetbrains.com/python/pycharm-professional-2024.1.1.tar.gz", - "build_number": "241.15989.155" + "version": "2024.1.2", + "sha256": "d6aadca9c2c0b158b62340d815e8236b93f733ab03052b25b809fe8277115e72", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.1.2.tar.gz", + "build_number": "241.17011.127" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz", - "version": "2024.1.1", - "sha256": "390967705d8e13f39754cbf39a9bec2bb33c6d0f8eeffcdb3d68a5c9ced696ea", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1.1.tar.gz", - "build_number": "241.14494.325" + "version": "2024.1.2", + "sha256": "befb1d1bc74925b81382189d7dedfd8fadf92a9726da247e8854a249d24101a1", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1.2.tar.gz", + "build_number": "241.15989.179" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz", - "version": "2024.1.1", - "sha256": "32e324e976c63e6f5897b392469240382baf5ab94c700b7f75c4a575a1f5d1dc", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.1.1.tar.gz", - "build_number": "241.15989.113" + "version": "2024.1.2", + "sha256": "d8c22d141a3df6858b7e00d20bec5e02cbc7407cb73b30d757a9ebc598af53e6", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.1.2.tar.gz", + "build_number": "241.17011.76" }, "rust-rover": { - "update-channel": "RustRover EAP", + "update-channel": "RustRover RELEASE", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.tar.gz", - "version": "2024.1 EAP", - "sha256": "10a904c833990c4621f919a36d31744dd1700dce42ff3addbc909937b6f6329d", - "url": "https://download.jetbrains.com/rustrover/RustRover-241.15989.101.tar.gz", - "build_number": "241.15989.101" + "version": "2024.1", + "sha256": "94b4107b4ff74f1efbf9255a277933578a7244ef7f4d362bef613ed14578d56c", + "url": "https://download.jetbrains.com/rustrover/RustRover-2024.1.tar.gz", + "build_number": "241.15989.199" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", - "version": "2024.1.2", - "sha256": "10110ac54ab7db1ca4560f83fdb921ca6217437dba1ad4ceb1c6cf0887ec5f29", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1.2.tar.gz", - "build_number": "241.15989.105" + "version": "2024.1.3", + "sha256": "f5c5b1e8e310213110b5d4513828be057b513944c401c9710bde364f226c2024", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1.3.tar.gz", + "build_number": "241.17011.90" }, "writerside": { "update-channel": "Writerside EAP", "url-template": "https://download.jetbrains.com/writerside/writerside-{version}.tar.gz", "version": "2024.1 EAP", - "sha256": "24da41b0eb4ca23652d05ecbccc5d2c792c3d49a964d8b6eb765ccd9cbcc7c3d", - "url": "https://download.jetbrains.com/writerside/writerside-241.15989.11.tar.gz", - "build_number": "241.15989.11" + "sha256": "efb69c46ab8f3a461c42d5b6d4f7e843d01f584ae97030110d36d71de453e320", + "url": "https://download.jetbrains.com/writerside/writerside-241.16003.85.tar.gz", + "build_number": "241.16003.85" } }, "aarch64-linux": { "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.tar.gz", - "version": "2024.1.1", - "sha256": "2323f3b64f690b0b099cdcb14ef6b80440abafda1c0113a6b96df9656167e638", - "url": "https://download.jetbrains.com/cpp/CLion-2024.1.1-aarch64.tar.gz", - "build_number": "241.15989.121" + "version": "2024.1.2", + "sha256": "1c2b87c9610d5151e1b5e3840cf2ffd95ab84a3fdd3c210e29ecd755a2b46673", + "url": "https://download.jetbrains.com/cpp/CLion-2024.1.2-aarch64.tar.gz", + "build_number": "241.17011.124" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.tar.gz", - "version": "2024.1.2", - "sha256": "98b9a89ba49fa16376dbdec01412893635465a67ee482c80f9c48e10dcf0bead", - "url": "https://download.jetbrains.com/datagrip/datagrip-2024.1.2-aarch64.tar.gz", - "build_number": "241.15989.49" + "version": "2024.1.3", + "sha256": "0dd09e55c2a8b2677afc66c661c5e571672cc9c35a186544500b20cbfae0fa7b", + "url": "https://download.jetbrains.com/datagrip/datagrip-2024.1.3-aarch64.tar.gz", + "build_number": "241.17011.41" }, "dataspell": { "update-channel": "DataSpell RELEASE", @@ -158,34 +158,34 @@ "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.tar.gz", - "version": "2024.1.1", - "sha256": "6ea42d3605f5dc25b67b5254947bb3cd1a3cce7e81520ae5f486224bbbbc5de3", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.1.1-aarch64.tar.gz", - "build_number": "241.15989.158" + "version": "2024.1.2", + "sha256": "ca3983e280d2184ce806741d47c72fb9d8e3610c89ee7e56940960a8385b473b", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.1.2-aarch64.tar.gz", + "build_number": "241.17011.87" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.tar.gz", - "version": "2024.1.1", - "sha256": "d5577561744d4cedf7c092acde9faafbcd57527678693a964517383cdf831eeb", - "url": "https://download.jetbrains.com/go/goland-2024.1.1-aarch64.tar.gz", - "build_number": "241.15989.157" + "version": "2024.1.2", + "sha256": "300db30f8618e1fb255a81e4d286246ceb6a278765763522757afc1e224d4797", + "url": "https://download.jetbrains.com/go/goland-2024.1.2-aarch64.tar.gz", + "build_number": "241.17011.92" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.tar.gz", - "version": "2024.1.1", - "sha256": "ae95111e01ce8f2f6dc0083306f121d8eb229dc001f1a5f0d69e4d20b2bc1d3c", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.1.1-aarch64.tar.gz", - "build_number": "241.15989.150" + "version": "2024.1.2", + "sha256": "6cfb94c9fc47955e5e13a0a97304e776717f243c4890a16d15f9c975d0cf60d5", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.1.2-aarch64.tar.gz", + "build_number": "241.17011.79" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.tar.gz", - "version": "2024.1.1", - "sha256": "4cec9ac0fbc1468708a9ae226a94d0ad1ef73829d49537d4363abd2ecda4bc62", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.1.1-aarch64.tar.gz", - "build_number": "241.15989.150" + "version": "2024.1.2", + "sha256": "03555e56e193e023b07ba4bcfefa31a820d3819532c5616cd7b21a33099a41c1", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.1.2-aarch64.tar.gz", + "build_number": "241.17011.79" }, "mps": { "update-channel": "MPS RELEASE", @@ -198,85 +198,85 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.tar.gz", - "version": "2024.1.1", - "sha256": "c1ff0b85679cee8c17ee3ea4b19ccb3278540821c7162354bee900d95cbc52a4", - "url": "https://download.jetbrains.com/webide/PhpStorm-2024.1.1-aarch64.tar.gz", - "build_number": "241.15989.102", + "version": "2024.1.2", + "sha256": "cf5da58e9f0601ef847cff3789e8d3b638076bd9e6af9c6e9c74655aef9656cd", + "url": "https://download.jetbrains.com/webide/PhpStorm-2024.1.2-aarch64.tar.gz", + "build_number": "241.17011.119", "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.1.1", - "sha256": "525c18749d9e2abd3ae2abea68c6be202348a9a026077f5782042baf12acf100", - "url": "https://download.jetbrains.com/python/pycharm-community-2024.1.1-aarch64.tar.gz", - "build_number": "241.15989.155" + "version": "2024.1.2", + "sha256": "21b886929a9512cbda5dd9d4c75be331b3b0a55d087bb4b6a8fc7df7f9e8bd95", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.1.2-aarch64.tar.gz", + "build_number": "241.17011.127" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.tar.gz", - "version": "2024.1.1", - "sha256": "141fbfb473e78270ec161f938963c77cdaad16cfc32985b9ec7a70fdb5e3e0bc", - "url": "https://download.jetbrains.com/python/pycharm-professional-2024.1.1-aarch64.tar.gz", - "build_number": "241.15989.155" + "version": "2024.1.2", + "sha256": "0b9a8ed79faef64a8b993ebb8e7980819c6f3cc10d701d8273d39a6d8c369e73", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.1.2-aarch64.tar.gz", + "build_number": "241.17011.127" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.tar.gz", - "version": "2024.1.1", - "sha256": "9f079193067cf1e4595a5142bb2341187e8730f3551b4583c940f2822d9c5be2", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1.1-aarch64.tar.gz", - "build_number": "241.14494.325" + "version": "2024.1.2", + "sha256": "70271706189f366057935a903d5f5a7b60b7f807affb66657b4b106f714db684", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1.2-aarch64.tar.gz", + "build_number": "241.15989.179" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.tar.gz", - "version": "2024.1.1", - "sha256": "87c7c6f86cc0337311eea595ee0754bcce3f4e88579c1f022abca19037ba7c51", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.1.1-aarch64.tar.gz", - "build_number": "241.15989.113" + "version": "2024.1.2", + "sha256": "e82df5f27e35b92341ee66a4859eedf0b4aef0b8eed9ab5b17e3e86400607f93", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.1.2-aarch64.tar.gz", + "build_number": "241.17011.76" }, "rust-rover": { - "update-channel": "RustRover EAP", + "update-channel": "RustRover RELEASE", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.tar.gz", - "version": "2024.1 EAP", - "sha256": "6ee90aee367cd9ecc8db99020133e17299113c1e016b3344a4762eb8b954317a", - "url": "https://download.jetbrains.com/rustrover/RustRover-241.15989.101-aarch64.tar.gz", - "build_number": "241.15989.101" + "version": "2024.1", + "sha256": "1c10994bc33d62f935b1fb5a9234ec572e091dd716b48a5ea54d514da5461788", + "url": "https://download.jetbrains.com/rustrover/RustRover-2024.1-aarch64.tar.gz", + "build_number": "241.15989.199" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.tar.gz", - "version": "2024.1.2", - "sha256": "de1443570d2769e5dae11da2c3a8049c438f6f16b598a214ab000a300c148476", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1.2-aarch64.tar.gz", - "build_number": "241.15989.105" + "version": "2024.1.3", + "sha256": "42913d1ad9db6f528aeb8e61125bc28a9df4d732d3cd7c6f7ff0d2f92d25d0c1", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1.3-aarch64.tar.gz", + "build_number": "241.17011.90" }, "writerside": { "update-channel": "Writerside EAP", "url-template": "https://download.jetbrains.com/writerside/writerside-{version}-aarch64.tar.gz", "version": "2024.1 EAP", - "sha256": "9b72a2422f2cb1f2bb2034ef4eaf130ee7a9062cf99ba53b8df62cc4e1c76c42", - "url": "https://download.jetbrains.com/writerside/writerside-241.15989.11-aarch64.tar.gz", - "build_number": "241.15989.11" + "sha256": "d9f764a8fcbdf13e67f1f152f790c38602792b07fdfd7a8935d320ed8ae68921", + "url": "https://download.jetbrains.com/writerside/writerside-241.16003.85-aarch64.tar.gz", + "build_number": "241.16003.85" } }, "x86_64-darwin": { "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg", - "version": "2024.1.1", - "sha256": "43a765102080acd6dc1fa5a26e0c5efcc3d2e7a22a0bf054a3b9ba4714a9c43e", - "url": "https://download.jetbrains.com/cpp/CLion-2024.1.1.dmg", - "build_number": "241.15989.121" + "version": "2024.1.2", + "sha256": "64229eecc45010f8535478e5b03b36d46bda8eb245cb6967ff130fb828c6ac38", + "url": "https://download.jetbrains.com/cpp/CLion-2024.1.2.dmg", + "build_number": "241.17011.124" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg", - "version": "2024.1.2", - "sha256": "41a4dabdd2ad97387d806742c41b34e5a1544860c159f5d71c09b00a1e605356", - "url": "https://download.jetbrains.com/datagrip/datagrip-2024.1.2.dmg", - "build_number": "241.15989.49" + "version": "2024.1.3", + "sha256": "9b37f5943532c5413179043721290f292be23a9baaccb6d42c5b31ae70af8ca2", + "url": "https://download.jetbrains.com/datagrip/datagrip-2024.1.3.dmg", + "build_number": "241.17011.41" }, "dataspell": { "update-channel": "DataSpell RELEASE", @@ -289,34 +289,34 @@ "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg", - "version": "2024.1.1", - "sha256": "0e230192d3532e4740a354bf7f58ae2efd4036607cb9ef4eaf4cca1ca0354df0", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.1.1.dmg", - "build_number": "241.15989.158" + "version": "2024.1.2", + "sha256": "be7e34b5a4a4e28b90c3d90f5761767d3d6e996cdc5846d3f8bd0e05d3ee0f1a", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.1.2.dmg", + "build_number": "241.17011.87" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", - "version": "2024.1.1", - "sha256": "189d8582a0474e1f6eac858f3528af85d6ca36918d659f66edf2fd26d70b07af", - "url": "https://download.jetbrains.com/go/goland-2024.1.1.dmg", - "build_number": "241.15989.157" + "version": "2024.1.2", + "sha256": "814776bafe395942d524d6c57d78f355df89b20ef6edd5d2f789a03b898e60a2", + "url": "https://download.jetbrains.com/go/goland-2024.1.2.dmg", + "build_number": "241.17011.92" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg", - "version": "2024.1.1", - "sha256": "b38881e1db85082fe167b24e7022aef958a9129bf07b56aff47ec43ac894c427", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.1.1.dmg", - "build_number": "241.15989.150" + "version": "2024.1.2", + "sha256": "f946074a97ea310ff3cd44c6d187e928018a55a3b98b114c070fc3f86df76fed", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.1.2.dmg", + "build_number": "241.17011.79" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", - "version": "2024.1.1", - "sha256": "2a32561669c4f21ed134006d4fe9c948881dc3b8e12c00f11c1616952f6975cc", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.1.1.dmg", - "build_number": "241.15989.150" + "version": "2024.1.2", + "sha256": "90d03ba4564e23cdcb5c77b2e0812302d1df21b7811998490abae1b18b39007c", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.1.2.dmg", + "build_number": "241.17011.79" }, "mps": { "update-channel": "MPS RELEASE", @@ -329,85 +329,85 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", - "version": "2024.1.1", - "sha256": "0232f3e562698bbacf8c72446fc868d50d2b308ce17b6a0655fe351b46370fa4", - "url": "https://download.jetbrains.com/webide/PhpStorm-2024.1.1.dmg", - "build_number": "241.15989.102", + "version": "2024.1.2", + "sha256": "1b1318acb34358478deab7d8e64f8e37f31d5118939678f497bda9c33fe2d2d8", + "url": "https://download.jetbrains.com/webide/PhpStorm-2024.1.2.dmg", + "build_number": "241.17011.119", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg", - "version": "2024.1.1", - "sha256": "73485ede957df2dc5c4a2936aa6d380fefccf1f5523407a1ad22ef6d757901d5", - "url": "https://download.jetbrains.com/python/pycharm-community-2024.1.1.dmg", - "build_number": "241.15989.155" + "version": "2024.1.2", + "sha256": "6055b9fe2a3e3ad906c160300b469cf4698e4fd1151c94e555f2ede423cc03a7", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.1.2.dmg", + "build_number": "241.17011.127" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg", - "version": "2024.1.1", - "sha256": "3acd4e5f9d78229cc70664f25068732f7e0b7afa7f8895280e9698870e5cdccb", - "url": "https://download.jetbrains.com/python/pycharm-professional-2024.1.1.dmg", - "build_number": "241.15989.155" + "version": "2024.1.2", + "sha256": "05a684d1fa1d0a9dc292110f07533c6bb8db558f716306b255cfef543c0be873", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.1.2.dmg", + "build_number": "241.17011.127" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg", - "version": "2024.1.1", - "sha256": "1c6f52b9629f77ca6a2f903fbadaae9dc80237b061dfeb94638d029a43bdf0c5", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1.1.dmg", - "build_number": "241.14494.325" + "version": "2024.1.2", + "sha256": "303da9bf04e6fcb5b4f12d6af0033120a6a1fe878c6a20eb9bf0a61c0f8f3ba8", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1.2.dmg", + "build_number": "241.15989.179" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg", - "version": "2024.1.1", - "sha256": "839fe79e93a293a514e8abdaec60ca9a79cddb889fe4fe1287e2b74540a9ec57", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.1.1.dmg", - "build_number": "241.15989.113" + "version": "2024.1.2", + "sha256": "17080d127951d0ccf1e137bc65c72ab186d0fae2c0d95bc30763486a26ff12ef", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.1.2.dmg", + "build_number": "241.17011.76" }, "rust-rover": { - "update-channel": "RustRover EAP", + "update-channel": "RustRover RELEASE", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.dmg", - "version": "2024.1 EAP", - "sha256": "c0b5885e7d85cc89d79110b4a56c3a08784c43b03e42686ec91cd4679bf9f469", - "url": "https://download.jetbrains.com/rustrover/RustRover-241.15989.101.dmg", - "build_number": "241.15989.101" + "version": "2024.1", + "sha256": "b905cc1e897cacc61da7422182a96b551a6412dbff75208d2491c0edcf0f3f12", + "url": "https://download.jetbrains.com/rustrover/RustRover-2024.1.dmg", + "build_number": "241.15989.199" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", - "version": "2024.1.2", - "sha256": "a5b79c530596bcef503847ea38a11263c871a9f8267d2e4fe4ef025c166d144f", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1.2.dmg", - "build_number": "241.15989.105" + "version": "2024.1.3", + "sha256": "ee0fb307ed4cb6bddd7e6d5cbd29a9ce57744c03f43efc0789a5484e6793a10a", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1.3.dmg", + "build_number": "241.17011.90" }, "writerside": { "update-channel": "Writerside EAP", "url-template": "https://download.jetbrains.com/writerside/writerside-{version}.dmg", "version": "2024.1 EAP", - "sha256": "36ec40a47989be9ab263f4b9f182fcc5b155f3fd068174e7539adc55f892b230", - "url": "https://download.jetbrains.com/writerside/writerside-241.15989.11.dmg", - "build_number": "241.15989.11" + "sha256": "a9ad84d95ad86b38f35bec25032235b907e19ddf3ef696404f4341650a7eb7b1", + "url": "https://download.jetbrains.com/writerside/writerside-241.16003.85.dmg", + "build_number": "241.16003.85" } }, "aarch64-darwin": { "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg", - "version": "2024.1.1", - "sha256": "08dab457cf1cb07e4489653f22a12e2997dea2b788ab0a5494de40a86b39f104", - "url": "https://download.jetbrains.com/cpp/CLion-2024.1.1-aarch64.dmg", - "build_number": "241.15989.121" + "version": "2024.1.2", + "sha256": "4a52d7d438eb8899d1ad8ab5cc619954bad7d64be04903aa6889ec3d4f126a92", + "url": "https://download.jetbrains.com/cpp/CLion-2024.1.2-aarch64.dmg", + "build_number": "241.17011.124" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg", - "version": "2024.1.2", - "sha256": "583c32f39918681673028a20cb911a41fc4495cf44c151c0790594042ec9e160", - "url": "https://download.jetbrains.com/datagrip/datagrip-2024.1.2-aarch64.dmg", - "build_number": "241.15989.49" + "version": "2024.1.3", + "sha256": "9fb1c0528209a1d32857b61b1e6910472b4f7316f8ec7ee0e3dfd2baeb164c06", + "url": "https://download.jetbrains.com/datagrip/datagrip-2024.1.3-aarch64.dmg", + "build_number": "241.17011.41" }, "dataspell": { "update-channel": "DataSpell RELEASE", @@ -420,34 +420,34 @@ "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg", - "version": "2024.1.1", - "sha256": "c82e70fd6688c218da7a541ac0a0d06652389112f73a667964ee7a8e0a5bfc44", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.1.1-aarch64.dmg", - "build_number": "241.15989.158" + "version": "2024.1.2", + "sha256": "70aab722715cb1abbab01e25109b6ca967588bcf3c1cec666986e42b825b0d9d", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.1.2-aarch64.dmg", + "build_number": "241.17011.87" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", - "version": "2024.1.1", - "sha256": "c04972578b92b2e8a9c0dfa52c01f09d9ed8640f12cf17e454d37ae6bea24a4a", - "url": "https://download.jetbrains.com/go/goland-2024.1.1-aarch64.dmg", - "build_number": "241.15989.157" + "version": "2024.1.2", + "sha256": "a9949e40786f0608e3438def31a7ca4f1b762fbb4f5a1560d8bdb1bbe0376fa4", + "url": "https://download.jetbrains.com/go/goland-2024.1.2-aarch64.dmg", + "build_number": "241.17011.92" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg", - "version": "2024.1.1", - "sha256": "fc5bdc7c325708d0754d9bd4868db02c1c3b9a14e910dd641b76478e5b805441", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.1.1-aarch64.dmg", - "build_number": "241.15989.150" + "version": "2024.1.2", + "sha256": "aaa128079c795a1a3b6539e151283d55d8cef66ad833c4f5ff1b799b8e633d07", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.1.2-aarch64.dmg", + "build_number": "241.17011.79" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg", - "version": "2024.1.1", - "sha256": "bc1d350f18c493cd24c479f6c4f5b167b2cc62b8ff6e43e831b8ab90d4e079d2", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.1.1-aarch64.dmg", - "build_number": "241.15989.150" + "version": "2024.1.2", + "sha256": "518711e5b614453969b834a798bf0b6712ead4fc76050cea6f0a6ec3ab81bf21", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.1.2-aarch64.dmg", + "build_number": "241.17011.79" }, "mps": { "update-channel": "MPS RELEASE", @@ -460,67 +460,67 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg", - "version": "2024.1.1", - "sha256": "b6b2b6181c724c320a491cea013c620f662e3fbc3a2f62718354d9e88c9d210d", - "url": "https://download.jetbrains.com/webide/PhpStorm-2024.1.1-aarch64.dmg", - "build_number": "241.15989.102", + "version": "2024.1.2", + "sha256": "3618fb76a47ecb3b1b675516f330a455626d3006338da61ce1b4921448e379c4", + "url": "https://download.jetbrains.com/webide/PhpStorm-2024.1.2-aarch64.dmg", + "build_number": "241.17011.119", "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.1.1", - "sha256": "68e55873a82457fcb8eb1033dbb4e0be817f5b5423b067d8b632fbe5f1d6a4bb", - "url": "https://download.jetbrains.com/python/pycharm-community-2024.1.1-aarch64.dmg", - "build_number": "241.15989.155" + "version": "2024.1.2", + "sha256": "bd9923b5595db072dc59c6ed037ab167eecdd55344ca4f3e59707ac6b0b2ba4b", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.1.2-aarch64.dmg", + "build_number": "241.17011.127" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg", - "version": "2024.1.1", - "sha256": "091a2531325c1df23619ee50998d5d7d7348dc9d25fd7416ccb07aa7d6100c39", - "url": "https://download.jetbrains.com/python/pycharm-professional-2024.1.1-aarch64.dmg", - "build_number": "241.15989.155" + "version": "2024.1.2", + "sha256": "27ec9614e956860d8549e18a40e713d1883665cd7fbe4fff5b32d997ec430af8", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.1.2-aarch64.dmg", + "build_number": "241.17011.127" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg", - "version": "2024.1.1", - "sha256": "d197249cc5cb8fb3ec30f3ed5468dd6d7782e97adb1e48a0509d2415b48f7a1b", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1.1-aarch64.dmg", - "build_number": "241.14494.325" + "version": "2024.1.2", + "sha256": "28f2de34c4417bc044d16f051bf947448d420a1e89762e80c2ee4a3a5937c41b", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1.2-aarch64.dmg", + "build_number": "241.15989.179" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg", - "version": "2024.1.1", - "sha256": "5e6bd929f2b74145aa763ca277ade3c3512342b38a5a21a605c0b319f487b49e", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.1.1-aarch64.dmg", - "build_number": "241.15989.113" + "version": "2024.1.2", + "sha256": "72aa935524f59e081b20d3cbeb82c90dbf2313015069ceddebd43a2c3f8de539", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.1.2-aarch64.dmg", + "build_number": "241.17011.76" }, "rust-rover": { - "update-channel": "RustRover EAP", + "update-channel": "RustRover RELEASE", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.dmg", - "version": "2024.1 EAP", - "sha256": "1d63faf3d687508b976989768ee44ac3632017d55fce0557591dff2eae37d6a2", - "url": "https://download.jetbrains.com/rustrover/RustRover-241.15989.101-aarch64.dmg", - "build_number": "241.15989.101" + "version": "2024.1", + "sha256": "4b1cd0af1f461feb98ca8c55f0d2e32c359af50c420d492697fda5b52bcc6ff6", + "url": "https://download.jetbrains.com/rustrover/RustRover-2024.1-aarch64.dmg", + "build_number": "241.15989.199" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg", - "version": "2024.1.2", - "sha256": "b3ce2aabba5bc3afef95d768aa721bb245d2fce0ec8d69d61d011c2b23087d97", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1.2-aarch64.dmg", - "build_number": "241.15989.105" + "version": "2024.1.3", + "sha256": "ebe9bbd936befa266b9f447963d94b01df3ba73ce2d946cd68776823dfdbd0e9", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1.3-aarch64.dmg", + "build_number": "241.17011.90" }, "writerside": { "update-channel": "Writerside EAP", "url-template": "https://download.jetbrains.com/writerside/writerside-{version}-aarch64.dmg", "version": "2024.1 EAP", - "sha256": "624f9f2fb0ed7c7d42484e42c16b9b0ec0c542ad8187d81b11ef1d38576c589d", - "url": "https://download.jetbrains.com/writerside/writerside-241.15989.11-aarch64.dmg", - "build_number": "241.15989.11" + "sha256": "d3bb0079046570dbfa5175b388e091b1567c024a7ec8587e7c8e5389cf1bd721", + "url": "https://download.jetbrains.com/writerside/writerside-241.16003.85-aarch64.dmg", + "build_number": "241.16003.85" } } } diff --git a/pkgs/applications/editors/jetbrains/plugins/plugins.json b/pkgs/applications/editors/jetbrains/plugins/plugins.json index cbc1207aabede..4bd0bf8363fd5 100644 --- a/pkgs/applications/editors/jetbrains/plugins/plugins.json +++ b/pkgs/applications/editors/jetbrains/plugins/plugins.json @@ -17,17 +17,17 @@ "webstorm" ], "builds": { - "233.13135.979": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", - "241.14494.325": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", - "241.15989.101": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", - "241.15989.102": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", - "241.15989.105": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", - "241.15989.113": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", - "241.15989.121": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", - "241.15989.150": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", - "241.15989.155": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", - "241.15989.157": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", - "241.15989.49": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip" + "233.13135.979": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", + "241.15989.179": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", + "241.15989.199": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", + "241.17011.119": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", + "241.17011.124": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", + "241.17011.127": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", + "241.17011.41": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", + "241.17011.76": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", + "241.17011.79": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", + "241.17011.90": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", + "241.17011.92": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip" }, "name": "ideavim" }, @@ -36,7 +36,7 @@ "idea-ultimate" ], "builds": { - "241.15989.150": "https://plugins.jetbrains.com/files/631/530669/python-241.15989.166.zip" + "241.17011.79": "https://plugins.jetbrains.com/files/631/544299/python-241.17011.79.zip" }, "name": "python" }, @@ -58,16 +58,16 @@ ], "builds": { "233.13135.979": null, - "241.14494.325": null, - "241.15989.101": null, - "241.15989.102": null, - "241.15989.105": null, - "241.15989.113": null, - "241.15989.121": null, - "241.15989.150": null, - "241.15989.155": null, - "241.15989.157": null, - "241.15989.49": null + "241.15989.179": null, + "241.15989.199": null, + "241.17011.119": null, + "241.17011.124": null, + "241.17011.127": null, + "241.17011.41": null, + "241.17011.76": null, + "241.17011.79": null, + "241.17011.90": null, + "241.17011.92": null }, "name": "kotlin" }, @@ -89,16 +89,16 @@ ], "builds": { "233.13135.979": null, - "241.14494.325": "https://plugins.jetbrains.com/files/6981/513562/ini-241.14494.240.zip", - "241.15989.101": "https://plugins.jetbrains.com/files/6981/527916/ini-241.15989.113.zip", - "241.15989.102": "https://plugins.jetbrains.com/files/6981/527916/ini-241.15989.113.zip", - "241.15989.105": "https://plugins.jetbrains.com/files/6981/527916/ini-241.15989.113.zip", - "241.15989.113": "https://plugins.jetbrains.com/files/6981/527916/ini-241.15989.113.zip", - "241.15989.121": "https://plugins.jetbrains.com/files/6981/527916/ini-241.15989.113.zip", - "241.15989.150": "https://plugins.jetbrains.com/files/6981/527916/ini-241.15989.113.zip", - "241.15989.155": "https://plugins.jetbrains.com/files/6981/527916/ini-241.15989.113.zip", - "241.15989.157": "https://plugins.jetbrains.com/files/6981/527916/ini-241.15989.113.zip", - "241.15989.49": "https://plugins.jetbrains.com/files/6981/527916/ini-241.15989.113.zip" + "241.15989.179": "https://plugins.jetbrains.com/files/6981/527916/ini-241.15989.113.zip", + "241.15989.199": "https://plugins.jetbrains.com/files/6981/527916/ini-241.15989.113.zip", + "241.17011.119": "https://plugins.jetbrains.com/files/6981/547306/ini-241.17011.124.zip", + "241.17011.124": "https://plugins.jetbrains.com/files/6981/547306/ini-241.17011.124.zip", + "241.17011.127": "https://plugins.jetbrains.com/files/6981/547306/ini-241.17011.124.zip", + "241.17011.41": "https://plugins.jetbrains.com/files/6981/547306/ini-241.17011.124.zip", + "241.17011.76": "https://plugins.jetbrains.com/files/6981/547306/ini-241.17011.124.zip", + "241.17011.79": "https://plugins.jetbrains.com/files/6981/547306/ini-241.17011.124.zip", + "241.17011.90": "https://plugins.jetbrains.com/files/6981/547306/ini-241.17011.124.zip", + "241.17011.92": "https://plugins.jetbrains.com/files/6981/547306/ini-241.17011.124.zip" }, "name": "ini" }, @@ -108,8 +108,8 @@ "phpstorm" ], "builds": { - "241.15989.102": "https://plugins.jetbrains.com/files/7219/529388/Symfony_Plugin-2023.1.271.zip", - "241.15989.150": "https://plugins.jetbrains.com/files/7219/529388/Symfony_Plugin-2023.1.271.zip" + "241.17011.119": "https://plugins.jetbrains.com/files/7219/542990/Symfony_Plugin-2024.1.274.zip", + "241.17011.79": "https://plugins.jetbrains.com/files/7219/542990/Symfony_Plugin-2024.1.274.zip" }, "name": "symfony-support" }, @@ -119,25 +119,29 @@ "phpstorm" ], "builds": { - "241.15989.102": "https://plugins.jetbrains.com/files/7320/507957/PHP_Annotations-10.0.0.zip", - "241.15989.150": "https://plugins.jetbrains.com/files/7320/507957/PHP_Annotations-10.0.0.zip" + "241.17011.119": "https://plugins.jetbrains.com/files/7320/507957/PHP_Annotations-10.0.0.zip", + "241.17011.79": "https://plugins.jetbrains.com/files/7320/507957/PHP_Annotations-10.0.0.zip" }, "name": "php-annotations" }, "7322": { "compatible": [ + "clion", "datagrip", "goland", "idea-community", + "pycharm-community", "rider", "rust-rover" ], "builds": { - "241.14494.325": "https://plugins.jetbrains.com/files/7322/513587/python-ce-241.14494.240.zip", - "241.15989.101": "https://plugins.jetbrains.com/files/7322/530366/python-ce-241.15989.150.zip", - "241.15989.150": "https://plugins.jetbrains.com/files/7322/530366/python-ce-241.15989.150.zip", - "241.15989.157": "https://plugins.jetbrains.com/files/7322/530366/python-ce-241.15989.150.zip", - "241.15989.49": "https://plugins.jetbrains.com/files/7322/530366/python-ce-241.15989.150.zip" + "241.15989.179": "https://plugins.jetbrains.com/files/7322/530366/python-ce-241.15989.150.zip", + "241.15989.199": "https://plugins.jetbrains.com/files/7322/530366/python-ce-241.15989.150.zip", + "241.17011.124": "https://plugins.jetbrains.com/files/7322/540027/python-ce-241.17011.48.zip", + "241.17011.127": "https://plugins.jetbrains.com/files/7322/540027/python-ce-241.17011.48.zip", + "241.17011.41": "https://plugins.jetbrains.com/files/7322/540027/python-ce-241.17011.48.zip", + "241.17011.79": "https://plugins.jetbrains.com/files/7322/540027/python-ce-241.17011.48.zip", + "241.17011.92": "https://plugins.jetbrains.com/files/7322/540027/python-ce-241.17011.48.zip" }, "name": "python-community-edition" }, @@ -158,15 +162,15 @@ ], "builds": { "233.13135.979": "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip", - "241.14494.325": null, - "241.15989.102": null, - "241.15989.105": null, - "241.15989.113": null, - "241.15989.121": null, - "241.15989.150": null, - "241.15989.155": null, - "241.15989.157": null, - "241.15989.49": null + "241.15989.179": null, + "241.17011.119": null, + "241.17011.124": null, + "241.17011.127": null, + "241.17011.41": null, + "241.17011.76": null, + "241.17011.79": null, + "241.17011.90": null, + "241.17011.92": null }, "name": "-deprecated-rust" }, @@ -187,15 +191,15 @@ ], "builds": { "233.13135.979": null, - "241.14494.325": null, - "241.15989.102": null, - "241.15989.105": null, - "241.15989.113": null, - "241.15989.121": null, - "241.15989.150": null, - "241.15989.155": null, - "241.15989.157": null, - "241.15989.49": null + "241.15989.179": null, + "241.17011.119": null, + "241.17011.124": null, + "241.17011.127": null, + "241.17011.41": null, + "241.17011.76": null, + "241.17011.79": null, + "241.17011.90": null, + "241.17011.92": null }, "name": "-deprecated-rust-beta" }, @@ -209,10 +213,10 @@ "ruby-mine" ], "builds": { - "241.15989.113": "https://plugins.jetbrains.com/files/8554/508289/featuresTrainer-241.14494.150.zip", - "241.15989.150": "https://plugins.jetbrains.com/files/8554/508289/featuresTrainer-241.14494.150.zip", - "241.15989.155": "https://plugins.jetbrains.com/files/8554/508289/featuresTrainer-241.14494.150.zip", - "241.15989.157": "https://plugins.jetbrains.com/files/8554/508289/featuresTrainer-241.14494.150.zip" + "241.17011.127": "https://plugins.jetbrains.com/files/8554/535094/featuresTrainer-241.17011.14.zip", + "241.17011.76": "https://plugins.jetbrains.com/files/8554/535094/featuresTrainer-241.17011.14.zip", + "241.17011.79": "https://plugins.jetbrains.com/files/8554/535094/featuresTrainer-241.17011.14.zip", + "241.17011.92": "https://plugins.jetbrains.com/files/8554/535094/featuresTrainer-241.17011.14.zip" }, "name": "ide-features-trainer" }, @@ -234,16 +238,16 @@ ], "builds": { "233.13135.979": "https://plugins.jetbrains.com/files/8607/530004/NixIDEA-0.4.0.13.zip", - "241.14494.325": "https://plugins.jetbrains.com/files/8607/530004/NixIDEA-0.4.0.13.zip", - "241.15989.101": "https://plugins.jetbrains.com/files/8607/530004/NixIDEA-0.4.0.13.zip", - "241.15989.102": "https://plugins.jetbrains.com/files/8607/530004/NixIDEA-0.4.0.13.zip", - "241.15989.105": "https://plugins.jetbrains.com/files/8607/530004/NixIDEA-0.4.0.13.zip", - "241.15989.113": "https://plugins.jetbrains.com/files/8607/530004/NixIDEA-0.4.0.13.zip", - "241.15989.121": "https://plugins.jetbrains.com/files/8607/530004/NixIDEA-0.4.0.13.zip", - "241.15989.150": "https://plugins.jetbrains.com/files/8607/530004/NixIDEA-0.4.0.13.zip", - "241.15989.155": "https://plugins.jetbrains.com/files/8607/530004/NixIDEA-0.4.0.13.zip", - "241.15989.157": "https://plugins.jetbrains.com/files/8607/530004/NixIDEA-0.4.0.13.zip", - "241.15989.49": "https://plugins.jetbrains.com/files/8607/530004/NixIDEA-0.4.0.13.zip" + "241.15989.179": "https://plugins.jetbrains.com/files/8607/530004/NixIDEA-0.4.0.13.zip", + "241.15989.199": "https://plugins.jetbrains.com/files/8607/530004/NixIDEA-0.4.0.13.zip", + "241.17011.119": "https://plugins.jetbrains.com/files/8607/530004/NixIDEA-0.4.0.13.zip", + "241.17011.124": "https://plugins.jetbrains.com/files/8607/530004/NixIDEA-0.4.0.13.zip", + "241.17011.127": "https://plugins.jetbrains.com/files/8607/530004/NixIDEA-0.4.0.13.zip", + "241.17011.41": "https://plugins.jetbrains.com/files/8607/530004/NixIDEA-0.4.0.13.zip", + "241.17011.76": "https://plugins.jetbrains.com/files/8607/530004/NixIDEA-0.4.0.13.zip", + "241.17011.79": "https://plugins.jetbrains.com/files/8607/530004/NixIDEA-0.4.0.13.zip", + "241.17011.90": "https://plugins.jetbrains.com/files/8607/530004/NixIDEA-0.4.0.13.zip", + "241.17011.92": "https://plugins.jetbrains.com/files/8607/530004/NixIDEA-0.4.0.13.zip" }, "name": "nixidea" }, @@ -253,8 +257,8 @@ "idea-ultimate" ], "builds": { - "241.15989.150": "https://plugins.jetbrains.com/files/9568/521002/go-plugin-241.15989.21.zip", - "241.15989.157": "https://plugins.jetbrains.com/files/9568/521002/go-plugin-241.15989.21.zip" + "241.17011.79": "https://plugins.jetbrains.com/files/9568/534161/go-plugin-241.17011.2.zip", + "241.17011.92": "https://plugins.jetbrains.com/files/9568/534161/go-plugin-241.17011.2.zip" }, "name": "go" }, @@ -276,16 +280,16 @@ ], "builds": { "233.13135.979": "https://plugins.jetbrains.com/files/10037/493012/CSVEditor-3.3.0-233.zip", - "241.14494.325": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.15989.101": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.15989.102": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.15989.105": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.15989.113": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.15989.121": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.15989.150": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.15989.155": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.15989.157": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.15989.49": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip" + "241.15989.179": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", + "241.15989.199": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", + "241.17011.119": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", + "241.17011.124": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", + "241.17011.127": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", + "241.17011.41": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", + "241.17011.76": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", + "241.17011.79": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", + "241.17011.90": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", + "241.17011.92": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip" }, "name": "csv-editor" }, @@ -307,16 +311,16 @@ ], "builds": { "233.13135.979": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip", - "241.14494.325": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.15989.101": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.15989.102": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.15989.105": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.15989.113": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.15989.121": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.15989.150": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.15989.155": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.15989.157": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.15989.49": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip" + "241.15989.179": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.15989.199": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.17011.119": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.17011.124": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.17011.127": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.17011.41": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.17011.76": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.17011.79": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.17011.90": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.17011.92": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip" }, "name": "vscode-keymap" }, @@ -338,16 +342,16 @@ ], "builds": { "233.13135.979": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip", - "241.14494.325": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.15989.101": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.15989.102": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.15989.105": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.15989.113": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.15989.121": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.15989.150": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.15989.155": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.15989.157": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.15989.49": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip" + "241.15989.179": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "241.15989.199": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "241.17011.119": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "241.17011.124": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "241.17011.127": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "241.17011.41": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "241.17011.76": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "241.17011.79": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "241.17011.90": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "241.17011.92": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip" }, "name": "eclipse-keymap" }, @@ -369,16 +373,16 @@ ], "builds": { "233.13135.979": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip", - "241.14494.325": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.15989.101": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.15989.102": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.15989.105": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.15989.113": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.15989.121": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.15989.150": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.15989.155": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.15989.157": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.15989.49": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip" + "241.15989.179": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "241.15989.199": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "241.17011.119": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "241.17011.124": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "241.17011.127": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "241.17011.41": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "241.17011.76": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "241.17011.79": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "241.17011.90": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "241.17011.92": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip" }, "name": "visual-studio-keymap" }, @@ -400,16 +404,16 @@ ], "builds": { "233.13135.979": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.14494.325": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.15989.101": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.15989.102": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.15989.105": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.15989.113": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.15989.121": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.15989.150": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.15989.155": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.15989.157": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.15989.49": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" + "241.15989.179": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.15989.199": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.17011.119": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.17011.124": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.17011.127": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.17011.41": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.17011.76": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.17011.79": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.17011.90": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.17011.92": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" }, "name": "darcula-pitch-black" }, @@ -430,17 +434,17 @@ "webstorm" ], "builds": { - "233.13135.979": "https://plugins.jetbrains.com/files/17718/517133/github-copilot-intellij-1.5.2.5345.zip", - "241.14494.325": "https://plugins.jetbrains.com/files/17718/517133/github-copilot-intellij-1.5.2.5345.zip", - "241.15989.101": "https://plugins.jetbrains.com/files/17718/517133/github-copilot-intellij-1.5.2.5345.zip", - "241.15989.102": "https://plugins.jetbrains.com/files/17718/517133/github-copilot-intellij-1.5.2.5345.zip", - "241.15989.105": "https://plugins.jetbrains.com/files/17718/517133/github-copilot-intellij-1.5.2.5345.zip", - "241.15989.113": "https://plugins.jetbrains.com/files/17718/517133/github-copilot-intellij-1.5.2.5345.zip", - "241.15989.121": "https://plugins.jetbrains.com/files/17718/517133/github-copilot-intellij-1.5.2.5345.zip", - "241.15989.150": "https://plugins.jetbrains.com/files/17718/517133/github-copilot-intellij-1.5.2.5345.zip", - "241.15989.155": "https://plugins.jetbrains.com/files/17718/517133/github-copilot-intellij-1.5.2.5345.zip", - "241.15989.157": "https://plugins.jetbrains.com/files/17718/517133/github-copilot-intellij-1.5.2.5345.zip", - "241.15989.49": "https://plugins.jetbrains.com/files/17718/517133/github-copilot-intellij-1.5.2.5345.zip" + "233.13135.979": "https://plugins.jetbrains.com/files/17718/551329/github-copilot-intellij-1.5.6.5692.zip", + "241.15989.179": "https://plugins.jetbrains.com/files/17718/551329/github-copilot-intellij-1.5.6.5692.zip", + "241.15989.199": "https://plugins.jetbrains.com/files/17718/551329/github-copilot-intellij-1.5.6.5692.zip", + "241.17011.119": "https://plugins.jetbrains.com/files/17718/551329/github-copilot-intellij-1.5.6.5692.zip", + "241.17011.124": "https://plugins.jetbrains.com/files/17718/551329/github-copilot-intellij-1.5.6.5692.zip", + "241.17011.127": "https://plugins.jetbrains.com/files/17718/551329/github-copilot-intellij-1.5.6.5692.zip", + "241.17011.41": "https://plugins.jetbrains.com/files/17718/551329/github-copilot-intellij-1.5.6.5692.zip", + "241.17011.76": "https://plugins.jetbrains.com/files/17718/551329/github-copilot-intellij-1.5.6.5692.zip", + "241.17011.79": "https://plugins.jetbrains.com/files/17718/551329/github-copilot-intellij-1.5.6.5692.zip", + "241.17011.90": "https://plugins.jetbrains.com/files/17718/551329/github-copilot-intellij-1.5.6.5692.zip", + "241.17011.92": "https://plugins.jetbrains.com/files/17718/551329/github-copilot-intellij-1.5.6.5692.zip" }, "name": "github-copilot" }, @@ -462,16 +466,16 @@ ], "builds": { "233.13135.979": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.14494.325": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.15989.101": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.15989.102": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.15989.105": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.15989.113": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.15989.121": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.15989.150": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.15989.155": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.15989.157": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.15989.49": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" + "241.15989.179": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.15989.199": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.17011.119": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.17011.124": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.17011.127": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.17011.41": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.17011.76": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.17011.79": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.17011.90": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.17011.92": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" }, "name": "netbeans-6-5-keymap" }, @@ -482,9 +486,9 @@ "rust-rover" ], "builds": { - "241.15989.101": "https://plugins.jetbrains.com/files/22407/526873/intellij-rust-241.25989.101.zip", - "241.15989.121": "https://plugins.jetbrains.com/files/22407/526873/intellij-rust-241.25989.101.zip", - "241.15989.150": "https://plugins.jetbrains.com/files/22407/526873/intellij-rust-241.25989.101.zip" + "241.15989.199": "https://plugins.jetbrains.com/files/22407/542571/intellij-rust-241.25989.199.zip", + "241.17011.124": "https://plugins.jetbrains.com/files/22407/542571/intellij-rust-241.25989.199.zip", + "241.17011.79": "https://plugins.jetbrains.com/files/22407/542571/intellij-rust-241.25989.199.zip" }, "name": "rust" } @@ -499,20 +503,20 @@ "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip": "sha256-Nb2tSxL+mAY1qJ3waipgV8ep+0R/BaYnzz7zfwtLHmk=", "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip": "sha256-tNgt0vIkdCB/LcaSj58mT6cNlw4lytRo0cZSt7sIERU=", "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar": "sha256-eXInfAqY3yEZRXCAuv3KGldM1pNKEioNwPB0rIGgJFw=", - "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip": "sha256-FP6th8J3ymfTrwvJ3Ms7fsNPh3f9ab5ZVg5yPpKV/rY=", - "https://plugins.jetbrains.com/files/17718/517133/github-copilot-intellij-1.5.2.5345.zip": "sha256-BaBYXN8eulaJtJSKrz9bZ2Yn8029goSAUvjYU+BaiIU=", + "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip": "sha256-6ibo1vdwO4olQTCWpWAefT3QCwgtzTo1ojilDes8Rvg=", + "https://plugins.jetbrains.com/files/17718/551329/github-copilot-intellij-1.5.6.5692.zip": "sha256-p2xY8eN3tOvlXhuZm4R7zl67lnKbaJwKwPZSolDTaX0=", "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip": "sha256-KrzZTKZMQqoEMw+vDUv2jjs0EX0leaPBkU8H/ecq/oI=", - "https://plugins.jetbrains.com/files/22407/526873/intellij-rust-241.25989.101.zip": "sha256-v1r14zx591Vr8JmQxfysQ/aO8HDYCorwnnOEKDIfx+Y=", - "https://plugins.jetbrains.com/files/631/530669/python-241.15989.166.zip": "sha256-1mdv8xJfaa8Ln4/jsnyQyd6C19C8++XYpOBDU67SDGc=", - "https://plugins.jetbrains.com/files/6981/513562/ini-241.14494.240.zip": "sha256-QC42nC7mEE3X1cmKj8jkwzpDJzX7ZoOPEd9y6i8IuvM=", + "https://plugins.jetbrains.com/files/22407/542571/intellij-rust-241.25989.199.zip": "sha256-ACeMU2llicj8VHBJJSAk2SIQaZrD2ykmY0b3VDiedV4=", + "https://plugins.jetbrains.com/files/631/544299/python-241.17011.79.zip": "sha256-7f3zOFn7VjZBKPJblkDVPS1amH8+hDTktNwyarNk+4Q=", "https://plugins.jetbrains.com/files/6981/527916/ini-241.15989.113.zip": "sha256-JgFoDqeMxdg3E9ZWHVsJGSygKAifFCEa9S+RdLFkLBI=", - "https://plugins.jetbrains.com/files/7219/529388/Symfony_Plugin-2023.1.271.zip": "sha256-vboCsF7e4Kx56hkKEXkFO9A/ElxNAITi4cIFwLcXxCU=", + "https://plugins.jetbrains.com/files/6981/547306/ini-241.17011.124.zip": "sha256-6EU2ExUMvXG2pJ77ZgZIsPC6gWX8MTZB0rRttYNRfX4=", + "https://plugins.jetbrains.com/files/7219/542990/Symfony_Plugin-2024.1.274.zip": "sha256-92uUIFz5kEjrbgPnomi0VXc9Du17evzGsO5ApsrtHrA=", "https://plugins.jetbrains.com/files/7320/507957/PHP_Annotations-10.0.0.zip": "sha256-JIZ6Iq3sOcAm8fBXnjRrG9dqCZuD/WajyVmn1JjYMBA=", - "https://plugins.jetbrains.com/files/7322/513587/python-ce-241.14494.240.zip": "sha256-6YC/aoiTRLAh87C2v3k24BLBH/tsdTWuDK/CBv8y1QI=", "https://plugins.jetbrains.com/files/7322/530366/python-ce-241.15989.150.zip": "sha256-VJWFzUk/lloFCfHbXX7lQRV6bGseCqEPA8XOLlkqNho=", + "https://plugins.jetbrains.com/files/7322/540027/python-ce-241.17011.48.zip": "sha256-UrvhbGhcqxGke5tZTktyaWVYIWO5NhOU/WiswMYr83Y=", "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip": "sha256-+Lc/avYBLpyIV63DlbhAJtieHDv4HdggqdGFDw9iqN0=", - "https://plugins.jetbrains.com/files/8554/508289/featuresTrainer-241.14494.150.zip": "sha256-D2gF9bLAEFd1+6vZskiM2Eyl5e8hmyh/VHrmW2NociE=", + "https://plugins.jetbrains.com/files/8554/535094/featuresTrainer-241.17011.14.zip": "sha256-p26GW1NyVI8OR1VypeWUFWW8qlwB+LtzrEoKyXBwiCw=", "https://plugins.jetbrains.com/files/8607/530004/NixIDEA-0.4.0.13.zip": "sha256-6MI3mRCzSWmdMfjlkE4SMZmKnvWLjMGmYvcPw0PoBNY=", - "https://plugins.jetbrains.com/files/9568/521002/go-plugin-241.15989.21.zip": "sha256-4wM2FFZMTJlWEmxoSrZgkJXdSxUUtDoGZGrobnrMH78=" + "https://plugins.jetbrains.com/files/9568/534161/go-plugin-241.17011.2.zip": "sha256-6+VdZVI/U+UxxNZM1/Va8RsiHG0ZnR6PpoOAhaOqk9U=" } } diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 6e5dbbd3e125d..381ec4c98c6e5 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -17394,5 +17394,17 @@ final: prev: meta.homepage = "https://github.com/pteroctopus/faster.nvim"; }; + cinnamon-nvim = buildVimPlugin { + pname = "cinnamon-nvim"; + version = "2024-04-25"; + src = fetchFromGitHub { + owner = "declancm"; + repo = "cinnamon.nvim"; + rev = "a011e84b624cd7b609ea928237505d31b987748a"; + sha256 = "sha256-cMP9WRZzevxaWgpILyDh1JwNukm3Jl3JKJYPT2HnFns="; + }; + meta.homepage = "https://github.com/declancm/cinnamon.nvim"; + }; + } diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 85ca84d788a54..5d29175278fd2 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -119,6 +119,7 @@ https://github.com/ms-jpq/chadtree/,HEAD, https://github.com/vim-scripts/changeColorScheme.vim/,, https://github.com/sudormrfbin/cheatsheet.nvim/,, https://github.com/yunlingz/ci_dark/,, +https://github.com/declancm/cinnamon.nvim/,HEAD, https://github.com/projekt0n/circles.nvim/,, https://github.com/zootedb0t/citruszest.nvim/,, https://github.com/xavierd/clang_complete/,, diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index e8ff066642b27..212bf8f1930ca 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -30,21 +30,21 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1zfh48g6prjhjcyrz5impsnm6khw7s75k8k54bp0cszl81ddsysx"; - x86_64-darwin = "1w5fzq8dmzrs2ggxvcbcs03psxxi1dbzx5l0jn52szi1g5y3daxi"; - aarch64-linux = "0rs4zzddfpwbf86cjl4r65cxccs4ypz1s7lw98vq0j8pfx8vkgqi"; - aarch64-darwin = "0gha1b6q3k57yrbp7qrrknlbbbbhcjd6slbyrzlwjcz1ddvs7c8s"; - armv7l-linux = "01s1vxbmg3zp47kwlsjr781v6c51l5bcpf9pc91id0qcrhax703k"; + x86_64-linux = "1ypxzk3p1acv6g9418bchbwi82imnvljgn8h6mjqwqzbf3khf5kd"; + x86_64-darwin = "0nm3765mzqlagbilb01s0zy9zww8rmf8bjlqq0vwvrxxfl7vbyl3"; + aarch64-linux = "0f0cwihiwvpck625s91hc838hzyiylbir3m23r4ncjws298ckyg5"; + aarch64-darwin = "1h7cldjwb8hyx7vq2almplwxl667cc8dw3iv2mqigrx3ibk6sss6"; + armv7l-linux = "0a0iy109qjwj1ri23xmmfa3j3mngz72ljw2m0czaf8rkcaglxa1v"; }.${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.89.1"; + version = "1.90.0"; pname = "vscode" + lib.optionalString isInsiders "-insiders"; # This is used for VS Code - Remote SSH test - rev = "dc96b837cf6bb4af9cd736aa3af08cf8279f7685"; + rev = "89de5a8d4d6205e5b11647eb6a74844ca23d2573"; executableName = "code" + lib.optionalString isInsiders "-insiders"; longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; @@ -68,7 +68,7 @@ in src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - sha256 = "05gvq96vw69lb8ip8pfd9g43j8kvfwlrdmm11b41fpdafhi45f89"; + sha256 = "0rwdvbig0a6mzgcn0zb08caaxyx5rk0741f8an3y0vavzgi5k38f"; }; }; diff --git a/pkgs/applications/editors/xed-editor/default.nix b/pkgs/applications/editors/xed-editor/default.nix index cb147cf099eb8..9034b2eb375c6 100644 --- a/pkgs/applications/editors/xed-editor/default.nix +++ b/pkgs/applications/editors/xed-editor/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "xed-editor"; - version = "3.4.5"; + version = "3.6.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xed"; rev = version; - sha256 = "sha256-MXRxzmRo/dRhp5Llib9ng1gzWW8uvzqTMjUVK8a3eJ8="; + sha256 = "sha256-RFauTXwiaSd+J8zoJQmib4bKNR4NC/LSCCqCHv8Hdr8="; }; patches = [ diff --git a/pkgs/applications/misc/nwg-dock-hyprland/default.nix b/pkgs/applications/misc/nwg-dock-hyprland/default.nix index ff0a57b07555f..a029b481eeec6 100644 --- a/pkgs/applications/misc/nwg-dock-hyprland/default.nix +++ b/pkgs/applications/misc/nwg-dock-hyprland/default.nix @@ -8,28 +8,34 @@ buildGoModule rec { pname = "nwg-dock-hyprland"; - version = "0.1.8"; + version = "0.1.9"; src = fetchFromGitHub { owner = "nwg-piotr"; - repo = pname; + repo = "nwg-dock-hyprland"; rev = "v${version}"; - sha256 = "sha256-cdNxaOnm98RcPG2o0GaBETpd+Zo2nlgrFv+2PiHOwUI="; + hash = "sha256-pzOdWv98tHZg6Xn58z5DlM1H0IOQ+ohfXEZRLZr8mz0="; }; - vendorHash = "sha256-JEzc950c4EGOYMLgpL8PXENkGlWSX8Z4A4jCx1B99X8="; + vendorHash = "sha256-bK3SpydIO943e7zti6yWQ+JqmdF4NkAAtelNBt4Q/+s="; ldflags = [ "-s" "-w" ]; nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; buildInputs = [ gtk-layer-shell ]; - meta = with lib; { + postInstall = '' + install -d $out/share/nwg-dock-hyprland + cp -r images $out/share/nwg-dock-hyprland/images + install -Dm644 config/style.css $out/share/nwg-dock-hyprland/style.css + ''; + + meta = { description = "GTK3-based dock for Hyprland"; mainProgram = "nwg-dock-hyprland"; homepage = "https://github.com/nwg-piotr/nwg-dock-hyprland"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ aleksana ]; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ aleksana ]; }; } diff --git a/pkgs/applications/networking/cluster/roxctl/default.nix b/pkgs/applications/networking/cluster/roxctl/default.nix index abc77155eb5ce..b710fe68b3ec4 100644 --- a/pkgs/applications/networking/cluster/roxctl/default.nix +++ b/pkgs/applications/networking/cluster/roxctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "roxctl"; - version = "4.4.2"; + version = "4.4.3"; src = fetchFromGitHub { owner = "stackrox"; repo = "stackrox"; rev = version; - sha256 = "sha256-OHDQr83EQn0qjObuzldRAa9fDv1itqipkDRcKdt3kxg="; + sha256 = "sha256-sQUX2Ou+fL4G2u/Mdnl9SwdwRkogiyq3tkauUeW//dU="; }; - vendorHash = "sha256-SLr7h830lZpou2FyYqqUsYzRsh/QzMgkTArAJjHzCx0="; + vendorHash = "sha256-j/ouxh4nMg5hyzT2RuP+hJrAeK7+PleT2W0DWxxjOfA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 39a7ae4690fb8..4e28f0750e49d 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -5,7 +5,7 @@ python3.pkgs.buildPythonApplication rec { pname = "flexget"; - version = "3.11.35"; + version = "3.11.36"; pyproject = true; # Fetch from GitHub in order to use `requirements.in` @@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec { owner = "Flexget"; repo = "Flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-L3A0bU35IfFfwDIbcNVAU4jGb00jODgq7Z67RQrT4u0="; + hash = "sha256-6WZALdKORsa0wahPKgkpzjlktJQxnbiiJLXGv3E9MXM="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 5167890de17fb..7bc13c1f85390 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -64,14 +64,14 @@ let in stdenv.mkDerivation rec { pname = "telegram-desktop"; - version = "5.1.2"; + version = "5.1.5"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-KTgID7pd0QSFi5t9cdIVEi4/oQirDgsf7tTcEEtRdY0="; + hash = "sha256-dlPt87SKP17v9QFiRZSSUtSLVGTGbeo05G/p05l2zVc="; }; patches = [ diff --git a/pkgs/applications/science/logic/bitwuzla/default.nix b/pkgs/applications/science/logic/bitwuzla/default.nix index 1fa78849db6e8..8ac21c2e2bc41 100644 --- a/pkgs/applications/science/logic/bitwuzla/default.nix +++ b/pkgs/applications/science/logic/bitwuzla/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchFromGitHub -, fetchpatch , lib , python3 , meson @@ -18,24 +17,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "bitwuzla"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "bitwuzla"; repo = "bitwuzla"; rev = finalAttrs.version; - hash = "sha256-ZEdV4ml1LwrYwscgOcL2gLx/ijPYqRktXMQH/Njh8OI="; + hash = "sha256-/izxmN+zlrXsY6g6TRC1QqsLqltvrmZquXRd6h8RLRc="; }; - patches = [ - # fix parser on aarch64 - # remove on next release - (fetchpatch { - url = "https://github.com/bitwuzla/bitwuzla/commit/4d914aa5ec34076c37749f0cf6dce976ea510386.patch"; - hash = "sha256-gp+HEamOySjPXCC39tt5DIMdQqEew26a+M15sNdCmTM="; - }) - ]; - strictDeps = true; nativeBuildInputs = [ meson pkg-config git ninja ]; diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index effee226a91a4..c3bb6b5456c1b 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -106,12 +106,10 @@ let # base ffmpeg version is specified in: # https://github.com/HandBrake/HandBrake/blob/master/contrib/ffmpeg/module.defs ffmpeg-version = "7.0"; - ffmpeg-hb = ffmpeg_7-full.overrideAttrs (old: { + ffmpeg-hb = (ffmpeg_7-full.override { version = ffmpeg-version; - src = fetchurl { - url = "https://www.ffmpeg.org/releases/ffmpeg-${ffmpeg-version}.tar.bz2"; - hash = "sha256-ok2QdL9VI6Zaqp570Cr+QQnOedab130QT+09q0uTTXo="; - }; + hash = "sha256-RdDfv+0y90XpgjIRvTjsemKyGunzDbsh4j4WiE9rfyM="; + }).overrideAttrs (old: { patches = (old.patches or [ ]) ++ [ "${src}/contrib/ffmpeg/A01-mov-read-name-track-tag-written-by-movenc.patch" "${src}/contrib/ffmpeg/A02-movenc-write-3gpp-track-titl-tag.patch" diff --git a/pkgs/by-name/br/brickstore/package.nix b/pkgs/by-name/br/brickstore/package.nix new file mode 100644 index 0000000000000..03d3dd06c6c54 --- /dev/null +++ b/pkgs/by-name/br/brickstore/package.nix @@ -0,0 +1,92 @@ +{ + lib, + stdenv, + qt6, + libsForQt5, + fetchFromGitHub, + gst_all_1, + cmake, + libglvnd, + tbb, + ninja, + pkg-config, +}: +let + inherit (libsForQt5) qcoro; +in +stdenv.mkDerivation (finalAttrs: { + pname = "brickstore"; + version = "0-unstable-2024-05-02"; + + src = fetchFromGitHub { + owner = "rgriebl"; + repo = "brickstore"; + rev = "v2024.5.2"; + hash = "sha256-Bu9oNbZm3lx/CfYAReHyWe/kW+kaefDWeBtWLHOCORU="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + cmake + libglvnd + ninja + pkg-config + qcoro + qt6.qtdoc + qt6.qtdeclarative + qt6.qtimageformats + qt6.qtmultimedia + qt6.qtquick3d + qt6.qtquicktimeline + qt6.qtshadertools + qt6.qttools + qt6.qtwayland + qt6.wrapQtAppsHook + tbb + ]; + + preConfigure = '' + sed -i '/^)$/d' cmake/BuildQCoro.cmake + + substituteInPlace cmake/BuildQCoro.cmake \ + --replace-fail 'FetchContent_Declare(' ' ' \ + --replace-fail ' qcoro' ' ' \ + --replace-fail ' GIT_REPOSITORY https://github.com/danvratil/qcoro.git' ' ' \ + --replace-fail ' GIT_TAG v''${QCORO_VERSION}' ' ' \ + --replace-fail 'FetchContent_GetProperties(qcoro)' ' ' \ + --replace-fail 'FetchContent_Populate(qcoro)' ' ' \ + --replace-fail \ + 'add_subdirectory(''${qcoro_SOURCE_DIR} ''${qcoro_BINARY_DIR} EXCLUDE_FROM_ALL)' \ + 'add_subdirectory(${qcoro.src} ${qcoro}bin/qcoro)' + ''; + + qtWrapperArgs = [ + '' + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : ${ + lib.makeLibraryPath [ + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly + gst_all_1.gst-libav + ] + } + '' + ]; + + meta = { + changelog = "https://github.com/rgriebl/brickstore/blob/main/CHANGELOG.md"; + description = "BrickLink offline management tool"; + homepage = "https://www.brickstore.dev/"; + license = lib.licenses.gpl3Plus; + longDescription = '' + BrickStore is a BrickLink offline management tool. + It is multi-platform (Windows, macOS and Linux as well as iOS and Android), + multilingual (currently English, German, Spanish, Swedish and French), fast and stable. + ''; + maintainers = with lib.maintainers; [ legojames ]; + mainProgram = "brickstore"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/ge/geesefs/package.nix b/pkgs/by-name/ge/geesefs/package.nix index 5d0277040141a..9c23f3234db7f 100644 --- a/pkgs/by-name/ge/geesefs/package.nix +++ b/pkgs/by-name/ge/geesefs/package.nix @@ -4,7 +4,7 @@ , fetchFromGitHub }: -let version = "0.41.0"; +let version = "0.41.1"; in buildGoModule { pname = "geesefs"; inherit version; @@ -13,7 +13,7 @@ in buildGoModule { owner = "yandex-cloud"; repo = "geesefs"; rev = "v${version}"; - hash = "sha256-tOioEimL4+xf19sdMwRS8tRmKKxLXmR8DWMEmvRqdJM="; + hash = "sha256-4uPq4NUd6upsOxuKAVqay7UTMfiHlCKwVvJed0jdeyc="; }; # hashes differ per architecture otherwise. diff --git a/pkgs/by-name/ho/home-manager/package.nix b/pkgs/by-name/ho/home-manager/package.nix index 5131ff7785c5c..5bf6a20b51840 100644 --- a/pkgs/by-name/ho/home-manager/package.nix +++ b/pkgs/by-name/ho/home-manager/package.nix @@ -16,14 +16,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "home-manager"; - version = "0-unstable-2024-05-30"; + version = "0-unstable-2024-06-04"; src = fetchFromGitHub { name = "home-manager-source"; owner = "nix-community"; repo = "home-manager"; - rev = "0eb314b4f0ba337e88123e0b1e57ef58346aafd9"; - hash = "sha256-HC5vJ3oYsjwsCaSbkIPv80e4ebJpNvFKQTBOGlHvjLs="; + rev = "a7117efb3725e6197dd95424136f79147aa35e5b"; + hash = "sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz+hg+x1pCcNkAws="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ju/just/fix-just-path-in-tests.patch b/pkgs/by-name/ju/just/fix-just-path-in-tests.patch new file mode 100644 index 0000000000000..63587ebc698aa --- /dev/null +++ b/pkgs/by-name/ju/just/fix-just-path-in-tests.patch @@ -0,0 +1,20 @@ +diff --git a/tests/completions/just.bash b/tests/completions/just.bash +index 6d5c12c..13bff87 100755 +--- a/tests/completions/just.bash ++++ b/tests/completions/just.bash +@@ -17,11 +17,13 @@ reply_equals() { + fi + } + ++just() { ++ cargo run -- "$@" ++} ++ + # --- Initial Setup --- + source "$1" + cd tests/completions +-cargo build +-PATH="$(git rev-parse --show-toplevel)/target/debug:$PATH" + exit_code=0 + + # --- Tests --- diff --git a/pkgs/by-name/ju/just/package.nix b/pkgs/by-name/ju/just/package.nix index d635d1271a2ea..c598c2d1ed5ac 100644 --- a/pkgs/by-name/ju/just/package.nix +++ b/pkgs/by-name/ju/just/package.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitHub , rustPlatform +, bashInteractive , coreutils , installShellFiles , libiconv @@ -11,17 +12,17 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "1.26.0"; + version = "1.28.0"; outputs = [ "out" "man" "doc" ]; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-jPVvKxTHTOFkjpTsnjy9/IxQtHLgv1fInKA6knKUmu8="; + hash = "sha256-GdDpFY9xdjA60zr+i5O9wBWF682tvi4N/pxEob5tYoA="; }; - cargoHash = "sha256-ssZ5JxOd0XVs4hsvnSz1IvtKE7ftEKX3nN2B8SsMesw="; + cargoHash = "sha256-Cvl4EY57TanJK1XGVahPHGtuEAIR44qwGEPDkXfgw5I="; nativeBuildInputs = [ installShellFiles mdbook ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; @@ -42,11 +43,27 @@ rustPlatform.buildRustPackage rec { # Return unchanged string.rs cp $TMPDIR/string.rs tests/string.rs + + # For shell completion tests + export PATH=${bashInteractive}/bin:$PATH + patchShebangs tests ''; + patches = [ + ./fix-just-path-in-tests.patch + ]; + postBuild = '' cargo run --package generate-book + mkdir -p completions man + + cargo run -- --man > man/just.1 + + for shell in bash fish zsh; do + cargo run -- --completions $shell > completions/just.$shell + done + # No linkcheck in sandbox echo 'optional = true' >> book/en/book.toml mdbook build book/en @@ -54,10 +71,12 @@ rustPlatform.buildRustPackage rec { ''; checkFlags = [ - "--skip=edit" # trying to run "vim" fails as there's no /usr/bin/env or which in the sandbox to find vim and the dependency is not easily patched - "--skip=run_shebang" # test case very rarely fails with "Text file busy" - "--skip=invoke_error_function" # wants JUST_CHOOSER to be fzf + "--skip=backticks::trailing_newlines_are_stripped" # Wants to use python3 as alternate shell + "--skip=choose::invoke_error_function" # wants JUST_CHOOSER to be fzf "--skip=choose::default" # symlinks cat->fzf which fails as coreutils doesn't understand name + "--skip=config::tests::show_arguments" # interferes with JUST_CHOOSER being set + "--skip=edit::editor_precedence" # trying to run "vim" fails as there's no /usr/bin/env or which in the sandbox to find vim and the dependency is not easily patched + "--skip=shebang::run_shebang" # test case very rarely fails with "Text file busy" ]; postInstall = '' diff --git a/pkgs/by-name/ko/kor/package.nix b/pkgs/by-name/ko/kor/package.nix index a085106c23a79..5a4f38431fc6e 100644 --- a/pkgs/by-name/ko/kor/package.nix +++ b/pkgs/by-name/ko/kor/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kor"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "yonahd"; repo = pname; rev = "v${version}"; - hash = "sha256-4l19/vIvcgt7g3o6IWGHhIsXurAy6Ts4fJjs8OMZalk="; + hash = "sha256-fyVMRHDzP7od+cwC01vNP/TOiDctD8E0y8uNWtgiEeA="; }; vendorHash = "sha256-NPmsXS7P+pCF97N8x3nQhCRoHJLMO5plNtcUqxxexVE="; diff --git a/pkgs/by-name/li/libfmvoice/package.nix b/pkgs/by-name/li/libfmvoice/package.nix index 294b9c34c6b42..cccc2f512e547 100644 --- a/pkgs/by-name/li/libfmvoice/package.nix +++ b/pkgs/by-name/li/libfmvoice/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libfmvoice"; - version = "0-unstable-2024-05-30"; + version = "0-unstable-2024-06-06"; src = fetchFromGitHub { owner = "vampirefrog"; repo = "libfmvoice"; - rev = "0e58cfb323dc6461c705a5fadac4362a17fbec4e"; - hash = "sha256-HyGB180roo28vJ+11/ocoKu1kHpn6GxtEg9NluQsECg="; + rev = "cd89a6a386b3b17c74b1caca11e297b2748cf90d"; + hash = "sha256-yak+pKxkrKOX/qgtwpldjd85deE/JB040bVjDD1mo7A="; }; strictDeps = true; diff --git a/pkgs/by-name/my/mycelium/Cargo.lock b/pkgs/by-name/my/mycelium/Cargo.lock index bf8ad6ce4d743..d60fb37a9c0c9 100644 --- a/pkgs/by-name/my/mycelium/Cargo.lock +++ b/pkgs/by-name/my/mycelium/Cargo.lock @@ -29,9 +29,9 @@ dependencies = [ [[package]] name = "aes" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", "cipher", @@ -53,57 +53,69 @@ dependencies = [ ] [[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 = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] [[package]] name = "anstream" -version = "0.6.11" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.4" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -111,9 +123,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.79" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "arrayref" @@ -129,20 +141,26 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "async-trait" -version = "0.1.77" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[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.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "axum" @@ -170,7 +188,7 @@ dependencies = [ "serde_json", "serde_path_to_error", "serde_urlencoded", - "sync_wrapper 1.0.0", + "sync_wrapper 1.0.1", "tokio", "tower", "tower-layer", @@ -199,9 +217,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ "addr2line", "cc", @@ -214,15 +232,9 @@ dependencies = [ [[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" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bitflags" @@ -232,9 +244,21 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" + +[[package]] +name = "bitvec" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] [[package]] name = "blake3" @@ -250,10 +274,67 @@ dependencies = [ ] [[package]] +name = "borsh" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6362ed55def622cddc70a4746a68554d7b687713770de539e59a739b249f8ed" +dependencies = [ + "borsh-derive", + "cfg_aliases 0.2.1", +] + +[[package]] +name = "borsh-derive" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3ef8005764f53cd4dca619f5bf64cafd4664dada50ece25e4d81de54c80cc0b" +dependencies = [ + "once_cell", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.66", + "syn_derive", +] + +[[package]] name = "bumpalo" -version = "3.14.0" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "byte-unit" +version = "5.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "33ac19bdf0b2665407c39d82dbc937e951e7e2001609f0fb32edd0af45a2d63e" +dependencies = [ + "rust_decimal", + "serde", + "utf8-width", +] + +[[package]] +name = "bytecheck" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" +dependencies = [ + "bytecheck_derive", + "ptr_meta", + "simdutf8", +] + +[[package]] +name = "bytecheck_derive" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] [[package]] name = "byteorder" @@ -289,12 +370,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] +checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" [[package]] name = "cfg-if" @@ -309,6 +387,12 @@ 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 = "cipher" version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -349,7 +433,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] @@ -360,9 +444,9 @@ checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" [[package]] name = "constant_time_eq" @@ -407,6 +491,27 @@ dependencies = [ ] [[package]] +name = "csv" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" +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 = "ctr" version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -417,9 +522,9 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.1.1" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c" +checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" dependencies = [ "cfg-if", "cpufeatures", @@ -439,7 +544,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] @@ -452,6 +557,27 @@ dependencies = [ ] [[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] name = "dlopen2" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -463,17 +589,10 @@ dependencies = [ ] [[package]] -name = "env_logger" -version = "0.10.2" +name = "encode_unicode" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" -dependencies = [ - "humantime", - "is-terminal", - "log", - "regex", - "termcolor", -] +checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" [[package]] name = "equivalent" @@ -483,9 +602,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -493,9 +612,9 @@ dependencies = [ [[package]] name = "etherparse" -version = "0.14.3" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "095ab548cf452be5813424558a18af88f0a620d0f4a3d8793aa09311a3b6fa5f" +checksum = "21696e6dfe1057a166a042c6d27b89a46aad2ee1003e6e1e03c49d54fd3270d7" dependencies = [ "arrayvec", ] @@ -511,9 +630,9 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.2.5" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27573eac26f4dd11e2b1916c3fe1baa56407c83c71a773a8ba17ec0bca03b6b7" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" [[package]] name = "fnv" @@ -522,21 +641,6 @@ 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" @@ -546,6 +650,12 @@ dependencies = [ ] [[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" @@ -601,7 +711,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] @@ -659,9 +769,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -670,9 +780,9 @@ dependencies = [ [[package]] name = "ghash" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" +checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1" dependencies = [ "opaque-debug", "polyval", @@ -686,15 +796,15 @@ checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "h2" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" dependencies = [ + "atomic-waker", "bytes", "fnv", "futures-core", "futures-sink", - "futures-util", "http", "indexmap", "slab", @@ -705,9 +815,18 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash", +] + +[[package]] +name = "hashbrown" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "heck" @@ -717,9 +836,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hermit-abi" -version = "0.3.4" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -750,12 +869,12 @@ dependencies = [ [[package]] name = "http-body-util" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840" +checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" dependencies = [ "bytes", - "futures-util", + "futures-core", "http", "http-body", "pin-project-lite", @@ -774,16 +893,10 @@ 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 = "1.2.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" +checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" dependencies = [ "bytes", "futures-channel", @@ -802,9 +915,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +checksum = "3d8d52be92d09acc2e01dddb7fde3ad983fc6489c7db4837e605bc3fca4cb63e" dependencies = [ "bytes", "futures-channel", @@ -832,12 +945,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.14.5", ] [[package]] @@ -850,17 +963,6 @@ dependencies = [ ] [[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" @@ -880,26 +982,32 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is-terminal" -version = "0.4.10" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" dependencies = [ "hermit-abi", - "rustix 0.38.30", + "libc", "windows-sys 0.52.0", ] [[package]] +name = "is_terminal_polyfill" +version = "1.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + +[[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "js-sys" -version = "0.3.67" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -922,37 +1030,41 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.154" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libloading" -version = "0.8.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "windows-sys 0.48.0", + "windows-targets 0.52.5", ] [[package]] -name = "linux-raw-sys" -version = "0.1.4" +name = "libredox" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.5.0", + "libc", +] [[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 = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -1000,15 +1112,15 @@ checksum = "df39d232f5c40b0891c10216992c2f250c054105cb1e56f0fc9032db6203ecc1" [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memoffset" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] @@ -1021,9 +1133,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" dependencies = [ "adler", ] @@ -1041,7 +1153,7 @@ dependencies = [ [[package]] name = "mycelium" -version = "0.5.2" +version = "0.5.3" dependencies = [ "aes-gcm", "blake3", @@ -1053,10 +1165,8 @@ dependencies = [ "ipnet", "left-right", "libc", - "log", "netdev", - "nix 0.28.0", - "openssl", + "nix 0.29.0", "quinn", "rand", "rcgen", @@ -1064,37 +1174,83 @@ dependencies = [ "rustls", "serde", "tokio", - "tokio-openssl", "tokio-stream", "tokio-tun", "tokio-util", + "tracing", + "tracing-subscriber", "tun", "wintun 0.4.0", "x25519-dalek", ] [[package]] -name = "myceliumd" -version = "0.5.2" +name = "mycelium-api" +version = "0.5.3" +dependencies = [ + "axum", + "base64", + "mycelium", + "mycelium-metrics", + "serde", + "tokio", + "tracing", +] + +[[package]] +name = "mycelium-cli" +version = "0.5.3" +dependencies = [ + "base64", + "byte-unit", + "mycelium", + "mycelium-api", + "prettytable-rs", + "reqwest", + "serde", + "serde_json", + "tokio", + "tracing", + "urlencoding", +] + +[[package]] +name = "mycelium-metrics" +version = "0.5.3" dependencies = [ "axum", - "base64 0.22.0", - "clap", - "log", "mycelium", - "pretty_env_logger", "prometheus", + "tokio", + "tracing", +] + +[[package]] +name = "myceliumd" +version = "0.5.3" +dependencies = [ + "base64", + "byte-unit", + "clap", + "mycelium", + "mycelium-api", + "mycelium-cli", + "mycelium-metrics", + "prettytable-rs", "reqwest", "serde", "serde_json", "tokio", + "tracing", + "tracing-subscriber", + "urlencoding", ] [[package]] name = "netdev" -version = "0.25.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb353f5a5a852d5cc779c1c80bec0bd14a696ef832f3a761cb10091802c37109" +checksum = "e12d9f49b8d4b9d7f97525ce65f6527079e549e8b2f010f15b921764e73d4baa" dependencies = [ "dlopen2", "libc", @@ -1160,9 +1316,9 @@ dependencies = [ [[package]] name = "netlink-proto" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "842c6770fc4bb33dd902f41829c61ef872b8e38de1405aa0b938b27b8fba12c3" +checksum = "86b33524dc0968bfad349684447bfce6db937a9ac3332a1fe60c0c5a5ce63f21" dependencies = [ "bytes", "futures", @@ -1175,9 +1331,9 @@ dependencies = [ [[package]] name = "netlink-sys" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6471bf08e7ac0135876a9581bf3217ef0333c191c128d34878079f42ee150411" +checksum = "416060d346fbaf1f23f9512963e3e878f1a78e707cb699ba9215761754244307" dependencies = [ "bytes", "futures", @@ -1192,7 +1348,7 @@ version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "cfg-if", "libc", ] @@ -1203,9 +1359,21 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "cfg-if", - "cfg_aliases", + "cfg_aliases 0.1.1", + "libc", +] + +[[package]] +name = "nix" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" +dependencies = [ + "bitflags 2.5.0", + "cfg-if", + "cfg_aliases 0.2.1", "libc", "memoffset", ] @@ -1221,6 +1389,21 @@ dependencies = [ ] [[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", +] + +[[package]] name = "num_cpus" version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1247,57 +1430,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - -[[package]] -name = "openssl" -version = "0.10.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" -dependencies = [ - "bitflags 2.4.2", - "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.48", -] - -[[package]] -name = "openssl-src" -version = "300.2.3+3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843" -dependencies = [ - "cc", -] - -[[package]] -name = "openssl-sys" -version = "0.9.102" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" -dependencies = [ - "cc", - "libc", - "openssl-src", - "pkg-config", - "vcpkg", -] +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "overload" @@ -1307,9 +1442,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -1317,30 +1452,30 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pem" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310" +checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae" dependencies = [ - "base64 0.21.7", + "base64", "serde", ] @@ -1352,29 +1487,29 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -1383,22 +1518,16 @@ 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 = "platforms" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c" +checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7" [[package]] name = "polyval" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52cff9d1d4dee5fe6d03729099f4a310a41179e0a10dbf542039873f2e826fb" +checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" dependencies = [ "cfg-if", "cpufeatures", @@ -1419,42 +1548,88 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] -name = "pretty_env_logger" -version = "0.5.0" +name = "prettytable-rs" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "865724d4dbe39d9f3dd3b52b88d859d66bcb2d6a0acfd5ea68a65fb66d4bdc1c" +checksum = "eea25e07510aa6ab6547308ebe3c036016d162b8da920dbb079e3ba8acf3d95a" dependencies = [ - "env_logger", - "log", + "csv", + "encode_unicode", + "is-terminal", + "lazy_static", + "term", + "unicode-width", +] + +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "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.78" +version = "1.0.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" dependencies = [ "unicode-ident", ] [[package]] name = "procfs" -version = "0.14.2" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1de8dacb0873f77e6aefc6d71e044761fcc68060290f5b1089fcdf84626bb69" +checksum = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4" dependencies = [ - "bitflags 1.3.2", - "byteorder", + "bitflags 2.5.0", "hex", "lazy_static", - "rustix 0.36.17", + "procfs-core", + "rustix", +] + +[[package]] +name = "procfs-core" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29" +dependencies = [ + "bitflags 2.5.0", + "hex", ] [[package]] name = "prometheus" -version = "0.13.3" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c" +checksum = "3d33c28a30771f7f96db69893f78b857f7450d7e0237e9c8fc6427a81bae7ed1" dependencies = [ "cfg-if", "fnv", @@ -1467,10 +1642,30 @@ dependencies = [ ] [[package]] +name = "ptr_meta" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" +dependencies = [ + "ptr_meta_derive", +] + +[[package]] +name = "ptr_meta_derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] name = "quinn" -version = "0.10.2" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cc2c5017e4b43d5995dcea317bc46c1e09404c0a9664d2908f7f02dfe943d75" +checksum = "904e3d3ba178131798c6d9375db2b13b34337d489b089fc5ba0825a2ff1bee73" dependencies = [ "bytes", "pin-project-lite", @@ -1485,13 +1680,13 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.10.6" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "141bf7dfde2fbc246bfd3fe12f2455aa24b0fbd9af535d8c86c7bd1381ff2b1a" +checksum = "e974563a4b1c2206bbc61191ca4da9c22e4308b4c455e8906751cc7828393f08" dependencies = [ "bytes", "rand", - "ring 0.16.20", + "ring", "rustc-hash", "rustls", "slab", @@ -1502,27 +1697,33 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7" +checksum = "e4f0def2590301f4f667db5a77f9694fb004f82796dc1a8b1508fafa3d0e8b72" dependencies = [ - "bytes", "libc", + "once_cell", "socket2", "tracing", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +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" @@ -1554,35 +1755,47 @@ dependencies = [ [[package]] name = "rcgen" -version = "0.12.1" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48406db8ac1f3cbc7dcdb56ec355343817958a356ff430259bb07baf7607e1e1" +checksum = "54077e1872c46788540de1ea3d7f4ccb1983d12f9aa909b234468676c1a36779" dependencies = [ "pem", - "ring 0.17.7", + "ring", + "rustls-pki-types", "time", "yasna", ] [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" dependencies = [ - "bitflags 1.3.2", + "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", + "thiserror", ] [[package]] name = "regex" -version = "1.10.3" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.4", - "regex-syntax 0.8.2", + "regex-automata 0.4.6", + "regex-syntax 0.8.3", ] [[package]] @@ -1596,13 +1809,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b7fa1134405e2ec9353fd416b17f8dacd46c473d7d3fd1cf202706a14eb792a" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax 0.8.3", ] [[package]] @@ -1613,9 +1826,18 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" + +[[package]] +name = "rend" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" +dependencies = [ + "bytecheck", +] [[package]] name = "reqwest" @@ -1623,7 +1845,7 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" dependencies = [ - "base64 0.22.0", + "base64", "bytes", "futures-core", "futures-util", @@ -1654,31 +1876,46 @@ dependencies = [ [[package]] name = "ring" -version = "0.16.20" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", + "cfg-if", + "getrandom", "libc", - "once_cell", - "spin 0.5.2", - "untrusted 0.7.1", - "web-sys", - "winapi", + "spin", + "untrusted", + "windows-sys 0.52.0", ] [[package]] -name = "ring" -version = "0.17.7" +name = "rkyv" +version = "0.7.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0" dependencies = [ - "cc", - "getrandom", - "libc", - "spin 0.9.8", - "untrusted 0.9.0", - "windows-sys 0.48.0", + "bitvec", + "bytecheck", + "bytes", + "hashbrown 0.12.3", + "ptr_meta", + "rend", + "rkyv_derive", + "seahash", + "tinyvec", + "uuid", +] + +[[package]] +name = "rkyv_derive" +version = "0.7.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] @@ -1700,16 +1937,32 @@ dependencies = [ ] [[package]] +name = "rust_decimal" +version = "1.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a" +dependencies = [ + "arrayvec", + "borsh", + "bytes", + "num-traits", + "rand", + "rkyv", + "serde", + "serde_json", +] + +[[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +checksum = "3450ed37fe9609abb6bc3b8891b6e078404e4c53c7332350e2e15126a95229bf" [[package]] name = "rustc_version" @@ -1722,63 +1975,59 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.17" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "305efbd14fde4139eb501df5f136994bb520b033fa9fbdce287507dc23b8c7ed" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.1.4", - "windows-sys 0.45.0", -] - -[[package]] -name = "rustix" -version = "0.38.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" -dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "errno", "libc", - "linux-raw-sys 0.4.13", + "linux-raw-sys", "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.21.12" +version = "0.23.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" +checksum = "a218f0f6d05669de4eabfb24f31ce802035c952429d037507b4a4a39f0e60c5b" dependencies = [ - "ring 0.17.7", + "once_cell", + "ring", + "rustls-pki-types", "rustls-webpki", - "sct", + "subtle", + "zeroize", ] [[package]] +name = "rustls-pki-types" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" + +[[package]] name = "rustls-webpki" -version = "0.101.7" +version = "0.102.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" dependencies = [ - "ring 0.17.7", - "untrusted 0.9.0", + "ring", + "rustls-pki-types", + "untrusted", ] [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "ryu" -version = "1.0.16" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "scoped-tls" @@ -1793,46 +2042,42 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] -name = "sct" -version = "0.7.1" +name = "seahash" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring 0.17.7", - "untrusted 0.9.0", -] +checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "semver" -version = "1.0.21" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.199" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.199" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] name = "serde_json" -version = "1.0.116" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ "itoa", "ryu", @@ -1841,9 +2086,9 @@ dependencies = [ [[package]] name = "serde_path_to_error" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd154a240de39fdebcf5775d2675c204d7c13cf39a4c697be6493c8e734337c" +checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" dependencies = [ "itoa", "serde", @@ -1872,14 +2117,20 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" 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" @@ -1890,37 +2141,31 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.5.5" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", - "windows-sys 0.48.0", + "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 = "strsim" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "subtle" @@ -1941,9 +2186,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.48" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -1951,6 +2196,18 @@ dependencies = [ ] [[package]] +name = "syn_derive" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] name = "sync_wrapper" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1958,9 +2215,9 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "sync_wrapper" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "384595c11a4e2969895cad5a8c4029115f5ab956a9e5ef4de79d11a426e5f20c" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" [[package]] name = "system-configuration" @@ -1968,7 +2225,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "658bc6ee10a9b4fcf576e9b0819d95ec16f4d2c02d39fd83ac1c8789785c4a42" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "core-foundation", "system-configuration-sys", ] @@ -1984,39 +2241,47 @@ dependencies = [ ] [[package]] -name = "termcolor" -version = "1.4.1" +name = "tap" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[package]] +name = "term" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" dependencies = [ - "winapi-util", + "dirs-next", + "rustversion", + "winapi", ] [[package]] name = "thiserror" -version = "1.0.56" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.56" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] name = "thread_local" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ "cfg-if", "once_cell", @@ -2024,11 +2289,12 @@ dependencies = [ [[package]] name = "time" -version = "0.3.31" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", + "num-conv", "powerfmt", "serde", "time-core", @@ -2057,9 +2323,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.37.0" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ "backtrace", "bytes", @@ -2075,25 +2341,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", -] - -[[package]] -name = "tokio-openssl" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ffab79df67727f6acf57f1ff743091873c24c579b1e2ce4d8f53e47ded4d63d" -dependencies = [ - "futures-util", - "openssl", - "openssl-sys", - "tokio", + "syn 2.0.66", ] [[package]] @@ -2122,16 +2376,32 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", +] + +[[package]] +name = "toml_datetime" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" + +[[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", ] [[package]] @@ -2147,7 +2417,6 @@ dependencies = [ "tokio", "tower-layer", "tower-service", - "tracing", ] [[package]] @@ -2168,7 +2437,6 @@ 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", @@ -2182,7 +2450,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] @@ -2233,7 +2501,7 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tun" version = "0.6.1" -source = "git+https://github.com/LeeSmet/rust-tun#eaad3340ef74475def7e080dedff77f7d830f3b8" +source = "git+https://github.com/LeeSmet/rust-tun#eb4d41c0a5d6a6e9c55340e2f61e50683d9f4731" dependencies = [ "byteorder", "bytes", @@ -2267,14 +2535,20 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] +name = "unicode-width" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" + +[[package]] name = "universal-hash" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2286,12 +2560,6 @@ dependencies = [ [[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" @@ -2308,22 +2576,34 @@ dependencies = [ ] [[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + +[[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.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] -name = "valuable" -version = "0.1.0" +name = "uuid" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" [[package]] -name = "vcpkg" -version = "0.2.15" +name = "valuable" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "version_check" @@ -2348,9 +2628,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2358,24 +2638,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.40" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bde2032aeb86bdfaecc8b261eef3cba735cc426c1f3a3416d1e0791be95fc461" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -2385,9 +2665,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2395,28 +2675,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "web-sys" -version = "0.3.67" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -2439,15 +2719,6 @@ 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" @@ -2479,7 +2750,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ "windows-core 0.52.0", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -2489,7 +2760,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" dependencies = [ "windows-core 0.54.0", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -2507,7 +2778,7 @@ 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.5", ] [[package]] @@ -2517,25 +2788,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" dependencies = [ "windows-result", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] name = "windows-result" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd19df78e5168dfb0aedc343d1d1b8d422ab2db6756d2dc3fef75035402a3f64" -dependencies = [ - "windows-targets 0.52.4", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +checksum = "749f0da9cc72d82e600d8d2e44cadd0b9eedb9038f71a1c58556ac1c5791813b" dependencies = [ - "windows-targets 0.42.2", + "windows-targets 0.52.5", ] [[package]] @@ -2553,22 +2815,7 @@ 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", + "windows-targets 0.52.5", ] [[package]] @@ -2588,42 +2835,31 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" 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.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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -2633,15 +2869,9 @@ 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" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -2651,15 +2881,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" [[package]] -name = "windows_i686_msvc" -version = "0.42.2" +name = "windows_i686_gnullvm" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -2669,15 +2899,9 @@ 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" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -2687,15 +2911,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.5" 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" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -2705,27 +2923,30 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.48.5" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] -name = "windows_x86_64_msvc" -version = "0.52.4" +name = "winnow" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] [[package]] name = "winreg" @@ -2764,6 +2985,15 @@ dependencies = [ ] [[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" @@ -2786,9 +3016,9 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" dependencies = [ "zeroize_derive", ] @@ -2801,5 +3031,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] diff --git a/pkgs/by-name/my/mycelium/package.nix b/pkgs/by-name/my/mycelium/package.nix index eea61e0c326b6..9551413833ddd 100644 --- a/pkgs/by-name/my/mycelium/package.nix +++ b/pkgs/by-name/my/mycelium/package.nix @@ -8,19 +8,21 @@ rustPlatform.buildRustPackage rec { pname = "mycelium"; - version = "0.5.2"; + version = "0.5.3"; + + sourceRoot = "source/myceliumd"; src = fetchFromGitHub { owner = "threefoldtech"; repo = "mycelium"; rev = "v${version}"; - hash = "sha256-Mz4YYpnuSGUwQANiXzsJNAYMugXL229E30wnZCu2lSM="; + hash = "sha256-nyHHuwOHaIh8WCxaQb7QoTReV09ydhHLYwEVHQg2Hek="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "tun-0.6.1" = "sha256-DelNPCOWvVSMS2BNGA2Gw/Mn9c7RdFNR21/jo1xf+xk="; + "tun-0.6.1" = "sha256-tJx/qRwPcZOAfxyjZUHKLKsLu+loltVUOCP8IzWMryM="; }; }; diff --git a/pkgs/by-name/re/redka/package.nix b/pkgs/by-name/re/redka/package.nix index d4f62134483b9..669cd5a3535eb 100644 --- a/pkgs/by-name/re/redka/package.nix +++ b/pkgs/by-name/re/redka/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "redka"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "nalgeon"; repo = "redka"; rev = "v${version}"; - hash = "sha256-PlEZMOrAPQh9RxJBw3zhaUoAH44lor7SFSpmODxUM4U="; + hash = "sha256-URPuAltTh95hXePx5zW/bdP2woAoEsKRpf4DHBwzdw4="; }; vendorHash = "sha256-aX0X6TWVEouo884LunCt+UzLyvDHgmvuxdV0wh0r7Ro="; diff --git a/pkgs/by-name/rs/rs-tftpd/package.nix b/pkgs/by-name/rs/rs-tftpd/package.nix index 43b010913ea8a..1e5b513f5ac01 100644 --- a/pkgs/by-name/rs/rs-tftpd/package.nix +++ b/pkgs/by-name/rs/rs-tftpd/package.nix @@ -1,20 +1,23 @@ { lib , rustPlatform , fetchFromGitHub +, nix-update-script }: rustPlatform.buildRustPackage rec { pname = "rs-tftpd"; - version = "0.2.12"; + version = "0.2.13"; src = fetchFromGitHub { owner = "altugbakan"; repo = "rs-tftpd"; rev = version; - hash = "sha256-H67lXwX+4guHpdq0yTHe6tl1NxC41saNrM9g+yH5otk="; + hash = "sha256-ABxgptbdepyTqMOz1YHSNRn1+8xYo8vN/dqZiSleJz4="; }; - cargoHash = "sha256-B5kduRuX9Lcdd31yj4PsDo8fyy0nabtmsiAXvc8RlYo="; + cargoHash = "sha256-8QVgdQnis0ihkU5ZYtxbPIM+9arfO4do1ToRHoi94A8="; + + passthru.updateScript = nix-update-script {}; meta = with lib; { description = "TFTP Server Daemon implemented in Rust"; diff --git a/pkgs/by-name/un/undertime/package.nix b/pkgs/by-name/un/undertime/package.nix new file mode 100644 index 0000000000000..a754229f4d171 --- /dev/null +++ b/pkgs/by-name/un/undertime/package.nix @@ -0,0 +1,47 @@ +{ lib +, python3Packages +, fetchFromGitLab +}: + +python3Packages.buildPythonApplication rec { + pname = "undertime"; + version = "4.0.0"; + pyproject = true; + + src = fetchFromGitLab { + owner = "anarcat"; + repo = pname; + rev = version; + hash = "sha256-BshgSnYaeX01KQ1fggB+yXEfg3Trhpcf/k4AmBDPxy8="; + }; + + nativeBuildInputs = with python3Packages; [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = with python3Packages; [ + dateparser + ephem + pytz + pyyaml + termcolor + tabulate + tzlocal + ]; + + meta = { + changelog = "https://gitlab.com/anarcat/undertime/-/raw/${version}/debian/changelog"; + description = "pick a meeting time across timezones from the commandline"; + homepage = "https://gitlab.com/anarcat/undertime"; + longDescription = '' + Undertime draws a simple 24 hour table of matching times across + different timezones or cities, outlining waking hours. This allows + picking an ideal meeting date across multiple locations for teams + working internationally. + ''; + license = lib.licenses.agpl3Only; + mainProgram = "undertime"; + maintainers = with lib.maintainers; [ dvn0 ]; + }; +} diff --git a/pkgs/by-name/uv/uv/Cargo.lock b/pkgs/by-name/uv/uv/Cargo.lock index d9aecaad97f2e..cccc3b6b3a1f1 100644 --- a/pkgs/by-name/uv/uv/Cargo.lock +++ b/pkgs/by-name/uv/uv/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -224,7 +224,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.66", ] [[package]] @@ -275,9 +275,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "axoasset" -version = "0.9.3" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d492e2a60fbacf2154ee58fd4bc3dd7385a5febf10fef6145924fd3117cd920" +checksum = "83394fb98d130ef5a4713d26dccc1bb25c66e1d58f351fed710af62c57abb8fa" dependencies = [ "camino", "miette", @@ -346,9 +346,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.71" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11" dependencies = [ "addr2line", "cc", @@ -464,9 +464,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "4.0.0" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6221fe77a248b9117d431ad93761222e1cf8ff282d9d1d5d9f53d6299a1cf76" +checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -608,9 +608,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.97" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4" +checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" dependencies = [ "jobserver", "libc", @@ -754,7 +754,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.66", ] [[package]] @@ -871,9 +871,9 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] @@ -935,9 +935,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crunchy" @@ -1190,9 +1190,9 @@ dependencies = [ [[package]] name = "event-listener" -version = "5.3.0" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" dependencies = [ "concurrent-queue", "parking", @@ -1393,7 +1393,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.66", ] [[package]] @@ -1438,9 +1438,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "js-sys", @@ -1461,9 +1461,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "glob" @@ -1842,9 +1842,9 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if", "js-sys", @@ -1974,9 +1974,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libmimalloc-sys" @@ -2136,7 +2136,7 @@ checksum = "dcf09caffaac8068c346b6df2a7fc27a177fd20b39421a39ce0a211bde679a6c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.66", ] [[package]] @@ -2156,9 +2156,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" dependencies = [ "adler", "simd-adler32", @@ -2270,9 +2270,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "object" -version = "0.32.2" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e" dependencies = [ "memchr", ] @@ -2341,9 +2341,9 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core 0.9.10", @@ -2486,7 +2486,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.66", ] [[package]] @@ -2533,7 +2533,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.66", ] [[package]] @@ -2650,9 +2650,9 @@ dependencies = [ [[package]] name = "priority-queue" -version = "2.0.2" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "509354d8a769e8d0b567d6821b84495c60213162761a732d68ce87c964bd347f" +checksum = "70c501afe3a2e25c9bd219aa56ec1e04cdb3fcdd763055be268778c13fa82c1f" dependencies = [ "autocfg", "equivalent", @@ -2661,9 +2661,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.82" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" +checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" dependencies = [ "unicode-ident", ] @@ -2691,7 +2691,7 @@ dependencies = [ [[package]] name = "pubgrub" version = "0.2.1" -source = "git+https://github.com/astral-sh/pubgrub?rev=d4795a31be17669aba11eb741b4a9086acc3eb11#d4795a31be17669aba11eb741b4a9086acc3eb11" +source = "git+https://github.com/astral-sh/pubgrub?rev=a68cbd1a26e43986a31563e1d127e83bafca3a0c#a68cbd1a26e43986a31563e1d127e83bafca3a0c" dependencies = [ "indexmap", "log", @@ -2710,7 +2710,7 @@ dependencies = [ "indoc", "libc", "memoffset 0.9.1", - "parking_lot 0.11.2", + "parking_lot 0.12.3", "portable-atomic", "pyo3-build-config", "pyo3-ffi", @@ -2758,7 +2758,7 @@ dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 2.0.64", + "syn 2.0.66", ] [[package]] @@ -2771,7 +2771,7 @@ dependencies = [ "proc-macro2", "pyo3-build-config", "quote", - "syn 2.0.64", + "syn 2.0.66", ] [[package]] @@ -3380,7 +3380,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.64", + "syn 2.0.66", ] [[package]] @@ -3441,7 +3441,7 @@ checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.66", ] [[package]] @@ -3452,7 +3452,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.66", ] [[package]] @@ -3683,9 +3683,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.64" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ad3dee41f36859875573074334c200d1add8e4a87bb37113ebd31d926b7b11f" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -3732,7 +3732,7 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96374855068f47402c3121c6eed88d29cb1de8f3ab27090e273e420bdabcf050" dependencies = [ - "parking_lot 0.12.2", + "parking_lot 0.12.3", ] [[package]] @@ -3781,7 +3781,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.66", ] [[package]] @@ -3792,7 +3792,7 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.66", "test-case-core", ] @@ -3814,7 +3814,7 @@ checksum = "5999e24eaa32083191ba4e425deb75cdf25efefabe5aaccb7446dd0d4122a3f5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.66", ] [[package]] @@ -3854,7 +3854,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.66", ] [[package]] @@ -3954,7 +3954,7 @@ dependencies = [ "libc", "mio", "num_cpus", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "pin-project-lite", "signal-hook-registry", "socket2", @@ -3970,7 +3970,7 @@ checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.66", ] [[package]] @@ -4027,9 +4027,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.13" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" dependencies = [ "serde", "serde_spanned", @@ -4048,9 +4048,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.13" +version = "0.22.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c" +checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" dependencies = [ "indexmap", "serde", @@ -4106,7 +4106,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.66", ] [[package]] @@ -4367,7 +4367,7 @@ checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" [[package]] name = "uv" -version = "0.2.6" +version = "0.2.9" dependencies = [ "anstream", "anyhow", @@ -4383,6 +4383,7 @@ dependencies = [ "filetime", "flate2", "fs-err", + "ignore", "indicatif", "indoc", "insta", @@ -4391,6 +4392,7 @@ dependencies = [ "miette", "mimalloc", "owo-colors", + "pep440_rs", "pep508_rs", "platform-tags", "predicates", @@ -4529,6 +4531,7 @@ dependencies = [ "hyper-util", "insta", "install-wheel-rs", + "itertools 0.13.0", "pep440_rs", "pep508_rs", "platform-tags", @@ -4661,6 +4664,7 @@ dependencies = [ "insta", "install-wheel-rs", "nanoid", + "once_cell", "path-absolutize", "pep440_rs", "pep508_rs", @@ -4881,7 +4885,6 @@ dependencies = [ name = "uv-resolver" version = "0.0.1" dependencies = [ - "anstream", "anyhow", "cache-key", "chrono", @@ -4897,7 +4900,6 @@ dependencies = [ "install-wheel-rs", "itertools 0.13.0", "once-map", - "once_cell", "owo-colors", "pep440_rs", "pep508_rs", @@ -4918,7 +4920,6 @@ dependencies = [ "toml_edit", "tracing", "url", - "uv-cache", "uv-client", "uv-configuration", "uv-distribution", @@ -4960,7 +4961,7 @@ dependencies = [ [[package]] name = "uv-version" -version = "0.2.6" +version = "0.2.9" [[package]] name = "uv-virtualenv" @@ -5078,7 +5079,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.66", "wasm-bindgen-shared", ] @@ -5112,7 +5113,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.66", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5276,7 +5277,7 @@ checksum = "12168c33176773b86799be25e2a2ba07c7aab9968b37541f1094dbd7a60c8946" dependencies = [ "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.66", ] [[package]] @@ -5287,7 +5288,7 @@ checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.66", ] [[package]] @@ -5298,7 +5299,7 @@ checksum = "9d8dc32e0095a7eeccebd0e3f09e9509365ecb3fc6ac4d6f5f14a3f6392942d1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.66", ] [[package]] @@ -5309,7 +5310,7 @@ checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.66", ] [[package]] @@ -5462,9 +5463,9 @@ checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" -version = "0.6.8" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d" +checksum = "56c52728401e1dc672a56e81e593e912aa54c78f40246869f78359a2bf24d29d" dependencies = [ "memchr", ] @@ -5557,9 +5558,9 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" [[package]] name = "zip" diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 0300f771a1777..2982497d89065 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -16,21 +16,21 @@ python3Packages.buildPythonApplication rec { pname = "uv"; - version = "0.2.6"; + version = "0.2.9"; pyproject = true; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; rev = "refs/tags/${version}"; - hash = "sha256-8HKpqPkQ2FGaq0NrlBpnf49G3ikNhsS/rC/tBZ6de3g="; + hash = "sha256-fMzMHWP06/0fqSnt+pVaht4TIo13yB7Y+DCJzXbmaio="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { "async_zip-0.0.17" = "sha256-Q5fMDJrQtob54CTII3+SXHeozy5S5s3iLOzntevdGOs="; - "pubgrub-0.2.1" = "sha256-DtUK5k7Hfl5h9nFSSeD2zm4wBiVo4tScvFTUQWxTYlU="; + "pubgrub-0.2.1" = "sha256-i1Eaip4J5VXb66p1w0sRjP655AngBLEym70ChbAFFIc="; }; }; diff --git a/pkgs/by-name/wy/wyoming-satellite/package.nix b/pkgs/by-name/wy/wyoming-satellite/package.nix index 45c0ff03eeb1f..cb34afc5b2f1a 100644 --- a/pkgs/by-name/wy/wyoming-satellite/package.nix +++ b/pkgs/by-name/wy/wyoming-satellite/package.nix @@ -21,6 +21,7 @@ python3Packages.buildPythonApplication rec { ]; pythonRelaxDeps = [ + "wyoming" "zeroconf" ]; diff --git a/pkgs/by-name/zp/zpaqfranz/package.nix b/pkgs/by-name/zp/zpaqfranz/package.nix index f0c3f8721a6a2..0801c920c653d 100644 --- a/pkgs/by-name/zp/zpaqfranz/package.nix +++ b/pkgs/by-name/zp/zpaqfranz/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "zpaqfranz"; - version = "59.6"; + version = "59.7"; src = fetchFromGitHub { owner = "fcorbelli"; repo = "zpaqfranz"; rev = finalAttrs.version; - hash = "sha256-qDiFYVIaMEETYPDX+zIix+Si4RHsEveBhZXeAEALO2I="; + hash = "sha256-BP9aAzS5ZeT0mZeheQY7tcnTLuJZMWz3se1phv5u5BI="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/pix/default.nix b/pkgs/desktops/cinnamon/pix/default.nix index 45b8da1760ba8..a0ef67a9302b1 100644 --- a/pkgs/desktops/cinnamon/pix/default.nix +++ b/pkgs/desktops/cinnamon/pix/default.nix @@ -7,6 +7,7 @@ , exiv2 , libheif , libjpeg +, libjxl , libtiff , gst_all_1 , libraw @@ -30,13 +31,13 @@ stdenv.mkDerivation rec { pname = "pix"; - version = "3.2.2"; + version = "3.4.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-tRndJjUw/k5mJPFTBMfW88Mvp2wZtC3RUzyS8bBO1jc="; + sha256 = "sha256-XXt5tq+Zfm6fqorsFAWV3guii6gTK5JRgw26GkNkoos="; }; nativeBuildInputs = [ @@ -65,6 +66,7 @@ stdenv.mkDerivation rec { lcms2 libheif libjpeg + libjxl libraw librsvg libsecret diff --git a/pkgs/desktops/cinnamon/xapp/default.nix b/pkgs/desktops/cinnamon/xapp/default.nix index 14b706fbd4c37..b55830b56c45b 100644 --- a/pkgs/desktops/cinnamon/xapp/default.nix +++ b/pkgs/desktops/cinnamon/xapp/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { pname = "xapp"; - version = "2.8.2"; + version = "2.8.3"; outputs = [ "out" "dev" ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-n600mc8/4+bYUtYaHUnmr90ThVkngcu8Ft02iuSrWWQ="; + hash = "sha256-uWBHCsKcW0vP2HYHQWXPrCSr5NsN2nYWAzBByxJBVrY="; }; # Recommended by upstream, which enables the build of xapp-debug. diff --git a/pkgs/desktops/cinnamon/xreader/default.nix b/pkgs/desktops/cinnamon/xreader/default.nix index 05a4aedfb6ed6..19e8ced87c90c 100644 --- a/pkgs/desktops/cinnamon/xreader/default.nix +++ b/pkgs/desktops/cinnamon/xreader/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "xreader"; - version = "4.0.2"; + version = "4.2.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-X5XMkO2JFceLyH7KEp8mnDltdjGpCT4kVGdcpGRpUJI="; + sha256 = "sha256-MWSAyXQcE8cDdzJISFV7UHheHX+7zF1Ula+LGicvUPM="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lomiri/applications/lomiri-filemanager-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-filemanager-app/default.nix new file mode 100644 index 0000000000000..fa91e1531bf21 --- /dev/null +++ b/pkgs/desktops/lomiri/applications/lomiri-filemanager-app/default.nix @@ -0,0 +1,142 @@ +{ + stdenv, + lib, + fetchFromGitLab, + fetchpatch, + gitUpdater, + nixosTests, + biometryd, + cmake, + content-hub, + gettext, + lomiri-thumbnailer, + lomiri-ui-extras, + lomiri-ui-toolkit, + pkg-config, + python3, + qtbase, + qtdeclarative, + samba, + wrapQtAppsHook, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "lomiri-filemanager-app"; + version = "1.0.4"; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/apps/lomiri-filemanager-app"; + rev = "v${finalAttrs.version}"; + hash = "sha256-vjGCTfXoqul1S7KUJXG6JwgZOc2etXWsdKbyQ/V3abA="; + }; + + patches = [ + # This sets the *wrong* domain, but at least it sets *some* domain. + # Remove when version > 1.0.4 + (fetchpatch { + name = "0001-lomiri-filemanager-app-Set-a-gettext-domain.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/commit/b310434d2c25a3b446d3d975f3755eb473a833e8.patch"; + hash = "sha256-gzFFzZCIxedMGW4fp6sonnHj/HmwqdqU5fvGhXUsSOI="; + }) + + # Set the *correct* domain. + # Remove when version > 1.0.4 + (fetchpatch { + name = "0002-lomiri-filemanager-app-Fix-gettext-domain.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/commit/2bb19aeef2baba8d12df1e4976becc08d7cf341d.patch"; + hash = "sha256-wreOMMvBjf316N/XJv3VfI5f5N/VFiEraeadtgRStjA="; + }) + + # Bind domain to locale dir + # Remove when https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/merge_requests/112 merged & in release + (fetchpatch { + name = "0003-lomiri-filemanager-app-Call-i18n.bindtextdomain.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/commit/ac0ab681c52c691d464cf94707b013b39675ad2d.patch"; + hash = "sha256-mwpcHwMT2FcNC6KIZNuSWU/bA8XP8rEQKHn7t5m6npM="; + }) + + # Stop using deprecated qt5_use_modules + # Remove when https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/merge_requests/113 merged & in release + (fetchpatch { + name = "0004-lomiri-filemanager-app-Stop-using-qt5_use_modules.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/commit/c2bfe927b16e660bf4730371b1e61e442e034780.patch"; + hash = "sha256-wPOZP2FOaacEGj4SMS5Q/TO+/L11Qz7NTux4kA86Bcs="; + }) + + # Use pkg-config for smbclient flags + # Remove when https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/merge_requests/115 merged & in release + (fetchpatch { + name = "0005-lomiri-filemanager-app-Get-smbclient-flags-via-pkg-config.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/commit/aa791da5999719724e0b0592765e8fa2962305c6.patch"; + hash = "sha256-fFAYKBR28ym/n7fhP9O6VE2owarLxK8cN9QeExHFbtU="; + }) + ]; + + postPatch = '' + # Use correct QML install path, don't pull in autopilot test code (we can't run that system) + # Remove absolute paths from desktop file, https://github.com/NixOS/nixpkgs/issues/308324 + substituteInPlace CMakeLists.txt \ + --replace-fail 'qmake -query QT_INSTALL_QML' 'echo ${placeholder "out"}/${qtbase.qtQmlPrefix}' \ + --replace-fail 'add_subdirectory(tests)' '#add_subdirectory(tests)' \ + --replace-fail 'ICON ''${CMAKE_INSTALL_PREFIX}/''${DATA_DIR}/''${ICON_FILE}' 'ICON lomiri-filemanager-app' \ + --replace-fail 'SPLASH ''${CMAKE_INSTALL_PREFIX}/''${DATA_DIR}/''${SPLASH_FILE}' 'SPLASH lomiri-app-launch/splash/lomiri-filemanager-app.svg' + + # In case this ever gets run, at least point it to a correct-ish path + substituteInPlace tests/autopilot/CMakeLists.txt \ + --replace-fail 'python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())"' 'echo "${placeholder "out"}/${python3.sitePackages}/lomiri_filemanager_app"' + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + gettext + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + qtbase + qtdeclarative + samba + + # QML + biometryd + content-hub + lomiri-thumbnailer + lomiri-ui-extras + lomiri-ui-toolkit + ]; + + cmakeFlags = [ + (lib.cmakeBool "INSTALL_TESTS" false) + (lib.cmakeBool "CLICK_MODE" false) + ]; + + # No tests we can actually run (just autopilot) + doCheck = false; + + postInstall = '' + # Some misc files don't get installed to the correct paths for us + mkdir -p $out/share/{content-hub/peers,icons/hicolor/scalable/apps,lomiri-app-launch/splash} + ln -s $out/share/lomiri-filemanager-app/content-hub.json $out/share/content-hub/peers/lomiri-filemanager-app + ln -s $out/share/lomiri-filemanager-app/filemanager.svg $out/share/icons/hicolor/scalable/apps/lomiri-filemanager-app.svg + ln -s $out/share/lomiri-filemanager-app/splash.svg $out/share/lomiri-app-launch/splash/lomiri-filemanager-app.svg + ''; + + passthru = { + tests.vm = nixosTests.lomiri-filemanager-app; + updateScript = gitUpdater { rev-prefix = "v"; }; + }; + + meta = { + description = "File Manager application for Ubuntu Touch devices"; + homepage = "https://gitlab.com/ubports/development/apps/lomiri-filemanager-app"; + changelog = "https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/blob/v${finalAttrs.version}/ChangeLog"; + license = lib.licenses.gpl3Only; + mainProgram = "lomiri-filemanager-app"; + maintainers = lib.teams.lomiri.members; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/desktops/lomiri/applications/lomiri/9902-lomiri-Check-NIXOS_XKB_LAYOUTS.patch b/pkgs/desktops/lomiri/applications/lomiri/9902-lomiri-Check-NIXOS_XKB_LAYOUTS.patch new file mode 100644 index 0000000000000..0563aab5dda85 --- /dev/null +++ b/pkgs/desktops/lomiri/applications/lomiri/9902-lomiri-Check-NIXOS_XKB_LAYOUTS.patch @@ -0,0 +1,29 @@ +From 640cab41986fac83742af39dd19877041a2ab8dc Mon Sep 17 00:00:00 2001 +From: OPNA2608 <opna2608@protonmail.com> +Date: Sat, 1 Jun 2024 00:22:27 +0200 +Subject: [PATCH] Check NIXOS_XKB_LAYOUTS for layouts before falling back to + "us" + +--- + plugins/AccountsService/AccountsService.cpp | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/plugins/AccountsService/AccountsService.cpp b/plugins/AccountsService/AccountsService.cpp +index bcf18246c..f4a7dfaa1 100644 +--- a/plugins/AccountsService/AccountsService.cpp ++++ b/plugins/AccountsService/AccountsService.cpp +@@ -295,6 +295,11 @@ QStringList AccountsService::keymaps() const + return simplifiedMaps; + } + ++ char* fallbackNixosLayouts = getenv("NIXOS_XKB_LAYOUTS"); ++ if (fallbackNixosLayouts != NULL && fallbackNixosLayouts[0] != '\0') { ++ return QString(fallbackNixosLayouts).split(QLatin1Char(','), Qt::SkipEmptyParts); ++ } ++ + return {QStringLiteral("us")}; + } + +-- +2.42.0 + diff --git a/pkgs/desktops/lomiri/applications/lomiri/default.nix b/pkgs/desktops/lomiri/applications/lomiri/default.nix index 35fdd1e466178..ca46560e702a5 100644 --- a/pkgs/desktops/lomiri/applications/lomiri/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri/default.nix @@ -117,6 +117,7 @@ stdenv.mkDerivation (finalAttrs: { }) ./9901-lomiri-Disable-Wizard.patch + ./9902-lomiri-Check-NIXOS_XKB_LAYOUTS.patch ]; postPatch = '' diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix index 76e0351e5a07a..03d8e9451bbb0 100644 --- a/pkgs/desktops/lomiri/default.nix +++ b/pkgs/desktops/lomiri/default.nix @@ -9,6 +9,7 @@ let in { #### Core Apps lomiri = callPackage ./applications/lomiri { }; + lomiri-filemanager-app = callPackage ./applications/lomiri-filemanager-app { }; lomiri-system-settings-unwrapped = callPackage ./applications/lomiri-system-settings { }; lomiri-system-settings-security-privacy = callPackage ./applications/lomiri-system-settings/plugins/lomiri-system-settings-security-privacy.nix { }; lomiri-system-settings = callPackage ./applications/lomiri-system-settings/wrapper.nix { }; diff --git a/pkgs/desktops/lomiri/development/lomiri-app-launch/2001-Inject-current-system-PATH.patch b/pkgs/desktops/lomiri/development/lomiri-app-launch/2001-Inject-current-system-PATH.patch new file mode 100644 index 0000000000000..86bf90085d7a0 --- /dev/null +++ b/pkgs/desktops/lomiri/development/lomiri-app-launch/2001-Inject-current-system-PATH.patch @@ -0,0 +1,59 @@ +From e4fe87427f24aa9b506c15c0f73f298e8909aabe Mon Sep 17 00:00:00 2001 +From: OPNA2608 <opna2608@protonmail.com> +Date: Fri, 31 May 2024 21:31:46 +0200 +Subject: [PATCH] Inject current-system PATH + +--- + liblomiri-app-launch/jobs-systemd.cpp | 16 ++++++++++++++++ + liblomiri-app-launch/jobs-systemd.h | 1 + + 2 files changed, 17 insertions(+) + +diff --git a/liblomiri-app-launch/jobs-systemd.cpp b/liblomiri-app-launch/jobs-systemd.cpp +index e9be801..246bea8 100644 +--- a/liblomiri-app-launch/jobs-systemd.cpp ++++ b/liblomiri-app-launch/jobs-systemd.cpp +@@ -574,6 +574,20 @@ void SystemD::copyEnvByPrefix(const std::string& prefix, std::list<std::pair<std + } + } + ++/* We don't have a normal PATH, so we need to inject our special one as a fallback & propagate it */ ++void SystemD::setupNixosPath(std::list<std::pair<std::string, std::string>>& env) ++{ ++ std::string newPath { "/run/current-system/sw/bin" }; ++ char* oldPath = getenv("PATH"); ++ if (oldPath != NULL && oldPath[0] != '\0') ++ { ++ newPath.insert(0, 1, ':'); ++ newPath.insert(0, oldPath); ++ } ++ setenv("PATH", newPath.c_str(), true); ++ copyEnv("PATH", env); ++} ++ + std::shared_ptr<Application::Instance> SystemD::launch( + const AppID& appId, + const std::string& job, +@@ -625,6 +639,8 @@ std::shared_ptr<Application::Instance> SystemD::launch( + + copyEnv("DISPLAY", env); + ++ setupNixosPath(env); ++ + for (const auto& prefix : {"DBUS_", "MIR_", "LOMIRI_APP_LAUNCH_"}) + { + copyEnvByPrefix(prefix, env); +diff --git a/liblomiri-app-launch/jobs-systemd.h b/liblomiri-app-launch/jobs-systemd.h +index fe35932..19bf44e 100644 +--- a/liblomiri-app-launch/jobs-systemd.h ++++ b/liblomiri-app-launch/jobs-systemd.h +@@ -136,6 +136,7 @@ private: + static void copyEnv(const std::string& envname, std::list<std::pair<std::string, std::string>>& env); + static void copyEnvByPrefix(const std::string& prefix, std::list<std::pair<std::string, std::string>>& env); + static int envSize(std::list<std::pair<std::string, std::string>>& env); ++ static void setupNixosPath(std::list<std::pair<std::string, std::string>>& env); + + static std::vector<std::string> parseExec(std::list<std::pair<std::string, std::string>>& env); + static void application_start_cb(GObject* obj, GAsyncResult* res, gpointer user_data); +-- +2.42.0 + diff --git a/pkgs/desktops/lomiri/development/lomiri-app-launch/default.nix b/pkgs/desktops/lomiri/development/lomiri-app-launch/default.nix index 381a89fe10ff6..ea44e6babb64c 100644 --- a/pkgs/desktops/lomiri/development/lomiri-app-launch/default.nix +++ b/pkgs/desktops/lomiri/development/lomiri-app-launch/default.nix @@ -48,12 +48,15 @@ stdenv.mkDerivation (finalAttrs: { }; patches = [ - # Remove when https://gitlab.com/ubports/development/core/lomiri-app-launch/-/merge_requests/57 merged & in release + # Remove when version > 0.1.9 (fetchpatch { name = "0001-lomiri-app-launch-Fix-typelib-gir-dependency.patch"; - url = "https://gitlab.com/ubports/development/core/lomiri-app-launch/-/commit/0419b2592284f43ee5e76060948ea3d5f1c991fd.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-app-launch/-/commit/8466e77914e73801499df224fcd4a53c4a0eab25.patch"; hash = "sha256-11pEhFi39Cvqb9Hg47kT8+5hq+bz6WmySqaIdwt1MVk="; }) + + # Use /run/current-system/sw/bin fallback for desktop file Exec= lookups, propagate to launched applications + ./2001-Inject-current-system-PATH.patch ]; postPatch = '' @@ -61,10 +64,10 @@ stdenv.mkDerivation (finalAttrs: { # used pkg_get_variable, cannot replace prefix substituteInPlace data/CMakeLists.txt \ - --replace 'pkg_get_variable(SYSTEMD_USER_UNIT_DIR systemd systemduserunitdir)' 'set(SYSTEMD_USER_UNIT_DIR "''${CMAKE_INSTALL_PREFIX}/lib/systemd/user")' + --replace-fail 'pkg_get_variable(SYSTEMD_USER_UNIT_DIR systemd systemduserunitdir)' 'pkg_get_variable(SYSTEMD_USER_UNIT_DIR systemd systemduserunitdir DEFINE_VARIABLES prefix=''${CMAKE_INSTALL_PREFIX})' substituteInPlace tests/jobs-systemd.cpp \ - --replace '^(/usr)?' '^(/nix/store/\\w+-bash-.+)?' + --replace-fail '^(/usr)?' '^(/nix/store/\\w+-bash-.+)?' ''; strictDeps = true; @@ -136,13 +139,13 @@ stdenv.mkDerivation (finalAttrs: { updateScript = gitUpdater { }; }; - meta = with lib; { + meta = { description = "System and associated utilities to launch applications in a standard and confined way"; homepage = "https://gitlab.com/ubports/development/core/lomiri-app-launch"; changelog = "https://gitlab.com/ubports/development/core/lomiri-app-launch/-/blob/${finalAttrs.version}/ChangeLog"; - license = licenses.gpl3Only; - maintainers = teams.lomiri.members; - platforms = platforms.linux; + license = lib.licenses.gpl3Only; + maintainers = lib.teams.lomiri.members; + platforms = lib.platforms.linux; pkgConfigModules = [ "lomiri-app-launch-0" ]; diff --git a/pkgs/desktops/lomiri/services/content-hub/default.nix b/pkgs/desktops/lomiri/services/content-hub/default.nix index 3df927d3ed2dc..a1fd997578442 100644 --- a/pkgs/desktops/lomiri/services/content-hub/default.nix +++ b/pkgs/desktops/lomiri/services/content-hub/default.nix @@ -47,11 +47,11 @@ stdenv.mkDerivation (finalAttrs: { ]; patches = [ - # Remove when https://gitlab.com/ubports/development/core/content-hub/-/merge_requests/33 merged & in release + # Remove when version > 1.1.1 (fetchpatch { name = "0001-content-hub-Migrate-to-GetConnectionCredentials.patch"; - url = "https://gitlab.com/ubports/development/core/content-hub/-/commit/9c0eae42d856b4b6e24fa609ade0e674c7a84cfe.patch"; - hash = "sha256-IWoCQKSCCk26n7133oG0Ht+iEjavn/IiOVUM+tCLX2U="; + url = "https://gitlab.com/ubports/development/core/content-hub/-/commit/9ec9df32f77383eec7994d8e3e6961531bc8464d.patch"; + hash = "sha256-14dZosMTMa1FDGEMuil0r1Hz6vn+L9XC83NMAqC7Ol8="; }) # Remove when https://gitlab.com/ubports/development/core/content-hub/-/merge_requests/34 merged & in release @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-T+6T9lXne6AhDFv9d7L8JNwdl8f0wjDmvSoNVPkHza4="; }) - # Remove when https://gitlab.com/ubports/development/core/content-hub/-/merge_requests/35 merged & in release + # Remove when version > 1.1.1 # fetchpatch2 due to renames, https://github.com/NixOS/nixpkgs/issues/32084 (fetchpatch2 { name = "0003-content-hub-Add-more-better-GNUInstallDirs-variables-usage.patch"; @@ -69,16 +69,18 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-kYN0eLwMyM/9yK+zboyEsoPKZMZ4SCXodVYsvkQr2F8="; }) - # Remove when https://gitlab.com/ubports/development/core/content-hub/-/merge_requests/37 merged & in release + # Remove when version > 1.1.1 (fetchpatch { - name = "0004-content-hub-Fix-generation-of-transfer_files.patch"; - url = "https://gitlab.com/ubports/development/core/content-hub/-/commit/7ab3a4421356f83515f0deffb5f97a5b38601c13.patch"; - hash = "sha256-MJZm3ny5t0/GX0bd5hGQbPM2k7M4KUvKqce/0cYYgvM="; + name = "0004-content-hub-Fix-generation-of-transfer_files-and-moc_test_harness.patch"; + url = "https://gitlab.com/ubports/development/core/content-hub/-/commit/68899c75e77e1f34176b8a550d52794413e5070f.patch"; + hash = "sha256-HAxePnzY/cL2c+o+Aw2N1pdr8rsbHGmRsH2EQkrBcHg="; }) + + # Remove when https://gitlab.com/ubports/development/core/lomiri-content-hub/-/merge_requests/40 merged & in release (fetchpatch { - name = "0005-content-hub-Fix-generation-of-moc_test_harness.patch"; - url = "https://gitlab.com/ubports/development/core/content-hub/-/commit/6e30f4f10ef90e817ca01d32959b6c782de48955.patch"; - hash = "sha256-TAbYn265RpHpulaRVaHy9XqNF+qoDE7YQIfFMPfqEhw="; + name = "0006-content-hub-Fix-AppArmor-less-transfer.patch"; + url = "https://gitlab.com/ubports/development/core/content-hub/-/commit/b58e5c8babf00ad7c402555c96254ce0165adb9e.patch"; + hash = "sha256-a7x/0NiUBmmFlq96jkHyLCL0f5NIFh5JR/H+FQ/2GqI="; }) ]; @@ -175,7 +177,7 @@ stdenv.mkDerivation (finalAttrs: { updateScript = gitUpdater { }; }; - meta = with lib; { + meta = { description = "Content sharing/picking service"; longDescription = '' content-hub is a mediation service to let applications share content between them, @@ -183,10 +185,10 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://gitlab.com/ubports/development/core/content-hub"; changelog = "https://gitlab.com/ubports/development/core/content-hub/-/blob/${finalAttrs.version}/ChangeLog"; - license = with licenses; [ gpl3Only lgpl3Only ]; + license = with lib.licenses; [ gpl3Only lgpl3Only ]; mainProgram = "content-hub-service"; - maintainers = teams.lomiri.members; - platforms = platforms.linux; + maintainers = lib.teams.lomiri.members; + platforms = lib.platforms.linux; pkgConfigModules = [ "libcontent-hub" "libcontent-hub-glib" diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix index f685ab2405f64..fab12e06bcc60 100644 --- a/pkgs/development/compilers/unison/default.nix +++ b/pkgs/development/compilers/unison/default.nix @@ -13,17 +13,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "unison-code-manager"; - version = "0.5.20"; + version = "0.5.21"; src = if stdenv.isDarwin then fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos.tar.gz"; - hash = "sha256-jhI3qy2ov8bf3l1n0wsslWT70LDeQ6sGNSH62VFJ5cE="; + hash = "sha256-AtLky8RevRRAZFAzGz4UqWhBP+Qm/kRu4fMTdx9KB+w="; } else fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux.tar.gz"; - hash = "sha256-MOm0RsMFWGik2OL2MPkgmHqKYNO28fkZHVJ/6P3aIww="; + hash = "sha256-ninkfYB9dmOD6+LsQNDJW89FrwZn2GrZkLGbafMsrHg="; }; # The tarball is just the prebuilt binary, in the archive root. diff --git a/pkgs/development/coq-modules/coq-lsp/default.nix b/pkgs/development/coq-modules/coq-lsp/default.nix index afa42728bb59c..8a031ba84d7af 100644 --- a/pkgs/development/coq-modules/coq-lsp/default.nix +++ b/pkgs/development/coq-modules/coq-lsp/default.nix @@ -8,16 +8,16 @@ mkCoqDerivation rec { useDune = true; release."0.1.8+8.16".sha256 = "sha256-dEEAK5IXGjHB8D/fYJRQG/oCotoXJuWLxXB0GQlY2eo="; - release."0.1.8+8.17".sha256 = "sha256-TmaE+osn/yAPU1Dyni/UTd5w/L2+qyPE3H/g6IWvHLQ="; - release."0.1.8+8.18".sha256 = "sha256-UYmiDdbax4wxp5dLia/1t1gFyK6UELtJJvDMd5Hd14s="; - release."0.1.8+8.19".sha256 = "sha256-aO3hUAWEqVxvCF7uJs+S4yrRxSMe/GaLKVfW/vawzNs="; + release."0.1.9+8.17".sha256 = "sha256-BCsVRKSE9txeKgDfTsu7hQ6MebC+dX2AAqDF9iL7bYE="; + release."0.1.9+8.18".sha256 = "sha256-elAXvkyqw/R/EziGn+QdPn42t5rqTVVW08BXGP3HimY="; + release."0.1.9+8.19".sha256 = "sha256-0bk0o25aYkrRf5zaWZnNJqqoBZ6u8nSV9QDIWCeFEco="; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = isEq "8.16"; out = "0.1.8+8.16"; } - { case = isEq "8.17"; out = "0.1.8+8.17"; } - { case = isEq "8.18"; out = "0.1.8+8.18"; } - { case = isEq "8.19"; out = "0.1.8+8.19"; } + { case = isEq "8.17"; out = "0.1.9+8.17"; } + { case = isEq "8.18"; out = "0.1.9+8.18"; } + { case = isEq "8.19"; out = "0.1.9+8.19"; } ] null; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/coq-modules/serapi/default.nix b/pkgs/development/coq-modules/serapi/default.nix index f48cce55d4dc2..b7aa0ecff25e4 100644 --- a/pkgs/development/coq-modules/serapi/default.nix +++ b/pkgs/development/coq-modules/serapi/default.nix @@ -2,9 +2,9 @@ let release = { - "8.19.0+0.19.0".sha256 = "sha256-M9d0ne2veTjf8/mFIDwtWdHi64JXjwCPWupnO2Ztd/Y="; - "8.18.0+0.18.0".sha256 = "sha256-c+3yG9vcbek/uvQ27OOQGqqsIHU1VuQhQvNVOjfucbo="; - "8.17.0+0.17.0".sha256 = "sha256-I81qvaXpJfXcbFw8vyzYLzlnhPg1QD0lTqAFXhoZ0rI="; + "8.19.0+0.19.3".sha256 = "sha256-QWRXBTcjtAGskZBeLIuX7WDE95KfH6SxV8MJSMx8B2Q="; + "8.18.0+0.18.3".sha256 = "sha256-3JGZCyn62LYJVpfXiwnSMxvdA2vQNTL7li2ZBPcjF0M="; + "8.17.0+0.17.3".sha256 = "sha256-XolzpJd8zs4LLyJO4eWvCiAJ0HJSGBJTGVSBClQRGnw="; "8.16.0+0.16.3".sha256 = "sha256-22Kawp8jAsgyBTppwN5vmN7zEaB1QfPs0qKxd6x/7Uc="; "8.15.0+0.15.0".sha256 = "1vh99ya2dq6a8xl2jrilgs0rpj4j227qx8zvzd2v5xylx0p4bbrp"; "8.14.0+0.14.0".sha256 = "1kh80yb791yl771qbqkvwhbhydfii23a7lql0jgifvllm2k8hd8d"; @@ -21,9 +21,9 @@ in defaultVersion = with versions; lib.switch coq.version [ - { case = isEq "8.19"; out = "8.19.0+0.19.0"; } - { case = isEq "8.18"; out = "8.18.0+0.18.0"; } - { case = isEq "8.17"; out = "8.17.0+0.17.0"; } + { case = isEq "8.19"; out = "8.19.0+0.19.3"; } + { case = isEq "8.18"; out = "8.18.0+0.18.3"; } + { case = isEq "8.17"; out = "8.17.0+0.17.3"; } { case = isEq "8.16"; out = "8.16.0+0.16.3"; } { case = isEq "8.15"; out = "8.15.0+0.15.0"; } { case = isEq "8.14"; out = "8.14.0+0.14.0"; } diff --git a/pkgs/development/embedded/teensy-loader-cli/default.nix b/pkgs/development/embedded/teensy-loader-cli/default.nix index cd318d7a1ca52..19f7051f0a302 100644 --- a/pkgs/development/embedded/teensy-loader-cli/default.nix +++ b/pkgs/development/embedded/teensy-loader-cli/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "teensy-loader-cli"; - version = "2.2"; + version = "2.3"; src = fetchFromGitHub { owner = "PaulStoffregen"; repo = "teensy_loader_cli"; rev = finalAttrs.version; - sha256 = "sha256-C9Qhd6LhAES7X0sh4rofjAM+gxwuosahVQHeR76LyIo="; + sha256 = "sha256-NYqCNWO/nHEuNc9eOzsUqJEHJtZ3XaNz1VYNbeuqEk8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index 6da6713a7f79b..5bd9171275bee 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -32,8 +32,8 @@ let }; v7 = { - version = "7.0"; - hash = "sha256-RdDfv+0y90XpgjIRvTjsemKyGunzDbsh4j4WiE9rfyM="; + version = "7.0.1"; + hash = "sha256-HiCT6bvLx4zmJ6ffutoimdz5ENQ55CRF64WBT3HeXMA="; }; in diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 55f6709c1361c..867202b1641f2 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -465,7 +465,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-oZMZysBA+/gwaGEM1yvI+8wCadXWE7qLRL6Emap3b8Q="; } ]) - ++ (lib.optionals (lib.versionAtLeast version "7.0") [ + ++ (lib.optionals (lib.versionAtLeast version "7.0" && lib.versionOlder version "7.0.1") [ { # Will likely be obsolete in >7.0 name = "fate_avoid_dependency_on_samples"; diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix index ea3fd6e1ac784..8a895c36e8657 100644 --- a/pkgs/development/libraries/gensio/default.nix +++ b/pkgs/development/libraries/gensio/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "gensio"; - version = "2.8.4"; + version = "2.8.5"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UPAYqgZSJMp6/pRIVJYqh8i5olBSVoMUv2zCd14JBOg="; + sha256 = "sha256-J1fP3CtTLkUMZxzsbu3ZMbg4ag1NFvaI5AibFT7eZso="; }; passthru = { diff --git a/pkgs/development/libraries/precice/default.nix b/pkgs/development/libraries/precice/default.nix index 781287da17caf..372a2940e0ae3 100644 --- a/pkgs/development/libraries/precice/default.nix +++ b/pkgs/development/libraries/precice/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "precice"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "precice"; repo = "precice"; rev = "v${version}"; - hash = "sha256-AkIyrjL4OSqX6B1tt1QFopuwnkQaTtb4LmIssY3d3fQ="; + hash = "sha256-KpmcQj8cv5V5OXCMhe2KLTsqUzKWtTeQyP+zg+Y+yd0="; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix b/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix index d614627a07493..a0808f78c2686 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix @@ -8,19 +8,20 @@ , cinnamon , glib , gsettings-desktop-schemas +, gtk3 , mate , xdg-desktop-portal }: stdenv.mkDerivation rec { pname = "xdg-desktop-portal-xapp"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xdg-desktop-portal-xapp"; rev = version; - hash = "sha256-Zz44PCociYhUuHTS3HJNxJPCkiIl01FFe4//7jtgDsk="; + hash = "sha256-dQDz5x6rCJ9BprwrVZVL9BgYqgWmC5eZ8xamX9elLD0="; }; nativeBuildInputs = [ @@ -34,6 +35,7 @@ stdenv.mkDerivation rec { cinnamon.cinnamon-desktop # org.cinnamon.desktop.background glib gsettings-desktop-schemas # org.gnome.system.location + gtk3 mate.mate-desktop # org.mate.background xdg-desktop-portal ]; diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 27ebada6b773e..4625ef8a73dbe 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.104"; + version = "9.2.105"; pyproject = true; disabled = pythonOlder "3.11"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "angr"; repo = "ailment"; rev = "refs/tags/v${version}"; - hash = "sha256-Hd521ihiC/3+0hnU7Rew06RXWQ8m1LnO41e3t1QIlGU="; + hash = "sha256-9Qg8vWSojYcfWhKcGeV+UcrZCpae6/bVOxMyRCLXQPY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aioaladdinconnect/default.nix b/pkgs/development/python-modules/aioaladdinconnect/default.nix deleted file mode 100644 index 3925407abeab4..0000000000000 --- a/pkgs/development/python-modules/aioaladdinconnect/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - aioboto3, - aiohttp, - buildPythonPackage, - fetchPypi, - pythonOlder, -}: - -buildPythonPackage rec { - pname = "aioaladdinconnect"; - version = "0.2.0"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; - - src = fetchPypi { - pname = "AIOAladdinConnect"; - inherit version; - hash = "sha256-5vfw8SU3lWlPoMAR+byf8jpZrGmXTPoeO+DvPByjZnw="; - }; - - propagatedBuildInputs = [ - aioboto3 - aiohttp - ]; - - # Module has no tests - doCheck = false; - - pythonImportsCheck = [ "AIOAladdinConnect" ]; - - meta = with lib; { - description = "Library for controlling Genie garage doors connected to Aladdin Connect devices"; - homepage = "https://github.com/mkmer/AIOAladdinConnect"; - changelog = "https://github.com/mkmer/AIOAladdinConnect/releases/tag/${version}"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/python-modules/aioautomower/default.nix b/pkgs/development/python-modules/aioautomower/default.nix index 9cb79bf9d2fac..f300758aa8116 100644 --- a/pkgs/development/python-modules/aioautomower/default.nix +++ b/pkgs/development/python-modules/aioautomower/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aioautomower"; - version = "2024.4.4"; + version = "2024.5.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "Thomas55555"; repo = "aioautomower"; rev = "refs/tags/${version}"; - hash = "sha256-/mwKomgY+yifN27bpCK9FjhbZRdllr471Ku+Kn2rUPM="; + hash = "sha256-SwRr8BJOchQ7qObgVkNGTkaFEx7wiB/EPedRG2csH+A="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aiohttp-fast-zlib/default.nix b/pkgs/development/python-modules/aiohttp-fast-zlib/default.nix new file mode 100644 index 0000000000000..e770098d63b3a --- /dev/null +++ b/pkgs/development/python-modules/aiohttp-fast-zlib/default.nix @@ -0,0 +1,48 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + aiohttp, + isal, + zlib-ng, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "aiohttp-fast-zlib"; + version = "0.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "bdraco"; + repo = "aiohttp-fast-zlib"; + rev = "v${version}"; + hash = "sha256-nR/0hVe5zAhLXu+kBOBH+whIjUV44c5yuNOj+Zl+eFo="; + }; + + postPatch = '' + sed -i "/addopts =/d" pyproject.toml + ''; + + build-system = [ poetry-core ]; + + dependencies = [ aiohttp ]; + + optional-dependencies = { + isal = [ isal ]; + zlib_ng = [ zlib-ng ]; + }; + + nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies); + + pythonImportsCheck = [ "aiohttp_fast_zlib" ]; + + meta = with lib; { + description = "Use the fastest installed zlib compatible library with aiohttp"; + homepage = "https://github.com/bdraco/aiohttp-fast-zlib"; + changelog = "https://github.com/bdraco/aiohttp-fast-zlib/blob/${src.rev}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/ambiclimate/default.nix b/pkgs/development/python-modules/ambiclimate/default.nix deleted file mode 100644 index 54ff63a282e3d..0000000000000 --- a/pkgs/development/python-modules/ambiclimate/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - aiohttp, - async-timeout, -}: - -buildPythonPackage rec { - pname = "ambiclimate"; - version = "0.2.1"; - format = "setuptools"; - - src = fetchPypi { - pname = "Ambiclimate"; - inherit version; - sha256 = "0vhmpazc2n7qyyh7wqsz635w0f8afk2i5d592ikb84bgnfn83483"; - }; - - propagatedBuildInputs = [ - aiohttp - async-timeout - ]; - - # tests are not present - doCheck = false; - - pythonImportsCheck = [ "ambiclimate" ]; - - meta = with lib; { - description = "Python library to communicate with ambiclimate"; - homepage = "https://github.com/Danielhiversen/pyAmbiclimate"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 920a8dc7053d4..b0b6555a4cf2a 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.104"; + version = "9.2.105"; pyproject = true; disabled = pythonOlder "3.11"; @@ -46,7 +46,7 @@ buildPythonPackage rec { owner = "angr"; repo = "angr"; rev = "refs/tags/v${version}"; - hash = "sha256-IJVPycIZNn0+B0YRNiTOL/+Jxioa4VPm1VWVg9Sz68A="; + hash = "sha256-KYRbMrxPAZAY/KGWnf5GYowXufhriWCJhV8ZbhIzsVc="; }; pythonRelaxDeps = [ "capstone" ]; diff --git a/pkgs/development/python-modules/arcam-fmj/default.nix b/pkgs/development/python-modules/arcam-fmj/default.nix index c7a2f75795070..1588d8f14eb74 100644 --- a/pkgs/development/python-modules/arcam-fmj/default.nix +++ b/pkgs/development/python-modules/arcam-fmj/default.nix @@ -4,6 +4,7 @@ pythonAtLeast, pythonOlder, fetchFromGitHub, + setuptools, aiohttp, attrs, defusedxml, @@ -14,8 +15,8 @@ buildPythonPackage rec { pname = "arcam-fmj"; - version = "1.4.0"; - format = "setuptools"; + version = "1.5.2"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -23,10 +24,12 @@ buildPythonPackage rec { owner = "elupus"; repo = "arcam_fmj"; rev = "refs/tags/${version}"; - hash = "sha256-/A3Fs0JyzW05L80CtI07Y/kTTrIC6yqubJfYO0kAEf0="; + hash = "sha256-hBoUxY+xtW04UPUG2P8A8QQbHxGk0bjcrtXis6nlaGg="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ aiohttp attrs defusedxml @@ -48,6 +51,7 @@ buildPythonPackage rec { "test_silent_server_disconnect" "test_heartbeat" "test_cancellation" + "test_unsupported_zone" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 483d483dfe8d8..2fcf0d5865db1 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.104"; + version = "9.2.105"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "angr"; repo = "archinfo"; rev = "refs/tags/v${version}"; - hash = "sha256-Fpt7fgyoXn00Wgwz/8P8X45677tZiVgJEmNo+r2VlZ0="; + hash = "sha256-xLwqK4CwgxIWjmVVR5GnK0KacL08ojKXtMkhwBE+5xI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index 5d4c388033836..efb76645c7876 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.38.4"; + version = "0.39.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - hash = "sha256-IyJQgKTRrff/LqY14IaATrJTkmVDEv0JFHAxCydNk7Y="; + hash = "sha256-lmSILV7xb3aHC+Rd8/SYzoA/t6DgdClccoK8ESdvNq0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix index 9e32e58f16332..2b7f334b989d5 100644 --- a/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/pkgs/development/python-modules/bimmer-connected/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "bimmer-connected"; - version = "0.15.2"; + version = "0.15.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "bimmerconnected"; repo = "bimmer_connected"; rev = "refs/tags/${version}"; - hash = "sha256-UCzPD+3v74eB32q0/blsyHAsN0yNskGky5nrBKzFFaE="; + hash = "sha256-0Z7W9Z5zl7N0WbvfOTs8wcloI5VfqrZ+OBWocFAnjwY="; }; build-system = [ diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix index fc4ac4b9fde09..97020e27a997e 100644 --- a/pkgs/development/python-modules/bthome-ble/default.nix +++ b/pkgs/development/python-modules/bthome-ble/default.nix @@ -26,6 +26,10 @@ buildPythonPackage rec { hash = "sha256-v3SzzbdWRJISuF1THHlrvci4b+H1Zw/0e5iSEB0Scvw="; }; + patches = [ + ./habluetooth-3.0-compat.patch + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace-fail " --cov=bthome_ble --cov-report=term-missing:skip-covered" "" diff --git a/pkgs/development/python-modules/bthome-ble/habluetooth-3.0-compat.patch b/pkgs/development/python-modules/bthome-ble/habluetooth-3.0-compat.patch new file mode 100644 index 0000000000000..5e31475dd9dc2 --- /dev/null +++ b/pkgs/development/python-modules/bthome-ble/habluetooth-3.0-compat.patch @@ -0,0 +1,48 @@ +diff --git a/tests/test_parser_v1.py b/tests/test_parser_v1.py +index d717263..bb03d80 100644 +--- a/tests/test_parser_v1.py ++++ b/tests/test_parser_v1.py +@@ -77,6 +77,7 @@ def bytes_to_service_info( + advertisement=None, + connectable=False, + time=ADVERTISEMENT_TIME, ++ tx_power=None, + ) + + +@@ -96,6 +97,7 @@ def bytes_to_encrypted_service_info( + advertisement=None, + connectable=False, + time=ADVERTISEMENT_TIME, ++ tx_power=None, + ) + + +@@ -1195,6 +1197,7 @@ def test_bthome_multiple_uuids(caplog): + advertisement=None, + connectable=False, + time=ADVERTISEMENT_TIME, ++ tx_power=None, + ) + + device = BTHomeBluetoothDeviceData() +diff --git a/tests/test_parser_v2.py b/tests/test_parser_v2.py +index 8fee31a..3ff8bc3 100644 +--- a/tests/test_parser_v2.py ++++ b/tests/test_parser_v2.py +@@ -97,6 +97,7 @@ def bytes_to_service_info( + advertisement=None, + connectable=False, + time=time, ++ tx_power=None, + ) + + +@@ -3171,6 +3172,7 @@ def test_bthome_multiple_uuids(caplog): + advertisement=None, + connectable=False, + time=ADVERTISEMENT_TIME, ++ tx_power=None, + ) + + device = BTHomeBluetoothDeviceData() diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 55fae699da6a5..d1187561caf13 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.104"; + version = "9.2.105"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "angr"; repo = "claripy"; rev = "refs/tags/v${version}"; - hash = "sha256-J4XoqlUZzm7WMfZJ0DY+yHvMaP5kUEtRv9JnnMhVAm0="; + hash = "sha256-Jiv8j6lpNaQjPFSaWUiakxQnh67EvTtE+WxjB3E06LY="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index dc49f346f19d0..6af8eab50d0d1 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -19,14 +19,14 @@ let # The binaries are following the argr projects release cycle - version = "9.2.104"; + version = "9.2.105"; # 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-5Rs7MMU1/5VwG9ZbLO07GggEHZA9zHK8LZEId6hTa9Q="; + hash = "sha256-O5VCPxpm/aVBYrJG49t1McGYN4mTLItDW2aBzdznTlw="; }; in buildPythonPackage rec { @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "angr"; repo = "cle"; rev = "refs/tags/v${version}"; - hash = "sha256-8jfXqv69IkqzeMW61ZMIjtvYMZezDcKgnRaVQEfhh0I="; + hash = "sha256-nbcU/t9mwcpLPcx1By+maMLyWD/b1BBhCg52+qNqrhI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/dm-control/default.nix b/pkgs/development/python-modules/dm-control/default.nix index 0d9c9d3f1c9ab..25a375bf7eb6f 100644 --- a/pkgs/development/python-modules/dm-control/default.nix +++ b/pkgs/development/python-modules/dm-control/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "dm-control"; - version = "1.0.19"; + version = "1.0.20"; pyproject = true; disabled = pythonOlder "3.8"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "google-deepmind"; repo = "dm_control"; rev = "refs/tags/${version}"; - hash = "sha256-q9hY/icvc1tPI0xBYxExc2a+gv0i6utaB4GBnJwQPCw="; + hash = "sha256-huXvfQz7E+OCqRrhLC5dUaG/A2PQXrPBzseIFx7ZIeE="; }; build-system = [ diff --git a/pkgs/development/python-modules/gardena-bluetooth/default.nix b/pkgs/development/python-modules/gardena-bluetooth/default.nix index 5217bf09b2c83..d637618255275 100644 --- a/pkgs/development/python-modules/gardena-bluetooth/default.nix +++ b/pkgs/development/python-modules/gardena-bluetooth/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "gardena-bluetooth"; - version = "1.4.1"; + version = "1.4.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "elupus"; repo = "gardena-bluetooth"; rev = "refs/tags/${version}"; - hash = "sha256-WnurxoSzzNTNxz6S1HSKb/lTuOyox6fG2I0Hlj95Ub0="; + hash = "sha256-eze99JvNSwhot8t43oy30iaFrrkpeMNFyHvfQcA56IM="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix index 162bd64c271fe..a609f01ec79a9 100644 --- a/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -7,7 +7,7 @@ google-auth, google-auth-oauthlib, google-cloud-pubsub, - pydantic, + mashumaro, pytest-aiohttp, pytest-asyncio, pytestCheckHook, @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "google-nest-sdm"; - version = "3.0.4"; + version = "4.0.4"; pyproject = true; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "python-google-nest-sdm"; rev = "refs/tags/${version}"; - hash = "sha256-zYHrS9y15dcyDhOoky7sB2BYkpTL3PoyNbNewKKl19E="; + hash = "sha256-bvfc9FPUSCVaHxyICCXmUCbbc6Vdxba1Tv8dbi7Ax6M="; }; build-system = [ setuptools ]; @@ -37,7 +37,7 @@ buildPythonPackage rec { google-auth google-auth-oauthlib google-cloud-pubsub - pydantic + mashumaro requests-oauthlib ]; diff --git a/pkgs/development/python-modules/govee-local-api/default.nix b/pkgs/development/python-modules/govee-local-api/default.nix index 5b818ad25c4c5..fee6555d378f8 100644 --- a/pkgs/development/python-modules/govee-local-api/default.nix +++ b/pkgs/development/python-modules/govee-local-api/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch2, poetry-core, pytestCheckHook, pythonOlder, @@ -10,7 +9,7 @@ buildPythonPackage rec { pname = "govee-local-api"; - version = "1.4.5"; + version = "1.5.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -19,17 +18,9 @@ buildPythonPackage rec { owner = "Galorhallen"; repo = "govee-local-api"; rev = "refs/tags/v${version}"; - hash = "sha256-kmIuo/e3eLJTgmI+2Oq9Y0jov/133jXwgoBayGv33r4="; + hash = "sha256-L9c/58B50E5Kk44j9tvtDZ0+ncJZ4KubTz/U9FI71+E="; }; - patches = [ - (fetchpatch2 { - # configure pep517 build-backend - url = "https://github.com/Galorhallen/govee-local-api/commit/897a21ae723ff94343bbf4ba1541e3a1d3e03c94.patch"; - hash = "sha256-/d5jGKGME768Ar+WWWQUByHJPGB31OHShI4oLjcMUIU="; - }) - ]; - build-system = [ poetry-core ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/habitipy/default.nix b/pkgs/development/python-modules/habitipy/default.nix index 20017eb2a2b9e..980dc0726991b 100644 --- a/pkgs/development/python-modules/habitipy/default.nix +++ b/pkgs/development/python-modules/habitipy/default.nix @@ -6,23 +6,26 @@ requests, setuptools, hypothesis, - pynose, + pytestCheckHook, responses, }: buildPythonPackage rec { pname = "habitipy"; - version = "0.3.0"; - format = "setuptools"; + version = "0.3.1"; + pyproject = true; src = fetchFromGitHub { owner = "ASMfreaK"; repo = "habitipy"; - rev = "v${version}"; - sha256 = "1vf485z5m4h61p64zr3sgkcil2s3brq7dja4n7m49d1fvzcirylv"; + # TODO: https://github.com/ASMfreaK/habitipy/issues/27 + rev = "faaca8840575fe8b807bf17acea6266d5ce92a99"; + hash = "sha256-BGFUAntSNH0YYWn9nfKjIlpevF7MFs0csCPSp6IT6Ro="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ plumbum requests setuptools @@ -30,14 +33,21 @@ buildPythonPackage rec { nativeCheckInputs = [ hypothesis - pynose + pytestCheckHook responses ]; - checkPhase = '' - HOME=$TMPDIR nosetests + preCheck = '' + export HOME=$TMPDIR ''; + disabledTests = [ + # network access + "test_content_cache" + # hypothesis.errors.InvalidArgument: tests/test_cli.py::test_data is a function that returns a Hypothesis strategy, but pytest has collected it as a test function. + "test_data" + ]; + pythonImportsCheck = [ "habitipy" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/habluetooth/default.nix b/pkgs/development/python-modules/habluetooth/default.nix index fc2761b3778ea..4a1f28a60b432 100644 --- a/pkgs/development/python-modules/habluetooth/default.nix +++ b/pkgs/development/python-modules/habluetooth/default.nix @@ -18,16 +18,16 @@ buildPythonPackage rec { pname = "habluetooth"; - version = "2.8.1"; + version = "3.1.1"; pyproject = true; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = "habluetooth"; rev = "refs/tags/v${version}"; - hash = "sha256-2QiV32gDaoIBLUv/a3YzosFl6+E/nm0WoSUcTx9ph8s="; + hash = "sha256-HlQAYR+feu1awKFf11Q5Us4zSeHASu8OscJ8T8tlm5M="; }; postPatch = '' diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 76e8e8ea31818..9e48a5da5b9c0 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2024.5.4"; + version = "2024.6.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = "hahomematic"; rev = "refs/tags/${version}"; - hash = "sha256-pNG1R19H3fRje2pfW2hZw3zuGnElksI+Ugm6imnzK/w="; + hash = "sha256-6WG8N4LcQ52mbrVP1aPL+xkpSQ9u3e0vV+Hf3ybh3mA="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index ecaa475906d68..8b9f883ce54c7 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.81.0"; + version = "0.81.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "nabucasa"; repo = "hass-nabucasa"; rev = "refs/tags/${version}"; - hash = "sha256-61pdl9bjtvC9Fa7jCtSPEz/5PJiANmKqOSSHjK7is2s="; + hash = "sha256-/sY/JijBCcGcbMjoX0yuhFIWvU+TFVN8sRxBx+CDVVs="; }; pythonRelaxDeps = [ "acme" ]; diff --git a/pkgs/development/python-modules/hassil/default.nix b/pkgs/development/python-modules/hassil/default.nix index ff5c2f108e1a7..42c46fc3383a5 100644 --- a/pkgs/development/python-modules/hassil/default.nix +++ b/pkgs/development/python-modules/hassil/default.nix @@ -1,10 +1,13 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pythonOlder, - # propagates + # build-system + setuptools, + + # dependencies pyyaml, unicode-rbnf, @@ -14,20 +17,24 @@ let pname = "hassil"; - version = "1.6.1"; + version = "1.7.1"; in buildPythonPackage { inherit pname version; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.9"; - src = fetchPypi { - inherit pname version; - hash = "sha256-jkPo02Jy6UqyC5YvwMw+DDkT8rG5Xe4EiNVED/JHzKc="; + src = fetchFromGitHub { + owner = "home-assistant"; + repo = "hassil"; + rev = "refs/tags/${version}"; + hash = "sha256-yrjzsJzyUFqTauEcNEOCQx2YxomkNS4J0JfQEQQ5m3E="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ pyyaml unicode-rbnf ]; diff --git a/pkgs/development/python-modules/hdate/default.nix b/pkgs/development/python-modules/hdate/default.nix index a725414ece472..0a005cba2ac6b 100644 --- a/pkgs/development/python-modules/hdate/default.nix +++ b/pkgs/development/python-modules/hdate/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, fetchFromGitHub, poetry-core, + pythonRelaxDepsHook, pytestCheckHook, pythonOlder, pytz, @@ -11,8 +12,8 @@ buildPythonPackage rec { pname = "hdate"; - version = "0.10.4"; - format = "pyproject"; + version = "0.10.8"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -20,18 +21,20 @@ buildPythonPackage rec { owner = "py-libhdate"; repo = "py-libhdate"; rev = "refs/tags/v${version}"; - hash = "sha256-NF2ZA9ruW7sL2tLY11VAtyPRxGg2o5/mpv3ZsH/Zxb8="; + hash = "sha256-SANCZl+1ghUuuxZAl6oycvo7hB7mIagjVEmwzarsspk="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'pytz = ">= 2020.0"' 'pytz = "*"' \ - --replace 'astral = {version = "^2.2", python = "^3.6"}' 'astral = "*"' - ''; + build-system = [ + poetry-core + pythonRelaxDepsHook + ]; - nativeBuildInputs = [ poetry-core ]; + pythonRelaxDeps = [ + "astral" + "pytz" + ]; - propagatedBuildInputs = [ + dependencies = [ astral pytz ]; diff --git a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix index fba93118b9de2..f155a5db19c39 100644 --- a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix +++ b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix @@ -31,6 +31,11 @@ buildPythonPackage rec { hash = "sha256-KTaZ3xbZpBIN5zP73YdJW6QeCQThGdqejnfWwvL+0R8="; }; + patches = [ + # https://github.com/home-assistant-libs/home-assistant-bluetooth/issues/38 + ./habluetooth-3.0-compat.patch + ]; + postPatch = '' # drop pytest parametrization (coverage, etc.) sed -i '/addopts/d' pyproject.toml diff --git a/pkgs/development/python-modules/home-assistant-bluetooth/habluetooth-3.0-compat.patch b/pkgs/development/python-modules/home-assistant-bluetooth/habluetooth-3.0-compat.patch new file mode 100644 index 0000000000000..c56d890fd8aa9 --- /dev/null +++ b/pkgs/development/python-modules/home-assistant-bluetooth/habluetooth-3.0-compat.patch @@ -0,0 +1,50 @@ +diff --git a/tests/test_models.py b/tests/test_models.py +index ecfd70c..b8001f2 100644 +--- a/tests/test_models.py ++++ b/tests/test_models.py +@@ -88,6 +88,7 @@ def test_model_from_scanner(): + "service_uuids": ["cba20d00-224d-11e6-9fb8-0002a5d5c51b"], + "source": "local", + "time": now, ++ "tx_power": -127, + } + + +@@ -109,6 +110,7 @@ def test_construct_service_info_bleak(): + advertisement=switchbot_adv, + connectable=False, + time=now, ++ tx_power=None, + ) + + assert service_info.service_uuids == ["cba20d00-224d-11e6-9fb8-0002a5d5c51b"] +@@ -132,6 +134,7 @@ def test_construct_service_info_bleak(): + "service_uuids": ["cba20d00-224d-11e6-9fb8-0002a5d5c51b"], + "source": "local", + "time": now, ++ "tx_power": None, + } + + +@@ -165,6 +168,7 @@ def test_from_device_and_advertisement_data(): + "service_uuids": ["cba20d00-224d-11e6-9fb8-0002a5d5c51b"], + "source": "local", + "time": now_monotonic, ++ "tx_power": -127, + } + + +@@ -200,6 +204,7 @@ def test_pyobjc_compat(): + advertisement=switchbot_adv, + connectable=False, + time=now, ++ tx_power=None, + ) + + assert service_info.service_uuids == ["cba20d00-224d-11e6-9fb8-0002a5d5c51b"] +@@ -223,4 +228,5 @@ def test_pyobjc_compat(): + "service_uuids": ["cba20d00-224d-11e6-9fb8-0002a5d5c51b"], + "source": "local", + "time": now, ++ "tx_power": None, + } diff --git a/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix b/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix index 52801ebe5d11f..e4425df5c63a3 100644 --- a/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "home-assistant-chip-clusters"; - version = "2024.3.2"; + version = "2024.5.2"; format = "wheel"; src = fetchPypi { @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "home_assistant_chip_clusters"; dist = "py3"; python = "py3"; - hash = "sha256-Imdpqy7m81oxfkzj+82afSX9juK/SOCBIMoaPjK8G+Y="; + hash = "sha256-LP/Iw0dgm8TUws/SNUfg7b/OPIboCGB7JRiEwXNd+4A="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/home-assistant-chip-core/default.nix b/pkgs/development/python-modules/home-assistant-chip-core/default.nix index f12f2e53592e6..0c2c6fda5ed85 100644 --- a/pkgs/development/python-modules/home-assistant-chip-core/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-core/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "home-assistant-chip-core"; - version = "2024.3.2"; + version = "2024.5.2"; format = "wheel"; disabled = pythonOlder "3.7"; @@ -40,11 +40,11 @@ buildPythonPackage rec { { "aarch64-linux" = { name = "aarch64"; - hash = "sha256-li+fmEikVnTAkgQnoiWjoZaVRwGRadTYuQySR5s8VB4="; + hash = "sha256-4C3KHmFbbpeWvmfwoVcc8kWRw22sGJMyDKsUGcbch6U="; }; "x86_64-linux" = { name = "x86_64"; - hash = "sha256-iUKtAz00qFklTW2ilUPGAWhpqDmnLb6D3Zdy1oHpQl0="; + hash = "sha256-n+Dn0vL0uUEvXsoKegSpJIG2jHbXSrYv2NhL+ZeVHrk="; }; } .${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); diff --git a/pkgs/development/python-modules/lingva/default.nix b/pkgs/development/python-modules/lingva/default.nix index 95bd168c39d01..153284d88125f 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.2"; + version = "5.0.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "vacanza"; repo = "lingva"; rev = "refs/tags/v${version}"; - hash = "sha256-kr64L/DtEWZu9z2p90QJHnb/6LygwZgxE+rARbo0NYI="; + hash = "sha256-usJyEbHtwhsc0ulG9+7zJ/kDUFrxfqykZLOAWwzP+Dw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix index f450b85abd1e3..dc2c2a908a791 100644 --- a/pkgs/development/python-modules/nettigo-air-monitor/default.nix +++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -12,11 +12,12 @@ pythonOlder, setuptools, syrupy, + tenacity, }: buildPythonPackage rec { pname = "nettigo-air-monitor"; - version = "3.0.1"; + version = "3.1.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,7 +26,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = "nettigo-air-monitor"; rev = "refs/tags/${version}"; - hash = "sha256-Ysvyg2cj09Bb+xpNPapYAQSBDKfGsYZcHj9xxIR8KGw="; + hash = "sha256-9LrzCUstzMTzt2qHzDsllyep5Rtt6vrrvVPRFILUtwA="; }; build-system = [ setuptools ]; @@ -34,6 +35,7 @@ buildPythonPackage rec { aiohttp aqipy-atmotech dacite + tenacity ]; nativeCheckInputs = [ @@ -44,6 +46,12 @@ buildPythonPackage rec { syrupy ]; + disabledTests = [ + # stuck in epoll + "test_retry_fail" + "test_retry_success" + ]; + pythonImportsCheck = [ "nettigo_air_monitor" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pydrawise/default.nix b/pkgs/development/python-modules/pydrawise/default.nix index 821ab2b4ccf3f..9895f34a86a2d 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 = "2024.6.1"; + version = "2024.6.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "dknowles2"; repo = "pydrawise"; rev = "refs/tags/${version}"; - hash = "sha256-mG1/Cd+w6KqI+KBjJazFBmAQDWZy/y2zFLFGSLVPyz0="; + hash = "sha256-vbEAlmb7j7QeFdYj3FZMPsDtawOzige/WQKDbPPxzoY="; }; build-system = [ diff --git a/pkgs/development/python-modules/pyefergy/default.nix b/pkgs/development/python-modules/pyefergy/default.nix index 847c595d5ef5f..2370bd7e62780 100644 --- a/pkgs/development/python-modules/pyefergy/default.nix +++ b/pkgs/development/python-modules/pyefergy/default.nix @@ -3,33 +3,40 @@ aiohttp, buildPythonPackage, fetchFromGitHub, + poetry-core, + poetry-dynamic-versioning, + pythonRelaxDepsHook, iso4217, - pytest-asyncio, pythonOlder, pytz, }: buildPythonPackage rec { pname = "pyefergy"; - version = "22.1.1"; - format = "setuptools"; + version = "22.5.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "tkdrob"; - repo = pname; - rev = version; - hash = "sha256-AdoM+PcVoajxhnEfkyN9UuNufChu8XGmZDLNC3mjrps="; + repo = "pyefergy"; + rev = "refs/tags/v${version}"; + hash = "sha256-4M3r/+C42X95/7BGZAJbkXKKFEkGzLlvX0Ynv+eL8qc="; }; - postPatch = '' - # setuptools.extern.packaging.version.InvalidVersion: Invalid version: 'master' - substituteInPlace setup.py \ - --replace 'version="master",' 'version="${version}",' - ''; + build-system = [ + poetry-core + poetry-dynamic-versioning + pythonRelaxDepsHook + ]; + + pythonRemoveDeps = [ + "codecov" + "types-pytz" + ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp iso4217 pytz @@ -41,6 +48,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "pyefergy" ]; meta = with lib; { + changelog = "https://github.com/tkdrob/pyefergy/releases/tag/v${version}"; description = "Python API library for Efergy energy meters"; homepage = "https://github.com/tkdrob/pyefergy"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/pylaunches/default.nix b/pkgs/development/python-modules/pylaunches/default.nix index f044593ef5587..106ea7a998880 100644 --- a/pkgs/development/python-modules/pylaunches/default.nix +++ b/pkgs/development/python-modules/pylaunches/default.nix @@ -4,6 +4,7 @@ aresponses, buildPythonPackage, fetchFromGitHub, + poetry-core, pytestCheckHook, pytest-asyncio, pythonOlder, @@ -11,19 +12,27 @@ buildPythonPackage rec { pname = "pylaunches"; - version = "1.4.0"; - format = "setuptools"; + version = "2.0.0"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "ludeeus"; - repo = pname; - rev = version; - sha256 = "sha256-bIcnYcbfAwjet3cg97y+ujFfY2916ANk4sw0sZoU59g="; + repo = "pylaunches"; + rev = "refs/tags/${version}"; + hash = "sha256-NewzzZuiXwaWU59bu+M2QcSfydL1khvw/YJkbZ58W2Q="; }; - propagatedBuildInputs = [ aiohttp ]; + postPatch = '' + # Upstream doesn't set version in the repo + substituteInPlace pyproject.toml \ + --replace-fail 'version = "0"' 'version = "${version}"' + ''; + + build-system = [ poetry-core ]; + + dependencies = [ aiohttp ]; nativeCheckInputs = [ aresponses @@ -31,18 +40,12 @@ buildPythonPackage rec { pytest-asyncio ]; - postPatch = '' - # Upstream doesn't set version in the repo - substituteInPlace setup.py \ - --replace 'version="main",' 'version="${version}",' \ - --replace ', "pytest-runner"' "" - ''; - pythonImportsCheck = [ "pylaunches" ]; meta = with lib; { description = "Python module to get information about upcoming space launches"; homepage = "https://github.com/ludeeus/pylaunches"; + changelog = "https://github.com/ludeeus/pylaunches/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/python-homewizard-energy/default.nix b/pkgs/development/python-modules/python-homewizard-energy/default.nix index 7a79c8648a5c7..a25cae986a2da 100644 --- a/pkgs/development/python-modules/python-homewizard-energy/default.nix +++ b/pkgs/development/python-modules/python-homewizard-energy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "python-homewizard-energy"; - version = "5.0.0"; + version = "6.0.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "DCSBL"; repo = "python-homewizard-energy"; rev = "refs/tags/v${version}"; - hash = "sha256-z9JJHS7w/lugV23xJjWHBWVQp38J3CKtj4IuDvpPQJw="; + hash = "sha256-tOoNC9MysL5PcIa1N/GjzNy+4+ovZGQznYYDt1o6f4c="; }; postPatch = '' @@ -31,9 +31,9 @@ buildPythonPackage rec { --replace-fail 'version = "0.0.0"' 'version = "${version}"' ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp async-timeout ]; diff --git a/pkgs/development/python-modules/python-matter-server/default.nix b/pkgs/development/python-modules/python-matter-server/default.nix index 8c86581d6d9a2..e981e6ce8c6a7 100644 --- a/pkgs/development/python-modules/python-matter-server/default.nix +++ b/pkgs/development/python-modules/python-matter-server/default.nix @@ -34,13 +34,13 @@ let paaCerts = stdenvNoCC.mkDerivation rec { pname = "matter-server-paa-certificates"; - version = "1.2.0.1"; + version = "1.3.0.0"; src = fetchFromGitHub { owner = "project-chip"; repo = "connectedhomeip"; rev = "refs/tags/v${version}"; - hash = "sha256-p3P0n5oKRasYz386K2bhN3QVfN6oFndFIUWLEUWB0ss="; + hash = "sha256-5MI6r0KhSTzolesTQ8YWeoko64jFu4jHfO5KOOKpV0A="; }; installPhase = '' @@ -56,8 +56,8 @@ in buildPythonPackage rec { pname = "python-matter-server"; - version = "5.10.0"; - format = "pyproject"; + version = "6.1.0"; + pyproject = true; disabled = pythonOlder "3.10"; @@ -65,7 +65,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "python-matter-server"; rev = "refs/tags/${version}"; - hash = "sha256-rfpGclSgCBTxlTgVqgNz3ixoldB9M+6mLmogkNDDdWs="; + hash = "sha256-sY/FaMZ3p/AC63t1ku1Khgqi71G7u2O+ZPTuMPHFkuk="; }; patches = [ @@ -81,14 +81,14 @@ buildPythonPackage rec { --replace '--cov' "" ''; - nativeBuildInputs = [ + build-system = [ setuptools pythonRelaxDepsHook ]; pythonRelaxDeps = [ "home-assistant-chip-clusters" ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp aiorun async-timeout @@ -98,7 +98,7 @@ buildPythonPackage rec { home-assistant-chip-clusters ]; - passthru.optional-dependencies = { + optional-dependencies = { server = [ cryptography home-assistant-chip-core @@ -109,11 +109,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-aiohttp pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); preCheck = let - pythonEnv = python.withPackages (_: propagatedBuildInputs ++ nativeCheckInputs ++ [ pytest ]); + pythonEnv = python.withPackages (_: dependencies ++ nativeCheckInputs ++ [ pytest ]); in '' export PYTHONPATH=${pythonEnv}/${python.sitePackages} diff --git a/pkgs/development/python-modules/python-matter-server/link-paa-root-certs.patch b/pkgs/development/python-modules/python-matter-server/link-paa-root-certs.patch index 6c52715950562..f7b09bb0aff62 100644 --- a/pkgs/development/python-modules/python-matter-server/link-paa-root-certs.patch +++ b/pkgs/development/python-modules/python-matter-server/link-paa-root-certs.patch @@ -1,3 +1,13 @@ +From f45cf9898f2e5a3a4c2b73a9ed84c4a037a85a1e Mon Sep 17 00:00:00 2001 +From: Matt Leon <ml@mattleon.com> +Date: Sat, 1 Jun 2024 23:28:41 -0400 +Subject: [PATCH] Symlink PAA root certificates to nix store + +--- + matter_server/server/const.py | 2 ++ + matter_server/server/helpers/paa_certificates.py | 6 ++++++ + 2 files changed, 8 insertions(+) + diff --git a/matter_server/server/const.py b/matter_server/server/const.py index 8cca3cf..43f02f5 100644 --- a/matter_server/server/const.py @@ -12,19 +22,19 @@ index 8cca3cf..43f02f5 100644 .parent.resolve() .parent.resolve() diff --git a/matter_server/server/helpers/paa_certificates.py b/matter_server/server/helpers/paa_certificates.py -index e530838..fdd6025 100644 +index de60c78..185e54c 100644 --- a/matter_server/server/helpers/paa_certificates.py +++ b/matter_server/server/helpers/paa_certificates.py -@@ -64,6 +64,8 @@ async def fetch_dcl_certificates( - fetch_production_certificates: bool = True, +@@ -105,6 +105,8 @@ async def fetch_dcl_certificates( + base_url: str, ) -> int: """Fetch DCL PAA Certificates.""" + return 0 + - LOGGER.info("Fetching the latest PAA root certificates from DCL.") fetch_count: int = 0 - base_urls = set() -@@ -124,6 +126,8 @@ async def fetch_dcl_certificates( + + try: +@@ -151,6 +153,8 @@ async def fetch_dcl_certificates( async def fetch_git_certificates(paa_root_cert_dir: Path) -> int: """Fetch Git PAA Certificates.""" @@ -33,12 +43,15 @@ index e530838..fdd6025 100644 fetch_count = 0 LOGGER.info("Fetching the latest PAA root certificates from Git.") -@@ -159,6 +163,8 @@ async def fetch_certificates( +@@ -185,6 +189,8 @@ async def fetch_certificates( fetch_production_certificates: bool = True, ) -> int: """Fetch PAA Certificates.""" + return 0 + loop = asyncio.get_running_loop() + paa_root_cert_dir_version = paa_root_cert_dir / ".version" - if not paa_root_cert_dir.is_dir(): +-- +2.44.1 + diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 234af13d159f2..cc63e21cd9822 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.104"; + version = "9.2.105"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-lFzvo+DZgVathfAx++A7lA9dRrUqDyAg204h7M17zW8="; + hash = "sha256-SlWcrrv3IvoTDy8CIxL/cPGs+asTwmWXU6Exul8a/O8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/renault-api/default.nix b/pkgs/development/python-modules/renault-api/default.nix index 61362a5021f61..a295c2654513d 100644 --- a/pkgs/development/python-modules/renault-api/default.nix +++ b/pkgs/development/python-modules/renault-api/default.nix @@ -19,8 +19,8 @@ buildPythonPackage rec { pname = "renault-api"; - version = "0.2.2"; - format = "pyproject"; + version = "0.2.3"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -28,24 +28,19 @@ buildPythonPackage rec { owner = "hacf-fr"; repo = "renault-api"; rev = "refs/tags/v${version}"; - hash = "sha256-FZ1VNO8gEH7HJRu9EVuKIwSQbceG720tCVqAPqHwISQ="; + hash = "sha256-+QqiD4mMfzlHmSiriaS0JzbMdOGCG7cg/xv6zJaPSOU="; }; build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp cryptography marshmallow-dataclass pyjwt ]; - dependencies = [ - aioresponses - pytest-asyncio - ]; - - passthru.optional-dependencies = { + optional-dependencies = { cli = [ click dateparser @@ -54,11 +49,11 @@ buildPythonPackage rec { }; nativeCheckInputs = [ + aioresponses + pytest-asyncio pytestCheckHook typeguard - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); - - pytestFlagsArray = [ "--asyncio-mode=auto" ]; + ] ++ lib.flatten (lib.attrValues optional-dependencies); pythonImportsCheck = [ "renault_api" ]; diff --git a/pkgs/development/python-modules/requests-pkcs12/default.nix b/pkgs/development/python-modules/requests-pkcs12/default.nix index f98c85a0b7455..550465962e313 100644 --- a/pkgs/development/python-modules/requests-pkcs12/default.nix +++ b/pkgs/development/python-modules/requests-pkcs12/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "requests-pkcs12"; - version = "1.24"; + version = "1.25"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "m-click"; repo = "requests_pkcs12"; rev = version; - hash = "sha256-JLFUdg7kbjhlpGgrQ29U1TRTKhjDlvMGc/FRE+awfLc="; + hash = "sha256-ukS0vxG2Rd71GsF1lmpsDSM2JovwqhXsaAnZdF8WGQo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/universal-silabs-flasher/default.nix b/pkgs/development/python-modules/universal-silabs-flasher/default.nix index 56b6f22685ce5..e4b09034d18f3 100644 --- a/pkgs/development/python-modules/universal-silabs-flasher/default.nix +++ b/pkgs/development/python-modules/universal-silabs-flasher/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "universal-silabs-flasher"; - version = "0.0.19"; + version = "0.0.20"; pyproject = true; src = fetchFromGitHub { owner = "NabuCasa"; repo = "universal-silabs-flasher"; rev = "refs/tags/v${version}"; - hash = "sha256-VoO9B27CNY2Cnt/Q2HsU6DVYkukQMgbIHc6xqfN0P7w="; + hash = "sha256-+wmBsb7zsN6vdNqUvozV317kEZCg1b+lBToRSdN2YM4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/voluptuous-openapi/default.nix b/pkgs/development/python-modules/voluptuous-openapi/default.nix new file mode 100644 index 0000000000000..a1f75cb60b01a --- /dev/null +++ b/pkgs/development/python-modules/voluptuous-openapi/default.nix @@ -0,0 +1,43 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + voluptuous, + + # tests + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "voluptuous-openapi"; + version = "0.0.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Shulyaka"; + repo = "voluptuous-openapi"; + # TODO: https://github.com/Shulyaka/voluptuous-openapi/commit/155f2dd6d55998c41aaafe0aa8a980f78f9e478b#commitcomment-142845137 + rev = "155f2dd6d55998c41aaafe0aa8a980f78f9e478b"; + hash = "sha256-ciAaWTltPKT9NzfxWoX6gk1gSMszQjVVimfn/0D+mfg="; + }; + + build-system = [ setuptools ]; + + dependencies = [ voluptuous ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "voluptuous_openapi" ]; + + meta = with lib; { + description = "Convert voluptuous schemas to OpenAPI Schema object"; + homepage = "https://github.com/Shulyaka/voluptuous-openapi"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/wyoming/default.nix b/pkgs/development/python-modules/wyoming/default.nix index 422ba89917d90..bc1eb85ab3ba0 100644 --- a/pkgs/development/python-modules/wyoming/default.nix +++ b/pkgs/development/python-modules/wyoming/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "wyoming"; - version = "1.5.3"; + version = "1.5.4"; pyproject = true; src = fetchFromGitHub { owner = "rhasspy"; repo = "wyoming"; rev = "refs/tags/${version}"; - hash = "sha256-SOPkvFMjoDQiWVP39+1Cx4fFmPH8wcBhZhaKapdZaeA="; + hash = "sha256-gx9IbFkwR5fiFFAZTiQKzBbVBJ/RYz29sztgbvAEeRQ="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/xapp/default.nix b/pkgs/development/python-modules/xapp/default.nix index ba55391ca66fc..631857b89d5b2 100644 --- a/pkgs/development/python-modules/xapp/default.nix +++ b/pkgs/development/python-modules/xapp/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "xapp"; - version = "2.4.1"; + version = "2.4.2"; format = "other"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "linuxmint"; repo = "python-xapp"; rev = version; - hash = "sha256-Kvhp+biZ+KK9FYma/8cUEaQCHPKMLjOO909kbyMLQ3o="; + hash = "sha256-Gbm4YT9ZyrROOAbKz5xYd9J9YG9cUL2Oo6dDCPciaBs="; }; nativeBuildInputs = [ @@ -42,14 +42,8 @@ buildPythonPackage rec { ]; postPatch = '' - substituteInPlace "xapp/os.py" --replace "/usr/bin/pkexec" "${polkit}/bin/pkexec" - ''; - - postInstall = '' - # This is typically set by pipInstallHook/eggInstallHook, - # so we have to do so manually when using meson. - # https://github.com/NixOS/nixpkgs/issues/175227 - export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH + substituteInPlace "xapp/os.py" \ + --replace-fail "/usr/bin/pkexec" "${polkit}/bin/pkexec" ''; doCheck = false; @@ -63,7 +57,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/linuxmint/python-xapp"; description = "Cross-desktop libraries and common resources for python"; - license = licenses.lgpl2; + license = licenses.lgpl2Plus; platforms = platforms.linux; maintainers = teams.cinnamon.members; }; diff --git a/pkgs/development/python-modules/zwave-js-server-python/default.nix b/pkgs/development/python-modules/zwave-js-server-python/default.nix index a6c1e50e34d39..aed86231442be 100644 --- a/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.55.4"; + version = "0.56.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "zwave-js-server-python"; rev = "refs/tags/${version}"; - hash = "sha256-wPvMgQR85yHC0k+ENj+r/ilcxmOipSFGkz8qBRLgPaY="; + hash = "sha256-PLXdK8fFwj0D8F/UD3nZUN6AEsxmJAuaOfJac+dN/sI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/tools/air/default.nix b/pkgs/development/tools/air/default.nix index 07da59891b396..952f43fff4fd2 100644 --- a/pkgs/development/tools/air/default.nix +++ b/pkgs/development/tools/air/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "air"; - version = "1.52.1"; + version = "1.52.2"; src = fetchFromGitHub { owner = "air-verse"; repo = "air"; rev = "v${version}"; - hash = "sha256-KTutLvcLH1dOsJFDaEU2c4wGbQyRE7qUHah4mEXCL08="; + hash = "sha256-j1iyVEvg7hqZ634hbAvH5RmVnV7bNsezw72OJ1CNvmY="; }; vendorHash = "sha256-dSu00NAq6hEOdJxXp+12UaUq32z53Wzla3/u+2nxqPw="; diff --git a/pkgs/development/tools/buildah/wrapper.nix b/pkgs/development/tools/buildah/wrapper.nix index 7b9a672d69938..b5042ae1b8273 100644 --- a/pkgs/development/tools/buildah/wrapper.nix +++ b/pkgs/development/tools/buildah/wrapper.nix @@ -14,6 +14,7 @@ , iptables , aardvark-dns , netavark +, passt }: let @@ -36,6 +37,7 @@ let ] ++ lib.optionals stdenv.isLinux [ aardvark-dns netavark + passt ]; }; diff --git a/pkgs/development/tools/jql/default.nix b/pkgs/development/tools/jql/default.nix index 14e813046fee5..9f8a779f3d767 100644 --- a/pkgs/development/tools/jql/default.nix +++ b/pkgs/development/tools/jql/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "jql"; - version = "7.1.10"; + version = "7.1.11"; src = fetchFromGitHub { owner = "yamafaktory"; repo = pname; rev = "jql-v${version}"; - hash = "sha256-Y2c+qcI+IuPE7kmgPXTDLSkqCBw7wPmdmmYhZmBjwJ8="; + hash = "sha256-gXxYN6WIbQNhFTCcrT6Kioo0FjbJM5gxHTjAK71LMjs="; }; - cargoHash = "sha256-GRIR5CfrELLlImw3jKn2CDrmxQ+6WWTi674esic2O2U="; + cargoHash = "sha256-bz8iAgdRxTQyZJsTVVwIpiC/ktas4Sv/S7PCqQ+/HDY="; meta = with lib; { description = "A JSON Query Language CLI tool built with Rust"; diff --git a/pkgs/kde/generated/licenses.json b/pkgs/kde/generated/licenses.json index 82ecdcb4cd955..1b6a47dc218c0 100644 --- a/pkgs/kde/generated/licenses.json +++ b/pkgs/kde/generated/licenses.json @@ -761,6 +761,7 @@ "LicenseRef-KDE-Accepted-LGPL" ], "kcontacts": [ + "BSD-3-Clause", "CC0-1.0", "LGPL-2.0-or-later" ], diff --git a/pkgs/kde/generated/sources/frameworks.json b/pkgs/kde/generated/sources/frameworks.json index 1dea7ed6c3583..0eee0ca863f29 100644 --- a/pkgs/kde/generated/sources/frameworks.json +++ b/pkgs/kde/generated/sources/frameworks.json @@ -1,362 +1,362 @@ { "attica": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/attica-6.2.0.tar.xz", - "hash": "sha256-J1+wCz9INwTYAEhIg6N4l5ejGYsM5oDYUxPZl3/94vA=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/attica-6.3.0.tar.xz", + "hash": "sha256-q686EToALV2ENaOnUCD5jFdCkNLFUqXyVikdBBjMWe0=" }, "baloo": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/baloo-6.2.0.tar.xz", - "hash": "sha256-HqQTudutp9Bkah+Nw/BoiSjCZuY4hSjP0F1MB5p+Iqg=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/baloo-6.3.0.tar.xz", + "hash": "sha256-h6+W5Y2TA0eeYot8gBZlYxtuVpjhupUm9BXPbzdVoGQ=" }, "bluez-qt": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/bluez-qt-6.2.0.tar.xz", - "hash": "sha256-lkh09OS0z6Y6lAy9CsIb0NxPwGwU/3qNtU+YEZv4tDA=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/bluez-qt-6.3.0.tar.xz", + "hash": "sha256-O2i4P64QMthCE2krDJCPD9V8r+VxdcYrbOW4m8HUotw=" }, "breeze-icons": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/breeze-icons-6.2.0.tar.xz", - "hash": "sha256-31o7FQdo3Vx4Gmw9GEjXn0sOsvMn4kjFQmoSNKpME1s=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/breeze-icons-6.3.0.tar.xz", + "hash": "sha256-ZyZjePLX2/E9xPaR3kPzC1rKTkozNun2Dw77oqR05iY=" }, "extra-cmake-modules": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/extra-cmake-modules-6.2.0.tar.xz", - "hash": "sha256-Y3S/oN3ti+JlxwKs1d4R7s0oUcYluT4ch9jQ9fGo6+E=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/extra-cmake-modules-6.3.0.tar.xz", + "hash": "sha256-E2j4+6lcR1pAnv8F94uvSczSZViJ0elJAr/Ihnha+Bg=" }, "frameworkintegration": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/frameworkintegration-6.2.0.tar.xz", - "hash": "sha256-5B9ksXitna3K1RsUW9WAhoq6Bh+4D/FWFCaNCexODXw=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/frameworkintegration-6.3.0.tar.xz", + "hash": "sha256-lHAFUbM3P3krJ+psowE8e9qPa2MmC5GLPB7sDYOtTH8=" }, "kapidox": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/kapidox-6.2.0.tar.xz", - "hash": "sha256-A6zTkjMxrztOTsJ9MlNfow1lg9LQhh/SgqtjgiOYdas=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/kapidox-6.3.0.tar.xz", + "hash": "sha256-IdOcUzG1kjkgtrs+08ZQIaZiUPivkSVWTLkJQwAy104=" }, "karchive": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/karchive-6.2.0.tar.xz", - "hash": "sha256-FDXgnmS/TPJ87r/HZYLkTbnTexRT5Vru4Jd4vM/ZqLI=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/karchive-6.3.0.tar.xz", + "hash": "sha256-J4B/Vwdmj5qkHImOupAZijCDV3/aufR1GgL+/mNnTik=" }, "kauth": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/kauth-6.2.0.tar.xz", - "hash": "sha256-NRHZ2FfA9pYrAFs4HsXi/vne1ZJE2hTjHdBnPgWmmwo=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/kauth-6.3.0.tar.xz", + "hash": "sha256-6882gW/4JqLPs+0KDTdG19qaI/eZAexDt6TnsVavM7U=" }, "kbookmarks": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/kbookmarks-6.2.0.tar.xz", - "hash": "sha256-GvDWvnxDyxe8movaRkw3K58n+Z083zvpXsXyTjQ2jvs=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/kbookmarks-6.3.0.tar.xz", + "hash": "sha256-8HidqquGsMJFGpHiEyfyC/HSAEkc93RK+TwmKqds/qE=" }, "kcalendarcore": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/kcalendarcore-6.2.0.tar.xz", - "hash": "sha256-o+J3wBNqWd5jWmWfcRnXNoUsL/9QCy9f1Dn2kGbz8gk=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/kcalendarcore-6.3.0.tar.xz", + "hash": "sha256-zd92tgTLXiYyB4H3bKDKuo4j5lMmPSoglekbKIoWE/s=" }, "kcmutils": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/kcmutils-6.2.0.tar.xz", - "hash": "sha256-jO8UDKnqvynoighInHmQeOhSR5B/1vdBZa6v1O1AwLs=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/kcmutils-6.3.0.tar.xz", + "hash": "sha256-mZiwjOQjyeWc3MEmp0dTWaDE++awQA9EQQyKXLaSjkA=" }, "kcodecs": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/kcodecs-6.2.0.tar.xz", - "hash": "sha256-0ED7A1EMqQlC5UMjsa/SbsANRZsbLFTm7u7OUWaELy8=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/kcodecs-6.3.0.tar.xz", + "hash": "sha256-aQJTGvw9R9VD/rlxwrwEkBryZeZzCkd69EAAc7Iuxuw=" }, "kcolorscheme": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/kcolorscheme-6.2.0.tar.xz", - "hash": "sha256-CZDBcsWxKZa3wL48LlNTDO9l6vdtGShUzyB4cvupXxs=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/kcolorscheme-6.3.0.tar.xz", + "hash": "sha256-MRcwvc+BAJ9aeWlPE1qTBApKg6ZsuULZYX/NaXYEkDU=" }, "kcompletion": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/kcompletion-6.2.0.tar.xz", - "hash": "sha256-WMuTjrER6IWd0bqlEGJGfyJrjGfLH9uYdI0+l/q/COk=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/kcompletion-6.3.0.tar.xz", + "hash": "sha256-PwJ6xr0oXQQKUDjDGxDjBr0ssJnTluiFNs0UnojucS4=" }, "kconfig": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/kconfig-6.2.0.tar.xz", - "hash": "sha256-JRK8A2/EDNwjNFy/gDeFPHr9yTt/gVKFR6RR4PjEKek=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/kconfig-6.3.0.tar.xz", + "hash": "sha256-jYCar3tRUezXl8YBx/JwG8Qmtm1DG1IGnH/ztAAteXk=" }, "kconfigwidgets": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/kconfigwidgets-6.2.0.tar.xz", - "hash": "sha256-O15yxuVee50LPr7g/os5wJjdB6Vt452hVWiRkl632WM=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/kconfigwidgets-6.3.0.tar.xz", + "hash": "sha256-ushmabg8OfoNPUWAQgLtbbWqSO3GtNF3xXKiIU0mIJA=" }, "kcontacts": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/kcontacts-6.2.0.tar.xz", - "hash": "sha256-cJyhnpB2+YdRdk0Cm41kjGphsXJiukghz5f5E8y9G/k=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/kcontacts-6.3.0.tar.xz", + "hash": "sha256-IptbF5fNx/rrIn9xXIbt7o6EZPQLJHQyr5CeOz0wsQc=" }, "kcoreaddons": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/kcoreaddons-6.2.0.tar.xz", - "hash": "sha256-P5g2o85ecog78DJYe3Rc5VQ1qnYnF0V50uAY2nFzOO0=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/kcoreaddons-6.3.0.tar.xz", + "hash": "sha256-uLuTusKhF1/2BYP2/KFLhwfrh47v4HQSF0GzyFzFx1Y=" }, "kcrash": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/kcrash-6.2.0.tar.xz", - "hash": "sha256-ALe0iFyyqS6DKBbpzB2oz1zMxMRILBNkjwIJiMhs9Yg=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/kcrash-6.3.0.tar.xz", + "hash": "sha256-ZcZ6D+m42ifQ7+ikThajSOf2ArKVEQYvJjtVXr6kj0E=" }, "kdav": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/kdav-6.2.0.tar.xz", - "hash": "sha256-8YJ4z8creo7tSKTUR+rgfkMdFCmNvPWbpFu5NihsZOE=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/kdav-6.3.0.tar.xz", + "hash": "sha256-sJKpGeglU5mVeNsQKPaOv+bLXx2hKXIvLGpmLQ23Kbk=" }, "kdbusaddons": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/kdbusaddons-6.2.0.tar.xz", - "hash": "sha256-vKDfP8c2Hv/Pgf+3ldj/YuIYnqlnJJLWsmweAUT+3Wc=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/kdbusaddons-6.3.0.tar.xz", + "hash": "sha256-fi2Jme8JUTqqQgAKy1NpsgPNWXcwj254kc3mqNRCIAI=" }, "kdeclarative": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/kdeclarative-6.2.0.tar.xz", - "hash": "sha256-qFw/FZnSKfBS7jeG6QQazlUQyZhEyO/Hv8ndrtGTbYQ=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/kdeclarative-6.3.0.tar.xz", + "hash": "sha256-gH2DxId1ntVAhc5RSoD7OuzqBO+Y7g6jBmaPttWkbc4=" }, "kded": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/kded-6.2.0.tar.xz", - "hash": "sha256-ym1pcbZhtRQu3mq5oay+JNQIXvvJ8TmIwXlkmxJhq08=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/kded-6.3.0.tar.xz", + "hash": "sha256-1LPlXLoRtroS33o6uVjmNxMEmaNPzDuRihyrfeYjXkg=" }, "kdesu": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/kdesu-6.2.0.tar.xz", - "hash": "sha256-fGEv6kidnj49PJDKsNMU2YSGvcBgFKYPYJ/f8hUFgi8=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/kdesu-6.3.0.tar.xz", + "hash": "sha256-o5kFoYEzR3d5B2IgY/w9UVogw7baD+R5qmFzQSap594=" }, "kdnssd": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/kdnssd-6.2.0.tar.xz", - "hash": "sha256-UJARNnwRw7FwNNdD6mk0lRpvxSW5Un0Yw4r4H2Cwj0U=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/kdnssd-6.3.0.tar.xz", + "hash": "sha256-Zx1I0t4al0tXDrT19vagOHX6Fx6t50uBOWpLtHS5cSo=" }, "kdoctools": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/kdoctools-6.2.0.tar.xz", - "hash": "sha256-7POFVuxfnZnuLOssKHJ/TIA0IhfLabmqlFpvcC3D/08=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/kdoctools-6.3.0.tar.xz", + "hash": "sha256-S1DtFbnb0IpbN5vTLtG0fugJcau+DHolcLdJpmXHhUo=" }, "kfilemetadata": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/kfilemetadata-6.2.0.tar.xz", - "hash": "sha256-EGlBZUAkthZdo/rCYi++vTX/CfCDRa2TorLBq/oXfjA=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/kfilemetadata-6.3.0.tar.xz", + "hash": "sha256-vYjjeIYaA62pnGmEGoH87v090iAUUAf7/pETJwt9YIg=" }, "kglobalaccel": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/kglobalaccel-6.2.0.tar.xz", - "hash": "sha256-x0cn/vSjloDjbF7SfNtMW3VQQ3lfpSd07jvGo7Vo5yQ=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/kglobalaccel-6.3.0.tar.xz", + "hash": "sha256-wIIGyjnbEieiqKPIwGki1ZCIMMttUu8hLLWXuMcCnfE=" }, "kguiaddons": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/kguiaddons-6.2.0.tar.xz", - "hash": "sha256-ulpeQtW5uUSGQZJjg2B0Qp/T+s/DZP1OOimlS8beXds=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/kguiaddons-6.3.0.tar.xz", + "hash": "sha256-4VGbH8Aew3McKSa2mu56MsE+D5IXiDT+9ISsN9XcMgE=" }, "kholidays": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/kholidays-6.2.0.tar.xz", - "hash": "sha256-nXqAUofgQoHdWbjMsTAkBqkv4JQeJzysHHJO9hJfrCk=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/kholidays-6.3.0.tar.xz", + "hash": "sha256-n5nhGMc9odU4Bcs47odhFdda1etfsQijjmrogOfPrF4=" }, "ki18n": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/ki18n-6.2.0.tar.xz", - "hash": "sha256-iqj0dA2wgPTwws6I0PKJdA1VyqBrf3a/IWPQ+5/TZg8=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/ki18n-6.3.0.tar.xz", + "hash": "sha256-TZU0HrogcP7DkBOW6wpo9KhCMzfeXqI/uGsOpwyVcoI=" }, "kiconthemes": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/kiconthemes-6.2.0.tar.xz", - "hash": "sha256-wP/mX1P1m3W/BDLE9X99NraEDIf4Dp6luIzrcaKLVkU=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/kiconthemes-6.3.0.tar.xz", + "hash": "sha256-lFOUr8n4IHkkvwf5pt477n/NUjvOh+AATWJ2erN8wwM=" }, "kidletime": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/kidletime-6.2.0.tar.xz", - "hash": "sha256-BpGC5Kv7g/k2YdW7Dq6xS0TjcF+jSS29uOwDv+bj2dw=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/kidletime-6.3.0.tar.xz", + "hash": "sha256-zY9nfM5nODQriIF9DnwYA0YPAOQJ1zDFrg6jOxQmRy0=" }, "kimageformats": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/kimageformats-6.2.0.tar.xz", - "hash": "sha256-mEQhkYXwP+eZCurm/7ql9FKw9sUFPIcovIfpdoJkNWE=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/kimageformats-6.3.0.tar.xz", + "hash": "sha256-DtQHcb017VOvfEpSFhEb7ygidbLrOErgB2yRfbIMEhA=" }, "kio": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/kio-6.2.0.tar.xz", - "hash": "sha256-Mx1v9rnLsOZSGl0HRrFSviWI/WMac9DiSbeM0s2mnM8=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/kio-6.3.0.tar.xz", + "hash": "sha256-OeGvsyQGlgVgnGDB1GONqIbev2FZF5UhFntRWdeaBEg=" }, "kirigami": { - "version": "6.2.1", - "url": "mirror://kde/stable/frameworks/6.2/kirigami-6.2.1.tar.xz", - "hash": "sha256-kQQSdw55ucE92sQhmfp1EXcM2Uhbj1omTh72NjozDJk=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/kirigami-6.3.0.tar.xz", + "hash": "sha256-28v6oFs3wDUB/o9N+vkvb3v5uHG40oiXNjpWeNyyOVs=" }, "kitemmodels": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/kitemmodels-6.2.0.tar.xz", - "hash": "sha256-wGaIgxMmDXWiB5OTNLBWtAFLpzZLQ3MlVheQ63s3Qro=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/kitemmodels-6.3.0.tar.xz", + "hash": "sha256-s6mE+2KRnB+Ls/t3ouIH5RpS9cWWQV6p/I/6YYtWrLo=" }, "kitemviews": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/kitemviews-6.2.0.tar.xz", - "hash": "sha256-c2LZiT0emoY0glc+z8Or3djGNFEtihiE8JSl9UOvSik=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/kitemviews-6.3.0.tar.xz", + "hash": "sha256-2GV9FVYRYxg0qACm+wqsEQtrqkQ13gD71gSL2fGi1C8=" }, "kjobwidgets": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/kjobwidgets-6.2.0.tar.xz", - "hash": "sha256-L7dgLyu6gYvP/+GtExDXkAiJ4Q5T44S4dClfs1k/s6E=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/kjobwidgets-6.3.0.tar.xz", + "hash": "sha256-X+4tS5R5+sdEInkMPqKxRktK4/EDR/xgOkHYsWfxCNg=" }, "knewstuff": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/knewstuff-6.2.0.tar.xz", - "hash": "sha256-9UlidWuOuYxnhANSoe/qRpjxWhfUvIKC9lrbDbCMV4A=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/knewstuff-6.3.0.tar.xz", + "hash": "sha256-oW0Wsi6Uy1FZo7GgccV4VynjBSuvnjPyqwILkDLZZ9c=" }, "knotifications": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/knotifications-6.2.0.tar.xz", - "hash": "sha256-lifCAPWN5eXcTnTRoTAFYkEVttI9oDTmSqG/MUPngWQ=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/knotifications-6.3.0.tar.xz", + "hash": "sha256-zO08GjeV/tyQ3GKMazz/8G0ZTsz9yiewWTj16UHMeHc=" }, "knotifyconfig": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/knotifyconfig-6.2.0.tar.xz", - "hash": "sha256-tb/sRYK8IvDIfHD90loF4UX9/l5KYKlj9RJXHgPTfMw=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/knotifyconfig-6.3.0.tar.xz", + "hash": "sha256-6/JvXlHlPq2xLpqFiq6dVQhdIzwfVDh5B2RSrCkAUl0=" }, "kpackage": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/kpackage-6.2.0.tar.xz", - "hash": "sha256-eMhGbXIB8qpoCdmFiCQq72MUvkpHFVYXxSnGoFSfOV0=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/kpackage-6.3.0.tar.xz", + "hash": "sha256-gR1oCeCRweqqB8r+rMhusj+lXtA4+PGpPSWeVzRRC00=" }, "kparts": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/kparts-6.2.0.tar.xz", - "hash": "sha256-BPcIKavHAzMn9C5eXuE2X026mWixhPNCEsVIbjapvrE=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/kparts-6.3.0.tar.xz", + "hash": "sha256-QvwnZnP0mYidVxPYqcBhx/enaIUUHyFNfxL55YylBAA=" }, "kpeople": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/kpeople-6.2.0.tar.xz", - "hash": "sha256-P1+qSO3h5H7j43R+8K3y8dgyDb76jw7G63X9L0q0WDc=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/kpeople-6.3.0.tar.xz", + "hash": "sha256-ln+Xnlas31RhmMGVDlVGY8ljruxW4gQFYHh4KUdyMD4=" }, "kplotting": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/kplotting-6.2.0.tar.xz", - "hash": "sha256-zdx+leM3a+FiGjR/bp/6iK14e0haomx+AmM2wFJ3wW0=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/kplotting-6.3.0.tar.xz", + "hash": "sha256-+Of6NH0Oa6uSTzNHcW61zEaLlrKWtSl005LfAw26lSE=" }, "kpty": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/kpty-6.2.0.tar.xz", - "hash": "sha256-92g+i1zV271CV+jVrNJuWGhaO8PxYdwP4Q9ToHUkAmQ=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/kpty-6.3.0.tar.xz", + "hash": "sha256-Y6SbOZhKwYx5cAytT4+Dy60tAGgBNm3GsQQppuANoKY=" }, "kquickcharts": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/kquickcharts-6.2.0.tar.xz", - "hash": "sha256-/dlr9CGKMJvihSOsMYvXgW6L0f6/DncbEzWc1ljGdWs=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/kquickcharts-6.3.0.tar.xz", + "hash": "sha256-JQ5SKt+/SLPydj9Ow3iiAzehyi5bDizYs2Fdej/tj8c=" }, "krunner": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/krunner-6.2.0.tar.xz", - "hash": "sha256-8Y8VeP+MdsRVg3pLyaPnEnO7pKxUr9JOFDqdwgcGBB8=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/krunner-6.3.0.tar.xz", + "hash": "sha256-bKb+Scm8DZ2jOV25k7+yjVAQvL14sJhGJYGdHTYx5CU=" }, "kservice": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/kservice-6.2.0.tar.xz", - "hash": "sha256-BkbJIZwNfZojcbkNxCfryGzzCtr8sitFjxMPAR3iiII=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/kservice-6.3.0.tar.xz", + "hash": "sha256-oFZNYsHg8ik7Dcs5z4FMKFYREkK4Yhsz9Spw/aGo/lQ=" }, "kstatusnotifieritem": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/kstatusnotifieritem-6.2.0.tar.xz", - "hash": "sha256-BLn8CQW2FK/I4K/PVFEBjSoSbxZSIbbbIOQXG+L7H88=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/kstatusnotifieritem-6.3.0.tar.xz", + "hash": "sha256-zh8uM9Db6BpI8AQJd7e3qnI09qADFz45Wz3l14M5jNg=" }, "ksvg": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/ksvg-6.2.0.tar.xz", - "hash": "sha256-Vom/ncPvqyn92uoK8AquyMqDI+ZQT0kMO7O0eoLrdvM=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/ksvg-6.3.0.tar.xz", + "hash": "sha256-AFTtDAlMYFpxK8n4yMxhx+DT7v4e5QqTkSu9YKbLB9c=" }, "ktexteditor": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/ktexteditor-6.2.0.tar.xz", - "hash": "sha256-wQpeTMkhrrUbF+l9TymIOrGGtj0QgZnmoxlECjnx8qA=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/ktexteditor-6.3.0.tar.xz", + "hash": "sha256-l52/+usKBBOzdF76GAqgvm4e2L+PWpOCgUmbkx4oN3Y=" }, "ktexttemplate": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/ktexttemplate-6.2.0.tar.xz", - "hash": "sha256-pZsObjrLlHN7gur6xH0UclJVxsbyHCNxzPnswQYs8so=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/ktexttemplate-6.3.0.tar.xz", + "hash": "sha256-k1GInFifsvp/M/pvDXSO2+9Ehj/nnrSbEtH6WrNJrp0=" }, "ktextwidgets": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/ktextwidgets-6.2.0.tar.xz", - "hash": "sha256-RpNow0EmWGXiViq20751TbloligL3KkME0EnsVAate0=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/ktextwidgets-6.3.0.tar.xz", + "hash": "sha256-np+1rua6VX/1PFv3JsuFUe/EIIA4/aR+5enET9fUOF4=" }, "kunitconversion": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/kunitconversion-6.2.0.tar.xz", - "hash": "sha256-5e1gV4ukw3hqEJzh+y5LNuSCWnkzjErKHd3JpJMAboA=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/kunitconversion-6.3.0.tar.xz", + "hash": "sha256-fbP0LdD/PfTrdI7mKIPo8jIDyjLRQ9P6Cd6wZRCVB5s=" }, "kuserfeedback": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/kuserfeedback-6.2.0.tar.xz", - "hash": "sha256-gpxS2xXWm5Dm0isI3qze3NE0I8kB5Nq2OJPoFLTnaFg=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/kuserfeedback-6.3.0.tar.xz", + "hash": "sha256-P+LON7kqcNYE84+jabX+LqZOJoxIqkUOmXH8hATocAY=" }, "kwallet": { - "version": "6.2.1", - "url": "mirror://kde/stable/frameworks/6.2/kwallet-6.2.1.tar.xz", - "hash": "sha256-UQxoGPso3ZHCqQxNBWgwEMrxs56a8bOoy7O0t8Yhk7w=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/kwallet-6.3.0.tar.xz", + "hash": "sha256-7bbrv6PZCGnK38kmbaR6iz1bK1sOSWt0p+pSYjktKt0=" }, "kwidgetsaddons": { - "version": "6.2.2", - "url": "mirror://kde/stable/frameworks/6.2/kwidgetsaddons-6.2.2.tar.xz", - "hash": "sha256-ORvVeEatFFHEoa39Cc+/qMI7FL8ra/cQhCNgtX2QBJ0=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/kwidgetsaddons-6.3.0.tar.xz", + "hash": "sha256-Dj+fDbmgpq1CPLUP/ooBvrX+74vHhyw1t1dhgOTRhEw=" }, "kwindowsystem": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/kwindowsystem-6.2.0.tar.xz", - "hash": "sha256-D4+xK07qkmp/TPWeyF2VKXqMtn2Ak9xLGUtRocRnHYk=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/kwindowsystem-6.3.0.tar.xz", + "hash": "sha256-QOM8WSk0vCdIS5IuPas8n9vgeAY/pbyvKdUNLNjoqrk=" }, "kxmlgui": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/kxmlgui-6.2.0.tar.xz", - "hash": "sha256-/yKnn8onN+M8VGPYf60rRpIMjUjGWDJoqa4nCXqKyQI=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/kxmlgui-6.3.0.tar.xz", + "hash": "sha256-InP9susy+MyRUMTLzE99nrLxJo/Lp+Ia3ScQXATnmV4=" }, "modemmanager-qt": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/modemmanager-qt-6.2.0.tar.xz", - "hash": "sha256-89HbmsZKNTM0sHTkXNB/zktArBOIyWT4sml0bcNb7qg=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/modemmanager-qt-6.3.0.tar.xz", + "hash": "sha256-nPMCl0aouLN0C8Tek/E4ZkMlx/T+gBfZLjQue8Q+x88=" }, "networkmanager-qt": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/networkmanager-qt-6.2.0.tar.xz", - "hash": "sha256-e+Iqa7xYQ7GtoKFw+1bJyWvvZD19SFQT8q95KRTtAtI=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/networkmanager-qt-6.3.0.tar.xz", + "hash": "sha256-DKlqO/ePAzo2vlnHXT1jgrTvE+dTQZ7tE+8uM4IeOeA=" }, "prison": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/prison-6.2.0.tar.xz", - "hash": "sha256-h3GWdcFlLwdzFJuN44T0BpSabWWr4lptNhHhENEtbKg=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/prison-6.3.0.tar.xz", + "hash": "sha256-dpgHcleHBR5emi9B6395GpzhG+d1p+7/jVJfKni0vEY=" }, "purpose": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/purpose-6.2.0.tar.xz", - "hash": "sha256-VbAtSTh7dvVOO+xI+CzXjzmLVAO8jRDUgr//fjCgAoo=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/purpose-6.3.0.tar.xz", + "hash": "sha256-vylvZka9z+9K67pNBOwD5+cqVFVSubdlqPv8Yl7m7Bc=" }, "qqc2-desktop-style": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/qqc2-desktop-style-6.2.0.tar.xz", - "hash": "sha256-uO0nDZMKrQXq3x7FpUCHDxEo2Mco2GFsQIAdaYCGmxw=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/qqc2-desktop-style-6.3.0.tar.xz", + "hash": "sha256-nn5pu382RtL8w3okNkxV18l0yDz24tkGo5qKjhTxvLA=" }, "solid": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/solid-6.2.0.tar.xz", - "hash": "sha256-ACoNKydZm+vHIVFmgdMnh2li/cr5lA8DNjT7k6T51yI=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/solid-6.3.0.tar.xz", + "hash": "sha256-uCGZlZm87gH9GQ29kvLOwx2uFesF21GlvJcMJLJ9k9k=" }, "sonnet": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/sonnet-6.2.0.tar.xz", - "hash": "sha256-hOcSrVa8lP+O/Jvd+rQfbDJxIbPd1pAw6UCsyRM2J+0=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/sonnet-6.3.0.tar.xz", + "hash": "sha256-a0TdAM6qd8PcnwX4LKI3kc7NiHggiJzfj/wks4SXTH4=" }, "syndication": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/syndication-6.2.0.tar.xz", - "hash": "sha256-UOw4Q6COx7GFNSyUuJvC0nIM6vF+uWGkw9pV+T0Frzw=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/syndication-6.3.0.tar.xz", + "hash": "sha256-zfBXwJvjXjmAkEAHKme4Um7mErbYdh+W9hOzUNl5yNQ=" }, "syntax-highlighting": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/syntax-highlighting-6.2.0.tar.xz", - "hash": "sha256-Mn7VjSDVJQK7/ZJ4+hyeerSoRhWeXPYw0J++oUTru38=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/syntax-highlighting-6.3.0.tar.xz", + "hash": "sha256-ODAKNclpvvX6NrQ31UNC2goMgFKCpldRm9Ti97Qt+YQ=" }, "threadweaver": { - "version": "6.2.0", - "url": "mirror://kde/stable/frameworks/6.2/threadweaver-6.2.0.tar.xz", - "hash": "sha256-503i3wu1AUisyKYWH5gJmRrksjNLWKnuCSuh2CcEQzc=" + "version": "6.3.0", + "url": "mirror://kde/stable/frameworks/6.3/threadweaver-6.3.0.tar.xz", + "hash": "sha256-gSAfj5kY1pZ7dqXIxGhIEonlv1Y1Gz4UDM5TKCH32RM=" } } \ No newline at end of file diff --git a/pkgs/os-specific/darwin/raycast/default.nix b/pkgs/os-specific/darwin/raycast/default.nix index 4c326a5b6122f..5df4990b59f2c 100644 --- a/pkgs/os-specific/darwin/raycast/default.nix +++ b/pkgs/os-specific/darwin/raycast/default.nix @@ -11,12 +11,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "raycast"; - version = "1.75.2"; + version = "1.76.0"; src = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal"; - hash = "sha256-P9lbIU8IBdowy8vkv+PHITBUpRNTI9t0j8Vm1DjYXnQ="; + hash = "sha256-9qvXUmCATwugK8lB1LeSnjfr5MNCjF9QTKR29LmbKes="; }; dontPatch = true; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 23f17c9ad7c18..6c600f0f5acb1 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 = "2024.5.5"; + version = "2024.6.0"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -51,6 +51,8 @@ ]; "air_quality" = ps: with ps; [ ]; + "airgradient" = ps: with ps; [ + ]; # missing inputs: airgradient "airly" = ps: with ps; [ airly ]; @@ -82,6 +84,7 @@ hassil home-assistant-intents ifaddr + isal mutagen psutil-home-assistant pyserial @@ -109,16 +112,21 @@ aioairzone-cloud ]; "aladdin_connect" = ps: with ps; [ - aioaladdinconnect - ]; + fnv-hash-fast + isal + psutil-home-assistant + sqlalchemy + ]; # missing inputs: genie-partner-sdk "alarm_control_panel" = ps: with ps; [ ]; "alarmdecoder" = ps: with ps; [ adext ]; "alert" = ps: with ps; [ + isal ]; "alexa" = ps: with ps; [ + isal pyturbojpeg ]; "alpha_vantage" = ps: with ps; [ @@ -130,9 +138,6 @@ "amberelectric" = ps: with ps; [ amberelectric ]; - "ambiclimate" = ps: with ps; [ - ambiclimate - ]; "ambient_network" = ps: with ps; [ aioambient ]; @@ -150,6 +155,7 @@ ]; "analytics" = ps: with ps; [ fnv-hash-fast + isal psutil-home-assistant sqlalchemy ]; @@ -191,12 +197,14 @@ aioapcaccess ]; "api" = ps: with ps; [ + isal ]; "appalachianpower" = ps: with ps; [ ]; "apple_tv" = ps: with ps; [ fnv-hash-fast ifaddr + isal psutil-home-assistant pyatv sqlalchemy @@ -204,6 +212,7 @@ ]; "application_credentials" = ps: with ps; [ fnv-hash-fast + isal psutil-home-assistant sqlalchemy ]; @@ -216,6 +225,8 @@ aprslib geopy ]; + "apsystems" = ps: with ps; [ + ]; # missing inputs: apsystems-ez1 "aqualogic" = ps: with ps; [ aqualogic ]; @@ -241,6 +252,7 @@ hassil home-assistant-intents ifaddr + isal mutagen psutil-home-assistant pyserial @@ -263,6 +275,7 @@ "arve" = ps: with ps; [ ]; # missing inputs: asyncarve "arwn" = ps: with ps; [ + isal paho-mqtt ]; "aseko_pool_live" = ps: with ps; [ @@ -272,6 +285,7 @@ ha-ffmpeg hassil home-assistant-intents + isal mutagen webrtc-noise-gain ]; @@ -312,8 +326,10 @@ pyaussiebb ]; "auth" = ps: with ps; [ + isal ]; "automation" = ps: with ps; [ + isal ]; "avea" = ps: with ps; [ avea @@ -329,8 +345,11 @@ ]; "axis" = ps: with ps; [ axis + isal paho-mqtt ]; + "azure_data_explorer" = ps: with ps; [ + ]; # missing inputs: azure-kusto-data azure-kusto-ingest "azure_devops" = ps: with ps; [ aioazuredevops ]; @@ -342,6 +361,7 @@ ]; "backup" = ps: with ps; [ fnv-hash-fast + isal psutil-home-assistant securetar sqlalchemy @@ -414,6 +434,7 @@ hassil home-assistant-intents ifaddr + isal mutagen psutil-home-assistant pyserial @@ -436,6 +457,7 @@ dbus-fast fnv-hash-fast habluetooth + isal psutil-home-assistant pyserial pyudev @@ -459,6 +481,7 @@ hassil home-assistant-intents ifaddr + isal mutagen psutil-home-assistant pyserial @@ -485,6 +508,7 @@ hassil home-assistant-intents ifaddr + isal mutagen psutil-home-assistant pyserial @@ -508,6 +532,7 @@ boschshcpy fnv-hash-fast ifaddr + isal psutil-home-assistant sqlalchemy zeroconf @@ -527,6 +552,7 @@ ]; "brother" = ps: with ps; [ brother + pysnmp-lextudio ]; "brottsplatskartan" = ps: with ps; [ brottsplatskartan @@ -565,6 +591,7 @@ hassil home-assistant-intents ifaddr + isal mutagen psutil-home-assistant pyserial @@ -586,8 +613,10 @@ caldav ]; "calendar" = ps: with ps; [ + isal ]; "camera" = ps: with ps; [ + isal pyturbojpeg ]; "canary" = ps: with ps; [ @@ -601,6 +630,7 @@ hassil home-assistant-intents ifaddr + isal mutagen plexapi plexauth @@ -647,6 +677,7 @@ hass-nabucasa hassil home-assistant-intents + isal mutagen psutil-home-assistant python-matter-server @@ -689,6 +720,7 @@ "coned" = ps: with ps; [ ]; "config" = ps: with ps; [ + isal ]; "configurator" = ps: with ps; [ ]; @@ -698,6 +730,7 @@ "conversation" = ps: with ps; [ hassil home-assistant-intents + isal ]; "coolmaster" = ps: with ps; [ pycoolmasternet-async @@ -720,6 +753,7 @@ crownstone-sse crownstone-uart fnv-hash-fast + isal psutil-home-assistant pyserial pyudev @@ -778,6 +812,7 @@ home-assistant-frontend home-assistant-intents ifaddr + isal mutagen numpy pillow @@ -801,8 +836,13 @@ deluge-client ]; "demo" = ps: with ps; [ + fnv-hash-fast hassil home-assistant-intents + isal + pillow + psutil-home-assistant + sqlalchemy ]; "denon" = ps: with ps; [ ]; @@ -815,6 +855,7 @@ devialet fnv-hash-fast ifaddr + isal psutil-home-assistant sqlalchemy zeroconf @@ -822,7 +863,11 @@ "device_automation" = ps: with ps; [ ]; "device_sun_light_trigger" = ps: with ps; [ + fnv-hash-fast + isal pillow + psutil-home-assistant + sqlalchemy ]; "device_tracker" = ps: with ps; [ ]; @@ -830,6 +875,7 @@ devolo-home-control-api fnv-hash-fast ifaddr + isal psutil-home-assistant sqlalchemy zeroconf @@ -846,8 +892,10 @@ cached-ipaddress ]; "diagnostics" = ps: with ps; [ + isal ]; "dialogflow" = ps: with ps; [ + isal ]; "diaz" = ps: with ps; [ ]; @@ -881,6 +929,7 @@ fnv-hash-fast getmac ifaddr + isal psutil-home-assistant sqlalchemy ]; @@ -888,6 +937,7 @@ async-upnp-client fnv-hash-fast ifaddr + isal psutil-home-assistant sqlalchemy ]; @@ -895,6 +945,7 @@ aiodns ]; "dominos" = ps: with ps; [ + isal ]; # missing inputs: pizzapi "doods" = ps: with ps; [ pillow @@ -902,6 +953,7 @@ ]; "doorbird" = ps: with ps; [ doorbirdpy + isal ]; "dooya" = ps: with ps; [ ]; @@ -923,6 +975,7 @@ hassil home-assistant-intents ifaddr + isal mutagen psutil-home-assistant py-dormakaba-dkey @@ -941,12 +994,14 @@ ]; "drop_connect" = ps: with ps; [ dropmqttapi + isal paho-mqtt ]; "dsmr" = ps: with ps; [ dsmr-parser ]; "dsmr_reader" = ps: with ps; [ + isal paho-mqtt ]; "dte_energy_bridge" = ps: with ps; [ @@ -973,6 +1028,7 @@ dynalite-panel fnv-hash-fast home-assistant-frontend + isal pillow psutil-home-assistant sqlalchemy @@ -1006,6 +1062,7 @@ ]; # missing inputs: py-sucks "ecowitt" = ps: with ps; [ aioecowitt + isal ]; "eddystone_temperature" = ps: with ps; [ ]; # missing inputs: beacontools @@ -1027,6 +1084,7 @@ ]; # missing inputs: pyElectra "electric_kiwi" = ps: with ps; [ fnv-hash-fast + isal psutil-home-assistant sqlalchemy ]; # missing inputs: electrickiwi-api @@ -1040,6 +1098,7 @@ elkm1-lib fnv-hash-fast ifaddr + isal psutil-home-assistant sqlalchemy ]; @@ -1051,6 +1110,7 @@ ]; "elvia" = ps: with ps; [ fnv-hash-fast + isal psutil-home-assistant sqlalchemy ]; # missing inputs: elvia @@ -1067,6 +1127,7 @@ "emulated_hue" = ps: with ps; [ fnv-hash-fast ifaddr + isal psutil-home-assistant sqlalchemy ]; @@ -1077,6 +1138,7 @@ emulated-roku fnv-hash-fast ifaddr + isal psutil-home-assistant sqlalchemy ]; @@ -1086,6 +1148,7 @@ ]; "energy" = ps: with ps; [ fnv-hash-fast + isal psutil-home-assistant sqlalchemy ]; @@ -1141,6 +1204,7 @@ hassil home-assistant-intents ifaddr + isal mutagen psutil-home-assistant pyserial @@ -1170,6 +1234,7 @@ hassil home-assistant-intents ifaddr + isal mutagen psutil-home-assistant pyserial @@ -1202,6 +1267,7 @@ hassil home-assistant-intents ifaddr + isal mutagen psutil-home-assistant pyserial @@ -1263,11 +1329,13 @@ file-read-backwards ]; "file_upload" = ps: with ps; [ + isal ]; "filesize" = ps: with ps; [ ]; "filter" = ps: with ps; [ fnv-hash-fast + isal psutil-home-assistant sqlalchemy ]; @@ -1285,6 +1353,7 @@ "fitbit" = ps: with ps; [ fitbit fnv-hash-fast + isal psutil-home-assistant sqlalchemy ]; @@ -1313,6 +1382,7 @@ hassil home-assistant-intents ifaddr + isal mutagen psutil-home-assistant pyserial @@ -1354,6 +1424,7 @@ flux-led fnv-hash-fast ifaddr + isal psutil-home-assistant sqlalchemy ]; @@ -1370,6 +1441,7 @@ ]; "forked_daapd" = ps: with ps; [ fnv-hash-fast + isal psutil-home-assistant spotipy sqlalchemy @@ -1381,6 +1453,7 @@ libpyfoscam ]; "foursquare" = ps: with ps; [ + isal ]; "free_mobile" = ps: with ps; [ ]; # missing inputs: freesms @@ -1397,6 +1470,7 @@ fnv-hash-fast fritzconnection ifaddr + isal psutil-home-assistant sqlalchemy xmltodict @@ -1415,6 +1489,7 @@ "frontend" = ps: with ps; [ fnv-hash-fast home-assistant-frontend + isal pillow psutil-home-assistant sqlalchemy @@ -1425,6 +1500,7 @@ "fujitsu_anywair" = ps: with ps; [ ]; "fully_kiosk" = ps: with ps; [ + isal paho-mqtt python-fullykiosk ]; @@ -1458,6 +1534,7 @@ hassil home-assistant-intents ifaddr + isal mutagen psutil-home-assistant pyserial @@ -1475,12 +1552,14 @@ ]; "generic" = ps: with ps; [ ha-av + isal pillow ]; "generic_hygrostat" = ps: with ps; [ ]; "generic_thermostat" = ps: with ps; [ fnv-hash-fast + isal psutil-home-assistant sqlalchemy ]; @@ -1498,10 +1577,12 @@ "geocaching" = ps: with ps; [ fnv-hash-fast geocachingapi + isal psutil-home-assistant sqlalchemy ]; "geofency" = ps: with ps; [ + isal ]; "geonetnz_quakes" = ps: with ps; [ aio-geojson-geonetnz-quakes @@ -1536,12 +1617,14 @@ fnv-hash-fast gcal-sync ical + isal oauth2client psutil-home-assistant sqlalchemy ]; "google_assistant" = ps: with ps; [ fnv-hash-fast + isal psutil-home-assistant python-matter-server pyturbojpeg @@ -1550,6 +1633,7 @@ "google_assistant_sdk" = ps: with ps; [ fnv-hash-fast gassist-text + isal psutil-home-assistant sqlalchemy ]; @@ -1560,12 +1644,18 @@ ]; "google_generative_ai_conversation" = ps: with ps; [ google-generativeai + ha-ffmpeg hassil home-assistant-intents + isal + mutagen + voluptuous-openapi + webrtc-noise-gain ]; "google_mail" = ps: with ps; [ fnv-hash-fast google-api-python-client + isal psutil-home-assistant sqlalchemy ]; @@ -1578,12 +1668,14 @@ "google_sheets" = ps: with ps; [ fnv-hash-fast gspread + isal psutil-home-assistant sqlalchemy ]; "google_tasks" = ps: with ps; [ fnv-hash-fast google-api-python-client + isal psutil-home-assistant sqlalchemy ]; @@ -1614,6 +1706,7 @@ hassil home-assistant-intents ifaddr + isal mutagen psutil-home-assistant pyserial @@ -1626,6 +1719,7 @@ fnv-hash-fast govee-local-api ifaddr + isal psutil-home-assistant sqlalchemy ]; @@ -1633,6 +1727,7 @@ gps3 ]; "gpslogger" = ps: with ps; [ + isal ]; "graphite" = ps: with ps; [ ]; @@ -1640,6 +1735,7 @@ fnv-hash-fast greeclimate ifaddr + isal psutil-home-assistant sqlalchemy ]; @@ -1649,6 +1745,11 @@ "greenwave" = ps: with ps; [ ]; # missing inputs: greenwavereality "group" = ps: with ps; [ + fnv-hash-fast + isal + pillow + psutil-home-assistant + sqlalchemy ]; "growatt_server" = ps: with ps; [ growattserver @@ -1665,6 +1766,7 @@ habitipy ]; "hardkernel" = ps: with ps; [ + isal psutil-home-assistant ]; "hardware" = ps: with ps; [ @@ -1677,6 +1779,7 @@ aioharmony ]; "hassio" = ps: with ps; [ + isal ]; "havana_shade" = ps: with ps; [ ]; @@ -1712,11 +1815,13 @@ ]; "history" = ps: with ps; [ fnv-hash-fast + isal psutil-home-assistant sqlalchemy ]; "history_stats" = ps: with ps; [ fnv-hash-fast + isal psutil-home-assistant sqlalchemy ]; @@ -1737,6 +1842,7 @@ "home_connect" = ps: with ps; [ fnv-hash-fast homeconnect + isal psutil-home-assistant sqlalchemy ]; @@ -1749,10 +1855,10 @@ "homeassistant_green" = ps: with ps; [ bellows fnv-hash-fast + isal pillow psutil-home-assistant pyserial - pyserial-asyncio pyserial-asyncio-fast pyudev sqlalchemy @@ -1767,10 +1873,10 @@ "homeassistant_hardware" = ps: with ps; [ bellows fnv-hash-fast + isal pillow psutil-home-assistant pyserial - pyserial-asyncio pyserial-asyncio-fast pyudev sqlalchemy @@ -1785,10 +1891,10 @@ "homeassistant_sky_connect" = ps: with ps; [ bellows fnv-hash-fast + isal pillow psutil-home-assistant pyserial - pyserial-asyncio pyserial-asyncio-fast pyudev sqlalchemy @@ -1803,10 +1909,10 @@ "homeassistant_yellow" = ps: with ps; [ bellows fnv-hash-fast + isal pillow psutil-home-assistant pyserial - pyserial-asyncio pyserial-asyncio-fast pyudev sqlalchemy @@ -1824,6 +1930,7 @@ ha-ffmpeg hap-python ifaddr + isal psutil-home-assistant pyqrcode pyturbojpeg @@ -1849,6 +1956,7 @@ hassil home-assistant-intents ifaddr + isal mutagen psutil-home-assistant pyroute2 @@ -1880,9 +1988,11 @@ python-hpilo ]; "html5" = ps: with ps; [ + isal pywebpush ]; "http" = ps: with ps; [ + isal ]; "huawei_lte" = ps: with ps; [ huawei-lte-api @@ -1905,6 +2015,7 @@ "husqvarna_automower" = ps: with ps; [ aioautomower fnv-hash-fast + isal psutil-home-assistant sqlalchemy ]; @@ -1949,6 +2060,7 @@ home-assistant-intents ibeacon-ble ifaddr + isal mutagen psutil-home-assistant pyserial @@ -1978,6 +2090,7 @@ hassil home-assistant-intents ifaddr + isal mutagen psutil-home-assistant pyserial @@ -1989,6 +2102,7 @@ "idteck_prox" = ps: with ps; [ ]; # missing inputs: rfk101py "ifttt" = ps: with ps; [ + isal pyfttt ]; "iglo" = ps: with ps; [ @@ -2000,16 +2114,22 @@ defusedxml ]; # missing inputs: ihcsdk "image" = ps: with ps; [ + isal ]; "image_processing" = ps: with ps; [ + isal pyturbojpeg ]; "image_upload" = ps: with ps; [ + isal pillow ]; "imap" = ps: with ps; [ aioimaplib + isal ]; + "imgw_pib" = ps: with ps; [ + ]; # missing inputs: imgw_pib "improv_ble" = ps: with ps; [ aioesphomeapi aioruuvigateway @@ -2028,6 +2148,7 @@ hassil home-assistant-intents ifaddr + isal mutagen psutil-home-assistant pyserial @@ -2064,6 +2185,7 @@ home-assistant-intents ifaddr inkbird-ble + isal mutagen psutil-home-assistant pyserial @@ -2090,6 +2212,7 @@ fnv-hash-fast home-assistant-frontend insteon-frontend-home-assistant + isal pillow psutil-home-assistant pyinsteon @@ -2103,6 +2226,7 @@ intellifire4py ]; "intent" = ps: with ps; [ + isal ]; "intent_script" = ps: with ps; [ ]; @@ -2112,6 +2236,7 @@ "ios" = ps: with ps; [ fnv-hash-fast ifaddr + isal psutil-home-assistant sqlalchemy zeroconf @@ -2132,6 +2257,9 @@ ]; "irish_rail_transport" = ps: with ps; [ ]; # missing inputs: pyirishrail + "isal" = ps: with ps; [ + isal + ]; "islamic_prayer_times" = ps: with ps; [ ]; # missing inputs: prayer-times-calculator-offline "ismartwindow" = ps: with ps; [ @@ -2199,6 +2327,7 @@ hassil home-assistant-intents ifaddr + isal kegtron-ble mutagen psutil-home-assistant @@ -2234,6 +2363,7 @@ hassil home-assistant-intents ifaddr + isal mutagen psutil-home-assistant pymicrobot @@ -2248,6 +2378,7 @@ ]; "kitchen_sink" = ps: with ps; [ fnv-hash-fast + isal psutil-home-assistant sqlalchemy ]; @@ -2260,6 +2391,7 @@ "knx" = ps: with ps; [ fnv-hash-fast home-assistant-frontend + isal knx-frontend pillow psutil-home-assistant @@ -2268,9 +2400,11 @@ xknxproject ]; "kodi" = ps: with ps; [ + isal pykodi ]; "konnected" = ps: with ps; [ + isal konnected ]; "kostal_plenticore" = ps: with ps; [ @@ -2311,6 +2445,7 @@ hassil home-assistant-intents ifaddr + isal lmcloud mutagen psutil-home-assistant @@ -2323,11 +2458,13 @@ "lametric" = ps: with ps; [ demetriek fnv-hash-fast + isal psutil-home-assistant sqlalchemy ]; "landisgyr_heat_meter" = ps: with ps; [ fnv-hash-fast + isal psutil-home-assistant pyserial pyudev @@ -2368,6 +2505,7 @@ hassil home-assistant-intents ifaddr + isal ld2410-ble mutagen psutil-home-assistant @@ -2395,6 +2533,7 @@ hassil home-assistant-intents ifaddr + isal mutagen psutil-home-assistant pyserial @@ -2421,6 +2560,7 @@ hassil home-assistant-intents ifaddr + isal led-ble mutagen psutil-home-assistant @@ -2435,6 +2575,7 @@ "lg_netcast" = ps: with ps; [ fnv-hash-fast ifaddr + isal psutil-home-assistant pylgnetcast sqlalchemy @@ -2453,6 +2594,7 @@ aiolifx-themes fnv-hash-fast ifaddr + isal psutil-home-assistant sqlalchemy ]; @@ -2497,6 +2639,7 @@ "local_ip" = ps: with ps; [ fnv-hash-fast ifaddr + isal psutil-home-assistant sqlalchemy ]; @@ -2504,12 +2647,14 @@ ical ]; "locative" = ps: with ps; [ + isal ]; "lock" = ps: with ps; [ ]; "logbook" = ps: with ps; [ fnv-hash-fast home-assistant-frontend + isal pillow psutil-home-assistant sqlalchemy @@ -2520,6 +2665,7 @@ ]; "logi_circle" = ps: with ps; [ ha-ffmpeg + isal logi-circle ]; "london_air" = ps: with ps; [ @@ -2535,6 +2681,7 @@ hass-nabucasa hassil home-assistant-intents + isal loqedapi mutagen psutil-home-assistant @@ -2544,6 +2691,7 @@ webrtc-noise-gain ]; "lovelace" = ps: with ps; [ + isal pillow ]; "luci" = ps: with ps; [ @@ -2568,24 +2716,29 @@ "lyric" = ps: with ps; [ aiolyric fnv-hash-fast + isal psutil-home-assistant sqlalchemy ]; "madeco" = ps: with ps; [ ]; "mailbox" = ps: with ps; [ + isal ]; "mailgun" = ps: with ps; [ + isal pymailgunner ]; "manual" = ps: with ps; [ ]; "manual_mqtt" = ps: with ps; [ + isal paho-mqtt ]; "map" = ps: with ps; [ fnv-hash-fast home-assistant-frontend + isal pillow psutil-home-assistant sqlalchemy @@ -2605,6 +2758,7 @@ ]; "matter" = ps: with ps; [ fnv-hash-fast + isal psutil-home-assistant python-matter-server sqlalchemy @@ -2635,6 +2789,7 @@ hassil home-assistant-intents ifaddr + isal mutagen psutil-home-assistant pyserial @@ -2644,11 +2799,14 @@ zeroconf ]; # missing inputs: medcom-ble "media_extractor" = ps: with ps; [ + isal yt-dlp ]; "media_player" = ps: with ps; [ + isal ]; "media_source" = ps: with ps; [ + isal ]; "mediaroom" = ps: with ps; [ pymediaroom @@ -2676,6 +2834,7 @@ hassil home-assistant-intents ifaddr + isal mutagen psutil-home-assistant pyserial @@ -2685,6 +2844,7 @@ zeroconf ]; # missing inputs: melnor-bluetooth "meraki" = ps: with ps; [ + isal ]; "message_bird" = ps: with ps; [ messagebird @@ -2711,18 +2871,22 @@ ]; # missing inputs: mficlient "microbees" = ps: with ps; [ fnv-hash-fast + isal psutil-home-assistant sqlalchemy ]; # missing inputs: microBeesPy "microsoft" = ps: with ps; [ ]; # missing inputs: pycsspeechtts "microsoft_face" = ps: with ps; [ + isal pyturbojpeg ]; "microsoft_face_detect" = ps: with ps; [ + isal pyturbojpeg ]; "microsoft_face_identify" = ps: with ps; [ + isal pyturbojpeg ]; "mijndomein_energie" = ps: with ps; [ @@ -2762,6 +2926,7 @@ hassil home-assistant-intents ifaddr + isal moat-ble mutagen psutil-home-assistant @@ -2777,6 +2942,7 @@ hass-nabucasa hassil home-assistant-intents + isal mutagen pillow psutil-home-assistant @@ -2793,6 +2959,7 @@ ]; "modem_callerid" = ps: with ps; [ fnv-hash-fast + isal phone-modem psutil-home-assistant pyserial @@ -2810,6 +2977,13 @@ ]; "monoprice" = ps: with ps; [ ]; # missing inputs: pymonoprice + "monzo" = ps: with ps; [ + fnv-hash-fast + isal + monzopy + psutil-home-assistant + sqlalchemy + ]; "moon" = ps: with ps; [ ]; "mopeka" = ps: with ps; [ @@ -2830,6 +3004,7 @@ hassil home-assistant-intents ifaddr + isal mopeka-iot-ble mutagen psutil-home-assistant @@ -2842,6 +3017,7 @@ "motion_blinds" = ps: with ps; [ fnv-hash-fast ifaddr + isal motionblinds psutil-home-assistant sqlalchemy @@ -2864,6 +3040,7 @@ hassil home-assistant-intents ifaddr + isal mutagen psutil-home-assistant pyserial @@ -2873,6 +3050,7 @@ zeroconf ]; # missing inputs: motionblindsble "motioneye" = ps: with ps; [ + isal motioneye-client ]; "motionmount" = ps: with ps; [ @@ -2882,18 +3060,23 @@ mpd2 ]; "mqtt" = ps: with ps; [ + isal paho-mqtt ]; "mqtt_eventstream" = ps: with ps; [ + isal paho-mqtt ]; "mqtt_json" = ps: with ps; [ + isal paho-mqtt ]; "mqtt_room" = ps: with ps; [ + isal paho-mqtt ]; "mqtt_statestream" = ps: with ps; [ + isal paho-mqtt ]; "msteams" = ps: with ps; [ @@ -2911,6 +3094,7 @@ "my" = ps: with ps; [ fnv-hash-fast home-assistant-frontend + isal pillow psutil-home-assistant sqlalchemy @@ -2918,10 +3102,12 @@ "myq" = ps: with ps; [ ]; "mysensors" = ps: with ps; [ + isal paho-mqtt pymysensors ]; "mystrom" = ps: with ps; [ + isal python-mystrom ]; "mythicbeastsdns" = ps: with ps; [ @@ -2929,6 +3115,7 @@ ]; "myuplink" = ps: with ps; [ fnv-hash-fast + isal myuplink psutil-home-assistant sqlalchemy @@ -2947,6 +3134,7 @@ ]; "neato" = ps: with ps; [ fnv-hash-fast + isal psutil-home-assistant pybotvac sqlalchemy @@ -2961,6 +3149,7 @@ fnv-hash-fast google-nest-sdm ha-ffmpeg + isal psutil-home-assistant sqlalchemy ]; @@ -2970,6 +3159,7 @@ hass-nabucasa hassil home-assistant-intents + isal mutagen psutil-home-assistant pyatmo @@ -2988,10 +3178,12 @@ eternalegypt ]; "netio" = ps: with ps; [ + isal ]; # missing inputs: pynetio "network" = ps: with ps; [ fnv-hash-fast ifaddr + isal psutil-home-assistant sqlalchemy ]; @@ -3037,6 +3229,7 @@ fnv-hash-fast getmac ifaddr + isal netmap psutil-home-assistant sqlalchemy @@ -3054,6 +3247,7 @@ pymetno ]; "notify" = ps: with ps; [ + isal ]; "notify_events" = ps: with ps; [ notify-events @@ -3070,6 +3264,7 @@ nuheat ]; "nuki" = ps: with ps; [ + isal pynuki ]; "numato" = ps: with ps; [ @@ -3106,8 +3301,12 @@ defusedxml ]; "ollama" = ps: with ps; [ + ha-ffmpeg hassil home-assistant-intents + isal + mutagen + webrtc-noise-gain ]; # missing inputs: ollama-hass "ombi" = ps: with ps; [ pyombi @@ -3116,12 +3315,14 @@ omnilogic ]; "onboarding" = ps: with ps; [ + isal pillow ]; "oncue" = ps: with ps; [ aiooncue ]; "ondilo_ico" = ps: with ps; [ + isal ondilo ]; "onewire" = ps: with ps; [ @@ -3142,8 +3343,10 @@ ha-ffmpeg hassil home-assistant-intents + isal mutagen openai + voluptuous-openapi webrtc-noise-gain ]; "openalpr_cloud" = ps: with ps; [ @@ -3178,13 +3381,13 @@ pyopenuv ]; "openweathermap" = ps: with ps; [ - pyowm - ]; + ]; # missing inputs: pyopenweathermap "opnsense" = ps: with ps; [ pyopnsense ]; "opower" = ps: with ps; [ fnv-hash-fast + isal opower psutil-home-assistant sqlalchemy @@ -3209,6 +3412,7 @@ hassil home-assistant-intents ifaddr + isal mutagen oralb-ble psutil-home-assistant @@ -3233,11 +3437,11 @@ bellows fnv-hash-fast ifaddr + isal pillow psutil-home-assistant pyroute2 pyserial - pyserial-asyncio pyserial-asyncio-fast python-otbr-api pyudev @@ -3268,6 +3472,7 @@ hass-nabucasa hassil home-assistant-intents + isal mutagen paho-mqtt psutil-home-assistant @@ -3292,6 +3497,7 @@ "panel_custom" = ps: with ps; [ fnv-hash-fast home-assistant-frontend + isal pillow psutil-home-assistant sqlalchemy @@ -3299,6 +3505,7 @@ "panel_iframe" = ps: with ps; [ fnv-hash-fast home-assistant-frontend + isal pillow psutil-home-assistant sqlalchemy @@ -3323,6 +3530,7 @@ "persistent_notification" = ps: with ps; [ ]; "person" = ps: with ps; [ + isal pillow ]; "pge" = ps: with ps; [ @@ -3355,6 +3563,7 @@ hass-nabucasa hassil home-assistant-intents + isal mutagen psutil-home-assistant pyplaato @@ -3365,10 +3574,12 @@ ]; "plant" = ps: with ps; [ fnv-hash-fast + isal psutil-home-assistant sqlalchemy ]; "plex" = ps: with ps; [ + isal plexapi plexauth plexwebsocket @@ -3382,6 +3593,7 @@ pycketcasts ]; "point" = ps: with ps; [ + isal pypoint ]; "poolsense" = ps: with ps; [ @@ -3410,6 +3622,7 @@ hassil home-assistant-intents ifaddr + isal mutagen psutil-home-assistant pyserial @@ -3428,6 +3641,7 @@ "proliphix" = ps: with ps; [ ]; # missing inputs: proliphix "prometheus" = ps: with ps; [ + isal prometheus-client ]; "prosegur" = ps: with ps; [ @@ -3462,6 +3676,7 @@ aiopurpleair ]; "push" = ps: with ps; [ + isal ]; "pushbullet" = ps: with ps; [ pushbullet-py @@ -3502,6 +3717,7 @@ hassil home-assistant-intents ifaddr + isal mutagen psutil-home-assistant pyserial @@ -3538,6 +3754,7 @@ "rabbitair" = ps: with ps; [ fnv-hash-fast ifaddr + isal psutil-home-assistant python-rabbitair sqlalchemy @@ -3549,6 +3766,7 @@ hass-nabucasa hassil home-assistant-intents + isal mutagen psutil-home-assistant python-matter-server @@ -3579,6 +3797,7 @@ "rainforest_raven" = ps: with ps; [ aioraven fnv-hash-fast + isal psutil-home-assistant pyserial pyudev @@ -3607,6 +3826,7 @@ hassil home-assistant-intents ifaddr + isal mutagen psutil-home-assistant pyserial @@ -3617,6 +3837,7 @@ zeroconf ]; "raspberry_pi" = ps: with ps; [ + isal psutil-home-assistant ]; "raspyrfm" = ps: with ps; [ @@ -3631,6 +3852,7 @@ ]; "recorder" = ps: with ps; [ fnv-hash-fast + isal psutil-home-assistant sqlalchemy ]; @@ -3641,6 +3863,7 @@ hassil home-assistant-frontend home-assistant-intents + isal mutagen pillow psutil-home-assistant @@ -3674,9 +3897,11 @@ renson-endura-delta ]; "reolink" = ps: with ps; [ + isal reolink-aio ]; "repairs" = ps: with ps; [ + isal ]; "repetier" = ps: with ps; [ ]; # missing inputs: pyrepetierng @@ -3695,6 +3920,7 @@ pyrfxtrx ]; "rhasspy" = ps: with ps; [ + isal ]; "ridwell" = ps: with ps; [ aioridwell @@ -3745,10 +3971,12 @@ rpi-bad-power ]; "rss_feed_template" = ps: with ps; [ + isal ]; "rtorrent" = ps: with ps; [ ]; "rtsp_to_webrtc" = ps: with ps; [ + isal pyturbojpeg rtsp-to-webrtc ]; @@ -3769,6 +3997,7 @@ dbus-fast fnv-hash-fast habluetooth + isal psutil-home-assistant pyserial pyudev @@ -3792,6 +4021,7 @@ hassil home-assistant-intents ifaddr + isal mutagen psutil-home-assistant pyserial @@ -3817,6 +4047,7 @@ fnv-hash-fast getmac ifaddr + isal psutil-home-assistant samsungctl samsungtvws @@ -3859,6 +4090,8 @@ ]; # missing inputs: scsgate "search" = ps: with ps; [ fnv-hash-fast + isal + pillow psutil-home-assistant sqlalchemy ]; @@ -3894,6 +4127,7 @@ hassil home-assistant-intents ifaddr + isal mutagen psutil-home-assistant pyserial @@ -3905,6 +4139,7 @@ ]; "sensor" = ps: with ps; [ fnv-hash-fast + isal psutil-home-assistant sqlalchemy ]; @@ -3928,6 +4163,7 @@ hassil home-assistant-intents ifaddr + isal mutagen psutil-home-assistant pyserial @@ -3955,6 +4191,7 @@ hassil home-assistant-intents ifaddr + isal mutagen psutil-home-assistant pyserial @@ -3970,11 +4207,12 @@ "senz" = ps: with ps; [ aiosenz fnv-hash-fast + isal psutil-home-assistant sqlalchemy ]; "serial" = ps: with ps; [ - pyserial-asyncio + pyserial-asyncio-fast ]; "serial_pm" = ps: with ps; [ pmsensor @@ -4006,6 +4244,7 @@ fnv-hash-fast habluetooth ifaddr + isal psutil-home-assistant pyserial pyudev @@ -4015,6 +4254,7 @@ shodan ]; "shopping_list" = ps: with ps; [ + isal ]; "sia" = ps: with ps; [ pysiaalarm @@ -4068,11 +4308,13 @@ ]; # missing inputs: goslide-api "slimproto" = ps: with ps; [ aioslimproto + isal ]; "sma" = ps: with ps; [ pysma ]; "smappee" = ps: with ps; [ + isal pysmappee ]; "smart_blinds" = ps: with ps; [ @@ -4090,6 +4332,7 @@ hass-nabucasa hassil home-assistant-intents + isal mutagen psutil-home-assistant pysmartapp @@ -4116,6 +4359,7 @@ snapcast ]; "snips" = ps: with ps; [ + isal paho-mqtt ]; "snmp" = ps: with ps; [ @@ -4139,6 +4383,7 @@ hassil home-assistant-intents ifaddr + isal mutagen psutil-home-assistant pyserial @@ -4177,6 +4422,7 @@ async-upnp-client fnv-hash-fast ifaddr + isal plexapi plexauth plexwebsocket @@ -4194,6 +4440,7 @@ libsoundtouch ]; "spaceapi" = ps: with ps; [ + isal ]; "spc" = ps: with ps; [ pyspcwebgw @@ -4208,6 +4455,7 @@ ]; # missing inputs: hass-splunk "spotify" = ps: with ps; [ fnv-hash-fast + isal psutil-home-assistant spotipy sqlalchemy @@ -4226,6 +4474,7 @@ async-upnp-client fnv-hash-fast ifaddr + isal psutil-home-assistant sqlalchemy ]; @@ -4241,6 +4490,7 @@ ]; "statistics" = ps: with ps; [ fnv-hash-fast + isal psutil-home-assistant sqlalchemy ]; @@ -4255,6 +4505,7 @@ discovery30303 fnv-hash-fast ifaddr + isal psutil-home-assistant sqlalchemy ]; @@ -4268,6 +4519,7 @@ ]; # missing inputs: stookwijzer "stream" = ps: with ps; [ ha-av + isal numpy pyturbojpeg ]; @@ -4275,6 +4527,7 @@ streamlabswater ]; "stt" = ps: with ps; [ + isal ]; "subaru" = ps: with ps; [ subarulink @@ -4329,6 +4582,7 @@ hassil home-assistant-intents ifaddr + isal mutagen psutil-home-assistant pyserial @@ -4358,6 +4612,7 @@ "synology_chat" = ps: with ps; [ ]; "synology_dsm" = ps: with ps; [ + isal py-synologydsm-api ]; "synology_srm" = ps: with ps; [ @@ -4367,6 +4622,7 @@ "system_bridge" = ps: with ps; [ fnv-hash-fast ifaddr + isal psutil-home-assistant sqlalchemy systembridgeconnector @@ -4374,6 +4630,7 @@ zeroconf ]; "system_health" = ps: with ps; [ + isal ]; "system_log" = ps: with ps; [ ]; @@ -4404,6 +4661,7 @@ ]; # missing inputs: tapsaff "tasmota" = ps: with ps; [ hatasmota + isal paho-mqtt ]; "tautulli" = ps: with ps; [ @@ -4418,12 +4676,15 @@ xmltodict ]; "tedee" = ps: with ps; [ + isal pytedee-async ]; "telegram" = ps: with ps; [ + isal python-telegram-bot ]; # missing inputs: python-telegram-bot.optional-dependencies.socks "telegram_bot" = ps: with ps; [ + isal python-telegram-bot ]; # missing inputs: python-telegram-bot.optional-dependencies.socks "tellduslive" = ps: with ps; [ @@ -4437,6 +4698,11 @@ temperusb ]; "template" = ps: with ps; [ + fnv-hash-fast + isal + pillow + psutil-home-assistant + sqlalchemy ]; "tensorflow" = ps: with ps; [ numpy @@ -4474,6 +4740,7 @@ hassil home-assistant-intents ifaddr + isal mutagen psutil-home-assistant pyserial @@ -4503,6 +4770,7 @@ hassil home-assistant-intents ifaddr + isal mutagen psutil-home-assistant pyserial @@ -4516,6 +4784,7 @@ stringcase ]; # missing inputs: thermoworks-smoke "thethingsnetwork" = ps: with ps; [ + ttn-client ]; "thingspeak" = ps: with ps; [ ]; # missing inputs: thingspeak @@ -4526,6 +4795,7 @@ "thread" = ps: with ps; [ fnv-hash-fast ifaddr + isal psutil-home-assistant pyroute2 python-otbr-api @@ -4536,6 +4806,7 @@ ]; "tibber" = ps: with ps; [ fnv-hash-fast + isal psutil-home-assistant pytibber sqlalchemy @@ -4563,6 +4834,7 @@ hassil home-assistant-intents ifaddr + isal mutagen psutil-home-assistant pyserial @@ -4584,6 +4856,7 @@ "tod" = ps: with ps; [ ]; "todo" = ps: with ps; [ + isal ]; "todoist" = ps: with ps; [ todoist-api-python @@ -4602,6 +4875,7 @@ hass-nabucasa hassil home-assistant-intents + isal mutagen psutil-home-assistant python-matter-server @@ -4611,6 +4885,7 @@ webrtc-noise-gain ]; "torque" = ps: with ps; [ + isal ]; "totalconnect" = ps: with ps; [ total-connect-client @@ -4620,6 +4895,7 @@ "tplink" = ps: with ps; [ fnv-hash-fast ifaddr + isal psutil-home-assistant python-kasa sqlalchemy @@ -4633,6 +4909,7 @@ "tplink_tapo" = ps: with ps; [ ]; "traccar" = ps: with ps; [ + isal pytraccar stringcase ]; @@ -4673,6 +4950,7 @@ ]; "tts" = ps: with ps; [ ha-ffmpeg + isal mutagen ]; "tuya" = ps: with ps; [ @@ -4683,12 +4961,15 @@ twentemilieu ]; "twilio" = ps: with ps; [ + isal twilio ]; "twilio_call" = ps: with ps; [ + isal twilio ]; "twilio_sms" = ps: with ps; [ + isal twilio ]; "twinkly" = ps: with ps; [ @@ -4696,6 +4977,7 @@ ]; "twitch" = ps: with ps; [ fnv-hash-fast + isal psutil-home-assistant sqlalchemy twitchapi @@ -4726,6 +5008,7 @@ unifiled ]; "unifiprotect" = ps: with ps; [ + isal pyunifiprotect unifi-discovery ]; @@ -4747,6 +5030,7 @@ fnv-hash-fast getmac ifaddr + isal psutil-home-assistant sqlalchemy ]; @@ -4759,6 +5043,7 @@ ]; "usb" = ps: with ps; [ fnv-hash-fast + isal psutil-home-assistant pyserial pyudev @@ -4788,6 +5073,7 @@ ]; "velbus" = ps: with ps; [ fnv-hash-fast + isal psutil-home-assistant pyserial pyudev @@ -4846,6 +5132,7 @@ ha-ffmpeg hassil home-assistant-intents + isal mutagen webrtc-noise-gain ]; # missing inputs: voip-utils @@ -4902,6 +5189,7 @@ apple-weatherkit ]; "webhook" = ps: with ps; [ + isal ]; "webmin" = ps: with ps; [ ]; # missing inputs: webmin-xmlrpc @@ -4910,6 +5198,7 @@ ]; "websocket_api" = ps: with ps; [ fnv-hash-fast + isal psutil-home-assistant sqlalchemy ]; @@ -4939,6 +5228,7 @@ hass-nabucasa hassil home-assistant-intents + isal mutagen psutil-home-assistant python-matter-server @@ -4949,6 +5239,7 @@ "wiz" = ps: with ps; [ fnv-hash-fast ifaddr + isal psutil-home-assistant pywizlight sqlalchemy @@ -4976,6 +5267,7 @@ ha-ffmpeg hassil home-assistant-intents + isal mutagen webrtc-noise-gain wyoming @@ -4984,6 +5276,7 @@ ]; "xbox" = ps: with ps; [ fnv-hash-fast + isal psutil-home-assistant sqlalchemy xbox-webapi @@ -5015,6 +5308,7 @@ hassil home-assistant-intents ifaddr + isal mutagen psutil-home-assistant pyserial @@ -5061,6 +5355,7 @@ hassil home-assistant-intents ifaddr + isal mutagen psutil-home-assistant pyserial @@ -5078,6 +5373,7 @@ async-upnp-client fnv-hash-fast ifaddr + isal psutil-home-assistant sqlalchemy ]; @@ -5093,6 +5389,7 @@ async-upnp-client fnv-hash-fast ifaddr + isal psutil-home-assistant sqlalchemy yeelight @@ -5105,6 +5402,7 @@ ]; "yolink" = ps: with ps; [ fnv-hash-fast + isal psutil-home-assistant sqlalchemy yolink-api @@ -5114,6 +5412,7 @@ ]; "youtube" = ps: with ps; [ fnv-hash-fast + isal psutil-home-assistant sqlalchemy youtubeaio @@ -5130,6 +5429,7 @@ "zeroconf" = ps: with ps; [ fnv-hash-fast ifaddr + isal psutil-home-assistant sqlalchemy zeroconf @@ -5145,10 +5445,10 @@ "zha" = ps: with ps; [ bellows fnv-hash-fast + isal pillow psutil-home-assistant pyserial - pyserial-asyncio pyserial-asyncio-fast pyudev sqlalchemy @@ -5175,6 +5475,7 @@ ]; "zwave_js" = ps: with ps; [ fnv-hash-fast + isal psutil-home-assistant pyserial pyudev @@ -5184,6 +5485,7 @@ "zwave_me" = ps: with ps; [ fnv-hash-fast ifaddr + isal psutil-home-assistant sqlalchemy url-normalize @@ -5214,13 +5516,11 @@ "airvisual_pro" "airzone" "airzone_cloud" - "aladdin_connect" "alarm_control_panel" "alarmdecoder" "alert" "alexa" "amberelectric" - "ambiclimate" "ambient_network" "ambient_station" "analytics" @@ -5529,6 +5829,7 @@ "ipma" "ipp" "iqvia" + "isal" "isy994" "izone" "jellyfin" @@ -5621,6 +5922,7 @@ "modem_callerid" "modern_forms" "mold_indicator" + "monzo" "moon" "mopeka" "motion_blinds" @@ -5689,7 +5991,6 @@ "opensky" "opentherm_gw" "openuv" - "openweathermap" "opnsense" "opower" "oralb" @@ -5894,6 +6195,7 @@ "text" "thermobeacon" "thermopro" + "thethingsnetwork" "thread" "threshold" "tibber" diff --git a/pkgs/servers/home-assistant/custom-components/homematicip_local/default.nix b/pkgs/servers/home-assistant/custom-components/homematicip_local/default.nix index 5a5c6c10e3223..a317c83fddbaf 100644 --- a/pkgs/servers/home-assistant/custom-components/homematicip_local/default.nix +++ b/pkgs/servers/home-assistant/custom-components/homematicip_local/default.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "danielperna84"; domain = "homematicip_local"; - version = "1.62.0"; + version = "1.63.0"; src = fetchFromGitHub { owner = "danielperna84"; repo = "custom_homematic"; rev = "refs/tags/${version}"; - hash = "sha256-jvjbo4nOh19o/Z/cDJ+DqDnP/d5YDZjDJjBp5I6yRQc="; + hash = "sha256-DK+zkNidHF/41qMQLxmYjgcybbC8fomfSmViL+pN/1Y="; }; dependencies = [ diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 12ed4a7a36cdd..ef2140d640627 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -30,15 +30,6 @@ let # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt (self: super: { - aioaladdinconnect = super.aioaladdinconnect.overridePythonAttrs (oldAttrs: rec { - version = "0.1.58"; - src = fetchPypi { - pname = "AIOAladdinConnect"; - inherit version; - hash = "sha256-ymynaOKvnqqHIEuQc+5CagsaH5cHnQit8ileoUO6G+I="; - }; - }); - aioelectricitymaps = super.aioelectricitymaps.overridePythonAttrs (oldAttrs: rec { version = "0.4.0"; src = fetchFromGitHub { @@ -102,13 +93,15 @@ let ''; }); - anova-wifi = super.anova-wifi.overridePythonAttrs (old: rec { - version = "0.10.3"; + aiowithings = super.aiowithings.overridePythonAttrs (oldAttrs: rec { + version = "2.1.0"; src = fetchFromGitHub { - owner = "Lash-L"; - repo = "anova_wifi"; - rev = "refs/tags/v${version}"; - hash = "sha256-tCmvp29KSCkc+g0w0odcB7vGjtDx6evac7XsHEF0syM="; + inherit (oldAttrs.src) + owner + repo + ; + rev = "refs/tags/${version}"; + hash = "sha256-+pIIVCR+QsW9M3pH9Ss3dMvkeKM1OdhQ1y+s/T6pHtk="; }; }); @@ -179,16 +172,6 @@ let }; }); - homematicip = super.homematicip.overridePythonAttrs rec { - version = "1.1.0"; - src = fetchFromGitHub { - owner = "hahn-th"; - repo = "homematicip-rest-api"; - rev = "refs/tags/${version}"; - hash = "sha256-tx7/amXG3rLdUFgRPQcuf57qkBLAPxPWjLGSO7MrcWU="; - }; - }; - intellifire4py = super.intellifire4py.overridePythonAttrs (oldAttrs: rec { version = "2.2.2"; src = fetchFromGitHub { @@ -458,16 +441,6 @@ let ]; }; - tesla-powerwall = super.tesla-powerwall.overridePythonAttrs (oldAttrs: rec { - version = "0.5.1"; - src = fetchFromGitHub { - owner = "jrester"; - repo = "tesla_powerwall"; - rev = "refs/tags/v${version}"; - hash = "sha256-if/FCfxAB48WGXZOMvCtdSOW2FWO43OrlcHZbXIPmGE="; - }; - }); - tuf = super.tuf.overridePythonAttrs rec { version = "2.1.0"; src = fetchFromGitHub { @@ -560,12 +533,12 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2024.5.5"; + hassVersion = "2024.6.0"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; version = assert (componentPackages.version == hassVersion); hassVersion; - format = "pyproject"; + pyproject = true; # check REQUIRED_PYTHON_VER in homeassistant/const.py disabled = python.pythonOlder "3.11"; @@ -578,13 +551,13 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-WAwLir9+O82kNBAwy0hUdfVxgDb3C4sIRDcyzVxfcuM="; + hash = "sha256-MO7JtWedZJCqK4kVgwxNGaEikBoFTddMSYf8ZG8e9ic="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-kcZM+IK96/q2GXeDSJzJTbzbz5mYcHevTDLpKspII6o="; + hash = "sha256-0gNwlkZoEDRk4vlX63lkpa6ykH79WxmiUeOv7oS6n2A="; }; build-system = with python.pkgs; [ @@ -641,8 +614,8 @@ in python.pkgs.buildPythonApplication rec { aiohttp aiohttp-cors aiohttp-fast-url-dispatcher - aiohttp-isal - aiohttp-session + aiohttp-fast-zlib + aiozoneinfo astral async-interrupt atomicwrites-homeassistant diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 4724eb834d841..e230de037c851 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,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 = "20240501.1"; + version = "20240605.0"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-d/mlZfMri0E4lgMrIt3cRqpF3F12Xr7YuHqTogFON9E="; + hash = "sha256-xuzaGS26BmUlJqfRD65Rc+NpQmyQ77nNLbPAyYuqGNo="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/intents.nix b/pkgs/servers/home-assistant/intents.nix index e72240cd6b837..06b68cfd383ee 100644 --- a/pkgs/servers/home-assistant/intents.nix +++ b/pkgs/servers/home-assistant/intents.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "home-assistant-intents"; - version = "2024.4.24"; + version = "2024.6.5"; pyproject = true; disabled = pythonOlder "3.9"; @@ -29,18 +29,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "home-assistant"; repo = "intents-package"; - # https://github.com/home-assistant/intents-package/issues/3 - rev = "a68176a189c3def87cb11ad39baacea2440ce668"; - hash = "sha256-SUIJWoA0ltg+bjYn4J5kvAk4Eh23uxEcdxonkTSV0m0="; + rev = "refs/tags/${version}"; + hash = "sha256-2rACxdgvCWnyhfVRAVbLTaEAYquAkLnfxi7zeZYZslI="; fetchSubmodules = true; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "setuptools~=62.3" "setuptools" \ - --replace-fail "wheel~=0.37.1" "wheel" - ''; - build-system = [ setuptools diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index dd7cc66e01e86..129eaa54834c4 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -8,8 +8,8 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2024.5.5"; - format = "pyproject"; + version = "2024.6.0"; + pyproject = true; disabled = python.version != home-assistant.python.version; @@ -17,10 +17,10 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-lZuP6DL9nuc5md2vDVGucOE8MrQOg7QHx5vYPuvFw50="; + hash = "sha256-QqY4OcICM2QvLP75aAw+6ualzJ4L+oQk+o4mmcNMax4="; }; - nativeBuildInputs = [ + build-system = [ poetry-core home-assistant ]; diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index 07e9ab99800b4..ae42f5fd7ce66 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -8,6 +8,7 @@ let airzone_cloud = [ aioairzone ]; + androidtv = home-assistant.getPackages "asuswrt" home-assistant.python.pkgs; bluetooth = [ pyswitchbot ]; @@ -91,6 +92,7 @@ let jellyfin = [ # AssertionError: assert 'audio/x-flac' == 'audio/flac' "--deselect tests/components/jellyfin/test_media_source.py::test_resolve" + "--deselect tests/components/jellyfin/test_media_source.py::test_audio_codec_resolve" # AssertionError: assert [+ received] == [- snapshot] "--deselect tests/components/jellyfin/test_media_source.py::test_music_library" ]; @@ -107,6 +109,7 @@ let in lib.listToAttrs (map (component: lib.nameValuePair component ( home-assistant.overridePythonAttrs (old: { pname = "homeassistant-test-${component}"; + pyproject = null; format = "other"; dontBuild = true; diff --git a/pkgs/tools/audio/wyoming/openwakeword.nix b/pkgs/tools/audio/wyoming/openwakeword.nix index 64c91ce259e81..5237a1e179ed9 100644 --- a/pkgs/tools/audio/wyoming/openwakeword.nix +++ b/pkgs/tools/audio/wyoming/openwakeword.nix @@ -20,6 +20,10 @@ python3Packages.buildPythonApplication rec { pythonRelaxDepsHook ]; + pythonRelaxDeps = [ + "wyoming" + ]; + pythonRemoveDeps = [ "tflite-runtime-nightly" ]; diff --git a/pkgs/tools/filesystems/tar2ext4/default.nix b/pkgs/tools/filesystems/tar2ext4/default.nix index aa1abaef4796e..287314205f54d 100644 --- a/pkgs/tools/filesystems/tar2ext4/default.nix +++ b/pkgs/tools/filesystems/tar2ext4/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tar2ext4"; - version = "0.12.3"; + version = "0.12.4"; src = fetchFromGitHub { owner = "microsoft"; repo = "hcsshim"; rev = "v${version}"; - sha256 = "sha256-xBlol+09rogbNSYM6Ok5EWb6IEfrVb+/wNMqAA3ZELU="; + sha256 = "sha256-aK1XZPHZSgTf6MTrJv+5SBr7FCT53VNXSTZQVnHM2GA="; }; sourceRoot = "${src.name}/cmd/tar2ext4"; diff --git a/pkgs/tools/security/argocd-vault-plugin/default.nix b/pkgs/tools/security/argocd-vault-plugin/default.nix index d8d13d207d896..0a4cf28b644cb 100644 --- a/pkgs/tools/security/argocd-vault-plugin/default.nix +++ b/pkgs/tools/security/argocd-vault-plugin/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "argocd-vault-plugin"; - version = "1.18.0"; + version = "1.18.1"; src = fetchFromGitHub { owner = "argoproj-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-5UIiWtEj2Hoiyp4+WDFKCe6u8Why+YJmg6vXQ5Vwi0I="; + hash = "sha256-rWNR4GVivuEprdX/xhwk/9SReeJ19UWDWx8Bf8z6CTI="; }; - vendorHash = "sha256-M/lnm+nBs6zXwPfm2sGtLZtsxRSVnRvEZPY3JVlEFuk="; + vendorHash = "sha256-iZ3WWM5p0UuKpdLq6wczLtgX01q6Vtx8j/XCAH+4POs="; ldflags = [ "-X=github.com/argoproj-labs/argocd-vault-plugin/version.Version=v${version}" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd3557c324cb8..67c3c0e2bf76f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19088,7 +19088,7 @@ with pkgs; python-matter-server = with python3Packages; toPythonApplication ( python-matter-server.overridePythonAttrs (oldAttrs: { - propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ oldAttrs.passthru.optional-dependencies.server; + dependencies = oldAttrs.dependencies ++ oldAttrs.optional-dependencies.server; }) ); diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 3b406fed9bf0b..3e1af7b55c87d 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -36,11 +36,13 @@ mapAliases ({ abodepy = jaraco-abode; # added 2023-02-01 acebinf = throw "acebinf has been removed because it is abandoned and broken."; # Added 2023-05-19 adafruit-nrfutil = throw "adafruit-nrfutil has been promoted to a top-level attribute name: `pkgs.adafruit-nrfutil`."; # Added 2023-11-19 + aioaladdinconnect = throw "aioaladdinconnect has been removed, as the API is supported was obsoleted on 2024-01-24."; # Added 2024-06-07 aioh2 = throw "aioh2 has been removed because it is abandoned and broken."; # Added 2022-03-30 aionotify = throw "aionotify has been removed because is unmaintained and incompatible with python3.11."; # Added 2023-10-27 aiosenseme = throw "aiosenseme has been removed, because it does no longer work with the latest firmware and has become unmaintained"; # Added 2023-07-05 aioquic-mitmproxy = throw "aioquic-mitmproxy has been removed because mitmproxy no longer uses it"; # Added 2024-01-16 amazon_kclpy = amazon-kclpy; # added 2023-08-08 + ambiclimate = throw "ambiclimate has been removed, because the service has been terminated after 2024-03-31."; # Added 2024-06-07 ansible-base = throw "ansible-base has been removed, because it is end of life"; # added 2022-03-30 ansible-doctor = throw "ansible-doctor has been promoted to a top-level attribute name: `pkgs.ansible-doctor`"; # Added 2023-05-16 ansible-later = throw "ansible-later has been promoted to a top-level attribute name: `pkgs.ansible-later`"; # Added 2023-05-16 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 82f2c27ee8d26..cf01a385c30fc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -153,8 +153,6 @@ self: super: with self; { aioairq = callPackage ../development/python-modules/aioairq { }; - aioaladdinconnect = callPackage ../development/python-modules/aioaladdinconnect { }; - aioambient = callPackage ../development/python-modules/aioambient { }; aioapcaccess = callPackage ../development/python-modules/aioapcaccess { }; @@ -249,6 +247,8 @@ self: super: with self; { aiohttp-fast-url-dispatcher = callPackage ../development/python-modules/aiohttp-fast-url-dispatcher { }; + aiohttp-fast-zlib = callPackage ../development/python-modules/aiohttp-fast-zlib { }; + aiohttp-isal = callPackage ../development/python-modules/aiohttp-isal { }; aiohttp-jinja2 = callPackage ../development/python-modules/aiohttp-jinja2 { }; @@ -541,8 +541,6 @@ self: super: with self; { amberelectric = callPackage ../development/python-modules/amberelectric { }; - ambiclimate = callPackage ../development/python-modules/ambiclimate { }; - amcrest = callPackage ../development/python-modules/amcrest { }; amiibo-py = callPackage ../development/python-modules/amiibo-py { }; @@ -16764,6 +16762,8 @@ self: super: with self; { voluptuous = callPackage ../development/python-modules/voluptuous { }; + voluptuous-openapi = callPackage ../development/python-modules/voluptuous-openapi { }; + voluptuous-serialize = callPackage ../development/python-modules/voluptuous-serialize { }; voluptuous-stubs = callPackage ../development/python-modules/voluptuous-stubs { }; |