pyrox.dev / nixpkgs
lol
fork atom

multipass: 1.15.1 -> 1.16.0 (#428100)

authored by

Pol Dellaiera and committed by
GitHub da44db4d 04009c66

+25 -118
unified split
+9 -4
pkgs/by-name/mu/multipass/gui.nix
··· 5 version, 6 7 autoPatchelfHook, 8 - flutter327, 9 gtkmm3, 10 keybinder3, 11 lib, ··· 15 protoc-gen-dart, 16 qt6, 17 }: 18 - flutter327.buildFlutterApplication { 19 inherit version; 20 pname = "multipass-gui"; 21 src = multipass_src; ··· 25 pubspecLock = lib.importJSON ./pubspec.lock.json; 26 27 gitHashes = { 28 - dartssh2 = "sha256-2pypKwurziwGLZYuGaxlS2lzN3UvJp3bRTvvYYxEqRI="; 29 hotkey_manager_linux = "sha256-aO0h94YZvgV/ggVupNw8GjyZsnXrq3qTHRDtuhNv3oI="; 30 - tray_menu = "sha256-riiAiBEms+9ARog8i+MR1fto1Yqx+gwbBWyNbNq6VTM="; 31 window_size = "sha256-71PqQzf+qY23hTJvcm0Oye8tng3Asr42E2vfF1nBmVA="; 32 xterm = "sha256-h8vIonTPUVnNqZPk/A4ZV7EYCMyM0rrErL9ZOMe4ZBE="; 33 }; ··· 49 ]; 50 51 preBuild = '' 52 mkdir -p lib/generated 53 54 # Generate the Dart gRPC code for the Multipass GUI.
··· 5 version, 6 7 autoPatchelfHook, 8 + flutter, 9 gtkmm3, 10 keybinder3, 11 lib, ··· 15 protoc-gen-dart, 16 qt6, 17 }: 18 + flutter.buildFlutterApplication { 19 inherit version; 20 pname = "multipass-gui"; 21 src = multipass_src; ··· 25 pubspecLock = lib.importJSON ./pubspec.lock.json; 26 27 gitHashes = { 28 + dartssh2 = "sha256-9XrxxOamy0uS7kUz6mwWwp4yIBHLX/GSoyxMk/Wwa+4="; 29 hotkey_manager_linux = "sha256-aO0h94YZvgV/ggVupNw8GjyZsnXrq3qTHRDtuhNv3oI="; 30 + tray_menu = "sha256-TAlRW7VkZWAoHAVlrPeDqS3BsqhQTyCekYQ2b4AEqjU="; 31 window_size = "sha256-71PqQzf+qY23hTJvcm0Oye8tng3Asr42E2vfF1nBmVA="; 32 xterm = "sha256-h8vIonTPUVnNqZPk/A4ZV7EYCMyM0rrErL9ZOMe4ZBE="; 33 }; ··· 49 ]; 50 51 preBuild = '' 52 + # Temporary fix which can be removed in the next release. 53 + # Already addressed upstream, but part of a larger patch 54 + # that did not trivially apply. 55 + substituteInPlace lib/main.dart --replace-fail 'TabBarTheme(' 'TabBarThemeData(' 56 + 57 mkdir -p lib/generated 58 59 # Generate the Dart gRPC code for the Multipass GUI.
+4 -17
pkgs/by-name/mu/multipass/multipassd.nix
··· 6 cmake, 7 dnsmasq, 8 fetchFromGitHub, 9 git, 10 gtest, 11 iproute2, 12 iptables, ··· 27 xterm, 28 }: 29 30 - let 31 - # This is done here because a CMakeLists.txt from one of it's submodules tries 32 - # to modify a file, so we grab the source for the submodule here, copy it into 33 - # the source of the Multipass project which allows the modification to happen. 34 - grpc_src = fetchFromGitHub { 35 - owner = "canonical"; 36 - repo = "grpc"; 37 - rev = "ba8e7f72a57b9e0b25783a4d3cea58c79379f194"; 38 - hash = "sha256-DS1UNLCUdbipn5w4p2aVa8LgHHhdJiAfzfEdIXNO69o="; 39 - fetchSubmodules = true; 40 - }; 41 - in 42 stdenv.mkDerivation { 43 inherit version; 44 pname = "multipassd"; ··· 54 # in the Nix build environment. This patch disables the fetch in favour of providing 55 # the googletest library from nixpkgs. 56 ./cmake_no_fetch.patch 57 - # Ensures '-Wno-ignored-attributes' is supported by the compiler before attempting to build. 58 - ./cmake_warning.patch 59 # As of Multipass 1.14.0, the upstream started using vcpkg for grabbing C++ dependencies, 60 # which doesn't work in the nix build environment. This patch reverts that change, in favour 61 # of providing those dependencies manually in this derivation. ··· 83 --replace-fail "OVMF.fd" "${OVMF.fd}/FV/OVMF.fd" \ 84 --replace-fail "QEMU_EFI.fd" "${OVMF.fd}/FV/QEMU_EFI.fd" 85 86 - # Copy the grpc submodule we fetched into the source code. 87 - cp -r --no-preserve=mode ${grpc_src} 3rd-party/grpc 88 - 89 # Configure CMake to use gtest from the nix store since we disabled fetching from the internet. 90 cat >> tests/CMakeLists.txt <<'EOF' 91 add_library(gtest INTERFACE) ··· 111 cmakeFlags = [ "-DMULTIPASS_ENABLE_FLUTTER_GUI=false" ]; 112 113 buildInputs = [ 114 gtest 115 libapparmor 116 libvirt
··· 6 cmake, 7 dnsmasq, 8 fetchFromGitHub, 9 + fmt_11, 10 git, 11 + grpc, 12 gtest, 13 iproute2, 14 iptables, ··· 29 xterm, 30 }: 31 32 stdenv.mkDerivation { 33 inherit version; 34 pname = "multipassd"; ··· 44 # in the Nix build environment. This patch disables the fetch in favour of providing 45 # the googletest library from nixpkgs. 46 ./cmake_no_fetch.patch 47 # As of Multipass 1.14.0, the upstream started using vcpkg for grabbing C++ dependencies, 48 # which doesn't work in the nix build environment. This patch reverts that change, in favour 49 # of providing those dependencies manually in this derivation. ··· 71 --replace-fail "OVMF.fd" "${OVMF.fd}/FV/OVMF.fd" \ 72 --replace-fail "QEMU_EFI.fd" "${OVMF.fd}/FV/QEMU_EFI.fd" 73 74 # Configure CMake to use gtest from the nix store since we disabled fetching from the internet. 75 cat >> tests/CMakeLists.txt <<'EOF' 76 add_library(gtest INTERFACE) ··· 96 cmakeFlags = [ "-DMULTIPASS_ENABLE_FLUTTER_GUI=false" ]; 97 98 buildInputs = [ 99 + fmt_11 100 + grpc 101 gtest 102 libapparmor 103 libvirt
+2 -2
pkgs/by-name/mu/multipass/package.nix
··· 9 10 let 11 name = "multipass"; 12 - version = "1.15.1"; 13 14 multipass_src = fetchFromGitHub { 15 owner = "canonical"; 16 repo = "multipass"; 17 rev = "refs/tags/v${version}"; 18 - hash = "sha256-ckIvijNWav8gCL8b+Iw84tWS4cpTobJDdHwh/p+Y3NI="; 19 fetchSubmodules = true; 20 }; 21
··· 9 10 let 11 name = "multipass"; 12 + version = "1.16.0"; 13 14 multipass_src = fetchFromGitHub { 15 owner = "canonical"; 16 repo = "multipass"; 17 rev = "refs/tags/v${version}"; 18 + hash = "sha256-7P7LZEvZ+ygM0G8C/gMIwq5BOSs4wSVEBNgsaZzBbOk="; 19 fetchSubmodules = true; 20 }; 21
+1 -1
pkgs/by-name/mu/multipass/pubspec.lock.json
··· 1 - {"packages":{"args":{"dependency":"transitive","description":{"name":"args","sha256":"7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a","url":"https://pub.dev"},"source":"hosted","version":"2.5.0"},"asn1lib":{"dependency":"transitive","description":{"name":"asn1lib","sha256":"6b151826fcc95ff246cd219a0bf4c753ea14f4081ad71c61939becf3aba27f70","url":"https://pub.dev"},"source":"hosted","version":"1.5.5"},"async":{"dependency":"direct main","description":{"name":"async","sha256":"947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c","url":"https://pub.dev"},"source":"hosted","version":"2.11.0"},"basics":{"dependency":"direct main","description":{"name":"basics","sha256":"41ff8aded84ae174d1df5cce0bcac3ab9070caac9f7da35fd2cc638dfee6163f","url":"https://pub.dev"},"source":"hosted","version":"0.10.0"},"boolean_selector":{"dependency":"transitive","description":{"name":"boolean_selector","sha256":"6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66","url":"https://pub.dev"},"source":"hosted","version":"2.1.1"},"built_collection":{"dependency":"direct main","description":{"name":"built_collection","sha256":"376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100","url":"https://pub.dev"},"source":"hosted","version":"5.1.1"},"characters":{"dependency":"transitive","description":{"name":"characters","sha256":"04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605","url":"https://pub.dev"},"source":"hosted","version":"1.3.0"},"clock":{"dependency":"transitive","description":{"name":"clock","sha256":"cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf","url":"https://pub.dev"},"source":"hosted","version":"1.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"},"cross_file":{"dependency":"transitive","description":{"name":"cross_file","sha256":"7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670","url":"https://pub.dev"},"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"},"dartssh2":{"dependency":"direct main","description":{"path":".","ref":"2.10.0+mp","resolved-ref":"e7c66932cf7ca8eba083268fa3230222c8cd0722","url":"https://github.com/andrei-toterman/dartssh2.git"},"source":"git","version":"2.10.0"},"equatable":{"dependency":"transitive","description":{"name":"equatable","sha256":"c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2","url":"https://pub.dev"},"source":"hosted","version":"2.0.5"},"extended_text":{"dependency":"direct main","description":{"name":"extended_text","sha256":"b0cdd240b4ddf61d18d7e33e7775195971f2d033bd69706fa897446dc96c3b81","url":"https://pub.dev"},"source":"hosted","version":"14.1.0"},"extended_text_library":{"dependency":"transitive","description":{"name":"extended_text_library","sha256":"55d09098ec56fab0d9a8a68950ca0bbf2efa1327937f7cec6af6dfa066234829","url":"https://pub.dev"},"source":"hosted","version":"12.0.0"},"ffi":{"dependency":"direct main","description":{"name":"ffi","sha256":"16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6","url":"https://pub.dev"},"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_selector":{"dependency":"direct main","description":{"name":"file_selector","sha256":"5019692b593455127794d5718304ff1ae15447dea286cdda9f0db2a796a1b828","url":"https://pub.dev"},"source":"hosted","version":"1.0.3"},"file_selector_android":{"dependency":"transitive","description":{"name":"file_selector_android","sha256":"8bcc3af859e9d47fab9c7dc315537406511a894ab578e198bd8f9ed745ea5a01","url":"https://pub.dev"},"source":"hosted","version":"0.5.1+2"},"file_selector_ios":{"dependency":"transitive","description":{"name":"file_selector_ios","sha256":"38ebf91ecbcfa89a9639a0854ccaed8ab370c75678938eebca7d34184296f0bb","url":"https://pub.dev"},"source":"hosted","version":"0.5.3"},"file_selector_linux":{"dependency":"transitive","description":{"name":"file_selector_linux","sha256":"045d372bf19b02aeb69cacf8b4009555fb5f6f0b7ad8016e5f46dd1387ddd492","url":"https://pub.dev"},"source":"hosted","version":"0.9.2+1"},"file_selector_macos":{"dependency":"transitive","description":{"name":"file_selector_macos","sha256":"f42eacb83b318e183b1ae24eead1373ab1334084404c8c16e0354f9a3e55d385","url":"https://pub.dev"},"source":"hosted","version":"0.9.4"},"file_selector_platform_interface":{"dependency":"transitive","description":{"name":"file_selector_platform_interface","sha256":"a3994c26f10378a039faa11de174d7b78eb8f79e4dd0af2a451410c1a5c3f66b","url":"https://pub.dev"},"source":"hosted","version":"2.6.2"},"file_selector_web":{"dependency":"transitive","description":{"name":"file_selector_web","sha256":"c4c0ea4224d97a60a7067eca0c8fd419e708ff830e0c83b11a48faf566cec3e7","url":"https://pub.dev"},"source":"hosted","version":"0.9.4+2"},"file_selector_windows":{"dependency":"transitive","description":{"name":"file_selector_windows","sha256":"2ad726953f6e8affbc4df8dc78b77c3b4a060967a291e528ef72ae846c60fb69","url":"https://pub.dev"},"source":"hosted","version":"0.9.3+2"},"fixnum":{"dependency":"transitive","description":{"name":"fixnum","sha256":"25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1","url":"https://pub.dev"},"source":"hosted","version":"1.1.0"},"fl_chart":{"dependency":"direct main","description":{"name":"fl_chart","sha256":"94307bef3a324a0d329d3ab77b2f0c6e5ed739185ffc029ed28c0f9b019ea7ef","url":"https://pub.dev"},"source":"hosted","version":"0.69.0"},"flutter":{"dependency":"direct main","description":"flutter","source":"sdk","version":"0.0.0"},"flutter_lints":{"dependency":"direct dev","description":{"name":"flutter_lints","sha256":"5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1","url":"https://pub.dev"},"source":"hosted","version":"5.0.0"},"flutter_riverpod":{"dependency":"direct main","description":{"name":"flutter_riverpod","sha256":"0f1974eff5bbe774bf1d870e406fc6f29e3d6f1c46bd9c58e7172ff68a785d7d","url":"https://pub.dev"},"source":"hosted","version":"2.5.1"},"flutter_svg":{"dependency":"direct main","description":{"name":"flutter_svg","sha256":"7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2","url":"https://pub.dev"},"source":"hosted","version":"2.0.10+1"},"flutter_web_plugins":{"dependency":"transitive","description":"flutter","source":"sdk","version":"0.0.0"},"fpdart":{"dependency":"direct main","description":{"name":"fpdart","sha256":"7413acc5a6569a3fe8277928fc7487f3198530f0c4e635d0baef199ea36e8ee9","url":"https://pub.dev"},"source":"hosted","version":"1.1.0"},"google_identity_services_web":{"dependency":"transitive","description":{"name":"google_identity_services_web","sha256":"5be191523702ba8d7a01ca97c17fca096822ccf246b0a9f11923a6ded06199b6","url":"https://pub.dev"},"source":"hosted","version":"0.3.1+4"},"googleapis_auth":{"dependency":"transitive","description":{"name":"googleapis_auth","sha256":"befd71383a955535060acde8792e7efc11d2fccd03dd1d3ec434e85b68775938","url":"https://pub.dev"},"source":"hosted","version":"1.6.0"},"grpc":{"dependency":"direct main","description":{"name":"grpc","sha256":"5b99b7a420937d4361ece68b798c9af8e04b5bc128a7859f2a4be87427694813","url":"https://pub.dev"},"source":"hosted","version":"4.0.1"},"hotkey_manager":{"dependency":"direct main","description":{"name":"hotkey_manager","sha256":"06f0655b76c8dd322fb7101dc615afbdbf39c3d3414df9e059c33892104479cd","url":"https://pub.dev"},"source":"hosted","version":"0.2.3"},"hotkey_manager_linux":{"dependency":"direct overridden","description":{"path":"packages/hotkey_manager_linux","ref":"no-cooked-accel","resolved-ref":"7e5a662615fbc9f077c1567fd7a66ec34ad52b5e","url":"https://github.com/andrei-toterman/hotkey_manager.git"},"source":"git","version":"0.2.0"},"hotkey_manager_macos":{"dependency":"transitive","description":{"name":"hotkey_manager_macos","sha256":"03b5967e64357b9ac05188ea4a5df6fe4ed4205762cb80aaccf8916ee1713c96","url":"https://pub.dev"},"source":"hosted","version":"0.2.0"},"hotkey_manager_platform_interface":{"dependency":"transitive","description":{"name":"hotkey_manager_platform_interface","sha256":"98ffca25b8cc9081552902747b2942e3bc37855389a4218c9d50ca316b653b13","url":"https://pub.dev"},"source":"hosted","version":"0.2.0"},"hotkey_manager_windows":{"dependency":"transitive","description":{"name":"hotkey_manager_windows","sha256":"0d03ced9fe563ed0b68f0a0e1b22c9ffe26eb8053cb960e401f68a4f070e0117","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"},"http2":{"dependency":"transitive","description":{"name":"http2","sha256":"9ced024a160b77aba8fb8674e38f70875e321d319e6f303ec18e87bd5a4b0c1d","url":"https://pub.dev"},"source":"hosted","version":"2.3.0"},"http_parser":{"dependency":"transitive","description":{"name":"http_parser","sha256":"2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b","url":"https://pub.dev"},"source":"hosted","version":"4.0.2"},"intl":{"dependency":"direct main","description":{"name":"intl","sha256":"99f282cb0e02edcbbf8c6b3bbc7c90b65635156c412e58f3975a7e55284ce685","url":"https://pub.dev"},"source":"hosted","version":"0.20.0"},"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":"3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413","url":"https://pub.dev"},"source":"hosted","version":"5.0.0"},"local_notifier":{"dependency":"direct main","description":{"name":"local_notifier","sha256":"f6cfc933c6fbc961f4e52b5c880f68e41b2d3cd29aad557cc654fd211093a025","url":"https://pub.dev"},"source":"hosted","version":"0.1.6"},"logger":{"dependency":"direct main","description":{"name":"logger","sha256":"697d067c60c20999686a0add96cf6aba723b3aa1f83ecf806a8097231529ec32","url":"https://pub.dev"},"source":"hosted","version":"2.4.0"},"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":{"name":"material_color_utilities","sha256":"f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec","url":"https://pub.dev"},"source":"hosted","version":"0.11.1"},"meta":{"dependency":"transitive","description":{"name":"meta","sha256":"bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7","url":"https://pub.dev"},"source":"hosted","version":"1.15.0"},"path":{"dependency":"transitive","description":{"name":"path","sha256":"087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af","url":"https://pub.dev"},"source":"hosted","version":"1.9.0"},"path_parsing":{"dependency":"transitive","description":{"name":"path_parsing","sha256":"e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf","url":"https://pub.dev"},"source":"hosted","version":"1.0.1"},"path_provider":{"dependency":"direct main","description":{"name":"path_provider","sha256":"fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378","url":"https://pub.dev"},"source":"hosted","version":"2.1.4"},"path_provider_android":{"dependency":"transitive","description":{"name":"path_provider_android","sha256":"6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7","url":"https://pub.dev"},"source":"hosted","version":"2.2.10"},"path_provider_foundation":{"dependency":"transitive","description":{"name":"path_provider_foundation","sha256":"f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16","url":"https://pub.dev"},"source":"hosted","version":"2.4.0"},"path_provider_linux":{"dependency":"transitive","description":{"name":"path_provider_linux","sha256":"f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279","url":"https://pub.dev"},"source":"hosted","version":"2.2.1"},"path_provider_platform_interface":{"dependency":"transitive","description":{"name":"path_provider_platform_interface","sha256":"88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334","url":"https://pub.dev"},"source":"hosted","version":"2.1.2"},"path_provider_windows":{"dependency":"transitive","description":{"name":"path_provider_windows","sha256":"bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7","url":"https://pub.dev"},"source":"hosted","version":"2.3.0"},"petitparser":{"dependency":"transitive","description":{"name":"petitparser","sha256":"c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27","url":"https://pub.dev"},"source":"hosted","version":"6.0.2"},"pinenacl":{"dependency":"transitive","description":{"name":"pinenacl","sha256":"57e907beaacbc3c024a098910b6240758e899674de07d6949a67b52fd984cbdf","url":"https://pub.dev"},"source":"hosted","version":"0.6.0"},"platform":{"dependency":"transitive","description":{"name":"platform","sha256":"9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65","url":"https://pub.dev"},"source":"hosted","version":"3.1.5"},"plugin_platform_interface":{"dependency":"transitive","description":{"name":"plugin_platform_interface","sha256":"4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02","url":"https://pub.dev"},"source":"hosted","version":"2.1.8"},"pointycastle":{"dependency":"transitive","description":{"name":"pointycastle","sha256":"4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe","url":"https://pub.dev"},"source":"hosted","version":"3.9.1"},"protobuf":{"dependency":"direct main","description":{"name":"protobuf","sha256":"579fe5557eae58e3adca2e999e38f02441d8aa908703854a9e0a0f47fa857731","url":"https://pub.dev"},"source":"hosted","version":"4.1.0"},"quiver":{"dependency":"transitive","description":{"name":"quiver","sha256":"ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2","url":"https://pub.dev"},"source":"hosted","version":"3.2.2"},"riverpod":{"dependency":"transitive","description":{"name":"riverpod","sha256":"f21b32ffd26a36555e501b04f4a5dca43ed59e16343f1a30c13632b2351dfa4d","url":"https://pub.dev"},"source":"hosted","version":"2.5.1"},"rxdart":{"dependency":"direct main","description":{"name":"rxdart","sha256":"5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962","url":"https://pub.dev"},"source":"hosted","version":"0.28.0"},"screen_retriever":{"dependency":"transitive","description":{"name":"screen_retriever","sha256":"6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90","url":"https://pub.dev"},"source":"hosted","version":"0.1.9"},"shared_preferences":{"dependency":"direct main","description":{"name":"shared_preferences","sha256":"746e5369a43170c25816cc472ee016d3a66bc13fcf430c0bc41ad7b4b2922051","url":"https://pub.dev"},"source":"hosted","version":"2.3.2"},"shared_preferences_android":{"dependency":"transitive","description":{"name":"shared_preferences_android","sha256":"480ba4345773f56acda9abf5f50bd966f581dac5d514e5fc4a18c62976bbba7e","url":"https://pub.dev"},"source":"hosted","version":"2.3.2"},"shared_preferences_foundation":{"dependency":"transitive","description":{"name":"shared_preferences_foundation","sha256":"c4b35f6cb8f63c147312c054ce7c2254c8066745125264f0c88739c417fc9d9f","url":"https://pub.dev"},"source":"hosted","version":"2.5.2"},"shared_preferences_linux":{"dependency":"transitive","description":{"name":"shared_preferences_linux","sha256":"580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f","url":"https://pub.dev"},"source":"hosted","version":"2.4.1"},"shared_preferences_platform_interface":{"dependency":"transitive","description":{"name":"shared_preferences_platform_interface","sha256":"57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80","url":"https://pub.dev"},"source":"hosted","version":"2.4.1"},"shared_preferences_web":{"dependency":"transitive","description":{"name":"shared_preferences_web","sha256":"d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e","url":"https://pub.dev"},"source":"hosted","version":"2.4.2"},"shared_preferences_windows":{"dependency":"transitive","description":{"name":"shared_preferences_windows","sha256":"94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1","url":"https://pub.dev"},"source":"hosted","version":"2.4.1"},"sky_engine":{"dependency":"transitive","description":"flutter","source":"sdk","version":"0.0.99"},"source_span":{"dependency":"transitive","description":{"name":"source_span","sha256":"53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c","url":"https://pub.dev"},"source":"hosted","version":"1.10.0"},"sprintf":{"dependency":"transitive","description":{"name":"sprintf","sha256":"1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23","url":"https://pub.dev"},"source":"hosted","version":"7.0.0"},"stack_trace":{"dependency":"transitive","description":{"name":"stack_trace","sha256":"9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377","url":"https://pub.dev"},"source":"hosted","version":"1.12.0"},"state_notifier":{"dependency":"transitive","description":{"name":"state_notifier","sha256":"b8677376aa54f2d7c58280d5a007f9e8774f1968d1fb1c096adcb4792fba29bb","url":"https://pub.dev"},"source":"hosted","version":"1.0.0"},"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":"688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3","url":"https://pub.dev"},"source":"hosted","version":"1.3.0"},"synchronized":{"dependency":"direct main","description":{"name":"synchronized","sha256":"69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225","url":"https://pub.dev"},"source":"hosted","version":"3.3.0+3"},"term_glyph":{"dependency":"transitive","description":{"name":"term_glyph","sha256":"a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84","url":"https://pub.dev"},"source":"hosted","version":"1.2.1"},"test_api":{"dependency":"transitive","description":{"name":"test_api","sha256":"664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c","url":"https://pub.dev"},"source":"hosted","version":"0.7.3"},"tray_menu":{"dependency":"direct main","description":{"path":".","ref":"7c1394c","resolved-ref":"7c1394c46aac4598ebdd3fa6670e4ea2904a4d31","url":"https://github.com/andrei-toterman/tray_menu.git"},"source":"git","version":"0.0.1"},"two_dimensional_scrollables":{"dependency":"direct main","description":{"name":"two_dimensional_scrollables","sha256":"74ce1f35a8c74370b322049c9d00bf098938661e9f67054eae0f618e6dc0cb62","url":"https://pub.dev"},"source":"hosted","version":"0.3.2"},"typed_data":{"dependency":"transitive","description":{"name":"typed_data","sha256":"facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c","url":"https://pub.dev"},"source":"hosted","version":"1.3.2"},"uni_platform":{"dependency":"transitive","description":{"name":"uni_platform","sha256":"e02213a7ee5352212412ca026afd41d269eb00d982faa552f419ffc2debfad84","url":"https://pub.dev"},"source":"hosted","version":"0.1.3"},"url_launcher":{"dependency":"direct main","description":{"name":"url_launcher","sha256":"21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3","url":"https://pub.dev"},"source":"hosted","version":"6.3.0"},"url_launcher_android":{"dependency":"transitive","description":{"name":"url_launcher_android","sha256":"e35a698ac302dd68e41f73250bd9517fe3ab5fa4f18fe4647a0872db61bacbab","url":"https://pub.dev"},"source":"hosted","version":"6.3.10"},"url_launcher_ios":{"dependency":"transitive","description":{"name":"url_launcher_ios","sha256":"e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e","url":"https://pub.dev"},"source":"hosted","version":"6.3.1"},"url_launcher_linux":{"dependency":"transitive","description":{"name":"url_launcher_linux","sha256":"e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af","url":"https://pub.dev"},"source":"hosted","version":"3.2.0"},"url_launcher_macos":{"dependency":"transitive","description":{"name":"url_launcher_macos","sha256":"769549c999acdb42b8bcfa7c43d72bf79a382ca7441ab18a808e101149daf672","url":"https://pub.dev"},"source":"hosted","version":"3.2.1"},"url_launcher_platform_interface":{"dependency":"transitive","description":{"name":"url_launcher_platform_interface","sha256":"552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029","url":"https://pub.dev"},"source":"hosted","version":"2.3.2"},"url_launcher_web":{"dependency":"transitive","description":{"name":"url_launcher_web","sha256":"772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e","url":"https://pub.dev"},"source":"hosted","version":"2.3.3"},"url_launcher_windows":{"dependency":"transitive","description":{"name":"url_launcher_windows","sha256":"49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185","url":"https://pub.dev"},"source":"hosted","version":"3.1.2"},"uuid":{"dependency":"transitive","description":{"name":"uuid","sha256":"a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff","url":"https://pub.dev"},"source":"hosted","version":"4.5.1"},"vector_graphics":{"dependency":"transitive","description":{"name":"vector_graphics","sha256":"32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3","url":"https://pub.dev"},"source":"hosted","version":"1.1.11+1"},"vector_graphics_codec":{"dependency":"transitive","description":{"name":"vector_graphics_codec","sha256":"c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da","url":"https://pub.dev"},"source":"hosted","version":"1.1.11+1"},"vector_graphics_compiler":{"dependency":"transitive","description":{"name":"vector_graphics_compiler","sha256":"12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81","url":"https://pub.dev"},"source":"hosted","version":"1.1.11+1"},"vector_math":{"dependency":"transitive","description":{"name":"vector_math","sha256":"80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803","url":"https://pub.dev"},"source":"hosted","version":"2.1.4"},"web":{"dependency":"transitive","description":{"name":"web","sha256":"97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27","url":"https://pub.dev"},"source":"hosted","version":"0.5.1"},"win32":{"dependency":"direct main","description":{"name":"win32","sha256":"4d45dc9069dba4619dc0ebd93c7cec5e66d8482cb625a370ac806dcc8165f2ec","url":"https://pub.dev"},"source":"hosted","version":"5.5.5"},"window_manager":{"dependency":"direct main","description":{"name":"window_manager","sha256":"ab8b2a7f97543d3db2b506c9d875e637149d48ee0c6a5cb5f5fd6e0dac463792","url":"https://pub.dev"},"source":"hosted","version":"0.4.2"},"window_size":{"dependency":"direct main","description":{"path":"plugins/window_size","ref":"6c66ad2","resolved-ref":"6c66ad23ee79749f30a8eece542cf54eaf157ed8","url":"https://github.com/google/flutter-desktop-embedding.git"},"source":"git","version":"0.1.0"},"xdg_directories":{"dependency":"transitive","description":{"name":"xdg_directories","sha256":"faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d","url":"https://pub.dev"},"source":"hosted","version":"1.0.4"},"xml":{"dependency":"transitive","description":{"name":"xml","sha256":"b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226","url":"https://pub.dev"},"source":"hosted","version":"6.5.0"},"xterm":{"dependency":"direct main","description":{"path":".","ref":"4.0.0+mp","resolved-ref":"ff2309c1581c025ba8b9f65e6619fe2fe2252827","url":"https://github.com/levkropp/xterm.dart"},"source":"git","version":"4.0.0"},"zmodem":{"dependency":"transitive","description":{"name":"zmodem","sha256":"3b7e5b29f3a7d8aee472029b05165a68438eff2f3f7766edf13daba1e297adbf","url":"https://pub.dev"},"source":"hosted","version":"0.0.6"}},"sdks":{"dart":">=3.5.0 <4.0.0","flutter":">=3.24.0"}}
··· 1 + {"packages":{"args":{"dependency":"transitive","description":{"name":"args","sha256":"d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04","url":"https://pub.dev"},"source":"hosted","version":"2.7.0"},"asn1lib":{"dependency":"transitive","description":{"name":"asn1lib","sha256":"9a8f69025044eb466b9b60ef3bc3ac99b4dc6c158ae9c56d25eeccf5bc56d024","url":"https://pub.dev"},"source":"hosted","version":"1.6.5"},"async":{"dependency":"direct main","description":{"name":"async","sha256":"758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb","url":"https://pub.dev"},"source":"hosted","version":"2.13.0"},"basics":{"dependency":"direct main","description":{"name":"basics","sha256":"41ff8aded84ae174d1df5cce0bcac3ab9070caac9f7da35fd2cc638dfee6163f","url":"https://pub.dev"},"source":"hosted","version":"0.10.0"},"boolean_selector":{"dependency":"transitive","description":{"name":"boolean_selector","sha256":"8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea","url":"https://pub.dev"},"source":"hosted","version":"2.1.2"},"built_collection":{"dependency":"direct main","description":{"name":"built_collection","sha256":"376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100","url":"https://pub.dev"},"source":"hosted","version":"5.1.1"},"characters":{"dependency":"transitive","description":{"name":"characters","sha256":"f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803","url":"https://pub.dev"},"source":"hosted","version":"1.4.0"},"clock":{"dependency":"transitive","description":{"name":"clock","sha256":"fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b","url":"https://pub.dev"},"source":"hosted","version":"1.1.2"},"collection":{"dependency":"direct main","description":{"name":"collection","sha256":"2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76","url":"https://pub.dev"},"source":"hosted","version":"1.19.1"},"convert":{"dependency":"transitive","description":{"name":"convert","sha256":"b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68","url":"https://pub.dev"},"source":"hosted","version":"3.1.2"},"cross_file":{"dependency":"transitive","description":{"name":"cross_file","sha256":"7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670","url":"https://pub.dev"},"source":"hosted","version":"0.3.4+2"},"crypto":{"dependency":"transitive","description":{"name":"crypto","sha256":"1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855","url":"https://pub.dev"},"source":"hosted","version":"3.0.6"},"dartssh2":{"dependency":"direct main","description":{"path":".","ref":"2.12.0+mp","resolved-ref":"1d924a068e4a4fa8ca51706192f91221a392144a","url":"https://github.com/canonical/dartssh2.git"},"source":"git","version":"2.12.0"},"equatable":{"dependency":"transitive","description":{"name":"equatable","sha256":"567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7","url":"https://pub.dev"},"source":"hosted","version":"2.0.7"},"extended_text":{"dependency":"direct main","description":{"name":"extended_text","sha256":"d8f4a6e2676505b54dc0d5f5e8de9020667b402e9c1b3a8b030a83e568c99654","url":"https://pub.dev"},"source":"hosted","version":"15.0.2"},"extended_text_library":{"dependency":"transitive","description":{"name":"extended_text_library","sha256":"13d99f8a10ead472d5e2cf4770d3d047203fe5054b152e9eb5dc692a71befbba","url":"https://pub.dev"},"source":"hosted","version":"12.0.1"},"ffi":{"dependency":"direct main","description":{"name":"ffi","sha256":"289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418","url":"https://pub.dev"},"source":"hosted","version":"2.1.4"},"file":{"dependency":"transitive","description":{"name":"file","sha256":"a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4","url":"https://pub.dev"},"source":"hosted","version":"7.0.1"},"file_selector":{"dependency":"direct main","description":{"name":"file_selector","sha256":"5019692b593455127794d5718304ff1ae15447dea286cdda9f0db2a796a1b828","url":"https://pub.dev"},"source":"hosted","version":"1.0.3"},"file_selector_android":{"dependency":"transitive","description":{"name":"file_selector_android","sha256":"6bba3d590ee9462758879741abc132a19133600dd31832f55627442f1ebd7b54","url":"https://pub.dev"},"source":"hosted","version":"0.5.1+14"},"file_selector_ios":{"dependency":"transitive","description":{"name":"file_selector_ios","sha256":"94b98ad950b8d40d96fee8fa88640c2e4bd8afcdd4817993bd04e20310f45420","url":"https://pub.dev"},"source":"hosted","version":"0.5.3+1"},"file_selector_linux":{"dependency":"transitive","description":{"name":"file_selector_linux","sha256":"54cbbd957e1156d29548c7d9b9ec0c0ebb6de0a90452198683a7d23aed617a33","url":"https://pub.dev"},"source":"hosted","version":"0.9.3+2"},"file_selector_macos":{"dependency":"transitive","description":{"name":"file_selector_macos","sha256":"8c9250b2bd2d8d4268e39c82543bacbaca0fda7d29e0728c3c4bbb7c820fd711","url":"https://pub.dev"},"source":"hosted","version":"0.9.4+3"},"file_selector_platform_interface":{"dependency":"transitive","description":{"name":"file_selector_platform_interface","sha256":"a3994c26f10378a039faa11de174d7b78eb8f79e4dd0af2a451410c1a5c3f66b","url":"https://pub.dev"},"source":"hosted","version":"2.6.2"},"file_selector_web":{"dependency":"transitive","description":{"name":"file_selector_web","sha256":"c4c0ea4224d97a60a7067eca0c8fd419e708ff830e0c83b11a48faf566cec3e7","url":"https://pub.dev"},"source":"hosted","version":"0.9.4+2"},"file_selector_windows":{"dependency":"transitive","description":{"name":"file_selector_windows","sha256":"320fcfb6f33caa90f0b58380489fc5ac05d99ee94b61aa96ec2bff0ba81d3c2b","url":"https://pub.dev"},"source":"hosted","version":"0.9.3+4"},"fixnum":{"dependency":"transitive","description":{"name":"fixnum","sha256":"b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be","url":"https://pub.dev"},"source":"hosted","version":"1.1.1"},"fl_chart":{"dependency":"direct main","description":{"name":"fl_chart","sha256":"577aeac8ca414c25333334d7c4bb246775234c0e44b38b10a82b559dd4d764e7","url":"https://pub.dev"},"source":"hosted","version":"1.0.0"},"flutter":{"dependency":"direct main","description":"flutter","source":"sdk","version":"0.0.0"},"flutter_lints":{"dependency":"direct dev","description":{"name":"flutter_lints","sha256":"3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1","url":"https://pub.dev"},"source":"hosted","version":"6.0.0"},"flutter_riverpod":{"dependency":"direct main","description":{"name":"flutter_riverpod","sha256":"9532ee6db4a943a1ed8383072a2e3eeda041db5657cdf6d2acecf3c21ecbe7e1","url":"https://pub.dev"},"source":"hosted","version":"2.6.1"},"flutter_svg":{"dependency":"direct main","description":{"name":"flutter_svg","sha256":"cd57f7969b4679317c17af6fd16ee233c1e60a82ed209d8a475c54fd6fd6f845","url":"https://pub.dev"},"source":"hosted","version":"2.2.0"},"flutter_web_plugins":{"dependency":"transitive","description":"flutter","source":"sdk","version":"0.0.0"},"fpdart":{"dependency":"direct main","description":{"name":"fpdart","sha256":"1b84ce64453974159f08046f5d05592020d1fcb2099d7fe6ec58da0e7337af77","url":"https://pub.dev"},"source":"hosted","version":"1.1.1"},"google_identity_services_web":{"dependency":"transitive","description":{"name":"google_identity_services_web","sha256":"5d187c46dc59e02646e10fe82665fc3884a9b71bc1c90c2b8b749316d33ee454","url":"https://pub.dev"},"source":"hosted","version":"0.3.3+1"},"googleapis_auth":{"dependency":"transitive","description":{"name":"googleapis_auth","sha256":"b81fe352cc4a330b3710d2b7ad258d9bcef6f909bb759b306bf42973a7d046db","url":"https://pub.dev"},"source":"hosted","version":"2.0.0"},"grpc":{"dependency":"direct main","description":{"name":"grpc","sha256":"2dde469ddd8bbd7a33a0765da417abe1ad2142813efce3a86c512041294e2b26","url":"https://pub.dev"},"source":"hosted","version":"4.1.0"},"hotkey_manager":{"dependency":"direct main","description":{"name":"hotkey_manager","sha256":"06f0655b76c8dd322fb7101dc615afbdbf39c3d3414df9e059c33892104479cd","url":"https://pub.dev"},"source":"hosted","version":"0.2.3"},"hotkey_manager_linux":{"dependency":"direct overridden","description":{"path":"packages/hotkey_manager_linux","ref":"no-cooked-accel","resolved-ref":"7e5a662615fbc9f077c1567fd7a66ec34ad52b5e","url":"https://github.com/canonical/hotkey_manager.git"},"source":"git","version":"0.2.0"},"hotkey_manager_macos":{"dependency":"transitive","description":{"name":"hotkey_manager_macos","sha256":"03b5967e64357b9ac05188ea4a5df6fe4ed4205762cb80aaccf8916ee1713c96","url":"https://pub.dev"},"source":"hosted","version":"0.2.0"},"hotkey_manager_platform_interface":{"dependency":"transitive","description":{"name":"hotkey_manager_platform_interface","sha256":"98ffca25b8cc9081552902747b2942e3bc37855389a4218c9d50ca316b653b13","url":"https://pub.dev"},"source":"hosted","version":"0.2.0"},"hotkey_manager_windows":{"dependency":"transitive","description":{"name":"hotkey_manager_windows","sha256":"0d03ced9fe563ed0b68f0a0e1b22c9ffe26eb8053cb960e401f68a4f070e0117","url":"https://pub.dev"},"source":"hosted","version":"0.2.0"},"http":{"dependency":"transitive","description":{"name":"http","sha256":"2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b","url":"https://pub.dev"},"source":"hosted","version":"1.4.0"},"http2":{"dependency":"transitive","description":{"name":"http2","sha256":"382d3aefc5bd6dc68c6b892d7664f29b5beb3251611ae946a98d35158a82bbfa","url":"https://pub.dev"},"source":"hosted","version":"2.3.1"},"http_parser":{"dependency":"transitive","description":{"name":"http_parser","sha256":"178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571","url":"https://pub.dev"},"source":"hosted","version":"4.1.2"},"intl":{"dependency":"direct main","description":{"name":"intl","sha256":"3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5","url":"https://pub.dev"},"source":"hosted","version":"0.20.2"},"js":{"dependency":"transitive","description":{"name":"js","sha256":"53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc","url":"https://pub.dev"},"source":"hosted","version":"0.7.2"},"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":"a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0","url":"https://pub.dev"},"source":"hosted","version":"6.0.0"},"local_notifier":{"dependency":"direct main","description":{"name":"local_notifier","sha256":"f6cfc933c6fbc961f4e52b5c880f68e41b2d3cd29aad557cc654fd211093a025","url":"https://pub.dev"},"source":"hosted","version":"0.1.6"},"logger":{"dependency":"direct main","description":{"name":"logger","sha256":"2621da01aabaf223f8f961e751f2c943dbb374dc3559b982f200ccedadaa6999","url":"https://pub.dev"},"source":"hosted","version":"2.6.0"},"matcher":{"dependency":"transitive","description":{"name":"matcher","sha256":"dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2","url":"https://pub.dev"},"source":"hosted","version":"0.12.17"},"material_color_utilities":{"dependency":"transitive","description":{"name":"material_color_utilities","sha256":"f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec","url":"https://pub.dev"},"source":"hosted","version":"0.11.1"},"meta":{"dependency":"transitive","description":{"name":"meta","sha256":"e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c","url":"https://pub.dev"},"source":"hosted","version":"1.16.0"},"path":{"dependency":"transitive","description":{"name":"path","sha256":"75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5","url":"https://pub.dev"},"source":"hosted","version":"1.9.1"},"path_parsing":{"dependency":"transitive","description":{"name":"path_parsing","sha256":"883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca","url":"https://pub.dev"},"source":"hosted","version":"1.1.0"},"path_provider":{"dependency":"direct main","description":{"name":"path_provider","sha256":"50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd","url":"https://pub.dev"},"source":"hosted","version":"2.1.5"},"path_provider_android":{"dependency":"transitive","description":{"name":"path_provider_android","sha256":"d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9","url":"https://pub.dev"},"source":"hosted","version":"2.2.17"},"path_provider_foundation":{"dependency":"transitive","description":{"name":"path_provider_foundation","sha256":"4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942","url":"https://pub.dev"},"source":"hosted","version":"2.4.1"},"path_provider_linux":{"dependency":"transitive","description":{"name":"path_provider_linux","sha256":"f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279","url":"https://pub.dev"},"source":"hosted","version":"2.2.1"},"path_provider_platform_interface":{"dependency":"transitive","description":{"name":"path_provider_platform_interface","sha256":"88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334","url":"https://pub.dev"},"source":"hosted","version":"2.1.2"},"path_provider_windows":{"dependency":"transitive","description":{"name":"path_provider_windows","sha256":"bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7","url":"https://pub.dev"},"source":"hosted","version":"2.3.0"},"petitparser":{"dependency":"transitive","description":{"name":"petitparser","sha256":"07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646","url":"https://pub.dev"},"source":"hosted","version":"6.1.0"},"pinenacl":{"dependency":"transitive","description":{"name":"pinenacl","sha256":"57e907beaacbc3c024a098910b6240758e899674de07d6949a67b52fd984cbdf","url":"https://pub.dev"},"source":"hosted","version":"0.6.0"},"platform":{"dependency":"transitive","description":{"name":"platform","sha256":"5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984","url":"https://pub.dev"},"source":"hosted","version":"3.1.6"},"plugin_platform_interface":{"dependency":"transitive","description":{"name":"plugin_platform_interface","sha256":"4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02","url":"https://pub.dev"},"source":"hosted","version":"2.1.8"},"pointycastle":{"dependency":"transitive","description":{"name":"pointycastle","sha256":"4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe","url":"https://pub.dev"},"source":"hosted","version":"3.9.1"},"protobuf":{"dependency":"direct main","description":{"name":"protobuf","sha256":"579fe5557eae58e3adca2e999e38f02441d8aa908703854a9e0a0f47fa857731","url":"https://pub.dev"},"source":"hosted","version":"4.1.0"},"quiver":{"dependency":"transitive","description":{"name":"quiver","sha256":"ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2","url":"https://pub.dev"},"source":"hosted","version":"3.2.2"},"riverpod":{"dependency":"transitive","description":{"name":"riverpod","sha256":"59062512288d3056b2321804332a13ffdd1bf16df70dcc8e506e411280a72959","url":"https://pub.dev"},"source":"hosted","version":"2.6.1"},"rxdart":{"dependency":"direct main","description":{"name":"rxdart","sha256":"5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962","url":"https://pub.dev"},"source":"hosted","version":"0.28.0"},"screen_retriever":{"dependency":"transitive","description":{"name":"screen_retriever","sha256":"570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c","url":"https://pub.dev"},"source":"hosted","version":"0.2.0"},"screen_retriever_linux":{"dependency":"transitive","description":{"name":"screen_retriever_linux","sha256":"f7f8120c92ef0784e58491ab664d01efda79a922b025ff286e29aa123ea3dd18","url":"https://pub.dev"},"source":"hosted","version":"0.2.0"},"screen_retriever_macos":{"dependency":"transitive","description":{"name":"screen_retriever_macos","sha256":"71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149","url":"https://pub.dev"},"source":"hosted","version":"0.2.0"},"screen_retriever_platform_interface":{"dependency":"transitive","description":{"name":"screen_retriever_platform_interface","sha256":"ee197f4581ff0d5608587819af40490748e1e39e648d7680ecf95c05197240c0","url":"https://pub.dev"},"source":"hosted","version":"0.2.0"},"screen_retriever_windows":{"dependency":"transitive","description":{"name":"screen_retriever_windows","sha256":"449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13","url":"https://pub.dev"},"source":"hosted","version":"0.2.0"},"shared_preferences":{"dependency":"direct main","description":{"name":"shared_preferences","sha256":"6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5","url":"https://pub.dev"},"source":"hosted","version":"2.5.3"},"shared_preferences_android":{"dependency":"transitive","description":{"name":"shared_preferences_android","sha256":"20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac","url":"https://pub.dev"},"source":"hosted","version":"2.4.10"},"shared_preferences_foundation":{"dependency":"transitive","description":{"name":"shared_preferences_foundation","sha256":"6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03","url":"https://pub.dev"},"source":"hosted","version":"2.5.4"},"shared_preferences_linux":{"dependency":"transitive","description":{"name":"shared_preferences_linux","sha256":"580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f","url":"https://pub.dev"},"source":"hosted","version":"2.4.1"},"shared_preferences_platform_interface":{"dependency":"transitive","description":{"name":"shared_preferences_platform_interface","sha256":"57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80","url":"https://pub.dev"},"source":"hosted","version":"2.4.1"},"shared_preferences_web":{"dependency":"transitive","description":{"name":"shared_preferences_web","sha256":"c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019","url":"https://pub.dev"},"source":"hosted","version":"2.4.3"},"shared_preferences_windows":{"dependency":"transitive","description":{"name":"shared_preferences_windows","sha256":"94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1","url":"https://pub.dev"},"source":"hosted","version":"2.4.1"},"sky_engine":{"dependency":"transitive","description":"flutter","source":"sdk","version":"0.0.0"},"source_span":{"dependency":"transitive","description":{"name":"source_span","sha256":"254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c","url":"https://pub.dev"},"source":"hosted","version":"1.10.1"},"sprintf":{"dependency":"transitive","description":{"name":"sprintf","sha256":"1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23","url":"https://pub.dev"},"source":"hosted","version":"7.0.0"},"stack_trace":{"dependency":"transitive","description":{"name":"stack_trace","sha256":"8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1","url":"https://pub.dev"},"source":"hosted","version":"1.12.1"},"state_notifier":{"dependency":"transitive","description":{"name":"state_notifier","sha256":"b8677376aa54f2d7c58280d5a007f9e8774f1968d1fb1c096adcb4792fba29bb","url":"https://pub.dev"},"source":"hosted","version":"1.0.0"},"stream_channel":{"dependency":"transitive","description":{"name":"stream_channel","sha256":"969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d","url":"https://pub.dev"},"source":"hosted","version":"2.1.4"},"string_scanner":{"dependency":"transitive","description":{"name":"string_scanner","sha256":"921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43","url":"https://pub.dev"},"source":"hosted","version":"1.4.1"},"synchronized":{"dependency":"direct main","description":{"name":"synchronized","sha256":"0669c70faae6270521ee4f05bffd2919892d42d1276e6c495be80174b6bc0ef6","url":"https://pub.dev"},"source":"hosted","version":"3.3.1"},"term_glyph":{"dependency":"transitive","description":{"name":"term_glyph","sha256":"7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e","url":"https://pub.dev"},"source":"hosted","version":"1.2.2"},"test_api":{"dependency":"transitive","description":{"name":"test_api","sha256":"522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00","url":"https://pub.dev"},"source":"hosted","version":"0.7.6"},"tray_menu":{"dependency":"direct main","description":{"path":".","ref":"cef5b8f","resolved-ref":"cef5b8f60d7b2717c6f2eef2163a8e11de3b8d3d","url":"https://github.com/canonical/tray_menu.git"},"source":"git","version":"0.0.1"},"two_dimensional_scrollables":{"dependency":"direct main","description":{"name":"two_dimensional_scrollables","sha256":"f02e99bae8b457f710c2a717dfbd0a32a5bbe332c0814bc559d9549a5b117db3","url":"https://pub.dev"},"source":"hosted","version":"0.3.6"},"typed_data":{"dependency":"transitive","description":{"name":"typed_data","sha256":"f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006","url":"https://pub.dev"},"source":"hosted","version":"1.4.0"},"uni_platform":{"dependency":"transitive","description":{"name":"uni_platform","sha256":"e02213a7ee5352212412ca026afd41d269eb00d982faa552f419ffc2debfad84","url":"https://pub.dev"},"source":"hosted","version":"0.1.3"},"url_launcher":{"dependency":"direct main","description":{"name":"url_launcher","sha256":"9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603","url":"https://pub.dev"},"source":"hosted","version":"6.3.1"},"url_launcher_android":{"dependency":"transitive","description":{"name":"url_launcher_android","sha256":"8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79","url":"https://pub.dev"},"source":"hosted","version":"6.3.16"},"url_launcher_ios":{"dependency":"transitive","description":{"name":"url_launcher_ios","sha256":"7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb","url":"https://pub.dev"},"source":"hosted","version":"6.3.3"},"url_launcher_linux":{"dependency":"transitive","description":{"name":"url_launcher_linux","sha256":"4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935","url":"https://pub.dev"},"source":"hosted","version":"3.2.1"},"url_launcher_macos":{"dependency":"transitive","description":{"name":"url_launcher_macos","sha256":"17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2","url":"https://pub.dev"},"source":"hosted","version":"3.2.2"},"url_launcher_platform_interface":{"dependency":"transitive","description":{"name":"url_launcher_platform_interface","sha256":"552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029","url":"https://pub.dev"},"source":"hosted","version":"2.3.2"},"url_launcher_web":{"dependency":"transitive","description":{"name":"url_launcher_web","sha256":"4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2","url":"https://pub.dev"},"source":"hosted","version":"2.4.1"},"url_launcher_windows":{"dependency":"transitive","description":{"name":"url_launcher_windows","sha256":"3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77","url":"https://pub.dev"},"source":"hosted","version":"3.1.4"},"uuid":{"dependency":"transitive","description":{"name":"uuid","sha256":"a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff","url":"https://pub.dev"},"source":"hosted","version":"4.5.1"},"vector_graphics":{"dependency":"transitive","description":{"name":"vector_graphics","sha256":"a4f059dc26fc8295b5921376600a194c4ec7d55e72f2fe4c7d2831e103d461e6","url":"https://pub.dev"},"source":"hosted","version":"1.1.19"},"vector_graphics_codec":{"dependency":"transitive","description":{"name":"vector_graphics_codec","sha256":"99fd9fbd34d9f9a32efd7b6a6aae14125d8237b10403b422a6a6dfeac2806146","url":"https://pub.dev"},"source":"hosted","version":"1.1.13"},"vector_graphics_compiler":{"dependency":"transitive","description":{"name":"vector_graphics_compiler","sha256":"557a315b7d2a6dbb0aaaff84d857967ce6bdc96a63dc6ee2a57ce5a6ee5d3331","url":"https://pub.dev"},"source":"hosted","version":"1.1.17"},"vector_math":{"dependency":"transitive","description":{"name":"vector_math","sha256":"80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803","url":"https://pub.dev"},"source":"hosted","version":"2.1.4"},"web":{"dependency":"transitive","description":{"name":"web","sha256":"868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a","url":"https://pub.dev"},"source":"hosted","version":"1.1.1"},"win32":{"dependency":"direct main","description":{"name":"win32","sha256":"66814138c3562338d05613a6e368ed8cfb237ad6d64a9e9334be3f309acfca03","url":"https://pub.dev"},"source":"hosted","version":"5.14.0"},"window_manager":{"dependency":"direct main","description":{"name":"window_manager","sha256":"51d50168ab267d344b975b15390426b1243600d436770d3f13de67e55b05ec16","url":"https://pub.dev"},"source":"hosted","version":"0.5.0"},"window_size":{"dependency":"direct main","description":{"path":"plugins/window_size","ref":"6c66ad2","resolved-ref":"6c66ad23ee79749f30a8eece542cf54eaf157ed8","url":"https://github.com/google/flutter-desktop-embedding.git"},"source":"git","version":"0.1.0"},"xdg_directories":{"dependency":"transitive","description":{"name":"xdg_directories","sha256":"7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15","url":"https://pub.dev"},"source":"hosted","version":"1.1.0"},"xml":{"dependency":"transitive","description":{"name":"xml","sha256":"b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226","url":"https://pub.dev"},"source":"hosted","version":"6.5.0"},"xterm":{"dependency":"direct main","description":{"path":".","ref":"4.0.0+mp","resolved-ref":"ff2309c1581c025ba8b9f65e6619fe2fe2252827","url":"https://github.com/levkropp/xterm.dart"},"source":"git","version":"4.0.0"},"zmodem":{"dependency":"transitive","description":{"name":"zmodem","sha256":"3b7e5b29f3a7d8aee472029b05165a68438eff2f3f7766edf13daba1e297adbf","url":"https://pub.dev"},"source":"hosted","version":"0.0.6"}},"sdks":{"dart":">=3.8.0 <4.0.0","flutter":">=3.29.0"}}
+3 -19
pkgs/by-name/mu/multipass/update.sh
··· 40 sed -i "s|hash = \".*$|hash = \"${sri_hash}\";|" package.nix 41 } 42 43 - # Update the version/hash of the grpc source code in the Nix expression. 44 - update_grpc_source() { 45 - local version; version="$1" 46 - echo "Updating grpc source" 47 - 48 - submodule_info="https://raw.githubusercontent.com/canonical/multipass/refs/tags/v${version}/3rd-party/submodule_info.md" 49 - commit_short="$(curl -s "${submodule_info}" | grep -Po "CanonicalLtd/grpc/compare/v[0-9]+\.[0-9]+\.[0-9]+\.\.\K[0-9a-f]+")" 50 - commit_hash="$(curl -s "https://github.com/canonical/grpc/commits/${commit_short}" | grep -Po "${commit_short}[0-9a-f]+" | head -n1)" 51 - sri_hash="$(nix-prefetch-github canonical grpc --rev "${commit_hash}" --fetch-submodules | jq -r '.hash')" 52 - 53 - sed -i "s|rev = \".*$|rev = \"${commit_hash}\";|" multipassd.nix 54 - sed -i "s|hash = \".*$|hash = \"${sri_hash}\";|" multipassd.nix 55 - } 56 - 57 - 58 LATEST_TAG="$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} https://api.github.com/repos/canonical/multipass/releases/latest | jq -r '.tag_name')" 59 LATEST_VERSION="$(expr "$LATEST_TAG" : 'v\(.*\)')" 60 CURRENT_VERSION="$(grep -Po "version = \"\K[^\"]+" package.nix)" ··· 66 67 update_pubspec_json "$LATEST_VERSION" 68 69 - update_dart_pkg_hash dartssh2 andrei-toterman dartssh2 70 - update_dart_pkg_hash hotkey_manager_linux andrei-toterman hotkey_manager 71 - update_dart_pkg_hash tray_menu andrei-toterman tray_menu 72 update_dart_pkg_hash window_size google flutter-desktop-embedding 73 update_dart_pkg_hash xterm levkropp xterm.dart 74 75 update_multipass_source "$LATEST_VERSION" 76 77 - update_grpc_source "$LATEST_VERSION"
··· 40 sed -i "s|hash = \".*$|hash = \"${sri_hash}\";|" package.nix 41 } 42 43 LATEST_TAG="$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} https://api.github.com/repos/canonical/multipass/releases/latest | jq -r '.tag_name')" 44 LATEST_VERSION="$(expr "$LATEST_TAG" : 'v\(.*\)')" 45 CURRENT_VERSION="$(grep -Po "version = \"\K[^\"]+" package.nix)" ··· 51 52 update_pubspec_json "$LATEST_VERSION" 53 54 + update_dart_pkg_hash dartssh2 canonical dartssh2 55 + update_dart_pkg_hash hotkey_manager_linux canonical hotkey_manager 56 + update_dart_pkg_hash tray_menu canonical tray_menu 57 update_dart_pkg_hash window_size google flutter-desktop-embedding 58 update_dart_pkg_hash xterm levkropp xterm.dart 59 60 update_multipass_source "$LATEST_VERSION" 61
+6 -75
pkgs/by-name/mu/multipass/vcpkg_no_install.patch
··· 1 - diff --git a/3rd-party/CMakeLists.txt b/3rd-party/CMakeLists.txt 2 - index 73291f6c..c1a38198 100644 3 - --- a/3rd-party/CMakeLists.txt 4 - +++ b/3rd-party/CMakeLists.txt 5 - @@ -4,6 +4,24 @@ if (MSVC) 6 - add_compile_options(-wd5045) #Disable warning about Spectre mitigation 7 - endif() 8 - 9 - +include(FetchContent) 10 - +set(FETCHCONTENT_QUIET FALSE) 11 - + 12 - +FetchContent_Declare(gRPC 13 - + DOWNLOAD_COMMAND true 14 - + SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/grpc 15 - +) 16 - + 17 - +set(gRPC_SSL_PROVIDER "package" CACHE STRING "Provider of ssl library") 18 - + 19 - +FetchContent_MakeAvailable(gRPC) 20 - + 21 - +# Workaround for zlib placing its generated zconf.h file in the build dir, 22 - +# and protobuf not knowing so finding the system version instead 23 - +include_directories(${grpc_SOURCE_DIR}/third_party/zlib) 24 - + 25 - +set_property(DIRECTORY ${grpc_SOURCE_DIR} PROPERTY EXCLUDE_FROM_ALL YES) 26 - + 27 - # Generates gRPC and protobuf C++ sources and headers from the given .proto files 28 - # 29 - # generate_grpc_cpp (<SRCS> <DEST> [<ARGN>...]) 30 - @@ -34,9 +52,9 @@ function(generate_grpc_cpp SRCS DEST) 31 - "${DEST}/${FIL_WE}.grpc.pb.h" 32 - "${DEST}/${FIL_WE}.pb.cc" 33 - "${DEST}/${FIL_WE}.pb.h" 34 - - COMMAND $<TARGET_FILE:protobuf::protoc> 35 - - ARGS --grpc_out=${DEST} --cpp_out=${DEST} --proto_path=${FIL_DIR} --proto_path=${grpc_SOURCE_DIR}/third_party/protobuf/src --plugin=protoc-gen-grpc=$<TARGET_FILE:gRPC::grpc_cpp_plugin> ${ABS_FIL} 36 - - DEPENDS ${ABS_FIL} 37 - + COMMAND $<TARGET_FILE:protoc> 38 - + ARGS --grpc_out=${DEST} --cpp_out=${DEST} --proto_path=${FIL_DIR} --proto_path=${grpc_SOURCE_DIR}/third_party/protobuf/src --plugin=protoc-gen-grpc=$<TARGET_FILE:grpc_cpp_plugin> ${ABS_FIL} 39 - + DEPENDS ${ABS_FIL} protoc grpc_cpp_plugin 40 - COMMENT "Running gRPC C++ protocol buffer compiler on ${FIL}" 41 - VERBATIM) 42 - endforeach () 43 - @@ -47,9 +65,14 @@ endfunction() 44 - 45 - add_library(gRPC INTERFACE) 46 - 47 - +target_include_directories(gRPC INTERFACE 48 - + ${CMAKE_CURRENT_SOURCE_DIR}/grpc/include 49 - + ${CMAKE_CURRENT_SOURCE_DIR}/grpc/third_party/protobuf/src) 50 - + 51 - target_link_libraries(gRPC INTERFACE 52 - - gRPC::grpc++ 53 - - protobuf::libprotobuf) 54 - + grpc++ 55 - + libprotobuf 56 - + zlibstatic) 57 - 58 - if (NOT MSVC) 59 - target_compile_options(gRPC INTERFACE "-Wno-unused-parameter" "-Wno-non-virtual-dtor" "-Wno-pedantic") 60 - diff --git a/CMakeLists.txt b/CMakeLists.txt 61 - index 18e47b74..d5bf5dea 100644 62 - --- a/CMakeLists.txt 63 - +++ b/CMakeLists.txt 64 - @@ -49,9 +49,6 @@ if(NOT DEFINED VCPKG_BUILD_DEFAULT) 65 - set(VCPKG_TARGET_TRIPLET "${VCPKG_HOST_ARCH}-${VCPKG_HOST_OS}-release") 66 endif() 67 68 -set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/3rd-party/vcpkg/scripts/buildsystems/vcpkg.cmake" ··· 71 project(Multipass) 72 73 option(MULTIPASS_ENABLE_TESTS "Build tests" ON) 74 - @@ -125,9 +122,6 @@ endif() 75 - # OpenSSL config 76 - find_package(OpenSSL REQUIRED) 77 - 78 - -# gRPC config 79 - -find_package(gRPC CONFIG REQUIRED) 80 - - 81 - # Needs to be here before we set further compilation options 82 - add_subdirectory(3rd-party) 83 -
··· 1 + diff --git i/CMakeLists.txt w/CMakeLists.txt 2 + index fd8d446c8..870a2c19c 100644 3 + --- i/CMakeLists.txt 4 + +++ w/CMakeLists.txt 5 + @@ -83,9 +83,6 @@ else() 6 + message(STATUS "Bootstrapping vcpkg completed successfully.") 7 endif() 8 9 -set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/3rd-party/vcpkg/scripts/buildsystems/vcpkg.cmake" ··· 12 project(Multipass) 13 14 option(MULTIPASS_ENABLE_TESTS "Build tests" ON)