diff --git a/pkgs/by-name/ru/rustdesk-flutter/Cargo.lock b/pkgs/by-name/ru/rustdesk-flutter/Cargo.lock index cb2a54f8a663..406c1525a8f8 100644 --- a/pkgs/by-name/ru/rustdesk-flutter/Cargo.lock +++ b/pkgs/by-name/ru/rustdesk-flutter/Cargo.lock @@ -224,7 +224,7 @@ checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "arboard" version = "3.4.0" -source = "git+https://github.com/rustdesk-org/arboard#a04bdb1b368a99691822c33bf0f7ed497d6a7a35" +source = "git+https://github.com/rustdesk-org/arboard#747ab2d9b40a5c9c5102051cf3b0bb38b4845e60" dependencies = [ "clipboard-win", "core-graphics 0.23.2", @@ -860,6 +860,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "chrono" version = "0.4.38" @@ -3037,7 +3043,7 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hwcodec" version = "0.7.0" -source = "git+https://github.com/rustdesk-org/hwcodec#6abd1898f3a03481ed0c038507b5218d6ea94267" +source = "git+https://github.com/rustdesk-org/hwcodec#f74410edec91435252b8394c38f8eeca87ad2a26" dependencies = [ "bindgen 0.59.2", "cc", @@ -3959,11 +3965,23 @@ checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ "bitflags 2.6.0", "cfg-if 1.0.0", - "cfg_aliases", + "cfg_aliases 0.1.1", "libc", "memoffset 0.9.1", ] +[[package]] +name = "nix" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" +dependencies = [ + "bitflags 2.6.0", + "cfg-if 1.0.0", + "cfg_aliases 0.2.1", + "libc", +] + [[package]] name = "nom" version = "7.1.3" @@ -5179,7 +5197,7 @@ dependencies = [ [[package]] name = "rdev" version = "0.5.0-2" -source = "git+https://github.com/rustdesk-org/rdev#b3434caee84c92412b45a2f655a15ac5dad33488" +source = "git+https://github.com/rustdesk-org/rdev#d4c1759926d693ba269e2cb8cf9f87b13e424e4e" dependencies = [ "cocoa 0.24.1", "core-foundation 0.9.4", @@ -5454,7 +5472,7 @@ dependencies = [ [[package]] name = "rustdesk" -version = "1.3.0" +version = "1.3.1" dependencies = [ "android-wakelock", "android_logger", @@ -5486,6 +5504,7 @@ dependencies = [ "flutter_rust_bridge", "fon", "fruitbasket", + "gtk", "hbb_common", "hex", "hound", @@ -5500,6 +5519,7 @@ dependencies = [ "libpulse-simple-binding", "mac_address", "magnum-opus", + "nix 0.29.0", "num_cpus", "objc", "objc_id", @@ -5531,6 +5551,7 @@ dependencies = [ "system_shutdown", "tao", "tauri-winrt-notification", + "termios", "totp-rs", "tray-icon", "url", @@ -5551,7 +5572,7 @@ dependencies = [ [[package]] name = "rustdesk-portable-packer" -version = "1.3.0" +version = "1.3.1" dependencies = [ "brotli", "dirs 5.0.1", diff --git a/pkgs/by-name/ru/rustdesk-flutter/package.nix b/pkgs/by-name/ru/rustdesk-flutter/package.nix index 18e2234a355a..2dd1b134eaa6 100644 --- a/pkgs/by-name/ru/rustdesk-flutter/package.nix +++ b/pkgs/by-name/ru/rustdesk-flutter/package.nix @@ -4,7 +4,7 @@ cargo, copyDesktopItems, fetchFromGitHub, - flutter316, + flutter319, ffmpeg, gst_all_1, fuse3, @@ -29,7 +29,7 @@ let flutterRustBridge = rustPlatform.buildRustPackage rec { pname = "flutter_rust_bridge_codegen"; - version = "1.80.1"; # https://github.com/rustdesk/rustdesk/blob/1.3.0/.github/workflows/bridge.yml#L10 + version = "1.80.1"; # https://github.com/rustdesk/rustdesk/blob/1.3.1/.github/workflows/bridge.yml#L10 src = fetchFromGitHub { owner = "fzyzcjy"; @@ -49,14 +49,14 @@ let sharedLibraryExt = rustc.stdenv.hostPlatform.extensions.sharedLibrary; in -flutter316.buildFlutterApplication rec { +flutter319.buildFlutterApplication rec { pname = "rustdesk"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "rustdesk"; repo = "rustdesk"; rev = version; - hash = "sha256-pDGURsF0eft2BkuXOzaMtNCHp9VFgZZh4bbNRa5NDII="; + hash = "sha256-PioaSdvgJ9oXC5DAbl+em7rxcGx1om9+sjCMdrvox90="; }; strictDeps = true; @@ -64,7 +64,7 @@ flutter316.buildFlutterApplication rec { # Configure the Flutter/Dart build sourceRoot = "${src.name}/flutter"; - # curl https://raw.githubusercontent.com/rustdesk/rustdesk/1.3.0/flutter/pubspec.lock | yq > pubspec.lock.json + # curl https://raw.githubusercontent.com/rustdesk/rustdesk/1.3.1/flutter/pubspec.lock | yq > pubspec.lock.json pubspecLock = lib.importJSON ./pubspec.lock.json; gitHashes = { dash_chat_2 = "sha256-J5Bc6CeCoRGN870aNEVJ2dkQNb+LOIZetfG2Dsfz5Ow="; @@ -84,13 +84,13 @@ flutter316.buildFlutterApplication rec { lockFile = ./Cargo.lock; outputHashes = { "android-wakelock-0.1.0" = "sha256-09EH/U1BBs3l4galQOrTKmPUYBgryUjfc/rqPZhdYc4="; - "arboard-3.4.0" = "sha256-lZIG5z115ExR6DcUut1rk9MrYFzSyCYH9kNGIikOPJM="; + "arboard-3.4.0" = "sha256-xuMfMakHVj/zjiUr6PVFy+aNQxwsXtAAFlTYxUt12fU="; "cacao-0.4.0-beta2" = "sha256-U5tCLeVxjmZCm7ti1u71+i116xmozPaR69pCsA4pxrM="; "clipboard-master-4.0.0-beta.6" = "sha256-GZyzGMQOZ0iwGNZa/ZzFp8gU2tQVWZBpAbim8yb6yZA="; "confy-0.4.0-2" = "sha256-V7BCKISrkJIxWC3WT5+B5Vav86YTQvdO9TO6A++47FU="; "core-foundation-0.9.3" = "sha256-iB4OVmWZhuWbs9RFWvNc+RNut6rip2/50o5ZM6c0c3g="; "evdev-0.11.5" = "sha256-aoPmjGi/PftnH6ClEWXHvIj0X3oh15ZC1q7wPC1XPr0="; - "hwcodec-0.7.0" = "sha256-pfzcaD7h/U5ou+P7qRLR56iXOkm043rF74y+Q0FsVLo="; + "hwcodec-0.7.0" = "sha256-SswZI2BJ4pRXT379cziJlisPsc5sOiOiDqJ5WaPETnA="; "impersonate_system-0.1.0" = "sha256-pIV7s2qGoCIUrhaRovBDCJaGQ/pMdJacDXJmeBpkcyI="; "keepawake-0.4.3" = "sha256-cqSpkq/PCz+5+ZUyPy5hF6rP3fBzuZDywyxMUQ50Rk4="; "machine-uid-0.3.0" = "sha256-rEOyNThg6p5oqE9URnxSkPtzyW8D4zKzLi9pAnzTElE="; @@ -98,7 +98,7 @@ flutter316.buildFlutterApplication rec { "pam-0.7.0" = "sha256-o47tVoFlW9RiL7O8Lvuwz7rMYQHO+5TG27XxkAdHEOE="; "pam-sys-1.0.0-alpha4" = "sha256-5HIErVWnanLo5054NgU+DEKC2wwyiJ8AHvbx0BGbyWo="; "parity-tokio-ipc-0.7.3-4" = "sha256-PKw2Twd2ap+tRrQxqg8T1FvpoeKn0hvBqn1Z44F1LcY="; - "rdev-0.5.0-2" = "sha256-KrzNa4sKyuVw3EV/Ec9VBNRyJy7QFR2Gu4c2WkltwUw="; + "rdev-0.5.0-2" = "sha256-G+PvnA5mZyN080uoI5CGj/dQ9B1J4h5iYd7214MKBR8="; "reqwest-0.11.23" = "sha256-kEUT+gs4ziknDiGdPMLnj5pmxC5SBpLopZ8jZ34GDWc="; "rust-pulsectl-0.2.12" = "sha256-8jXTspWvjONFcvw9/Z8C43g4BuGZ3rsG32tvLMQbtbM="; "sciter-rs-0.5.57" = "sha256-5Nd9npdx8yQJEczHv7WmSmrE1lBfvp5z7BubTbYBg3E="; @@ -172,7 +172,7 @@ flutter316.buildFlutterApplication rec { ''; preBuild = '' - # Disable static linking of ffmpeg since https://github.com/21pages/hwcodec/commit/1873c34e3da070a462540f61c0b782b7ab15dc84ΒΆ + # Disable static linking of ffmpeg since https://github.com/21pages/hwcodec/commit/1873c34e3da070a462540f61c0b782b7ab15dc84 sed -i 's/static=//g' /build/cargo-vendor-dir/hwcodec-*/build.rs # Build the Flutter/Rust bridge bindings @@ -200,7 +200,6 @@ flutter316.buildFlutterApplication rec { mkdir -p $out/share/polkit-1/actions $out/share/icons/hicolor/{256x256,scalable}/apps cp ../res/128x128@2x.png $out/share/icons/hicolor/256x256/apps/rustdesk.png cp ../res/scalable.svg $out/share/icons/hicolor/scalable/apps/rustdesk.svg - cp ../res/com.rustdesk.RustDesk.policy $out/share/polkit-1/actions/ ''; desktopItems = [ diff --git a/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json b/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json index a077b296731b..a0a7ad0d8076 100644 --- a/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json +++ b/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json @@ -473,6 +473,26 @@ "source": "git", "version": "0.0.1+1" }, + "extended_text": { + "dependency": "direct main", + "description": { + "name": "extended_text", + "sha256": "7f382de3af12992e34bd72ddd36becf90c4720900af126cb9859f0189af71ffe", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "13.0.0" + }, + "extended_text_library": { + "dependency": "transitive", + "description": { + "name": "extended_text_library", + "sha256": "55d09098ec56fab0d9a8a68950ca0bbf2efa1327937f7cec6af6dfa066234829", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "12.0.0" + }, "external_path": { "dependency": "direct main", "description": { @@ -633,8 +653,8 @@ "dependency": "direct main", "description": { "path": ".", - "ref": "38951317afe79d953ab25733667bd96e172a80d3", - "resolved-ref": "38951317afe79d953ab25733667bd96e172a80d3", + "ref": "2ded7f146437a761ffe6981e2f742038f85ca68d", + "resolved-ref": "2ded7f146437a761ffe6981e2f742038f85ca68d", "url": "https://github.com/rustdesk-org/flutter_gpu_texture_renderer" }, "source": "git", @@ -2013,7 +2033,7 @@ } }, "sdks": { - "dart": ">=3.2.0 <4.0.0", - "flutter": ">=3.16.0" + "dart": ">=3.3.0 <4.0.0", + "flutter": ">=3.19.0" } }