diff --git a/pkgs/by-name/lo/localsend/package.nix b/pkgs/by-name/lo/localsend/package.nix index d84aee26984eeb..7038f355fd2074 100644 --- a/pkgs/by-name/lo/localsend/package.nix +++ b/pkgs/by-name/lo/localsend/package.nix @@ -11,27 +11,68 @@ libayatana-appindicator, undmg, makeBinaryWrapper, + rustPlatform, + moreutils, + jq, + cargo, + rustc, + fetchzip, }: let pname = "localsend"; - version = "1.15.4"; + version = "1.16.0"; linux = flutter324.buildFlutterApplication rec { - inherit pname; - version = "1.15.4-unstable-2024-10-26"; + inherit pname version; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "d0e864ddf6ebe1c55188b33f8fdccd534d203c75"; - hash = "sha256-qaW9LoRQge4K/CAQwbjNxmlUkQmxvaZyBJdAjXbbTw4="; + rev = "v${version}"; + hash = "sha256-0FBHT7hIDVpRVc+a1Y7g35MGzoE66oGf0CvsU1dUqCc="; }; sourceRoot = "${src.name}/app"; pubspecLock = lib.importJSON ./pubspec.lock.json; + customSourceBuilders = { + rhttp = + { version, src, ... }: + stdenv.mkDerivation rec { + pname = "rhttp"; + inherit version src; + inherit (src) passthru; + patches = [ ./rhttp.patch ]; + postPatch = '' + sed -i '/chmod +x/d' cargokit/cmake/cargokit.cmake + sed -i '/--no-precompile/d' cargokit/run_build_tool.sh + ''; + installPhase = '' + runHook preInstall + chmod +x cargokit/run_build_tool.sh + mkdir $out + cp -a ./* $out/ + runHook postInstall + ''; + }; + }; + + rhttp-version = "0.9.0"; + rhttp-src = fetchzip { + url = "https://pub.dev/api/archives/rhttp-${rhttp-version}.tar.gz"; + hash = "sha256-R/epI6ZC3AhcRL7LY/SLxyCLVCAFQSNTEsbqC3JPrgc="; + stripRoot = false; + }; + cargoDeps = rustPlatform.fetchCargoTarball rec { + pname = "rhttp"; + version = rhttp-version; + src = rhttp-src; + sourceRoot = "${src.name}/rust"; + hash = "sha256-Cw/M/YwZbkFhcD1friSdWzgjIodTlw8Il3GOmwrRQH4="; + }; + gitHashes = { permission_handler_windows = "sha256-+TP3neqlQRZnW6BxHaXr2EbmdITIx1Yo7AEn5iwAhwM="; pasteboard = "sha256-lJA5OWoAHfxORqWMglKzhsL1IFr9YcdAQP/NVOLYB4o="; @@ -40,10 +81,24 @@ let nativeBuildInputs = [ pkg-config copyDesktopItems + moreutils + jq + cargo + rustc + rustPlatform.cargoSetupHook ]; buildInputs = [ libayatana-appindicator ]; + postPatch = '' + cp ${rhttp-src}/rust/Cargo.lock ./Cargo.lock + ''; + + preBuild = '' + # build_tool hack: add build_tool as an actually resolvable package (the location is relative to the rhttp package directory) + jq '.packages += [.packages.[] | select(.name == "rhttp") | .rootUri += "/cargokit/build_tool" | .name = "build_tool"]' .dart_tool/package_config.json | sponge .dart_tool/package_config.json + ''; + postInstall = '' for s in 32 128 256 512; do d=$out/share/icons/hicolor/''${s}x''${s}/apps @@ -52,6 +107,10 @@ let done ''; + extraWrapProgramArgs = '' + --prefix LD_LIBRARY_PATH : "$out/app/${pname}/lib" + ''; + desktopItems = [ (makeDesktopItem { name = "LocalSend"; @@ -79,7 +138,7 @@ let src = fetchurl { url = "https://github.com/localsend/localsend/releases/download/v${version}/LocalSend-${version}.dmg"; - hash = "sha256-ZU2aXZNKo01TnXNH0e+r0l4J5HIILmGam3T4+6GaeA4="; + hash = "sha256-CPAcVFQwkFx28BlXJw8dEBZHLq+f0DUdEtWGWC2DS8o="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/lo/localsend/pubspec.lock.json b/pkgs/by-name/lo/localsend/pubspec.lock.json index 4d8c28b858ccea..a306c8c23b828d 100644 --- a/pkgs/by-name/lo/localsend/pubspec.lock.json +++ b/pkgs/by-name/lo/localsend/pubspec.lock.json @@ -10,22 +10,562 @@ "source": "hosted", "version": "72.0.0" }, + "adaptive_number": { + "dependency": "transitive", + "description": { + "name": "adaptive_number", + "sha256": "3a567544e9b5c9c803006f51140ad544aedc79604fd4f3f2c1380003f97c1d77", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "analyzer": { + "dependency": "transitive", + "description": { + "name": "analyzer", + "sha256": "b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.7.0" + }, + "args": { + "dependency": "transitive", + "description": { + "name": "args", + "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.0" + }, + "async": { + "dependency": "transitive", + "description": { + "name": "async", + "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.11.0" + }, + "boolean_selector": { + "dependency": "transitive", + "description": { + "name": "boolean_selector", + "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "collection": { + "dependency": "direct main", + "description": { + "name": "collection", + "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.18.0" + }, + "convert": { + "dependency": "transitive", + "description": { + "name": "convert", + "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.1" + }, + "coverage": { + "dependency": "transitive", + "description": { + "name": "coverage", + "sha256": "c1fb2dce3c0085f39dc72668e85f8e0210ec7de05345821ff58530567df345a5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.2" + }, + "crypto": { + "dependency": "transitive", + "description": { + "name": "crypto", + "sha256": "ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.5" + }, + "ed25519_edwards": { + "dependency": "direct main", + "description": { + "name": "ed25519_edwards", + "sha256": "6ce0112d131327ec6d42beede1e5dfd526069b18ad45dcf654f15074ad9276cd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.1" + }, + "file": { + "dependency": "transitive", + "description": { + "name": "file", + "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, + "fixnum": { + "dependency": "transitive", + "description": { + "name": "fixnum", + "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "frontend_server_client": { + "dependency": "transitive", + "description": { + "name": "frontend_server_client", + "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "github": { + "dependency": "direct main", + "description": { + "name": "github", + "sha256": "9966bc13bf612342e916b0a343e95e5f046c88f602a14476440e9b75d2295411", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.17.0" + }, + "glob": { + "dependency": "transitive", + "description": { + "name": "glob", + "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "hex": { + "dependency": "direct main", + "description": { + "name": "hex", + "sha256": "4e7cd54e4b59ba026432a6be2dd9d96e4c5205725194997193bf871703b82c4a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "http": { + "dependency": "transitive", + "description": { + "name": "http", + "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.2" + }, + "http_multi_server": { + "dependency": "transitive", + "description": { + "name": "http_multi_server", + "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, + "http_parser": { + "dependency": "transitive", + "description": { + "name": "http_parser", + "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.2" + }, + "io": { + "dependency": "transitive", + "description": { + "name": "io", + "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "js": { + "dependency": "transitive", + "description": { + "name": "js", + "sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.1" + }, + "json_annotation": { + "dependency": "transitive", + "description": { + "name": "json_annotation", + "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.9.0" + }, + "lints": { + "dependency": "transitive", + "description": { + "name": "lints", + "sha256": "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "logging": { + "dependency": "direct main", + "description": { + "name": "logging", + "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "matcher": { + "dependency": "transitive", + "description": { + "name": "matcher", + "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.16+1" + }, + "meta": { + "dependency": "transitive", + "description": { + "name": "meta", + "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.15.0" + }, + "mime": { + "dependency": "direct main", + "description": { + "name": "mime", + "sha256": "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.6" + }, + "node_preamble": { + "dependency": "transitive", + "description": { + "name": "node_preamble", + "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "package_config": { + "dependency": "transitive", + "description": { + "name": "package_config", + "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "path": { + "dependency": "direct main", + "description": { + "name": "path", + "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.0" + }, + "petitparser": { + "dependency": "transitive", + "description": { + "name": "petitparser", + "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.2" + }, + "pool": { + "dependency": "transitive", + "description": { + "name": "pool", + "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.1" + }, + "pub_semver": { + "dependency": "transitive", + "description": { + "name": "pub_semver", + "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "shelf": { + "dependency": "transitive", + "description": { + "name": "shelf", + "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.1" + }, + "shelf_packages_handler": { + "dependency": "transitive", + "description": { + "name": "shelf_packages_handler", + "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "shelf_static": { + "dependency": "transitive", + "description": { + "name": "shelf_static", + "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.3" + }, + "shelf_web_socket": { + "dependency": "transitive", + "description": { + "name": "shelf_web_socket", + "sha256": "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "source_map_stack_trace": { + "dependency": "transitive", + "description": { + "name": "source_map_stack_trace", + "sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "source_maps": { + "dependency": "transitive", + "description": { + "name": "source_maps", + "sha256": "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.12" + }, + "source_span": { + "dependency": "transitive", + "description": { + "name": "source_span", + "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.10.0" + }, + "stack_trace": { + "dependency": "transitive", + "description": { + "name": "stack_trace", + "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.11.1" + }, + "stream_channel": { + "dependency": "transitive", + "description": { + "name": "stream_channel", + "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "string_scanner": { + "dependency": "transitive", + "description": { + "name": "string_scanner", + "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "term_glyph": { + "dependency": "transitive", + "description": { + "name": "term_glyph", + "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "test": { + "dependency": "direct dev", + "description": { + "name": "test", + "sha256": "7ee44229615f8f642b68120165ae4c2a75fe77ae2065b1e55ae4711f6cf0899e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.25.7" + }, + "test_api": { + "dependency": "transitive", + "description": { + "name": "test_api", + "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.2" + }, + "test_core": { + "dependency": "transitive", + "description": { + "name": "test_core", + "sha256": "55ea5a652e38a1dfb32943a7973f3681a60f872f8c3a05a14664ad54ef9c6696", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.4" + }, + "toml": { + "dependency": "direct main", + "description": { + "name": "toml", + "sha256": "157c5dca5160fced243f3ce984117f729c788bb5e475504f3dbcda881accee44", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.14.0" + }, + "typed_data": { + "dependency": "transitive", + "description": { + "name": "typed_data", + "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.2" + }, + "version": { + "dependency": "direct main", + "description": { + "name": "version", + "sha256": "2307e23a45b43f96469eeab946208ed63293e8afca9c28cd8b5241ff31c55f55", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "vm_service": { + "dependency": "transitive", + "description": { + "name": "vm_service", + "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "14.2.5" + }, + "watcher": { + "dependency": "transitive", + "description": { + "name": "watcher", + "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "web_socket_channel": { + "dependency": "transitive", + "description": { + "name": "web_socket_channel", + "sha256": "d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" + }, + "webkit_inspection_protocol": { + "dependency": "transitive", + "description": { + "name": "webkit_inspection_protocol", + "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "yaml": { + "dependency": "transitive", + "description": { + "name": "yaml", + "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, "_macros": { "dependency": "transitive", "description": "dart", "source": "sdk", "version": "0.3.2" }, - "analyzer": { - "dependency": "transitive", - "description": { - "name": "analyzer", - "sha256": "b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.7.0" - }, "animated_vector": { "dependency": "transitive", "description": { @@ -66,26 +606,6 @@ "source": "hosted", "version": "3.6.1" }, - "args": { - "dependency": "transitive", - "description": { - "name": "args", - "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.5.0" - }, - "async": { - "dependency": "transitive", - "description": { - "name": "async", - "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.11.0" - }, "basic_utils": { "dependency": "direct main", "description": { @@ -96,25 +616,25 @@ "source": "hosted", "version": "5.7.0" }, - "boolean_selector": { + "build": { "dependency": "transitive", "description": { - "name": "boolean_selector", - "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "name": "build", + "sha256": "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.4.1" }, - "build": { + "build_cli_annotations": { "dependency": "transitive", "description": { - "name": "build", - "sha256": "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0", + "name": "build_cli_annotations", + "sha256": "b59d2769769efd6c9ff6d4c4cede0be115a566afc591705c2040b707534b1172", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.1" + "version": "2.1.0" }, "build_config": { "dependency": "transitive", @@ -226,16 +746,6 @@ "source": "hosted", "version": "4.10.0" }, - "collection": { - "dependency": "direct main", - "description": { - "name": "collection", - "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.18.0" - }, "color": { "dependency": "transitive", "description": { @@ -275,26 +785,6 @@ "source": "hosted", "version": "2.0.1" }, - "convert": { - "dependency": "transitive", - "description": { - "name": "convert", - "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.1" - }, - "coverage": { - "dependency": "transitive", - "description": { - "name": "coverage", - "sha256": "c1fb2dce3c0085f39dc72668e85f8e0210ec7de05345821ff58530567df345a5", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.9.2" - }, "cross_file": { "dependency": "transitive", "description": { @@ -305,16 +795,6 @@ "source": "hosted", "version": "0.3.4+2" }, - "crypto": { - "dependency": "transitive", - "description": { - "name": "crypto", - "sha256": "ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.5" - }, "csslib": { "dependency": "transitive", "description": { @@ -495,16 +975,6 @@ "source": "hosted", "version": "2.1.3" }, - "file": { - "dependency": "transitive", - "description": { - "name": "file", - "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "7.0.0" - }, "file_picker": { "dependency": "direct main", "description": { @@ -595,16 +1065,6 @@ "source": "hosted", "version": "0.9.3+3" }, - "fixnum": { - "dependency": "transitive", - "description": { - "name": "fixnum", - "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.0" - }, "flutter": { "dependency": "direct main", "description": "flutter", @@ -677,6 +1137,16 @@ "source": "hosted", "version": "2.0.23" }, + "flutter_rust_bridge": { + "dependency": "transitive", + "description": { + "name": "flutter_rust_bridge", + "sha256": "5fe868d3cb8cbc4d83091748552e03f00ccfa41b8e44691bc382611f831d5f8b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.1" + }, "flutter_test": { "dependency": "transitive", "description": "flutter", @@ -689,15 +1159,15 @@ "source": "sdk", "version": "0.0.0" }, - "frontend_server_client": { + "freezed_annotation": { "dependency": "transitive", "description": { - "name": "frontend_server_client", - "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", + "name": "freezed_annotation", + "sha256": "c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.0" + "version": "2.4.4" }, "gal": { "dependency": "direct main", @@ -709,16 +1179,6 @@ "source": "hosted", "version": "2.3.0" }, - "glob": { - "dependency": "transitive", - "description": { - "name": "glob", - "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.2" - }, "graphs": { "dependency": "transitive", "description": { @@ -769,16 +1229,6 @@ "source": "hosted", "version": "0.15.4" }, - "http": { - "dependency": "transitive", - "description": { - "name": "http", - "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.2" - }, "http_client_helper": { "dependency": "transitive", "description": { @@ -789,26 +1239,6 @@ "source": "hosted", "version": "3.0.0" }, - "http_multi_server": { - "dependency": "transitive", - "description": { - "name": "http_multi_server", - "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.2.1" - }, - "http_parser": { - "dependency": "transitive", - "description": { - "name": "http_parser", - "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.0.2" - }, "image": { "dependency": "transitive", "description": { @@ -959,26 +1389,6 @@ "source": "hosted", "version": "0.19.0" }, - "io": { - "dependency": "transitive", - "description": { - "name": "io", - "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.4" - }, - "js": { - "dependency": "transitive", - "description": { - "name": "js", - "sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.7.1" - }, "json2yaml": { "dependency": "transitive", "description": { @@ -989,16 +1399,6 @@ "source": "hosted", "version": "3.0.1" }, - "json_annotation": { - "dependency": "transitive", - "description": { - "name": "json_annotation", - "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.9.0" - }, "leak_tracker": { "dependency": "transitive", "description": { @@ -1039,26 +1439,6 @@ "source": "hosted", "version": "1.2.2" }, - "lints": { - "dependency": "transitive", - "description": { - "name": "lints", - "sha256": "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.0.0" - }, - "logging": { - "dependency": "direct main", - "description": { - "name": "logging", - "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.0" - }, "macros": { "dependency": "transitive", "description": { @@ -1079,16 +1459,6 @@ "source": "hosted", "version": "7.2.2" }, - "matcher": { - "dependency": "transitive", - "description": { - "name": "matcher", - "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.12.16+1" - }, "material_color_utilities": { "dependency": "transitive", "description": { @@ -1109,26 +1479,6 @@ "source": "hosted", "version": "0.1.1" }, - "meta": { - "dependency": "transitive", - "description": { - "name": "meta", - "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.15.0" - }, - "mime": { - "dependency": "direct main", - "description": { - "name": "mime", - "sha256": "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.6" - }, "mockito": { "dependency": "direct dev", "description": { @@ -1189,35 +1539,15 @@ "source": "hosted", "version": "0.5.0" }, - "node_preamble": { - "dependency": "transitive", - "description": { - "name": "node_preamble", - "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.2" - }, "open_filex": { "dependency": "direct main", "description": { - "name": "open_filex", - "sha256": "ba425ea49affd0a98a234aa9344b9ea5d4c4f7625a1377961eae9fe194c3d523", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.5.0" - }, - "package_config": { - "dependency": "transitive", - "description": { - "name": "package_config", - "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd", + "name": "open_filex", + "sha256": "ba425ea49affd0a98a234aa9344b9ea5d4c4f7625a1377961eae9fe194c3d523", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "4.5.0" }, "package_info_plus": { "dependency": "direct main", @@ -1250,16 +1580,6 @@ "source": "git", "version": "0.3.0" }, - "path": { - "dependency": "direct main", - "description": { - "name": "path", - "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.9.0" - }, "path_parsing": { "dependency": "transitive", "description": { @@ -1391,16 +1711,6 @@ "source": "git", "version": "0.1.2" }, - "petitparser": { - "dependency": "transitive", - "description": { - "name": "petitparser", - "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.0.2" - }, "photo_manager": { "dependency": "transitive", "description": { @@ -1461,16 +1771,6 @@ "source": "hosted", "version": "3.9.1" }, - "pool": { - "dependency": "transitive", - "description": { - "name": "pool", - "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.5.1" - }, "pretty_qr_code": { "dependency": "direct main", "description": { @@ -1491,16 +1791,6 @@ "source": "hosted", "version": "6.1.2" }, - "pub_semver": { - "dependency": "transitive", - "description": { - "name": "pub_semver", - "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.4" - }, "pubspec_parse": { "dependency": "transitive", "description": { @@ -1561,6 +1851,16 @@ "source": "hosted", "version": "2.0.0" }, + "rhttp": { + "dependency": "direct main", + "description": { + "name": "rhttp", + "sha256": "8dc4e1b50cbbd4422a3da93accfd40ea96227fb7d2264d6856754122aedfb194", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.0" + }, "routerino": { "dependency": "direct main", "description": { @@ -1711,46 +2011,6 @@ "source": "hosted", "version": "0.8.1" }, - "shelf": { - "dependency": "transitive", - "description": { - "name": "shelf", - "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.4.1" - }, - "shelf_packages_handler": { - "dependency": "transitive", - "description": { - "name": "shelf_packages_handler", - "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.2" - }, - "shelf_static": { - "dependency": "transitive", - "description": { - "name": "shelf_static", - "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.3" - }, - "shelf_web_socket": { - "dependency": "transitive", - "description": { - "name": "shelf_web_socket", - "sha256": "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.4" - }, "shortid": { "dependency": "transitive", "description": { @@ -1771,41 +2031,31 @@ "dependency": "direct main", "description": { "name": "slang", - "sha256": "a2f704508bf9f209b71c881347bd27de45309651e9bd63570e4dd6ed2a77fbd2", + "sha256": "b04db2dbaf927b28600a2f8a272a3bf2ae309556dcc5d6beb02d66af0be39e4c", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.31.2" + "version": "4.1.0" }, "slang_build_runner": { "dependency": "direct dev", "description": { "name": "slang_build_runner", - "sha256": "6e60160e8000b91824c47221b20d9642e7408287a5a21837ecefc75270197586", + "sha256": "6338653769ab088ad222e84b1f382fffb867a9a3ead802960aa4d0ab45a62f5f", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.31.0" + "version": "4.1.0" }, "slang_flutter": { "dependency": "direct main", "description": { "name": "slang_flutter", - "sha256": "f8400292be49c11697d94af58d7f7d054c91af759f41ffe71e4e5413871ffc62", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.31.0" - }, - "slang_gpt": { - "dependency": "direct dev", - "description": { - "name": "slang_gpt", - "sha256": "98e6f32f518c038c18fdd6b53923966a97f3a358487bfbe1a6dead4e8c1a3a39", + "sha256": "59988f37bb8b50d96ee46832a8a389036c0da26c04b1b1d4aa6690c00f70eccf", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.10.3" + "version": "4.1.0" }, "source_gen": { "dependency": "transitive", @@ -1817,36 +2067,6 @@ "source": "hosted", "version": "1.5.0" }, - "source_map_stack_trace": { - "dependency": "transitive", - "description": { - "name": "source_map_stack_trace", - "sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.2" - }, - "source_maps": { - "dependency": "transitive", - "description": { - "name": "source_maps", - "sha256": "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.10.12" - }, - "source_span": { - "dependency": "transitive", - "description": { - "name": "source_span", - "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.10.0" - }, "sprintf": { "dependency": "transitive", "description": { @@ -1857,26 +2077,6 @@ "source": "hosted", "version": "7.0.0" }, - "stack_trace": { - "dependency": "transitive", - "description": { - "name": "stack_trace", - "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.11.1" - }, - "stream_channel": { - "dependency": "transitive", - "description": { - "name": "stream_channel", - "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.2" - }, "stream_transform": { "dependency": "transitive", "description": { @@ -1887,16 +2087,6 @@ "source": "hosted", "version": "2.1.0" }, - "string_scanner": { - "dependency": "transitive", - "description": { - "name": "string_scanner", - "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.0" - }, "system_settings": { "dependency": "direct main", "description": { @@ -1907,46 +2097,6 @@ "source": "hosted", "version": "2.1.0" }, - "term_glyph": { - "dependency": "transitive", - "description": { - "name": "term_glyph", - "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.1" - }, - "test": { - "dependency": "direct dev", - "description": { - "name": "test", - "sha256": "7ee44229615f8f642b68120165ae4c2a75fe77ae2065b1e55ae4711f6cf0899e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.25.7" - }, - "test_api": { - "dependency": "transitive", - "description": { - "name": "test_api", - "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.7.2" - }, - "test_core": { - "dependency": "transitive", - "description": { - "name": "test_core", - "sha256": "55ea5a652e38a1dfb32943a7973f3681a60f872f8c3a05a14664ad54ef9c6696", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.6.4" - }, "time": { "dependency": "transitive", "description": { @@ -1987,16 +2137,6 @@ "source": "hosted", "version": "2.1.1" }, - "typed_data": { - "dependency": "transitive", - "description": { - "name": "typed_data", - "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.3.2" - }, "uri_content": { "dependency": "direct main", "description": { @@ -2187,16 +2327,6 @@ "source": "hosted", "version": "0.4.0+2" }, - "vm_service": { - "dependency": "transitive", - "description": { - "name": "vm_service", - "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "14.2.5" - }, "wakelock_plus": { "dependency": "direct main", "description": { @@ -2217,16 +2347,6 @@ "source": "hosted", "version": "1.2.1" }, - "watcher": { - "dependency": "transitive", - "description": { - "name": "watcher", - "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.0" - }, "web": { "dependency": "transitive", "description": { @@ -2237,26 +2357,6 @@ "source": "hosted", "version": "1.1.0" }, - "web_socket_channel": { - "dependency": "transitive", - "description": { - "name": "web_socket_channel", - "sha256": "d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.0" - }, - "webkit_inspection_protocol": { - "dependency": "transitive", - "description": { - "name": "webkit_inspection_protocol", - "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.1" - }, "wechat_assets_picker": { "dependency": "direct main", "description": { @@ -2337,16 +2437,6 @@ "source": "hosted", "version": "6.5.0" }, - "yaml": { - "dependency": "transitive", - "description": { - "name": "yaml", - "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.2" - }, "yaru": { "dependency": "direct main", "description": { @@ -2409,7 +2499,6 @@ } }, "sdks": { - "dart": ">=3.5.0 <4.0.0", - "flutter": ">=3.24.3" + "dart": ">=3.0.0 <4.0.0" } } diff --git a/pkgs/by-name/lo/localsend/rhttp.patch b/pkgs/by-name/lo/localsend/rhttp.patch new file mode 100644 index 00000000000000..80613d0e9dff00 --- /dev/null +++ b/pkgs/by-name/lo/localsend/rhttp.patch @@ -0,0 +1,54 @@ +diff --git a/cargokit/build_tool/lib/src/artifacts_provider.dart b/cargokit/build_tool/lib/src/artifacts_provider.dart +index ef655a9..01f58ea 100755 +--- a/cargokit/build_tool/lib/src/artifacts_provider.dart ++++ b/cargokit/build_tool/lib/src/artifacts_provider.dart +@@ -60,10 +60,8 @@ class ArtifactProvider { + return result; + } + +- final rustup = Rustup(); + for (final target in targets) { + final builder = RustBuilder(target: target, environment: environment); +- builder.prepare(rustup); + _log.info('Building ${environment.crateInfo.packageName} for $target'); + final targetDir = await builder.build(); + // For local build accept both static and dynamic libraries. +diff --git a/cargokit/build_tool/lib/src/builder.dart b/cargokit/build_tool/lib/src/builder.dart +index 570a537..6cc0e2a 100755 +--- a/cargokit/build_tool/lib/src/builder.dart ++++ b/cargokit/build_tool/lib/src/builder.dart +@@ -137,11 +137,8 @@ class RustBuilder { + final extraArgs = _buildOptions?.flags ?? []; + final manifestPath = path.join(environment.manifestDir, 'Cargo.toml'); + runCommand( +- 'rustup', ++ 'cargo', + [ +- 'run', +- _toolchain, +- 'cargo', + 'build', + ...extraArgs, + '--manifest-path', +diff --git a/cargokit/cmake/cargokit.cmake b/cargokit/cmake/cargokit.cmake +index 41c03b0..9e1c5eb 100755 +--- a/cargokit/cmake/cargokit.cmake ++++ b/cargokit/cmake/cargokit.cmake +@@ -60,7 +60,7 @@ function(apply_cargokit target manifest_dir lib_name any_symbol_name) + "${CMAKE_CURRENT_BINARY_DIR}/${CONFIG}/${CARGOKIT_LIB_FULL_NAME}" + "${CMAKE_CURRENT_BINARY_DIR}/_phony_" + COMMAND ${CMAKE_COMMAND} -E env ${CARGOKIT_ENV} +- "${cargokit_cmake_root}/run_build_tool${SCRIPT_EXTENSION}" build-cmake ++ dart --packages=../../../../../../.dart_tool/package_config.json "${cargokit_cmake_root}/build_tool/bin/build_tool.dart" build-cmake + VERBATIM + ) + endforeach() +@@ -70,7 +70,7 @@ function(apply_cargokit target manifest_dir lib_name any_symbol_name) + ${OUTPUT_LIB} + "${CMAKE_CURRENT_BINARY_DIR}/_phony_" + COMMAND ${CMAKE_COMMAND} -E env ${CARGOKIT_ENV} +- "${cargokit_cmake_root}/run_build_tool${SCRIPT_EXTENSION}" build-cmake ++ dart --packages=../../../../../../.dart_tool/package_config.json "${cargokit_cmake_root}/build_tool/bin/build_tool.dart" build-cmake + VERBATIM + ) + endif()